Twine Studio

20 files changed, 258 insertions, 184 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj
index 7e1a0c249..dfe7cc101 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj
@@ -45,8 +45,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj
index 73039f2ca..4e4aa75ae 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj
@@ -45,8 +45,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj
index a53040398..c2dfeb2a6 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj
@@ -47,8 +47,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj
index e4a0c9e61..51e9dc119 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj
index e4a83be19..cbf76444d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj
@@ -45,8 +45,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml
index c1de5f498..919d47132 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml
@@ -29,13 +29,14 @@
                         </Style.Triggers>
                     </Style>
                 </Grid.Style>
+                
                 <commonControls:FSETabControl TabsWidth="1000" x:Name="tabs" SelectedObject="{Binding SelectedView,Mode=TwoWay}">
                     <local:MonitoringView Tag="MONITORING" />
                     <local:RemoteDesktopView Tag="REMOTE DESKTOP" />
-                    <local:ConsoleView Tag="CONSOLE" />
-                    <local:FileSystemView Tag="FILE SYSTEM" />
+                    <local:ConsoleView Tag="CONSOLE" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineStudio}" />
+                    <local:FileSystemView Tag="FILE SYSTEM" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineStudio}" />
                     <local:UpdatesView Tag="UPDATES" />
-                    <local:LogsView Tag="LOGS" />
+                    <local:LogsView Tag="LOGS" commonControls:FSETabControl.Hidden="{Binding BuildProvider.IsTwineStudio}" />
                 </commonControls:FSETabControl>
 
                 <TextBlock resolution:ResolutionHelper.MinWidth="1500" Margin="10 0 0 0" FontFamily="{StaticResource hand}" FontSize="{StaticResource FSE_ModuleHeaderFontSize}" Foreground="{StaticResource FSE_PrimaryAccentDarkBrush}" VerticalAlignment="Top" HorizontalAlignment="Left" Text="{Binding ElementName=tabs,Path=SelectedElement.Tag,Converter={StaticResource StringToTitleCaseConverter}}"></TextBlock>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
index 612cebef9..0f1ffda6d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj
@@ -48,8 +48,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj
index fa891ad24..7d38491cb 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj
@@ -45,8 +45,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj
index 0afd544f5..20e2b1fe1 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj
@@ -44,8 +44,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
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 e4b423c89..82fad45e2 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
@@ -42,8 +42,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs
index e97ce9c6a..ee99f24d1 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs
@@ -16,5 +16,6 @@ namespace Tango.FSE.Common.Build
     {
         BuildVariants CurrentBuild { get; }
         String BuildName { get; }
+        bool IsTwineStudio { get; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/FSETabControl.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/FSETabControl.cs
index 44cfd4872..7f73eb607 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/FSETabControl.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/FSETabControl.cs
@@ -95,6 +95,7 @@ namespace Tango.FSE.Common.Controls
                 SelectedElement = e;
             };
 
+            Elements = Elements.Where(x => !GetHidden(x)).ToObservableCollection();
             _navigationControl.Elements = Elements;
         }
 
@@ -102,5 +103,41 @@ namespace Tango.FSE.Common.Controls
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(FSETabControl), new FrameworkPropertyMetadata(typeof(FSETabControl)));
         }
+
+        #region Attached Properties
+
+        #region Hidden
+
+        /// <summary>
+        /// Determines the element navigation name.
+        /// </summary>
+        public static readonly DependencyProperty Hidden =
+            DependencyProperty.RegisterAttached("Hidden",
+            typeof(bool), typeof(FSETabControl),
+            new FrameworkPropertyMetadata(false));
+
+        /// <summary>
+        /// Sets the name of the navigation.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <param name="value">The value.</param>
+        public static void SetHidden(FrameworkElement element, bool value)
+        {
+            element.SetValue(Hidden, value);
+        }
+
+        /// <summary>
+        /// Gets the name of the navigation.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <returns></returns>
+        public static bool GetHidden(FrameworkElement element)
+        {
+            return (bool)element.GetValue(Hidden);
+        }
+
+        #endregion
+
+        #endregion
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
index aed04a956..98652de6b 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
@@ -51,9 +51,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DocumentationFile>..\..\Build\Twine Studio\Debug\Tango.FSE.Common.xml</DocumentationFile>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <NoWarn>1591</NoWarn>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
index 9fc31e1b4..401c2ab71 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs
@@ -12,6 +12,11 @@ namespace Tango.FSE.UI.Build
         public BuildVariants CurrentBuild { get; private set; }
         public string BuildName { get; private set; }
 
