From d045a47ad7363e62b763013fa6afcdb1762a7ce3 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 11 Aug 2019 16:48:35 +0300
Subject: Machine Studio : added configuration for  dark /light theme

---
 .../Controls/HiveComboControl.xaml                 |   2 +-
 .../Controls/MachineView.xaml                      |  12 +-
 .../MachineStudioSettings.cs                       |   6 +
 .../MachineStudioTheme.cs                          |  14 +
 .../Resources/MaterialDesign.xaml                  |  17 +-
 .../Resources/SharedResourceDictionary.cs          |   6 +
 .../Tango.MachineStudio.Common.csproj              |   5 +
 .../Themes/DarkThemeColors.xaml                    | 301 +++++++++++++++++++++
 .../Themes/LightThemeColors.xaml                   |  93 +++++--
 9 files changed, 425 insertions(+), 31 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
index 7f135efbc..cd218f663 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml
@@ -39,7 +39,7 @@
 
                 <Grid Grid.Row="1">
                     <shapes:Hexagon Stroke="{StaticResource DarkGrayBrush}" StrokeThickness="1" Margin="5" />
-                    <TextBlock TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" FontStyle="Italic" FontSize="10">
+                    <TextBlock TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" FontStyle="Italic" FontSize="10" Foreground="{StaticResource Hexagon.ForegroundBrush}">
                         <Run Text="&#916;"></Run>
                         <Run Text="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Resolution,FallbackValue=1}"></Run>
                     </TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml
index 6f352f35c..013dca6ce 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineView.xaml
@@ -39,7 +39,7 @@
                         <Border BorderBrush="#6C6C6C" BorderThickness="1" IsHitTestVisible="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Images/hardware.png" Width="10" VerticalAlignment="Center" Margin="5" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="Gainsboro" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
+                                <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="{StaticResource BorderBrushGainsboro}" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
                                             <Run Text="{Binding Configuration.HardwareVersion.Name}"></Run>
                                             <Run Text="{Binding Configuration.HardwareVersion.Version}"></Run>
                                 </TextBlock>
@@ -174,7 +174,7 @@
                                     </Style.Triggers>
                                 </Style>
                             </Grid.Style>
-                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="Gainsboro">NO IDS PACKS</TextBlock>
+                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="{StaticResource BorderBrushGainsboro}">NO IDS PACKS</TextBlock>
                         </Grid>
 
                         <Rectangle VerticalAlignment="Bottom" Stroke="DimGray" StrokeThickness="1">
@@ -195,7 +195,7 @@
 
                         <StackPanel Orientation="Horizontal">
                             <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
+                            <TextBlock VerticalAlignment="Center" Padding="1" Foreground="{StaticResource BorderBrushGainsboro}"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
                         </StackPanel>
                     </Grid>
 
@@ -238,7 +238,7 @@
 
                         <StackPanel>
                             <Image Source="../Images/tablet.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock Padding="2 0 2 0" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                            <TextBlock Padding="2 0 2 0" Foreground="{StaticResource BorderBrushGainsboro}"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
                                         <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
                             </TextBlock>
@@ -247,7 +247,7 @@
 
                         <StackPanel Grid.Row="3" >
                             <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="{StaticResource BorderBrushGainsboro}" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Name}"></Run>
                                         <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Version}"></Run>
                             </TextBlock>
@@ -255,7 +255,7 @@
 
                         <StackPanel Grid.Row="1" >
                             <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                            <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="{StaticResource BorderBrushGainsboro}" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="{Binding Configuration.ApplicationOsVersion.Name}"></Run>
                                         <Run Text="{Binding Configuration.ApplicationOsVersion.Version}"></Run>
                             </TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 0433ff7be..2920c8dd9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -135,6 +135,11 @@ namespace Tango.MachineStudio.Common
             return DeploymentSlot.ToAddress();
         }
 
