diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 7ebb87094a..a5535ea52d 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -78,9 +78,12 @@ namespace ControlCatalog
 
         public override void Initialize()
         {
-            Styles.Insert(0, Fluent);
-            Styles.Insert(1, ColorPickerFluent);
-            Styles.Insert(2, DataGridFluent);
+            Styles.Insert(0, DefaultLight);
+            Styles.Insert(1, ColorPickerDefault);
+            Styles.Insert(2, DataGridDefault);
+            //Styles.Insert(0, Fluent);
+            //Styles.Insert(1, ColorPickerFluent);
+            //Styles.Insert(2, DataGridFluent);
             AvaloniaXamlLoader.Load(this);
         }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index 680424122b..004518598c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -4,7 +4,8 @@
         xmlns:diag="clr-namespace:Avalonia.Diagnostics"
         xmlns:default="using:Avalonia.Themes.Default"
         Title="Avalonia DevTools"
-        x:Class="Avalonia.Diagnostics.Views.MainWindow">
+        x:Class="Avalonia.Diagnostics.Views.MainWindow"
+        Theme="{StaticResource {x:Type Window}}">
   <Window.DataTemplates>
     <diag:ViewLocator/>
   </Window.DataTemplates>