From e4a0b6b162fce311af1d47bc459eaa9d28f00c27 Mon Sep 17 00:00:00 2001
From: Basewq <Basewq@users.noreply.github.com>
Date: Sat, 28 Mar 2020 19:24:51 +1300
Subject: [PATCH 1/4] [Editor] Change Editor settings properties panel's
 background color to be consistent with the Component properties panel

---
 .../editor/Stride.Core.Assets.Editor/View/SettingsWindow.xaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/editor/Stride.Core.Assets.Editor/View/SettingsWindow.xaml b/sources/editor/Stride.Core.Assets.Editor/View/SettingsWindow.xaml
index 2b5bdaed24..d33a123d27 100644
--- a/sources/editor/Stride.Core.Assets.Editor/View/SettingsWindow.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/View/SettingsWindow.xaml
@@ -57,7 +57,7 @@
 
       <GridSplitter Grid.Column="1" Width="5" ResizeBehavior="PreviousAndNext" VerticalAlignment="Stretch" />
 
-      <sd:PropertyView NameColumnSize="310" Grid.Column="2" ItemsSource="{Binding ViewModel.RootNode.Children}" BorderThickness="1" Background="{DynamicResource HoverBrush}" Padding="5">
+      <sd:PropertyView NameColumnSize="310" Grid.Column="2" ItemsSource="{Binding ViewModel.RootNode.Children}" BorderThickness="1" Background="{DynamicResource BackgroundBrush}" Padding="5">
         <sd:PropertyView.ItemContainerStyle>
           <Style BasedOn="{StaticResource {x:Type sd:PropertyViewItem}}" TargetType="sd:PropertyViewItem">
             <Setter Property="Background" Value="Transparent"/>

From 801e36ebc290b599db46cd33a3bf12795353be69 Mon Sep 17 00:00:00 2001
From: Basewq <Basewq@users.noreply.github.com>
Date: Fri, 27 Mar 2020 18:51:57 +1300
Subject: [PATCH 2/4] [Editor] Add Theme (color scheme) config option

---
 .../Settings/EditorSettings.cs                |   3 +
 .../Settings/ThemesSettings.cs                |  29 ++++
 ...leflowView.ExpressionDark.normalcolor.xaml |   2 +-
 .../Themes/ThemeSelector.xaml                 |  11 ++
 .../Themes/generic.xaml                       |   2 +-
 .../View/CommonResources.xaml                 |   6 +-
 .../View/DebugTools/DebugWindow.xaml          |   2 +-
 .../View/NotificationWindow.xaml              |   2 +-
 .../Stride.GameStudio/Theme.AvalonDock.xaml   |   4 -
 .../PrivacyPolicyWindow.xaml                  |   2 +-
 sources/launcher/Stride.Launcher/App.xaml     |   4 +-
 .../Themes/Overrides/DarkSteelTheme.xaml      | 124 +++++++++++++++++
 .../Themes/Overrides/ExpressionDarkTheme.xaml | 130 +++++++++++++++++
 .../Themes/ThemeController.cs                 |   2 +
 .../Themes/ThemeResourceDictionary.cs         |  49 +++++++
 .../Theme.xaml => ThemeSelector.xaml}         | 131 +++---------------
 .../Theme.xaml.cs => ThemeSelector.xaml.cs}   |   6 +-
 .../Themes/ThemeType.cs                       |  13 ++
 18 files changed, 391 insertions(+), 131 deletions(-)
 create mode 100644 sources/editor/Stride.Core.Assets.Editor/Settings/ThemesSettings.cs
 create mode 100644 sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml
 create mode 100644 sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
 create mode 100644 sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
 create mode 100644 sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs
 rename sources/presentation/Stride.Core.Presentation/Themes/{ExpressionDark/Theme.xaml => ThemeSelector.xaml} (98%)
 rename sources/presentation/Stride.Core.Presentation/Themes/{ExpressionDark/Theme.xaml.cs => ThemeSelector.xaml.cs} (82%)
 create mode 100644 sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs

diff --git a/sources/editor/Stride.Core.Assets.Editor/Settings/EditorSettings.cs b/sources/editor/Stride.Core.Assets.Editor/Settings/EditorSettings.cs
index 66461f0d17..db424e374f 100644
--- a/sources/editor/Stride.Core.Assets.Editor/Settings/EditorSettings.cs
+++ b/sources/editor/Stride.Core.Assets.Editor/Settings/EditorSettings.cs
@@ -124,10 +124,13 @@ static EditorSettings()
         public static void Initialize()
         {
             profile = SettingsContainer.LoadSettingsProfile(EditorPath.EditorConfigPath, true) ?? SettingsContainer.CreateSettingsProfile(true);
+            Presentation.Themes.ThemesSettings.Initialize();
 
             // Settings that requires a restart must register here:
             UseEffectCompilerServer.ChangesValidated += (s, e) => NeedRestart = true;
             Language.ChangesValidated += (s, e) => NeedRestart = true;
+
+            Presentation.Themes.ThemesSettings.ThemeName.ChangesValidated += (s, e) => NeedRestart = true;
         }
 
         public static void Save()