+        /// <summary>
+        /// Gets or sets the working theme.
+        /// </summary>
+        public MachineStudioTheme Theme { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MachineStudio"/> class.
         /// </summary>
@@ -149,6 +154,7 @@ namespace Tango.MachineStudio.Common
             JobUploadStrategy = JobUploadStrategy.JobDescriptionFile;
             MaximumCacheTime = TimeSpan.FromMinutes(5);
             CachingMode = ObservablesContextInMemoryCachingMode.None;
+            Theme = MachineStudioTheme.Light;
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs
new file mode 100644
index 000000000..16dda143b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioTheme.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.Common
+{
+    public enum MachineStudioTheme
+    {
+        Light,
+        Dark
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index 03c6649d6..0bf472a2e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -24,11 +24,12 @@
         </ResourceDictionary>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml">
         </ResourceDictionary>
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml">
-        </ResourceDictionary>
-        <!--Material Design-->
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml">
+
+        <!--<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml">
         </ResourceDictionary>
+        --><!--Material Design--><!--
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml">
+        </ResourceDictionary>-->
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml">
         </ResourceDictionary>
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/materialdesigncolor.lightblue.xaml">
@@ -139,9 +140,9 @@
                                    AllowsTransparency="True"
                                    PopupAnimation="Slide"
                                    Focusable="False">
-                                    <Border Background="White"
+                                    <Border Background="{DynamicResource AutoCompleteTextBox.Popup.Background}" x:Name="PopupBorder"
                                         BorderThickness="1"
-                                        BorderBrush="#BDBDBD"
+                                        BorderBrush="{DynamicResource AutoCompleteTextBox.Popup.BorderBrush}"
                                         CornerRadius="0"
                                         Padding="2">
                                         <Grid>
@@ -286,7 +287,7 @@
                                                                 </Style>
                                                             </Ellipse.Style>
                                                         </Ellipse>
-                                                        <TextBlock FontSize="8" Text="{Binding Name}" VerticalAlignment="Center" Foreground="Gainsboro" FontWeight="DemiBold" HorizontalAlignment="Center"></TextBlock>
+                                                        <TextBlock FontSize="8" Text="{Binding Name}" VerticalAlignment="Center" Foreground="{DynamicResource BorderBrushGainsboro}" FontWeight="DemiBold" HorizontalAlignment="Center"></TextBlock>
                                                     </Grid>
                                                 </Grid>
                                             </ControlTemplate>
@@ -477,7 +478,7 @@
                         </LinearGradientBrush>
                     </Setter.Value>
                 </Setter>
-                <Setter Property="TextElement.Foreground" Value="Gainsboro"></Setter>
+                <Setter Property="TextElement.Foreground" Value="{DynamicResource BorderBrushGainsboro}"></Setter>
 
                 <Style.Triggers>
                     <EventTrigger RoutedEvent="PreviewMouseDown">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
index 6b1a86741..d422df26c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using Tango.Settings;
 
 namespace Tango.MachineStudio.Common.Resources
 {
@@ -34,6 +35,11 @@ namespace Tango.MachineStudio.Common.Resources
             set
             {
                 _sourceUri = value;
+                var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+                //add current theme
+                MachineStudioTheme wTheme = settings.Theme;
+                if ((wTheme == MachineStudioTheme.Dark && value.LocalPath.Contains("Light")) || (wTheme == MachineStudioTheme.Light && value.LocalPath.Contains("Dark")))
+                    return;
 
                 if (!_sharedDictionaries.ContainsKey(value))
                 {
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 c368a499c..62f2dc984 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
@@ -93,6 +93,7 @@
     <Compile Include="Controls\WpfGraphControl.cs" />
     <Compile Include="Converters\UserRoleToBooleanConverter.cs" />
     <Compile Include="Converters\UserRoleToVisibilityConverter.cs" />
+    <Compile Include="MachineStudioTheme.cs" />
     <Compile Include="Resources\SharedResourceDictionary.cs" />
     <Compile Include="Web\LoginRequest.cs" />
     <Compile Include="Web\LoginResponse.cs" />
@@ -186,6 +187,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\DarkThemeColors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
new file mode 100644
index 000000000..ad8f0f09b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
@@ -0,0 +1,301 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Themes"
+                   xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <ResourceDictionary.MergedDictionaries>
+
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml"/>
+
+
+        <ResourceDictionary>
+            <system:Double x:Key = "HomeImageOpacity">0.7</system:Double>
+            <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300" />
+            <SolidColorBrush x:Key="OrangeBrush200" Color="#FFA65F" />
+            <SolidColorBrush x:Key="OrangeBrush250" Color="#E79F20" />
+            <SolidColorBrush x:Key="OrangeCanceledBrush" Color="#EF832B" />
+            <!--Background for all duplicate buttons-->
+            <SolidColorBrush x:Key="OrangeBrush300" Color="#FF9A6A" />
+            <SolidColorBrush x:Key="OrangeBrush400" Color="#F38B76" />
+            <SolidColorBrush x:Key="RedBrush100" Color="#FF5151" />
+            <SolidColorBrush x:Key="RedBrush200" Color="#FF6F6F" />
+            <!--Background for all remove/delete buttons-->
+            <SolidColorBrush x:Key="RedBrush300"  Color="#FF7272" />
+            <SolidColorBrush x:Key="RedBrush400" Color="#FF8585" />
+            <SolidColorBrush x:Key="RedBrush500" Color="#E14141" />
+            <SolidColorBrush x:Key="OrangeUploadBrush" Color="#E76311" />
+
+
+            <SolidColorBrush x:Key="GreenBrush"
+                             Color="#04CB04" />
+            <SolidColorBrush x:Key="GreenDownloadFileBrush"
+                             Color="#2DD42D" />
+            <SolidColorBrush x:Key="GreenBrush100"
+                             Color="#68E46E" />
+            <!--<SolidColorBrush x:Key="GreenBrush200" Color="#65C682"/>-->
+            <!--Background for all new buttons-->
+            <SolidColorBrush x:Key="GreenBrush300"
+                             Color="#68B367" />
+            <SolidColorBrush x:Key="GreenBrush400"
+                             Color="#90E990" />
+            <SolidColorBrush x:Key="GreenBrush450"
+                             Color="#20BB20" />
+            <SolidColorBrush x:Key="GreenUploadBrush"
+                             Color="#2FD42F" />
+            <SolidColorBrush x:Key="GreenOpenFileBrush"
+                             Color="#2CC62C" />
+            <SolidColorBrush x:Key="GreenMConnectionBrush"
+                             Color="#03FF8E" />
+            <SolidColorBrush x:Key="GreenMenuDebugBrush"
+                             Color="#8DD28A" />
+
+
+            <SolidColorBrush x:Key="DarkBlueBrush"
+                             Color="#3C7EF4" />
+            <SolidColorBrush x:Key="DodgerBlueBrush"
+                             Color="DodgerBlue" />
+            <SolidColorBrush x:Key="BlueBrush100"
+                             Color="#03A9F4" />
+            <SolidColorBrush x:Key="BlueBrush"
+                             Color="#64B8EC" />
+            <SolidColorBrush x:Key="BlueSelectionStrokBrush"
+                             Color="#1EA9FF" />
+
+            <SolidColorBrush x:Key="LilacBrush"
+                             Color="#833CEC" />
+            <SolidColorBrush x:Key="LilacBrush100"
+                             Color="#682EBE" />
+            <SolidColorBrush x:Key="LilacBrush200"
+                             Color="#532990" />
+
+
+
+            <SolidColorBrush x:Key="WhiteTextBrush"  Color="White" />
+            <SolidColorBrush x:Key="WhiteBackgroundBrush" Color="#181818" />
+            <SolidColorBrush x:Key="WhiteBrush"  Color="#E6252525" />
+            <SolidColorBrush x:Key="WhiteBrush50" Color="#FF101010" />
+
+            <!--<SolidColorBrush x:Key="WhiteBrush100" Color="#ECECEC"/>-->
+            <SolidColorBrush x:Key="WhiteBrush100"  Color="#212121" />
+            <SolidColorBrush x:Key="LightGrayBrush"  Color="#A5A4A4" />
+            <SolidColorBrush x:Key="LightGrayBrush100" Color="#5C5C5C" />
+            <SolidColorBrush x:Key="LightGrayBrush150"  Color="#CBCBCB" />
+            <SolidColorBrush x:Key="LightGrayBrush200" Color="#D9D9D9" />
+
+            <!-- used for regular text color -->
+            <SolidColorBrush x:Key="BlackForegroundBrush"  Color="#BBBBBB" />
+            <SolidColorBrush x:Key="DarkGrayBrush"  Color="#E4E1E1" />
+            <SolidColorBrush x:Key="DarkGrayBrush100"  Color="#F7F4F4" />
+            <SolidColorBrush x:Key="DarkGrayBrush200"  Color="#E1E1E1" />
+            <SolidColorBrush x:Key="GrayBrush300" Color="#C8C8C8" />
+            <!--used for Foreground Storage-->
+            <SolidColorBrush x:Key="GrayBrush310"  Color="#D9D7D7" />
+            <SolidColorBrush x:Key="GrayBrush280"  Color="#BBBBBB" />
+            <SolidColorBrush x:Key="GrayBrush290"  Color="#BDBDBD" />
+            <!-- used for text color-->
+            <SolidColorBrush x:Key="GrayBrush250"  Color="#BDBDBD" />
+            <SolidColorBrush x:Key="GrayBrush200" Color="#616161" />
+            <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A" />
+            <SolidColorBrush x:Key="GrayBrush" Color="#BBBBBB" />
+            <SolidColorBrush x:Key="DimGrayBrush"  Color="#A0A0A0" />
+            <SolidColorBrush x:Key="SideBarBackgroundBrush" Color="#252525" />
+            <SolidColorBrush x:Key="JobFieldForeground"  Color="#FFF0F0F0" />
+            <SolidColorBrush x:Key="HomePageForeground" Color="#BBBBBB"/>
+            <!--used for border brush-->
+            <SolidColorBrush x:Key="BorderBrushGainsboro"
+                             Color="#5C5C5C" />
+
+            <LinearGradientBrush x:Key="BlueGradientBrush"
+                                 StartPoint="0.5,0"
+                                 EndPoint="0.5,1">
+                <GradientStop Color="#03A9F4" />
+                <GradientStop Color="#0081BB"
+                              Offset="1" />
+            </LinearGradientBrush>
+
+            <SolidColorBrush x:Key="TransparentBackgroundBrush"  Color="#96252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush100"  Color="#B9252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush200"  Color="#E6252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush300"  Color="#D4252525" />
+            <SolidColorBrush x:Key="Transparent200" Color="#C9313131" />
+            <!--MachineJobSelectionView Grid Background-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush400"  Color="#B1252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush420"  Color="#A6000000" />
+            <!--Storage.Views.MainView-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8B252525" />
+            <!--MachineTechView-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush450"  Color="#7E252525" />
+            <SolidColorBrush x:Key="TransparentBackgroundBrush600"  Color="#70252525" />
+            <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D" />
+
+            <!--Dispenser background-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush700" Color="#68313131" />
+
+            <!--base background and foreground-->
+            <SolidColorBrush x:Key="MainWindow.Background" Color="#181818"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Foreground" Color="#BBBBBB"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Header" Color="#383838"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.WindowTitleColorBrush" Color="#202020" />
+            <SolidColorBrush x:Key="Dialog.Background" Color="#383838"></SolidColorBrush>
+            <SolidColorBrush x:Key="Dialog.Foreground" Color="#F1F1F1"></SolidColorBrush>
+            <SolidColorBrush x:Key="Combobox.Background" Color="#252525"></SolidColorBrush>
+            <SolidColorBrush x:Key="Card.Background" Color="#202020"></SolidColorBrush>
+            <SolidColorBrush x:Key="ToggleButton.TrackBaceColor" Color="#717171"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.SubMenuItem.Background" Color="#3A3A3A"></SolidColorBrush>
+            <SolidColorBrush x:Key="Statistics.BorderBrush" Color="#D6D6D6"/>
+            <SolidColorBrush x:Key="Hexagon.ForegroundBrush" Color="White"/>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.Background" Color="#383838"></SolidColorBrush>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.BorderBrush" Color="#BBBBBB"></SolidColorBrush>
+            <SolidColorBrush x:Key="ComboBox.Popup.Background" Color="red"></SolidColorBrush>
+
+
+            <!--material design colors-->
+            <SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}" />
+            <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Primary500}" />
+            <SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}" />
+            <SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}" />
+            <SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}" />
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}" />
+            <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
+                <GradientStop Color="{DynamicResource Primary700}" Offset="0" />
+                <GradientStop Color="{DynamicResource Primary300}" Offset="1" />
+            </LinearGradientBrush>
+            <SolidColorBrush x:Key="CheckmarkFill" Color="{DynamicResource Primary500}" />
+            <SolidColorBrush x:Key="RightArrowFill" Color="{DynamicResource Primary500}" />
+            <SolidColorBrush x:Key="IdealForegroundColorBrush"  Color="{DynamicResource Primary500Foreground}" />
+            <SolidColorBrush x:Key="IdealForegroundDisabledBrush"  Color="{DynamicResource Primary500}"  Opacity="0.4" />
+
+            <!--Colors-->
+            <Color x:Key="borderColor">#5C5C5C</Color>
+            <Color x:Key="graphGridLinesColor">#5C5C5C</Color>
+            <Color x:Key="graphsMarkerColor">#5C5C5C</Color>
+            <Color x:Key="materialColor">#FF03A9F4</Color>
+            <!--Brushes-->
+            <SolidColorBrush x:Key="borderBrush"
+                             Color="{StaticResource borderColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesBrush"
+                             Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="BlackBrush"
+                             Color="#545454"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesLightBrush"
+                             Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesDarkBrush"
+                             Color="#FFC6C6C6"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignFlatButtonClick"
+                             Color="#C13E3E3E"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignBody"
+                             Color="#FFBBBBBB"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignSelection"
+                             Color="#FF474747"></SolidColorBrush>
+
+
+            <LinearGradientBrush EndPoint="0.5,1"
+                                 StartPoint="0.5,0"
+                                 x:Key="graphBackgroundLight">
+                <GradientStop Color="White" />
+                <GradientStop Color="#FFE9E9E9"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1"
+                                 StartPoint="0.5,0"
+                                 x:Key="graphBackgroundDark">
+                <GradientStop Color="Black" />
+                <GradientStop Color="#FF333333"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1"
+                                 StartPoint="0.5,0"
+                                 x:Key="graphBackground">
+                <GradientStop Color="#121212" />
+                <GradientStop Color="#FF333333"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1"
+                                 StartPoint="0.5,0"
+                                 x:Key="graphLabelBackground"
+                                 Opacity="0.7">
+                <GradientStop Color="White" />
+                <GradientStop Color="#FFD9D9D9"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1"
+                                 StartPoint="0.5,0"
+                                 x:Key="graphLegendBackground"
+                                 Opacity="0.7">
+                <GradientStop Color="#FFE9E9E9" />
+                <GradientStop Color="#FFBDBDBD"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0,0.5"
+                                 EndPoint="1,0.5"
+                                 x:Key="borderBackground">
+                <GradientStop Color="#00E6E6E6" />
+                <GradientStop Color="#DEDEDE"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <SolidColorBrush Color="#FFECECEC"
+                             x:Key="topBarBackgroundBrush"></SolidColorBrush>
+            <LinearGradientBrush StartPoint="0.5,0"
+                                 x:Key="Logging.Background"
+                                 EndPoint="0.5,1">
+                <GradientStop Color="Black" />
+                <GradientStop Color="#FF2B2B2B"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="UserRoles.Background">
+                <GradientStop Color="#181818" />
+                <GradientStop Color="#FF474646"
+                              Offset="1" />
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0.8" EndPoint="0.5,1"  x:Key="UserRoles.GridBackground">
+                <GradientStop/>
+                <GradientStop Color="#55181818" Offset="0"/>
+            </LinearGradientBrush>
+
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="LogBorder.Background">
+                <GradientStop Color="#15DBDBDB"/>
+                <GradientStop Color="Black" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="LoadingBorderGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
+                <GradientStop Color="#383838"/>
+                <GradientStop Color="#777777" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SelectedSegmentGradientBrush">
+                <GradientStop Color="#FFAAAAAA" Offset="0" />
+                <GradientStop Color="{StaticResource AccentColor}" Offset="1.6" />
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SegmentGradientBrush">
+                <GradientStop Color="#FEBDBDBD" Offset="0" />
+                <GradientStop Color="#004E4E4E" Offset="0.9" />
+            </LinearGradientBrush>
+
+
+            <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
+                <Setter Property="HasDropShadow" Value="True" />
+                <Setter Property="Foreground" Value="{StaticResource MainWindow.Foreground}" />
+                <Setter Property="Opacity"  Value="0.95" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ToolTip">
+                            <Border Name="Border"
+                                    Background="{StaticResource MainWindow.Background}"
+                                    BorderBrush="{StaticResource MainWindow.Background}"
+                                    BorderThickness="1"
+                                    Width="{TemplateBinding Width}"
+                                    Height="{TemplateBinding Height}">
+                                <ContentPresenter Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="HasDropShadow" Value="true">
+                                    <Setter TargetName="Border"  Property="CornerRadius"  Value="0" />
+                                    <Setter TargetName="Border"   Property="SnapsToDevicePixels"  Value="true" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
index 90b3b0829..25f72f8d4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
@@ -1,9 +1,14 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Themes">
+                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Themes"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml"/>
+
         <ResourceDictionary>
