diff --git a/app/src/main/java/com/kunzisoft/keepass/education/Education.kt b/app/src/main/java/com/kunzisoft/keepass/education/Education.kt
index 782b7428f..81e8d9b40 100644
--- a/app/src/main/java/com/kunzisoft/keepass/education/Education.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/education/Education.kt
@@ -98,7 +98,7 @@ open class Education(val activity: Activity) {
     }
 
     protected fun getCircleColor(): Int {
-        val typedArray = activity.obtainStyledAttributes(intArrayOf(R.attr.educationCircleColor))
+        val typedArray = activity.obtainStyledAttributes(intArrayOf(R.attr.colorPrimaryContainer))
         val colorControl = typedArray.getColor(0, Color.GREEN)
         typedArray.recycle()
         return colorControl
@@ -109,7 +109,7 @@ open class Education(val activity: Activity) {
     }
 
     protected fun getTextColor(): Int {
-        val typedArray = activity.obtainStyledAttributes(intArrayOf(R.attr.educationTextColor))
+        val typedArray = activity.obtainStyledAttributes(intArrayOf(R.attr.colorOnPrimaryContainer))
         val colorControl = typedArray.getColor(0, Color.WHITE)
         typedArray.recycle()
         return colorControl
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 5dbb9e209..53f65a9da 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -43,7 +43,8 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_alignBottom="@+id/item_attachment_thumbnail"
-        android:background="?attr/cardBackgroundTransparentColor">
+        android:alpha="0.8"
+        android:background="?attr/colorSurfaceContainer">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/item_attachment_broken"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c79dc6b63..809872a7d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -21,12 +21,8 @@
     <attr name="toolbarSpecialStyle" format="reference" />
     <attr name="toolbarActionStyle" format="reference" />
 
-    <attr name="cardBackgroundTransparentColor" format="reference|color" />
     <attr name="iconPreferenceColor" format="reference|color" />
 
-    <attr name="educationCircleColor" format="reference|color" />
-    <attr name="educationTextColor" format="reference|color" />
-
     <declare-styleable name="explanationDialog">
         <attr name="explanations" format="string" />
     </declare-styleable>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 89673f943..ebeac11c3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -221,6 +221,7 @@
     <color name="classic_theme_light_inverseOnSurface">#F0F1EB</color>
     <color name="classic_theme_light_inverseSurface">#2D2F31</color>
     <color name="classic_theme_light_inversePrimary">#4FC3F7</color>
+    <color name="classic_theme_light_textPrimary">@color/cyan</color>
 
     <color name="classic_theme_night_primary">#209BC6</color>
     <color name="classic_theme_night_primaryDark">@color/black_light</color>
@@ -254,6 +255,7 @@
     <color name="classic_theme_night_inverseOnSurface">#191B1C</color>
     <color name="classic_theme_night_inverseSurface">#DDE1E3</color>
     <color name="classic_theme_night_inversePrimary">#00486E</color>
+    <color name="classic_theme_night_textPrimary">@color/cyan_lightest</color>
 
     <!-- Divine -->
 
@@ -289,6 +291,7 @@
     <color name="divine_theme_light_inverseOnSurface">#F1EEEB</color>
     <color name="divine_theme_light_inverseSurface">#312F2D</color>
     <color name="divine_theme_light_inversePrimary">#F7924F</color>
+    <color name="divine_theme_light_textPrimary">@color/orange_dark</color>
 
     <color name="divine_theme_night_primary">@color/orange_darkest</color>
     <color name="divine_theme_night_primaryDark">@color/black</color>
@@ -322,6 +325,7 @@
     <color name="divine_theme_night_inverseOnSurface">#1C1A19</color>
     <color name="divine_theme_night_inverseSurface">#E3E0DD</color>
     <color name="divine_theme_night_inversePrimary">#6E3000</color>
+    <color name="divine_theme_night_textPrimary">@color/orange_lighter</color>
 
     <!-- Classic -->
 
@@ -357,6 +361,7 @@
     <color name="simple_theme_light_inverseOnSurface">#F0F1EB</color>
     <color name="simple_theme_light_inverseSurface">#2D2F31</color>
     <color name="simple_theme_light_inversePrimary">@color/blue_deep</color>
+    <color name="simple_theme_light_textPrimary">@color/grey_darker</color>
 
     <color name="simple_theme_night_primary">#1A66CC</color>
     <color name="simple_theme_night_primaryDark">@color/grey_slight</color>
@@ -390,6 +395,7 @@
     <color name="simple_theme_night_inverseOnSurface">#191B1C</color>
     <color name="simple_theme_night_inverseSurface">#DDE1E3</color>
     <color name="simple_theme_night_inversePrimary">#00486E</color>
+    <color name="simple_theme_night_textPrimary">@color/white</color>
 
     <!-- Moon -->
 
@@ -425,6 +431,7 @@
     <color name="moon_theme_light_inverseOnSurface">#F0F1EB</color>
     <color name="moon_theme_light_inverseSurface">#2D2F31</color>
     <color name="moon_theme_light_inversePrimary">@color/blue_deep</color>
+    <color name="moon_theme_light_textPrimary">@color/blue_darker</color>
 
     <color name="moon_theme_night_primary">@color/blue</color>
     <color name="moon_theme_night_primaryDark">@color/blue_dark</color>
@@ -458,6 +465,7 @@
     <color name="moon_theme_night_inverseOnSurface">#191B1C</color>
     <color name="moon_theme_night_inverseSurface">#DDE1E3</color>
     <color name="moon_theme_night_inversePrimary">#00486E</color>
+    <color name="moon_theme_night_textPrimary">@color/blue_lighter</color>
 
     <!-- Sun -->
 
@@ -493,6 +501,7 @@
     <color name="sun_theme_light_inverseOnSurface">#F0F1EB</color>
     <color name="sun_theme_light_inverseSurface">#312D2D</color>
     <color name="sun_theme_light_inversePrimary">@color/red_black</color>
+    <color name="sun_theme_light_textPrimary">@color/red_dark</color>
 
     <color name="sun_theme_night_primary">@color/red</color>
     <color name="sun_theme_night_primaryDark">@color/red_dark</color>
@@ -526,6 +535,7 @@
     <color name="sun_theme_night_inverseOnSurface">#1C1919</color>
     <color name="sun_theme_night_inverseSurface">#E3DDDD</color>
     <color name="sun_theme_night_inversePrimary">#6E0000</color>
+    <color name="sun_theme_night_textPrimary">@color/red_lighter</color>
 
     <!-- Reply -->
 
@@ -563,6 +573,7 @@
     <color name="reply_theme_light_inverseOnSurface">#F0F1EB</color>
     <color name="reply_theme_light_inverseSurface">#414445</color>
     <color name="reply_theme_light_inversePrimary">#243442</color>
+    <color name="reply_theme_light_textPrimary">#27343A</color>
 
     <color name="reply_theme_night_primary">#F9AA33</color>
     <color name="reply_theme_night_primaryDark">#1D272B</color>
@@ -596,6 +607,7 @@
     <color name="reply_theme_night_inverseOnSurface">#F0F1EB</color>
     <color name="reply_theme_night_inverseSurface">#414445</color>
     <color name="reply_theme_night_inversePrimary">#243442</color>
+    <color name="reply_theme_night_textPrimary">#F1F2F3</color>
 
     <!-- Kunzite -->
 
@@ -631,7 +643,7 @@
     <color name="purple_theme_light_inverseOnSurface">#EFEBF1</color>
     <color name="purple_theme_light_inverseSurface">#2F2D31</color>
     <color name="purple_theme_light_inversePrimary">#2F2442</color>
-    <color name="purple_theme_light_textPrimary">@color/purple_light</color>
+    <color name="purple_theme_light_textPrimary">@color/purple_dark</color>
 
     <color name="purple_theme_night_primary">@color/red_dark</color>
     <color name="purple_theme_night_primaryDark">@color/black_purple</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c4501d72a..d0e55bf71 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -81,8 +81,6 @@
         <item name="android:textAppearance">@style/KeepassDXStyle.TextAppearance</item>
         <item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
 
-        <item name="cardBackgroundTransparentColor">#DDFFFFFF</item>
-
         <item name="android:textColor">@color/text_color_light</item>
         <item name="android:textColorLink">@color/text_color_light</item>
         <item name="android:editTextColor">@color/grey_light</item>
@@ -117,10 +115,6 @@
         <item name="switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
         <item name="switchPreferenceCompatStyle">@style/KeepassDXStyle.SwitchPreference</item>
 
-        <!-- Education Hint -->
-        <item name="educationCircleColor">@color/green_lighter</item>
-        <item name="educationTextColor">@color/white</item>
-
         <!-- Edit Text -->
         <item name="textInputStyle">@style/KeepassDXStyle.TextInputLayout</item>
 
@@ -182,8 +176,6 @@
         <item name="android:textAppearance">@style/KeepassDXStyle.TextAppearance</item>
         <item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
 
-        <item name="cardBackgroundTransparentColor">@color/grey_dark_transparent</item>
-
         <item name="android:textColor">@color/text_color_night</item>
         <item name="android:textColorLink">@color/text_color_night</item>
         <item name="android:editTextColor">@color/white</item>
@@ -216,10 +208,6 @@
         <item name="switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
         <item name="switchPreferenceCompatStyle">@style/KeepassDXStyle.SwitchPreference</item>
 
-        <!-- Education Hint -->
-        <item name="educationCircleColor">@color/green_light</item>
-        <item name="educationTextColor">@color/white</item>
-
         <!-- Edit Text -->
         <item name="textInputStyle">@style/KeepassDXStyle.TextInputLayout</item>
 
diff --git a/app/src/main/res/values/styles_classic.xml b/app/src/main/res/values/styles_classic.xml
index e638660d2..a44fc097d 100644
--- a/app/src/main/res/values/styles_classic.xml
+++ b/app/src/main/res/values/styles_classic.xml
@@ -19,9 +19,7 @@
 -->
 <resources>
     <!-- Classic Clear Style -->
-    <style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Clear.v21" />
-    <style name="KeepassDXStyle.Clear.v21" parent="KeepassDXStyle.Clear.Base" />
-    <style name="KeepassDXStyle.Clear.Base" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Light" >
 
         <item name="colorPrimary">@color/classic_theme_light_primary</item>
         <item name="colorPrimaryDark">@color/classic_theme_light_primaryDark</item>
@@ -56,28 +54,21 @@
         <item name="colorOnSurfaceInverse">@color/classic_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/classic_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/classic_theme_light_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/cyan_lightest</item>
+        <item name="android:textColorPrimary">@color/classic_theme_light_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/white_grey_lighter_transparent</item>
-        <item name="educationCircleColor">@color/cyan_lighter</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorSecondary">@color/cyan_lighter</item>
-        <item name="android:textColorPrimary">@color/cyan</item>
-        <item name="android:background">@color/white_grey_lighter</item>
-        <item name="background">@color/white_grey_lighter</item>
+        <item name="colorSecondary">@color/classic_theme_light_secondary</item>
+        <item name="android:textColorPrimary">@color/classic_theme_light_textPrimary</item>
+        <item name="android:background">@color/classic_theme_light_background</item>
+        <item name="background">@color/classic_theme_light_background</item>
     </style>
 
     <!-- Classic Dark Style -->
-    <style name="KeepassDXStyle.Dark" parent="KeepassDXStyle.Dark.v21" />
-    <style name="KeepassDXStyle.Dark.v21" parent="KeepassDXStyle.Dark.Base" />
-    <style name="KeepassDXStyle.Dark.Base" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Dark" parent="KeepassDXStyle.Night" >
 
         <item name="colorPrimary">@color/classic_theme_night_primary</item>
         <item name="colorPrimaryDark">@color/classic_theme_night_primaryDark</item>
@@ -112,21 +103,16 @@
         <item name="colorOnSurfaceInverse">@color/classic_theme_night_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/classic_theme_night_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/classic_theme_night_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/cyan_lightest</item>
+        <item name="android:textColorPrimary">@color/classic_theme_night_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
-        <item name="educationCircleColor">@color/cyan</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorSecondary">@color/cyan_lighter</item>
-        <item name="android:textColorPrimary">@color/cyan_lightest</item>
-        <item name="android:background">@color/black_lighter</item>
-        <item name="background">@color/black_lighter</item>
+        <item name="colorSecondary">@color/classic_theme_night_secondary</item>
+        <item name="android:textColorPrimary">@color/classic_theme_night_textPrimary</item>
+        <item name="android:background">@color/classic_theme_night_background</item>
+        <item name="background">@color/classic_theme_night_background</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_divine.xml b/app/src/main/res/values/styles_divine.xml
index 99795cac8..2381c0588 100644
--- a/app/src/main/res/values/styles_divine.xml
+++ b/app/src/main/res/values/styles_divine.xml
@@ -56,28 +56,21 @@
         <item name="colorOnSurfaceInverse">@color/divine_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/divine_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/divine_theme_light_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/orange_light</item>
+        <item name="android:textColorPrimary">@color/divine_theme_light_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/white_transparent</item>
-        <item name="educationCircleColor">@color/orange</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorSecondary">@color/orange</item>
-        <item name="android:textColorPrimary">@color/grey_light</item>
-        <item name="android:background">@color/white</item>
-        <item name="background">@color/white</item>
+        <item name="colorSecondary">@color/divine_theme_light_secondary</item>
+        <item name="android:textColorPrimary">@color/divine_theme_light_textPrimary</item>
+        <item name="android:background">@color/divine_theme_light_background</item>
+        <item name="background">@color/divine_theme_light_background</item>
     </style>
 
     <!-- Black Style -->
-    <style name="KeepassDXStyle.Black" parent="KeepassDXStyle.Black.v21" />
-    <style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Black.Base" />
-    <style name="KeepassDXStyle.Black.Base" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Black" parent="KeepassDXStyle.Night" >
 
         <item name="colorPrimary">@color/divine_theme_night_primary</item>
         <item name="colorPrimaryDark">@color/divine_theme_night_primaryDark</item>
@@ -112,21 +105,16 @@
         <item name="colorOnSurfaceInverse">@color/divine_theme_night_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/divine_theme_night_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/divine_theme_night_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/orange_lighter</item>
+        <item name="android:textColorPrimary">@color/divine_theme_night_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
-        <item name="educationCircleColor">@color/orange_darker</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorSecondary">@color/orange_darker</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:background">@color/black_lighter</item>
-        <item name="background">@color/black_lighter</item>
+        <item name="colorSecondary">@color/divine_theme_night_secondary</item>
+        <item name="android:textColorPrimary">@color/divine_theme_night_textPrimary</item>
+        <item name="android:background">@color/divine_theme_night_background</item>
+        <item name="background">@color/divine_theme_night_background</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_kunzite.xml b/app/src/main/res/values/styles_kunzite.xml
index 67d6c69a2..1d01de4a9 100644
--- a/app/src/main/res/values/styles_kunzite.xml
+++ b/app/src/main/res/values/styles_kunzite.xml
@@ -19,9 +19,7 @@
 -->
 <resources>
     <!-- Light Purple Style -->
-    <style name="KeepassDXStyle.Purple" parent="KeepassDXStyle.Purple.v21" />
-    <style name="KeepassDXStyle.Purple.v21" parent="KeepassDXStyle.Purple.Base" />
-    <style name="KeepassDXStyle.Purple.Base" parent="KeepassDXStyle.Light">
+    <style name="KeepassDXStyle.Purple" parent="KeepassDXStyle.Light">
 
         <item name="colorPrimary">@color/purple_theme_light_primary</item>
         <item name="colorPrimaryDark">@color/purple_theme_light_primaryDark</item>
@@ -56,15 +54,10 @@
         <item name="colorOnSurfaceInverse">@color/purple_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/purple_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/purple_theme_light_inversePrimary</item>
-
         <item name="android:textColorPrimary">@color/purple_theme_light_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/white_purple_light_transparent</item>
-        <item name="educationCircleColor">@color/purple_dark</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -75,9 +68,7 @@
     </style>
 
     <!-- Dark Purple Style -->
-    <style name="KeepassDXStyle.Purple.Dark" parent="KeepassDXStyle.Purple.Dark.v21" />
-    <style name="KeepassDXStyle.Purple.Dark.v21" parent="KeepassDXStyle.Purple.Dark.Base" />
-    <style name="KeepassDXStyle.Purple.Dark.Base" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Purple.Dark" parent="KeepassDXStyle.Night" >
 
         <item name="colorPrimary">@color/purple_theme_night_primary</item>
         <item name="colorPrimaryDark">@color/purple_theme_night_primaryDark</item>
@@ -112,15 +103,10 @@
         <item name="colorOnSurfaceInverse">@color/purple_theme_night_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/purple_theme_night_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/purple_theme_night_inversePrimary</item>
-
         <item name="android:textColorPrimary">@color/purple_theme_night_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/black_purple_transparent</item>
-        <item name="educationCircleColor">@color/black_purple</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
diff --git a/app/src/main/res/values/styles_moon.xml b/app/src/main/res/values/styles_moon.xml
index 7d97f065d..b38d2296a 100644
--- a/app/src/main/res/values/styles_moon.xml
+++ b/app/src/main/res/values/styles_moon.xml
@@ -19,8 +19,7 @@
 -->
 <resources>
     <!-- Light Blue Style -->
-    <style name="KeepassDXStyle.Blue" parent="KeepassDXStyle.Blue.v21" />
-    <style name="KeepassDXStyle.Blue.v21" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Blue" parent="KeepassDXStyle.Light" >
 
         <item name="colorPrimary">@color/moon_theme_light_primary</item>
         <item name="colorPrimaryDark">@color/moon_theme_light_primaryDark</item>
@@ -55,26 +54,21 @@
         <item name="colorOnSurfaceInverse">@color/moon_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/moon_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/moon_theme_light_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/blue_light</item>
+        <item name="android:textColorPrimary">@color/moon_theme_light_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
-
-        <item name="educationCircleColor">@color/blue_dark</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorSecondary">@color/blue_white_dark</item>
-        <item name="android:textColorPrimary">@color/blue</item>
-        <item name="android:background">@color/blue_white_light</item>
-        <item name="background">@color/blue_white_light</item>
+        <item name="colorSecondary">@color/moon_theme_light_secondary</item>
+        <item name="android:textColorPrimary">@color/moon_theme_light_textPrimary</item>
+        <item name="android:background">@color/moon_theme_light_background</item>
+        <item name="background">@color/moon_theme_light_background</item>
     </style>
 
     <!-- Dark Blue Style -->
-    <style name="KeepassDXStyle.Blue.Night" parent="KeepassDXStyle.Blue.Night.v21" />
-    <style name="KeepassDXStyle.Blue.Night.v21" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Blue.Night" parent="KeepassDXStyle.Night" >
 
         <item name="colorPrimary">@color/moon_theme_night_primary</item>
         <item name="colorPrimaryDark">@color/moon_theme_night_primaryDark</item>
@@ -109,20 +103,16 @@
         <item name="colorOnSurfaceInverse">@color/moon_theme_night_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/moon_theme_night_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/moon_theme_night_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/blue_light</item>
+        <item name="android:textColorPrimary">@color/moon_theme_night_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
-
-        <item name="educationCircleColor">@color/blue_dark</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorSecondary">@color/blue_white_dark</item>
-        <item name="android:textColorPrimary">@color/blue</item>
-        <item name="android:background">@color/blue_black_dark</item>
-        <item name="background">@color/blue_black_dark</item>
+        <item name="colorSecondary">@color/moon_theme_night_secondary</item>
+        <item name="android:textColorPrimary">@color/moon_theme_night_textPrimary</item>
+        <item name="android:background">@color/moon_theme_night_background</item>
+        <item name="background">@color/moon_theme_night_background</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_reply.xml b/app/src/main/res/values/styles_reply.xml
index d982424be..d0ae147f3 100644
--- a/app/src/main/res/values/styles_reply.xml
+++ b/app/src/main/res/values/styles_reply.xml
@@ -19,9 +19,7 @@
 -->
 <resources>
     <!-- Light Blue Style -->
-    <style name="KeepassDXStyle.Reply" parent="KeepassDXStyle.Reply.v21" />
-    <style name="KeepassDXStyle.Reply.v21" parent="KeepassDXStyle.Reply.Base" />
-    <style name="KeepassDXStyle.Reply.Base" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Reply" parent="KeepassDXStyle.Light" >
 
         <item name="colorPrimary">@color/reply_theme_light_primary</item>
         <item name="colorPrimaryDark">@color/reply_theme_light_primaryDark</item>
@@ -56,27 +54,21 @@
         <item name="colorOnSurfaceInverse">@color/reply_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/reply_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/reply_theme_light_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/reply_theme_light_onSurface</item>
+        <item name="android:textColorPrimary">@color/reply_theme_light_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
-
-        <item name="educationCircleColor">@color/reply_theme_light_primaryContainer</item>
-        <item name="educationTextColor">@color/reply_theme_light_onPrimaryContainer</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Reply.Dialog" parent="KeepassDXStyle.Light.Dialog">
         <item name="colorSecondary">@color/reply_theme_light_secondary</item>
-        <item name="android:textColorPrimary">@color/reply_theme_light_onBackground</item>
+        <item name="android:textColorPrimary">@color/reply_theme_light_textPrimary</item>
         <item name="android:background">@color/reply_theme_light_background</item>
         <item name="background">@color/reply_theme_light_background</item>
     </style>
 
     <!-- Dark Reply Style -->
-    <style name="KeepassDXStyle.Reply.Night" parent="KeepassDXStyle.Reply.Night.v21" />
-    <style name="KeepassDXStyle.Reply.Night.v21" parent="KeepassDXStyle.Reply.Night.Base" />
-    <style name="KeepassDXStyle.Reply.Night.Base" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Reply.Night" parent="KeepassDXStyle.Night" >
 
         <item name="colorPrimary">@color/reply_theme_night_primary</item>
         <item name="colorAccent">@color/reply_theme_night_primary</item>
@@ -112,21 +104,15 @@
         <item name="colorOnSurfaceInverse">@color/reply_theme_night_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/reply_theme_night_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/reply_theme_night_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/reply_theme_night_onSurface</item>
+        <item name="android:textColorPrimary">@color/reply_theme_night_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/reply_black_transparent</item>
-        <item name="educationCircleColor">@color/reply_theme_night_primaryContainer</item>
-        <item name="educationTextColor">@color/reply_theme_night_onPrimaryContainer</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Reply.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorPrimary">@color/reply_theme_night_primary</item>
         <item name="colorSecondary">@color/reply_theme_night_secondary</item>
-        <item name="android:textColorPrimary">@color/reply_theme_night_onBackground</item>
+        <item name="android:textColorPrimary">@color/reply_theme_night_textPrimary</item>
         <item name="android:background">@color/reply_theme_night_background</item>
         <item name="background">@color/reply_theme_night_background</item>
     </style>
diff --git a/app/src/main/res/values/styles_simple.xml b/app/src/main/res/values/styles_simple.xml
index f8d8cc0f6..51036ddbe 100644
--- a/app/src/main/res/values/styles_simple.xml
+++ b/app/src/main/res/values/styles_simple.xml
@@ -19,9 +19,7 @@
 -->
 <resources>
     <!-- Classic Simple Style -->
-    <style name="KeepassDXStyle.Simple" parent="KeepassDXStyle.Simple.Light.v21" />
-    <style name="KeepassDXStyle.Simple.Light.v21" parent="KeepassDXStyle.Simple.Light.Base" />
-    <style name="KeepassDXStyle.Simple.Light.Base" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Simple" parent="KeepassDXStyle.Light" >
 
         <item name="colorPrimary">@color/simple_theme_light_primary</item>
         <item name="colorPrimaryDark">@color/simple_theme_light_primaryDark</item>
@@ -56,28 +54,21 @@
         <item name="colorOnSurfaceInverse">@color/simple_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/simple_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/simple_theme_light_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/grey</item>
+        <item name="android:textColorPrimary">@color/simple_theme_light_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/white_slight_transparent</item>
-        <item name="educationCircleColor">@color/blue_dark</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Simple.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorSecondary">@color/blue_deep</item>
-        <item name="android:textColorPrimary">@color/grey</item>
-        <item name="android:background">@color/white_slight</item>
-        <item name="background">@color/white_slight</item>
+        <item name="colorSecondary">@color/simple_theme_light_secondary</item>
+        <item name="android:textColorPrimary">@color/simple_theme_light_textPrimary</item>
+        <item name="android:background">@color/simple_theme_light_background</item>
+        <item name="background">@color/simple_theme_light_background</item>
     </style>
 
     <!-- Classic Night Style -->
-    <style name="KeepassDXStyle.Simple.Night" parent="KeepassDXStyle.Simple.Night.v21" />
-    <style name="KeepassDXStyle.Simple.Night.v21" parent="KeepassDXStyle.Simple.Night.Base" />
-    <style name="KeepassDXStyle.Simple.Night.Base" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Simple.Night" parent="KeepassDXStyle.Night" >
 
         <item name="colorPrimary">@color/simple_theme_night_primary</item>
         <item name="colorPrimaryDark">@color/simple_theme_night_primaryDark</item>
@@ -112,21 +103,16 @@
         <item name="colorOnSurfaceInverse">@color/simple_theme_night_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/simple_theme_night_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/simple_theme_night_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorPrimary">@color/simple_theme_night_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
-
-        <item name="cardBackgroundTransparentColor">@color/grey_slight_transparent</item>
-        <item name="educationCircleColor">@color/blue_slight</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Simple.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorSecondary">@color/blue_slight</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:background">@color/grey_slight</item>
-        <item name="background">@color/grey_slight</item>
+        <item name="colorSecondary">@color/simple_theme_night_secondary</item>
+        <item name="android:textColorPrimary">@color/simple_theme_night_textPrimary</item>
+        <item name="android:background">@color/simple_theme_night_background</item>
+        <item name="background">@color/simple_theme_night_background</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_sun.xml b/app/src/main/res/values/styles_sun.xml
index 0e8044a04..feea1d58e 100644
--- a/app/src/main/res/values/styles_sun.xml
+++ b/app/src/main/res/values/styles_sun.xml
@@ -19,8 +19,7 @@
 -->
 <resources>
     <!-- Light Red Style -->
-    <style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Red.v21" />
-    <style name="KeepassDXStyle.Red.v21" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Light" >
 
         <item name="colorPrimary">@color/sun_theme_light_primary</item>
         <item name="colorPrimaryDark">@color/sun_theme_light_primaryDark</item>
@@ -55,26 +54,21 @@
         <item name="colorOnSurfaceInverse">@color/sun_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/sun_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/sun_theme_light_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/red</item>
+        <item name="android:textColorPrimary">@color/sun_theme_light_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
-
-        <item name="educationCircleColor">@color/red_dark</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorSecondary">@color/red</item>
-        <item name="android:textColorPrimary">@color/orange</item>
-        <item name="android:background">@color/red_white_light</item>
-        <item name="background">@color/red_white_light</item>
+        <item name="colorSecondary">@color/sun_theme_light_secondary</item>
+        <item name="android:textColorPrimary">@color/sun_theme_light_textPrimary</item>
+        <item name="android:background">@color/sun_theme_light_background</item>
+        <item name="background">@color/sun_theme_light_background</item>
     </style>
 
     <!-- Night Red Style -->
-    <style name="KeepassDXStyle.Red.Night" parent="KeepassDXStyle.Red.Night.v21" />
-    <style name="KeepassDXStyle.Red.Night.v21" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Red.Night" parent="KeepassDXStyle.Night" >
 
         <item name="colorPrimary">@color/sun_theme_night_primary</item>
         <item name="colorPrimaryDark">@color/sun_theme_night_primaryDark</item>
@@ -109,20 +103,16 @@
         <item name="colorOnSurfaceInverse">@color/sun_theme_night_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/sun_theme_night_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/sun_theme_night_inversePrimary</item>
-
-        <item name="android:textColorPrimary">@color/red</item>
+        <item name="android:textColorPrimary">@color/sun_theme_night_textPrimary</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
-
-        <item name="educationCircleColor">@color/red_dark</item>
-        <item name="educationTextColor">@color/white</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorSecondary">@color/red</item>
-        <item name="android:textColorPrimary">@color/orange</item>
-        <item name="android:background">@color/red_black_dark</item>
-        <item name="background">@color/red_black_dark</item>
+        <item name="colorSecondary">@color/sun_theme_night_secondary</item>
+        <item name="android:textColorPrimary">@color/sun_theme_night_textPrimary</item>
+        <item name="android:background">@color/sun_theme_night_background</item>
+        <item name="background">@color/sun_theme_night_background</item>
     </style>
 </resources>
\ No newline at end of file