diff --git a/sources/editor/Stride.Core.Assets.Editor/Settings/ThemesSettings.cs b/sources/editor/Stride.Core.Assets.Editor/Settings/ThemesSettings.cs
new file mode 100644
index 0000000000..889a546122
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor/Settings/ThemesSettings.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Stride contributors (https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Stride.Core.Assets.Editor.Settings;
+using Stride.Core.Settings;
+using Stride.Core.Translation;
+
+namespace Stride.Core.Presentation.Themes
+{
+    public static class ThemesSettings
+    {
+        // Categories
+        public static readonly string Themes = Tr._p("Settings", "Themes");
+
+        static ThemesSettings()
+        {
+            ThemeName = new SettingsKey<ThemeType>("Themes/ThemeName", EditorSettings.SettingsContainer, ThemeType.ExpressionDark)
+            {
+                DisplayName = $"{Themes}/{Tr._p("Settings", "Theme Name")}"
+            };
+        }
+
+        public static SettingsKey<ThemeType> ThemeName { get; }
+
+        public static void Initialize()
+        {
+            ThemeController.CurrentTheme = ThemeName.GetValue();
+        }
+    }
+}
diff --git a/sources/editor/Stride.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml b/sources/editor/Stride.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml
index d270f020e9..5c45545319 100644
--- a/sources/editor/Stride.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml
@@ -20,7 +20,7 @@
 
   <ResourceDictionary.MergedDictionaries>
 
-    <ResourceDictionary Source="pack://application:,,,/Stride.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
+    <ResourceDictionary Source="pack://application:,,,/Stride.Core.Presentation;component/Themes/ThemeSelector.xaml"/>
 
     <!-- Include the view independant, color-scheme independant, theme resources -->
     <ResourceDictionary Source="Resources/ExpressionDark.normalcolor.Resources.xaml" />
diff --git a/sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml b/sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml
new file mode 100644
index 0000000000..2c5c0b6de2
--- /dev/null
+++ b/sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml
@@ -0,0 +1,11 @@
+<!--
+// ExpressionDark is the default/fallback theme.
+// When adding a new theme, ensure all themes:ThemeResourceDictionary in every *.xaml files
+// are updated to ensure the theme is correctly applied.
+-->
+<themes:ThemeResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                xmlns:themes="clr-namespace:Stride.Core.Presentation.Themes;assembly=Stride.Core.Presentation"
+                                Source="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"
+                                ExpressionDarkSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"
+                                DarkSteelSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml">
+</themes:ThemeResourceDictionary>
diff --git a/sources/editor/Stride.Core.Assets.Editor/Themes/generic.xaml b/sources/editor/Stride.Core.Assets.Editor/Themes/generic.xaml
index d4d41b2470..1e77b1d0d6 100644
--- a/sources/editor/Stride.Core.Assets.Editor/Themes/generic.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/Themes/generic.xaml
@@ -6,7 +6,7 @@
                     xmlns:diagnostics="clr-namespace:Stride.Core.Assets.Diagnostics;assembly=Stride.Core.Assets">
 
   <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
+    <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ThemeSelector.xaml" />
     <ResourceDictionary Source="/Stride.Core.Assets.Editor;component/View/CommonResources.xaml" />
   </ResourceDictionary.MergedDictionaries>
   
diff --git a/sources/editor/Stride.Core.Assets.Editor/View/CommonResources.xaml b/sources/editor/Stride.Core.Assets.Editor/View/CommonResources.xaml
index c4cc62f463..fe31bc2745 100644
--- a/sources/editor/Stride.Core.Assets.Editor/View/CommonResources.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/View/CommonResources.xaml
@@ -9,9 +9,9 @@
                     mc:Ignorable="d">
 
   <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
-    <ResourceDictionary Source="ImageDictionary.xaml"/>
-    <ResourceDictionary Source="../Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"/>
+    <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ThemeSelector.xaml" />
+    <ResourceDictionary Source="ImageDictionary.xaml" />
+    <ResourceDictionary Source="../Themes/ThemeSelector.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
   <Style TargetType="view:DataGridEx">
diff --git a/sources/editor/Stride.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml b/sources/editor/Stride.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml
index 829a56d6fc..4b992c7eae 100644
--- a/sources/editor/Stride.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml
@@ -9,7 +9,7 @@
   <Window.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
+        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ThemeSelector.xaml"/>
         <ResourceDictionary Source="../ImageDictionary.xaml"/>
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
diff --git a/sources/editor/Stride.Core.Assets.Editor/View/NotificationWindow.xaml b/sources/editor/Stride.Core.Assets.Editor/View/NotificationWindow.xaml
index 4b9c7fb0e3..083081f53d 100644
--- a/sources/editor/Stride.Core.Assets.Editor/View/NotificationWindow.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/View/NotificationWindow.xaml
@@ -9,7 +9,7 @@
     <ResourceDictionary>
       <!-- MERGED DICTIONARIES: IMAGE DICTIONARY, PROPERTY GRID VIEWS -->
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
+        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ThemeSelector.xaml"/>
       </ResourceDictionary.MergedDictionaries>
 
       <Style TargetType="Hyperlink">
diff --git a/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml b/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml
index 9461bf2726..c355ebbb46 100644
--- a/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml
+++ b/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml
@@ -27,10 +27,6 @@
     <ResourceDictionary Source="/Stride.Core.Assets.Editor;component/View/CommonResources.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
-  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#101011" />
-  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
-  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
-
   <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
   <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
   <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
diff --git a/sources/editor/Stride.PrivacyPolicy/PrivacyPolicyWindow.xaml b/sources/editor/Stride.PrivacyPolicy/PrivacyPolicyWindow.xaml
index 9124c34189..ccb8bfd30a 100644
--- a/sources/editor/Stride.PrivacyPolicy/PrivacyPolicyWindow.xaml
+++ b/sources/editor/Stride.PrivacyPolicy/PrivacyPolicyWindow.xaml
@@ -9,7 +9,7 @@
   <Window.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml" />
+        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ThemeSelector.xaml" />
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </Window.Resources>
diff --git a/sources/launcher/Stride.Launcher/App.xaml b/sources/launcher/Stride.Launcher/App.xaml
index e1fb089f61..21624885e8 100644
--- a/sources/launcher/Stride.Launcher/App.xaml
+++ b/sources/launcher/Stride.Launcher/App.xaml
@@ -4,7 +4,7 @@
   <Application.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
+        <ResourceDictionary Source="/Stride.Core.Presentation;component/Themes/ThemeSelector.xaml"/>
       </ResourceDictionary.MergedDictionaries>
       <DrawingImage x:Key="VectorEditorIcon">
         <DrawingImage.Drawing>
@@ -12,7 +12,7 @@
             <GeometryDrawing Brush="#101011" Geometry="M1.68887,5.08005 L10.2627,0 L18.3635,4.84767 L18.3654,5.46729 L14.6718,7.6596 L18.3335,9.84063 L18.3335,15.0019 L9.9374,20 L1.53998,15.0864 L1.54229,14.4645 L5.22764,12.3475 L1.68887,10.2397 z M17.5552,5.16011 L10.2682,0.788518 L2.67402,5.27561 L10.0112,9.64581 L13.8477,7.36068 z M9.6841,10.2397 L2.34302,5.86717 L2.34302,9.84062 L9.6841,14.2131 z M17.3443,10.0402 L14.0088,8.05343 L10.3383,10.2397 L10.3383,14.2131 z M17.6793,14.2131 L17.6793,10.6293 L14.6709,12.4212 z M10.0112,15.1967 L5.89594,12.7455 L2.35648,14.7788 L9.93464,19.213 L17.3442,14.8022 L14.0088,12.8156 z" />
           </DrawingGroup>
         </DrawingImage.Drawing>
-      </DrawingImage>    
+      </DrawingImage>
     </ResourceDictionary>
   </Application.Resources>
 </Application>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
new file mode 100644
index 0000000000..794c9fb0c7
--- /dev/null
+++ b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
@@ -0,0 +1,124 @@
+<!--
+// Copyright (c) Stride contributors (https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    x:Class="Stride.Core.Presentation.Themes.Overrides.DarkSteelTheme"
+                    mc:Ignorable="d">
+  <!-- Main Colors -->
+
+  <Color x:Key="MainColor">#FF595959</Color>
+  <Color x:Key="HoverColor">#FF393939</Color>
+  <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+  <SolidColorBrush x:Key="LightBrush" Color="#FF4D4D4D" />
+  <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
+
+  <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
+  <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
+
+  <Color x:Key="BlackColor">#FF000000</Color>
+  <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+
+  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#4F4F54" />
+  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
+  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
+
+  <SolidColorBrush x:Key="BackgroundBrush" Color="#3C3C3E"/>
+  <SolidColorBrush x:Key="TextBrush" Color="#EBEBEB" />
+  <SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
+  <SolidColorBrush x:Key="NormalBrush" Color="#4E4E51" />
+  <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF5E5E60" />
+  <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
+  <SolidColorBrush x:Key="GlyphBrush" Color="#FFD9D9D9" />
+
+  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#3C3C3E" />
+  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#545454" />
+  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
+
+  <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
+
+  <SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
+  <SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
+  <SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
+  <SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
+  <SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
+
+  <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#323234" />
+
+  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
+
+  <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
+  <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
+
+  <Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
+  <SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
+
+  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#656565" />
+  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
+  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
+
+  <SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
+  <SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
+  <SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="#1F1F20" />
+
+  <SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
+
+  <SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FF878787"/>
+  <SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#FF969696"/>
+
+  <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
+  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF4D4D4D"/>
+  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#4A4A4C"/>
+  <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
+
+  <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
+  <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
+
+  <SolidColorBrush x:Key="MenuBackgroundBrush" Color="#1D1D1F"/>
+  <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF888888" />
+  <SolidColorBrush x:Key="ButtonNormalBackground" Color="#47474A"/>
+
+  <SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FF494949"/>
+
+  <SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
+  <SolidColorBrush x:Key="MenuBorderBrush" Color="#6B6B6E"/>
+
+  <SolidColorBrush x:Key="ListBorder" Color="#828790" />
+  <SolidColorBrush x:Key="ToolBarGripper" Color="#3A3A3A"/>
+  <SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
+  <SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFFFFFFF"/>
+  <SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
+  <SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FF525252"/>
+  <SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#FF303033"/>
+
+  <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
+
+  <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
+  <!-- EXPRESSION COMMON VALUES -->
+
+  <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#59FFFFFF" Offset="0" />
+    <GradientStop Color="#00FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#4CFFFFFF" Offset="0" />
+    <GradientStop Color="#26FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+    <GradientStop Color="#00FFFFFF" Offset="0.856" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+    <GradientStop Color="#444" Offset="0.0" />
+    <GradientStop Color="#888" Offset="1.0" />
+  </LinearGradientBrush>
+
+</ResourceDictionary>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
new file mode 100644
index 0000000000..77fa0ad10e
--- /dev/null
+++ b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
@@ -0,0 +1,130 @@
+<!--
+// Copyright (c) Stride contributors (https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+//
+// Original code:
+// (c) Copyright Microsoft Corporation.
+// This source is subject to Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    x:Class="Stride.Core.Presentation.Themes.Overrides.ExpressionDarkTheme"
+                    mc:Ignorable="d">
+  <!-- Main Colors -->
+
+  <Color x:Key="MainColor">#FF595959</Color>
+  <Color x:Key="HoverColor">#FF393939</Color>
+  <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+  <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
+  <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
+
+  <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
+  <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
+
+  <Color x:Key="BlackColor">#FF000000</Color>
+  <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+
+  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#101011" />
+  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
+  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
+
+  <SolidColorBrush x:Key="BackgroundBrush" Color="#1A1A1D"/>
+  <SolidColorBrush x:Key="TextBrush" Color="#E6E6E6" />
+  <SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
+  <SolidColorBrush x:Key="NormalBrush" Color="#3E3E40" />
+  <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
+  <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
+  <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
+
+  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#161616" />
+  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#333333" />
+  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
+
+  <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
+
+  <SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
+  <SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
+  <SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
+  <SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
+  <SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
+
+  <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#101011" />
+
+  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
+
+  <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
+  <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
+
+  <Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
+  <SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
+
+  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#656565" />
+  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
+  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
+
+  <SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
+  <SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
+  <SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="#1F1F20" />
+
+  <SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
+
+  <SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FF878787"/>
+  <SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#FF969696"/>
+
+  <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
+  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF333333"/>
+  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#3E3E40"/>
+  <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
+
+  <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
+  <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
+
+  <SolidColorBrush x:Key="MenuBackgroundBrush" Color="#040405"/>
+  <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF888888" />
+  <SolidColorBrush x:Key="ButtonNormalBackground" Color="#2D2D2D"/>
+
+  <SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FF494949"/>
+
+  <SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
+  <SolidColorBrush x:Key="MenuBorderBrush" Color="#212125"/>
+
+  <SolidColorBrush x:Key="ListBorder" Color="#828790" />
+  <SolidColorBrush x:Key="ToolBarGripper" Color="#3A3A3A"/>
+  <SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
+  <SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFFFFFFF"/>
+  <SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
+  <SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FF525252"/>
+  <SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#FF101011"/>
+
+  <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
+
+  <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
+  <!-- EXPRESSION COMMON VALUES -->
+
+  <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#59FFFFFF" Offset="0" />
+    <GradientStop Color="#00FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#4CFFFFFF" Offset="0" />
+    <GradientStop Color="#26FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+    <GradientStop Color="#00FFFFFF" Offset="0.856" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+    <GradientStop Color="#444" Offset="0.0" />
+    <GradientStop Color="#888" Offset="1.0" />
+  </LinearGradientBrush>
+
+</ResourceDictionary>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeController.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeController.cs
index ffe4a4a722..a06fc71be7 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ThemeController.cs
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeController.cs
@@ -26,5 +26,7 @@ public static void SetIsDark(DependencyObject obj, bool value)
         {
             obj.SetValue(IsDarkProperty, value);
         }
+
+        public static ThemeType CurrentTheme { get; set; }
     }
 }
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs
new file mode 100644
index 0000000000..7ced3208a9
--- /dev/null
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Stride contributors (https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Windows;
+
+namespace Stride.Core.Presentation.Themes
+{
+    public class ThemeResourceDictionary : ResourceDictionary
+    {
+        private Uri expressionDarkSource;
+        private Uri darkSteelSource;
+
+        // New themes are added here as new properties.
+
+        public Uri ExpressionDarkSource
+        {
+            get => expressionDarkSource;
+            set => SetValue(ref expressionDarkSource,  value);
+        }
+
+        public Uri DarkSteelSource
+        {
+            get => darkSteelSource;
+            set => SetValue(ref darkSteelSource, value);
+        }
+
+        public void UpdateSource(ThemeType themeType)
+        {
+            switch (themeType)
+            {
+                case ThemeType.ExpressionDark:
+                    if (ExpressionDarkSource != null)
+                        Source = ExpressionDarkSource;
+                    break;
+
+                case ThemeType.DarkSteel:
+                    if (DarkSteelSource != null)
+                        Source = DarkSteelSource;
+                    break;
+            }
+        }
+
+        private void SetValue(ref Uri sourceBackingField, Uri value)
+        {
+            sourceBackingField = value;
+            UpdateSource(ThemeController.CurrentTheme);
+        }
+    }
+}
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ExpressionDark/Theme.xaml b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
similarity index 98%
rename from sources/presentation/Stride.Core.Presentation/Themes/ExpressionDark/Theme.xaml
rename to sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
index 64a985e34b..48b39f6507 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ExpressionDark/Theme.xaml
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
@@ -1,4 +1,8 @@
 <!--
+// Copyright (c) Stride contributors (https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+//
+// Original code:
 // (c) Copyright Microsoft Corporation.
 // This source is subject to Microsoft Public License (Ms-PL).
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
@@ -19,122 +23,22 @@
                     xmlns:wnd="clr-namespace:Stride.Core.Presentation.Windows"
                     xmlns:local="clr-namespace:Stride.Core.Presentation"
                     xmlns:sd="http://schemas.stride3d.net/xaml/presentation"
-                    x:Class="Stride.Core.Presentation.Themes.ExpressionDark.ExpressionDarkTheme"
+                    xmlns:themes="clr-namespace:Stride.Core.Presentation.Themes"
+                    x:Class="Stride.Core.Presentation.Themes.ThemeSelector"
                     mc:Ignorable="d">
   <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../generic.xaml"/>
+    <ResourceDictionary Source="generic.xaml"/>
     <ResourceDictionary Source="pack://application:,,,/Stride.Core.Presentation;component/Resources/VectorResources.xaml" />
+    <!--
+    // ExpressionDark is the default/fallback theme.
+    // When adding a new theme, ensure all themes:ThemeResourceDictionary in every *.xaml files
+    // are updated to ensure the theme is correctly applied.
+    -->
+    <themes:ThemeResourceDictionary Source="Overrides/ExpressionDarkTheme.xaml"
+                                    ExpressionDarkSource="Overrides/ExpressionDarkTheme.xaml"
+                                    DarkSteelSource="Overrides/DarkSteelTheme.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
-  <!-- Main Colors -->
-
-  <Color x:Key="MainColor">#FF595959</Color>
-  <Color x:Key="HoverColor">#FF393939</Color>
-  <Color x:Key="DefaultColor">#FF9BB1C5</Color>
-  <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
-  <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
-
-  <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
-  <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
-
-  <Color x:Key="BlackColor">#FF000000</Color>
-  <Color x:Key="WhiteColor">#FFFFFFFF</Color>
-
-  <SolidColorBrush x:Key="BackgroundBrush" Color="#1A1A1D"/>
-  <SolidColorBrush x:Key="TextBrush" Color="#E6E6E6" />
-  <SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
-  <SolidColorBrush x:Key="NormalBrush" Color="#3E3E40" />
-  <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
-  <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
-  <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
-
-  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#161616" />
-  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#333333" />
-  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
-
-  <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
-
-  <SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
-  <SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
-  <SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
-  <SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
-  <SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
-
-  <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#101011" />
-
-  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
-
-  <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
-  <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
-
-  <Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
-  <SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
-
-  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#656565" />
-  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
-  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
-  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
-
-  <SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
-  <SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
-  <SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="#1F1F20" />
-
-  <SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
-
-  <SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FF878787"/>
-  <SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#FF969696"/>
-
-  <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
-  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
-  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF333333"/>
-  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#3E3E40"/>
-  <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
-
-  <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
-  <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
-
-  <SolidColorBrush x:Key="MenuBackgroundBrush" Color="#040405"/>
-  <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF888888" />
-  <SolidColorBrush x:Key="ButtonNormalBackground" Color="#2D2D2D"/>
-
-  <SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FF494949"/>
-
-  <SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
-  <SolidColorBrush x:Key="MenuBorderBrush" Color="#212125"/>
-
-  <SolidColorBrush x:Key="ListBorder" Color="#828790" />
-  <SolidColorBrush x:Key="ToolBarGripper" Color="#3A3A3A"/>
-  <SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
-  <SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFFFFFFF"/>
-  <SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
-  <SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FF525252"/>
-  <SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#FF101011"/>
-
-  <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
-
-  <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
-  <!-- EXPRESSION COMMON VALUES -->
-
-  <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
-    <GradientStop Color="#59FFFFFF" Offset="0" />
-    <GradientStop Color="#00FFFFFF" Offset="1" />
-    <GradientStop Color="#26FFFFFF" Offset="0.467" />
-    <GradientStop Color="#00FFFFFF" Offset="0.475" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
-    <GradientStop Color="#4CFFFFFF" Offset="0" />
-    <GradientStop Color="#26FFFFFF" Offset="1" />
-    <GradientStop Color="#26FFFFFF" Offset="0.467" />
-    <GradientStop Color="#00FFFFFF" Offset="0.475" />
-    <GradientStop Color="#00FFFFFF" Offset="0.856" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
-    <GradientStop Color="#444" Offset="0.0" />
-    <GradientStop Color="#888" Offset="1.0" />
-  </LinearGradientBrush>
-
   <Geometry x:Key="GeometryDebugMessage">F1 M 46.5,19C 47.8807,19 49,20.1193 49,21.5C 49,22.8807 47.8807,24 46.5,24L 45.8641,23.9184L 43.5566,26.8718C 45.1489,28.0176 46.5309,29.6405 47.6023,31.6025C 44.8701,32.4842 41.563,33 38,33C 34.4369,33 31.1299,32.4842 28.3977,31.6025C 29.4333,29.7061 30.7591,28.1265 32.2844,26.9882L 29.9221,23.9646C 29.7849,23.9879 29.6438,24 29.5,24C 28.1193,24 27,22.8808 27,21.5C 27,20.1193 28.1193,19 29.5,19C 30.8807,19 32,20.1193 32,21.5C 32,22.0018 31.8521,22.4691 31.5976,22.8607L 34.0019,25.938C 35.2525,25.3305 36.5982,25 38,25C 39.3339,25 40.617,25.2993 41.8156,25.8516L 44.2947,22.6786C 44.1066,22.3274 44,21.9262 44,21.5C 44,20.1193 45.1193,19 46.5,19 Z M 54.5,40C 55.3284,40 56,40.6716 56,41.5C 56,42.3284 55.3284,43 54.5,43L 49.9511,43C 49.88,44.0847 49.7325,45.1391 49.5162,46.1531L 54.8059,48.6197C 55.5567,48.9698 55.8815,49.8623 55.5314,50.6131C 55.1813,51.3639 54.2889,51.6887 53.5381,51.3386L 48.6665,49.067C 46.8161,53.9883 43.2172,57.4651 39,57.9435L 39,34.9864C 42.541,34.8897 45.7913,34.283 48.4239,33.3201L 48.6187,33.8074L 53.73,31.8454C 54.5034,31.5485 55.371,31.9348 55.6679,32.7082C 55.9648,33.4816 55.5785,34.3492 54.8051,34.6461L 49.482,36.6895C 49.717,37.7515 49.8763,38.859 49.9511,40L 54.5,40 Z M 21.5,40L 26.0489,40C 26.1237,38.859 26.2829,37.7516 26.518,36.6895L 21.1949,34.6461C 20.4215,34.3492 20.0352,33.4816 20.332,32.7082C 20.6289,31.9348 21.4966,31.5485 22.27,31.8454L 27.3812,33.8074L 27.5761,33.3201C 30.2087,34.283 33.4589,34.8897 37,34.9864L 37,57.9435C 32.7827,57.4651 29.1838,53.9883 27.3335,49.067L 22.4618,51.3387C 21.711,51.6888 20.8186,51.3639 20.4685,50.6131C 20.1184,49.8623 20.4432,48.9699 21.194,48.6198L 26.4838,46.1531C 26.2674,45.1392 26.12,44.0847 26.0489,43L 21.5,43C 20.6716,43 20,42.3285 20,41.5C 20,40.6716 20.6716,40 21.5,40 Z</Geometry>
   <Geometry x:Key="GeometryVerboseMessage">F1 M 40.3806,19.0027C 49.5637,19.0027 57.008,23.611 57.008,29.2958C 57.008,32.9008 54.0141,36.073 49.4815,37.9115C 50.4478,39.7772 52.1442,41.8291 53.8406,44.4135C 50.3128,43.1826 45.0382,41.9924 41.9082,39.546L 40.3806,39.5889C 31.1976,39.5889 23.7533,34.9805 23.7533,29.2958C 23.7533,23.611 31.1976,19.0027 40.3806,19.0027 Z M 44.3395,43.5477C 44.3395,48.3579 38.6677,52.2573 31.6711,52.2573L 30.7082,52.2325C 28.1329,54.6161 24.5589,57.008 20.5862,57.008C 21.5113,55.1577 23.5174,53.3075 24.7099,50.8257C 21.2717,49.2683 19.0026,46.5902 19.0026,43.5477C 19.0026,40.5065 21.27,37.8293 24.706,36.2715C 27.6472,39.1709 32.8586,41.0982 38.7973,41.0982L 40.3249,41.0553C 41.4454,41.9312 42.8409,42.646 44.3327,43.2594L 44.3395,43.5477 Z</Geometry>
   <Geometry x:Key="GeometryInfoMessage">F1 M 38,19C 48.4934,19 57,27.5066 57,38C 57,48.4934 48.4934,57 38,57C 27.5066,57 19,48.4934 19,38C 19,27.5066 27.5066,19 38,19 Z M 33.25,33.25L 33.25,36.4167L 36.4166,36.4167L 36.4166,47.5L 33.25,47.5L 33.25,50.6667L 44.3333,50.6667L 44.3333,47.5L 41.1666,47.5L 41.1666,36.4167L 41.1666,33.25L 33.25,33.25 Z M 38.7917,25.3333C 37.48,25.3333 36.4167,26.3967 36.4167,27.7083C 36.4167,29.02 37.48,30.0833 38.7917,30.0833C 40.1033,30.0833 41.1667,29.02 41.1667,27.7083C 41.1667,26.3967 40.1033,25.3333 38.7917,25.3333 Z</Geometry>
@@ -165,7 +69,6 @@
   <BitmapImage x:Key="ImageLocked" UriSource="pack://application:,,,/Stride.Core.Presentation;component/Resources/Images/lock.png" />
   <BitmapImage x:Key="ImageUnlocked" UriSource="pack://application:,,,/Stride.Core.Presentation;component/Resources/Images/lock-unlock.png" />
   <BitmapImage x:Key="ImageLength" UriSource="pack://application:,,,/Stride.Core.Presentation;component/Resources/Images/ruler-triangle.png" />
-
   <!--  WINDOWS  -->
   <Style TargetType="{x:Type Window}" x:Key="WindowChromeStyle">
     <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
@@ -179,7 +82,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="Window">
-          <Grid Background="#1A1A1D" Margin="6">
+          <Grid Background="{StaticResource BackgroundBrush}" Margin="6">
             <Border x:Name="ContentBorder" Background="{StaticResource BackgroundBrush}" BorderBrush="Black" BorderThickness="1" IsHitTestVisible="True">
               <DockPanel>
                 <DockPanel x:Name="TitleBar" DockPanel.Dock="Top" VerticalAlignment="Top" WindowChrome.IsHitTestVisibleInChrome="False"
@@ -194,7 +97,7 @@
                         <ContentPresenter Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"/>
                       </ControlTemplate>
                     </Button.Template>
-                    <Image Source="{DynamicResource VectorEditorIcon}" Width="20" Margin="0,3,0,2"/>
+                    <Image Source="{DynamicResource VectorEditorIcon}" Width="22" Opacity="0.5"/>
                   </Button>
                   <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Title}" Margin="0,4" FontSize="13"/>
                 </DockPanel>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ExpressionDark/Theme.xaml.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml.cs