-        <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300"/>
+            <system:Double x:Key = "HomeImageOpacity">1</system:Double>
+            <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300"/>
         <SolidColorBrush x:Key="OrangeBrush200" Color="#FFA65F"/>
         <SolidColorBrush x:Key="OrangeBrush250" Color="#E79F20"/>
             <SolidColorBrush x:Key="OrangeCanceledBrush" Color="#EF832B"/>
@@ -44,9 +49,7 @@
         <SolidColorBrush x:Key="LilacBrush100" Color="#682EBE"/>
         <SolidColorBrush x:Key="LilacBrush200" Color="#532990"/>
 
-
-
-            <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
         <SolidColorBrush x:Key="WhiteBackgroundBrush" Color="White"/>
         <SolidColorBrush x:Key="WhiteBrush" Color="#E6FFFFFF"/>
         <SolidColorBrush x:Key="WhiteBrush50" Color="#FFF1F1F1"/>
@@ -73,6 +76,13 @@
         <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A"/>
         <SolidColorBrush x:Key="GrayBrush" Color="Gray"/>
         <SolidColorBrush x:Key="DimGrayBrush" Color="DimGray"/>
+            <SolidColorBrush x:Key="SideBarBackgroundBrush" Color="white" />
+            <SolidColorBrush x:Key="JobFieldForeground" Color="#FF494949"/>
+            <SolidColorBrush x:Key="HomePageForeground" Color="#FF494949"/>
+
+            <!--used for border brush-->
+            <SolidColorBrush x:Key="BorderBrushGainsboro" Color="Gainsboro"/>
+         
 
 
             <LinearGradientBrush x:Key="BlueGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