+        public bool IsTwineStudio
+        {
+            get { return CurrentBuild == BuildVariants.TwineStudio; }
+        }
+
         public DefaultBuildProvider()
         {
             BuildName = "Tango FSE";
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
index 5a4d8c5eb..98a250875 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
@@ -47,7 +47,7 @@
                             </ListBox>
                         </DockPanel>
                     </Grid>
-                    <Grid Margin="0 10 0 0" Grid.Row="1">
+                    <Grid Margin="0 10 0 0" Grid.Row="1" Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <DockPanel>
                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines on the local serial ports..."></TextBlock>
                             <ProgressBar DockPanel.Dock="Top" Height="2" IsIndeterminate="True" Margin="0 3 0 0" />
@@ -70,9 +70,20 @@
                             </ListBox>
                         </DockPanel>
                     </Grid>
-                    <GridSplitter HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="2" />
-                    <Grid Grid.Row="3">
-                        <DockPanel>
+                    <GridSplitter Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="2" />
+                    <Grid>
+                        <Grid.Style>
+                            <Style TargetType="Grid">
+                                <Setter Property="Grid.Row" Value="3"></Setter>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding BuildProvider.IsTwineStudio}" Value="True">
+                                        <Setter Property="Grid.Row" Value="1"></Setter>
+                                        <Setter Property="Grid.RowSpan" Value="5"></Setter>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Grid.Style>
+                            <DockPanel>
                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines on your local network..."></TextBlock>
                             <ProgressBar DockPanel.Dock="Top" Height="2" IsIndeterminate="True" Margin="0 3 0 0" />
                             <ListBox x:Name="listWifi" ItemsSource="{Binding TcpMachines}" SelectedItem="{Binding SelectedMachine,Mode=OneWay}" PreviewMouseDoubleClick="ListBox_PreviewMouseDoubleClick">
@@ -97,8 +108,8 @@
                             </ListBox>
                         </DockPanel>
                     </Grid>
-                    <GridSplitter HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="4" />
-                    <Grid Grid.Row="5">
+                    <GridSplitter Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Grid.Row="4" />
+                    <Grid Grid.Row="5" Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <DockPanel>
                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines across the internet..."></TextBlock>
                             <ProgressBar DockPanel.Dock="Top" Height="2" IsIndeterminate="True" Margin="0 3 0 0" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs
index 94b20010e..b48b6254d 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs
@@ -187,7 +187,7 @@ namespace Tango.FSE.UI.Panes
                 }
                 catch { }
 
-                if (machine is ExternalBridgeUsbClient)
+                if (machine is ExternalBridgeUsbClient && !BuildProvider.IsTwineStudio)
                 {
                     if (insert)
                     {
@@ -198,7 +198,7 @@ namespace Tango.FSE.UI.Panes
                         UsbMachines.Add(machine as ExternalBridgeUsbClient);
                     }
                 }
