diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
index 82cb6873eeb..2e09516544f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
@@ -18,10 +18,18 @@ static ThemeManager()
// TODO : Temprorary way of checking if setting Fluent theme enabled flag. Provide a property for theme switch.
if (Application.Current != null)
{
+ string dictionarySource;
foreach (ResourceDictionary mergedDictionary in Application.Current.Resources.MergedDictionaries)
{
- if (mergedDictionary.Source != null && mergedDictionary.Source.ToString().EndsWith("Fluent.xaml"))
+ if (mergedDictionary.Source != null)
{
+ dictionarySource = mergedDictionary.Source.ToString();
+
+ if (dictionarySource.EndsWith("Fluent.Light.xaml", StringComparison.OrdinalIgnoreCase)
+ || dictionarySource.EndsWith("Fluent.Dark.xaml", StringComparison.OrdinalIgnoreCase)
+ || dictionarySource.EndsWith("Fluent.HC.xaml", StringComparison.OrdinalIgnoreCase)
+ || dictionarySource.EndsWith("Fluent.xaml", StringComparison.OrdinalIgnoreCase))
+
_isFluentThemeEnabled = true;
break;
}
@@ -40,8 +48,8 @@ internal static void InitializeFluentTheme()
_currentApplicationTheme = GetSystemTheme();
_currentUseLightMode = IsSystemThemeLight();
- var themeColorResourceUri = GetFluentWindowThemeColorResourceUri(_currentApplicationTheme, _currentUseLightMode);
- Application.Current.Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = themeColorResourceUri });
+ var themeColorResourceUri = GetFluentThemeResourceUri(_currentApplicationTheme, _currentUseLightMode);
+ AddOrUpdateThemeResources(themeColorResourceUri);
_isFluentThemeInitialized = true;
}
@@ -103,7 +111,7 @@ private static void ApplyTheme(
requestedAccentColor != _currentSystemAccentColor)
{
- Uri dictionaryUri = GetFluentWindowThemeColorResourceUri(requestedTheme, requestedUseLightMode);
+ Uri dictionaryUri = GetFluentThemeResourceUri(requestedTheme, requestedUseLightMode);
AddOrUpdateThemeResources(dictionaryUri);
foreach(Window window in windows)
@@ -191,11 +199,11 @@ private static void AddOrUpdateThemeResources(Uri dictionaryUri)
var newDictionary = new ResourceDictionary() { Source = dictionaryUri };
- FindFluentThemeAndColorDictionary(out ResourceDictionary fluentDictionary, out ResourceDictionary colorDictionary);
+ FindFluentThemeResourceDictionary(out ResourceDictionary fluentDictionary);
- if (colorDictionary != null)
+ if (fluentDictionary != null)
{
- Application.Current.Resources.MergedDictionaries.Remove(colorDictionary);
+ Application.Current.Resources.MergedDictionaries.Remove(fluentDictionary);
}
Application.Current.Resources.MergedDictionaries.Add(newDictionary);
@@ -215,22 +223,21 @@ private static void AddOrUpdateThemeResources(Uri dictionaryUri)
#region Private Methods
- private static Uri GetFluentWindowThemeColorResourceUri(string systemTheme, bool useLightMode)
+ private static Uri GetFluentThemeResourceUri(string systemTheme, bool useLightMode)
{
- string themeColorFileName = useLightMode ? "light.xaml" : "dark.xaml";
+ string themeFileName = "Fluent." + (useLightMode ? "Light" : "Dark") + ".xaml";
if(SystemParameters.HighContrast)
{
- themeColorFileName = "hc.xaml";
+ themeFileName = "Fluent.HC.xaml";
}
- return new Uri("pack://application:,,,/PresentationFramework.Fluent;component/Resources/Theme/" + themeColorFileName, UriKind.Absolute);
- }
+ return new Uri("pack://application:,,,/PresentationFramework.Fluent;component/Themes/" + themeFileName, UriKind.Absolute);
+ }
- private static void FindFluentThemeAndColorDictionary(out ResourceDictionary fluentThemeDictionary, out ResourceDictionary fluentColorDictionary)
+ private static void FindFluentThemeResourceDictionary(out ResourceDictionary fluentDictionary)
{
- fluentThemeDictionary = null;
- fluentColorDictionary = null;
+ fluentDictionary = null;
if (Application.Current == null) return;
@@ -238,20 +245,15 @@ private static void FindFluentThemeAndColorDictionary(out ResourceDictionary flu
{
if (mergedDictionary.Source != null)
{
- if (mergedDictionary.Source.ToString() == fluentResourceDictionaryUri)
- {
- fluentThemeDictionary = mergedDictionary;
- }
- else if (mergedDictionary.Source.ToString().StartsWith(fluentColorResourceUriPart))
+ if (mergedDictionary.Source.ToString().Contains(fluentThemeResoruceDictionaryUri))
{
- fluentColorDictionary = mergedDictionary;
+ fluentDictionary = mergedDictionary;
+ break;
}
}
}
}
-
-
#endregion
#region Private Members
@@ -260,8 +262,7 @@ private static void FindFluentThemeAndColorDictionary(out ResourceDictionary flu
private static readonly string _regPersonalizeKeyPath = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
- private static readonly string fluentResourceDictionaryUri = "pack://application:,,,/PresentationFramework.Fluent;component/Resources/Fluent.xaml";
- private static readonly string fluentColorResourceUriPart = "pack://application:,,,/PresentationFramework.Fluent;component/Resources/Theme/";
+ private static readonly string fluentThemeResoruceDictionaryUri = "pack://application:,,,/PresentationFramework.Fluent;component/Themes/";
private static string _currentApplicationTheme;
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/Generator/ThemeGenerator.Fluent.ps1 b/src/Microsoft.DotNet.Wpf/src/Themes/Generator/ThemeGenerator.Fluent.ps1
new file mode 100644
index 00000000000..2dd67279fb5
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/Generator/ThemeGenerator.Fluent.ps1
@@ -0,0 +1,45 @@
+[CmdletBinding(PositionalBinding=$false)]
+Param(
+ [string][Alias('c')]$themeColor = "Light"
+)
+
+$currentDir = Get-Location
+$fluentThemeDir = Join-Path $currentDir "..\PresentationFramework.Fluent\"
+
+$outFilePath = Join-Path $fluentThemeDir "Themes\Fluent.$themeColor.xaml"
+
+$styleFilesDir = Join-Path $fluentThemeDir "Styles"
+$resouceFilesDir = Join-Path $fluentThemeDir "Resources"
+$themeColorFilePath = Join-Path $resouceFilesDir "Theme\$themeColor.xaml"
+
+[xml]$combinedXaml = '
+ '
+
+foreach ($file in Get-ChildItem $resouceFilesDir -Filter "*.xaml") {
+ if($file.BaseName -eq "Fluent") {
+ continue
+ }
+ [xml]$currentXaml = Get-Content $file
+
+ $combinedXaml.ResourceDictionary.InnerXml += $currentXaml.ResourceDictionary.InnerXml
+}
+
+[xml]$themeColorXaml = Get-Content $themeColorFilePath
+$combinedXaml.ResourceDictionary.InnerXml += $themeColorXaml.ResourceDictionary.InnerXml
+
+foreach ($file in Get-ChildItem $styleFilesDir -Filter "*.xaml") {
+ [xml]$currentXaml = Get-Content $file
+
+ $combinedXaml.ResourceDictionary.InnerXml += $currentXaml.ResourceDictionary.InnerXml
+}
+
+([xml]$combinedXaml).Save($outFilePath)
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Variables.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Variables.xaml
index ccff04a06d3..3e764fc25f9 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Variables.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Variables.xaml
@@ -46,7 +46,7 @@
10,0,30,0
24
- 12,1,0,3
+
32
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Calendar.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Calendar.xaml
index 897cf3e805a..1807342c2f2 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Calendar.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Calendar.xaml
@@ -10,10 +10,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=System.Runtime">
-
-
-
-
-
+
- #FFFF0000
+
- 11,5,11,6
- 1
- 8,0,0,0
- 14
- 22
- 22
+ 11,5,11,6
+ 1
+ 8,0,0,0
+ 14
+ 22
+ 22
+
+ Segoe Fluent Icons
+ #FFFFFF
+ #C5FFFFFF
+ #87FFFFFF
+ #5DFFFFFF
+ #E4000000
+
+
+
+
+
+ #E4000000
+ #BE000000
+ #A2000000
+ #5C000000
+ #FFFFFF
+
+
+
+
+
+ #FFFAFAFA
+
+ #FF202020
+
+ #B3FFFFFF
+
+ #72000000
+
+ 16
+ 14
+ 4,4,4,4
+ 8,8,8,8
+ 8,8,8,8
+
+ 1
+ 2
+ 10,8,10,7
+ 14
+ 24
+ 0
+ 32
+ 24
+ 24
+ 0
+ 0
+ 0,1,0,2
+ 0,1,0,2
+ 9,0,0,1
+ 10,0,30,0
+ 24
+
+ 32
+
+ #FF202020
+
+ #87FFFFFF
+
+
+ #FFFFFF
+ #C5FFFFFF
+ #87FFFFFF
+ #5DFFFFFF
+ #E4000000
+ #5DFFFFFF
+ #FFFFFF
+ #000000
+ #80000000
+ #87FFFFFF
+ #0FFFFFFF
+ #15FFFFFF
+ #08FFFFFF
+ #0BFFFFFF
+ #00FFFFFF
+ #B31E1E1E
+ #8BFFFFFF
+ #3FFFFFFF
+ #454545
+ #00FFFFFF
+ #0FFFFFFF
+ #0AFFFFFF
+ #00FFFFFF
+ #00FFFFFF
+ #19000000
+ #0BFFFFFF
+ #12FFFFFF
+ #00FFFFFF
+ #B31C1C1C
+ #1A1A1A
+ #131313
+ #1E1E1E
+ #28FFFFFF
+ #12FFFFFF
+ #18FFFFFF
+ #14FFFFFF
+ #23000000
+ #37000000
+ #33000000
+ #6B000000
+ #19000000
+ #1C1C1C
+ #8BFFFFFF
+ #28FFFFFF
+ #66757575
+ #33000000
+ #0F000000
+ #15FFFFFF
+ #FFFFFF
+ #B3000000
+ #0DFFFFFF
+ #08FFFFFF
+ #4D000000
+ #4C3A3A3A
+ #0DFFFFFF
+ #09FFFFFF
+ #09FFFFFF
+
+ #2C2C2C
+ #733A3A3A
+ #0FFFFFFF
+ #2C2C2C
+ #00FFFFFF
+ #202020
+ #1C1C1C
+ #282828
+ #2C2C2C
+ #00202020
+ #0A0A0A
+ #6CCB5F
+ #FCE100
+ #FF99A4
+ #8BFFFFFF
+ #9D9D9D
+ #08FFFFFF
+ #393D1B
+ #433519
+ #442726
+ #08FFFFFF
+ #2E2E2E
+ #2E2E2E
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FFFF0000
+ 11,5,11,6
+ 1
+ 8,0,0,0
+ 14
+ 22
+ 22
+
+
+
+
+ 10,8,10,8
+ 1,1,1,1
+ 0,0,0,2
+ 8,0,10,0
+ 3,2,3,0
+ 10,8,8,8
+ 11.0
+ 32.0
+
+
+
+
+
+
+
+
+
+
+
+ 14
+ #FFE8EDF9
+ #FFC5CBF9
+ #FF888888
+ White
+ #FF7381F9
+ #FF211AA9
+ #FF3843C4
+ #FF211AA9
+ #FF444444
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 8,0,0,0
+ 14
+ 22
+ 22
+
+
+
+
+
+ 1,1,1,0
+ 0,0,0,1
+ 10,8,0,0
+ 0,8,10,0
+ 0,5,4,0
+ 0,0,0,0
+ 24
+ 14
+
+
+
+
+
+ 11,11,11,11
+ 1
+ 12.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1,1,1,1
+ 0,0,0,1
+ 10,8,0,0
+ 0,8,10,0
+ 0,5,4,0
+ 0,0,0,0
+ 24
+ 14
+
+
+
+
+
+
+ 12
+ 20
+
+ 1
+ 8,6,0,0
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+ 0:0:0.16
+ 0:0:0.16
+ 12
+ 12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 12
+ 14
+ 20
+ 28
+ 40
+ 68
+
+
+
+
+
+
+
+
+ 1,1,1,1
+ 0,0,0,1
+ 10,0,0,0
+ 0,0,10,0
+ 0,0,4,0
+ 0,0,0,0
+ 24
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+ 14
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
new file mode 100644
index 00000000000..98b3fbfe864
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
@@ -0,0 +1,4692 @@
+
+
+
+
+
+
+
+
+ Segoe Fluent Icons
+ #FFFFFF
+ #C5FFFFFF
+ #87FFFFFF
+ #5DFFFFFF
+ #E4000000
+
+
+
+
+
+ #E4000000
+ #BE000000
+ #A2000000
+ #5C000000
+ #FFFFFF
+
+
+
+
+
+ #FFFAFAFA
+
+ #FF202020
+
+ #B3FFFFFF
+
+ #72000000
+
+ 16
+ 14
+ 4,4,4,4
+ 8,8,8,8
+ 8,8,8,8
+
+ 1
+ 2
+ 10,8,10,7
+ 14
+ 24
+ 0
+ 32
+ 24
+ 24
+ 0
+ 0
+ 0,1,0,2
+ 0,1,0,2
+ 9,0,0,1
+ 10,0,30,0
+ 24
+
+ 32
+
+
+
+
+
+
+
+
+
+
+ #2D3236
+
+
+ #FFFFFF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #A6A6A6
+ #FFFFFF
+ #A6A6A6
+ #FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #A6A6A6
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ Transparent
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ Transparent
+ #2D3236
+ #2D3236
+ #2D3236
+ Transparent
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #B6F6F0
+ #B6F6F0
+ #B6F6F0
+ #B6F6F0
+ #B6F6F0
+ #A6A6A6
+ #B6F6F0
+ #FFFFFF
+ #FFFFFF
+ #B6F6F0
+ #B6F6F0
+ #FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+
+ #2D3236
+ #FF0000
+ #FF0000
+ #FF0000
+ #FF0000
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ Transparent
+ #2D3236
+ #FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #FF0000
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #2D3236
+ #FF0000
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FFFF0000
+ 11,5,11,6
+ 1
+ 8,0,0,0
+ 14
+ 22
+ 22
+
+
+
+
+ 10,8,10,8
+ 1,1,1,1
+ 0,0,0,2
+ 8,0,10,0
+ 3,2,3,0
+ 10,8,8,8
+ 11.0
+ 32.0
+
+
+
+
+
+
+
+
+
+
+
+ 14
+ #FFE8EDF9
+ #FFC5CBF9
+ #FF888888
+ White
+ #FF7381F9
+ #FF211AA9
+ #FF3843C4
+ #FF211AA9
+ #FF444444
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 8,0,0,0
+ 14
+ 22
+ 22
+
+
+
+
+
+ 1,1,1,0
+ 0,0,0,1
+ 10,8,0,0
+ 0,8,10,0
+ 0,5,4,0
+ 0,0,0,0
+ 24
+ 14
+
+
+
+
+
+ 11,11,11,11
+ 1
+ 12.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1,1,1,1
+ 0,0,0,1
+ 10,8,0,0
+ 0,8,10,0
+ 0,5,4,0
+ 0,0,0,0
+ 24
+ 14
+
+
+
+
+
+
+ 12
+ 20
+
+ 1
+ 8,6,0,0
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+ 0:0:0.16
+ 0:0:0.16
+ 12
+ 12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 12
+ 14
+ 20
+ 28
+ 40
+ 68
+
+
+
+
+
+
+
+
+ 1,1,1,1
+ 0,0,0,1
+ 10,0,0,0
+ 0,0,10,0
+ 0,0,4,0
+ 0,0,0,0
+ 24
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+ 14
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
new file mode 100644
index 00000000000..2fa832ec108
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
@@ -0,0 +1,4713 @@
+
+
+
+
+
+
+
+
+ Segoe Fluent Icons
+ #FFFFFF
+ #C5FFFFFF
+ #87FFFFFF
+ #5DFFFFFF
+ #E4000000
+
+
+
+
+
+ #E4000000
+ #BE000000
+ #A2000000
+ #5C000000
+ #FFFFFF
+
+
+
+
+
+ #FFFAFAFA
+
+ #FF202020
+
+ #B3FFFFFF
+
+ #72000000
+
+ 16
+ 14
+ 4,4,4,4
+ 8,8,8,8
+ 8,8,8,8
+
+ 1
+ 2
+ 10,8,10,7
+ 14
+ 24
+ 0
+ 32
+ 24
+ 24
+ 0
+ 0
+ 0,1,0,2
+ 0,1,0,2
+ 9,0,0,1
+ 10,0,30,0
+ 24
+
+ 32
+
+ #FFFAFAFA
+
+ #BE000000
+
+
+ #E4000000
+ #9E000000
+ #72000000
+ #5C000000
+ #FFFFFF
+ #5C000000
+ #FFFFFF
+ #FFFFFF
+ #B3FFFFFF
+ #FFFFFF
+ #B3FFFFFF
+ #80F9F9F9
+ #4DF9F9F9
+ #4DF9F9F9
+ #00FFFFFF
+ #FFFFFF
+ #72000000
+ #51000000
+ #FFFFFF
+ #00FFFFFF
+ #09000000
+ #06000000
+ #00FFFFFF
+ #00FFFFFF
+ #06000000
+ #0F000000
+ #18000000
+ #00FFFFFF
+ #C9FFFFFF
+ #F3F3F3
+ #EBEBEB
+ #00FFFFFF
+ #37000000
+ #0F000000
+ #29000000
+ #14FFFFFF
+ #66000000
+ #37000000
+ #0F000000
+ #59FFFFFF
+ #0F000000
+ #EBEBEB
+ #72000000
+ #37000000
+ #66757575
+ #0F000000
+ #15FFFFFF
+ #0F000000
+ #E4000000
+ #B3FFFFFF
+ #B3FFFFFF
+ #80F6F6F6
+ #4D000000
+ #80FFFFFF
+ #FFFFFF
+ #40FFFFFF
+ #40FFFFFF
+
+ #F9F9F9
+ #B3FFFFFF
+ #0A000000
+ #F9F9F9
+ #00000000
+ #F3F3F3
+ #EEEEEE
+ #F9F9F9
+ #FFFFFF
+ #00F3F3F3
+ #DADADA
+ #0F7B0F
+ #9D5D00
+ #C42B1C
+ #72000000
+ #8A8A8A
+ #80F6F6F6
+ #DFF6DD
+ #FFF4CE
+ #FDE7E9
+ #06000000
+ #F7F7F7
+ #F3F3F3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+ #FF00FF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FFF2F2F2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FFFF0000
+ 11,5,11,6
+ 1
+ 8,0,0,0
+ 14
+ 22
+ 22
+
+
+
+
+ 10,8,10,8
+ 1,1,1,1
+ 0,0,0,2
+ 8,0,10,0
+ 3,2,3,0
+ 10,8,8,8
+ 11.0
+ 32.0
+
+
+
+
+
+
+
+
+
+
+
+ 14
+ #FFE8EDF9
+ #FFC5CBF9
+ #FF888888
+ White
+ #FF7381F9
+ #FF211AA9
+ #FF3843C4
+ #FF211AA9
+ #FF444444
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 8,0,0,0
+ 14
+ 22
+ 22
+
+
+
+
+
+ 1,1,1,0
+ 0,0,0,1
+ 10,8,0,0
+ 0,8,10,0
+ 0,5,4,0
+ 0,0,0,0
+ 24
+ 14
+
+
+
+
+
+ 11,11,11,11
+ 1
+ 12.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1,1,1,1
+ 0,0,0,1
+ 10,8,0,0
+ 0,8,10,0
+ 0,5,4,0
+ 0,0,0,0
+ 24
+ 14
+
+
+
+
+
+
+ 12
+ 20
+
+ 1
+ 8,6,0,0
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+ 0:0:0.16
+ 0:0:0.16
+ 12
+ 12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 12
+ 14
+ 20
+ 28
+ 40
+ 68
+
+
+
+
+
+
+
+
+ 1,1,1,1
+ 0,0,0,1
+ 10,0,0,0
+ 0,0,10,0
+ 0,0,4,0
+ 0,0,0,0
+ 24
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11,5,11,6
+ 1
+ 0,0,8,0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+ 14
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Fluent.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.xaml
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Fluent.xaml
rename to src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.xaml