@@ -87,26 +97,49 @@
         <SolidColorBrush x:Key="Transparent200" Color="#C9F6F6F6"/>
          <!--MachineJobSelectionView Grid Background-->
         <SolidColorBrush x:Key="TransparentBackgroundBrush400" Color="#B1FFFFFF"/>
-        <!--Storage.Views.MainView-->
-        <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8BFFFFFF"/>
+            <SolidColorBrush x:Key="TransparentBackgroundBrush420" Color="#A6FFFFFF"/>
             
-        <!--MachineTechView-->
+        <!--Storage.Views.MainView-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8BFFFFFF"/>
+
+            <!--MachineTechView-->
         <SolidColorBrush x:Key="TransparentBackgroundBrush450" Color="#7EFFFFFF"/>
-            <SolidColorBrush x:Key="TransparentBackgroundBrush600" Color="#70FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush600" Color="#70FFFFFF"/>
         <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D"/>
-        
+            <!--Dispenser background-->
+            <SolidColorBrush x:Key="TransparentBackgroundBrush700" Color="#68F6F6F6"/>
+
             <!--base background and foreground-->
-        <SolidColorBrush x:Key="MainWindow.Background" Color="White"></SolidColorBrush>
-        <SolidColorBrush x:Key="MainWindow.Foreground" Color="#FF494949"></SolidColorBrush>
-            
+            <SolidColorBrush x:Key="MainWindow.Background" Color="White"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Foreground" Color="#FF494949"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.Header" Color="#03A9F4"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.WindowTitleColorBrush" Color="#FF0288d1" />
+            <SolidColorBrush x:Key="Dialog.Background" Color="White"></SolidColorBrush>
+            <SolidColorBrush x:Key="Dialog.Foreground" Color="black"></SolidColorBrush>
+            <SolidColorBrush x:Key="Combobox.Background" Color="Transparent"></SolidColorBrush>
+            <SolidColorBrush x:Key="Card.Background" Color="Transparent"></SolidColorBrush>
+            <SolidColorBrush x:Key="ToggleButton.TrackBaceColor"  Color="Black"></SolidColorBrush>
+            <SolidColorBrush x:Key="MainWindow.SubMenuItem.Background" Color="{x:Static SystemColors.MenuColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="Statistics.BorderBrush" Color="#181818"/>
+            <SolidColorBrush x:Key="Hexagon.ForegroundBrush" Color="black"/>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.Background" Color="White"></SolidColorBrush>
+            <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.BorderBrush" Color="#BDBDBD"></SolidColorBrush>
+
             <!--material design colors-->
