diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 7a84bb7fab..2fc0d954bd 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -108,7 +108,7 @@
         android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppThemeBlueOrangeLight">
+        android:theme="@style/Theme.App.BlueOrangeLight">
         <!-- https://developer.samsung.com/samsung-dex/modify-optimizing.html -->
 
         <!-- https://developer.android.com/guide/webapps/managing-webview#metrics -->
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 939064c2e1..3d6a83c0a4 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -108,7 +108,7 @@
         android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppThemeBlueOrange">
+        android:theme="@style/Theme.App.BlueOrange">
         <!-- https://developer.samsung.com/samsung-dex/modify-optimizing.html -->
 
         <!-- https://developer.android.com/guide/webapps/managing-webview#metrics -->
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f7ef4c9d4..017bce89bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,7 +108,7 @@
         android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppThemeBlueOrange">
+        android:theme="@style/Theme.App.BlueOrange">
         <!-- https://developer.samsung.com/samsung-dex/modify-optimizing.html -->
 
         <!-- https://developer.android.com/guide/webapps/managing-webview#metrics -->
diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index c8884e7754..a637c84106 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -106,85 +106,85 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                 case "light":
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                 case "blue_orange_light":
-                    setTheme(R.style.AppThemeBlueOrange);
+                    setTheme(R.style.Theme_App_BlueOrange);
                     break;
                 case "orange_blue_light":
-                    setTheme(R.style.AppThemeOrangeBlue);
+                    setTheme(R.style.Theme_App_OrangeBlue);
                     break;
 
                 case "yellow_purple_light":
-                    setTheme(R.style.AppThemeYellowPurple);
+                    setTheme(R.style.Theme_App_YellowPurple);
                     break;
                 case "purple_yellow_light":
-                    setTheme(R.style.AppThemePurpleYellow);
+                    setTheme(R.style.Theme_App_PurpleYellow);
                     break;
 
                 case "red_green_light":
-                    setTheme(R.style.AppThemeRedGreen);
+                    setTheme(R.style.Theme_App_RedGreen);
                     break;
                 case "green_red_light":
-                    setTheme(R.style.AppThemeGreenRed);
+                    setTheme(R.style.Theme_App_GreenRed);
                     break;
 
                 // Dark
                 case "dark":
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                 case "blue_orange_dark":
-                    setTheme(R.style.AppThemeBlueOrange);
+                    setTheme(R.style.Theme_App_BlueOrange);
                     break;
                 case "orange_blue_dark":
-                    setTheme(R.style.AppThemeOrangeBlue);
+                    setTheme(R.style.Theme_App_OrangeBlue);
                     break;
 
                 case "yellow_purple_dark":
-                    setTheme(R.style.AppThemeYellowPurple);
+                    setTheme(R.style.Theme_App_YellowPurple);
                     break;
                 case "purple_yellow_dark":
-                    setTheme(R.style.AppThemePurpleYellow);
+                    setTheme(R.style.Theme_App_PurpleYellow);
                     break;
 
                 case "red_green_dark":
-                    setTheme(R.style.AppThemeRedGreen);
+                    setTheme(R.style.Theme_App_RedGreen);
                     break;
                 case "green_red_dark":
-                    setTheme(R.style.AppThemeGreenRed);
+                    setTheme(R.style.Theme_App_GreenRed);
                     break;
 
                 // Black
                 case "blue_orange_black":
-                    setTheme(R.style.AppThemeBlueOrangeBlack);
+                    setTheme(R.style.Theme_App_BlueOrangeBlack);
                     break;
                 case "orange_blue_black":
-                    setTheme(R.style.AppThemeOrangeBlueBlack);
+                    setTheme(R.style.Theme_App_OrangeBlueBlack);
                     break;
                 case "yellow_purple_black":
-                    setTheme(R.style.AppThemeYellowPurpleBlack);
+                    setTheme(R.style.Theme_App_YellowPurpleBlack);
                     break;
                 case "purple_yellow_black":
-                    setTheme(R.style.AppThemePurpleYellowBlack);
+                    setTheme(R.style.Theme_App_PurpleYellowBlack);
                     break;
                 case "red_green_black":
-                    setTheme(R.style.AppThemeRedGreenBlack);
+                    setTheme(R.style.Theme_App_RedGreenBlack);
                     break;
                 case "green_red_black":
-                    setTheme(R.style.AppThemeGreenRedBlack);
+                    setTheme(R.style.Theme_App_GreenRedBlack);
                     break;
 
                 // Grey
                 case "grey_light":
-                    setTheme(R.style.AppThemeGreySteelBlue);
+                    setTheme(R.style.Theme_App_GreySteelBlue);
                     break;
                 case "grey_dark":
-                    setTheme(R.style.AppThemeGreySteelBlue);
+                    setTheme(R.style.Theme_App_GreySteelBlue);
                     break;
 
                 // Black
                 case "black":
