diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 78ca4bfe..e86a0742 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.Configuration
-import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -72,6 +71,7 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectSt
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
@@ -602,9 +602,10 @@ class HomeFragment : Fragment() {
 
         val searchText =
             home_search?.findViewById<SearchView.SearchAutoComplete>(androidx.appcompat.R.id.search_src_text)
-        searchText?.setTextColor(Color.WHITE)
-        searchText?.setHintTextColor(Color.WHITE)
-
+        searchText?.context?.getResourceColor(R.attr.white)?.let { color ->
+            searchText.setTextColor(color)
+            searchText.setHintTextColor(color)
+        }
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
             // setKey(USER_SELECTED_HOMEPAGE_API, apiName)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 3aae7fd2..db71b714 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -938,6 +938,7 @@ open class ResultFragment : ResultTrailerPlayer() {
                             )
                             chip.setChipDrawable(chipDrawable)
                             chip.text = tag
+                            chip.isChecked = false
                             chip.isCheckable = false
                             chip.isFocusable = false
                             chip.isClickable = false
diff --git a/app/src/main/res/color/chip_color_text.xml b/app/src/main/res/color/chip_color_text.xml
new file mode 100644
index 00000000..03d1e7b0
--- /dev/null
+++ b/app/src/main/res/color/chip_color_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorOnPrimary" android:state_checked="true"/>
+    <item android:color="?attr/textColor" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index 9ee5d716..f88e39d0 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -34,33 +34,42 @@
                 android:text="@string/download_storage_text"
                 android:textColor="?attr/textColor" />
 
-            <LinearLayout
+            <androidx.cardview.widget.CardView
                 android:layout_width="fill_parent"
                 android:layout_height="12dp"
                 android:layout_marginBottom="5dp"
-                android:orientation="horizontal">
+                android:elevation="0dp"
+                app:cardCornerRadius="@dimen/storage_radius"
+                app:cardElevation="0dp"
+                app:cardMaxElevation="0dp">
 
-                <View
-                    android:id="@+id/download_used"
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.5"
-                    android:background="@drawable/storage_bar_left" />
+                    android:orientation="horizontal">
 
-                <View
-                    android:id="@+id/download_app"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.10"
-                    android:background="@drawable/storage_bar_mid" />
+                    <View
+                        android:id="@+id/download_used"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.5"
+                        android:background="@drawable/storage_bar_left" />
 
-                <View
-                    android:id="@+id/download_free"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.10"
-                    android:background="@drawable/storage_bar_right" />
-            </LinearLayout>
+                    <View
+                        android:id="@+id/download_app"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.10"
+                        android:background="@drawable/storage_bar_mid" />
+
+                    <View
+                        android:id="@+id/download_free"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.10"
+                        android:background="@drawable/storage_bar_right" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index 3d0404fc..a550efa4 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -84,6 +84,9 @@
                 android:textColor="?attr/textColor" />
 
             <androidx.cardview.widget.CardView
+                app:cardElevation="0dp"
+                android:elevation="0dp"
+                app:cardMaxElevation="0dp"
                 android:layout_width="fill_parent"
                 android:layout_height="12dp"
                 android:layout_marginBottom="5dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 17bce297..bce49c22 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -358,13 +358,15 @@
                     android:layout_gravity="bottom"
                     android:orientation="vertical">
                     <TextView
+                        android:paddingStart="30dp"
+                        android:paddingEnd="30dp"
                         android:textStyle="bold"
                         android:paddingBottom="10dp"
                         android:id="@+id/home_preview_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:textColor="@color/white"
+                        android:textColor="?attr/white"
                         android:textSize="17sp"
                         tools:text="The Perfect Run" />
                     <!--<TextView
@@ -384,7 +386,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:textColor="@color/white"
+                        android:textColor="?attr/white"
                         android:textSize="14sp"
                         tools:text="Hello • World • Tags" />
 
@@ -406,9 +408,10 @@
                             android:layout_width="70dp"
                             android:layout_height="wrap_content"
                             android:text="@string/none"
-                            android:textColor="@color/white"
+                            android:textColor="?attr/white"
                             app:drawableTopCompat="@drawable/ic_baseline_add_24"
-                            app:tint="@color/white" />
+                            app:tint="?attr/white"
+                            app:drawableTint="?attr/white" />
                         <com.google.android.material.button.MaterialButton
                             android:layout_gravity="center"
                             style="@style/WhiteButton"
@@ -427,9 +430,10 @@
                             android:layout_width="70dp"
                             android:layout_height="wrap_content"
                             android:text="@string/home_info"
-                            android:textColor="@color/white"
+                            android:textColor="?attr/white"
                             app:drawableTopCompat="@drawable/ic_outline_info_24"
-                            app:tint="@color/white" />
+                            app:tint="?attr/white"
+                            app:drawableTint="?attr/white" />
                     </LinearLayout>
                 </LinearLayout>
             </FrameLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d745c7a1..8b3d0fbf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,6 +22,9 @@
     <color name="white">#FFF</color>
     <color name="black">#000</color>
 
+    <color name="whiteText">#FFF</color>
+    <color name="blackText">#000</color>
+
     <color name="dubColor">#3d50fa</color> <!--3b65f5 f18c82 8294F1-->
     <color name="amoledModeLight">#121213</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d6e7b65f..70ac7516 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,6 +56,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="textColor">@color/textColor</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <item name="grayTextColor">@color/grayTextColor</item>
         <item name="primaryGrayBackground">@color/primaryGrayBackground</item>
         <item name="primaryBlackBackground">@color/primaryBlackBackground</item>
@@ -78,6 +79,8 @@
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
         <item name="chipBackgroundColor">@color/chip_color</item>
         <item name="chipStrokeColor">@color/transparent</item>