similarity index 82%
rename from sources/presentation/Stride.Core.Presentation/Themes/ExpressionDark/Theme.xaml.cs
rename to sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml.cs
index 03bd47b79f..6b3f36788e 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ExpressionDark/Theme.xaml.cs
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml.cs
@@ -5,11 +5,11 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace Stride.Core.Presentation.Themes.ExpressionDark
+namespace Stride.Core.Presentation.Themes
 {
-    public partial class ExpressionDarkTheme : ResourceDictionary
+    public partial class ThemeSelector : ResourceDictionary
     {
-        public ExpressionDarkTheme()
+        public ThemeSelector()
         {
             InitializeComponent();
         }
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
new file mode 100644
index 0000000000..ff24a791a4
--- /dev/null
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Stride contributors (https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+namespace Stride.Core.Presentation.Themes
+{
+    public enum ThemeType
+    {
+        [Display("Expression Dark (Default)")]
+        ExpressionDark,
+        [Display("Dark Steel")]
+        DarkSteel,
+    }
+}

From 13065676d8dbd1c1aa3de44890fbd225c0dca3b6 Mon Sep 17 00:00:00 2001
From: Basewq <Basewq@users.noreply.github.com>
Date: Sun, 12 Apr 2020 12:49:23 +1200
Subject: [PATCH 3/4] [Editor] Clarify xaml key names and split keys for
 preparation for light base theme

---
 .../Views/EntityHierarchyEditorView.xaml      |  13 +-
 .../Views/GraphicsCompositorEditorView.xaml   |   4 +-
 .../Resources/ThemeScriptEditor.xaml          |  32 ++---
 .../ScriptEditor/SimpleCodeTextEditor.cs      |   3 +-
 .../Themes/Generic.xaml                       |   2 +-
 .../View/SkeletonPropertyTemplates.xaml       |   2 +-
 .../DefaultPropertyTemplateProviders.xaml     |   7 +-
 .../Stride.GameStudio/GameStudioWindow.xaml   |  35 ++++-
 .../Stride.GameStudio/Theme.AvalonDock.xaml   |  55 ++++---
 .../MarkupExtensions/ImageExtension.cs        |   2 +-
 .../MarkupExtensions/ThemedSourceExtension.cs |   2 +-
 .../Themes/IconThemeSelector.cs               |   8 +-
 .../Themes/Overrides/DarkSteelTheme.xaml      |  34 ++++-
 .../Themes/Overrides/ExpressionDarkTheme.xaml |  34 ++++-
 .../Themes/ThemeSelector.xaml                 | 136 ++++++++++--------
 .../Themes/ThemeSelector.xaml.cs              |   2 +-
 .../Themes/ThemeType.cs                       |  14 ++
 17 files changed, 239 insertions(+), 146 deletions(-)

diff --git a/sources/editor/Stride.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml b/sources/editor/Stride.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml
index 5fd8911f31..45dfb74686 100644
--- a/sources/editor/Stride.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml
+++ b/sources/editor/Stride.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml
@@ -249,12 +249,15 @@
                   <DataTrigger Binding="{Binding Owner.IsLoaded, Mode=OneWay}" Value="{sd:False}">
                     <Setter Property="Foreground" Value="{StaticResource UnloadedColor}"/>
                   </DataTrigger>
+                  <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type sd:TreeViewItem}}, Mode=OneWay}" Value="True">
+                    <Setter Property="Foreground" Value="{StaticResource SelectedTextBrush}"/>
+                  </DataTrigger>
                 </Style.Triggers>
               </Style>
               <!-- Loading style -->
               <Style x:Key="LoadingStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}" d:DataContext="{d:DesignInstance ehvm:EntityHierarchyElementViewModel}">
                 <Setter Property="Margin" Value="4,0"/>
-                <Setter Property="Foreground" Value="#FF00FF70" />
+                <Setter Property="Foreground" Value="{StaticResource LoadingAssetMessageFromBrush}" />
                 <Setter Property="Text" Value="{sd:Localize Loading...}" />
                 <Setter Property="Visibility" Value="{Binding IsLoading, Mode=OneWay, Converter={sd:VisibleOrCollapsed}}" />
                 <Style.Triggers>
@@ -264,7 +267,8 @@
                   <EventTrigger RoutedEvent="TextBlock.Loaded">
                     <BeginStoryboard>
                       <Storyboard>
-                        <ColorAnimation From="#FF00FF70" To="White" Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)" BeginTime="0:0:0.3" Duration="0:0:0.2" AutoReverse="True" RepeatBehavior="Forever"/>
+                        <ColorAnimation From="{StaticResource LoadingAssetMessageFromColor}" To="{StaticResource LoadingAssetMessageToColor}"
+                                        Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)" BeginTime="0:0:0.3" Duration="0:0:0.2" AutoReverse="True" RepeatBehavior="Forever"/>
                       </Storyboard>
                     </BeginStoryboard>
                   </EventTrigger>
@@ -746,12 +750,13 @@
                             ToolTip="{sd:Localize Show or hide selection mask, Context=ToolTip}" sd:ToolTipHelper.Status="{Binding Session.Editor.Status}" ToolTipService.ShowOnDisabled="True" />
               <Separator Background="{StaticResource ToggleButtonNormalBackground}"/>
               <TextBlock Text="{sd:Localize Loading assets...}" Visibility="{Binding CompilingAssets, Converter={sd:VisibleOrCollapsed}}"
-                         VerticalAlignment="Center" FontWeight="Bold" Foreground="#FF00FF70">
+                         VerticalAlignment="Center" FontWeight="Bold" Foreground="{StaticResource LoadingAssetMessageFromBrush}">
                 <TextBlock.Triggers>
                   <EventTrigger RoutedEvent="TextBlock.Loaded">
                     <BeginStoryboard>
                       <Storyboard>
