Added new events !!!

35 files changed, 29 insertions, 846 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs
deleted file mode 100644
index b33259e3e..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using Tango.BL.Entities;
-using Tango.MachineStudio.DB.ViewModels;
-
-namespace Tango.MachineStudio.DB.Converters
-{
-    /// <summary>
-    /// Converts an event type action to string representation.
-    /// </summary>
-    /// <seealso cref="System.Windows.Data.IValueConverter" />
-    public class EventTypeActionsToStringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value == null) return "";
-
-            if (value is IEnumerable<EventTypesAction>)
-            {
-                IEnumerable<EventTypesAction> eventActions = value as IEnumerable<EventTypesAction>;
-                return String.Join(", ", eventActions.Select(x => x.ActionType.Name));
-            }
-            else
-            {
-                IEnumerable<MultiComboVM<ActionType>> eventActions = value as IEnumerable<MultiComboVM<ActionType>>;
-                return String.Join(", ", eventActions.Where(x => x.IsSelected).Select(x => x.Entity.Name));
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index e719464f8..da427f4d8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -80,13 +80,11 @@
     </Compile>
     <Compile Include="Converters\ByteArrayToFileSizeConverter.cs" />
     <Compile Include="Converters\EntityFieldNameToFriendlyStringConverter.cs" />
-    <Compile Include="Converters\EventTypeActionsToStringConverter.cs" />
     <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" />
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
     <Compile Include="DBModule.cs" />
     <Compile Include="Messages\CloseEntityEditViewMessage.cs" />
     <Compile Include="Messages\OpenEntityEditViewMessage.cs" />
-    <Compile Include="ViewModels\ActionTypesViewVM.cs" />
     <Compile Include="ViewModels\AddressesViewVM.cs" />
     <Compile Include="ViewModels\ApplicationDisplayPanelVersionsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" />
@@ -96,13 +94,11 @@
     <Compile Include="ViewModels\CctsViewVM.cs" />
     <Compile Include="ViewModels\ConfigurationsViewVM.cs" />
     <Compile Include="ViewModels\ContactsViewVM.cs" />
-    <Compile Include="ViewModels\EventTypesGroupsViewVM.cs" />
     <Compile Include="ViewModels\HardwareDancerTypesViewVM.cs" />
     <Compile Include="ViewModels\DbTableViewModel.cs" />
     <Compile Include="ViewModels\DialogOpenMode.cs" />
     <Compile Include="ViewModels\DispenserTypesViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" />
-    <Compile Include="ViewModels\EventTypesViewVM.cs" />
     <Compile Include="ViewModels\FiberShapesViewVM.cs" />
     <Compile Include="ViewModels\FiberSynthsViewVM.cs" />
     <Compile Include="ViewModels\HardwareVersionsViewVM.cs" />
@@ -132,24 +128,12 @@
     <Compile Include="ViewModels\EntityViewModel.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModelLocator.cs" />
-    <Compile Include="Views\DBViews\ActionTypesView.xaml.cs">
-      <DependentUpon>ActionTypesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DBViews\ActionTypeView.xaml.cs">
-      <DependentUpon>ActionTypeView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\SpoolTypesView.xaml.cs">
       <DependentUpon>SpoolTypesView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\SpoolTypeView.xaml.cs">
       <DependentUpon>SpoolTypeView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EventTypesGroupsView.xaml.cs">
-      <DependentUpon>EventTypesGroupsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DBViews\EventTypesGroupView.xaml.cs">
-      <DependentUpon>EventTypesGroupView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\HardwarePidControlTypesView.xaml.cs">
       <DependentUpon>HardwarePidControlTypesView.xaml</DependentUpon>
     </Compile>
@@ -354,18 +338,12 @@
     <Compile Include="Views\DBViews\OrganizationView.xaml.cs">
       <DependentUpon>OrganizationView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EventTypesView.xaml.cs">
-      <DependentUpon>EventTypesView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\LiquidTypesRmlsView.xaml.cs">
       <DependentUpon>LiquidTypesRmlsView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\UsersView.xaml.cs">
       <DependentUpon>UsersView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\EventTypeView.xaml.cs">
-      <DependentUpon>EventTypeView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\LiquidTypesRmlView.xaml.cs">
       <DependentUpon>LiquidTypesRmlView.xaml</DependentUpon>
     </Compile>
@@ -387,14 +365,6 @@
     <Compile Include="CustomAttributes\DBViewAttribute.cs" />
     <Compile Include="Managers\RegisteredView.cs" />
     <Compile Include="Managers\ViewsManager.cs" />
-    <Page Include="Views\DBViews\ActionTypesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\DBViews\ActionTypeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\SpoolTypesView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -403,14 +373,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EventTypesGroupsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\DBViews\EventTypesGroupView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\HardwarePidControlTypesView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -683,10 +645,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EventTypesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\LiquidTypesRmlsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -695,10 +653,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\EventTypeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\LiquidTypesRmlView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -780,7 +734,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <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/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index 409b66e12..736682e07 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -37,8 +37,6 @@ namespace Tango.MachineStudio.DB
             TangoIOC.Default.Register<CartridgeTypesViewVM>();
             TangoIOC.Default.Register<MidTankTypesViewVM>();
 
-            TangoIOC.Default.Register<EventTypesViewVM>();
-            TangoIOC.Default.Register<ActionTypesViewVM>();
 
             TangoIOC.Default.Register<ContactsViewVM>();
 
@@ -62,8 +60,6 @@ namespace Tango.MachineStudio.DB
             TangoIOC.Default.Register<HardwareDancerTypesViewVM>();
             TangoIOC.Default.Register<HardwarePidControlTypesViewVM>();
 
-            TangoIOC.Default.Register<EventTypesGroupsViewVM>();
-
             TangoIOC.Default.Register<SpoolTypesViewVM>();
         }
 
