more refactorings

samples/ControlCatalog/App.xaml

@@ -5,8 +5,6 @@
              x:CompileBindings="True"
              x:Class="ControlCatalog.App">
   <Application.Styles>
-    <FluentTheme Mode="Light"/>
-    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     <Style Selector="TextBlock.h1, TextBlock.h2, TextBlock.h3">
       <Setter Property="TextWrapping" Value="Wrap" />
     </Style>

samples/ControlCatalog/App.xaml.cs

@@ -5,6 +5,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Styling;
+using Avalonia.Themes.Fluent;
 using ControlCatalog.ViewModels;
 
 namespace ControlCatalog
@@ -26,21 +27,9 @@ namespace ControlCatalog
             Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Default.xaml")
         };
 
-        public static Styles FluentDark = new Styles
-        {
-            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
-            {
-                Source = new Uri("avares://Avalonia.Themes.Fluent/FluentDark.xaml")
-            }
-        };
+        public static FluentTheme FluentDark = new FluentTheme(new Uri("avares://ControlCatalog/Styles")) { Mode = FluentThemeMode.Dark };
 
-        public static Styles FluentLight = new Styles
-        {
-            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
-            {
-                Source = new Uri("avares://Avalonia.Themes.Fluent/FluentLight.xaml")
-            }
-        };
+        public static FluentTheme FluentLight = new FluentTheme(new Uri("avares://ControlCatalog/Styles"));
 
         public static Styles DefaultLight = new Styles
         {
@@ -92,7 +81,8 @@ namespace ControlCatalog
 
         public override void Initialize()
         {
-
+            Styles.Insert(0, FluentLight);
+            Styles.Insert(1, DataGridFluent);
             AvaloniaXamlLoader.Load(this);
         }
 

samples/ControlCatalog/MainView.xaml.cs

@@ -53,7 +53,7 @@ namespace ControlCatalog
                         }
                         else
                         {
-                            Application.Current.Styles[0] = new FluentTheme(new Uri("avares://ControlCatalog/Styles"));
+                            Application.Current.Styles[0] = App.FluentLight;
                             Application.Current.Styles[1] = App.DataGridFluent;
                         }
                     }
@@ -68,7 +68,7 @@ namespace ControlCatalog
                         }
                         else
                         {
-                            Application.Current.Styles[0] = new FluentTheme(new Uri("avares://ControlCatalog/Styles")) { Mode = FluentThemeMode.Dark };
+                            Application.Current.Styles[0] = App.FluentDark;
                             Application.Current.Styles[1] = App.DataGridFluent;
                         }
                     }