diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 8fb7bf954ff2..9670feb8c55a 100644
--- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -999,7 +999,7 @@ protected void setDrawerMenuItemChecked(int menuItemId) {
                     }
                     menuItem.setTitle(Html.fromHtml(
                         "<font color='"
-                            + ThemeUtils.colorToHexString(ContextCompat.getColor(this, R.color.textColor))
+                            + ThemeUtils.colorToHexString(ContextCompat.getColor(this, R.color.text_color))
                             + "'>" + menuItem.getTitle()
                             + "</font>"));
                 }
diff --git a/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java b/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java
index 556c465c5bd6..71a418bfce5e 100644
--- a/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java
@@ -143,8 +143,8 @@ private SpannableStringBuilder makeSpecialPartsBold(String text, String... toBeS
             int start = text.indexOf(textBlock);
             int end = start + textBlock.length();
             ssb.setSpan(new StyleSpan(Typeface.BOLD), start, end, 0);
-            ssb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.textColor)), start, end,
-                                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            ssb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.text_color)), start, end,
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
         return ssb;
diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
index 32077c806026..5a5275ced0ed 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
@@ -369,7 +369,7 @@ public void updateDrawState(@NonNull TextPaint ds) {
                 }, idx1, idx2, 0);
                 ssb.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), idx1, idx2, 0);
                 ssb.setSpan(
-                    new ForegroundColorSpan(context.getResources().getColor(R.color.textColor)),
+                    new ForegroundColorSpan(context.getResources().getColor(R.color.text_color)),
                     idx1,
                     idx2,
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
diff --git a/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java
index b47f666c4604..621fe5671790 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java
@@ -86,7 +86,7 @@ public NotificationListAdapter(OwnCloudClient client, NotificationsActivity noti
         this.client = client;
         this.notificationsActivity = notificationsActivity;
         foregroundColorSpanBlack = new ForegroundColorSpan(
-            notificationsActivity.getResources().getColor(R.color.textColor));
+            notificationsActivity.getResources().getColor(R.color.text_color));
     }
 
     public void setNotificationItems(List<Notification> notificationItems) {
diff --git a/src/main/java/com/owncloud/android/utils/ThemeUtils.java b/src/main/java/com/owncloud/android/utils/ThemeUtils.java
index 35d5ef6df83c..da1021b78442 100644
--- a/src/main/java/com/owncloud/android/utils/ThemeUtils.java
+++ b/src/main/java/com/owncloud/android/utils/ThemeUtils.java
@@ -164,7 +164,7 @@ public static int elementColor(Account account, Context context) {
             float[] hsl = colorToHSL(primaryColor);
 
             if (hsl[INDEX_LUMINATION] > LUMINATION_THRESHOLD) {
-                return context.getResources().getColor(R.color.elementFallbackColor);
+                return context.getResources().getColor(R.color.element_fallback_color);
             } else {
                 return primaryColor;
             }
diff --git a/src/main/res/drawable/list_selector.xml b/src/main/res/drawable/list_selector.xml
index 9f776a852854..499b0b0fabd1 100644
--- a/src/main/res/drawable/list_selector.xml
+++ b/src/main/res/drawable/list_selector.xml
@@ -20,8 +20,8 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
 
-    <item android:drawable="@color/owncloud_blue_bright" android:state_pressed="true"/>
-    <item android:drawable="@color/owncloud_blue_bright" android:state_focused="true"/>
+    <item android:drawable="@color/list_selector_focused_pressed" android:state_pressed="true"/>
+    <item android:drawable="@color/list_selector_focused_pressed" android:state_focused="true"/>
     <item android:drawable="@color/bg_default" />
 
 </selector>
diff --git a/src/main/res/layout/contacts_backup_fragment.xml b/src/main/res/layout/contacts_backup_fragment.xml
index 02d5a1fa1121..dcaf76c2860a 100644
--- a/src/main/res/layout/contacts_backup_fragment.xml
+++ b/src/main/res/layout/contacts_backup_fragment.xml
@@ -36,7 +36,7 @@
             android:layout_margin="@dimen/standard_margin"
             android:text="@string/contacts_automatic_backup"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/textColor" />
+            android:textColor="@color/text_color" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -51,7 +51,7 @@
                 android:layout_weight="1"
                 android:text="@string/contacts_last_backup"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/textColor"/>
+                android:textColor="@color/text_color"/>
 
             <TextView
                 android:id="@+id/contacts_last_backup_timestamp"
diff --git a/src/main/res/layout/deep_link_login.xml b/src/main/res/layout/deep_link_login.xml
index 4e4cc46d0069..a1bfd27e5a8a 100644
--- a/src/main/res/layout/deep_link_login.xml
+++ b/src/main/res/layout/deep_link_login.xml
@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:text="@string/placeholder_filename"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="20sp"
             android:textStyle="bold" />
 
diff --git a/src/main/res/layout/drawer_header.xml b/src/main/res/layout/drawer_header.xml
index 0e396c675d7c..08153b42ed12 100644
--- a/src/main/res/layout/drawer_header.xml
+++ b/src/main/res/layout/drawer_header.xml
@@ -106,7 +106,7 @@
                     android:shadowRadius="2"
                     android:maxLines="1"
                     android:text="@string/app_name"
-                    android:textColor="@color/textColor"
+                    android:textColor="@color/text_color"
                     android:textSize="@dimen/drawer_header_text"
                     android:textStyle="bold"/>
 
@@ -122,7 +122,7 @@
                     android:shadowDy="0"
                     android:shadowRadius="2"
                     android:text="@string/app_name"
-                    android:textColor="@color/textColor"
+                    android:textColor="@color/text_color"
                     android:textSize="@dimen/drawer_header_subtext"/>
 
             </LinearLayout>
diff --git a/src/main/res/layout/file_details_activities_fragment.xml b/src/main/res/layout/file_details_activities_fragment.xml
index a3751db4f3e5..7495c7f2214d 100644
--- a/src/main/res/layout/file_details_activities_fragment.xml
+++ b/src/main/res/layout/file_details_activities_fragment.xml
@@ -39,7 +39,7 @@
             android:layout_weight="1"
             android:hint="@string/new_comment"
             android:paddingTop="@dimen/standard_padding"
-            android:textColorHint="@color/secondaryTextColor" />
+            android:textColorHint="@color/secondary_text_color" />
 
         <ImageButton
             android:id="@+id/submitComment"
diff --git a/src/main/res/layout/file_details_fragment.xml b/src/main/res/layout/file_details_fragment.xml
index ca6ce6a4e818..3f71d3b1f7ea 100644
--- a/src/main/res/layout/file_details_fragment.xml
+++ b/src/main/res/layout/file_details_fragment.xml
@@ -58,7 +58,7 @@
                         android:layout_height="wrap_content"
                         android:ellipsize="middle"
                         android:text="@string/placeholder_filename"
-                        android:textColor="@color/textColor"
+                        android:textColor="@color/text_color"
                         android:textSize="20sp"
                         android:textStyle="bold"
                         tools:text="@string/placeholder_filename"/>
@@ -196,7 +196,7 @@
                 android:background="@color/bg_default"
                 app:tabGravity="center"
                 app:tabMode="fixed"
-                app:tabTextColor="@color/textColor"
+                app:tabTextColor="@color/text_color"
                 app:tabTextAppearance="@style/AppTabTextAppearance" />
 
             <androidx.viewpager.widget.ViewPager
diff --git a/src/main/res/layout/file_details_share_user_item.xml b/src/main/res/layout/file_details_share_user_item.xml
index 843239279b09..44dd14238723 100644
--- a/src/main/res/layout/file_details_share_user_item.xml
+++ b/src/main/res/layout/file_details_share_user_item.xml
@@ -50,7 +50,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="@string/username"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/file_details_username_text_size" />
 
     <androidx.appcompat.widget.AppCompatCheckBox
diff --git a/src/main/res/layout/file_details_sharing_fragment.xml b/src/main/res/layout/file_details_sharing_fragment.xml
index 38defe2f7e14..434e5af1dd7f 100644
--- a/src/main/res/layout/file_details_sharing_fragment.xml
+++ b/src/main/res/layout/file_details_sharing_fragment.xml
@@ -209,7 +209,7 @@
                     android:id="@+id/copyInternalLink"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/textColor"
+                    android:textColor="@color/text_color"
                     android:text="@string/copy_internal_link" />
 
                 <TextView
diff --git a/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml b/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
index edefa5a4dac8..978b629c198d 100644
--- a/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
+++ b/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
@@ -30,7 +30,7 @@
         android:padding="@dimen/standard_padding"
         android:text="@string/add_to_cloud"
         android:textSize="@dimen/bottom_sheet_text_size"
-        android:textColor="@color/textColor"/>
+        android:textColor="@color/text_color"/>
 
     <LinearLayout
         android:id="@+id/menu_upload_files"
@@ -58,7 +58,7 @@
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/upload_files"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
 
     </LinearLayout>
@@ -89,7 +89,7 @@
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/upload_content_from_other_apps"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
 
     </LinearLayout>
@@ -130,7 +130,7 @@
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/upload_direct_camera_upload"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
 
     </LinearLayout>
@@ -171,7 +171,7 @@
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/create_new_folder"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
 
     </LinearLayout>
@@ -218,7 +218,7 @@
                 android:layout_marginLeft="@dimen/standard_margin"
                 android:layout_marginStart="@dimen/standard_margin"
                 android:text="@string/create_new_document"
-                android:textColor="@color/textColor"
+                android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size"/>
         </LinearLayout>
 
@@ -247,7 +247,7 @@
                 android:layout_marginLeft="@dimen/standard_margin"
                 android:layout_marginStart="@dimen/standard_margin"
                 android:text="@string/create_new_spreadsheet"
-                android:textColor="@color/textColor"
+                android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size"/>
         </LinearLayout>
 
@@ -276,7 +276,7 @@
                 android:layout_marginLeft="@dimen/standard_margin"
                 android:layout_marginStart="@dimen/standard_margin"
                 android:text="@string/create_new_presentation"
-                android:textColor="@color/textColor"
+                android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/src/main/res/layout/grid_item.xml b/src/main/res/layout/grid_item.xml
index bb098b747030..4df2732772fb 100644
--- a/src/main/res/layout/grid_item.xml
+++ b/src/main/res/layout/grid_item.xml
@@ -105,7 +105,7 @@
         android:gravity="center_horizontal"
         android:singleLine="true"
         android:text="@string/placeholder_filename"
-        android:textColor="@color/textColor"
+        android:textColor="@color/text_color"
         android:textSize="@dimen/grid_item_text_size" />
 
 </com.owncloud.android.ui.SquareLinearLayout>
diff --git a/src/main/res/layout/list_footer.xml b/src/main/res/layout/list_footer.xml
index c0b85733afa0..716cc55660a1 100644
--- a/src/main/res/layout/list_footer.xml
+++ b/src/main/res/layout/list_footer.xml
@@ -22,6 +22,6 @@
         android:layout_marginBottom="@dimen/min_list_item_size"
         android:gravity="center"
         android:padding="@dimen/standard_padding"
-        android:textColor="@color/secondaryTextColor" />
+        android:textColor="@color/secondary_text_color" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 7eadda37179f..f36a772e6380 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -89,7 +89,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/placeholder_filename"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/two_line_primary_text_size"/>
 
         <LinearLayout
diff --git a/src/main/res/layout/media_control.xml b/src/main/res/layout/media_control.xml
index ef563ce559e6..78469f63b329 100644
--- a/src/main/res/layout/media_control.xml
+++ b/src/main/res/layout/media_control.xml
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:paddingEnd="@dimen/standard_quarter_padding"
             android:text="@string/placeholder_media_time"
-            android:textColor="@color/textColor_inverse"
+            android:textColor="@color/text_color_inverse"
             />
 
         <SeekBar
@@ -87,7 +87,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/standard_quarter_padding"
             android:text="@string/placeholder_media_time"
-            android:textColor="@color/textColor_inverse"
+            android:textColor="@color/text_color_inverse"
             />
         
     </LinearLayout>
diff --git a/src/main/res/layout/passcodelock.xml b/src/main/res/layout/passcodelock.xml
index f2f4808ad39c..cd1d81bc3d0f 100644
--- a/src/main/res/layout/passcodelock.xml
+++ b/src/main/res/layout/passcodelock.xml
@@ -31,7 +31,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/pass_code_enter_pass_code"
-        android:textColor="@color/textColor"
+        android:textColor="@color/text_color"
         android:gravity="center_horizontal"
         android:textSize="@dimen/two_line_primary_text_size"
          />
diff --git a/src/main/res/layout/richdocuments_webview.xml b/src/main/res/layout/richdocuments_webview.xml
index afb3c098c2ef..ee4b356dde7e 100644
--- a/src/main/res/layout/richdocuments_webview.xml
+++ b/src/main/res/layout/richdocuments_webview.xml
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:text="@string/placeholder_filename"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="20sp"
             android:textStyle="bold"/>
 
diff --git a/src/main/res/layout/send_button.xml b/src/main/res/layout/send_button.xml
index b0c54fe58bbc..0eaa29e5ee81 100644
--- a/src/main/res/layout/send_button.xml
+++ b/src/main/res/layout/send_button.xml
@@ -41,5 +41,5 @@
         android:layout_gravity="center"
         android:gravity="center_horizontal"
         android:paddingTop="@dimen/standard_half_padding"
-        android:textColor="@color/textColor" />
+        android:textColor="@color/text_color" />
 </LinearLayout>
diff --git a/src/main/res/layout/send_share_fragment.xml b/src/main/res/layout/send_share_fragment.xml
index 841d2d071f4c..8a4e8c2aaa5d 100644
--- a/src/main/res/layout/send_share_fragment.xml
+++ b/src/main/res/layout/send_share_fragment.xml
@@ -70,7 +70,7 @@
                 android:drawable="@drawable/ic_share"
                 android:text="@string/share"
                 android:paddingTop="@dimen/standard_half_padding"
-                android:textColor="@color/textColor"/>
+                android:textColor="@color/text_color"/>
         </LinearLayout>
 
         <LinearLayout
@@ -98,7 +98,7 @@
                 android:drawable="@drawable/ic_share"
                 android:text="@string/link"
                 android:paddingTop="@dimen/standard_half_padding"
-                android:textColor="@color/textColor"/>
+                android:textColor="@color/text_color"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/src/main/res/layout/share_file_layout.xml b/src/main/res/layout/share_file_layout.xml
index e2acd28c9158..9e3e1bd833ac 100644
--- a/src/main/res/layout/share_file_layout.xml
+++ b/src/main/res/layout/share_file_layout.xml
@@ -58,7 +58,7 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="@string/placeholder_filename"
-                android:textColor="@color/textColor"
+                android:textColor="@color/text_color"
                 android:textSize="@dimen/two_line_primary_text_size"/>
 
             <TextView
@@ -193,7 +193,7 @@
                         android:layout_toStartOf="@id/shareViaLinkEditPermissionSwitch"
                         android:padding="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_edit_permission_label"
-                        android:textColor="@color/textColor"
+                        android:textColor="@color/text_color"
                         android:textSize="14sp"
                         />
 
@@ -227,7 +227,7 @@
                         android:layout_toStartOf="@id/shareViaLinkFileListingPermissionSwitch"
                         android:padding="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_hide_file_listing_permission_label"
-                        android:textColor="@color/textColor"
+                        android:textColor="@color/text_color"
                         android:textSize="@dimen/two_line_secondary_text_size"
                         />
 
@@ -261,7 +261,7 @@
                         android:paddingRight="@dimen/standard_half_padding"
                         android:paddingTop="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_password_label"
-                        android:textColor="@color/textColor"
+                        android:textColor="@color/text_color"
                         android:textSize="@dimen/two_line_secondary_text_size"
                         />
 
@@ -312,7 +312,7 @@
                         android:paddingRight="@dimen/standard_half_padding"
                         android:paddingTop="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_expiration_date_label"
-                        android:textColor="@color/textColor"
+                        android:textColor="@color/text_color"
                         android:textSize="@dimen/two_line_secondary_text_size"
                         />
 
diff --git a/src/main/res/layout/share_user_item.xml b/src/main/res/layout/share_user_item.xml
index b111ab02d039..c53d4bb3af35 100644
--- a/src/main/res/layout/share_user_item.xml
+++ b/src/main/res/layout/share_user_item.xml
@@ -43,7 +43,7 @@
             android:id="@+id/userOrGroupName"
             android:layout_marginLeft="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_half_margin"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:singleLine="true"
             android:ellipsize="middle"
             android:gravity="center_vertical"/>
diff --git a/src/main/res/layout/ssl_untrusted_cert_layout.xml b/src/main/res/layout/ssl_untrusted_cert_layout.xml
index dec0a7087271..1671d828889a 100644
--- a/src/main/res/layout/ssl_untrusted_cert_layout.xml
+++ b/src/main/res/layout/ssl_untrusted_cert_layout.xml
@@ -32,7 +32,7 @@
 		android:paddingBottom="@dimen/standard_padding"
 		android:text="@string/ssl_validator_header"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:textColor="@color/textColor"
+		android:textColor="@color/text_color"
 		 />
 
 	<TextView
diff --git a/src/main/res/layout/ssl_validator_layout.xml b/src/main/res/layout/ssl_validator_layout.xml
index 34a9be94aedf..283112acf817 100644
--- a/src/main/res/layout/ssl_validator_layout.xml
+++ b/src/main/res/layout/ssl_validator_layout.xml
@@ -31,7 +31,7 @@
 		android:text="@string/ssl_validator_header"
 		android:paddingBottom="@dimen/standard_padding"
         android:textStyle="bold"
-        android:textColor="@color/textColor"
+        android:textColor="@color/text_color"
 		android:textAppearance="?android:attr/textAppearanceMedium" />
 
 	<TextView
diff --git a/src/main/res/layout/storage_path_item.xml b/src/main/res/layout/storage_path_item.xml
index 0726935730e9..4aacf82d0e38 100644
--- a/src/main/res/layout/storage_path_item.xml
+++ b/src/main/res/layout/storage_path_item.xml
@@ -50,7 +50,7 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:singleLine="true"
-        android:textColor="@color/textColor"
+        android:textColor="@color/text_color"
         android:textSize="@dimen/file_details_username_text_size"
         tools:text="DCIM" />
 </LinearLayout>
diff --git a/src/main/res/layout/template_button.xml b/src/main/res/layout/template_button.xml
index 611f2145281f..8387b0cf526b 100644
--- a/src/main/res/layout/template_button.xml
+++ b/src/main/res/layout/template_button.xml
@@ -44,5 +44,5 @@
         android:ellipsize="middle"
         android:gravity="center_horizontal"
         android:paddingTop="@dimen/standard_half_padding"
-        android:textColor="@color/textColor"/>
+        android:textColor="@color/text_color"/>
 </LinearLayout>
diff --git a/src/main/res/layout/trashbin_item.xml b/src/main/res/layout/trashbin_item.xml
index 6da789597e36..b508a878e4ea 100644
--- a/src/main/res/layout/trashbin_item.xml
+++ b/src/main/res/layout/trashbin_item.xml
@@ -58,7 +58,7 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 tools:text="@string/placeholder_filename"
-                android:textColor="@color/textColor"
+                android:textColor="@color/text_color"
                 android:textSize="@dimen/two_line_primary_text_size"/>
 
             <LinearLayout
diff --git a/src/main/res/layout/upload_files_layout.xml b/src/main/res/layout/upload_files_layout.xml
index fb6dbe4d25af..38cece7dce1b 100644
--- a/src/main/res/layout/upload_files_layout.xml
+++ b/src/main/res/layout/upload_files_layout.xml
@@ -61,7 +61,7 @@
             android:layout_height="wrap_content"
             android:text="@string/uploader_upload_files_behaviour"
             android:id="@+id/upload_files_upload_files_behaviour_text"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textStyle="bold"
             android:paddingBottom="@dimen/standard_half_padding"/>
 
diff --git a/src/main/res/layout/upload_list_item.xml b/src/main/res/layout/upload_list_item.xml
index f822282a6ea3..6086b2b0fada 100755
--- a/src/main/res/layout/upload_list_item.xml
+++ b/src/main/res/layout/upload_list_item.xml
@@ -61,7 +61,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/placeholder_filename"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/two_line_primary_text_size" />
 
 
diff --git a/src/main/res/layout/uploader_list_item_layout.xml b/src/main/res/layout/uploader_list_item_layout.xml
index b1b7ddbeb497..8cf7c065d6ac 100644
--- a/src/main/res/layout/uploader_list_item_layout.xml
+++ b/src/main/res/layout/uploader_list_item_layout.xml
@@ -51,7 +51,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/placeholder_filename"
-            android:textColor="@color/textColor"
+            android:textColor="@color/text_color"
             android:textSize="@dimen/two_line_primary_text_size"/>
 
         <LinearLayout
diff --git a/src/main/res/layout/whats_new_element.xml b/src/main/res/layout/whats_new_element.xml
index bab2f7a46db0..b010d34fbacf 100644
--- a/src/main/res/layout/whats_new_element.xml
+++ b/src/main/res/layout/whats_new_element.xml
@@ -49,7 +49,7 @@
         android:gravity="center"
         android:text=""
         android:textAppearance="@style/NextcloudTextAppearanceHeadline"
-        android:textColor="@color/textColor_inverse"
+        android:textColor="@color/text_color_inverse"
         android:textStyle="bold"/>
 
     <LinearLayout
diff --git a/src/main/res/values-night/colors.xml b/src/main/res/values-night/colors.xml
index 90bd4c701059..020a3dd11036 100644
--- a/src/main/res/values-night/colors.xml
+++ b/src/main/res/values-night/colors.xml
@@ -20,8 +20,8 @@
 -->
 <resources>
 
-    <color name="textColor">#ffffff</color>
-    <color name="textColor_inverse">#000000</color>
+    <color name="text_color">#ffffff</color>
+    <color name="text_color_inverse">#000000</color>
 
     <!-- Colors -->
     <color name="bg_default">#222222</color>
diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
index 05f9a8e53190..f08e9dd32cce 100644
--- a/src/main/res/values-v21/styles.xml
+++ b/src/main/res/values-v21/styles.xml
@@ -19,16 +19,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- General ownCloud app style -->
     <style name="Theme.ownCloud" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <item name="android:textColorSecondary">@color/secondaryTextColor</item>
-        <item name="colorSecondary">@color/secondaryTextColor</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="colorSecondary">@color/secondary_text_color</item>
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
     </style>
 
     <style name="FallbackThemingTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
-        <item name="android:textColor">@color/textColor</item>
-        <item name="android:textColorSecondary">@color/secondaryTextColor</item>
-        <item name="colorSecondary">@color/secondaryTextColor</item>
+        <item name="android:textColor">@color/text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="colorSecondary">@color/secondary_text_color</item>
         <item name="android:alertDialogTheme">@style/FallbackTheming.Dialog</item>
     </style>
 
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index d30b2f203ea0..2833dd82b79d 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -19,13 +19,13 @@
 -->
 <resources>
 
-    <color name="owncloud_blue_bright">#00ddff</color>
+    <color name="list_selector_focused_pressed">#00ddff</color>
 
-    <color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>
+    <color name="list_item_lastmod_and_filesize_text">@color/secondary_text_color</color>
     <color name="black">#000000</color>
     <color name="white">#ffffff</color>
-    <color name="textColor">#000000</color>
-    <color name="textColor_inverse">#ffffff</color>
+    <color name="text_color">#000000</color>
+    <color name="text_color_inverse">#ffffff</color>
     <color name="disabled_text">#ff888888</color>
     <color name="list_divider_background">#eee</color>
     <color name="fg_default">#000000</color>
@@ -34,12 +34,12 @@
     <color name="filelist_icon_background">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="transparent">#00000000</color>
-    <color name="secondaryTextColor">#a0a0a0</color>
+    <color name="secondary_text_color">#a0a0a0</color>
     <color name="highlight_textColor_Warning">#e53935</color>
 
     <!-- Colors -->
     <color name="standard_grey">#757575</color>
-    <color name="elementFallbackColor">#555555</color>
+    <color name="element_fallback_color">#555555</color>
     <color name="grey_200">#EEEEEE</color>
     <color name="grey_db">#dbdbdb</color>
     <color name="actionbar_shadow">#222222</color>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 2bfa78e0726b..bac5c803c78d 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -31,10 +31,10 @@
         <item name="android:alertDialogTheme">@style/ownCloud.AlertDialog</item>
         <item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
         <item name="searchViewStyle">@style/ownCloud.SearchView</item>
-        <item name="android:textColor">@color/textColor</item>
-        <item name="android:textColorSecondary">@color/secondaryTextColor</item>
-        <item name="colorSecondary">@color/secondaryTextColor</item>
-        <item name="android:textColorHint">@color/secondaryTextColor</item>
+        <item name="android:textColor">@color/text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="colorSecondary">@color/secondary_text_color</item>
+        <item name="android:textColorHint">@color/secondary_text_color</item>
     </style>
 
 	<style name="FallbackThemingTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
@@ -42,11 +42,11 @@
 		<item name="colorPrimaryDark">#212121</item>
 		<item name="colorAccent">#757575</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">@color/textColor</item>
+        <item name="android:textColor">@color/text_color</item>
         <item name="android:alertDialogTheme">@style/FallbackTheming.Dialog</item>
         <item name="dialogTheme">@style/FallbackTheming.Dialog</item>
         <item name="android:windowBackground">@color/bg_default</item>
-        <item name="android:textColorSecondary">@color/secondaryTextColor</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
     </style>
 
 	<style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
@@ -196,7 +196,7 @@
 	<!-- Launch screen -->
 	<style name="Theme.ownCloud.Launcher">
 		<item name="android:windowBackground">@drawable/launch_screen</item>
-        <item name="android:textColorHint">@color/secondaryTextColor</item>
+        <item name="android:textColorHint">@color/secondary_text_color</item>
 	</style>
 
 	<!-- Progress bar -->
@@ -214,7 +214,7 @@
 		parent="@style/Theme.MaterialComponents.Light.DarkActionBar.Bridge">
 		<item name="android:background">@color/primary</item>
 		<item name="background">@color/primary</item>
-    	<item name="android:textColor">@color/textColor</item>
+    	<item name="android:textColor">@color/text_color</item>
     	<item name="android:shadowColor">@color/actionbar_shadow</item>
     	<item name="android:shadowRadius">1</item>
     	<item name="android:shadowDy">1</item>
@@ -270,7 +270,7 @@
 	<!-- Text styles -->
 	<style name="NextcloudTextAppearanceHeadline" parent="@style/TextAppearance.AppCompat.Headline">
 		<item name="android:textSize">26sp</item>
-		<item name="android:textColor">@color/textColor</item>
+		<item name="android:textColor">@color/text_color</item>
 	</style>
 	<style name="NextcloudTextAppearanceMedium" parent="@style/TextAppearance.AppCompat.Medium">
 	</style>
@@ -285,14 +285,14 @@
 	<style name="AppTabTextAppearance" parent="@style/TextAppearance.Design.Tab">
 		<item name="android:textSize">16sp</item>
 		<item name="textAllCaps">false</item>
-        <item name="android:textColor">@color/textColor</item>
+        <item name="android:textColor">@color/text_color</item>
     </style>
 
     <style name="ThemeOverlay.AppTheme.PopupMenu" parent="ThemeOverlay.MaterialComponents.Dark">
         <!-- popup menu background - NEVER "android:background" !!! in themes -->
         <item name="android:colorBackground">@color/bg_default</item>
         <!-- popup menu item text color -->
-        <item name="android:textColorPrimary">@color/textColor</item>
+        <item name="android:textColorPrimary">@color/text_color</item>
     </style>
 
     <style name="MaterialListItemSingleLine">