-                        <ColorAnimation From="#FF00FF70" To="White" Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)" BeginTime="0:0:0.3" Duration="0:0:0.2" AutoReverse="True" RepeatBehavior="Forever"/>
+                        <ColorAnimation From="{StaticResource LoadingAssetMessageFromColor}" To="{StaticResource LoadingAssetMessageToColor}"
+                                        Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)" BeginTime="0:0:0.3" Duration="0:0:0.2" AutoReverse="True" RepeatBehavior="Forever"/>
                       </Storyboard>
                     </BeginStoryboard>
                   </EventTrigger>
diff --git a/sources/editor/Stride.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml b/sources/editor/Stride.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml
index baaec2bbb6..2475a7ed7b 100644
--- a/sources/editor/Stride.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml
+++ b/sources/editor/Stride.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml
@@ -22,7 +22,7 @@
       <Style TargetType="sd:EditableContentListBox" BasedOn="{StaticResource {x:Type ListBox}}"/>
 
       <DataTemplate DataType="{x:Type vm:SharedRendererOutputSlotViewModel}">
-        <TextBlock Text="{Binding Name}"/>
+        <TextBlock Text="{Binding Name}" Foreground="{StaticResource GraphicsCompositorNodeTextBrush}"/>
       </DataTemplate>
 
       <Style x:Key="AddRenderFeatureComboBox" BasedOn="{StaticResource AddItemComboBox}" TargetType="ComboBox">
@@ -70,7 +70,7 @@
                 </Grid.RowDefinitions>
 
                 <Border Grid.Row="0" x:Name="PART_vertexTitle" Background="{TemplateBinding TitleBackground}" BorderBrush="{TemplateBinding TitleBorderBrush}" CornerRadius="{TemplateBinding TitleBorderCornerRadius}" Padding="{TemplateBinding TitlePadding}">
-                  <TextBlock x:Name="PART_vertexName" Text="{Binding Block.Title}" HorizontalAlignment="Center" FontWeight="Bold" Padding="10,0,10,0" />
+                  <TextBlock x:Name="PART_vertexName" Text="{Binding Block.Title}" HorizontalAlignment="Center" Foreground="{StaticResource GraphicsCompositorNodeTextBrush}" FontWeight="Bold" Padding="10,0,10,0" />
                 </Border>
 
                 <Border Grid.Row="1" x:Name="PART_vertexContent" Background="{TemplateBinding ContentBackground}" BorderBrush="{TemplateBinding ContentBorderBrush}" CornerRadius="{TemplateBinding ContentBorderCornerRadius}" Padding="{TemplateBinding ContentPadding}">
diff --git a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/Resources/ThemeScriptEditor.xaml b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/Resources/ThemeScriptEditor.xaml
index 2cec98a457..9b05ba7d2e 100644
--- a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/Resources/ThemeScriptEditor.xaml
+++ b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/Resources/ThemeScriptEditor.xaml
@@ -48,8 +48,6 @@
     </Setter>
   </Style>
 
-  <SolidColorBrush x:Key="CodeEditorBackgroundBrush" Color="#FF1E1E1E" />
-
   <HierarchicalDataTemplate DataType="{x:Type codeFixes:CodeFixCollection}" ItemsSource="{Binding Fixes, Mode=OneTime}">
     <TextBlock Text="{Binding Provider, Mode=OneTime}" />
   </HierarchicalDataTemplate>
@@ -201,25 +199,25 @@
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListBoxItem}">
           <Border Name="Bd"
-					        Background="{TemplateBinding Background}"
-					        BorderBrush="{TemplateBinding BorderBrush}"
-					        BorderThickness="{TemplateBinding BorderThickness}"
-					        Padding="{TemplateBinding Padding}"
-					        SnapsToDevicePixels="true">
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Padding="{TemplateBinding Padding}"
+                  SnapsToDevicePixels="true">
             <ContentPresenter
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
           </Border>
           <!-- Simplified triggers:
-						 we don't want a gray selection background when the ListBox doesn't have focus
-					-->
+             we don't want a gray selection background when the ListBox doesn't have focus
+          -->
           <ControlTemplate.Triggers>
             <Trigger Property="IsSelected" Value="true">
               <Setter Property="Background"
-							        Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
               <Setter Property="Foreground"
-							        Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                      Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
             </Trigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
@@ -246,9 +244,9 @@
               <Setter TargetName="PART_ListBox" Property="Template">
                 <Setter.Value>
                   <ControlTemplate>
-                    <Border CornerRadius="2" 
-			                      BorderBrush="{TemplateBinding BorderBrush}"
-			                      BorderThickness="{TemplateBinding BorderThickness}">
+                    <Border CornerRadius="2"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
                       <ListBoxItem Style="{StaticResource CompletionListBoxItem}">
                         <TextBlock Text="{sd:Localize No suggestions}"/>
                       </ListBoxItem>
diff --git a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
index e11e80ace4..58f5a47d4f 100644
--- a/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
+++ b/sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
@@ -10,6 +10,7 @@
 using RoslynPad.Roslyn.BraceMatching;
 using RoslynPad.Roslyn.Diagnostics;
 using RoslynPad.Roslyn.QuickInfo;
+using Stride.Core.Presentation.Themes;
 
 namespace Stride.Assets.Presentation.AssetEditors.ScriptEditor
 {
@@ -70,7 +71,7 @@ public void BindSourceTextContainer(RoslynWorkspace workspace, AvalonEditTextCon
             TextArea.Caret.PositionChanged += CaretOnPositionChanged;
 
             // Syntax highlighting
-            var classificationHighlightColors = new ClassificationHighlightColorsDark();
+            var classificationHighlightColors = ThemeController.CurrentTheme.GetThemeBase() == IconThemeSelector.ThemeBase.Dark ? new ClassificationHighlightColorsDark() : new ClassificationHighlightColors();
             syntaxHighlightingColorizer = new RoslynHighlightingColorizer(documentId, workspace.Host, classificationHighlightColors);
             TextArea.TextView.LineTransformers.Insert(0, syntaxHighlightingColorizer);
 
diff --git a/sources/editor/Stride.Assets.Presentation/Themes/Generic.xaml b/sources/editor/Stride.Assets.Presentation/Themes/Generic.xaml
index a41cc747a7..735e1732a8 100644
--- a/sources/editor/Stride.Assets.Presentation/Themes/Generic.xaml
+++ b/sources/editor/Stride.Assets.Presentation/Themes/Generic.xaml
@@ -212,7 +212,7 @@
                   <Slider.Template>
                     <ControlTemplate TargetType="{x:Type Slider}">
                       <Grid x:Name="GridRoot" Focusable="False" MinHeight="{TemplateBinding MinHeight}">
-                        <Border Margin="0" x:Name="Border" Height="4" CornerRadius="2" Background="{DynamicResource LightBrush}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1,1,1,1" />
+                        <Border Margin="0" x:Name="Border" Height="4" CornerRadius="2" Background="{DynamicResource DropdownButtonBackgroundBrush}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1,1,1,1" />
                         <Track x:Name="PART_Track">
                           <Track.Thumb>
                             <Thumb Style="{DynamicResource NuclearSliderThumb}" Foreground="{x:Null}" Width="12" Height="{TemplateBinding ActualHeight}"/>
diff --git a/sources/editor/Stride.Assets.Presentation/View/SkeletonPropertyTemplates.xaml b/sources/editor/Stride.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
index 72a3fb27c0..8221227f43 100644
--- a/sources/editor/Stride.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
+++ b/sources/editor/Stride.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
@@ -28,7 +28,7 @@
                 Command="{Binding SkeletonNodePreserveAll}" CommandParameter="{sd:False}"/>
           </UniformGrid>
           <!-- Difference from HeaderReadOnlyProperty ends here -->
-          <ToggleButton DockPanel.Dock="Left" Template="{StaticResource DarkExpanderToggleButton}" Width="16" Height="16"
+          <ToggleButton DockPanel.Dock="Left" Template="{StaticResource TreeExpanderToggleButton}" Width="16" Height="16"
                         IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=sd:PropertyViewItem}}"
                         Visibility="{Binding VisibleChildrenCount, Converter={sd:Chained {sd:NumericToBool}, {sd:VisibleOrCollapsed}}}"/>
           <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
diff --git a/sources/editor/Stride.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml b/sources/editor/Stride.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
index 30a831ed49..a534d47415 100644
--- a/sources/editor/Stride.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
@@ -197,7 +197,7 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="Auto"/>
           </Grid.ColumnDefinitions>
-          <ToggleButton Grid.Column="1" Template="{StaticResource DarkExpanderToggleButton}" Width="12" Height="12" HorizontalAlignment="Left"
+          <ToggleButton Grid.Column="1" Template="{StaticResource TreeExpanderToggleButton}" Width="12" Height="12" HorizontalAlignment="Left"
                                         IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=sd:PropertyViewItem}}"
                                         Visibility="{Binding VisibleChildrenCount, Converter={sd:Chained {sd:NumericToBool}, {sd:VisibleOrCollapsed}}}"/>
           <TextBlock x:Name="PropertyNameBlock" Grid.Column="2" Text="{Binding DisplayName}" HorizontalAlignment="Stretch" VerticalAlignment="Center"
@@ -271,7 +271,7 @@
             </i:Interaction.Behaviors>
           </ComboBox>
         </StackPanel>
-        <ToggleButton DockPanel.Dock="Left" Template="{StaticResource DarkExpanderToggleButton}" Width="16" Height="16"
+        <ToggleButton DockPanel.Dock="Left" Template="{StaticResource PropertyGridHeaderExpanderToggleButton}" Width="16" Height="16"
                                     IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=sd:PropertyViewItem}}"
                                     Visibility="{Binding VisibleChildrenCount, Converter={sd:Chained {sd:NumericToBool}, {sd:VisibleOrCollapsed}}}"/>
         <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
@@ -282,7 +282,8 @@
           <Image Source="{Binding NodeValue, Converter={sd:Chained {sd:ObjectToType}, {cvt:TypeToResource}}}" MaxWidth="16" MaxHeight="16"
                             RenderOptions.BitmapScalingMode="NearestNeighbor" Margin="0,0,4,0"/>
           <TextBlock x:Name="HeaderTextBlock" FontSize="16" TextTrimming="CharacterEllipsis"
-                     Text="{Binding DisplayName, Mode=OneWay}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                     Text="{Binding DisplayName, Mode=OneWay}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                     Foreground="{StaticResource SelectedTextBrush}"/>
         </StackPanel>
       </DockPanel>
       <i:Interaction.Behaviors>
diff --git a/sources/editor/Stride.GameStudio/GameStudioWindow.xaml b/sources/editor/Stride.GameStudio/GameStudioWindow.xaml
index d2be386ca2..b7a7ec0cd7 100644
--- a/sources/editor/Stride.GameStudio/GameStudioWindow.xaml
+++ b/sources/editor/Stride.GameStudio/GameStudioWindow.xaml
@@ -23,6 +23,15 @@
       </ResourceDictionary.MergedDictionaries>
       <DataTemplate x:Key="AvalonDock_GameStudio_TitleTemplate">
         <DockPanel LastChildFill="False">
+          <DockPanel.Resources>
+            <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+              <Style.Triggers>
+                <DataTrigger Binding="{Binding LayoutItem.IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcad:LayoutDocumentTabItem}}, Mode=OneWay}" Value="True">
+                  <Setter Property="Foreground" Value="{StaticResource SelectedTextBrush}"/>
+                </DataTrigger>
+              </Style.Triggers>
+            </Style>
+          </DockPanel.Resources>
           <TextBlock Margin="3 0" Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
           <TextBlock DockPanel.Dock="Left" HorizontalAlignment="Center" VerticalAlignment="Top"
                      Visibility="{Binding Path=Content.DataContext.IsDirty, Converter={sd:VisibleOrCollapsed}, FallbackValue={sd:Collapsed}}"
@@ -620,7 +629,8 @@
                     <TabItem DataContext="{Binding Debugging.BuildLog}">
                       <TabItem.Header>
                         <TextBlock FontWeight="{Binding HasNewMessages, Mode=OneWay, Converter={sd:BoolToParam},
-                                    ConverterParameter={x:Static FontWeights.Bold}, FallbackValue={x:Static FontWeights.Normal}}">
+                                    ConverterParameter={x:Static FontWeights.Bold}, FallbackValue={x:Static FontWeights.Normal}}"
+                                   Foreground="{StaticResource SelectedTextBrush}">
                                     <Run Text="{sd:Localize Build}"/>
                                     <Run Text="{Binding HasNewMessages, Mode=OneWay, Converter={sd:BoolToParam}, ConverterParameter=*}"/>
                         </TextBlock>