-                else if (machine is ExternalBridgeSignalRClient)
+                else if (machine is ExternalBridgeSignalRClient && !BuildProvider.IsTwineStudio)
                 {
                     if (!CurrentUser.PreventRemoteMachineAccess)
                     {
@@ -295,7 +295,7 @@ namespace Tango.FSE.UI.Panes
 
             TryAutoSelectMachine();
 
-            _scanner.SignalRConfiguration.Enabled = Settings.EnableExternalBridgeSignalR;
+            _scanner.SignalRConfiguration.Enabled = Settings.EnableExternalBridgeSignalR && !BuildProvider.IsTwineStudio;
             if (ApplicationManager.IsWebDebugMode)
             {
                 LogManager.Log($"Application is in web debug mode. Scanning for SignalR machine on address '{WEB_DEBUG_ADDRESS}'...");
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat b/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat
index 45cf988ef..dcfbcf208 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat
@@ -15,18 +15,35 @@ RD /S /Q "Roslyn\"
 
 del WebRtc.NET.pdb
 
-rem Twine Studio
+rem -------------------- Twine Studio -----------------------------------
 
 del "Tango.Twine Studio.UI.exe"
 del "Tango.Twine Studio.UI.exe.config"
 del "Tango.Twine Studio.UI.pdb"
 
 if %1==TS (
+	goto TwineStudioRelease
+	goto TwineStudio
+)
 
-echo Modifying Assembly to "Twine Studio"
+if %1==TS_Debug (
+	goto TwineStudio
+)
 
+:TwineStudioRelease
 ren "Tango.FSE.UI.exe" "Tango.Twine Studio.UI.exe"
 ren "Tango.FSE.UI.exe.config" "Tango.Twine Studio.UI.exe.config"
 ren "Tango.FSE.UI.pdb" "Tango.Twine Studio.UI.pdb"
 
-)
\ No newline at end of file
+
+:TwineStudio
+echo Modifying Assembly to "Twine Studio"
+
+rem Exclude Modules
+del Tango.FSE.Diagnostics.*
+del Tango.FSE.Firmware.*
+del Tango.FSE.Insights.*
+del Tango.FSE.MachineConfiguration.*
+del Tango.FSE.Procedures.*
+del Tango.FSE.Upgrade.*
+del Tango.FSE.UsersAndRoles.*
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
index 59b3d2f2c..fbacf3920 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
@@ -53,8 +53,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>TRACE;TS</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>TRACE;DEBUG;TS</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
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 930087c5d..9a6a33363 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
@@ -60,39 +60,39 @@
                                                 <GradientStop Offset="1" Color="#A32323" />
                                             </RadialGradientBrush>
                                         </StackPanel.Resources>
-                                            <Grid Width="14" Height="14" ToolTip="Communication Out" ToolTipService.Placement="Top">
-                                                <Ellipse Stroke="#353535" Fill="{StaticResource FSE_LED_GrayBrush}" />
-                                                <Ellipse Stroke="#353535">
-                                                    <Ellipse.Style>
-                                                        <Style TargetType="Ellipse">
-                                                            <Setter Property="Opacity" Value="0"></Setter>
-                                                            <Setter Property="Fill" Value="{StaticResource FSE_LED_RedBrush}"></Setter>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding TransportOut}" Value="True">
-                                                                    <Setter Property="Opacity" Value="1"></Setter>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Ellipse.Style>
-                                                </Ellipse>
-                                            </Grid>
+                                        <Grid Width="14" Height="14" ToolTip="Communication Out" ToolTipService.Placement="Top">
+                                            <Ellipse Stroke="#353535" Fill="{StaticResource FSE_LED_GrayBrush}" />
+                                            <Ellipse Stroke="#353535">
+                                                <Ellipse.Style>
+                                                    <Style TargetType="Ellipse">
+                                                        <Setter Property="Opacity" Value="0"></Setter>
+                                                        <Setter Property="Fill" Value="{StaticResource FSE_LED_RedBrush}"></Setter>
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding TransportOut}" Value="True">
+                                                                <Setter Property="Opacity" Value="1"></Setter>
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Ellipse.Style>
+                                            </Ellipse>
+                                        </Grid>
 
                                         <Grid Margin="5 0 0 0" Width="14" Height="14" ToolTip="Communication In" ToolTipService.Placement="Top">
