diff --git a/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt b/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt
index c20c6084c..daad5916e 100644
--- a/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt
+++ b/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt
@@ -31,6 +31,7 @@ import androidx.core.graphics.createBitmap
 import androidx.core.net.toUri
 import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
+import androidx.core.util.TypedValueCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -448,7 +449,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
 
         val actionTintNormal = button.context.getColorFromAttr(android.R.attr.colorPrimary)
         val actionTintOnNormal = button.context.getColorFromAttr(MaterialR.attr.colorOnPrimary)
-        val actionTintCancel = button.context.getColorFromAttr(android.R.attr.colorError)
+        val actionTintCancel = button.context.getColorFromAttr(R.attr.colorError)
         val actionTintOnCancel = button.context.getColorFromAttr(MaterialR.attr.colorOnError)
         val actionTintDisabled = button.context.getColorFromAttr(MaterialR.attr.colorOutline)
         val actionTintOnDisabled = button.context.getColorFromAttr(android.R.attr.colorBackground)
diff --git a/app/src/main/res/values-night-v26/base_theme.xml b/app/src/main/res/values-night-v26/base_theme.xml
new file mode 100644
index 000000000..fa9e95dfe
--- /dev/null
+++ b/app/src/main/res/values-night-v26/base_theme.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MainTheme" parent="Base.MainTheme.Night">
+        <item name="colorError">?android:attr/colorError</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/base_theme.xml b/app/src/main/res/values-night/base_theme.xml
index 636cbc9ff..74bde7722 100644
--- a/app/src/main/res/values-night/base_theme.xml
+++ b/app/src/main/res/values-night/base_theme.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MainTheme" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.MainTheme.Night" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="android:colorBackground">@color/md_theme_d_background</item>
         <item name="colorSurface">?android:attr/colorBackground</item>
         <item name="android:colorPrimaryDark">?android:attr/colorBackground</item>
     </style>
+    <style name="MainTheme" parent="Base.MainTheme.Night">
+        <item name="colorError">@color/md_theme_d_error</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values-v26/base_theme.xml b/app/src/main/res/values-v26/base_theme.xml
new file mode 100644
index 000000000..209ba9f95
--- /dev/null
+++ b/app/src/main/res/values-v26/base_theme.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MainTheme" parent="Base.MainTheme.Light">
+        <item name="colorError">?android:attr/colorError</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..27f4f4a43
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="colorError" format="color|reference"/>
+</resources>
diff --git a/app/src/main/res/values/base_theme.xml b/app/src/main/res/values/base_theme.xml
index 9fd155e25..89c74fffb 100644
--- a/app/src/main/res/values/base_theme.xml
+++ b/app/src/main/res/values/base_theme.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MainTheme" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="android:colorBackground">@color/md_theme_l_background</item>
+    <style name="Base.MainTheme.Light" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorSurface">?android:attr/colorBackground</item>
         <item name="android:colorPrimaryDark">?android:attr/colorBackground</item>
+        <item name="android:colorBackground">@color/md_theme_l_background</item>
+    </style>
+    <style name="MainTheme" parent="Base.MainTheme.Light">
+        <item name="colorError">@color/md_theme_l_error</item>
     </style>
 </resources>