Machine Studio : added configuration for dark /light theme

2 files changed, 378 insertions, 16 deletions

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