@@ -211,22 +207,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static EventTypesViewVM EventTypesViewVM
-        {
-            get
-            {
-                return TangoIOC.Default.GetInstance<EventTypesViewVM>();
-            }
-        }
-
-        public static ActionTypesViewVM ActionTypesViewVM
-        {
-            get
-            {
-                return TangoIOC.Default.GetInstance<ActionTypesViewVM>();
-            }
-        }
-
         public static ContactsViewVM ContactsViewVM
         {
             get
@@ -379,14 +359,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static EventTypesGroupsViewVM EventTypesGroupsViewVM
-        {
-            get
-            {
-                return TangoIOC.Default.GetInstance<EventTypesGroupsViewVM>();
-            }
-        }
-
         public static SpoolTypesViewVM SpoolTypesViewVM
         {
             get
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs
deleted file mode 100644
index 69092a70d..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class ActionTypesViewVM : DbTableViewModel<ActionType>
-    {
-        public ActionTypesViewVM(INotificationProvider notification) : base(notification)
-        {
-
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs
deleted file mode 100644
index abdb00e32..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class EventTypesGroupsViewVM : DbTableViewModel<EventTypesGroup>
-    {
-        public EventTypesGroupsViewVM(INotificationProvider notification) : base(notification)
-        {
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
deleted file mode 100644
index 6702b720f..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class EventTypesViewVM : DbTableViewModel<EventType>
-    {
-        public EventTypesViewVM(INotificationProvider notification) : base(notification)
-        {
-            SelectedActions = new ObservableCollection<MultiComboVM<ActionType>>();
-        }
-
-        private ObservableCollection<MultiComboVM<ActionType>> _selectedActions;
-        public ObservableCollection<MultiComboVM<ActionType>> SelectedActions
-        {
-            get { return _selectedActions; }
-            set { _selectedActions = value; RaisePropertyChangedAuto(); }
-        }
-
-        protected override void OnEdit()
-        {
-            SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM<ActionType>(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection();
-
-            foreach (var actionType in SelectedActions)
-            {
-                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionType == actionType.Entity))
-                {
-                    actionType.IsSelected = true;
-                }
-            }
-
-            base.OnEdit();
-        }
-
-        protected override void OnAdd()
-        {
-            SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM<ActionType>(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection();
-
-            base.OnAdd();
-        }
-
-        protected override void OnBeforeEntitySave(DialogOpenMode mode, EventType eventType)
-        {
-            base.OnBeforeEntitySave(mode, eventType);
-
-
-
-            Adapter.Context.EventTypesActions.RemoveRange(eventType.EventTypesActions);
-
-            foreach (var actionType in SelectedActions)
-            {
-                if (actionType.IsSelected)
-                {
-                    eventType.EventTypesActions.Add(new EventTypesAction()
-                    {
-                        ActionType = actionType.Entity,
-                        EventType = eventType,
-                        ActionTypeGuid = actionType.Entity.Guid,
-                        EventTypeGuid = eventType.Guid
-                    });
-                }
-            }
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml
deleted file mode 100644
index 11a472edb..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.ActionTypeView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels"
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:ActionTypesViewVM, IsDesignTimeCreatable=False}">
-    
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Code:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown>
-            <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
-            <TextBlock Text="Description:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Description,Mode=TwoWay}"></TextBox>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs
deleted file mode 100644
index 05a56fb89..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachineView.xaml
-    /// </summary>
-    public partial class ActionTypeView : UserControl
-    {
-        public ActionTypeView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml
deleted file mode 100644
index a9a14fb0c..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.ActionTypesView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.ActionTypesViewVM}">
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.ActionTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Code" Binding="{Binding Code}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Description" Binding="{Binding Description}"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs
deleted file mode 100644
index aad79c87a..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Tango.MachineStudio.DB.CustomAttributes;
-using Tango.MachineStudio.DB.Managers;
-using Tango.SharedUI.Controls;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachinesView.xaml
-    /// </summary>
-    [DBView]
-    public partial class ActionTypesView : UserControl
-    {
-        public ActionTypesView() : base()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml
deleted file mode 100644
index 4c1111ed7..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypeView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-
-    <UserControl.Resources>
-        <converters:EventTypeActionsToStringConverter x:Key="EventTypeActionsToStringConverter"></converters:EventTypeActionsToStringConverter>
-    </UserControl.Resources>
-
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True" IsEnabled="False"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True" IsEnabled="False"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True" IsEnabled="False"></TextBox>
-            <TextBlock Text="Code:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown>
-            <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
-            <TextBlock Text="Description:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Description,Mode=TwoWay}"></TextBox>
-            <TextBlock Text="Category:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.EventTypesCategories}" SelectedItem="{Binding EditEntity.EventTypesCategory,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-            <TextBlock Text="Group:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.EventTypesGroups}" SelectedItem="{Binding EditEntity.EventTypesGroup,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-            <TextBlock Text="Requires User Intervention:" FontWeight="Bold"></TextBlock>
-            <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding EditEntity.RequiresUserIntervention}" />
-            <TextBlock Text="Resolvable:" FontWeight="Bold"></TextBlock>
-            <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding EditEntity.Resolvable}" />
-            <TextBlock Text="HTML Page:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.HtmlPages}" SelectedItem="{Binding EditEntity.HtmlPage,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-            <TextBlock Text="Actions:" FontWeight="Bold"></TextBlock>
-            <ComboBox x:Name="comboActions" SelectionChanged="comboRoles_SelectionChanged" ItemsSource="{Binding SelectedActions}" materialDesign:HintAssist.Hint="{Binding SelectedActions,Converter={StaticResource EventTypeActionsToStringConverter},UpdateSourceTrigger=PropertyChanged}">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <CheckBox IsChecked="{Binding IsSelected}" Width="20"/>
-                            <TextBlock Text="{Binding Entity.Name}" MinWidth="100" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs
deleted file mode 100644
index 6294b14e7..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for UserView.xaml
-    /// </summary>
-    public partial class EventTypeView : UserControl
-    {
-        public EventTypeView()
-        {
-            InitializeComponent();
-        }
-
-        private void comboRoles_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            comboActions.SelectedItem = null;
-            comboActions.Text = "Press to select";
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml
deleted file mode 100644
index 8f8ec1eae..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypesGroupView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-
-
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True" IsEnabled="False"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True" IsEnabled="False"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True" IsEnabled="False"></TextBox>
-            <TextBlock Text="Code:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown>
-            <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
-            <TextBlock Text="Description:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Description,Mode=TwoWay}"></TextBox>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs
deleted file mode 100644
index e164fa171..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for UserView.xaml
-    /// </summary>
-    public partial class EventTypesGroupView : UserControl
-    {
-        public EventTypesGroupView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml
deleted file mode 100644
index e6dff7f8a..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypesGroupsView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.EventTypesGroupsViewVM}">
-
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.EventTypesGroupsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Code" Binding="{Binding Code}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Description" Binding="{Binding Description}"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs
deleted file mode 100644
index c11aeccc4..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Tango.MachineStudio.DB.CustomAttributes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for UsersView.xaml
-    /// </summary>
-    [DBView]
-    public partial class EventTypesGroupsView : UserControl
-    {
-        public EventTypesGroupsView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml
deleted file mode 100644
index 19700c976..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.EventTypesView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
-             xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.EventTypesViewVM}">
-
-    <UserControl.Resources>
-        <converters:EventTypeActionsToStringConverter x:Key="EventTypeActionsToStringConverter"></converters:EventTypeActionsToStringConverter>
-        <sharedConverters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
-    </UserControl.Resources>
-
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.EventTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Code" Binding="{Binding Code}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Description" Binding="{Binding Description}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Category" Binding="{Binding EventTypesCategory.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Group" Binding="{Binding EventTypesGroup.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Requires User Intervention" Binding="{Binding RequiresUserIntervention,Converter={StaticResource BooleanToYesNoConverter}}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Resolvable" Binding="{Binding Resolvable,Converter={StaticResource BooleanToYesNoConverter}}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="HTML Page" Binding="{Binding HtmlPageGuid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Actions" Binding="{Binding EventTypesActions,Converter={StaticResource EventTypeActionsToStringConverter}}"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs
deleted file mode 100644
index 3c197b7f2..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Tango.MachineStudio.DB.CustomAttributes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for UsersView.xaml
-    /// </summary>
-    [DBView]
-    public partial class EventTypesView : UserControl
-    {
-        public EventTypesView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
index 9876dca9e..3d282367a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs
@@ -377,7 +377,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels
             using (_notification.PushTaskItem("Starting Recording..."))
             {
                 Recorder.Start();
-                _eventLogger.Log(EventTypes.RecordingStarted, "Recording Started...");
+                _eventLogger.Log(EventTypes.RECORDING_STARTED, "Recording Started...");
                 _recordingBarItem.Push();
             }
 
@@ -393,7 +393,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels
                     await Recorder.Stop();
                     _recordingBarItem.Pop();
 
-                    _eventLogger.Log(EventTypes.RecordingStopped, "Recording Stopped...");
+                    _eventLogger.Log(EventTypes.RECORDING_STOPPED, "Recording Stopped...");
                 }
 
                 String recordingName = _notification.ShowTextInput("Enter recording name", "Recording name");
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 8b0a89336..8ac8e6acd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -738,8 +738,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             RemoveBrushStopCommand = new RelayCommand(RemoveSelectedBrushStops, () => SelectedBrushStop != null && CanWork);
             SaveJobCommand = new RelayCommand(SaveActiveJob, () => SelectedMachine != null && CanWork);
             DiscardJobCommand = new RelayCommand(BackToJobs, () => SelectedMachine != null && CanWork);
-            StartJobCommand = new RelayCommand(() => StartJob(), () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution)));
-            StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution)));
+            StartJobCommand = new RelayCommand(() => StartJob(), () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.PreventJob)));
+            StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.PreventJob)));
             StopJobCommand = new RelayCommand(StopJob, () => IsJobRunning && CanWork);
             CloseJobCompletionStatusCommand = new RelayCommand(CloseJobCompletionStatusBar);
             LoadJobCommand = new RelayCommand(() => LoadSelectedJob(), () => SelectedMachineJob != null && CanWork);
