diff --git a/app/src/main/res/layout/activity_caldav_account_settings.xml b/app/src/main/res/layout/activity_caldav_account_settings.xml
index 18462f53c..db0f027ed 100644
--- a/app/src/main/res/layout/activity_caldav_account_settings.xml
+++ b/app/src/main/res/layout/activity_caldav_account_settings.xml
@@ -32,8 +32,7 @@
           android:layout_height="wrap_content"
           android:hint="@string/name"
           android:imeOptions="flagNoExtractUi"
-          android:inputType="textCapSentences|textAutoCorrect"
-          android:textColor="?attr/asTextColor"/>
+          android:inputType="textCapSentences|textAutoCorrect"/>
 
       </com.google.android.material.textfield.TextInputLayout>
 
@@ -46,8 +45,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:hint="@string/url"
-          android:imeOptions="flagNoExtractUi"
-          android:textColor="?attr/asTextColor"/>
+          android:imeOptions="flagNoExtractUi"/>
 
       </com.google.android.material.textfield.TextInputLayout>
 
@@ -60,8 +58,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:hint="@string/user"
-          android:imeOptions="flagNoExtractUi"
-          android:textColor="?attr/asTextColor"/>
+          android:imeOptions="flagNoExtractUi"/>
 
       </com.google.android.material.textfield.TextInputLayout>
 
@@ -76,8 +73,7 @@
           android:layout_height="wrap_content"
           android:hint="@string/password"
           android:imeOptions="flagNoExtractUi"
-          android:inputType="textPassword"
-          android:textColor="?attr/asTextColor"/>
+          android:inputType="textPassword"/>
 
       </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/activity_caldav_calendar_settings.xml b/app/src/main/res/layout/activity_caldav_calendar_settings.xml
index 905c4bed8..196fd58e3 100644
--- a/app/src/main/res/layout/activity_caldav_calendar_settings.xml
+++ b/app/src/main/res/layout/activity_caldav_calendar_settings.xml
@@ -31,8 +31,7 @@
           android:layout_height="wrap_content"
           android:hint="@string/name"
           android:imeOptions="flagNoExtractUi"
-          android:inputType="textCapSentences|textAutoCorrect"
-          android:textColor="?attr/asTextColor"/>
+          android:inputType="textCapSentences|textAutoCorrect"/>
 
       </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/activity_google_task_list_settings.xml b/app/src/main/res/layout/activity_google_task_list_settings.xml
index 727b2f70c..5ef6bba9a 100644
--- a/app/src/main/res/layout/activity_google_task_list_settings.xml
+++ b/app/src/main/res/layout/activity_google_task_list_settings.xml
@@ -29,8 +29,7 @@
           android:hint="@string/name"
           android:imeOptions="flagNoExtractUi"
           android:inputType="textCapSentences|textFilter"
-          android:maxLines="1"
-          android:textColor="?attr/asTextColor"/>
+          android:maxLines="1"/>
       </com.google.android.material.textfield.TextInputLayout>
 
       <include layout="@layout/list_settings_color"/>
diff --git a/app/src/main/res/layout/activity_tag_settings.xml b/app/src/main/res/layout/activity_tag_settings.xml
index 0b800203b..18af5db82 100644
--- a/app/src/main/res/layout/activity_tag_settings.xml
+++ b/app/src/main/res/layout/activity_tag_settings.xml
@@ -29,8 +29,7 @@
           android:hint="@string/name"
           android:imeOptions="flagNoExtractUi"
           android:inputType="textCapSentences|textFilter"
-          android:maxLines="1"
-          android:textColor="?attr/asTextColor"/>
+          android:maxLines="1"/>
       </com.google.android.material.textfield.TextInputLayout>
 
 
diff --git a/app/src/main/res/layout/alarm_edit_row.xml b/app/src/main/res/layout/alarm_edit_row.xml
index 427e17a12..ab259a1d8 100644
--- a/app/src/main/res/layout/alarm_edit_row.xml
+++ b/app/src/main/res/layout/alarm_edit_row.xml
@@ -17,8 +17,7 @@
       android:id="@+id/alarm_string"
       style="@style/TaskEditTextPrimary"
       android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:textColor="?attr/asTextColor"/>
+      android:layout_height="wrap_content"/>
 
     <Spinner
       android:id="@+id/reminder_random_interval"
diff --git a/app/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml
index 179a6a7e3..1f28aaa0f 100644
--- a/app/src/main/res/layout/control_set_repeat.xml
+++ b/app/src/main/res/layout/control_set_repeat.xml
@@ -126,8 +126,7 @@
         android:layout_marginEnd="0dp"
         android:layout_marginLeft="@dimen/keyline_first"
         android:layout_marginRight="0dp"