-            <SolidColorBrush x:Key="HighlightBrush" Color="#FF0288d1" />
+            <!--<SolidColorBrush x:Key="HighlightBrush" Color="#FF0288d1" />
             <SolidColorBrush x:Key="AccentColorBrush" Color="#2196f3" />
             <SolidColorBrush x:Key="AccentColorBrush2" Color="#FF29b6f6" />
             <SolidColorBrush x:Key="AccentColorBrush3" Color="#FF4fc3f7" />
             <SolidColorBrush x:Key="AccentColorBrush4" Color="#FF81d4fa" />
             <SolidColorBrush x:Key="WindowTitleColorBrush" Color="#FF0288d1" />
-            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="#FFFFFFFF" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="#FFFFFFFF" />-->
+            <SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}" />
+            <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Primary500}" />
+            <SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}" />
+            <SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}" />
+            <SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}" />
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}" />
             <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
                 <GradientStop Color="#0288d1" Offset="0" />
                 <GradientStop Color="#4fc3f7" Offset="1" />
@@ -153,6 +186,34 @@
                 <GradientStop Color="#DEDEDE" Offset="1"/>
             </LinearGradientBrush>
             <SolidColorBrush Color="#FFECECEC" x:Key="topBarBackgroundBrush"></SolidColorBrush>
-    </ResourceDictionary>
+            <LinearGradientBrush StartPoint="0.5,0" x:Key="Logging.Background" EndPoint="0.5,1">
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFEAEAEA" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="UserRoles.Background" >
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFD6D6D6" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="UserRoles.GridBackground">
+                <GradientStop/>
+                <GradientStop Color="White" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="LogBorder.Background">
+                <GradientStop Color="#35FFFFFF"/>
+                <GradientStop Color="White" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush x:Key="LoadingBorderGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
+                <GradientStop Color="#03A9F4"/>
+                <GradientStop Color="#0081BB" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SelectedSegmentGradientBrush">
+                <GradientStop Color="White" Offset="0" />
+                <GradientStop Color="{StaticResource AccentColor}" Offset="2" />
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1" x:Key="SegmentGradientBrush">
+                <GradientStop Color="#00EEEEEE" Offset="0" />
+                <GradientStop Color="#FFB5B5B5" Offset="1" />
+            </LinearGradientBrush>
+        </ResourceDictionary>
 </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
-- 
cgit v1.3.1


From d2e231dbe55d7fcae6aa53caf78f72bd58784a98 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 13 Aug 2019 18:00:24 +0300
Subject: Added TransparentComboBoxStyle style

---
 .../Views/MainView.xaml                            |   4 +-
 .../Views/EventDetailsView.xaml                    |   2 +-
 .../Views/MachineSettingsView.xaml                 |  12 +-
 .../Views/MachineVersionDialog.xaml                |   2 +-
 .../Resources/MaterialDesign.xaml                  | 320 +++++++++++++++++----
 .../Themes/DarkThemeColors.xaml                    |   2 +-
 .../Themes/LightThemeColors.xaml                   |   1 +
 7 files changed, 272 insertions(+), 71 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
index f4fa039dc..49966bad2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
@@ -71,7 +71,7 @@
                 <StackPanel>
                     <StackPanel Visibility="{Binding IsHosted,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <TextBlock Margin="40 20" FontSize="30" FontWeight="SemiBold" FontStyle="Italic">TARGET MACHINE</TextBlock>
