diff --git a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
index 5b814cdc..394f3806 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
@@ -17,11 +17,6 @@ import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
-import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
 import org.gitnex.tea4j.v2.models.ContentsResponse;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.FileViewActivity;
@@ -35,6 +30,11 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Path;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
 import org.mian.gitnex.viewmodels.FilesViewModel;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
+import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
 
 /**
  * @author M M Arif
diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml
index 3178ed33..8c945bfb 100644
--- a/app/src/main/res/drawable/progress_bar.xml
+++ b/app/src/main/res/drawable/progress_bar.xml
@@ -10,7 +10,7 @@
         android:top="2dp">
         <shape>
             <corners android:radius="10dp"/>
-            <solid android:color="?attr/inputBackgroundColor"/>
+            <solid android:color="?attr/primaryBackgroundColor"/>
         </shape>
     </item>
 
diff --git a/app/src/main/res/layout/activity_create_label.xml b/app/src/main/res/layout/activity_create_label.xml
index 4c2312cf..a92fd183 100644
--- a/app/src/main/res/layout/activity_create_label.xml
+++ b/app/src/main/res/layout/activity_create_label.xml
@@ -95,7 +95,7 @@
                 android:textSize="@dimen/dimen16sp"/>
 
             <com.google.android.material.card.MaterialCardView
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 android:layout_width="@dimen/dimen28dp"
                 android:layout_height="@dimen/dimen28dp"
                 app:cardCornerRadius="@dimen/dimen16dp"
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 35804733..8c33497c 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -93,7 +93,7 @@
 
                     <com.google.android.material.card.MaterialCardView
                         android:id="@+id/titleCard"
-                        style="?attr/materialCardViewFilledStyle"
+                        style="?attr/materialCardViewElevatedStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="@dimen/dimen12dp"
@@ -122,7 +122,7 @@
 
                     <com.google.android.material.card.MaterialCardView
                         android:id="@+id/mainThreadCard"
-                        style="?attr/materialCardViewFilledStyle"
+                        style="?attr/materialCardViewElevatedStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/titleCard"
@@ -144,7 +144,7 @@
                                 android:orientation="horizontal">
 
                                 <com.google.android.material.card.MaterialCardView
-                                    style="?attr/materialCardViewFilledStyle"
+                                    style="?attr/materialCardViewElevatedStyle"
                                     android:layout_width="@dimen/dimen24dp"
                                     android:layout_height="@dimen/dimen24dp"
                                     app:cardCornerRadius="@dimen/dimen12dp"
diff --git a/app/src/main/res/layout/custom_about_dialog.xml b/app/src/main/res/layout/custom_about_dialog.xml
index 22993d96..da669207 100644
--- a/app/src/main/res/layout/custom_about_dialog.xml
+++ b/app/src/main/res/layout/custom_about_dialog.xml
@@ -70,7 +70,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:text="@string/appVersionBuild"
-                        android:textColor="@color/iconPrMergedColor"
+                        android:textColor="@color/retroThemeColorSecondary"
                         android:textIsSelectable="true"
                         android:paddingTop="@dimen/dimen8dp"
                         android:paddingBottom="@dimen/dimen8dp"
diff --git a/app/src/main/res/layout/fragment_commit_details.xml b/app/src/main/res/layout/fragment_commit_details.xml
index f51a5e24..56d7dfd2 100644
--- a/app/src/main/res/layout/fragment_commit_details.xml
+++ b/app/src/main/res/layout/fragment_commit_details.xml
@@ -71,7 +71,7 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 android:layout_marginBottom="@dimen/dimen4dp"
                 app:cardElevation="@dimen/dimen0dp">
 
diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
index d56022e1..7c995bbc 100644
--- a/app/src/main/res/layout/fragment_files.xml
+++ b/app/src/main/res/layout/fragment_files.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -18,7 +18,7 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="?attr/materialCardViewFilledStyle"
+            style="?attr/materialCardViewElevatedStyle"
             android:layout_margin="@dimen/dimen8dp"
             app:cardElevation="@dimen/dimen0dp">
 
@@ -36,8 +36,8 @@
                     android:saveEnabled="false"
                     android:text="@string/filesBreadcrumbRoot"
                     app:CustomTextSize="@dimen/dimen16sp"
-                    app:SelectedTextColor="?attr/primaryTextColor"
-                    app:UnSelectedTextColor="@color/lightGray"/>
+                    app:SelectedTextColor="?attr/inputSelectedColor"
+                    app:UnSelectedTextColor="?attr/primaryTextColor" />
 
             </LinearLayout>
 
@@ -57,7 +57,7 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
+                    android:layout_height="match_parent" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -69,12 +69,12 @@
         android:id="@+id/noDataFiles"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="15dp"
+        android:layout_margin="@dimen/dimen16dp"
         android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="18sp"
-        android:visibility="gone"/>
+        android:textSize="@dimen/dimen18sp"
+        android:visibility="gone" />
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progress_bar"
@@ -83,6 +83,6 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/filesFrame"
         android:indeterminate="true"
-        app:indicatorColor="?attr/progressIndicatorColor"/>
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
-</RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index 7bc182f8..c4c2fea8 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -16,7 +16,7 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="?attr/materialCardViewFilledStyle"
+            style="?attr/materialCardViewElevatedStyle"
             app:cardElevation="@dimen/dimen0dp">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index 1c95d49d..7e9d1d70 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -33,7 +33,7 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 app:cardElevation="@dimen/dimen0dp">
 
                 <LinearLayout
@@ -423,7 +423,7 @@
                 android:id="@+id/fileContentsFrameHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 android:layout_marginTop="@dimen/dimen8dp"
                 app:cardElevation="@dimen/dimen0dp">
 
diff --git a/app/src/main/res/layout/list_admin_cron_tasks.xml b/app/src/main/res/layout/list_admin_cron_tasks.xml
index e3e0e0d4..9a31d4c7 100644
--- a/app/src/main/res/layout/list_admin_cron_tasks.xml
+++ b/app/src/main/res/layout/list_admin_cron_tasks.xml
@@ -9,7 +9,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_admin_unadopted_repos.xml b/app/src/main/res/layout/list_admin_unadopted_repos.xml
index 7250ee0f..3706db2e 100644
--- a/app/src/main/res/layout/list_admin_unadopted_repos.xml
+++ b/app/src/main/res/layout/list_admin_unadopted_repos.xml
@@ -9,7 +9,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_admin_users.xml b/app/src/main/res/layout/list_admin_users.xml
index b3e87921..ddd4976e 100644
--- a/app/src/main/res/layout/list_admin_users.xml
+++ b/app/src/main/res/layout/list_admin_users.xml
@@ -9,7 +9,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -31,7 +31,7 @@
                     android:id="@+id/userAccountAvatar"
                     android:layout_width="@dimen/dimen24dp"
                     android:layout_height="@dimen/dimen24dp"
-                    style="?attr/materialCardViewFilledStyle"
+                    style="?attr/materialCardViewElevatedStyle"
                     app:cardElevation="@dimen/dimen0dp"
                     android:layout_gravity="center"
                     app:cardCornerRadius="@dimen/dimen12dp">
diff --git a/app/src/main/res/layout/list_collaborators.xml b/app/src/main/res/layout/list_collaborators.xml
index 1fe53c8d..e9641d85 100644
--- a/app/src/main/res/layout/list_collaborators.xml
+++ b/app/src/main/res/layout/list_collaborators.xml
@@ -10,7 +10,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_collaborators_search.xml b/app/src/main/res/layout/list_collaborators_search.xml
index 9fbea86c..6d5d4845 100644
--- a/app/src/main/res/layout/list_collaborators_search.xml
+++ b/app/src/main/res/layout/list_collaborators_search.xml
@@ -9,7 +9,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -24,7 +24,7 @@
                 android:id="@+id/avatarFrame"
                 android:layout_width="@dimen/dimen24dp"
                 android:layout_height="@dimen/dimen24dp"
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 app:cardElevation="@dimen/dimen0dp"
                 android:layout_marginEnd="@dimen/dimen12dp"
                 app:cardCornerRadius="@dimen/dimen12dp">
diff --git a/app/src/main/res/layout/list_commit_status.xml b/app/src/main/res/layout/list_commit_status.xml
index 379d9819..7a831ef8 100644
--- a/app/src/main/res/layout/list_commit_status.xml
+++ b/app/src/main/res/layout/list_commit_status.xml
@@ -8,7 +8,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         android:background="?android:attr/selectableItemBackground"
         app:cardElevation="@dimen/dimen0dp">
 
diff --git a/app/src/main/res/layout/list_commits.xml b/app/src/main/res/layout/list_commits.xml
index 9ea72a9d..ad733c1b 100644
--- a/app/src/main/res/layout/list_commits.xml
+++ b/app/src/main/res/layout/list_commits.xml
@@ -11,7 +11,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -51,7 +51,7 @@
                         android:id="@+id/commitAuthorAvatarFrame"
                         android:layout_width="@dimen/dimen24dp"
                         android:layout_height="@dimen/dimen24dp"
-                        style="?attr/materialCardViewFilledStyle"
+                        style="?attr/materialCardViewElevatedStyle"
                         app:cardElevation="@dimen/dimen0dp"
                         android:layout_marginEnd="@dimen/dimen6dp"
                         app:cardCornerRadius="@dimen/dimen12dp">
@@ -69,7 +69,7 @@
                         android:id="@+id/commitCommitterAvatarFrame"
                         android:layout_width="@dimen/dimen24dp"
                         android:layout_height="@dimen/dimen24dp"
-                        style="?attr/materialCardViewFilledStyle"
+                        style="?attr/materialCardViewElevatedStyle"
                         app:cardElevation="@dimen/dimen0dp"
                         android:layout_marginEnd="@dimen/dimen6dp"
                         app:cardCornerRadius="@dimen/dimen12dp">
diff --git a/app/src/main/res/layout/list_diff_files.xml b/app/src/main/res/layout/list_diff_files.xml
index cb77cc3b..408474b0 100644
--- a/app/src/main/res/layout/list_diff_files.xml
+++ b/app/src/main/res/layout/list_diff_files.xml
@@ -13,7 +13,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_drafts.xml b/app/src/main/res/layout/list_drafts.xml
index f94658e0..a2c6ad23 100644
--- a/app/src/main/res/layout/list_drafts.xml
+++ b/app/src/main/res/layout/list_drafts.xml
@@ -12,7 +12,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_files.xml b/app/src/main/res/layout/list_files.xml
index 92b92d2f..982f1d50 100644
--- a/app/src/main/res/layout/list_files.xml
+++ b/app/src/main/res/layout/list_files.xml
@@ -13,7 +13,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_issue_comments.xml b/app/src/main/res/layout/list_issue_comments.xml
index 03e88d7e..957f9015 100644
--- a/app/src/main/res/layout/list_issue_comments.xml
+++ b/app/src/main/res/layout/list_issue_comments.xml
@@ -25,7 +25,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/comment_view"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardElevation="@dimen/dimen0dp">
@@ -45,7 +45,7 @@
                 android:orientation="horizontal">
 
                 <com.google.android.material.card.MaterialCardView
-                    style="?attr/materialCardViewFilledStyle"
+                    style="?attr/materialCardViewElevatedStyle"
                     android:layout_width="@dimen/dimen24dp"
                     android:layout_height="@dimen/dimen24dp"
                     app:cardCornerRadius="@dimen/dimen12dp"
@@ -165,7 +165,7 @@
             android:orientation="vertical">
 
             <com.google.android.material.card.MaterialCardView
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 android:layout_width="@dimen/dimen28dp"
                 android:layout_height="@dimen/dimen28dp"
                 android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/list_issues.xml b/app/src/main/res/layout/list_issues.xml
index 1457f691..f584e66e 100644
--- a/app/src/main/res/layout/list_issues.xml
+++ b/app/src/main/res/layout/list_issues.xml
@@ -12,7 +12,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -33,7 +33,7 @@
                 <com.google.android.material.card.MaterialCardView
                     android:layout_width="@dimen/dimen24dp"
                     android:layout_height="@dimen/dimen24dp"
-                    style="?attr/materialCardViewFilledStyle"
+                    style="?attr/materialCardViewElevatedStyle"
                     app:cardElevation="@dimen/dimen0dp"
                     android:layout_marginEnd="@dimen/dimen12dp"
                     app:cardCornerRadius="@dimen/dimen12dp">
diff --git a/app/src/main/res/layout/list_labels.xml b/app/src/main/res/layout/list_labels.xml
index 45da86b7..c98a7bc9 100644
--- a/app/src/main/res/layout/list_labels.xml
+++ b/app/src/main/res/layout/list_labels.xml
@@ -12,7 +12,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -27,7 +27,7 @@
                 android:id="@+id/labelView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 app:cardCornerRadius="@dimen/dimen16dp"
                 app:cardElevation="@dimen/dimen0dp"
                 app:contentPaddingBottom="@dimen/dimen4dp"
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index ec1e0abb..b1f6528c 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -12,7 +12,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -50,7 +50,7 @@
                     android:indeterminate="false"
                     android:progress="50"
                     android:progressDrawable="@drawable/progress_bar"
-                    android:progressTint="@color/btnBackground"/>
+                    android:progressTint="?attr/fabColor" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_most_visited_repos.xml b/app/src/main/res/layout/list_most_visited_repos.xml
index 600747e7..8987debe 100644
--- a/app/src/main/res/layout/list_most_visited_repos.xml
+++ b/app/src/main/res/layout/list_most_visited_repos.xml
@@ -9,7 +9,7 @@
     android:paddingBottom="@dimen/dimen4dp">
 
     <com.google.android.material.card.MaterialCardView
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardElevation="@dimen/dimen0dp">
diff --git a/app/src/main/res/layout/list_notes.xml b/app/src/main/res/layout/list_notes.xml
index 208a3538..112c6094 100644
--- a/app/src/main/res/layout/list_notes.xml
+++ b/app/src/main/res/layout/list_notes.xml
@@ -11,7 +11,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_notifications.xml b/app/src/main/res/layout/list_notifications.xml
index 2e628f26..0f9d701e 100644
--- a/app/src/main/res/layout/list_notifications.xml
+++ b/app/src/main/res/layout/list_notifications.xml
@@ -11,7 +11,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_organization_members_preview.xml b/app/src/main/res/layout/list_organization_members_preview.xml
index 9ef63849..6b0e3883 100644
--- a/app/src/main/res/layout/list_organization_members_preview.xml
+++ b/app/src/main/res/layout/list_organization_members_preview.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         android:layout_width="@dimen/dimen24dp"
         android:layout_height="@dimen/dimen24dp"
         app:cardCornerRadius="@dimen/dimen12dp"
diff --git a/app/src/main/res/layout/list_organization_teams.xml b/app/src/main/res/layout/list_organization_teams.xml
index ecbd6846..31211577 100644
--- a/app/src/main/res/layout/list_organization_teams.xml
+++ b/app/src/main/res/layout/list_organization_teams.xml
@@ -12,7 +12,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_organizations.xml b/app/src/main/res/layout/list_organizations.xml
index e6764292..26495432 100644
--- a/app/src/main/res/layout/list_organizations.xml
+++ b/app/src/main/res/layout/list_organizations.xml
@@ -12,7 +12,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml
index b496c495..29d657bc 100644
--- a/app/src/main/res/layout/list_pr.xml
+++ b/app/src/main/res/layout/list_pr.xml
@@ -13,7 +13,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -34,7 +34,7 @@
                 <com.google.android.material.card.MaterialCardView
                     android:layout_width="@dimen/dimen24dp"
                     android:layout_height="@dimen/dimen24dp"
-                    style="?attr/materialCardViewFilledStyle"
+                    style="?attr/materialCardViewElevatedStyle"
                     app:cardElevation="@dimen/dimen0dp"
                     android:layout_marginEnd="@dimen/dimen12dp"
                     app:cardCornerRadius="@dimen/dimen12dp">
diff --git a/app/src/main/res/layout/list_reaction_authors.xml b/app/src/main/res/layout/list_reaction_authors.xml
index 065d9300..797f9500 100644
--- a/app/src/main/res/layout/list_reaction_authors.xml
+++ b/app/src/main/res/layout/list_reaction_authors.xml
@@ -14,7 +14,7 @@
     android:orientation="horizontal">
 
     <com.google.android.material.card.MaterialCardView
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         android:layout_width="@dimen/dimen24dp"
         android:layout_height="@dimen/dimen24dp"
         android:layout_marginEnd="@dimen/dimen12dp"
diff --git a/app/src/main/res/layout/list_releases.xml b/app/src/main/res/layout/list_releases.xml
index 47d763ab..3b593ef2 100644
--- a/app/src/main/res/layout/list_releases.xml
+++ b/app/src/main/res/layout/list_releases.xml
@@ -9,7 +9,7 @@
     android:paddingBottom="@dimen/dimen4dp">
 
     <com.google.android.material.card.MaterialCardView
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardElevation="@dimen/dimen0dp">
@@ -69,7 +69,7 @@
                         tools:ignore="UseCompoundDrawables">
 
                         <com.google.android.material.card.MaterialCardView
-                            style="?attr/materialCardViewFilledStyle"
+                            style="?attr/materialCardViewElevatedStyle"
                             android:layout_width="@dimen/dimen24dp"
                             android:layout_height="@dimen/dimen24dp"
                             app:cardCornerRadius="@dimen/dimen12dp"
diff --git a/app/src/main/res/layout/list_repositories.xml b/app/src/main/res/layout/list_repositories.xml
index 4a5e99e5..f9cfe3d1 100644
--- a/app/src/main/res/layout/list_repositories.xml
+++ b/app/src/main/res/layout/list_repositories.xml
@@ -19,7 +19,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_tags.xml b/app/src/main/res/layout/list_tags.xml
index d714f09f..4080e0b1 100644
--- a/app/src/main/res/layout/list_tags.xml
+++ b/app/src/main/res/layout/list_tags.xml
@@ -11,7 +11,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_user_accounts.xml b/app/src/main/res/layout/list_user_accounts.xml
index 86139e57..1f6ea09b 100644
--- a/app/src/main/res/layout/list_user_accounts.xml
+++ b/app/src/main/res/layout/list_user_accounts.xml
@@ -13,7 +13,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/list_users_grid.xml b/app/src/main/res/layout/list_users_grid.xml
index c047408e..eb3d4e0b 100644
--- a/app/src/main/res/layout/list_users_grid.xml
+++ b/app/src/main/res/layout/list_users_grid.xml
@@ -10,7 +10,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
@@ -54,6 +54,8 @@
                     android:paddingEnd="@dimen/dimen2dp"
                     android:text="@string/userName"
                     android:textColor="?attr/primaryTextColor"
+                    android:ellipsize="end"
+                    android:maxLines="2"
                     android:textSize="14sp"/>
 
                 <TextView
@@ -64,6 +66,8 @@
                     android:paddingEnd="@dimen/dimen2dp"
                     android:text="@string/userName"
                     android:textColor="?attr/primaryTextColor"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:textSize="@dimen/dimen12sp"/>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/list_wiki.xml b/app/src/main/res/layout/list_wiki.xml
index e6a69bf1..b7bb3486 100644
--- a/app/src/main/res/layout/list_wiki.xml
+++ b/app/src/main/res/layout/list_wiki.xml
@@ -11,7 +11,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/materialCardViewFilledStyle"
+        style="?attr/materialCardViewElevatedStyle"
         app:cardElevation="@dimen/dimen0dp">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index 85eabd76..5ed9d1ec 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -27,7 +27,7 @@
             android:orientation="horizontal">
 
             <com.google.android.material.card.MaterialCardView
-                style="?attr/materialCardViewFilledStyle"
+                style="?attr/materialCardViewElevatedStyle"
                 android:layout_width="@dimen/dimen60dp"
                 android:layout_height="@dimen/dimen60dp"
                 app:cardCornerRadius="@dimen/dimen32dp"
@@ -51,7 +51,7 @@
 
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/userAccountsFrame"
-                    style="?attr/materialCardViewFilledStyle"
+                    style="?attr/materialCardViewElevatedStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/dimen40dp"
                     android:layout_gravity="end"
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index f3231ddc..bb572ae7 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -58,9 +58,9 @@
         <item name="colorSecondary">@android:color/system_accent1_200</item>
         <item name="colorOnSurface">@android:color/system_accent2_900</item>
 
-        <item name="diffAddedColor">@color/diffAddedColor</item>
-        <item name="diffRemovedColor">@color/diffRemovedColor</item>
-        <item name="diffSelectedColor">@color/diffSelectedColor</item>
+        <item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
+        <item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
+        <item name="diffSelectedColor">@color/lightThemeDiffSelectedColor</item>
         <item name="primaryTextColor">@android:color/system_accent2_900</item>
         <item name="primaryBackgroundColor">@android:color/system_neutral1_10</item>
         <item name="hintColor">@android:color/system_accent1_800</item>