diff --git a/src/Avalonia.Themes.Fluent/Accents/Base.xaml b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
index 479bcd8531..7512fa4cfa 100644
--- a/src/Avalonia.Themes.Fluent/Accents/Base.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
@@ -2,38 +2,481 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="using:System"
xmlns:converters="using:Avalonia.Controls.Converters">
-
-
- #FFF0F0F0
- #FF000000
- #FF6D6D6D
- #FF3399FF
- #FFFFFFFF
- #FF0066CC
- #FFFFFFFF
- #FF000000
- avares://Avalonia.Themes.Fluent/Assets#Inter
- 14
-
-
- True
- 1
- 2
- 10,6,6,5
- 20
- 20
- 8,5,8,6
-
-
- 3
- 5
-
-
- scaleX(0.125) translateX(-2px)
- scaleY(0.125) translateY(-2px)
-
-
-
-
-
+
+ avares://Avalonia.Themes.Fluent/Assets#Inter
+ 14
+
+
+ True
+ 1
+ 2
+ 10,6,6,5
+ 20
+ 20
+ 8,5,8,6
+
+
+ 3
+ 5
+
+
+ scaleX(0.125) translateX(-2px)
+ scaleY(0.125) translateY(-2px)
+
+
+
+
+
+
+
+
+
+ #FFFFFFFF
+ #33FFFFFF
+ #99FFFFFF
+ #CCFFFFFF
+ #66FFFFFF
+ #FF000000
+ #33000000
+ #99000000
+ #CC000000
+ #66000000
+ #FF171717
+ #FF000000
+ #33000000
+ #66000000
+ #CC000000
+ #FFCCCCCC
+ #FF7A7A7A
+ #FFCCCCCC
+ #FFF2F2F2
+ #FFE6E6E6
+ #FFF2F2F2
+ #FFFFFFFF
+ #FF767676
+ #19000000
+ #33000000
+ #C50500
+
+ #17000000
+ #2E000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FFFFFFFF
+
+
+
+ 374
+ 0,2,0,2
+ 1
+ -1,0,-1,0
+ 32
+ 64
+ 456
+ 0
+ 1
+ 0
+
+ 12,11,12,12
+ 96
+ 40
+ 758
+
+
+ 0
+
+
+ 0,4,0,4
+
+
+ 12,0,12,0
+
+
+
+ #FF000000
+ #33000000
+ #99000000
+ #CC000000
+ #66000000
+ #FFFFFFFF
+ #33FFFFFF
+ #99FFFFFF
+ #CCFFFFFF
+ #66FFFFFF
+ #FFF2F2F2
+ #FF000000
+ #33000000
+ #66000000
+ #CC000000
+ #FF333333
+ #FF858585
+ #FF767676
+ #FF171717
+ #FF1F1F1F
+ #FF2B2B2B
+ #FFFFFFFF
+ #FF767676
+ #19FFFFFF
+ #33FFFFFF
+ #FFF000
+
+ #18FFFFFF
+ #30FFFFFF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FF000000
+
+
+ 374
+ 0,2,0,2
+ 1
+ -1,0,-1,0
+ 32
+ 64
+ 456
+ 0
+ 1
+ 0
+
+ 12,11,12,12
+ 96
+ 40
+ 758
+
+
+ 0
+
+
+ 0,4,0,4
+
+
+ 12,0,12,0
+
+
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
deleted file mode 100644
index 0192fb1b54..0000000000
--- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
- #FF000000
- #33000000
- #99000000
- #CC000000
- #66000000
- #FFFFFFFF
- #33FFFFFF
- #99FFFFFF
- #CCFFFFFF
- #66FFFFFF
- #FFF2F2F2
- #FF000000
- #33000000
- #66000000
- #CC000000
- #FF333333
- #FF858585
- #FF767676
- #FF171717
- #FF1F1F1F
- #FF2B2B2B
- #FFFFFFFF
- #FF767676
- #19FFFFFF
- #33FFFFFF
- #FFF000
-
- #18FFFFFF
- #30FFFFFF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #FF000000
-
-
- 374
- 0,2,0,2
- 1
- -1,0,-1,0
- 32
- 64
- 456
- 0
- 1
- 0
-
- 12,11,12,12
- 96
- 40
- 758
-
-
- 0
-
-
- 0,4,0,4
-
-
- 12,0,12,0
-
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
deleted file mode 100644
index a9e5ed949a..0000000000
--- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
- #FFFFFFFF
- #33FFFFFF
- #99FFFFFF
- #CCFFFFFF
- #66FFFFFF
- #FF000000
- #33000000
- #99000000
- #CC000000
- #66000000
- #FF171717
- #FF000000
- #33000000
- #66000000
- #CC000000
- #FFCCCCCC
- #FF7A7A7A
- #FFCCCCCC
- #FFF2F2F2
- #FFE6E6E6
- #FFF2F2F2
- #FFFFFFFF
- #FF767676
- #19000000
- #33000000
- #C50500
-
- #17000000
- #2E000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #FFFFFFFF
-
-
-
- 374
- 0,2,0,2
- 1
- -1,0,-1,0
- 32
- 64
- 456
- 0
- 1
- 0
-
- 12,11,12,12
- 96
- 40
- 758
-
-
- 0
-
-
- 0,4,0,4
-
-
- 12,0,12,0
-
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResources.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResources.xaml
new file mode 100644
index 0000000000..a9bc622221
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResources.xaml
@@ -0,0 +1,1551 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 64
+ 1
+ 1
+ 11,5,11,7
+ Normal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0,4,0,4
+
+
+ 0
+
+
+ 4
+ 0
+
+
+ 1
+ 32
+ 0,0
+ 12,0,0,0
+ 12,4,12,4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,9,11,10
+ 11,4,11,7
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 2
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 12
+ 1
+
+
+
+ 8,5,8,7
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 24
+ 12,0,12,0
+ 12,0,12,0
+ SemiLight
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 16
+ 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 64
+ 1
+ 1
+ 11,5,11,7
+ Normal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0,4,0,4
+
+
+ 0
+
+
+ 4
+ 0
+
+
+ 1
+ 32
+ 0,0
+ 12,0,0,0
+ 12,4,12,4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,9,11,10
+ 11,4,11,7
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 2
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 12
+ 1
+
+
+
+ 8,5,8,7
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 24
+ 12,0,12,0
+ 12,0,12,0
+ SemiLight
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 16
+ 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
deleted file mode 100644
index 810065fc9b..0000000000
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ /dev/null
@@ -1,643 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 64
- 1
- 1
- 11,5,11,7
- Normal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0,4,0,4
-
-
- 0
-
-
- 4
- 0
-
-
- 1
- 32
- 0,0
- 12,0,0,0
- 12,4,12,4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 11,9,11,10
- 11,4,11,7
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4
- 2
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 12
- 1
-
-
-
- 8,5,8,7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 24
- 12,0,12,0
- 12,0,12,0
- SemiLight
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 16
- 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- 32
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
deleted file mode 100644
index bccc47b9b8..0000000000
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ /dev/null
@@ -1,638 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 64
- 1
- 1
- 11,5,11,7
- Normal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0,4,0,4
-
-
- 0
-
-
- 4
- 0
-
-
- 1
- 32
- 0,0
- 12,0,0,0
- 12,4,12,4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 11,9,11,10
- 11,4,11,7
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4
- 2
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 12
- 1
-
-
-
- 8,5,8,7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 24
- 12,0,12,0
- 12,0,12,0
- SemiLight
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 16
- 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- 32
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 2c3550a72f..532b0cff1b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -69,6 +69,7 @@
+
diff --git a/src/Avalonia.Themes.Fluent/Controls/ThemeVariantScope.xaml b/src/Avalonia.Themes.Fluent/Controls/ThemeVariantScope.xaml
new file mode 100644
index 0000000000..21a5506b88
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/ThemeVariantScope.xaml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
index 44ca60e2fa..e83257fd9f 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
@@ -6,13 +6,10 @@
+
-
-
-
-
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs b/src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs
index a8297953a8..95539bc08a 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs
@@ -6,12 +6,6 @@ using Avalonia.Styling;
namespace Avalonia.Themes.Fluent
{
- public enum FluentThemeMode
- {
- Light,
- Dark,
- }
-
public enum DensityStyle
{
Normal,
@@ -23,10 +17,6 @@ namespace Avalonia.Themes.Fluent
///
public class FluentTheme : Styles
{
- private readonly IResourceDictionary _baseDark;
- private readonly IResourceDictionary _fluentDark;
- private readonly IResourceDictionary _baseLight;
- private readonly IResourceDictionary _fluentLight;
private readonly Styles _compactStyles;
///
@@ -37,13 +27,8 @@ namespace Avalonia.Themes.Fluent
{
AvaloniaXamlLoader.Load(sp, this);
- _baseDark = (IResourceDictionary)GetAndRemove("BaseDark");
- _fluentDark = (IResourceDictionary)GetAndRemove("FluentDark");
- _baseLight = (IResourceDictionary)GetAndRemove("BaseLight");
- _fluentLight = (IResourceDictionary)GetAndRemove("FluentLight");
_compactStyles = (Styles)GetAndRemove("CompactStyles");
-
- EnsureThemeVariants();
+
EnsureCompactStyles();
object GetAndRemove(string key)
@@ -54,22 +39,10 @@ namespace Avalonia.Themes.Fluent
return val;
}
}
-
- public static readonly StyledProperty ModeProperty =
- AvaloniaProperty.Register(nameof(Mode));
-
+
public static readonly StyledProperty DensityStyleProperty =
AvaloniaProperty.Register(nameof(DensityStyle));
- ///
- /// Gets or sets the mode of the fluent theme (light, dark).
- ///
- public FluentThemeMode Mode
- {
- get => GetValue(ModeProperty);
- set => SetValue(ModeProperty, value);
- }
-
///
/// Gets or sets the density style of the fluent theme (normal, compact).
///
@@ -82,11 +55,6 @@ namespace Avalonia.Themes.Fluent
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
-
- if (change.Property == ModeProperty)
- {
- EnsureThemeVariants();
- }
if (change.Property == DensityStyleProperty)
{
@@ -94,23 +62,6 @@ namespace Avalonia.Themes.Fluent
}
}
- private void EnsureThemeVariants()
- {
- var themeVariantResource1 = Mode == FluentThemeMode.Dark ? _baseDark : _baseLight;
- var themeVariantResource2 = Mode == FluentThemeMode.Dark ? _fluentDark : _fluentLight;
- var dict = Resources.MergedDictionaries;
- if (dict.Count == 0)
- {
- dict.Add(themeVariantResource1);
- dict.Add(themeVariantResource2);
- }
- else
- {
- dict[0] = themeVariantResource1;
- dict[1] = themeVariantResource2;
- }
- }
-
private void EnsureCompactStyles()
{
if (DensityStyle == DensityStyle.Compact)
diff --git a/src/Avalonia.Themes.Simple/Accents/Base.xaml b/src/Avalonia.Themes.Simple/Accents/Base.xaml
index bffdbd8a27..0c1354e475 100644
--- a/src/Avalonia.Themes.Simple/Accents/Base.xaml
+++ b/src/Avalonia.Themes.Simple/Accents/Base.xaml
@@ -1,62 +1,131 @@
-
- #CC119EDA
- #99119EDA
- #66119EDA
- #33119EDA
- #FF808080
- #FFFFFFFF
- #FFFF0000
- #10FF0000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- 0.5
+
+
+
+ #FFFFFFFF
+ #FFAAAAAA
+ #FF888888
+ #FF333333
+ #FF868999
+ #FFF5F5F5
+ #FFC2C3C9
+ #FF686868
+ #FF5B5B5B
+ #FFF0F0F0
+ #FFD0D0D0
+ #FF808080
+ #FF000000
+ #FF086F9E
- 10
- 12
- 16
+
+
+
+
+
+
+
+
+
+
+
+
+
- 18
- 8
+
+
+
+
+
+ #FF282828
+ #FF505050
+ #FF808080
+ #FFA0A0A0
+ #FF282828
+ #FF505050
+ #FF686868
+ #FF808080
+ #FFEFEBEF
+ #FFA8A8A8
+ #FF828282
+ #FF505050
+ #FFDEDEDE
+ #FF119EDA
- 20
- 20
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #CC119EDA
+ #99119EDA
+ #66119EDA
+ #33119EDA
+ #FF808080
+ #FFFFFFFF
+ #FFFF0000
+ #10FF0000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 0.5
+
+ 10
+ 12
+ 16
+
+ 18
+ 8
+
+ 20
+ 20
diff --git a/src/Avalonia.Themes.Simple/Accents/BaseDark.xaml b/src/Avalonia.Themes.Simple/Accents/BaseDark.xaml
deleted file mode 100644
index 88c2681f65..0000000000
--- a/src/Avalonia.Themes.Simple/Accents/BaseDark.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
- #FF282828
- #FF505050
- #FF808080
- #FFA0A0A0
- #FF282828
- #FF505050
- #FF686868
- #FF808080
- #FFEFEBEF
- #FFA8A8A8
- #FF828282
- #FF505050
- #FFDEDEDE
- #FF119EDA
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Avalonia.Themes.Simple/Accents/BaseLight.xaml b/src/Avalonia.Themes.Simple/Accents/BaseLight.xaml
deleted file mode 100644
index 77166a9d8a..0000000000
--- a/src/Avalonia.Themes.Simple/Accents/BaseLight.xaml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
- #FFFFFFFF
- #FFAAAAAA
- #FF888888
- #FF333333
- #FF868999
- #FFF5F5F5
- #FFC2C3C9
- #FF686868
- #FF5B5B5B
- #FFF0F0F0
- #FFD0D0D0
- #FF808080
- #FF000000
- #FF086F9E
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
index 093adaeab2..479db9ed09 100644
--- a/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
@@ -67,6 +67,7 @@
+
diff --git a/src/Avalonia.Themes.Simple/Controls/ThemeVariantScope.xaml b/src/Avalonia.Themes.Simple/Controls/ThemeVariantScope.xaml
new file mode 100644
index 0000000000..a6022fb263
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/ThemeVariantScope.xaml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/src/Avalonia.Themes.Simple/SimpleTheme.xaml b/src/Avalonia.Themes.Simple/SimpleTheme.xaml
index 5b0cae7fd2..f6d6ddfec9 100644
--- a/src/Avalonia.Themes.Simple/SimpleTheme.xaml
+++ b/src/Avalonia.Themes.Simple/SimpleTheme.xaml
@@ -4,12 +4,8 @@
-
+
-
-
-
-
diff --git a/src/Avalonia.Themes.Simple/SimpleTheme.xaml.cs b/src/Avalonia.Themes.Simple/SimpleTheme.xaml.cs
index 42dfafd7e0..31b3243993 100644
--- a/src/Avalonia.Themes.Simple/SimpleTheme.xaml.cs
+++ b/src/Avalonia.Themes.Simple/SimpleTheme.xaml.cs
@@ -4,68 +4,16 @@ using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.Styling;
-namespace Avalonia.Themes.Simple
+namespace Avalonia.Themes.Simple;
+
+public class SimpleTheme : Styles
{
- public class SimpleTheme : Styles
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The parent's service provider.
+ public SimpleTheme(IServiceProvider? sp = null)
{
- public static readonly StyledProperty ModeProperty =
- AvaloniaProperty.Register(nameof(Mode));
-
- private readonly IResourceDictionary _simpleDark;
- private readonly IResourceDictionary _simpleLight;
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// The parent's service provider.
- public SimpleTheme(IServiceProvider? sp = null)
- {
- AvaloniaXamlLoader.Load(sp, this);
-
- _simpleDark = (IResourceDictionary)GetAndRemove("BaseDark");
- _simpleLight = (IResourceDictionary)GetAndRemove("BaseLight");
- EnsureThemeVariant();
-
- object GetAndRemove(string key)
- {
- var val = Resources[key]
- ?? throw new KeyNotFoundException($"Key {key} was not found in the resources");
- Resources.Remove(key);
- return val;
- }
- }
-
- ///
- /// Gets or sets the mode of the fluent theme (light, dark).
- ///
- public SimpleThemeMode Mode
- {
- get => GetValue(ModeProperty);
- set => SetValue(ModeProperty, value);
- }
-
- protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
- {
- base.OnPropertyChanged(change);
-
- if (change.Property == ModeProperty)
- {
- EnsureThemeVariant();
- }
- }
-
- private void EnsureThemeVariant()
- {
- var themeVariantResource = Mode == SimpleThemeMode.Dark ? _simpleDark : _simpleLight;
- var dict = Resources.MergedDictionaries;
- if (dict.Count == 0)
- {
- dict.Add(themeVariantResource);
- }
- else
- {
- dict[0] = themeVariantResource;
- }
- }
+ AvaloniaXamlLoader.Load(sp, this);
}
}
diff --git a/src/Avalonia.Themes.Simple/SimpleThemeMode.cs b/src/Avalonia.Themes.Simple/SimpleThemeMode.cs
deleted file mode 100644
index 683c751f10..0000000000
--- a/src/Avalonia.Themes.Simple/SimpleThemeMode.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Avalonia.Themes.Simple
-{
- public enum SimpleThemeMode
- {
- Light,
- Dark
- }
-}