-                        <ComboBox ItemsSource="{Binding Machines}" FontSize="20" SelectedItem="{Binding SelectedMachine}" materialDesign:HintAssist.Hint="Serial Number" Margin="40 0 40 0" Background="{StaticResource Combobox.Background}">
+                        <ComboBox ItemsSource="{Binding Machines}" FontSize="20" SelectedItem="{Binding SelectedMachine}" materialDesign:HintAssist.Hint="Serial Number" Margin="40 0 40 0" Background="Transparent" Style="{StaticResource TransparentComboBoxStyle}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -86,7 +86,7 @@
                     <commonControls:MachineView Width="500" Margin="0 40 0 0" DataContext="{Binding SelectedMachine}" />
                     <StackPanel Margin="40 40">
                         <TextBlock FontSize="16">MEDIA</TextBlock>
-                        <ComboBox ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" FontSize="16" IsEnabled="{Binding SelectedMachine,Converter={StaticResource NullObjectToBooleanConverter}}" Background="{StaticResource Combobox.Background}" >
+                        <ComboBox ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" FontSize="16" IsEnabled="{Binding SelectedMachine,Converter={StaticResource NullObjectToBooleanConverter}}" Background="Transparent" Style="{StaticResource TransparentComboBoxStyle}" >
 
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
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 d9a806a2a..4031c9ce3 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
@@ -10,7 +10,7 @@
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.Logging.Views"
              mc:Ignorable="d" 
-             Height="500" Width="800" Background="{StaticResource MainWindow.Background}" d:DataContext="{d:DesignInstance Type=vm:EventDetailsViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
+             Height="500" Width="800" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:EventDetailsViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index 6a8b7c9b0..62c38a1e6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -42,25 +42,25 @@
                             <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
 
                             <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
-                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Organization</TextBlock>
-                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default RML</TextBlock>
-                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Loaded RML</TextBlock>
-                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default Color Space</TextBlock>
-                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default Segment Length</TextBlock>
                             <mahapps:NumericUpDown HideUpDownButtons="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="1000" Value="{Binding ActiveMachine.DefaultSegmentLength}" HasDecimals="False"></mahapps:NumericUpDown>
 
                             <TextBlock FontWeight="SemiBold">Default Spool Type</TextBlock>
-                            <ComboBox ItemsSource="{Binding ActiveMachineAdapter.SpoolTypes}" SelectedItem="{Binding ActiveMachine.DefaultSpoolType}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox  Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.SpoolTypes}" SelectedItem="{Binding ActiveMachine.DefaultSpoolType}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
                             <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml
index f6c39a6cd..b04720647 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml
@@ -9,7 +9,7 @@
              xmlns:providers="clr-namespace:Tango.MachineStudio.MachineDesigner.AutoComplete"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
-             mc:Ignorable="d" Width="530" Height="239" Background="White">
+             mc:Ignorable="d" Width="530" Height="239" Background="{StaticResource Dialog.Background}" Foreground="{StaticResource Dialog.Foreground}">
 
     <UserControl.Resources>
         <providers:MachineVersionsProvider x:Key="VersionsProvider"></providers:MachineVersionsProvider>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index 0bf472a2e..70c9cb3c4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -6,7 +6,8 @@
                     xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
                     xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Resources">
+                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Resources"
+                    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
     <ResourceDictionary.MergedDictionaries>
         
         <!--WPF Extended Toolkit-->
@@ -55,31 +56,10 @@
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/materialdesigntheme.Slider.xaml">
         </ResourceDictionary>
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/materialdesigntheme.ProgressBar.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ComboBox.xaml" />
 
         <ResourceDictionary Source="GradientOffsetSlider.xaml" />
 
-        <!--<local:SharedResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml"/>-->
-
-        <!--MahApps Brushes-->
-        <!--<ResourceDictionary>-->
-            <!--<SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}" />
-            <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Primary500}" />
-            <SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}" />
-            <SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}" />
-            <SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}" />
-            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}" />
-            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}" />
-            <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
-                <GradientStop Color="{DynamicResource Primary700}" Offset="0" />
-                <GradientStop Color="{DynamicResource Primary300}" Offset="1" />
-            </LinearGradientBrush>
-            <SolidColorBrush x:Key="CheckmarkFill" Color="{DynamicResource Primary500}" />
-            <SolidColorBrush x:Key="RightArrowFill" Color="{DynamicResource Primary500}" />
-            <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}" />
-            <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4" />-->
-        <!--</ResourceDictionary>-->
-        
-
         <!--Fonts-->
         <ResourceDictionary>
             <FontFamily x:Key="digital-7">../Fonts/#digital-7</FontFamily>
@@ -90,6 +70,15 @@
 
             <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
             <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
+            <converters:MathConverter x:Key="MathAddConverter" Operation="Add" />
+            <converters:BrushRoundConverter x:Key="BrushRoundConverter" />
+            <converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
+
+            <sys:Double x:Key="PopupContentPresenterExtend">4</sys:Double>
+            <sys:Double x:Key="PopupTopBottomMargin">8</sys:Double>
+            <sys:Double x:Key="PopupLeftRightMargin">16</sys:Double>
+            <sys:Boolean x:Key="TrueValue">True</sys:Boolean>
+            <sys:Boolean x:Key="FalseValue">False</sys:Boolean>
 
             <Style TargetType="editors:AutoCompleteTextBox" >
                 <Setter Property="Focusable" Value="True" />
@@ -209,43 +198,6 @@
             <sys:Double x:Key="MiniFontSize">12</sys:Double>
             <sys:Double x:Key="TinyFontSize">9</sys:Double>
 