@@ -1052,7 +1052,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 _speech.SpeakError(events.Last().EventType.Name);
 
-                if (events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.AbortRunningJob)))
+                if (events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.StopJob)))
                 {
                     if (JobHandler != null)
                     {
@@ -1209,7 +1209,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         private void OnSelectedJobEventChanged()
         {
-            if (SelectedJobEvent != null && SelectedJobEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown)
+            if (SelectedJobEvent != null && SelectedJobEvent.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED && !_dialog_shown)
             {
                 _dialog_shown = true;
                 _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedJobEvent), (x) =>
@@ -1333,7 +1333,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         if (status.Message != null)
                         {
                             // TODO: Write to db when shlomo is not sending test messages anymore.
-                            _eventLogger.Log(BL.Enumerations.EventTypes.JobStatus, status.Message, false);
+                            _eventLogger.Log(BL.Enumerations.EventTypes.JOB_STATUS, status.Message, false);
                         }
                     }
                 };
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
index 1f93a96dc..c813e9752 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
@@ -140,8 +140,6 @@ namespace Tango.MachineStudio.Logging.ViewModels
                         _db = ObservablesContext.CreateDefault();
 
                         _db.EventTypes.Load();
-                        _db.EventTypesCategories.Load();
-                        _db.EventTypesGroups.Load();
 
                         DateTime now = DateTime.UtcNow.AddMonths(-1);
 
@@ -183,7 +181,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void OnSelectedEventChanged()
         {
-            if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown)
+            if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED && !_dialog_shown)
             {
                 _dialog_shown = true;
                 _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedEvent), (x) =>