-                                                <Ellipse Stroke="#353535" Fill="{StaticResource FSE_LED_GrayBrush}" />
-                                                <Ellipse Stroke="#353535">
-                                                    <Ellipse.Style>
-                                                        <Style TargetType="Ellipse">
-                                                            <Setter Property="Opacity" Value="0"></Setter>
-                                                            <Setter Property="Fill" Value="{StaticResource FSE_LED_GreenBrush}"></Setter>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding TransportIn}" Value="True">
-                                                                    <Setter Property="Opacity" Value="1"></Setter>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Ellipse.Style>
-                                                </Ellipse>
-                                            </Grid>
+                                            <Ellipse Stroke="#353535" Fill="{StaticResource FSE_LED_GrayBrush}" />
+                                            <Ellipse Stroke="#353535">
+                                                <Ellipse.Style>
+                                                    <Style TargetType="Ellipse">
+                                                        <Setter Property="Opacity" Value="0"></Setter>
+                                                        <Setter Property="Fill" Value="{StaticResource FSE_LED_GreenBrush}"></Setter>
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding TransportIn}" Value="True">
+                                                                <Setter Property="Opacity" Value="1"></Setter>
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Ellipse.Style>
+                                            </Ellipse>
+                                        </Grid>
 
                                         <Rectangle Margin="10 6" Stroke="{StaticResource FSE_BorderBrush}" />
 
@@ -128,26 +128,28 @@
                                     </StackPanel>
 
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 5 0">
-                                        <commonControls:IconButton Command="{Binding ReportIssueCommand}" ToolTip="Report Issue" ToolTipService.Placement="Top" Icon="Bugfood" Foreground="{StaticResource FSE_ErrorBrush}" Height="26" Cursor="Hand" Margin="0 -2 0 0" VerticalAlignment="Center"></commonControls:IconButton>
-                                        <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=logsPane,Path=(win:WindowsManagerHelper.IsDetached),Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                            <Rectangle Width="1" HorizontalAlignment="Center" Stroke="{StaticResource FSE_BorderBrush}" Margin="10 4"></Rectangle>
-                                            <commonControls:ToggleIconButton x:Name="chkLogsViewer" Cursor="Hand" FontSize="{StaticResource FSE_SmallerFontSize}" Margin="5 0 0 0" UncheckedText="Open Log Viewer" CheckedText="Close Log Viewer" TextAlignment="Left" Height="24" Width="Auto" Checked="OnLogsChecked" Unchecked="OnLogsUnChecked" VerticalAlignment="Center" IsChecked="{Binding IsLogsOpened}" CheckedIcon="ChevronDoubleDown" UncheckedIcon="ChevronDoubleUp" />
-                                        </StackPanel>
+                                        <commonControls:IconButton Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}" Command="{Binding ReportIssueCommand}" ToolTip="Report Issue" ToolTipService.Placement="Top" Icon="Bugfood" Foreground="{StaticResource FSE_ErrorBrush}" Height="26" Cursor="Hand" Margin="0 -2 0 0" VerticalAlignment="Center"></commonControls:IconButton>
+                                        <Grid Visibility="{Binding BuildProvider.IsTwineStudio,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                            <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=logsPane,Path=(win:WindowsManagerHelper.IsDetached),Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                <Rectangle Width="1" HorizontalAlignment="Center" Stroke="{StaticResource FSE_BorderBrush}" Margin="10 4"></Rectangle>
+                                                <commonControls:ToggleIconButton x:Name="chkLogsViewer" Cursor="Hand" FontSize="{StaticResource FSE_SmallerFontSize}" Margin="5 0 0 0" UncheckedText="Open Log Viewer" CheckedText="Close Log Viewer" TextAlignment="Left" Height="24" Width="Auto" Checked="OnLogsChecked" Unchecked="OnLogsUnChecked" VerticalAlignment="Center" IsChecked="{Binding IsLogsOpened}" CheckedIcon="ChevronDoubleDown" UncheckedIcon="ChevronDoubleUp" />
+                                            </StackPanel>
+                                        </Grid>
                                         <StackPanel Orientation="Horizontal" Visibility="{Binding NotificationProvider.HasSnackbarItems,Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <Rectangle Width="1" HorizontalAlignment="Center" Stroke="{StaticResource FSE_BorderBrush}" Margin="10 4"></Rectangle>
                                             <Grid Margin="5 2 0 0" Width="30">
                                                 <material:PackIcon Kind="Email" Width="20" Height="20" HorizontalAlignment="Left" VerticalAlignment="Top" />
 
                                                 <Grid Width="16" Height="16" Margin="0 0 3 3" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-                                                <Ellipse StrokeThickness="1" Stroke="{StaticResource FSE_PrimaryForegroundBrush}">