@@ -634,7 +644,8 @@
                     <TabItem DataContext="{Binding Debugging.LiveScriptingLog}" Visibility="Collapsed">
                       <TabItem.Header>
                         <TextBlock FontWeight="{Binding HasNewMessages, Mode=OneWay, Converter={sd:BoolToParam},
-                                    ConverterParameter={x:Static FontWeights.Bold}, FallbackValue={x:Static FontWeights.Normal}}">
+                                    ConverterParameter={x:Static FontWeights.Bold}, FallbackValue={x:Static FontWeights.Normal}}"
+                                   Foreground="{StaticResource SelectedTextBrush}">
                                     <Run Text="{sd:Localize Live-scripting}"/>
                                     <Run Text="{Binding HasNewMessages, Mode=OneWay, Converter={sd:BoolToParam}, ConverterParameter=*}"/>
                         </TextBlock>
@@ -749,7 +760,6 @@
                                        ItemsSource="{Binding Session.ActiveProperties.ViewModel.RootNode.Children}"
                                        Visibility="{Binding Session.ActiveProperties.CanDisplayProperties, Converter={sd:VisibleOrCollapsed}}">
                       <sd:PropertyView.Resources>
-                        <SolidColorBrush x:Key="ItemHoverBrush" Color="#FF525252" />
                         <RoutedUICommand x:Key="ReplaceCommand" Text="Replace">
                           <RoutedUICommand.InputGestures>
                             <KeyGesture>Ctrl+Shift+V</KeyGesture>
@@ -838,7 +848,7 @@
                               <Setter Property="Highlightable" Value="False"/>
                             </DataTrigger>
                             <Trigger Property="IsHovered" Value="True">
-                              <Setter Property="Background" Value="{StaticResource ItemHoverBrush}"/>
+                              <Setter Property="Background" Value="{StaticResource PropertyGridItemHoverBrush}"/>
                             </Trigger>
                             <Trigger Property="IsFocused" Value="True">
                               <Setter Property="Background" Value="{StaticResource NormalBrush}"/>
@@ -918,6 +928,15 @@
         </xcad:LayoutRoot>
       </xcad:DockingManager>
       <StatusBar Grid.Row="2" Background="#007ACC" Visibility="{Binding Session, Converter={sd:Chained {sd:ObjectToBool}, {sd:VisibleOrCollapsed}}}">
+        <StatusBar.Resources>
+          <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+            <Setter Property="Foreground" Value="{StaticResource SelectedTextBrush}"/>
+          </Style>
+          <Style x:Key="StatusBarSeparatorStyle" TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Type Separator}}">
+            <Setter Property="Background" Value="{StaticResource SelectedTextBrush}"/>
+            <Setter Property="Opacity" Value="0.25"/>
+          </Style>
+        </StatusBar.Resources>
         <StatusBar.ItemsPanel>
           <ItemsPanelTemplate>
             <Grid>
@@ -932,15 +951,17 @@
             </Grid>
           </ItemsPanelTemplate>
         </StatusBar.ItemsPanel>
-        <StatusBarItem Grid.Column="0" Content="{Binding Status.CurrentStatus}"/>
-        <Separator Grid.Column="1"/>
+        <StatusBarItem Grid.Column="0">
+          <TextBlock Margin="5,0" Text="{Binding Status.CurrentStatus}"/>
+        </StatusBarItem>
+        <Separator Grid.Column="1" Style="{StaticResource StatusBarSeparatorStyle}"/>
         <StatusBarItem Grid.Column="2">
           <TextBlock>
             <Run Text="{sd:Localize {}{0} item, Plural={}{0} items, Count={Binding Session.ActiveAssetView.FilteredContent.Count, Mode=OneWay}, IsStringFormat=True, Context=StatusBar}"/>
             <Run Text="{sd:Localize ({0} selected), Plural=({0} selected), Count={Binding Session.ActiveAssetView.SelectedContent.Count, Mode=OneWay}, IsStringFormat=True, Context=StatusBar}"/>
           </TextBlock>
         </StatusBarItem>
-        <Separator Grid.Column="3"/>
+        <Separator Grid.Column="3" Style="{StaticResource StatusBarSeparatorStyle}"/>
         <StatusBarItem Grid.Column="4" HorizontalContentAlignment="Right">
           <TextBlock Margin="5,0" Text="{Binding Status.CurrentJob.Message}"/>
         </StatusBarItem>
diff --git a/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml b/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml
index c355ebbb46..cef7240c99 100644
--- a/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml
+++ b/sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml
@@ -37,6 +37,14 @@
 
   <Style TargetType="{x:Type avalonDockControls:ContextMenuEx}" BasedOn="{StaticResource {x:Type ContextMenu}}"/>
 
+  <Style x:Key="AvalonDock_SubTabItemTextStyle" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+    <Style.Triggers>
+      <DataTrigger Binding="{Binding LayoutItem.IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type avalonDockControls:LayoutAnchorableTabItem}}, Mode=OneWay}" Value="True">
+        <Setter Property="Foreground" Value="{StaticResource SubTabItemActiveForeground}"/>
+      </DataTrigger>
+    </Style.Triggers>
+  </Style>
+
   <!--DocumentPaneControlStyle-->
   <Style x:Key="AvalonDock_ThemeAero_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
     <Setter Property="Background" Value="{StaticResource ControlBackgroundBrush}"/>
@@ -172,20 +180,15 @@
                   </Border>
                 </Grid>
                 <ControlTemplate.Triggers>
-                  <Trigger Property="Selector.IsSelected"
-                   Value="true">
-                    <Setter Property="BorderBrush"
-                Value="{StaticResource SolidBorderBrush}" />
-                    <Setter Property="Background"
-                Value="{StaticResource SelectedBackgroundBrush}" />
-                    <Setter Property="Panel.ZIndex"
-                                  Value="1" />
+                  <Trigger Property="Selector.IsSelected" Value="true">
+                    <Setter Property="BorderBrush" Value="{StaticResource SolidBorderBrush}" />
+                    <Setter Property="Background" Value="{StaticResource SelectedBackgroundBrush}" />
+                    <Setter Property="Panel.ZIndex" Value="1" />
                     <!--<Setter Property="Margin" Value="-1,0,-16,-1"/>
                     <Setter Property="Margin" TargetName="BdInternal" Value="0,0,0,-1"/>
                     <Setter Property="Margin" TargetName="splineBd" Value="0,0,0,-1.0"/>-->
                     <Setter Property="FontWeight" Value="Normal"/>
-                    <Setter Property="Panel.ZIndex"
-                                  Value="1" />
+                    <Setter Property="Panel.ZIndex" Value="1" />
                   </Trigger>
                   <MultiTrigger>
                     <MultiTrigger.Conditions>
@@ -289,12 +292,12 @@
               <ControlTemplate TargetType="{x:Type TabItem}">
                 <Grid SnapsToDevicePixels="true">
                   <Border x:Name="Bd"
-                   BorderBrush="{TemplateBinding BorderBrush}"
-                   Background="{TemplateBinding Background}"
-                   Padding="{TemplateBinding Padding}">
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Background="{TemplateBinding Background}"
+                          Padding="{TemplateBinding Padding}">
                     <ContentPresenter
-                  x:Name="Content"
-                  ContentSource="Header"
+                                  x:Name="Content"
+                                  ContentSource="Header"
                                   HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
                                   VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
                                   RecognizesAccessKey="True"
@@ -302,15 +305,10 @@
                   </Border>
                 </Grid>
                 <ControlTemplate.Triggers>
-                  <Trigger Property="Selector.IsSelected"
-               Value="true">
-                    <Setter Property="Background"
-            Value="{StaticResource DarkDefaultBackground}" />
-                    <Setter Property="Foreground"
-            Value="{StaticResource DarkDefaultForeground}" />
-                    <Setter Property="Panel.ZIndex"
-                              Value="1" />
-                    <Setter Property="TextBlock.Foreground" TargetName="Content" Value="{StaticResource DarkDefaultForeground}" />
+                  <Trigger Property="Selector.IsSelected" Value="true">
+                    <Setter Property="Background" Value="{StaticResource SubTabItemActiveBackground}" />
+                    <Setter Property="Panel.ZIndex" Value="1" />
+                    <Setter Property="TextBlock.Foreground" TargetName="Content" Value="{StaticResource SubTabItemActiveForeground}" />
                   </Trigger>
                   <MultiTrigger>
                     <MultiTrigger.Conditions>
@@ -631,7 +629,7 @@
   </Style>
 
   <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentHeaderTemplate">
-    <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" Style="{StaticResource AvalonDock_SubTabItemTextStyle}"/>
   </DataTemplate>
 
   <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableHeaderTemplate">
@@ -641,7 +639,8 @@
         <ColumnDefinition/>
       </Grid.ColumnDefinitions>
       <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
-      <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
+      <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis"
+                 Grid.Column="1" Style="{StaticResource AvalonDock_SubTabItemTextStyle}"/>
     </Grid>
     <DataTemplate.Triggers>
       <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
@@ -652,11 +651,11 @@
   </DataTemplate>
 
   <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentTitleTemplate">
-    <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" Style="{StaticResource AvalonDock_SubTabItemTextStyle}"/>
   </DataTemplate>
 
   <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableTitleTemplate">
-    <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
+    <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" Style="{StaticResource AvalonDock_SubTabItemTextStyle}" />
   </DataTemplate>
 
   <DataTemplate x:Key="AvalonDock_ThemeAero_IconContentTemplate">
diff --git a/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ImageExtension.cs b/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ImageExtension.cs
index 4789509e09..1916af9402 100644
--- a/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ImageExtension.cs
+++ b/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ImageExtension.cs
@@ -47,7 +47,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
             {
                 image.Source = new DrawingImage()
                 {
-                    Drawing = ImageThemingUtilities.TransformDrawing((source as DrawingImage)?.Drawing, IconThemeSelector.KnownThemes.Dark.GetIconTheme())
+                    Drawing = ImageThemingUtilities.TransformDrawing((source as DrawingImage)?.Drawing, ThemeController.CurrentTheme.GetThemeBase().GetIconTheme())
                 };
             }
 
