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 158bfea6ab1..039728e28be 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
@@ -226,13 +226,7 @@ private static Uri GetFluentWindowThemeColorResourceUri(string systemTheme, bool
if(SystemParameters.HighContrast)
{
- themeColorFileName = systemTheme switch
- {
- string s when s.Contains("hcblack") => "hcblack.xaml",
- string s when s.Contains("hcwhite") => "hcwhite.xaml",
- string s when s.Contains("hc1") => "hc1.xaml",
- _ => "hc2.xaml"
- };
+ themeColorFileName = "hc.xaml";
}
return new Uri("pack://application:,,,/PresentationFramework.Fluent;component/Resources/Theme/" + themeColorFileName, UriKind.Absolute);
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC1.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml
similarity index 96%
rename from src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC1.xaml
rename to src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml
index 843cd1369c2..9aaf8c63342 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC1.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC.xaml
@@ -21,24 +21,23 @@
#4cc2ff
#4cc2ff
-
- #FFFFFF
- #2D3236
- #212D3B
- #ABCFF2
- #B6F6F0
- #2D3236
- #70EBDE
- #A6A6A6
-
+
+
+
+
+
+
+
+
+
#2D3236
-
+
#FFFFFF
-
+
@@ -133,18 +132,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC2.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC2.xaml
deleted file mode 100644
index fbd1c13a086..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC2.xaml
+++ /dev/null
@@ -1,699 +0,0 @@
-
-
-
-
-
-
- #4cc2ff
- #4cc2ff
- #4cc2ff
-
-
- #FFFFFF
- #000000
- #2B2B2B
- #D6B4FD
- #FFEE32
- #000000
- #8080FF
- #A6A6A6
-
- #000000
-
-
-
- #FFFFFF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #A6A6A6
- #FF0000
- #FFFFFF
-
- #A6A6A6
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #A6A6A6
-
- #000000
- #000000
- #000000
- #000000
- Transparent
- #000000
-
- #000000
- #000000
-
- #000000
-
- Transparent
- #000000
- #000000
- #000000
-
- Transparent
- #000000
- #000000
- #000000
- #000000
-
- #000000
- #000000
- #000000
- #000000
-
- #000000
-
- #FFEE32
- #FFEE32
- #FFEE32
- #FFEE32
- #FFEE32
- #FFEE32
- #A6A6A6
-
- #FFEE32
-
- #FFFFFF
- #FFFFFF
-
- #FFEE32
- #FFEE32
-
- #FFFFFF
- #FFFFFF
- #FFFFFF
-
- #FFFFFF
-
- #FFFFFF
- #000000
-
- #000000
- #000000
-
- #000000
-
- #000000
- #000000
- #000000
- #000000
-
-
- #000000
-
- #FF0000
- #FF0000
- #FF0000
- #FF0000
-
- #000000
- #000000
- #000000
- #000000
- #FF0000
- #FF0000
-
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #FF0000
- #FFFFFF
- #000000
- #000000
- #000000
- #000000
- #000000
- #FF0000
-
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCBlack.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCBlack.xaml
deleted file mode 100644
index 3751aba60f3..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCBlack.xaml
+++ /dev/null
@@ -1,699 +0,0 @@
-
-
-
-
-
-
- #4cc2ff
- #4cc2ff
- #4cc2ff
-
-
- #FFFFFF
- #202020
- #263B50
- #8EE3F0
- #FFFFFF
- #202020
- #75E9FC
- #A6A6A6
-
- #202020
-
-
-
- #FFFFFF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #A6A6A6
- #FF0000
- #FFFFFF
-
- #A6A6A6
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #A6A6A6
-
- #202020
- #202020
- #202020
- #202020
- Transparent
- #202020
-
- #202020
- #202020
-
- #202020
-
- Transparent
- #202020
- #202020
- #202020
-
- Transparent
- #202020
- #202020
- #202020
- #202020
-
- #202020
- #202020
- #202020
- #202020
-
- #202020
-
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #A6A6A6
-
- #FFFFFF
-
- #FFFFFF
- #FFFFFF
-
- #FFFFFF
- #FFFFFF
-
- #FFFFFF
- #FFFFFF
- #FFFFFF
-
- #FFFFFF
-
- #FFFFFF
- #202020
-
- #202020
- #202020
-
- #202020
-
- #202020
- #202020
- #202020
- #202020
-
-
- #202020
-
- #FF0000
- #FF0000
- #FF0000
- #FF0000
-
- #202020
- #202020
- #202020
- #202020
- #FF0000
- #FF0000
-
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #FFFFFF
- #FF0000
- #202020
- #202020
- #202020
- #202020
- #202020
- #202020
- #FF0000
-
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCWhite.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCWhite.xaml
deleted file mode 100644
index 8ab431859e2..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCWhite.xaml
+++ /dev/null
@@ -1,699 +0,0 @@
-
-
-
-
-
-
- #4cc2ff
- #4cc2ff
- #4cc2ff
-
-
- #3D3D3D
- #FFFAEF
- #FFF5E3
- #903909
- #202020
- #FFFAEF
- #1C5E75
- #676767
-
- #FFFAEF
-
-
-
- #3D3D3D
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #3D3D3D
- #3D3D3D
- #3D3D3D
- #676767
- #FF0000
- #3D3D3D
-
- #676767
- #3D3D3D
- #3D3D3D
- #3D3D3D
- #676767
-
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FFFAEF
- Transparent
- #FFFAEF
-
- #FFFAEF
- #FFFAEF
-
- #FFFAEF
-
- Transparent
- #FFFAEF
- #FFFAEF
- #FFFAEF
-
- Transparent
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FFFAEF
-
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FFFAEF
-
- #FFFAEF
-
- #202020
- #202020
- #202020
- #202020
- #202020
- #202020
- #676767
-
- #202020
-
- #3D3D3D
- #3D3D3D
-
- #202020
- #202020
-
- #3D3D3D
- #3D3D3D
- #3D3D3D
-
- #3D3D3D
-
- #3D3D3D
- #FFFAEF
-
- #FFFAEF
- #FFFAEF
-
- #FFFAEF
-
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FFFAEF
-
-
- #FFFAEF
-
- #FF0000
- #FF0000
- #FF0000
- #FF0000
-
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FF0000
- #FF0000
-
- #3D3D3D
- #3D3D3D
- #F3D3D3DF
- #3D3D3D
- #FF0000
- #3D3D3D
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FFFAEF
- #FF0000
-