@@ -198,7 +196,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void DisplayTimeline(MachinesEvent ev)
         {
-            var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.ApplicationStarted).ToObservableCollection();
+            var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED).ToObservableCollection();
             events.Insert(0, ev);
 
             TimelineViewVM.Initialize(events.ToList());
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
index c75ef41ee..2dda7d342 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
@@ -73,9 +73,9 @@
 
                         <controls:TableGrid RowHeight="30">
                             <TextBlock Text="Category:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Event.EventType.EventTypesCategory.Name}"></TextBlock>
+                            <TextBlock Text="{Binding Event.EventType.Category}"></TextBlock>
                             <TextBlock Text="Group:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Event.EventType.EventTypesGroup.Name}"></TextBlock>
+                            <TextBlock Text="{Binding Event.EventType.Group}"></TextBlock>
                         </controls:TableGrid>
                     </UniformGrid>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
index 196b6f930..846ea1fe2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
@@ -136,7 +136,7 @@
                                                 <Trigger Property="IsFocused" Value="True">
                                                     <Setter Property="Background" Value="Transparent"></Setter>
                                                 </Trigger>
-                                                <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted">
+                                                <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED">
                                                     <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter>
                                                     <Setter Property="Foreground" Value="White" />
                                                     <Setter Property="FontWeight" Value="SemiBold"></Setter>