diff --git a/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ThemedSourceExtension.cs b/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ThemedSourceExtension.cs
index 581e6cefd7..ae8e40dbc5 100644
--- a/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ThemedSourceExtension.cs
+++ b/sources/presentation/Stride.Core.Presentation/MarkupExtensions/ThemedSourceExtension.cs
@@ -16,7 +16,7 @@ public class ThemedSourceExtension : MarkupExtension
     {
         public ThemedSourceExtension() { }
 
-        public ThemedSourceExtension(ImageSource source, KnownThemes theme)
+        public ThemedSourceExtension(ImageSource source, ThemeBase theme)
         {
             Source = source;
             Theme = theme.GetIconTheme();
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/IconThemeSelector.cs b/sources/presentation/Stride.Core.Presentation/Themes/IconThemeSelector.cs
index d33651473f..553294f74a 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/IconThemeSelector.cs
+++ b/sources/presentation/Stride.Core.Presentation/Themes/IconThemeSelector.cs
@@ -10,20 +10,20 @@ namespace Stride.Core.Presentation.Themes
     /// </summary>
     public static class IconThemeSelector
     {
-        public enum KnownThemes
+        public enum ThemeBase
         {
             Light,
             Dark
         }
 
-        public static IconTheme GetIconTheme(this KnownThemes theme)
+        public static IconTheme GetIconTheme(this ThemeBase theme)
         {
             switch (theme)
             {
-                case KnownThemes.Dark:
+                case ThemeBase.Dark:
                     return new IconTheme("Dark", Color.FromRgb(16, 16, 17));
 
-                case KnownThemes.Light: 
+                case ThemeBase.Light:
                     return new IconTheme("Light", Color.FromRgb(245, 245, 245));
 
                 default:
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
index 794c9fb0c7..770a9e5e0d 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
+++ b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
@@ -13,8 +13,9 @@
   <Color x:Key="MainColor">#FF595959</Color>
   <Color x:Key="HoverColor">#FF393939</Color>
   <Color x:Key="DefaultColor">#FF9BB1C5</Color>
-  <SolidColorBrush x:Key="LightBrush" Color="#FF4D4D4D" />
+  <SolidColorBrush x:Key="DropdownButtonBackgroundBrush" Color="#FF4D4D4D" />
   <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
+  <SolidColorBrush x:Key="ComboBoxItemHoverBackground" Color="#3399FF"/>
 
   <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
   <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
@@ -22,9 +23,12 @@
   <Color x:Key="BlackColor">#FF000000</Color>
   <Color x:Key="WhiteColor">#FFFFFFFF</Color>
 
-  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#4F4F54" />
-  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
-  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
+  <Color x:Key="LoadingAssetMessageFromColor">#FF00FF70</Color>
+  <SolidColorBrush x:Key="LoadingAssetMessageFromBrush" Color="{StaticResource LoadingAssetMessageFromColor}" />
+  <Color x:Key="LoadingAssetMessageToColor">White</Color>
+
+  <SolidColorBrush x:Key="SubTabItemActiveBackground" Color="#4F4F54" />
+  <SolidColorBrush x:Key="SubTabItemActiveForeground" Color="#EBEBEB" />
 
   <SolidColorBrush x:Key="BackgroundBrush" Color="#3C3C3E"/>
   <SolidColorBrush x:Key="TextBrush" Color="#EBEBEB" />
@@ -33,10 +37,11 @@
   <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF5E5E60" />
   <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
   <SolidColorBrush x:Key="GlyphBrush" Color="#FFD9D9D9" />
+  <SolidColorBrush x:Key="GlyphHeaderBrush" Color="#FFD1D1D1" />
 
-  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#3C3C3E" />
-  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#545454" />
-  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
+  <SolidColorBrush x:Key="ScrollBarBackgroundNormalBrush" Color="#3C3C3E" />
+  <SolidColorBrush x:Key="ScrollBarThumbHoverBrush" Color="White" />
+  <SolidColorBrush x:Key="ScrollBarThumbPressedBrush" Color="White" />
 
   <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
 
@@ -49,6 +54,7 @@
   <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#323234" />
 
   <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
+  <SolidColorBrush x:Key="SelectedTextBrush" Color="#EBEBEB"/>
 
   <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
   <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
@@ -75,6 +81,7 @@
   <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF4D4D4D"/>
   <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#4A4A4C"/>
   <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
+  <SolidColorBrush x:Key="PropertyGridItemHoverBrush" Color="#FF525252" />
 
   <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
   <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
@@ -99,6 +106,19 @@
   <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
 
   <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
+
+  <SolidColorBrush x:Key="CodeEditorBackgroundBrush" Color="#FF1E1E1E" />
+
+  <SolidColorBrush x:Key="GraphicsCompositorNodeTextBrush" Color="#EBEBEB" />
+
+  <!--TextLogViewer colors-->
+  <SolidColorBrush x:Key="TextLogDebugBrush" Color="DarkGray"/>
+  <SolidColorBrush x:Key="TextLogVerboseBrush" Color="White"/>
+  <SolidColorBrush x:Key="TextLogInfoBrush" Color="LightGreen"/>
+  <SolidColorBrush x:Key="TextLogWarningBrush" Color="Gold"/>
+  <SolidColorBrush x:Key="TextLogErrorBrush" Color="Tomato"/>
+  <SolidColorBrush x:Key="TextLogFatalBrush" Color="Red"/>
+
   <!-- EXPRESSION COMMON VALUES -->
 
   <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
index 77fa0ad10e..4a717c79d4 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
+++ b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
@@ -19,8 +19,9 @@
   <Color x:Key="MainColor">#FF595959</Color>
   <Color x:Key="HoverColor">#FF393939</Color>
   <Color x:Key="DefaultColor">#FF9BB1C5</Color>
-  <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
+  <SolidColorBrush x:Key="DropdownButtonBackgroundBrush" Color="#FF333333" />
   <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
+  <SolidColorBrush x:Key="ComboBoxItemHoverBackground" Color="#3399FF"/>
 
   <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
   <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
@@ -28,9 +29,12 @@
   <Color x:Key="BlackColor">#FF000000</Color>
   <Color x:Key="WhiteColor">#FFFFFFFF</Color>
 
-  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#101011" />
-  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
-  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
+  <Color x:Key="LoadingAssetMessageFromColor">#FF00FF70</Color>
+  <SolidColorBrush x:Key="LoadingAssetMessageFromBrush" Color="{StaticResource LoadingAssetMessageFromColor}" />
+  <Color x:Key="LoadingAssetMessageToColor">White</Color>
+
+  <SolidColorBrush x:Key="SubTabItemActiveBackground" Color="#101011" />
+  <SolidColorBrush x:Key="SubTabItemActiveForeground" Color="#EBEBEB" />
 
   <SolidColorBrush x:Key="BackgroundBrush" Color="#1A1A1D"/>
   <SolidColorBrush x:Key="TextBrush" Color="#E6E6E6" />
@@ -39,10 +43,11 @@
   <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
   <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
   <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
+  <SolidColorBrush x:Key="GlyphHeaderBrush" Color="#FFD1D1D1" />
 
-  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#161616" />
-  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#333333" />
-  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
+  <SolidColorBrush x:Key="ScrollBarBackgroundNormalBrush" Color="#161616" />
+  <SolidColorBrush x:Key="ScrollBarThumbHoverBrush" Color="White" />
+  <SolidColorBrush x:Key="ScrollBarThumbPressedBrush" Color="White" />
 
   <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
 
@@ -55,6 +60,7 @@
   <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#101011" />
 
   <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
+  <SolidColorBrush x:Key="SelectedTextBrush" Color="#E6E6E6"/>
 
   <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
   <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
@@ -81,6 +87,7 @@
   <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF333333"/>
   <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#3E3E40"/>
   <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
+  <SolidColorBrush x:Key="PropertyGridItemHoverBrush" Color="#FF525252" />
 
   <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
   <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
@@ -105,6 +112,19 @@
   <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
 
   <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
+
+  <SolidColorBrush x:Key="CodeEditorBackgroundBrush" Color="#FF1E1E1E" />
+
+  <SolidColorBrush x:Key="GraphicsCompositorNodeTextBrush" Color="#EBEBEB" />
+
+  <!--TextLogViewer colors-->
+  <SolidColorBrush x:Key="TextLogDebugBrush" Color="DarkGray"/>
+  <SolidColorBrush x:Key="TextLogVerboseBrush" Color="White"/>
+  <SolidColorBrush x:Key="TextLogInfoBrush" Color="LightGreen"/>
+  <SolidColorBrush x:Key="TextLogWarningBrush" Color="Gold"/>
+  <SolidColorBrush x:Key="TextLogErrorBrush" Color="Tomato"/>
+  <SolidColorBrush x:Key="TextLogFatalBrush" Color="Red"/>
+
   <!-- EXPRESSION COMMON VALUES -->
 
   <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
index 48b39f6507..603570eea2 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
@@ -336,7 +336,7 @@
         <ColumnDefinition />
         <ColumnDefinition Width="16" />
       </Grid.ColumnDefinitions>
-      <Rectangle Grid.ColumnSpan="2" HorizontalAlignment="Stretch" x:Name="Rectangle" VerticalAlignment="Stretch" Fill="{DynamicResource LightBrush}" Stroke="{DynamicResource NormalBorderBrush}" />
+      <Rectangle Grid.ColumnSpan="2" HorizontalAlignment="Stretch" x:Name="Rectangle" VerticalAlignment="Stretch" Fill="{DynamicResource DropdownButtonBackgroundBrush}" Stroke="{DynamicResource NormalBorderBrush}" />
       <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Fill="{DynamicResource ComboBoxBackground}" Stroke="{DynamicResource NormalBorderBrush}" />
       <Border Margin="1" Grid.Column="1" Background="{DynamicResource ComboToggleButtonBackground}" x:Name="border" />
       <Path Grid.Column="1" HorizontalAlignment="Center" x:Name="Arrow" VerticalAlignment="Center" Data="M0.5,0.5 L3,6.5 5.5,0.5" Stroke="{DynamicResource TextBrush}" Margin="0" Height="5.5" StrokeThickness="2" Stretch="Fill" Width="9.8" />
@@ -400,7 +400,7 @@
   <Style TargetType="{x:Type ComboBox}">
     <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
     <Setter Property="SnapsToDevicePixels" Value="true" />
-    <Setter Property="Background" Value="{DynamicResource LightComboBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}"/>
     <Setter Property="Template" Value="{DynamicResource ComboBoxTemplate}" />
   </Style>
 
@@ -413,7 +413,7 @@
           <Grid SnapsToDevicePixels="true" Margin="0">
             <Rectangle x:Name="Background" IsHitTestVisible="True" Fill="Transparent"/>
             <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource NormalBrush}"/>
-            <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource SelectedBackgroundBrush}"/>
+            <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource ComboBoxItemHoverBackground}"/>
             <ContentPresenter Margin="5,1" x:Name="contentPresenter" VerticalAlignment="Center" />
           </Grid>
           <ControlTemplate.Triggers>
@@ -1073,16 +1073,12 @@
             </Storyboard>
           </ControlTemplate.Resources>
           <Grid Margin="0,0,0,0" x:Name="Grid">
-            <Rectangle HorizontalAlignment="Stretch" x:Name="HoverRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="4.5,-2,4.5,-2" Opacity="0.3" MinHeight="10">
-              <Rectangle.Fill>
-                <SolidColorBrush Color="{DynamicResource WhiteColor}" />
-              </Rectangle.Fill>
-            </Rectangle>
-            <Rectangle HorizontalAlignment="Stretch" x:Name="PressedRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="4.5,-2,4.5,-2" Opacity="0.3" MinHeight="10">
-              <Rectangle.Fill>
-                <SolidColorBrush Color="{DynamicResource WhiteColor}" />
-              </Rectangle.Fill>
-            </Rectangle>
+            <Rectangle x:Name="HoverRectangle" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                       Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="4.5,-2,4.5,-2" Opacity="0.3" MinHeight="10"
+                       Fill="{StaticResource ScrollBarThumbHoverBrush}"/>
+            <Rectangle x:Name="PressedRectangle" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                       Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="4.5,-2,4.5,-2" Opacity="0.3" MinHeight="10"
+                       Fill="{StaticResource ScrollBarThumbPressedBrush}"/>
           </Grid>
           <ControlTemplate.Triggers>
             <Trigger Property="IsFocused" Value="True" />
@@ -1138,16 +1134,13 @@
             </Storyboard>
           </ControlTemplate.Resources>
           <Grid Margin="0,0,0,0" x:Name="Grid">
-            <Rectangle HorizontalAlignment="Stretch" x:Name="HoverRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="-2,4.5,-2,4.5" Opacity="0.3" MinWidth="10">
-              <Rectangle.Fill>
-                <SolidColorBrush Color="{DynamicResource WhiteColor}" />
-              </Rectangle.Fill>
-            </Rectangle>
-            <Rectangle HorizontalAlignment="Stretch" x:Name="PressedRectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="-2,4.5,-2,4.5" Opacity="0.3" MinWidth="10">
-              <Rectangle.Fill>
-                <SolidColorBrush Color="{DynamicResource WhiteColor}" />
-              </Rectangle.Fill>
-            </Rectangle>
+            <Rectangle x:Name="HoverRectangle" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                       Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="-2,4.5,-2,4.5" Opacity="0.3" MinWidth="10"
+                       Fill="{StaticResource ScrollBarThumbHoverBrush}"/>
+
+            <Rectangle x:Name="PressedRectangle" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                       Width="Auto" Height="Auto" Stroke="{x:Null}" Margin="-2,4.5,-2,4.5" Opacity="0.3" MinWidth="10"
+                       Fill="{StaticResource ScrollBarThumbPressedBrush}"/>
           </Grid>
           <ControlTemplate.Triggers>
             <Trigger Property="IsFocused" Value="True" />
@@ -1193,7 +1186,7 @@
   </Style>
 
   <ControlTemplate x:Key="VerticalScrollBarControlTemplate" TargetType="{x:Type ScrollBar}">
-    <Grid x:Name="GridRoot" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Background="{DynamicResource ScrollbarBackgroundNormal}">
+    <Grid x:Name="GridRoot" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Background="{DynamicResource ScrollBarBackgroundNormalBrush}">
       <Grid.RowDefinitions>
         <RowDefinition MaxHeight="18" />
         <RowDefinition Height="*" />
@@ -1228,7 +1221,7 @@
   </ControlTemplate>
 
   <ControlTemplate x:Key="HorizontalScrollBarControlTemplate" TargetType="{x:Type ScrollBar}">
-    <Grid x:Name="GridRoot" Height="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}" Background="{DynamicResource ScrollbarBackgroundNormal}">
+    <Grid x:Name="GridRoot" Height="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}" Background="{DynamicResource ScrollBarBackgroundNormalBrush}">
       <Grid.ColumnDefinitions>
         <ColumnDefinition MaxWidth="18" />
         <ColumnDefinition Width="*" />
@@ -1326,7 +1319,17 @@
             <Rectangle x:Name="Background" IsHitTestVisible="False" Opacity="1" Fill="{TemplateBinding Background}"/>
             <Rectangle x:Name="HoverRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource NormalBrush}"/>
             <Rectangle x:Name="SelectedRectangle" IsHitTestVisible="False" Opacity="0" Fill="{StaticResource SelectedBackgroundBrush}"/>
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" x:Name="contentPresenter" />
+            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" x:Name="contentPresenter">
+              <ContentPresenter.Resources>
+                <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+                  <Style.Triggers>
+                    <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Mode=OneWay}" Value="True">
+                      <Setter Property="Foreground" Value="{StaticResource SelectedTextBrush}"/>
+                    </DataTrigger>
+                  </Style.Triggers>
+                </Style>
+              </ContentPresenter.Resources>
+            </ContentPresenter>
             <Rectangle x:Name="FocusVisualElement" Stroke="{StaticResource HoverShineBrush}" StrokeThickness="0" Opacity="0" IsHitTestVisible="False" Margin="1,1,1,1"/>
           </Grid>
           <ControlTemplate.Triggers>
@@ -2738,7 +2741,7 @@
               <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar Visibility="Collapsed" x:Name="TopTick" Height="4" SnapsToDevicePixels="True" Placement="Top" Fill="{DynamicResource GlyphBrush}" />
-            <Border Grid.Row="1" Margin="0" x:Name="Border" Height="4" Background="{DynamicResource LightBrush}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1,1,1,1" />
+            <Border Grid.Row="1" Margin="0" x:Name="Border" Height="4" Background="{DynamicResource DropdownButtonBackgroundBrush}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1,1,1,1" />
             <Track Grid.Row="1" x:Name="PART_Track">
               <Track.Thumb>
                 <Thumb Style="{DynamicResource NuclearSliderThumb}" Background="{DynamicResource NormalBrush}" Foreground="{x:Null}" Width="10" Height="{TemplateBinding ActualHeight}"/>
@@ -2796,7 +2799,22 @@
     </Setter>
   </Style>
 
-  <ControlTemplate x:Key="DarkExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+  <ControlTemplate x:Key="PropertyGridHeaderExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+    <Grid Background="Transparent">
+      <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphHeaderBrush}"
+                  Data="M 0 0 L 6 6 L 0 12 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
+      <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphHeaderBrush}"
+                  Data="M 0 0 L 6 6 L 12 0 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsChecked" Value="true">
+        <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
+        <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+
+  <ControlTemplate x:Key="TreeExpanderToggleButton" TargetType="{x:Type ToggleButton}">
     <Grid Background="Transparent">
       <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}"
                   Data="M 0 0 L 6 6 L 0 12 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
