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

---
 .../Views/ConfigurationView.xaml                   | 64 +++++++++++-----------
 .../Views/MachineSettingsView.xaml                 | 14 ++---
 .../Views/MachinesView.xaml                        |  2 +-
 .../Views/SpoolsView.xaml                          |  2 +-
 4 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
index 97eceaa7d..b13ffb87b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
@@ -109,7 +109,7 @@
                                     </Border>
                                 </Grid>
 
-                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="Gray" Canvas.Top="-22">Hardware Version</TextBlock>
+                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="{StaticResource GrayBrush}" Canvas.Top="-22">Hardware Version</TextBlock>
                                 <Grid Width="97" Height="90" Canvas.Left="431" Canvas.Top="-13">
                                     <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
                                     <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
@@ -284,7 +284,7 @@
                                 <Grid Width="61" IsHitTestVisible="True" SnapsToDevicePixels="True" ClipToBounds="True" Height="42" Canvas.Left="85" Canvas.Top="385">
                                     <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 ActiveMachine.Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding ActiveMachine.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 ActiveMachine.Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding ActiveMachine.Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
                                     </StackPanel>
                                 </Grid>
 
@@ -337,7 +337,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 ActiveMachine.Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
                                         </TextBlock>
@@ -346,7 +346,7 @@
 
                                     <StackPanel Grid.Row="1" >
                                         <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 ActiveMachine.Configuration.ApplicationFirmwareVersion.Name}"></Run>
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationFirmwareVersion.Version}"></Run>
                                         </TextBlock>
@@ -354,7 +354,7 @@
 
                                     <StackPanel Grid.Row="2" >
                                         <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 ActiveMachine.Configuration.ApplicationOsVersion.Name}"></Run>
                                         <Run Text="{Binding ActiveMachine.Configuration.ApplicationOsVersion.Version}"></Run>
                                         </TextBlock>
@@ -367,9 +367,9 @@
 
 
                 <Grid>
-                    <TextBlock Margin="10" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="Gray" FontSize="16">IDS PACKS</TextBlock>
+                    <TextBlock Margin="10" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="{StaticResource GrayBrush}" FontSize="16">IDS PACKS</TextBlock>
                     <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                        <ItemsControl ItemsSource="{Binding ActiveMachine.Configuration.IdsPacks}" FontSize="10" Foreground="DimGray" Margin="10 30 10 10">
+                        <ItemsControl ItemsSource="{Binding ActiveMachine.Configuration.IdsPacks}" FontSize="10" Foreground="{StaticResource DimGrayBrush}" Margin="10 30 10 10">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel>
@@ -404,7 +404,7 @@
                         </ItemsControl>
                     </ScrollViewer>
 
-                    <Rectangle HorizontalAlignment="Right" Margin="0 20 0 20" Stroke="Gainsboro" StrokeThickness="1" StrokeDashArray="5 5 5 5"></Rectangle>
+                    <Rectangle HorizontalAlignment="Right" Margin="0 20 0 20" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1" StrokeDashArray="5 5 5 5"></Rectangle>
                 </Grid>
             </Grid>
 
@@ -442,7 +442,7 @@
                                                                 </StackPanel>
                                                             </StackPanel>
 
-                                                            <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                            <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                         </Grid>
                                                     </DataTemplate>
                                                 </ListBox.ItemTemplate>
@@ -465,11 +465,11 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tank.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -495,7 +495,7 @@
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -517,8 +517,8 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/liquid.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                                 <Rectangle Height="5" Width="170">
                                                                     <Rectangle.Fill>
                                                                         <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
@@ -527,7 +527,7 @@
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -549,11 +549,11 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/formula.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -575,12 +575,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tablet.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -602,12 +602,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/android.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -629,12 +629,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/application-firmware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -656,12 +656,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/embedded.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
@@ -683,12 +683,12 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/hardware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="{StaticResource DimGrayBrush}"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="{StaticResource BorderBrushGainsboro}" StrokeThickness="1"></Rectangle>
                                                     </Grid>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
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 8c9fe7179..6a8b7c9b0 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
@@ -27,7 +27,7 @@
 
                 <local:MachineView DataContext="{Binding ActiveMachine}" IsHitTestVisible="False" />
 
-                <Border Grid.Column="1" Margin="100 70" CornerRadius="5" Background="#68F6F6F6" Padding="10" BorderBrush="Silver" BorderThickness="1">
+                <Border Grid.Column="1" Margin="100 70" CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="10" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
                     <Grid TextElement.Foreground="{StaticResource GrayBrush280}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
@@ -42,19 +42,19 @@
                             <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
 
                             <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Organization</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default RML</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Loaded RML</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name"></ComboBox>
 
                             <TextBlock FontWeight="SemiBold">Default Color Space</TextBlock>
-                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name"></ComboBox>
+                            <ComboBox Background="{StaticResource Combobox.Background}" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name"></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>
@@ -68,7 +68,7 @@
                             <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
                             <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
                         </controls:TableGrid>
-                        <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="Silver" HorizontalAlignment="Center" Margin="50 50" />
+                        <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="{StaticResource borderBrush}" HorizontalAlignment="Center" Margin="50 50" />
                         <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
                             <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
                             <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoLogin}"></ToggleButton>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
index 41dc0554c..466e6f458 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
@@ -60,7 +60,7 @@
                 </StackPanel>
             </Grid>
             <Grid IsEnabled="{Binding IsFree}">
-                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding EditMachineCommand}" Margin="0 0 0 10" SelectionMode="Single" SelectionUnit="FullRow" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding MachinesAdapter.Machines}" SelectedItem="{Binding SelectedMachine}">
+                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding EditMachineCommand}" Margin="0 0 0 10" SelectionMode="Single" SelectionUnit="FullRow" BorderBrush="{StaticResource borderBrush}" IsReadOnly="True" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding MachinesAdapter.Machines}" SelectedItem="{Binding SelectedMachine}">
                     <DataGrid.CellStyle>
                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                             <Setter Property="BorderThickness" Value="0"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
index 3641492df..3663f72f8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
@@ -46,7 +46,7 @@
                         </StackPanel>
                     </Grid>
                     <Grid>
-                        <DataGrid Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="Silver" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding ActiveMachine.Spools}" SelectedItem="{Binding SelectedSpool}">
+                        <DataGrid Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="{StaticResource borderBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding ActiveMachine.Spools}" SelectedItem="{Binding SelectedSpool}">
                             <DataGrid.CellStyle>
                                 <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                     <Setter Property="BorderThickness" Value="0"/>
-- 
cgit v1.3.1