-                                                    <Ellipse.Fill>
-                                                        <LinearGradientBrush>
-                                                            <GradientStop Offset="0" Color="{StaticResource FSE_PrimaryBackgroundDarkColor}" />
-                                                            <GradientStop Offset="1" Color="{StaticResource FSE_PrimaryBackgroundLightColor}" />
-                                                        </LinearGradientBrush>
-                                                    </Ellipse.Fill>
-                                                </Ellipse>
-                                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding NotificationProvider.SnackbarItems.Count}" FontSize="8" />
+                                                    <Ellipse StrokeThickness="1" Stroke="{StaticResource FSE_PrimaryForegroundBrush}">
+                                                        <Ellipse.Fill>
+                                                            <LinearGradientBrush>
+                                                                <GradientStop Offset="0" Color="{StaticResource FSE_PrimaryBackgroundDarkColor}" />
+                                                                <GradientStop Offset="1" Color="{StaticResource FSE_PrimaryBackgroundLightColor}" />
+                                                            </LinearGradientBrush>
+                                                        </Ellipse.Fill>
+                                                    </Ellipse>
+                                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding NotificationProvider.SnackbarItems.Count}" FontSize="8" />
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
@@ -319,98 +321,98 @@
                                 </Grid>
                             </Grid>
                             <Grid>
-                            <Button Margin="0 15 80 15" material:ButtonAssist.CornerRadius="15" IsEnabled="{Binding MachineProvider.IsBusy,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" Command="{Binding ToggleConnectionPaneCommand}" Style="{StaticResource FSE_RaisedButton_Dark_Hover}" VerticalAlignment="Center">
-                                <StackPanel Orientation="Horizontal">
-                                    <Grid>
-                                        <Image Source="{StaticResource FSE_Machine_Small}" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <Ellipse Width="14" Height="14" Visibility="{Binding MachineProvider.IsConnected,Converter={StaticResource BooleanToVisibilityConverter}}" Stroke="#3A6A2D" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -4 -4 0" >
-                                            <Ellipse.Fill>
-                                                <RadialGradientBrush>
-                                                    <GradientStop Color="#26A326" Offset="1" />
-                                                    <GradientStop Color="#65E932" Offset="0" />
-                                                </RadialGradientBrush>
-                                            </Ellipse.Fill>
-                                            <Ellipse.Style>
-                                                <Style TargetType="Ellipse">
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding MachineProvider.IsConnected}" Value="True">
-                                                            <DataTrigger.EnterActions>
-                                                                <BeginStoryboard Name="blink">
-                                                                    <Storyboard>
-                                                                        <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="Opacity" FillBehavior="Stop">
-                                                                            <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="0" />
-                                                                            <DiscreteDoubleKeyFrame KeyTime="00:00:0.5" Value="1" />
-                                                                            <DiscreteDoubleKeyFrame KeyTime="00:00:1" Value="1" />
-                                                                        </DoubleAnimationUsingKeyFrames>
-                                                                    </Storyboard>
-                                                                </BeginStoryboard>
-                                                            </DataTrigger.EnterActions>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Ellipse.Style>
-                                        </Ellipse>
-                                    </Grid>
-                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Machine Connection</TextBlock>
-                                </StackPanel>
-                            </Button>
+                                <Button Margin="0 15 80 15" material:ButtonAssist.CornerRadius="15" IsEnabled="{Binding MachineProvider.IsBusy,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" Command="{Binding ToggleConnectionPaneCommand}" Style="{StaticResource FSE_RaisedButton_Dark_Hover}" VerticalAlignment="Center">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Grid>
+                                            <Image Source="{StaticResource FSE_Machine_Small}" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <Ellipse Width="14" Height="14" Visibility="{Binding MachineProvider.IsConnected,Converter={StaticResource BooleanToVisibilityConverter}}" Stroke="#3A6A2D" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -4 -4 0" >
+                                                <Ellipse.Fill>
+                                                    <RadialGradientBrush>
+                                                        <GradientStop Color="#26A326" Offset="1" />
+                                                        <GradientStop Color="#65E932" Offset="0" />
+                                                    </RadialGradientBrush>
+                                                </Ellipse.Fill>
+                                                <Ellipse.Style>
+                                                    <Style TargetType="Ellipse">
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding MachineProvider.IsConnected}" Value="True">
+                                                                <DataTrigger.EnterActions>
+                                                                    <BeginStoryboard Name="blink">
+                                                                        <Storyboard>
+                                                                            <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="Opacity" FillBehavior="Stop">
+                                                                                <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="0" />
+                                                                                <DiscreteDoubleKeyFrame KeyTime="00:00:0.5" Value="1" />
+                                                                                <DiscreteDoubleKeyFrame KeyTime="00:00:1" Value="1" />
+                                                                            </DoubleAnimationUsingKeyFrames>
+                                                                        </Storyboard>
+                                                                    </BeginStoryboard>
+                                                                </DataTrigger.EnterActions>
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Ellipse.Style>
+                                            </Ellipse>
+                                        </Grid>
+                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center">Machine Connection</TextBlock>
+                                    </StackPanel>
+                                </Button>
 