@@ -2808,12 +2826,16 @@
         <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
         <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
       </Trigger>
+      <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ctrl:TreeViewItem}}, Mode=OneWay}" Value="True">
+        <Setter Property="Fill" Value="{StaticResource GlyphHeaderBrush}" TargetName="Up_Arrow"/>
+        <Setter Property="Fill" Value="{StaticResource GlyphHeaderBrush}" TargetName="Down_Arrow"/>
+      </DataTrigger>
     </ControlTemplate.Triggers>
   </ControlTemplate>
 
   <Style x:Key="NuclearTreeViewItemToggleButton" d:IsControlPart="True" TargetType="{x:Type ToggleButton}">
     <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template" Value="{StaticResource DarkExpanderToggleButton}"/>
+    <Setter Property="Template" Value="{StaticResource TreeExpanderToggleButton}"/>
   </Style>
 
   <Style d:IsControlPart="True" TargetType="{x:Type TreeViewItem}">
@@ -2921,15 +2943,6 @@
       </Setter.Value>
     </Setter>
     <Setter Property="Background" Value="Transparent"/>
-    <Style.Triggers>
-      <Trigger Property="IsSelected" Value="True">
-        <Setter Property="Foreground">
-          <Setter.Value>
-            <SolidColorBrush Color="{DynamicResource BlackColor}"/>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
   </Style>
 
   <Style x:Key="ButtonFocusVisual">
@@ -3080,7 +3093,7 @@
               <RowDefinition Height="*" />
               <RowDefinition Height="6" />
             </Grid.RowDefinitions>
-            <Border Grid.ColumnSpan="4" Grid.RowSpan="4" Background="{DynamicResource LightBrush}" CornerRadius="4,4,4,4" BorderThickness="1,1,1,1" />
+            <Border Grid.ColumnSpan="4" Grid.RowSpan="4" Background="{DynamicResource DropdownButtonBackgroundBrush}" CornerRadius="4,4,4,4" BorderThickness="1,1,1,1" />
             <Border Grid.ColumnSpan="4" Grid.Row="1" Grid.RowSpan="3" BorderThickness="1,1,1,1" CornerRadius="4" BorderBrush="{DynamicResource NormalBorderBrush}">
               <Border.OpacityMask>
                 <MultiBinding Converter="{StaticResource BorderGapMaskConverter}" ConverterParameter="7">
@@ -3251,15 +3264,6 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-    <Style.Triggers>
-      <Trigger Property="Selector.IsSelected" Value="True">
-        <Setter Property="Foreground">
-          <Setter.Value>
-            <SolidColorBrush Color="{DynamicResource BlackColor}" />
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
   </Style>
 
   <Style x:Key="GridViewColumnHeaderGripper" TargetType="{x:Type Thumb}">
@@ -3267,7 +3271,7 @@
     <Setter Property="Width" Value="18" />
     <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}" />
     <Setter Property="Padding" Value="0,3,0,4" />
-    <Setter Property="Background" Value="{DynamicResource LightBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DropdownButtonBackgroundBrush}" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type Thumb}">
@@ -3286,7 +3290,7 @@
   <Style x:Key="{x:Type GridViewColumnHeader}" TargetType="{x:Type GridViewColumnHeader}">
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{DynamicResource LightBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DropdownButtonBackgroundBrush}" />
     <Setter Property="Padding" Value="2,0,2,0" />
     <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
     <Setter Property="Template">
@@ -3451,7 +3455,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Border SnapsToDevicePixels="true" x:Name="Bd" CornerRadius="0,0,0,0" Background="{DynamicResource LightBrush}">
+          <Border SnapsToDevicePixels="true" x:Name="Bd" CornerRadius="0,0,0,0" Background="{DynamicResource DropdownButtonBackgroundBrush}">
             <Canvas SnapsToDevicePixels="true" HorizontalAlignment="Right" Margin="7,2,2,2" VerticalAlignment="Bottom" Width="6" Height="7">
               <Path Stroke="#FF5C5C5C" Data="M 1 1.5 L 6 1.5"/>
               <Path Stroke="{TemplateBinding Foreground}" Data="M 0 0.5 L 5 0.5"/>
@@ -3550,7 +3554,7 @@
               <ToggleButton Visibility="{TemplateBinding HasOverflowItems, Converter={cvt:VisibleOrCollapsed}}" FocusVisualStyle="{x:Null}" x:Name="OverflowButton" Style="{StaticResource ToolBarHorizontalOverflowButtonStyle}" ClickMode="Press" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>
               <Popup Focusable="false" AllowsTransparency="true" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" StaysOpen="False" x:Name="OverflowPopup">
                 <Border x:Name="Shdw">
-                  <Border BorderThickness="1,1,1,1" Background="{DynamicResource LightBrush}" BorderBrush="{DynamicResource LightBrush}">
+                  <Border BorderThickness="1,1,1,1" Background="{DynamicResource DropdownButtonBackgroundBrush}" BorderBrush="{DynamicResource DropdownButtonBackgroundBrush}">
                     <ToolBarOverflowPanel Focusable="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" FocusVisualStyle="{x:Null}" Margin="2" x:Name="PART_ToolBarOverflowPanel" WrapWidth="200" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle"/>
                   </Border>
                 </Border>
@@ -3625,7 +3629,7 @@
               </ToggleButton>
               <Border VerticalAlignment="Bottom" HorizontalAlignment="Right" x:Name="PopupPlacementTarget"/>
               <Popup Focusable="false" AllowsTransparency="true" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Left" PlacementTarget="{Binding ElementName=PopupPlacementTarget}"  PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" StaysOpen="True" x:Name="OverflowPopup">
-                <Border BorderThickness="1,1,1,1" Background="{DynamicResource LightBrush}" BorderBrush="{DynamicResource LightBrush}">
+                <Border BorderThickness="1,1,1,1" Background="{DynamicResource DropdownButtonBackgroundBrush}" BorderBrush="{DynamicResource DropdownButtonBackgroundBrush}">
                   <ToolBarOverflowPanel Focusable="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" FocusVisualStyle="{x:Null}" Margin="2" x:Name="PART_ToolBarOverflowPanel" WrapWidth="200" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle"/>
                 </Border>
               </Popup>
@@ -4509,12 +4513,12 @@
   </Style>
 
   <Style TargetType="ctrl:TextLogViewer" BasedOn="{StaticResource DefaultLogViewerStyle}">
-    <Setter Property="DebugBrush" Value="DarkGray"/>
-    <Setter Property="VerboseBrush" Value="White"/>
-    <Setter Property="InfoBrush" Value="LightGreen"/>
-    <Setter Property="WarningBrush" Value="Gold"/>
-    <Setter Property="ErrorBrush" Value="Tomato"/>
-    <Setter Property="FatalBrush" Value="Red"/>
+    <Setter Property="DebugBrush" Value="{StaticResource TextLogDebugBrush}"/>
+    <Setter Property="VerboseBrush" Value="{StaticResource TextLogVerboseBrush}"/>
+    <Setter Property="InfoBrush" Value="{StaticResource TextLogInfoBrush}"/>
+    <Setter Property="WarningBrush" Value="{StaticResource TextLogWarningBrush}"/>
+    <Setter Property="ErrorBrush" Value="{StaticResource TextLogErrorBrush}"/>
+    <Setter Property="FatalBrush" Value="{StaticResource TextLogFatalBrush}"/>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="ctrl:TextLogViewer">
@@ -4678,7 +4682,7 @@
                       <Setter Property="Width" Value="12" />
                       <Setter Property="Height" Value="12" />
                       <Setter Property="Margin" Value="0,0,4,0" />
-                      <Setter Property="Template" Value="{StaticResource DarkExpanderToggleButton}"/>
+                      <Setter Property="Template" Value="{StaticResource TreeExpanderToggleButton}"/>
                     </Style>
                   </ToggleButton.Style>
                 </ToggleButton>
@@ -4691,7 +4695,17 @@
                                   ContentSource="Header"
                                   HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
                                   VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
-                                  SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                                  SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" >
+                  <ContentPresenter.Resources>
+                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+                      <Style.Triggers>
+                        <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ctrl:TreeViewItem}}, Mode=OneWay}" Value="True">
+                          <Setter Property="Foreground" Value="{StaticResource SelectedTextBrush}"/>
+                        </DataTrigger>
+                      </Style.Triggers>
+                    </Style>
+                  </ContentPresenter.Resources>
+                </ContentPresenter>
               </DockPanel>
               <Rectangle x:Name="FocusVisualElement" Stroke="#4CFFFFFF" StrokeThickness="1" RadiusX="1" RadiusY="1" Opacity="0" IsHitTestVisible="False" Margin="1,1,1,1"/>
             </Grid>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml.cs
index 6b3f36788e..a3e7867c96 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml.cs
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml.cs
@@ -20,7 +20,7 @@ private void Image_Loaded(object sender, RoutedEventArgs e)
             {
                 img.Source = new DrawingImage
                 {
-                    Drawing = ImageThemingUtilities.TransformDrawing(drawingImage.Drawing, IconThemeSelector.KnownThemes.Dark.GetIconTheme())
+                    Drawing = ImageThemingUtilities.TransformDrawing(drawingImage.Drawing, ThemeController.CurrentTheme.GetThemeBase().GetIconTheme())
                 };
             }
         }
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
index ff24a791a4..aa34763bf8 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
@@ -10,4 +10,18 @@ public enum ThemeType
         [Display("Dark Steel")]
         DarkSteel,
     }
+
+    public static class ThemeTypeExtensions
+    {
+        public static IconThemeSelector.ThemeBase GetThemeBase(this ThemeType themeType)
+        {
+            switch (themeType)
+            {
+                case ThemeType.ExpressionDark:
+                case ThemeType.DarkSteel:
+                default:
+                    return IconThemeSelector.ThemeBase.Dark;
+            }
+        }
+    }
 }