-            <!--Colors--><!--
-            <Color x:Key="borderColor">Silver</Color>
-            <Color x:Key="graphGridLinesColor">#FF464646</Color>
-            <Color x:Key="graphsMarkerColor">Gray</Color>
-            <Color x:Key="materialColor">#03A9F4</Color>
-
-            --><!--Brushes--><!--
-            <SolidColorBrush x:Key="borderBrush" Color="{StaticResource borderColor}"></SolidColorBrush>
-            <SolidColorBrush x:Key="graphGridLinesBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
-            <SolidColorBrush x:Key="BlackBrush" Color="#545454"></SolidColorBrush>
-
-            <SolidColorBrush x:Key="graphGridLinesLightBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
-            <SolidColorBrush x:Key="graphGridLinesDarkBrush" Color="#FF2E2E2E"></SolidColorBrush>
-
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundLight">
-                <GradientStop Color="White"/>
-                <GradientStop Color="#FFE9E9E9" Offset="1"/>
-            </LinearGradientBrush>
-
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundDark">
-                <GradientStop Color="Black"/>
-                <GradientStop Color="#FF333333" Offset="1"/>
-            </LinearGradientBrush>
-
-            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackground">
-                <GradientStop Color="#121212"/>
-                <GradientStop Color="#FF333333" Offset="1"/>
-            </LinearGradientBrush>-->
-
-
-
-            <!--<SolidColorBrush Color="{DynamicResource WhiteBrush100}" x:Key="topBarBackgroundBrush"></SolidColorBrush>-->
-            <!--Brushes-->
-
-
-
-
             <!--Graph Ticks Template-->
             <DataTemplate x:Key="graphTicksTemplate">
                 <Ellipse Width="3" Height="3" Margin="0 0 0 0" Fill="{StaticResource AccentColorBrush}"></Ellipse>
@@ -574,6 +526,254 @@
                     </Setter.Value>
                 </Setter>
             </Style>