-                            <Grid HorizontalAlignment="Right" Margin="0 0 25 0" ToolTip="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}">
-                                <Ellipse Width="42" Height="42" Stroke="{StaticResource FSE_PrimaryBackgroundLightBrush}" StrokeThickness="4">
-                                    <Ellipse.Style>
-                                        <Style TargetType="Ellipse">
-                                            <Setter Property="Fill" Value="{StaticResource FSE_PrimaryBackgroundLighterBrush}"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding MachineProvider.IsConnected}" Value="True">
-                                                    <Setter Property="Fill" Value="White"></Setter>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Ellipse.Style>
-                                </Ellipse>
-                                <Image Stretch="Fill" Margin="0 2 0 0" RenderOptions.BitmapScalingMode="Fant" Width="32" Height="32" VerticalAlignment="Center" Visibility="{Binding MachineProvider.IsConnected,Converter={StaticResource BooleanToVisibilityConverter}}"
+                                <Grid HorizontalAlignment="Right" Margin="0 0 25 0" ToolTip="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}">
+                                    <Ellipse Width="42" Height="42" Stroke="{StaticResource FSE_PrimaryBackgroundLightBrush}" StrokeThickness="4">
+                                        <Ellipse.Style>
+                                            <Style TargetType="Ellipse">
+                                                <Setter Property="Fill" Value="{StaticResource FSE_PrimaryBackgroundLighterBrush}"></Setter>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding MachineProvider.IsConnected}" Value="True">
+                                                        <Setter Property="Fill" Value="White"></Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </Ellipse.Style>
+                                    </Ellipse>
+                                    <Image Stretch="Fill" Margin="0 2 0 0" RenderOptions.BitmapScalingMode="Fant" Width="32" Height="32" VerticalAlignment="Center" Visibility="{Binding MachineProvider.IsConnected,Converter={StaticResource BooleanToVisibilityConverter}}"
                                             gif:ImageBehavior.EnableAnimation="True"
                                             gif:ImageBehavior.SpeedRatio="1">
-                                    <Image.Style>
-                                        <Style TargetType="Image">
-                                            <Setter Property="gif:ImageBehavior.AnimatedSource" Value="{x:Null}"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Disconnected}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/machine_off_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.PowerUp}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/getting_ready_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Standby}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/standby_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.ReadyToDye}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/Ready_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.GettingReady}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/getting_ready_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Printing}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/dyeing_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.ShuttingDown}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/shutdown_icon_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Error}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/error_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Service}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/service_Anim.gif"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Upgrading}">
-                                                    <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/service_Anim.gif"></Setter>
-                                                </DataTrigger>
+                                        <Image.Style>
+                                            <Style TargetType="Image">
+                                                <Setter Property="gif:ImageBehavior.AnimatedSource" Value="{x:Null}"></Setter>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Disconnected}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/machine_off_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.PowerUp}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/getting_ready_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Standby}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/standby_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.ReadyToDye}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/Ready_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.GettingReady}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/getting_ready_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Printing}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/dyeing_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.ShuttingDown}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/shutdown_icon_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Error}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/error_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Service}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/service_Anim.gif"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Upgrading}">
+                                                        <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/service_Anim.gif"></Setter>
+                                                    </DataTrigger>
                                                 </Style.Triggers>
