diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d6d9e04fa9..f5b2ffba80 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -32,4 +32,7 @@
 
     <attr name="lightSystemBarsOnPrimary" format="reference|boolean"/>
 
+    <!-- Setting chip color values for specific themes -->
+    <attr name="chipTextColor" format="reference|integer"/>
+
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9a63f1d2c5..ffa5a8ad43 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -30,6 +30,7 @@
     <color name="accent_yinyang">#000000</color>
     <color name="color_on_secondary_yinyang">#FFFFFF</color>
     <color name="ripple_colored_yinyang">#999999</color>
+    <color name="chip_text_yinyang">#000000</color>
 
     <!-- Midnight Dusk Theme -->
     <color name="accent_midnightdusk">#F02475</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 96865a8dd9..cb736b1781 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -187,8 +187,8 @@
     <style name="Widget.Tachiyomi.Chip.Action" parent="Widget.MaterialComponents.Chip.Action">
         <item name="chipStrokeWidth">1dp</item>
         <item name="chipStrokeColor">?attr/colorPrimary</item>
-        <item name="chipBackgroundColor">@android:color/transparent</item>
-        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="chipBackgroundColor">?attr/chipBackgroundColor</item>
+        <item name="android:textColor">?attr/chipTextColor</item>
         <item name="rippleColor">?attr/colorControlHighlight</item>
 
         <!-- Custom chip states -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index aaf2deb788..5fc623e4d8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -54,6 +54,8 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
         <item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
+        <item name="chipTextColor">?android:attr/textColorPrimary</item>
+        <item name="chipBackgroundColor">?attr/colorControlHighlight</item>
         <item name="snackbarStyle">@style/Widget.Tachiyomi.Snackbar</item>
         <item name="snackbarTextViewStyle">@style/Widget.Tachiyomi.Snackbar.TextView</item>
         <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
@@ -119,6 +121,10 @@
         <item name="colorTertiary">@color/color_on_secondary_yinyang</item>
         <item name="colorOnTertiary">@color/accent_yinyang</item>
         <item name="colorControlHighlight">@color/ripple_colored_yinyang</item>
+
+        <!-- Themes -->
+        <item name="chipTextColor">@color/color_on_secondary_yinyang</item>
+        <item name="chipBackgroundColor">@color/accent_yinyang</item>
     </style>
 
     <!--== Midnight Dusk theme ==-->