+            
+            <ControlTemplate x:Key="TransparentPopupContentDownTemplate" TargetType="ContentControl">
+                <Grid MinWidth="{Binding ElementName=templateRoot, Path=ActualWidth, Converter={StaticResource MathAddConverter}, ConverterParameter=32}"
+              Margin="6" Background="Transparent">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Border Background="Transparent"
+                    BorderBrush="{DynamicResource MaterialDesignShadowBrush}"
+                    BorderThickness="1"
+                    CornerRadius="2">
+                        <Border.Effect>
+                            <BlurEffect Radius="6"/>
+                        </Border.Effect>
+                    </Border>
+                    <Grid Margin="1"
+                  SnapsToDevicePixels="True">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <Border Grid.Row="0"
+                        CornerRadius="2 2 0 0"
+                        Background="{DynamicResource ComboBox.Floating.Background}"
+                        Height="{StaticResource PopupTopBottomMargin}"/>
+
+                        <Grid Grid.Row="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Border Grid.Column="0"
+                            Width="{StaticResource PopupLeftRightMargin}"
+                            Background="{DynamicResource ComboBox.Floating.Background}"
+                               />
+                            <Grid Grid.Column="1"
+                          Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type materialDesign:ComboBoxPopup}}, Path=VisiblePlacementWidth}"
+                          Height="{Binding ElementName=templateRoot, Path=ActualHeight}"/>
+                            <Border Grid.Column="2"
+                            MinWidth="{StaticResource PopupLeftRightMargin}"
+                            Background="{DynamicResource ComboBox.Floating.Background}"
+                               />
+                        </Grid>
+
+                        <Border Grid.Row="2"
+                        Background="{DynamicResource ComboBox.Floating.Background}"
+                        Height="{StaticResource PopupContentPresenterExtend}"/>
+
+                        <ContentPresenter Grid.Row="3"/>
+
+                        <Border Grid.Row="4"
+                        CornerRadius="0 0 2 2"
+                        Height="{StaticResource PopupTopBottomMargin}"
+                        Background="{DynamicResource ComboBox.Floating.Background}" />
+                    </Grid>
+                </Grid>
+            </ControlTemplate>
+
+            <Style x:Key="TransparentComboBoxStyle" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignComboBox}">
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ComboBox}" >
+                            <Grid x:Name="templateRoot"
+              Background="Transparent"
+              SnapsToDevicePixels="True">
+                                <Grid x:Name="InnerRoot">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="0" MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
+                                    </Grid.ColumnDefinitions>
+                                    <ToggleButton x:Name="toggleButton"
+                              Grid.ColumnSpan="2"
+                              Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness}"
+                              IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                              Style="{StaticResource MaterialDesignComboBoxToggleButton}"/>
+                                    <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                      Margin="{TemplateBinding Padding}"
+                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                      UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+                                        <Grid x:Name="InputRoot"
+                          HorizontalAlignment="Left">
+                                            <ContentPresenter x:Name="contentPresenter"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          IsHitTestVisible="False" />
+                                            <TextBox x:Name="PART_EditableTextBox"
+                                 IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                 HorizontalAlignment="Left"
+                                 HorizontalContentAlignment="Stretch"
+                                 Style="{StaticResource MaterialDesignComboBoxEditableTextBox}"
+                                 CaretBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderBrush}"                                 
+                                 Visibility="Collapsed" />
+
+                                            <materialDesign:SmartHint x:Name="Hint"
+                                       HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
+                                       FontSize="{TemplateBinding FontSize}"
+                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                       UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
+                                       UseFloating="{Binding Path=(materialDesign:HintAssist.IsFloating), RelativeSource={RelativeSource TemplatedParent}}"
+                                       HintOpacity="{Binding Path=(materialDesign:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
+                                       Hint="{TemplateBinding materialDesign:HintAssist.Hint}" />
+                                        </Grid>
+                                    </Grid>
+                                    <Line x:Name="DashedLine" Grid.ColumnSpan="2" VerticalAlignment="Bottom"
+                      Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Converter={StaticResource InverseBoolToVisConverter}}"
+                      StrokeThickness="1.25" StrokeDashArray="1,2.5" StrokeDashCap="Round"
+                      X1="0" X2="{Binding ActualWidth, ElementName=toggleButton}" Y1="0" Y2="0" 
+                      Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
+                                    <materialDesign:Underline x:Name="Underline"
+                               Grid.ColumnSpan="2"
+                               IsActive="{Binding ElementName=PART_EditableTextBox, Path=IsKeyboardFocused}"
+                               Visibility="{Binding Path=(materialDesign:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"/>
+
+                                    <materialDesign:ComboBoxPopup x:Name="PART_Popup"
+                                   
+                                   AllowsTransparency="true"
+                                   Focusable="False"
+                                   HorizontalOffset="-11.5"
+                                   IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                   PlacementTarget="{Binding ElementName=templateRoot}"
+                                   SnapsToDevicePixels="True"
+                                   UseLayoutRounding="True"
+                                   Placement="Custom"
+                                   PopupAnimation="Fade"
+                                   VerticalOffset="0"
+                                   DefaultVerticalOffset="5"
+                                   DownVerticalOffset="-15.5"
+                                   UpVerticalOffset="15"
+                                   ClassicMode="{Binding Path=(materialDesign:ComboBoxAssist.ClassicMode), RelativeSource={RelativeSource TemplatedParent}}"
+                                   UpContentTemplate="{StaticResource PopupContentUpTemplate}"
+                                   DownContentTemplate="{StaticResource TransparentPopupContentDownTemplate}"
+                                   ClassicContentTemplate="{StaticResource PopupContentClassicTemplate}">
+
+                                        <ContentControl>
+                                            <ScrollViewer MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                      Background="{DynamicResource ComboBox.Floating.Background}">
+                                                <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" />
+                                            </ScrollViewer>
+                                        </ContentControl>
+                                    </materialDesign:ComboBoxPopup>
+                                </Grid>
+                            </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger SourceName="PART_Popup" Property="PopupPlacement" Value="{x:Static materialDesign:ComboBoxPopupPlacement.Classic}">
+                                    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignComboBoxItemStyle}" />
+                                </Trigger>
+                                <Trigger SourceName="PART_Popup" Property="IsOpen" Value="True">
+                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Floating.Background}" />
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="templateRoot" Property="Opacity" Value="0.56"/>
+                                    <Setter TargetName="toggleButton" Property="BorderBrush" Value="Transparent"/>
+                                </Trigger>
+                                <Trigger Property="IsEditable" Value="True">
+                                    <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
+                                    <Setter TargetName="Underline" Property="Visibility" Value="{Binding Path=(materialDesign:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <Setter TargetName="contentPresenter" Property="Visibility" Value="Collapsed" />
+                                </Trigger>
+                                <Trigger Property="materialDesign:HintAssist.IsFloating" Value="True">
+                                    <Setter TargetName="InnerRoot" Property="Margin" Value="0 11.5 0 0" />
+                                </Trigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsEditable" Value="False"/>
+                                        <Condition Property="IsDropDownOpen" Value="True"/>
+                                    </MultiTrigger.Conditions>
+                                    <Setter TargetName="Underline" Property="Visibility" Value="Hidden"/>
+                                    <Setter TargetName="toggleButton" Property="BorderBrush" Value="Transparent"/>
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
+                                        <Condition Property="materialDesign:HintAssist.IsFloating" Value="True" />
+                                        <Condition Property="IsKeyboardFocusWithin" Value="True" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
+                                    <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="materialDesign:HintAssist.IsFloating" Value="True" />
+                                        <!--<Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />-->
+                                        <Condition Property="IsKeyboardFocusWithin" Value="True" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
+                                    <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
+                                        <Condition SourceName="PART_EditableTextBox" Property="IsKeyboardFocused" Value="True" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
+                                    <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
+                                        <Condition Property="IsDropDownOpen" Value="True" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
+                                    <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsGrouping" Value="true" />
+                                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                                </MultiTrigger>
+                                <Trigger Property="IsKeyboardFocused" Value="true">
+                                    <Setter TargetName="Underline" Property="IsActive" Value="True"/>
+                                </Trigger>
+                                <Trigger Property="Validation.HasError" Value="true">
+                                    <Setter Property="BorderBrush" Value="{DynamicResource ValidationErrorBrush}"/>
+                                    <Setter TargetName="Underline" Property="Background" Value="{DynamicResource ValidationErrorBrush}"/>
+                                </Trigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsMouseOver" Value="true" />
+                                        <Condition Property="Validation.HasError" Value="true" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="BorderBrush" Value="{DynamicResource ValidationErrorBrush}"/>
+                                    <Setter TargetName="Underline" Property="Background" Value="{DynamicResource ValidationErrorBrush}"/>
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsMouseOver" Value="true" />
+                                        <Condition Property="Validation.HasError" Value="false" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
+                                    <Setter TargetName="Underline" Property="Background" Value="{DynamicResource PrimaryHueMidBrush}"/>
+                                </MultiTrigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+                </Style>
         </ResourceDictionary>
 
     </ResourceDictionary.MergedDictionaries>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
index ad8f0f09b..8dd4efc32 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/DarkThemeColors.xaml
@@ -146,7 +146,7 @@
             <SolidColorBrush x:Key="Hexagon.ForegroundBrush" Color="White"/>
             <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.Background" Color="#383838"></SolidColorBrush>
             <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.BorderBrush" Color="#BBBBBB"></SolidColorBrush>
-            <SolidColorBrush x:Key="ComboBox.Popup.Background" Color="red"></SolidColorBrush>
+            <SolidColorBrush x:Key="ComboBox.Floating.Background" Color="#383838"></SolidColorBrush>
 
 
             <!--material design colors-->
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
index 25f72f8d4..0f5727e5b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
@@ -124,6 +124,7 @@
             <SolidColorBrush x:Key="Hexagon.ForegroundBrush" Color="black"/>
             <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.Background" Color="White"></SolidColorBrush>
             <SolidColorBrush x:Key="AutoCompleteTextBox.Popup.BorderBrush" Color="#BDBDBD"></SolidColorBrush>
+            <SolidColorBrush x:Key="ComboBox.Floating.Background" Color="White"></SolidColorBrush>
 
             <!--material design colors-->
             <!--<SolidColorBrush x:Key="HighlightBrush" Color="#FF0288d1" />
-- 
cgit v1.3.1