@@ -154,7 +154,7 @@
                                                 <Trigger Property="IsSelected" Value="True">
                                                     <Setter Property="Background" Value="Transparent"></Setter>
                                                 </Trigger>
-                                                <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted">
+                                                <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED">
                                                     <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter>
                                                     <Setter Property="Foreground" Value="White" />
                                                     <Setter Property="FontWeight" Value="SemiBold"></Setter>
@@ -188,7 +188,7 @@
                                                                         <Setter Property="Kind" Value="BellPlus"></Setter>
                                                                         <Setter Property="Foreground" Value="Red"></Setter>
                                                                     </DataTrigger>
-                                                                    <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted">
+                                                                    <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED">
                                                                         <Setter Property="Kind" Value="ClockFast"></Setter>
                                                                         <Setter Property="Foreground" Value="White"></Setter>
                                                                     </DataTrigger>
@@ -202,7 +202,7 @@
                                         <DataGridTextColumn Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" />
                                         <DataGridTextColumn Header="HOST" Binding="{Binding HostName}" />
                                         <DataGridTextColumn Header="USER" Binding="{Binding User.Contact.FullName,Mode=OneTime}" />
-                                        <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.EventTypesGroup.Name}" />
+                                        <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" />
                                         <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" />
                                         <DataGridTemplateColumn Header="MESSAGE" Width="1*">
                                             <DataGridTemplateColumn.CellTemplate>
@@ -219,7 +219,7 @@
                                                             <Style TargetType="ContentControl">
                                                                 <Setter Property="ContentTemplate" Value="{x:Null}"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted">
+                                                                    <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED">
                                                                         <Setter Property="ContentTemplate">
                                                                             <Setter.Value>
                                                                                 <DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
