diff --git a/src/MaterialDesignThemes.Wpf/ThemeExtensions.g.cs b/src/MaterialDesignThemes.Wpf/ThemeExtensions.g.cs
index a304456e89..76aa629ebf 100644
--- a/src/MaterialDesignThemes.Wpf/ThemeExtensions.g.cs
+++ b/src/MaterialDesignThemes.Wpf/ThemeExtensions.g.cs
@@ -34,7 +34,7 @@ public static partial void SetLightTheme(this Theme theme)
         theme.CheckBoxes.Disabled = BaseThemeColors.Neutral700;
         theme.CheckBoxes.UncheckedBorder = BaseThemeColors.Black100;
         theme.CheckBoxes.Off = BaseThemeColors.Black500;
-        theme.Chips.Background = Color.FromArgb(0x12, 0x00, 0x00, 0x00);
+        theme.Chips.Background = BaseThemeColors.Black50;
         theme.Chips.OutlineBorder = BaseThemeColors.Black100;
         theme.ColorZones.DarkBackground = BaseThemeColors.Neutral100;
         theme.ColorZones.DarkForeground = BaseThemeColors.Neutral900;
@@ -123,7 +123,7 @@ public static partial void SetDarkTheme(this Theme theme)
         theme.CheckBoxes.Disabled = BaseThemeColors.Neutral300;
         theme.CheckBoxes.UncheckedBorder = BaseThemeColors.White100;
         theme.CheckBoxes.Off = BaseThemeColors.White500;
-        theme.Chips.Background = Color.FromArgb(0xFF, 0x2E, 0x3C, 0x43);
+        theme.Chips.Background = BaseThemeColors.White50;
         theme.Chips.OutlineBorder = BaseThemeColors.White100;
         theme.ColorZones.DarkBackground = BaseThemeColors.Neutral100;
         theme.ColorZones.DarkForeground = BaseThemeColors.Neutral900;
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml
index 004ec3d45e..7be4625076 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml
@@ -18,7 +18,7 @@
   <colors:StaticResource x:Key="MaterialDesign.Brush.Card.Border" ResourceKey="Neutral500" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.CheckBox.Disabled" ResourceKey="Neutral300" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.CheckBox.UncheckedBorder" ResourceKey="White100" />
-  <SolidColorBrush x:Key="MaterialDesign.Brush.Chip.Background" Color="#FF2E3C43" po:Freeze="True" />
+  <colors:StaticResource x:Key="MaterialDesign.Brush.Chip.Background" ResourceKey="White50" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.Chip.OutlineBorder" ResourceKey="White100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.ColorZone.DarkBackground" ResourceKey="Neutral100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.ColorZone.DarkForeground" ResourceKey="Neutral900" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml
index f12197dac0..1b460fd491 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml
@@ -18,7 +18,7 @@
   <colors:StaticResource x:Key="MaterialDesign.Brush.Card.Border" ResourceKey="Neutral700" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.CheckBox.Disabled" ResourceKey="Neutral700" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.CheckBox.UncheckedBorder" ResourceKey="Black100" />
-  <SolidColorBrush x:Key="MaterialDesign.Brush.Chip.Background" Color="#12000000" po:Freeze="True" />
+  <colors:StaticResource x:Key="MaterialDesign.Brush.Chip.Background" ResourceKey="Black50" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.Chip.OutlineBorder" ResourceKey="Black100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.ColorZone.DarkBackground" ResourceKey="Neutral100" />
   <colors:StaticResource x:Key="MaterialDesign.Brush.ColorZone.DarkForeground" ResourceKey="Neutral900" />
diff --git a/src/MaterialDesignToolkit.ResourceGeneration/ThemeColors.json b/src/MaterialDesignToolkit.ResourceGeneration/ThemeColors.json
index c1a40145bb..9fc357fa90 100644
--- a/src/MaterialDesignToolkit.ResourceGeneration/ThemeColors.json
+++ b/src/MaterialDesignToolkit.ResourceGeneration/ThemeColors.json
@@ -160,8 +160,8 @@
     {
         "name": "MaterialDesign.Brush.Chip.Background",
         "themeValues": {
-            "light": "#12000000",
-            "dark": "#FF2E3C43"
+            "light": "Black50",
+            "dark": "White50"
         },
         "alternateKeys": [],
         "obsoleteKeys": [