+        <item name="textColor">@color/chip_color_text</item>
+        <item name="android:textColor">@color/chip_color_text</item>
     </style>
 
     <style name="AmoledMode">
@@ -88,6 +91,7 @@
         <item name="textColor">@color/textColor</item>
         <item name="grayTextColor">@color/grayTextColor</item>
         <item name="white">@color/white</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
     </style>
 
     <style name="LightMode">
@@ -98,6 +102,7 @@
         <item name="textColor">@color/lightTextColor</item>
         <item name="grayTextColor">@color/lightGrayTextColor</item>
         <item name="white">#000</item>
+        <item name="colorOnPrimary">@color/blackText</item>
     </style>
 
     <style name="MonetMode">
@@ -108,6 +113,7 @@
         <item name="textColor">@color/material_dynamic_neutral90</item>
         <item name="grayTextColor">@color/material_dynamic_neutral60</item>
         <item name="white">@color/material_dynamic_neutral90</item>
+        <item name="colorOnPrimary">@color/material_on_primary_emphasis_medium</item>
     </style>
 
     <style name="OverlayPrimaryColorNormal">
@@ -115,7 +121,7 @@
         <item name="android:colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorOnPrimary">@color/colorAccent</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!-- Needed for leanback fuckery -->
         <item name="android:colorAccent">@color/colorAccent</item>
     </style>
@@ -145,7 +151,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryBlue</item>
         <item name="colorPrimaryDark">#4855A2</item>
         <item name="colorAccent">#5A6BCB</item>
-        <item name="colorOnPrimary">#5A6BCB</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!-- Needed for leanback fuckery -->
         <item name="android:colorAccent">@color/colorPrimaryBlue</item>
     </style>
@@ -155,7 +161,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryPurple</item>
         <item name="colorPrimaryDark">#4704A3</item>
         <item name="colorAccent">#7125DB</item>
-        <item name="colorOnPrimary">#7125DB</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <item name="android:colorAccent">@color/colorPrimaryPurple</item>
     </style>
 
@@ -164,7 +170,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryGreen</item>
         <item name="colorPrimaryDark">#007363</item>
         <item name="colorAccent">#39C1AE</item>
-        <item name="colorOnPrimary">#39C1AE</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryGreen</item>
     </style>
 
@@ -173,7 +179,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryGreenApple</item>
         <item name="colorPrimaryDark">#319B5A</item>
         <item name="colorAccent">#51C57E</item>
-        <item name="colorOnPrimary">#51C57E</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryGreenApple</item>
     </style>
 
@@ -182,7 +188,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryRed</item>
         <item name="colorPrimaryDark">#B62B2B</item>
         <item name="colorAccent">@color/colorPrimaryRed</item> <!--#F53B3B-->
-        <item name="colorOnPrimary">@color/colorPrimaryRed</item> <!--#EC3838-->
+        <item name="colorOnPrimary">@color/whiteText</item> <!--#EC3838-->
         <!-- Needed for leanback fuckery -->
         <item name="android:colorAccent">@color/colorPrimaryRed</item>
     </style>
@@ -192,7 +198,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryBanana</item>
         <item name="colorPrimaryDark">#9B7D31</item>
         <item name="colorAccent">#C5B251</item>
-        <item name="colorOnPrimary">#C5A851</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryBanana</item>
     </style>
 
@@ -201,7 +207,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryParty</item>
         <item name="colorPrimaryDark">#C1495B</item>
         <item name="colorAccent">#FD798C</item>
-        <item name="colorOnPrimary">#BF5968</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryParty</item>
     </style>
 
@@ -210,7 +216,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryPink</item>
         <item name="colorPrimaryDark">#DD1280</item>
         <item name="colorAccent">#FF4DAE</item>
-        <item name="colorOnPrimary">#DD1280</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <item name="android:colorAccent">@color/colorPrimaryPink</item>
     </style>
 
@@ -219,7 +225,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryCarnationPink</item>
         <item name="colorPrimaryDark">#83366f</item>
         <item name="colorAccent">#BD5DA5</item>
-        <item name="colorOnPrimary">#BD5DA5</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryCarnationPink</item>
     </style>
@@ -229,7 +235,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryMaroon</item>
         <item name="colorPrimaryDark">#370C0C</item>
         <item name="colorAccent">#451010</item>
-        <item name="colorOnPrimary">#451010</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryMaroon</item>
     </style>
@@ -239,7 +245,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryDarkGreen</item>
         <item name="colorPrimaryDark">#003d00</item>
         <item name="colorAccent">#004500</item>
-        <item name="colorOnPrimary">#004500</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryDarkGreen</item>
     </style>
@@ -249,7 +255,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryNavyBlue</item>
         <item name="colorPrimaryDark">#000073</item>
         <item name="colorAccent">#000080</item>
-        <item name="colorOnPrimary">#000080</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryNavyBlue</item>
     </style>
@@ -259,7 +265,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryGrey</item>
         <item name="colorPrimaryDark">#484848</item>
         <item name="colorAccent">#515151</item>
-        <item name="colorOnPrimary">#515151</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryGrey</item>
     </style>
@@ -269,7 +275,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryWhite</item>
         <item name="colorPrimaryDark">#CCCCCC</item>
         <item name="colorAccent">#FFFFFF</item>
-        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorOnPrimary">@color/blackText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryWhite</item>
     </style>
@@ -279,7 +285,7 @@
         <item name="android:colorPrimary">@color/colorPrimaryBrown</item>
         <item name="colorPrimaryDark">#582700</item>
         <item name="colorAccent">#622C00</item>
-        <item name="colorOnPrimary">#622C00</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
         <!--   Needed for leanback fuckery   -->
         <item name="android:colorAccent">@color/colorPrimaryBrown</item>
     </style>