index e634de824..8347c3144 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
@@ -82,10 +82,6 @@ namespace Tango.MachineStudio.Common.EventLogging
                 {
                     _db = ObservablesContext.CreateDefault();
 
-                    _db.ActionTypes.ToList();
-                    _db.EventTypesActions.ToList();
-                    _db.EventTypesCategories.ToList();
-                    _db.EventTypesGroups.ToList();
                     _db.EventTypes.ToList();
 
                     foreach (var type in _db.EventTypes)
@@ -140,7 +136,7 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="message">The message.</param>
         private void Machine_RequestSent(object sender, IMessage message)
         {
-            Log(EventTypes.RequestSent, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString()));
+            Log(EventTypes.REQUEST_SENT, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString()));
         }
 
         /// <summary>
@@ -150,7 +146,7 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="e">The <see cref="RequestFailedEventArgs"/> instance containing the event data.</param>
         private void Machine_RequestFailed(object sender, RequestFailedEventArgs e)
         {
-            Log(EventTypes.RequestFailed, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString()));
+            Log(EventTypes.REQUEST_FAILED, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString()));
         }
 
         /// <summary>
@@ -160,7 +156,7 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="message">The message.</param>
         private void Machine_ResponseReceived(object sender, IMessage message)
         {
-            Log(EventTypes.ResponseReceived, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString()));
+            Log(EventTypes.RESPONSE_RECEIVED, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString()));
         }
 
         /// <summary>
@@ -271,7 +267,7 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="exception">The exception.</param>
         public void Log(Exception exception)
         {
-            Log(EventTypes.ApplicationException, exception.ToString());
+            Log(EventTypes.APPLICATION_EXCEPTION, exception.ToString());
         }
 
         /// <summary>
@@ -281,7 +277,7 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="description"></param>
         public void Log(Exception exception, string description)
         {
-            Log(EventTypes.ApplicationException, description + Environment.NewLine + exception.ToString());
+            Log(EventTypes.APPLICATION_EXCEPTION, description + Environment.NewLine + exception.ToString());
         }
 
         /// <summary>