-        android:layout_gravity="center"
-        android:textColor="?attr/asTextColor"/>
+        android:layout_gravity="center"/>
 
       <EditText
         android:id="@+id/repeatTimesValue"
diff --git a/app/src/main/res/layout/control_set_timers_dialog.xml b/app/src/main/res/layout/control_set_timers_dialog.xml
index 0bfca745d..648661219 100644
--- a/app/src/main/res/layout/control_set_timers_dialog.xml
+++ b/app/src/main/res/layout/control_set_timers_dialog.xml
@@ -34,8 +34,7 @@
       android:paddingEnd="0dp"
       android:paddingLeft="10dip"
       android:paddingRight="0dp"
-      android:gravity="end"
-      android:textColor="?attr/asTextColor"/>
+      android:gravity="end"/>
   </LinearLayout>
 
   <View style="@style/horizontal_divider"/>
@@ -64,8 +63,7 @@
       android:paddingEnd="0dp"
       android:paddingLeft="10dip"
       android:paddingRight="0dp"
-      android:gravity="end"
-      android:textColor="?attr/asTextColor"/>
+      android:gravity="end"/>
   </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/control_set_title.xml b/app/src/main/res/layout/control_set_title.xml
index 1d5b7ce0a..d5e7271f2 100644
--- a/app/src/main/res/layout/control_set_title.xml
+++ b/app/src/main/res/layout/control_set_title.xml
@@ -46,7 +46,6 @@
       android:nextFocusUp="@id/title"
       android:scrollbars="vertical"
       android:textAlignment="viewStart"
-      android:textColor="?attr/asTextColor"
       android:textColorHint="?attr/asTextColorHint"/>
 
   </RelativeLayout>
diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml
index db5e4dd74..29bc615b3 100644
--- a/app/src/main/res/layout/file_row.xml
+++ b/app/src/main/res/layout/file_row.xml
@@ -22,7 +22,6 @@
     android:layout_toLeftOf="@id/clear"
     android:layout_toStartOf="@id/clear"
     android:gravity="start"
-    android:textColor="?attr/asTextColor"
     android:textDirection="locale"
     tools:ignore="UnusedAttribute"/>
 
diff --git a/app/src/main/res/layout/filter_adapter_subheader.xml b/app/src/main/res/layout/filter_adapter_subheader.xml
index 5057483f3..7fdaadabf 100644
--- a/app/src/main/res/layout/filter_adapter_subheader.xml
+++ b/app/src/main/res/layout/filter_adapter_subheader.xml
@@ -53,7 +53,6 @@
     android:gravity="start|center_vertical"
     android:singleLine="true"
     android:textAlignment="viewStart"
-    android:textColor="?attr/asTextColor"
     android:textSize="14sp"
     tools:ignore="UnusedAttribute"/>
 
diff --git a/app/src/main/res/layout/filter_settings_activity.xml b/app/src/main/res/layout/filter_settings_activity.xml
index dce4274e4..bfdcacb1a 100644
--- a/app/src/main/res/layout/filter_settings_activity.xml
+++ b/app/src/main/res/layout/filter_settings_activity.xml
@@ -30,8 +30,7 @@
           android:hint="@string/name"
           android:imeOptions="flagNoExtractUi"
           android:inputType="textCapSentences|textFilter"
-          android:maxLines="1"
-          android:textColor="?attr/asTextColor"/>
+          android:maxLines="1"/>
       </com.google.android.material.textfield.TextInputLayout>
 
       <include layout="@layout/list_settings_color"/>
diff --git a/app/src/main/res/layout/list_settings_color.xml b/app/src/main/res/layout/list_settings_color.xml
index ed9838256..a503f15eb 100644
--- a/app/src/main/res/layout/list_settings_color.xml
+++ b/app/src/main/res/layout/list_settings_color.xml
@@ -25,7 +25,6 @@
     android:layout_toStartOf="@id/color"
     android:contentDescription="@string/color"
     android:text="@string/color"
-    android:textColor="?attr/asTextColor"
     android:textSize="18sp"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_settings_icon.xml b/app/src/main/res/layout/list_settings_icon.xml
index ace068dc6..220bfd026 100644
--- a/app/src/main/res/layout/list_settings_icon.xml
+++ b/app/src/main/res/layout/list_settings_icon.xml
@@ -25,7 +25,6 @@
     android:layout_toStartOf="@id/icon"
     android:contentDescription="@string/icon"
     android:text="@string/icon"