From 41bea14ceeb978bd9df33235a2181b9ba5f578c6 Mon Sep 17 00:00:00 2001
From: Basewq <Basewq@users.noreply.github.com>
Date: Sun, 12 Apr 2020 15:04:10 +1200
Subject: [PATCH 4/4] [Editor] Add light theme (experimental)

---
 .../Themes/ThemeSelector.xaml                 |   3 +-
 .../Themes/Overrides/LightSteelBlueTheme.xaml | 144 ++++++++++++++++++
 .../Themes/ThemeResourceDictionary.cs         |  12 ++
 .../Themes/ThemeSelector.xaml                 |   3 +-
 .../Themes/ThemeType.cs                       |   8 +
 5 files changed, 168 insertions(+), 2 deletions(-)
 create mode 100644 sources/presentation/Stride.Core.Presentation/Themes/Overrides/LightSteelBlueTheme.xaml

diff --git a/sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml b/sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml
index 2c5c0b6de2..a9241e7ace 100644
--- a/sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml
+++ b/sources/editor/Stride.Core.Assets.Editor/Themes/ThemeSelector.xaml
@@ -7,5 +7,6 @@
                                 xmlns:themes="clr-namespace:Stride.Core.Presentation.Themes;assembly=Stride.Core.Presentation"
                                 Source="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"
                                 ExpressionDarkSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"
-                                DarkSteelSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml">
+                                DarkSteelSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"
+                                LightSteelBlueSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml">
 </themes:ThemeResourceDictionary>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/Overrides/LightSteelBlueTheme.xaml b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/LightSteelBlueTheme.xaml
new file mode 100644
index 0000000000..b4c419ea7c
--- /dev/null
+++ b/sources/presentation/Stride.Core.Presentation/Themes/Overrides/LightSteelBlueTheme.xaml
@@ -0,0 +1,144 @@
+<!--
+// Copyright (c) Stride contributors (https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    x:Class="Stride.Core.Presentation.Themes.Overrides.LightSteelBlueTheme"
+                    mc:Ignorable="d">
+  <!-- Main Colors -->
+
+  <Color x:Key="MainColor">#FF939393</Color>
+  <Color x:Key="HoverColor">#FFAAAAAA</Color>
+  <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+  <SolidColorBrush x:Key="DropdownButtonBackgroundBrush" Color="#F5F5F5" />
+  <SolidColorBrush x:Key="ComboBoxBackground" Color="White" />
+  <SolidColorBrush x:Key="ComboBoxItemHoverBackground" Color="#FFC9DEF5"/>
+
+  <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
+  <Color x:Key="BottomGradientSelectColor">#FF999999</Color>
+
+  <Color x:Key="BlackColor">#FF000000</Color>
+  <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+
+  <Color x:Key="LoadingAssetMessageFromColor">DarkGreen</Color>
+  <SolidColorBrush x:Key="LoadingAssetMessageFromBrush" Color="{StaticResource LoadingAssetMessageFromColor}" />
+  <Color x:Key="LoadingAssetMessageToColor">Black</Color>
+
+  <SolidColorBrush x:Key="SubTabItemActiveBackground" Color="#F5F5F5" />
+  <SolidColorBrush x:Key="SubTabItemActiveForeground" Color="#0066CC" />
+
+  <SolidColorBrush x:Key="BackgroundBrush" Color="#E7E7EA"/>
+  <SolidColorBrush x:Key="TextBrush" Color="#FF000000" />
+  <SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
+  <SolidColorBrush x:Key="NormalBrush" Color="#D1D5DA" />
+  <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF9B9999" />
+  <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
+  <SolidColorBrush x:Key="GlyphBrush" Color="#1E1E1E" />
+  <SolidColorBrush x:Key="GlyphHeaderBrush" Color="White" />
+
+  <SolidColorBrush x:Key="ScrollBarBackgroundNormalBrush" Color="#F2F2F2" />
+  <SolidColorBrush x:Key="ScrollBarThumbHoverBrush" Color="#686868" />
+  <SolidColorBrush x:Key="ScrollBarThumbPressedBrush" Color="#5B5B5B" />
+
+  <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
+
+  <SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
+  <SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
+  <SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
+  <SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
+  <SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
+
+  <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFF5F5F5" />
+
+  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#007ACC"/>
+  <SolidColorBrush x:Key="SelectedTextBrush" Color="White"/>
+
+  <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
+  <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
+
+  <Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
+  <SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
+
+  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
+  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#FFD4D4D4" />
+  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFFFFFFF" />
+
+  <SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
+  <SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
+  <SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="White" />
+
+  <SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
+
+  <SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FFC9DEF5"/>
+  <SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#0082D9"/>
+
+  <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
+  <SolidColorBrush x:Key="SolidBorderBrush" Color="#CCCEDB" />
+  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FFCCCEDB"/>
+  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#C2D7ED"/>
+  <SolidColorBrush x:Key="MenuHoverBrush" Color="#C9DEF5"/>
+  <SolidColorBrush x:Key="PropertyGridItemHoverBrush" Color="#FFC9DEF5" />
+
+  <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
+  <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
+
+  <SolidColorBrush x:Key="MenuBackgroundBrush" Color="#F2F2F2"/>
+  <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF545456" />
+  <SolidColorBrush x:Key="ButtonNormalBackground" Color="#F7F7FA"/>
+
+  <SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FFCCCEDB"/>
+
+  <SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
+  <SolidColorBrush x:Key="MenuBorderBrush" Color="#D0D3D6"/>
+
+  <SolidColorBrush x:Key="ListBorder" Color="#828790" />
+  <SolidColorBrush x:Key="ToolBarGripper" Color="#3A3A3A"/>
+  <SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
+  <SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFCCCEDB"/>
+  <SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
+  <SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FFC9DEF5"/>
+  <SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#E8E8E8"/>
+
+  <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
+
+  <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
+
+  <SolidColorBrush x:Key="CodeEditorBackgroundBrush" Color="White" />
+
+  <SolidColorBrush x:Key="GraphicsCompositorNodeTextBrush" Color="#EBEBEB" />
+
+  <!--TextLogViewer colors-->
+  <SolidColorBrush x:Key="TextLogDebugBrush" Color="DarkSlateGray"/>
+  <SolidColorBrush x:Key="TextLogVerboseBrush" Color="Black"/>
+  <SolidColorBrush x:Key="TextLogInfoBrush" Color="DarkGreen"/>
+  <SolidColorBrush x:Key="TextLogWarningBrush" Color="DarkOrange"/>
+  <SolidColorBrush x:Key="TextLogErrorBrush" Color="Red"/>
+  <SolidColorBrush x:Key="TextLogFatalBrush" Color="DarkRed"/>
+
+  <!-- EXPRESSION COMMON VALUES -->
+
+  <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#59FFFFFF" Offset="0" />
+    <GradientStop Color="#00FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#4CFFFFFF" Offset="0" />
+    <GradientStop Color="#26FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+    <GradientStop Color="#00FFFFFF" Offset="0.856" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+    <GradientStop Color="#444" Offset="0.0" />
+    <GradientStop Color="#888" Offset="1.0" />
+  </LinearGradientBrush>
+
+</ResourceDictionary>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs
index 7ced3208a9..d6edd5dde0 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs
@@ -9,6 +9,7 @@ public class ThemeResourceDictionary : ResourceDictionary
     {
         private Uri expressionDarkSource;
         private Uri darkSteelSource;
+        private Uri expressionLightSource;
 
         // New themes are added here as new properties.
 
@@ -24,6 +25,12 @@ public Uri DarkSteelSource
             set => SetValue(ref darkSteelSource, value);
         }
 
+        public Uri LightSteelBlueSource
+        {
+            get => expressionLightSource;
+            set => SetValue(ref expressionLightSource, value);
+        }
+
         public void UpdateSource(ThemeType themeType)
         {
             switch (themeType)
@@ -37,6 +44,11 @@ public void UpdateSource(ThemeType themeType)
                     if (DarkSteelSource != null)
                         Source = DarkSteelSource;
                     break;
+
+                case ThemeType.LightSteelBlue:
+                    if (LightSteelBlueSource != null)
+                        Source = LightSteelBlueSource;
+                    break;
             }
         }
 
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
index 603570eea2..15fc60fef1 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
@@ -36,7 +36,8 @@
     -->
     <themes:ThemeResourceDictionary Source="Overrides/ExpressionDarkTheme.xaml"
                                     ExpressionDarkSource="Overrides/ExpressionDarkTheme.xaml"
-                                    DarkSteelSource="Overrides/DarkSteelTheme.xaml" />
+                                    DarkSteelSource="Overrides/DarkSteelTheme.xaml"
+                                    LightSteelBlueSource="Overrides/LightSteelBlueTheme.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
   <Geometry x:Key="GeometryDebugMessage">F1 M 46.5,19C 47.8807,19 49,20.1193 49,21.5C 49,22.8807 47.8807,24 46.5,24L 45.8641,23.9184L 43.5566,26.8718C 45.1489,28.0176 46.5309,29.6405 47.6023,31.6025C 44.8701,32.4842 41.563,33 38,33C 34.4369,33 31.1299,32.4842 28.3977,31.6025C 29.4333,29.7061 30.7591,28.1265 32.2844,26.9882L 29.9221,23.9646C 29.7849,23.9879 29.6438,24 29.5,24C 28.1193,24 27,22.8808 27,21.5C 27,20.1193 28.1193,19 29.5,19C 30.8807,19 32,20.1193 32,21.5C 32,22.0018 31.8521,22.4691 31.5976,22.8607L 34.0019,25.938C 35.2525,25.3305 36.5982,25 38,25C 39.3339,25 40.617,25.2993 41.8156,25.8516L 44.2947,22.6786C 44.1066,22.3274 44,21.9262 44,21.5C 44,20.1193 45.1193,19 46.5,19 Z M 54.5,40C 55.3284,40 56,40.6716 56,41.5C 56,42.3284 55.3284,43 54.5,43L 49.9511,43C 49.88,44.0847 49.7325,45.1391 49.5162,46.1531L 54.8059,48.6197C 55.5567,48.9698 55.8815,49.8623 55.5314,50.6131C 55.1813,51.3639 54.2889,51.6887 53.5381,51.3386L 48.6665,49.067C 46.8161,53.9883 43.2172,57.4651 39,57.9435L 39,34.9864C 42.541,34.8897 45.7913,34.283 48.4239,33.3201L 48.6187,33.8074L 53.73,31.8454C 54.5034,31.5485 55.371,31.9348 55.6679,32.7082C 55.9648,33.4816 55.5785,34.3492 54.8051,34.6461L 49.482,36.6895C 49.717,37.7515 49.8763,38.859 49.9511,40L 54.5,40 Z M 21.5,40L 26.0489,40C 26.1237,38.859 26.2829,37.7516 26.518,36.6895L 21.1949,34.6461C 20.4215,34.3492 20.0352,33.4816 20.332,32.7082C 20.6289,31.9348 21.4966,31.5485 22.27,31.8454L 27.3812,33.8074L 27.5761,33.3201C 30.2087,34.283 33.4589,34.8897 37,34.9864L 37,57.9435C 32.7827,57.4651 29.1838,53.9883 27.3335,49.067L 22.4618,51.3387C 21.711,51.6888 20.8186,51.3639 20.4685,50.6131C 20.1184,49.8623 20.4432,48.9699 21.194,48.6198L 26.4838,46.1531C 26.2674,45.1392 26.12,44.0847 26.0489,43L 21.5,43C 20.6716,43 20,42.3285 20,41.5C 20,40.6716 20.6716,40 21.5,40 Z</Geometry>
diff --git a/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs b/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
index aa34763bf8..de09180f08 100644
--- a/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
+++ b/sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
@@ -5,10 +5,15 @@ namespace Stride.Core.Presentation.Themes
 {
     public enum ThemeType
     {
+        // Dark themes
         [Display("Expression Dark (Default)")]
         ExpressionDark,
         [Display("Dark Steel")]
         DarkSteel,
+
+        // Light themes
+        [Display("Light Steel Blue (Experimental)")]
+        LightSteelBlue,
     }
 
     public static class ThemeTypeExtensions
@@ -21,6 +26,9 @@ public static IconThemeSelector.ThemeBase GetThemeBase(this ThemeType themeType)
                 case ThemeType.DarkSteel:
                 default:
                     return IconThemeSelector.ThemeBase.Dark;
+
+                case ThemeType.LightSteelBlue:
+                    return IconThemeSelector.ThemeBase.Light;
             }
         }
     }