-                    setTheme(R.style.AppThemeBlack);
+                    setTheme(R.style.Theme_App_Black);
                     break;
 
                 case "black_and_white":
-                    setTheme(R.style.AppThemeBlackAndWhite);
+                    setTheme(R.style.Theme_App_BlackAndWhite);
                     break;
 
                 // System
@@ -198,55 +198,55 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                     }
                 case "blue_orange_system":
                     setTheme(night
-                            ? R.style.AppThemeBlueOrange : R.style.AppThemeBlueOrange);
+                            ? R.style.Theme_App_BlueOrange : R.style.Theme_App_BlueOrange);
                     break;
                 case "blue_orange_system_black":
                     setTheme(night
-                            ? R.style.AppThemeBlueOrangeBlack : R.style.AppThemeBlueOrange);
+                            ? R.style.Theme_App_BlueOrangeBlack : R.style.Theme_App_BlueOrange);
                     break;
                 case "orange_blue_system":
                     setTheme(night
-                            ? R.style.AppThemeOrangeBlue : R.style.AppThemeOrangeBlue);
+                            ? R.style.Theme_App_OrangeBlue : R.style.Theme_App_OrangeBlue);
                     break;
                 case "orange_blue_system_black":
                     setTheme(night
-                            ? R.style.AppThemeOrangeBlueBlack : R.style.AppThemeOrangeBlue);
+                            ? R.style.Theme_App_OrangeBlueBlack : R.style.Theme_App_OrangeBlue);
                     break;
                 case "yellow_purple_system":
                     setTheme(night
-                            ? R.style.AppThemeYellowPurple : R.style.AppThemeYellowPurple);
+                            ? R.style.Theme_App_YellowPurple : R.style.Theme_App_YellowPurple);
                     break;
                 case "yellow_purple_system_black":
                     setTheme(night
-                            ? R.style.AppThemeYellowPurpleBlack : R.style.AppThemeYellowPurple);
+                            ? R.style.Theme_App_YellowPurpleBlack : R.style.Theme_App_YellowPurple);
                     break;
                 case "purple_yellow_system":
                     setTheme(night
-                            ? R.style.AppThemePurpleYellow : R.style.AppThemePurpleYellow);
+                            ? R.style.Theme_App_PurpleYellow : R.style.Theme_App_PurpleYellow);
                     break;
                 case "purple_yellow_system_black":
                     setTheme(night
-                            ? R.style.AppThemePurpleYellowBlack : R.style.AppThemePurpleYellow);
+                            ? R.style.Theme_App_PurpleYellowBlack : R.style.Theme_App_PurpleYellow);
                     break;
                 case "red_green_system":
                     setTheme(night
-                            ? R.style.AppThemeRedGreen : R.style.AppThemeRedGreen);
+                            ? R.style.Theme_App_RedGreen : R.style.Theme_App_RedGreen);
                     break;
                 case "red_green_system_black":
                     setTheme(night
-                            ? R.style.AppThemeRedGreenBlack : R.style.AppThemeRedGreen);
+                            ? R.style.Theme_App_RedGreenBlack : R.style.Theme_App_RedGreen);
                     break;
                 case "green_red_system":
                     setTheme(night
-                            ? R.style.AppThemeGreenRed : R.style.AppThemeGreenRed);
+                            ? R.style.Theme_App_GreenRed : R.style.Theme_App_GreenRed);
                     break;
                 case "green_red_system_black":
                     setTheme(night
-                            ? R.style.AppThemeGreenRedBlack : R.style.AppThemeGreenRed);
+                            ? R.style.Theme_App_GreenRedBlack : R.style.Theme_App_GreenRed);
                     break;
                 case "grey_system":
                     setTheme(night
-                            ? R.style.AppThemeGreySteelBlue : R.style.AppThemeGreySteelBlue);
+                            ? R.style.Theme_App_GreySteelBlue : R.style.Theme_App_GreySteelBlue);
                     break;
             }
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index f319078412..c0556a1129 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -41,7 +41,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
         getSupportFragmentManager().addOnBackStackChangedListener(this);
 
         if (!Log.isSupportedDevice() && Helper.isPlayStoreInstall()) {
-            setTheme(R.style.AppThemeBlueOrange);
+            setTheme(R.style.Theme_App_BlueOrange);
             super.onCreate(savedInstanceState);
             setContentView(R.layout.activity_unsupported);
             return;
@@ -181,7 +181,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
             else
                 prefs.edit().putBoolean("compact", true).apply();
 
-            setTheme(R.style.AppThemeBlueOrange);
+            setTheme(R.style.Theme_App_BlueOrange);
             super.onCreate(savedInstanceState);
             setContentView(R.layout.activity_main);
 
diff --git a/app/src/main/res/layout/action_bar.xml b/app/src/main/res/layout/action_bar.xml
index 2797d656a7..464af4f970 100644
--- a/app/src/main/res/layout/action_bar.xml
+++ b/app/src/main/res/layout/action_bar.xml
@@ -11,7 +11,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:text="Title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+        android:textAppearance="?textAppearanceHeadline6"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -23,7 +23,7 @@
         android:ellipsize="middle"
         android:singleLine="true"
         android:text="Subtitle"
-        android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle"
+        android:textAppearance="?textAppearanceSubtitle1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title" />
diff --git a/app/src/main/res/layout/action_button_text.xml b/app/src/main/res/layout/action_button_text.xml
index 63757fad9d..4d9f804493 100644
--- a/app/src/main/res/layout/action_button_text.xml
+++ b/app/src/main/res/layout/action_button_text.xml
@@ -6,7 +6,7 @@
 
     <ImageButton
         android:id="@+id/button"
-        style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+        style="?toolbarNavigationButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index 491779ec6a..936871e9bb 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -403,10 +403,10 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:tint="?attr/colorWarning"
         app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
         app:layout_constraintTop_toTopOf="@id/tvError"
-        app:srcCompat="@drawable/twotone_info_24" />
+        app:srcCompat="@drawable/twotone_info_24"
+        app:tint="?attr/colorWarning" />
 
     <View
         android:id="@+id/paddingEnd"
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index bf41aa7391..915452e373 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -67,10 +67,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
-            android:tint="?attr/colorWarning"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/twotone_warning_24" />
+            app:srcCompat="@drawable/twotone_warning_24"
+            app:tint="?attr/colorWarning" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index aeed29bf03..adeb84a1a5 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppThemeBase" parent="Theme.MaterialComponents.DayNight">
+    <style name="Theme.App.Base" parent="Theme.MaterialComponents.DayNight">
         <item name="themeName">dark</item>
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowAnimationStyle">@style/activityAnimationStyle</item>
@@ -34,8 +34,8 @@
         <item name="activatableItemBackground">@drawable/activatable_item_background_dark</item>
 
         <item name="android:checkboxStyle">@style/checkboxStyle</item>
-        <item name="android:buttonStyle">@style/buttonStyle</item>
-        <item name="android:buttonStyleSmall">@style/buttonStyleSmall</item>
+        <item name="android:buttonStyle">@style/Widget.App.Button</item>
+        <item name="android:buttonStyleSmall">@style/Widget.App.Button.Small</item>
         <item name="android:buttonStyleToggle">@style/buttonStyleToggle</item>
         <item name="android:radioButtonStyle">@style/radioButtonStyle</item>
 
@@ -45,9 +45,9 @@
         <item name="android:scrollbarFadeDuration">5000</item>
     </style>
 
-    <style name="AppThemeBlueOrange" parent="AppThemeBase">
+    <style name="Theme.App.BlueOrange" parent="Theme.App.Base">
         <item name="colorPrimary">@color/darkBluePrimary</item>
-        <item name="colorPrimary">@color/darkBluePrimaryDark</item>
+        <item name="colorPrimary">@color/darkBluePrimaryVariant</item>
         <item name="colorSecondary">@color/darkAmberSecondary</item>
 
         <item name="colorUnreadHighlight">@color/darkAmberSecondary</item>
@@ -58,9 +58,9 @@
         <item name="colorInfoBackground">@color/darkBluePrimary</item>
     </style>
 
-    <style name="AppThemeOrangeBlue" parent="AppThemeBase">
+    <style name="Theme.App.OrangeBlue" parent="Theme.App.Base">
         <item name="colorPrimary">@color/darkAmberPrimary</item>
-        <item name="colorPrimary">@color/darkAmberPrimaryDark</item>
+        <item name="colorPrimary">@color/darkAmberPrimaryVariant</item>
         <item name="colorSecondary">@color/darkBlueSecondary</item>
 
         <item name="colorUnreadHighlight">@color/darkBlueSecondary</item>
@@ -71,9 +71,9 @@
         <item name="colorInfoBackground">@color/darkAmberPrimary</item>
     </style>
 
-    <style name="AppThemeYellowPurple" parent="AppThemeBase">
+    <style name="Theme.App.YellowPurple" parent="Theme.App.Base">
         <item name="colorPrimary">@color/darkYellowPrimary</item>
-        <item name="colorPrimary">@color/darkYellowPrimaryDark</item>
+        <item name="colorPrimary">@color/darkYellowPrimaryVariant</item>
         <item name="colorSecondary">@color/darkPurpleSecondary</item>
 
         <item name="colorUnreadHighlight">@color/darkPurpleSecondary</item>
@@ -86,9 +86,9 @@
         <item name="android:textColorLink">@color/darkPurpleSecondary</item>
     </style>
 
-    <style name="AppThemePurpleYellow" parent="AppThemeBase">
+    <style name="Theme.App.PurpleYellow" parent="Theme.App.Base">
         <item name="colorPrimary">@color/darkPurplePrimary</item>
-        <item name="colorPrimary">@color/darkPurplePrimaryDark</item>
+        <item name="colorPrimary">@color/darkPurplePrimaryVariant</item>
         <item name="colorSecondary">@color/darkYellowSecondary</item>
 
         <item name="colorUnreadHighlight">@color/darkYellowSecondary</item>
@@ -101,9 +101,9 @@
         <item name="android:textColorLink">@color/darkYellowSecondary</item>
     </style>
 
-    <style name="AppThemeRedGreen" parent="AppThemeBase">
+    <style name="Theme.App.RedGreen" parent="Theme.App.Base">
         <item name="colorPrimary">@color/darkRedPrimary</item>
-        <item name="colorPrimary">@color/darkRedPrimaryDark</item>
+        <item name="colorPrimary">@color/darkRedPrimaryVariant</item>
         <item name="colorSecondary">@color/darkGreenSecondary</item>
 
         <item name="colorUnreadHighlight">@color/darkGreenSecondary</item>
@@ -116,9 +116,9 @@
         <item name="android:textColorLink">@color/darkGreenSecondary</item>
     </style>
 
-    <style name="AppThemeGreenRed" parent="AppThemeBase">
+    <style name="Theme.App.GreenRed" parent="Theme.App.Base">
         <item name="colorPrimary">@color/darkGreenPrimary</item>
-        <item name="colorPrimary">@color/darkGreenPrimaryDark</item>
+        <item name="colorPrimary">@color/darkGreenPrimaryVariant</item>
         <item name="colorSecondary">@color/darkRedSecondary</item>
 
         <item name="colorUnreadHighlight">@color/darkRedSecondary</item>
@@ -133,37 +133,37 @@
 
     <!-- Black -->
 
-    <style name="AppThemeBlueOrangeBlack" parent="AppThemeBlueOrange">
+    <style name="Theme.App.BlueOrangeBlack" parent="Theme.App.BlueOrange">
         <item name="themeName">black</item>
         <item name="android:windowBackground">@drawable/black_background</item>
         <item name="colorDrawerBackground">@color/black</item>
     </style>
 
-    <style name="AppThemeOrangeBlueBlack" parent="AppThemeOrangeBlue">
+    <style name="Theme.App.OrangeBlueBlack" parent="Theme.App.OrangeBlue">
         <item name="themeName">black</item>
         <item name="android:windowBackground">@drawable/black_background</item>
         <item name="colorDrawerBackground">@color/black</item>
     </style>
 
-    <style name="AppThemeYellowPurpleBlack" parent="AppThemeYellowPurple">
+    <style name="Theme.App.YellowPurpleBlack" parent="Theme.App.YellowPurple">
         <item name="themeName">black</item>
         <item name="android:windowBackground">@drawable/black_background</item>
         <item name="colorDrawerBackground">@color/black</item>
     </style>
 
-    <style name="AppThemePurpleYellowBlack" parent="AppThemePurpleYellow">
+    <style name="Theme.App.PurpleYellowBlack" parent="Theme.App.PurpleYellow">
         <item name="themeName">black</item>
         <item name="android:windowBackground">@drawable/black_background</item>
         <item name="colorDrawerBackground">@color/black</item>
     </style>
 
-    <style name="AppThemeRedGreenBlack" parent="AppThemeRedGreen">
+    <style name="Theme.App.RedGreenBlack" parent="Theme.App.RedGreen">
         <item name="themeName">black</item>
         <item name="android:windowBackground">@drawable/black_background</item>
         <item name="colorDrawerBackground">@color/black</item>
     </style>
 
-    <style name="AppThemeGreenRedBlack" parent="AppThemeGreenRed">
+    <style name="Theme.App.GreenRedBlack" parent="Theme.App.GreenRed">
         <item name="themeName">black</item>
         <item name="android:windowBackground">@drawable/black_background</item>
         <item name="colorDrawerBackground">@color/black</item>
@@ -171,10 +171,10 @@
 
     <!-- Other -->
 
-    <style name="AppThemeBlack" parent="AppThemeBlueOrange">
+    <style name="Theme.App.Black" parent="Theme.App.BlueOrange">
         <item name="themeName">black</item>
         <item name="colorPrimary">@color/blackPrimary</item>
-        <item name="colorPrimary">@color/blackPrimaryDark</item>
+        <item name="colorPrimary">@color/blackPrimaryVariant</item>
         <item name="colorSecondary">@color/blackSecondary</item>
 
         <item name="colorInfoForeground">@color/white</item>
@@ -186,10 +186,10 @@
 
 
 
-    <style name="AppThemeGreySteelBlue" parent="AppThemeBase">
+    <style name="Theme.App.GreySteelBlue" parent="Theme.App.Base">
         <item name="themeName">black</item>
         <item name="colorPrimary">@color/greyPrimary</item>
-        <item name="colorPrimary">@color/greyPrimaryDark</item>
+        <item name="colorPrimary">@color/greyPrimaryVariant</item>
         <item name="colorSecondary">@color/greySecondary</item>
 
         <item name="colorUnreadHighlight">@color/greyAccentLight</item>
@@ -197,7 +197,7 @@
 
         <item name="colorActionBackground">@color/greyPrimary</item>
 
-        <item name="colorFabBackground">@color/greyAccentDark</item>
+        <item name="colorFabBackground">@color/greySecondaryVariant</item>
 
         <item name="colorInfoForeground">@color/white</item>
         <item name="colorInfoBackground">@color/greyPrimary</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5d8c6ea552..cb4369ae30 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -57,80 +57,80 @@
 
     <!-- Light blue 600 / Amber 600 -->
     <color name="lightBluePrimary">#039be5</color>
-    <color name="lightBluePrimaryDark">#006db3</color>
+    <color name="lightBluePrimaryVariant">#006db3</color>
     <color name="lightAmberSecondary">#ffb300</color>
-    <color name="lightAmberAccentDark">#c68400</color>
+    <color name="lightAmberSecondaryVariant">#c68400</color>
 
     <!-- Amber 600 / Light blue 600 -->
     <color name="lightAmberPrimary">#ffb300</color>
-    <color name="lightAmberPrimaryDark">#c68400</color>
+    <color name="lightAmberPrimaryVariant">#c68400</color>
     <color name="lightBlueSecondary">#039be5</color>
 
     <!-- Yellow 600 / Purple 600 -->
     <color name="lightYellowPrimary">#fdd835</color>
-    <color name="lightYellowPrimaryDark">#c6a700</color>
+    <color name="lightYellowPrimaryVariant">#c6a700</color>
     <color name="lightPurpleSecondary">#8e24aa</color>
 
     <!-- Purple 600 / Yellow 800 -->
     <color name="lightPurplePrimary">#8e24aa</color>
-    <color name="lightPurplePrimaryDark">#5c007a</color>
+    <color name="lightPurplePrimaryVariant">#5c007a</color>
     <color name="lightYellowSecondary">#f9a825</color>
 
     <!-- Red 600 / Green 600 -->
     <color name="lightRedPrimary">#e53935</color>
-    <color name="lightRedPrimaryDark">#ab000d</color>
+    <color name="lightRedPrimaryVariant">#ab000d</color>
     <color name="lightGreenSecondary">#43a047</color>
 
     <!-- Green 600 / Red 600 -->
     <color name="lightGreenPrimary">#43a047</color>
-    <color name="lightGreenPrimaryDark">#00701a</color>
+    <color name="lightGreenPrimaryVariant">#00701a</color>
     <color name="lightRedSecondary">#e53935</color>
 
     <!-- Light blue 900 / Amber 600 -->
     <color name="darkBluePrimary">#01579b</color>
-    <color name="darkBluePrimaryDark">#002f6c</color>
+    <color name="darkBluePrimaryVariant">#002f6c</color>
     <color name="darkAmberSecondary">#ffb300</color>
 
     <!-- Amber 900 / Light blue 300-->
     <color name="darkAmberPrimary">#ff6f00</color>
-    <color name="darkAmberPrimaryDark">#c43e00</color>
+    <color name="darkAmberPrimaryVariant">#c43e00</color>
     <color name="darkBlueSecondary">#4fc3f7</color>
 
     <!-- Yellow 900 / Purple 300 -->
     <color name="darkYellowPrimary">#f57f17</color>
-    <color name="darkYellowPrimaryDark">#bc5100</color>
+    <color name="darkYellowPrimaryVariant">#bc5100</color>
     <color name="darkPurpleSecondary">#ba68c8</color>
 
     <!-- Purple 900 / Yellow 600 -->
     <color name="darkPurplePrimary">#4a148c</color>
-    <color name="darkPurplePrimaryDark">#12005e</color>
+    <color name="darkPurplePrimaryVariant">#12005e</color>
     <color name="darkYellowSecondary">#fdd835</color>
 
     <!-- Red 900 / Green 300 -->
     <color name="darkRedPrimary">#b71c1c</color>
-    <color name="darkRedPrimaryDark">#7f0000</color>
+    <color name="darkRedPrimaryVariant">#7f0000</color>
     <color name="darkGreenSecondary">#81c784</color>
 
     <!-- Green 900 / Red 300 -->
     <color name="darkGreenPrimary">#1b5e20</color>
-    <color name="darkGreenPrimaryDark">#003300</color>
+    <color name="darkGreenPrimaryVariant">#003300</color>
     <color name="darkRedSecondary">#e57373</color>
 
     <!-- Grey 800 / Amber 800 -->
     <color name="blackPrimary">#424242</color>
-    <color name="blackPrimaryDark">#1b1b1b</color>
+    <color name="blackPrimaryVariant">#1b1b1b</color>
     <color name="blackSecondary">#ff8f00</color>
 
     <!-- Grey 900 -->
     <color name="blackAndWhitePrimary">#212121</color>
-    <color name="blackAndWhitePrimaryDark">#000000</color>
+    <color name="blackAndWhitePrimaryVariant">#000000</color>
     <color name="blackAndWhitePrimaryLight">#484848</color>
 
     <!-- Grey 800 / Blue grey 300 -->
     <color name="greyPrimary">#424242</color>
-    <color name="greyPrimaryDark">#1b1b1b</color>
+    <color name="greyPrimaryVariant">#1b1b1b</color>
     <color name="greySecondary">#90a4ae</color>
-    <color name="greyAccentDark">#62757f</color>
+    <color name="greySecondaryVariant">#62757f</color>
     <color name="greyAccentLight">#c1d5e0</color>
 
     <!-- default: #323232 -->
@@ -138,6 +138,7 @@
 
     <color name="white">#ffffffff</color>
     <color name="black">#ff000000</color>
+    <color name="grey_200">#ffcfd8dc</color>
     <color name="grey">#ff7f7f7f</color>
     <color name="transparent">#00000000</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 595cdcd257..2e8b01f9d1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,16 +19,53 @@
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
-    <style name="buttonStyle" parent="Widget.MaterialComponents.Button">
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Button</item>
+    <!--Top App Bar-->
+
+    <style name="Widget.App.Toolbar" parent="Widget.MaterialComponents.Toolbar.PrimarySurface">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Toolbar</item>
+        <item name="titleTextAppearance">@style/TextAppearance.App.Headline6</item>
+        <item name="subtitleTextAppearance">@style/TextAppearance.App.Subtitle1</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Toolbar" parent="">
+        <item name="colorPrimary">?colorPrimary</item>
+        <item name="colorPrimaryVariant">?colorPrimaryVariant</item>
+        <item name="colorOnPrimary">@color/white</item>
+    </style>
+
+    <!--Button-->
+
+    <style name="Widget.App.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button.TextButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.App.Button</item>
+    </style>
+
+    <style name="Widget.App.Button.OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button.TextButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.App.Button</item>
+    </style>
+
+    <style name="Widget.App.Button" parent="Widget.MaterialComponents.Button">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button</item>
+        <item name="android:textAppearance">@style/TextAppearance.App.Button</item>
     </style>
 
-    <style name="buttonStyleSmall" parent="Widget.MaterialComponents.Button">
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Body2</item>
+    <style name="Widget.App.Button.Small" parent="Widget.App.Button">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Button</item>
+        <item name="android:textAppearance">@style/TextAppearance.App.Button.Small</item>
         <item name="android:minHeight">0dp</item>
         <item name="android:minWidth">0dp</item>
     </style>
 
+    <style name="ThemeOverlay.App.Button.TextButton" parent="">
+        <item name="colorPrimary">?colorSecondary</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Button" parent="">
+        <item name="colorPrimary">@color/grey_200</item>
+        <item name="colorOnPrimary">@color/black</item>
+    </style>
+
     <style name="buttonStyleToggle" parent="Widget.MaterialComponents.Button">
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 076274a4d5..e8ba41c64e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -22,7 +22,7 @@
     <attr name="colorInfoBackground" format="reference" />
     <attr name="activatableItemBackground" format="reference" />
 
-    <style name="AppThemeBase" parent="Theme.MaterialComponents.DayNight">
+    <style name="Theme.App.Base" parent="Theme.MaterialComponents.DayNight">
         <item name="themeName">light</item>
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowAnimationStyle">@style/activityAnimationStyle</item>
@@ -52,11 +52,10 @@
 
         <item name="activatableItemBackground">@drawable/activatable_item_background_light</item>
 
-        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Primary</item>
+        <item name="toolbarStyle">@style/Widget.App.Toolbar</item>
 
         <item name="android:checkboxStyle">@style/checkboxStyle</item>
-        <item name="android:buttonStyle">@style/buttonStyle</item>
-        <item name="android:buttonStyleSmall">@style/buttonStyleSmall</item>
+        <item name="android:buttonStyleSmall">@style/Widget.App.Button.Small</item>
         <item name="android:buttonStyleToggle">@style/buttonStyleToggle</item>
         <item name="android:radioButtonStyle">@style/radioButtonStyle</item>
 
@@ -64,17 +63,25 @@
         <item name="android:scrollbarThumbVertical">@drawable/scroll_thumb</item>
         <item name="android:scrollbarTrackVertical">@drawable/scroll_track</item>
         <item name="android:scrollbarFadeDuration">5000</item>
+
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorOnSecondary">@color/white</item>
+
+        <item name="borderlessButtonStyle">@style/Widget.App.Button.TextButton</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.App.Button.OutlinedButton</item>
+        <item name="materialButtonStyle">@style/Widget.App.Button</item>
     </style>
 
 
     <!-- Light -->
 
-    <style name="AppThemeBlueOrange" parent="AppThemeBase">
+    <style name="Theme.App.BlueOrange" parent="Theme.App.Base">
         <item name="colorPrimary">@color/lightBluePrimary</item>
-        <item name="colorPrimaryVariant">@color/lightBluePrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/lightBluePrimaryVariant</item>
         <item name="colorSecondary">@color/lightAmberSecondary</item>
+        <item name="colorSecondary">@color/lightAmberSecondaryVariant</item>
 
-        <item name="colorUnreadHighlight">@color/lightAmberAccentDark</item>
+        <item name="colorUnreadHighlight">@color/lightAmberSecondaryVariant</item>
 
         <item name="colorWarning">@color/lightAmberSecondary</item>
 
@@ -83,12 +90,12 @@
         <item name="colorInfoForeground">@color/white</item>
         <item name="colorInfoBackground">@color/lightBluePrimary</item>
 
-        <item name="android:textColorLink">@color/lightAmberAccentDark</item>
+        <item name="android:textColorLink">@color/lightAmberSecondaryVariant</item>
     </style>
 
-    <style name="AppThemeOrangeBlue" parent="AppThemeBase">
+    <style name="Theme.App.OrangeBlue" parent="Theme.App.Base">
         <item name="colorPrimary">@color/lightAmberPrimary</item>
-        <item name="colorPrimaryVariant">@color/lightAmberPrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/lightAmberPrimaryVariant</item>
         <item name="colorSecondary">@color/lightBlueSecondary</item>
 
         <item name="colorUnreadHighlight">@color/lightBlueSecondary</item>
@@ -101,9 +108,9 @@
         <item name="android:textColorLink">@color/lightBlueSecondary</item>
     </style>
 
-    <style name="AppThemeYellowPurple" parent="AppThemeBase">
+    <style name="Theme.App.YellowPurple" parent="Theme.App.Base">
         <item name="colorPrimary">@color/lightYellowPrimary</item>
-        <item name="colorPrimaryVariant">@color/lightYellowPrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/lightYellowPrimaryVariant</item>
         <item name="colorSecondary">@color/lightPurpleSecondary</item>
 
         <item name="colorUnreadHighlight">@color/lightPurpleSecondary</item>
@@ -116,9 +123,9 @@
         <item name="android:textColorLink">@color/lightPurpleSecondary</item>
     </style>
 
-    <style name="AppThemePurpleYellow" parent="AppThemeBase">
+    <style name="Theme.App.PurpleYellow" parent="Theme.App.Base">
         <item name="colorPrimary">@color/lightPurplePrimary</item>
-        <item name="colorPrimaryVariant">@color/lightPurplePrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/lightPurplePrimaryVariant</item>
         <item name="colorSecondary">@color/lightYellowSecondary</item>
 
         <item name="colorUnreadHighlight">@color/lightYellowSecondary</item>
@@ -131,9 +138,9 @@
         <item name="android:textColorLink">@color/lightYellowSecondary</item>
     </style>
 
-    <style name="AppThemeRedGreen" parent="AppThemeBase">
+    <style name="Theme.App.RedGreen" parent="Theme.App.Base">
         <item name="colorPrimary">@color/lightRedPrimary</item>
-        <item name="colorPrimaryVariant">@color/lightRedPrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/lightRedPrimaryVariant</item>
         <item name="colorSecondary">@color/lightGreenSecondary</item>
 
         <item name="colorUnreadHighlight">@color/lightGreenSecondary</item>
@@ -146,9 +153,9 @@
         <item name="android:textColorLink">@color/lightGreenSecondary</item>
     </style>
 
-    <style name="AppThemeGreenRed" parent="AppThemeBase">
+    <style name="Theme.App.GreenRed" parent="Theme.App.Base">
         <item name="colorPrimary">@color/lightGreenPrimary</item>
-        <item name="colorPrimaryVariant">@color/lightGreenPrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/lightGreenPrimaryVariant</item>
         <item name="colorSecondary">@color/lightRedSecondary</item>
 
         <item name="colorUnreadHighlight">@color/lightRedSecondary</item>
@@ -164,12 +171,12 @@
     <!-- Dark -->
 
 
-    <style name="AppThemeGreySteelBlue" parent="AppThemeBase">
+    <style name="Theme.App.GreySteelBlue" parent="Theme.App.Base">
         <item name="colorPrimary">@color/greyPrimary</item>
-        <item name="colorPrimaryVariant">@color/greyPrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/greyPrimaryVariant</item>
         <item name="colorSecondary">@color/greySecondary</item>
 
-        <item name="colorUnreadHighlight">@color/greyAccentDark</item>
+        <item name="colorUnreadHighlight">@color/greySecondaryVariant</item>
 
         <item name="colorEncrypt">@color/colorEncryptDark</item>
 
@@ -190,24 +197,24 @@
     </style>
 
     <!-- Black -->
-    <style name="AppThemeBlack" parent="AppThemeBlueOrange"/>
+    <style name="Theme.App.Black" parent="Theme.App.BlueOrange"/>
 
-    <style name="AppThemeBlueOrangeBlack" parent="AppThemeBlueOrange" />
+    <style name="Theme.App.BlueOrangeBlack" parent="Theme.App.BlueOrange" />
 
-    <style name="AppThemeOrangeBlueBlack" parent="AppThemeOrangeBlue" />
+    <style name="Theme.App.OrangeBlueBlack" parent="Theme.App.OrangeBlue" />
 
-    <style name="AppThemeYellowPurpleBlack" parent="AppThemeYellowPurple" />
+    <style name="Theme.App.YellowPurpleBlack" parent="Theme.App.YellowPurple" />
 
-    <style name="AppThemePurpleYellowBlack" parent="AppThemePurpleYellow" />
+    <style name="Theme.App.PurpleYellowBlack" parent="Theme.App.PurpleYellow" />
 
-    <style name="AppThemeRedGreenBlack" parent="AppThemeRedGreen" />
+    <style name="Theme.App.RedGreenBlack" parent="Theme.App.RedGreen" />
 
-    <style name="AppThemeGreenRedBlack" parent="AppThemeGreenRed" />
+    <style name="Theme.App.GreenRedBlack" parent="Theme.App.GreenRed" />
 
 
-    <style name="AppThemeBlackAndWhite" parent="AppThemeBlack">
+    <style name="Theme.App.BlackAndWhite" parent="Theme.App.Black">
         <item name="colorPrimary">@color/blackAndWhitePrimary</item>
-        <item name="colorPrimary">@color/blackAndWhitePrimaryDark</item>
+        <item name="colorPrimary">@color/blackAndWhitePrimaryVariant</item>
         <item name="colorSecondary">@color/white</item>
 
         <item name="android:textColor">@color/bw_textcolor</item>
diff --git a/app/src/main/res/values/type.xml b/app/src/main/res/values/type.xml
new file mode 100644
index 0000000000..148cb13217
--- /dev/null
+++ b/app/src/main/res/values/type.xml
@@ -0,0 +1,96 @@
+<!--
+~ Copyright (C) 2019 The Android Open Source Project
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~      http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<resources>
+
+    <!--Typography-->
+
+    <!--Material’s type system supports 13 categories that, when combined, form the typescale. -->
+    <!--This typescale is evident in the variety of text styles and sizes that appear on screen, -->
+    <!--ranging from body copy to buttons. Type appears across the UI, in places such as in -->
+    <!--components and on surfaces.-->
+
+    <!--These styles should be used throughout your app when creating text views so all your -->
+    <!--text is consistently styled and easily updated if design or product needs change. Each -->
+    <!--style in the type scale can be customized by defining a style and overriding that -->
+    <!--style's Material Theme attribute (?textAppearanceHeadline1, ?textAppearanceBody2, etc.) -->
+    <!--in your app's theme. In this project, type attributes have already been overridden in -->
+    <!--themes.xml and are set to the styles in this file, type.xml. These ?textAppearance* -->
+    <!--theme attributes should be used in your layouts to set a TextView’s appearance instead -->
+    <!--of fully qualified style references and in favor of manually setting text properties.-->
+
+    <!--Type on Android is themed by defining a custom TextAppearance for each type scale style. -->
+    <!--Use standard TextAppearance attributes such as textSize, textColor, fontFamily, -->
+    <!--letterSpacing, etc. to define a custom appearance for each and see how they are -->
+    <!--applied globally across your app.-->
+
+    <style name="TextAppearance.App.Headline1" parent="TextAppearance.MaterialComponents.Headline1">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Headline2" parent="TextAppearance.MaterialComponents.Headline2">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Headline3" parent="TextAppearance.MaterialComponents.Headline3">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Headline4" parent="TextAppearance.MaterialComponents.Headline4">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Headline5" parent="TextAppearance.MaterialComponents.Headline5">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Headline6" parent="TextAppearance.MaterialComponents.Headline6">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Body1" parent="TextAppearance.MaterialComponents.Body1">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Body2" parent="TextAppearance.MaterialComponents.Body2">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Button" parent="TextAppearance.MaterialComponents.Button">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Button.Small" parent="TextAppearance.MaterialComponents.Body2">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Caption" parent="TextAppearance.MaterialComponents.Caption">
+        <!--Your custom type style here-->
+    </style>
+
+    <style name="TextAppearance.App.Overline" parent="TextAppearance.MaterialComponents.Overline">
+        <!--Your custom type style here-->
+    </style>
+
+</resources>
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index fd0f26c345..6a2a7afb89 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -108,7 +108,7 @@
         android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppThemeBlueOrangeLight">
+        android:theme="@style/Theme.App.BlueOrangeLight">
         <!-- https://developer.samsung.com/samsung-dex/modify-optimizing.html -->
 
         <!-- https://developer.android.com/guide/webapps/managing-webview#metrics -->