-    android:textColor="?attr/asTextColor"
     android:textSize="18sp"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/location_row.xml b/app/src/main/res/layout/location_row.xml
index bbc1309e6..2a873420c 100644
--- a/app/src/main/res/layout/location_row.xml
+++ b/app/src/main/res/layout/location_row.xml
@@ -33,7 +33,6 @@
     android:gravity="start"
     android:hint="@string/add_location"
     android:textAlignment="viewStart"
-    android:textColor="?attr/asTextColor"
     android:textColorHint="@color/text_secondary"/>
 
   <TextView
diff --git a/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml b/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
index e00b4a174..f0c19bc40 100644
--- a/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
+++ b/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
@@ -15,5 +15,4 @@
   android:drawableLeft="@drawable/ic_outline_label_24px"
   android:drawablePadding="@dimen/keyline_second"
   android:drawableStart="@drawable/ic_outline_label_24px"
-  android:gravity="center_vertical"
-  android:textColor="?attr/asTextColor"/>
+  android:gravity="center_vertical"/>
diff --git a/app/src/main/res/layout/simple_list_item_single_choice_themed.xml b/app/src/main/res/layout/simple_list_item_single_choice_themed.xml
index 31f5bbcca..8afb56159 100644
--- a/app/src/main/res/layout/simple_list_item_single_choice_themed.xml
+++ b/app/src/main/res/layout/simple_list_item_single_choice_themed.xml
@@ -26,5 +26,4 @@
   android:checked="false"
   android:drawablePadding="@dimen/keyline_second"
   android:gravity="center_vertical"
-  android:textAppearance="?attr/textAppearanceListItemSmall"
-  android:textColor="?attr/asTextColor"/>
+  android:textAppearance="?attr/textAppearanceListItemSmall"/>
diff --git a/app/src/main/res/layout/tag_edit_row.xml b/app/src/main/res/layout/tag_edit_row.xml
index ad964f2d6..130bcdd91 100644
--- a/app/src/main/res/layout/tag_edit_row.xml
+++ b/app/src/main/res/layout/tag_edit_row.xml
@@ -20,7 +20,6 @@
 
   <AutoCompleteTextView
     android:id="@+id/text1"
-    style="@style/TextBoxText"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index bf3bf6978..a9a48cd48 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,7 +8,6 @@
   <!-- theme attributes -->
   <attr format="color" name="asWindowBackground"/>
   <attr format="color" name="asContentBackground"/>
-  <attr format="color" name="asTextColor"/>
   <attr format="color" name="asTextColorHint"/>
   <attr format="color" name="icon_tint"/>
   <attr format="reference" name="overlay_theme"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 852836226..2d4cb1fbb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,10 +18,6 @@
     <item name="android:windowCloseOnTouchOutside">false</item>
   </style>
 
-  <style name="TextBoxText">
-    <item name="android:textColor">?attr/asTextColor</item>
-  </style>
-
   <style name="TaskEditTextPrimary">
     <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textColorHint">?android:attr/textColorTertiary</item>
@@ -73,9 +69,7 @@
 
   <!--================================================== General == -->
 
-  <style name="TextAppearance" parent="android:TextAppearance">
-    <item name="android:textColor">?attr/asTextColor</item>
-  </style>
+  <style name="TextAppearance" parent="android:TextAppearance"/>
 
   <!--=============================================== MainActivity == -->
 
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index e5d19e089..50e0409ee 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -12,7 +12,6 @@
     <item name="windowActionModeOverlay">true</item>
     <item name="asWindowBackground">@color/window_background</item>
     <item name="asContentBackground">@color/content_background</item>
-    <item name="asTextColor">@color/text_primary</item>
     <item name="asTextColorHint">@color/text_tertiary</item>
     <item name="icon_tint">@color/icon_tint</item>
     <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
@@ -46,14 +45,12 @@
     <item name="colorOnBackground">@color/text_primary</item>
     <item name="colorOnSurface">@color/text_primary</item>
     <item name="colorAccent">?attr/colorAccentDialog</item>
-    <item name="asTextColor">@color/text_primary</item>
     <item name="icon_tint">@color/icon_tint</item>
   </style>
 
   <style name="TasksDialog" parent="DayNightDialog">
     <item name="android:windowBackground">@color/dialog_background</item>
     <item name="colorAccent">?attr/colorAccentDialog</item>
-    <item name="asTextColor">@color/text_primary</item>
     <item name="icon_tint">@color/icon_tint</item>
   </style>