diff --git a/app/src/main/res/layout-v31/dialog_theme.xml b/app/src/main/res/layout-v31/dialog_theme.xml
index 3b01015120..a7f13e6229 100644
--- a/app/src/main/res/layout-v31/dialog_theme.xml
+++ b/app/src/main/res/layout-v31/dialog_theme.xml
@@ -229,7 +229,7 @@
             android:gravity="center"
             android:text="Primary"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintEnd_toStartOf="@+id/tvSecondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvYou800_3" />
@@ -241,7 +241,7 @@
             android:gravity="center"
             android:text="Secondary"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorSecondary"
+            android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintEnd_toStartOf="@+id/tvTertiary"
             app:layout_constraintStart_toEndOf="@+id/tvPrimary"
             app:layout_constraintTop_toBottomOf="@id/tvYou800_3" />
@@ -264,7 +264,7 @@
             android:gravity="center"
             android:text="Normal"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textStyle="normal"
             app:layout_constraintEnd_toStartOf="@+id/tvItalic"
             app:layout_constraintStart_toStartOf="parent"
@@ -277,7 +277,7 @@
             android:gravity="center"
             android:text="Italic"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textStyle="italic"
             app:layout_constraintEnd_toStartOf="@+id/tvBold"
             app:layout_constraintStart_toEndOf="@+id/tvNormal"
@@ -290,7 +290,7 @@
             android:gravity="center"
             android:text="Bold"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/tvItalic"
diff --git a/app/src/main/res/layout/dialog_nav_options.xml b/app/src/main/res/layout/dialog_nav_options.xml
index bf32b444c5..876b563b38 100644
--- a/app/src/main/res/layout/dialog_nav_options.xml
+++ b/app/src/main/res/layout/dialog_nav_options.xml
@@ -19,7 +19,7 @@
             android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_advanced_nav_hide_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 82adad0cd0..b789a22af6 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -270,7 +270,7 @@
             android:layout_height="wrap_content"
             android:text="example.org"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textIsSelectable="true"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOwnerTitle" />
@@ -281,7 +281,7 @@
             android:layout_height="wrap_content"
             android:text="Cloudflare"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textIsSelectable="true"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHost" />
@@ -317,11 +317,11 @@
             android:layout_marginTop="12dp"
             android:drawableEnd="@drawable/twotone_open_in_new_12"
             android:drawablePadding="6dp"
-            android:drawableTint="?android:textColorLink"
+            android:drawableTint="?android:attr/textColorLink"
             android:focusable="false"
             android:text="@string/title_reset_open"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorLink"
+            android:textColor="?android:attr/textColorLink"
             android:textIsSelectable="true"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnDefault" />
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 8d0317f1a4..a1727afe58 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -284,7 +284,7 @@
                     android:layout_marginEnd="12dp"
                     android:drawableEnd="@drawable/twotone_edit_24"
                     android:drawablePadding="6dp"
-                    android:drawableTint="?android:textColorTertiary"
+                    android:drawableTint="?android:attr/textColorTertiary"
                     android:gravity="center"
                     android:paddingStart="36dp"
                     android:text="@string/title_setup_manual"