-                                        </Style>
-                                    </Image.Style>
-                                </Image>
+                                            </Style>
+                                        </Image.Style>
+                                    </Image>
+                                </Grid>
                             </Grid>
-                        </Grid>
                         </StackPanel>
                     </Grid>
                     <Grid>
@@ -605,7 +607,7 @@
                             <Ellipse Stroke="{StaticResource FSE_PrimaryForegroundBrush}" StrokeThickness="1"></Ellipse>
                             <Image Source="/Images/logout.png" RenderOptions.BitmapScalingMode="Fant" Width="35" Stretch="Uniform" />
                         </Grid>
-                            <Grid Width="45" Height="45" Margin="0 5" resolution:ResolutionHelper.Mode="Low">
+                        <Grid Width="45" Height="45" Margin="0 5" resolution:ResolutionHelper.Mode="Low">
                             <Ellipse Stroke="{StaticResource FSE_PrimaryForegroundBrush}" StrokeThickness="1"></Ellipse>
                             <Image Source="/Images/logout.png" RenderOptions.BitmapScalingMode="Fant" Width="25" Stretch="Uniform" />
                         </Grid>
@@ -703,12 +705,12 @@
                                 </Grid>
                             </Border>
                             <Grid>
-                            <DockPanel IsHitTestVisible="False" resolution:ResolutionHelper.Mode="High">
-                                <Grid Width="55" Height="55" Margin="10 10" HorizontalAlignment="Left">
-                                    <Image Source="/Images/logout.png" RenderOptions.BitmapScalingMode="Fant" Width="35" Stretch="Uniform" />
-                                </Grid>
-                                <TextBlock Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}" Text="Logout" VerticalAlignment="Center"></TextBlock>
-                            </DockPanel>
+                                <DockPanel IsHitTestVisible="False" resolution:ResolutionHelper.Mode="High">
+                                    <Grid Width="55" Height="55" Margin="10 10" HorizontalAlignment="Left">
+                                        <Image Source="/Images/logout.png" RenderOptions.BitmapScalingMode="Fant" Width="35" Stretch="Uniform" />
+                                    </Grid>
+                                    <TextBlock Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}" Text="Logout" VerticalAlignment="Center"></TextBlock>
+                                </DockPanel>
                                 <DockPanel IsHitTestVisible="False" resolution:ResolutionHelper.Mode="Low">
                                     <Grid Width="45" Height="45" Margin="10 5" HorizontalAlignment="Left">
                                         <Image Source="/Images/logout.png" RenderOptions.BitmapScalingMode="Fant" Width="25" Stretch="Uniform" />
@@ -760,12 +762,12 @@
                                             </Grid>
                                         </Border>
                                         <Grid>
-                                        <DockPanel IsHitTestVisible="False" resolution:ResolutionHelper.Mode="High">
-                                            <Grid Width="55" Height="55" Margin="10 10" HorizontalAlignment="Left">
-                                                <Image Source="{Binding Image}" RenderOptions.BitmapScalingMode="Fant" Width="35" Stretch="Uniform" />
-                                            </Grid>
-                                            <TextBlock IsHitTestVisible="False" Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}" Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
-                                        </DockPanel>
+                                            <DockPanel IsHitTestVisible="False" resolution:ResolutionHelper.Mode="High">
+                                                <Grid Width="55" Height="55" Margin="10 10" HorizontalAlignment="Left">
+                                                    <Image Source="{Binding Image}" RenderOptions.BitmapScalingMode="Fant" Width="35" Stretch="Uniform" />
+                                                </Grid>
+                                                <TextBlock IsHitTestVisible="False" Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}" Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                                            </DockPanel>
                                             <DockPanel IsHitTestVisible="False" resolution:ResolutionHelper.Mode="Low">
                                                 <Grid Width="45" Height="45" Margin="10 5" HorizontalAlignment="Left">
                                                     <Image Source="{Binding Image}" RenderOptions.BitmapScalingMode="Fant" Width="25" Stretch="Uniform" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
index 931e000c7..f93785c2a 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
@@ -41,8 +41,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\Build\Twine Studio\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>