diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index a6754143a2..130c000440 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -11,25 +11,25 @@ namespace ControlCatalog
{
public static Styles FluentDark = new Styles
{
- new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
{
- Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default")
+ Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")
},
- new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
{
- Source = new Uri("resm:Avalonia.Themes.Fluent.Accents.FluentDark.xaml?assembly=Avalonia.Themes.Fluent")
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml")
},
};
public static Styles FluentLight = new Styles
{
- new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
{
- Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default")
+ Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")
},
- new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
{
- Source = new Uri("resm:Avalonia.Themes.Fluent.Accents.FluentLight.xaml?assembly=Avalonia.Themes.Fluent")
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml")
},
};
@@ -61,7 +61,7 @@ namespace ControlCatalog
{
AvaloniaXamlLoader.Load(this);
- Styles.Insert(0, FluentDark);
+ Styles.Insert(0, FluentLight);
}
public override void OnFrameworkInitializationCompleted()
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
index d29db79e7b..9ef92a44d5 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
index 43867f6e97..8c92040122 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 84bf799d8d..c5eb016fe8 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -11,12 +11,8 @@
-
-
-
-
-
-
+
+
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
index 2cb34431fa..3d54f082bd 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
@@ -2,60 +2,59 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="Avalonia.Themes.Fluent.FluentTheme">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+