@@ -290,7 +286,7 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="message">The message.</param>
         public void Log(String message)
         {
-            Log(EventTypes.ApplicationInformation, message);
+            Log(EventTypes.APPLICATION_INFORMATION, message);
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Html/IHtmlPresenter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Html/IHtmlPresenter.cs
deleted file mode 100644
index 549022050..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Html/IHtmlPresenter.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-
-namespace Tango.MachineStudio.Common.Html
-{
-    public interface IHtmlPresenter
-    {
-        bool DisplayHtml(HtmlPage html);
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 704223d17..2d83fdec4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -101,7 +101,6 @@
     <Compile Include="ExtensionMethods\CommonDialogExtensions.cs" />
     <Compile Include="ExtensionMethods\TangoIOCExtensions.cs" />
     <Compile Include="FirmwareUpgrade\IFirmwareUpgrader.cs" />
-    <Compile Include="Html\IHtmlPresenter.cs" />
     <None Include="Helpers\GraphsHelper.cs" />
     <Compile Include="IStudioViewModel.cs" />
     <Compile Include="MachineStudioSettings.cs" />
@@ -312,7 +311,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/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs
deleted file mode 100644
index eff8c98a0..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Html;
-using Tango.MachineStudio.UI.Windows;
-
-namespace Tango.MachineStudio.UI.Html
-{
-    public class DefaultHtmlPresenter : IHtmlPresenter
-    {
-        public bool DisplayHtml(HtmlPage html)
-        {
-            HtmlWindow dialog = new HtmlWindow(html);
-            dialog.Owner = Application.Current.MainWindow;
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
-            var result = dialog.ShowDialog();
-            MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
-            return result.Value;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html
deleted file mode 100644
index 5c620fc83..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <style>
-        html {
-            overflow: hidden;
-            padding: 0;
-            margin: 0;
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-        }
-
-        body {
-            padding: 0;
-            margin: 0;
-            /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#eeeeee+0,eeeeee+100;Grey+Flat */
-            background: rgb(238,238,238); /* Old browsers */
-            background: -moz-linear-gradient(top, rgba(238,238,238,1) 0%, rgba(238,238,238,1) 100%); /* FF3.6-15 */
-            background: -webkit-linear-gradient(top, rgba(238,238,238,1) 0%,rgba(238,238,238,1) 100%); /* Chrome10-25,Safari5.1-6 */
-            background: linear-gradient(to bottom, rgba(238,238,238,1) 0%,rgba(238,238,238,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
-            filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
-        }
-
-        .header {
-            font-size: 25pt;
-            background: #414141;
-            color: white;
-            padding: 15px;
-        }
-
-        li {
-            margin:30px 10px;
-            padding:10px;
-            background:#C3C3C3;
-            max-width:500px;
-            border-radius:5px;
-        }
-    </style>
-</head>
-<body>
-    <div class="header">Thread Break</div>
-    <ol>
-        <li>Open the cover.</li>
-        <li>Connect the broken thread.</li>
-        <li>Close the cover.</li>
-        <li>Press 'OK' when done.</li>
-    </ol>
-</body>
-</html>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml
deleted file mode 100644
index f984a985f..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Window x:Class="Tango.MachineStudio.UI.Html.HtmlWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Tango.MachineStudio.UI.Windows"
-        mc:Ignorable="d"
-        Title="Machine Studio" Height="500" Width="800" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" Background="Transparent">
-    <Grid>
-        <Grid>
-            <Border Background="White"  BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}">
-                <Border.Effect>
-                    <DropShadowEffect ShadowDepth="0" BlurRadius="10"></DropShadowEffect>
-                </Border.Effect>
-
-                <Grid>
-                    <DockPanel>
-                        <Grid DockPanel.Dock="Bottom">
-                            <Button Margin="10" Width="140" HorizontalAlignment="Right" Click="OKClicked">RESOLVE</Button>
-                        </Grid>
-                        <WebBrowser x:Name="webBrowser"   
-                                    OverridesDefaultStyle="False"
-                                    ScrollViewer.CanContentScroll="False"
-                                    ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
-                                    ScrollViewer.VerticalScrollBarVisibility="Hidden"></WebBrowser>
-                    </DockPanel>
-
-                    <Button Click="CloseClicked" HorizontalAlignment="Right" VerticalAlignment="Top" Width="20" Height="20" Margin="0 -6 -4 0" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="Black">
-                        <materialDesign:PackIcon Kind="Close" Width="16" Height="16"></materialDesign:PackIcon>
-                    </Button>
-                </Grid>
-            </Border>
-        </Grid>
-    </Grid>
-</Window>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs
deleted file mode 100644
index 9f37eba06..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using MahApps.Metro.Controls;
-using MaterialDesignThemes.Wpf;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using Tango.BL.Entities;
-using Tango.Core.Commands;
-
-namespace Tango.MachineStudio.UI.Html
-{
-    /// <summary>
-    /// Interaction logic for DialogWindow.xaml
-    /// </summary>
-    public partial class HtmlWindow : Window
-    {
-        public HtmlWindow(HtmlPage html)
-        {
-            InitializeComponent();
-
-            webBrowser.Loaded += (_, __) => 
-            {
-                webBrowser.NavigateToString(html.Html);
-            };
-        }
-
-        private void OKClicked(object sender, RoutedEventArgs e)
-        {
-            DialogResult = true;
-            Close();
-        }
-
-        private void CloseClicked(object sender, RoutedEventArgs e)
-        {
-            DialogResult = false;
-            Close();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index baa550017..1612eb36c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -265,7 +265,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     var eventLogger = TangoIOC.Default.GetInstance<IEventLogger>();
                     if (eventLogger != null)
                     {
-                        eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!");
+                        eventLogger.Log(EventTypes.APPLICATION_TERMINATED, "Application Terminated!");
                         eventLogger.FlushAll();
                     }
 
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 fb84d64bd..706b1c8f7 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
@@ -144,10 +144,6 @@
     </Compile>
     <Compile Include="Console\ConsoleWindowVM.cs" />
     <Compile Include="FirmwareUpgrade\DefaultFirmwareUpgrader.cs" />
-    <Compile Include="Html\DefaultHtmlPresenter.cs" />
-    <Compile Include="Html\HtmlWindow.xaml.cs">
-      <DependentUpon>HtmlWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Messages\ForcedUpdateMessage.cs" />
     <Compile Include="Modules\DefaultStudioModuleLoader.cs" />
     <Compile Include="Notifications\TextInputBoxWindow.xaml.cs">
@@ -243,10 +239,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Html\HtmlWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -536,7 +528,6 @@
       <Link>Tango.Embroidery.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Html\HTML Templates\Thread Break.html" />
     <Resource Include="machine.ico" />
     <Resource Include="Images\bug-resolved.png" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -618,7 +609,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 3c548855d..b0a3a8c11 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -7,7 +7,6 @@ using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.MachineStudio.Common.FirmwareUpgrade;
-using Tango.MachineStudio.Common.Html;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
@@ -18,7 +17,6 @@ using Tango.MachineStudio.Common.Video;
 using Tango.MachineStudio.UI.Authentication;
 using Tango.MachineStudio.UI.Console;
 using Tango.MachineStudio.UI.FirmwareUpgrade;
-using Tango.MachineStudio.UI.Html;
 using Tango.MachineStudio.UI.Modules;
 using Tango.MachineStudio.UI.Navigation;
 using Tango.MachineStudio.UI.Notifications;
@@ -67,7 +65,6 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Unregister<IDiagnosticsFrameProvider>();
             TangoIOC.Default.Unregister<IEventLogger>();
             TangoIOC.Default.Unregister<ISpeechProvider>();
-            TangoIOC.Default.Unregister<IHtmlPresenter>();
             TangoIOC.Default.Unregister<ITeamFoundationServiceClient>();
             TangoIOC.Default.Unregister<IDispatcherProvider>();
             TangoIOC.Default.Unregister<IFirmwareUpgrader>();
@@ -84,7 +81,6 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
             TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();
             TangoIOC.Default.Register<ISpeechProvider, DefaultSpeechProvider>();
-            TangoIOC.Default.Register<IHtmlPresenter, DefaultHtmlPresenter>();
             TangoIOC.Default.Register<IFirmwareUpgrader, DefaultFirmwareUpgrader>();
             TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa"));
             
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index 492e23963..4ebf3d96d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -141,7 +141,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                         _authenticationProvider.Login(Email, Password);
 
-                        _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
+                        _eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!");
 
                         _navigationManager.NavigateTo(NavigationView.MainView);
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index e3a8b4e7c..c13c7379a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -20,7 +20,6 @@ using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.EventLogging;
-using Tango.MachineStudio.Common.Html;
 using Tango.MachineStudio.Common.Messages;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
@@ -54,7 +53,6 @@ namespace Tango.MachineStudio.UI.ViewModels
         private bool _isDisconnecting;
         private Thread _updateCheckThread;
         private IEventLogger _eventLogger;
-        private IHtmlPresenter _htmlPresenter;
         private MachineStudioSettings _settings;
 
         /// <summary>
@@ -282,7 +280,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             IEventLogger eventLogger,
             IDiagnosticsFrameProvider frameProvider,
             ISpeechProvider speechProvider,
-            IHtmlPresenter htmlPresenter, TeamFoundationServiceExtendedClient tfs) : base()
+            TeamFoundationServiceExtendedClient tfs) : base()
         {
             TFSClient = tfs;
             _eventLogger = eventLogger;
@@ -293,7 +291,6 @@ namespace Tango.MachineStudio.UI.ViewModels
             ApplicationManager = applicationManager;
             DiagnosticsFrameProvider = frameProvider;
             SpeechProvider = speechProvider;
-            _htmlPresenter = htmlPresenter;
 
             _settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
@@ -782,21 +779,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <param name="machineEvent">The HTML page.</param>
         private async void ResolveMachineEvent(MachinesEvent machineEvent)
         {
-            if (machineEvent.EventType.HtmlPage != null)
-            {
-                if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage))
-                {
-                    if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable)
-                    {
-                        _eventLogger.Log(String.Format("Event '{0}' resolved by user.", machineEvent.EventType.Name));
-                        await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type);
-                    }
-                }
-            }
-            else
-            {
-                _notificationProvider.ShowWarning("Could not locate guidance content for the specified event.");
-            }
+
         }
 
         /// <summary>