diff --git a/app/src/main/res/values-v21/styles_moon.xml b/app/src/main/res/values-v21/styles_moon.xml
index a6f71dbc5..973951a2b 100644
--- a/app/src/main/res/values-v21/styles_moon.xml
+++ b/app/src/main/res/values-v21/styles_moon.xml
@@ -19,16 +19,10 @@
 -->
 <resources>
     <style name="KeepassDXStyle.Blue" parent="KeepassDXStyle.Blue.v21" >
-        <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Blue.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Blue.DateTime.Dialog</item>
     </style>
     <style name="KeepassDXStyle.Blue.Night" parent="KeepassDXStyle.Blue.Night.v21" >
-        <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Blue.Night.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Blue.Night.DateTime.Dialog</item>
     </style>
diff --git a/app/src/main/res/values-v21/styles_simple.xml b/app/src/main/res/values-v21/styles_simple.xml
index d5a0f4ea5..d821a93b3 100644
--- a/app/src/main/res/values-v21/styles_simple.xml
+++ b/app/src/main/res/values-v21/styles_simple.xml
@@ -18,17 +18,11 @@
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <style name="KeepassDXStyle.Simple.v21" parent="KeepassDXStyle.Simple.Base" >
-        <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">@color/grey_dark</item>
-        <item name="android:navigationBarColor">@color/grey_dark</item>
+    <style name="KeepassDXStyle.Simple.Light.v21" parent="KeepassDXStyle.Simple.Light.Base" >
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Simple.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Simple.DateTime.Dialog</item>
     </style>
-    <style name="KeepassDXStyle.Simple.Night" parent="KeepassDXStyle.Simple.Night.v21" >
-        <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
+    <style name="KeepassDXStyle.Simple.Night.v21" parent="KeepassDXStyle.Simple.Night.Base" >
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Simple.Night.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Simple.Night.DateTime.Dialog</item>
     </style>
diff --git a/app/src/main/res/values-v21/styles_sun.xml b/app/src/main/res/values-v21/styles_sun.xml
index 3db8f5caa..64f6e27b7 100644
--- a/app/src/main/res/values-v21/styles_sun.xml
+++ b/app/src/main/res/values-v21/styles_sun.xml
@@ -19,16 +19,10 @@
 -->
 <resources>
     <style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Red.v21" >
-        <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Red.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Red.DateTime.Dialog</item>
     </style>
     <style name="KeepassDXStyle.Red.Night" parent="KeepassDXStyle.Red.Night.v21" >
-        <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Red.Night.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Red.Night.DateTime.Dialog</item>
     </style>
diff --git a/app/src/main/res/values-v23/styles_simple.xml b/app/src/main/res/values-v23/styles_simple.xml
deleted file mode 100644
index 8bd4e1137..000000000
--- a/app/src/main/res/values-v23/styles_simple.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2021 Jeremy Jamet / Kunzisoft.
-
- This file is part of KeePassDX.
-
-  KeePassDX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KeePassDX is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
-    <style name="KeepassDXStyle.Simple.v23" parent="KeepassDXStyle.Simple.v21" >
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-v27/styles_simple.xml b/app/src/main/res/values-v27/styles_simple.xml
deleted file mode 100644
index bf756fc2b..000000000
--- a/app/src/main/res/values-v27/styles_simple.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2021 Jeremy Jamet / Kunzisoft.
-
- This file is part of KeePassDX.
-
-  KeePassDX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KeePassDX is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
-    <style name="KeepassDXStyle.Simple.v27" parent="KeepassDXStyle.Simple.v23" >
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bff569ee4..c09d6a77d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -323,6 +323,211 @@
     <color name="divine_theme_night_inverseSurface">#E3E0DD</color>
     <color name="divine_theme_night_inversePrimary">#6E3000</color>
 
+    <!-- Classic -->
+
+    <color name="simple_theme_light_primary">@color/blue_deep</color>
+    <color name="simple_theme_light_primaryDark">@color/white_slight</color>
+    <color name="simple_theme_light_onPrimary">@color/white</color>
+    <color name="simple_theme_light_primaryContainer">@color/blue_deep</color>
+    <color name="simple_theme_light_onPrimaryContainer">@color/white_darkest</color>
+    <color name="simple_theme_light_secondary">@color/blue_deep</color>
+    <color name="simple_theme_light_onSecondary">@color/white</color>
+    <color name="simple_theme_light_secondaryContainer">#1959AE</color>
+    <color name="simple_theme_light_onSecondaryContainer">@color/white</color>
+    <color name="simple_theme_light_tertiary">@color/cyan_dark</color>
+    <color name="simple_theme_light_onTertiary">@color/white</color>
+    <color name="simple_theme_light_tertiaryContainer">@color/cyan_dark</color>
+    <color name="simple_theme_light_onTertiaryContainer">@color/white</color>
+    <color name="simple_theme_light_error">#BA1A1A</color>
+    <color name="simple_theme_light_errorContainer">#FFDAD6</color>
+    <color name="simple_theme_light_onError">#FFFFFF</color>
+    <color name="simple_theme_light_onErrorContainer">#410002</color>
+    <color name="simple_theme_light_background">@color/white_slight</color>
+    <color name="simple_theme_light_onBackground">@color/cyan_dark</color>
+    <color name="simple_theme_light_surface">@color/white_slight</color>
+    <color name="simple_theme_light_onSurface">@color/cyan_dark</color>
+    <color name="simple_theme_light_surfaceContainerLowest">#FCFEFF</color>
+    <color name="simple_theme_light_surfaceContainerLow">#F8FCFF</color>
+    <color name="simple_theme_light_surfaceContainer">#F1F7FD</color>
+    <color name="simple_theme_light_surfaceContainerHigh">#EEF7FF</color>
+    <color name="simple_theme_light_surfaceContainerHighest">#EAF5FF</color>
+    <color name="simple_theme_light_surfaceVariant">#DEE5D8</color>
+    <color name="simple_theme_light_onSurfaceVariant">#404649</color>
+    <color name="simple_theme_light_outline">#72796F</color>
+    <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_night_primary">#1A66CC</color>
+    <color name="simple_theme_night_primaryDark">@color/grey_slight</color>
+    <color name="simple_theme_night_onPrimary">@color/white</color>
+    <color name="simple_theme_night_primaryContainer">@color/blue_deep</color>
+    <color name="simple_theme_night_onPrimaryContainer">@color/white</color>
+    <color name="simple_theme_night_secondary">@color/blue_slight</color>
+    <color name="simple_theme_night_onSecondary">@color/white</color>
+    <color name="simple_theme_night_secondaryContainer">#0E61CF</color>
+    <color name="simple_theme_night_onSecondaryContainer">@color/white_grey_light</color>
+    <color name="simple_theme_night_tertiary">@color/cyan_dark</color>
+    <color name="simple_theme_night_onTertiary">@color/white</color>
+    <color name="simple_theme_night_tertiaryContainer">@color/cyan_dark</color>
+    <color name="simple_theme_night_onTertiaryContainer">@color/white</color>
+    <color name="simple_theme_night_error">#FFB4AB</color>
+    <color name="simple_theme_night_errorContainer">#93000A</color>
+    <color name="simple_theme_night_onError">#690005</color>
+    <color name="simple_theme_night_onErrorContainer">#FFDAD6</color>
+    <color name="simple_theme_night_background">@color/grey_slight</color>
+    <color name="simple_theme_night_onBackground">#DDE3E3</color>
+    <color name="simple_theme_night_surface">@color/grey_slight_dark</color>
+    <color name="simple_theme_night_onSurface">#F1F2F3</color>
+    <color name="simple_theme_night_surfaceContainerLowest">#222D30</color>
+    <color name="simple_theme_night_surfaceContainerLow">#212B2F</color>
+    <color name="simple_theme_night_surfaceContainer">#1D262C</color>
+    <color name="simple_theme_night_surfaceContainerHigh">#1B252B</color>
+    <color name="simple_theme_night_surfaceContainerHighest">#182025</color>
+    <color name="simple_theme_night_surfaceVariant">#404649</color>
+    <color name="simple_theme_night_onSurfaceVariant">#C2C9BD</color>
+    <color name="simple_theme_night_outline">#888F93</color>
+    <color name="simple_theme_night_inverseOnSurface">#191B1C</color>
+    <color name="simple_theme_night_inverseSurface">#DDE1E3</color>
+    <color name="simple_theme_night_inversePrimary">#00486E</color>
+
+    <!-- Moon -->
+
+    <color name="moon_theme_light_primary">@color/blue_light</color>
+    <color name="moon_theme_light_primaryDark">@color/blue_dark</color>
+    <color name="moon_theme_light_onPrimary">@color/white</color>
+    <color name="moon_theme_light_primaryContainer">@color/blue_deep</color>
+    <color name="moon_theme_light_onPrimaryContainer">@color/white_darkest</color>
+    <color name="moon_theme_light_secondary">@color/blue_lighter</color>
+    <color name="moon_theme_light_onSecondary">@color/white</color>
+    <color name="moon_theme_light_secondaryContainer">@color/blue</color>
+    <color name="moon_theme_light_onSecondaryContainer">@color/white</color>
+    <color name="moon_theme_light_tertiary">@color/cyan_dark</color>
+    <color name="moon_theme_light_onTertiary">@color/white</color>
+    <color name="moon_theme_light_tertiaryContainer">@color/cyan_dark</color>
+    <color name="moon_theme_light_onTertiaryContainer">@color/white</color>
+    <color name="moon_theme_light_error">#BA1A1A</color>
+    <color name="moon_theme_light_errorContainer">#FFDAD6</color>
+    <color name="moon_theme_light_onError">#FFFFFF</color>
+    <color name="moon_theme_light_onErrorContainer">#410002</color>
+    <color name="moon_theme_light_background">#EBF7FF</color>
+    <color name="moon_theme_light_onBackground">@color/cyan_dark</color>
+    <color name="moon_theme_light_surface">@color/blue_white</color>
+    <color name="moon_theme_light_onSurface">@color/cyan_dark</color>
+    <color name="moon_theme_light_surfaceContainerLowest">#E9F5FF</color>
+    <color name="moon_theme_light_surfaceContainerLow">#E1F1FF</color>
+    <color name="moon_theme_light_surfaceContainer">#DBEEFE</color>
+    <color name="moon_theme_light_surfaceContainerHigh">#D5ECFF</color>
+    <color name="moon_theme_light_surfaceContainerHighest">#D2EBFF</color>
+    <color name="moon_theme_light_surfaceVariant">#DEE5D8</color>
+    <color name="moon_theme_light_onSurfaceVariant">#404649</color>
+    <color name="moon_theme_light_outline">#72796F</color>
+    <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_night_primary">@color/blue</color>
+    <color name="moon_theme_night_primaryDark">@color/blue_dark</color>
+    <color name="moon_theme_night_onPrimary">@color/white</color>
+    <color name="moon_theme_night_primaryContainer">@color/blue_deep</color>
+    <color name="moon_theme_night_onPrimaryContainer">@color/white</color>
+    <color name="moon_theme_night_secondary">@color/blue_light</color>
+    <color name="moon_theme_night_onSecondary">@color/white</color>
+    <color name="moon_theme_night_secondaryContainer">@color/blue_light</color>
+    <color name="moon_theme_night_onSecondaryContainer">@color/white</color>
+    <color name="moon_theme_night_tertiary">@color/cyan_dark</color>
+    <color name="moon_theme_night_onTertiary">@color/white</color>
+    <color name="moon_theme_night_tertiaryContainer">@color/cyan_dark</color>
+    <color name="moon_theme_night_onTertiaryContainer">@color/white</color>
+    <color name="moon_theme_night_error">#FFB4AB</color>
+    <color name="moon_theme_night_errorContainer">#93000A</color>
+    <color name="moon_theme_night_onError">#690005</color>
+    <color name="moon_theme_night_onErrorContainer">#FFDAD6</color>
+    <color name="moon_theme_night_background">#051B2E</color>
+    <color name="moon_theme_night_onBackground">#DDE3E3</color>
+    <color name="moon_theme_night_surface">#082239</color>
+    <color name="moon_theme_night_onSurface">#F1F2F3</color>
+    <color name="moon_theme_night_surfaceContainerLowest">#0C3355</color>
+    <color name="moon_theme_night_surfaceContainerLow">#0A2C49</color>
+    <color name="moon_theme_night_surfaceContainer">#092741</color>
+    <color name="moon_theme_night_surfaceContainerHigh">#082239</color>
+    <color name="moon_theme_night_surfaceContainerHighest">#071F33</color>
+    <color name="moon_theme_night_surfaceVariant">#404649</color>
+    <color name="moon_theme_night_onSurfaceVariant">#C2C9BD</color>
+    <color name="moon_theme_night_outline">#888F93</color>
+    <color name="moon_theme_night_inverseOnSurface">#191B1C</color>
+    <color name="moon_theme_night_inverseSurface">#DDE1E3</color>
+    <color name="moon_theme_night_inversePrimary">#00486E</color>
+
+    <!-- Sun -->
+
+    <color name="sun_theme_light_primary">@color/red</color>
+    <color name="sun_theme_light_primaryDark">@color/red_dark</color>
+    <color name="sun_theme_light_onPrimary">@color/red_white_light</color>
+    <color name="sun_theme_light_primaryContainer">@color/red</color>
+    <color name="sun_theme_light_onPrimaryContainer">@color/white_darkest</color>
+    <color name="sun_theme_light_secondary">@color/orange</color>
+    <color name="sun_theme_light_onSecondary">@color/white</color>
+    <color name="sun_theme_light_secondaryContainer">@color/orange</color>
+    <color name="sun_theme_light_onSecondaryContainer">@color/white</color>
+    <color name="sun_theme_light_tertiary">#986100</color>
+    <color name="sun_theme_light_onTertiary">@color/white</color>
+    <color name="sun_theme_light_tertiaryContainer">#986100</color>
+    <color name="sun_theme_light_onTertiaryContainer">@color/white</color>
+    <color name="sun_theme_light_error">#BA1A1A</color>
+    <color name="sun_theme_light_errorContainer">#FFDAD6</color>
+    <color name="sun_theme_light_onError">#FFFFFF</color>
+    <color name="sun_theme_light_onErrorContainer">#410002</color>
+    <color name="sun_theme_light_background">@color/red_white_light</color>
+    <color name="sun_theme_light_onBackground">@color/red_black_dark</color>
+    <color name="sun_theme_light_surface">#FFEBED</color>
+    <color name="sun_theme_light_onSurface">@color/red_black_dark</color>
+    <color name="sun_theme_light_surfaceContainerLowest">#FBEBEB</color>
+    <color name="sun_theme_light_surfaceContainerLow">#FAE2E2</color>
+    <color name="sun_theme_light_surfaceContainer">#FADDDE</color>
+    <color name="sun_theme_light_surfaceContainerHigh">#FBD9DA</color>
+    <color name="sun_theme_light_surfaceContainerHighest">#FBD6D7</color>
+    <color name="sun_theme_light_surfaceVariant">#DEE5D8</color>
+    <color name="sun_theme_light_onSurfaceVariant">#494040</color>
+    <color name="sun_theme_light_outline">#796F6F</color>
+    <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_night_primary">@color/red</color>
+    <color name="sun_theme_night_primaryDark">@color/red_dark</color>
+    <color name="sun_theme_night_onPrimary">@color/red_white_light</color>
+    <color name="sun_theme_night_primaryContainer">@color/red_dark</color>
+    <color name="sun_theme_night_onPrimaryContainer">@color/white</color>
+    <color name="sun_theme_night_secondary">@color/orange_dark</color>
+    <color name="sun_theme_night_onSecondary">@color/white</color>
+    <color name="sun_theme_night_secondaryContainer">@color/orange_darkest</color>
+    <color name="sun_theme_night_onSecondaryContainer">@color/white</color>
+    <color name="sun_theme_night_tertiary">#986100</color>
+    <color name="sun_theme_night_onTertiary">@color/white</color>
+    <color name="sun_theme_night_tertiaryContainer">#986100</color>
+    <color name="sun_theme_night_onTertiaryContainer">@color/white</color>
+    <color name="sun_theme_night_error">#FFB4AB</color>
+    <color name="sun_theme_night_errorContainer">#93000A</color>
+    <color name="sun_theme_night_onError">#690005</color>
+    <color name="sun_theme_night_onErrorContainer">#FFDAD6</color>
+    <color name="sun_theme_night_background">@color/red_black_dark</color>
+    <color name="sun_theme_night_onBackground">#DDE3E3</color>
+    <color name="sun_theme_night_surface">#332023</color>
+    <color name="sun_theme_night_onSurface">#F1F2F3</color>
+    <color name="sun_theme_night_surfaceContainerLowest">#4E2B2E</color>
+    <color name="sun_theme_night_surfaceContainerLow">#432527</color>
+    <color name="sun_theme_night_surfaceContainer">#3C2123</color>
+    <color name="sun_theme_night_surfaceContainerHigh">#321B1D</color>
+    <color name="sun_theme_night_surfaceContainerHighest">#2B1719</color>
+    <color name="sun_theme_night_surfaceVariant">#494040</color>
+    <color name="sun_theme_night_onSurfaceVariant">#C2C9BD</color>
+    <color name="sun_theme_night_outline">#938888</color>
+    <color name="sun_theme_night_inverseOnSurface">#1C1919</color>
+    <color name="sun_theme_night_inverseSurface">#E3DDDD</color>
+    <color name="sun_theme_night_inversePrimary">#6E0000</color>
+
+
     <!-- Reply -->
 
     <color name="reply_orange_light">#FFBA52</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 277dde7d5..cc1595a2d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -321,6 +321,7 @@
         <item name="android:textColor">@color/text_color_light</item>
     </style>
     <style name="KeepassDXStyle.Light.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog">
+        <item name="colorPrimary">@color/green</item>
         <item name="colorSecondary">@color/orange</item>
         <item name="android:textColorPrimary">@color/green_dark</item>
         <item name="android:windowBackground">@color/green_white</item>
@@ -345,10 +346,10 @@
         <item name="android:textColor">@color/text_color_night</item>
     </style>
     <style name="KeepassDXStyle.Night.DateTime.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog">
+        <item name="colorPrimary">@color/green</item>
         <item name="colorSecondary">@color/orange_darker</item>
         <item name="android:textColorPrimary">@color/green_light</item>
         <item name="android:windowBackground">@color/grey_dark</item>
-        <item name="buttonBarStyle">@style/KeepassDXStyle.Night.Dialog.NegativeButtonStyle</item>
         <item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Night.Dialog.NegativeButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Night.Dialog.PositiveButtonStyle</item>
     </style>
diff --git a/app/src/main/res/values/styles_classic.xml b/app/src/main/res/values/styles_classic.xml
index c7277b7b1..ef36f6d5f 100644
--- a/app/src/main/res/values/styles_classic.xml
+++ b/app/src/main/res/values/styles_classic.xml
@@ -78,9 +78,10 @@
         <item name="background">@color/white_grey_lighter</item>
     </style>
     <style name="KeepassDXStyle.Clear.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
+        <item name="colorPrimary">@color/cyan_lighter</item>
         <item name="colorSecondary">@color/cyan_lighter</item>
         <item name="android:textColorPrimary">@color/cyan</item>
-        <item name="android:windowBackground">@color/white_grey_lighter</item>
+        <item name="android:windowBackground">@color/classic_theme_light_background</item>
     </style>
 
     <!-- Classic Dark Style -->
@@ -143,8 +144,9 @@
         <item name="background">@color/black_lighter</item>
     </style>
     <style name="KeepassDXStyle.Dark.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
+        <item name="colorPrimary">@color/cyan_lighter</item>
         <item name="colorSecondary">@color/cyan_lighter</item>
         <item name="android:textColorPrimary">@color/cyan_lightest</item>
-        <item name="android:windowBackground">@color/black_lighter</item>
+        <item name="android:windowBackground">@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 6daec1f46..8dba6ae8f 100644
--- a/app/src/main/res/values/styles_divine.xml
+++ b/app/src/main/res/values/styles_divine.xml
@@ -77,14 +77,11 @@
         <item name="android:background">@color/white</item>
         <item name="background">@color/white</item>
     </style>
-    <style name="KeepassDXStyle.White.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="KeepassDXStyle.White.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
+        <item name="colorPrimary">@color/orange</item>
         <item name="colorSecondary">@color/orange</item>
         <item name="android:textColorPrimary">@color/orange_darker</item>
-        <item name="android:windowBackground">@color/white</item>
-    </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.White" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/white</item>
+        <item name="android:windowBackground">@color/divine_theme_light_background</item>
     </style>
 
     <!-- Black Style -->
@@ -146,9 +143,10 @@
         <item name="android:background">@color/black_lighter</item>
         <item name="background">@color/black_lighter</item>
     </style>
-    <style name="KeepassDXStyle.Black.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
+    <style name="KeepassDXStyle.Black.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
+        <item name="colorPrimary">@color/orange_darker</item>
         <item name="colorSecondary">@color/orange_darker</item>
         <item name="android:textColorPrimary">@color/orange</item>
-        <item name="android:windowBackground">@color/black_lighter</item>
+        <item name="android:windowBackground">@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 e70f42f0e..6b69cae0c 100644
--- a/app/src/main/res/values/styles_kunzite.xml
+++ b/app/src/main/res/values/styles_kunzite.xml
@@ -35,7 +35,7 @@
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple</item>
+
         <item name="cardBackgroundTransparentColor">@color/white_purple_light_transparent</item>
         <item name="educationCircleColor">@color/purple_dark</item>
         <item name="educationTextColor">@color/white</item>
@@ -51,15 +51,12 @@
         <item name="android:background">@color/white_purple</item>
         <item name="background">@color/white_purple</item>
     </style>
-    <style name="KeepassDXStyle.Purple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="KeepassDXStyle.Purple.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
+        <item name="colorPrimary">@color/red</item>
         <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/purple_light</item>
         <item name="android:windowBackground">@color/white_purple</item>
     </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Purple" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/white_purple_light</item>
-    </style>
 
     <!-- Dark Purple Style -->
     <style name="KeepassDXStyle.Purple.Dark" parent="KeepassDXStyle.Purple.Dark.v21" />
@@ -78,7 +75,7 @@
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple.Dark</item>
+
         <item name="cardBackgroundTransparentColor">@color/black_purple_transparent</item>
         <item name="educationCircleColor">@color/black_purple</item>
         <item name="educationTextColor">@color/white</item>
@@ -94,13 +91,10 @@
         <item name="android:background">@color/black_purple_dark</item>
         <item name="background">@color/black_purple_dark</item>
     </style>
-    <style name="KeepassDXStyle.Purple.Dark.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
+    <style name="KeepassDXStyle.Purple.Dark.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
+        <item name="colorPrimary">@color/red</item>
         <item name="colorSecondary">@color/red</item>
         <item name="android:textColorPrimary">@color/purple_lighter</item>
         <item name="android:windowBackground">@color/black_purple_dark</item>
     </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Purple.Dark" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/black_purple</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_moon.xml b/app/src/main/res/values/styles_moon.xml
index c2255f25c..d164a4d74 100644
--- a/app/src/main/res/values/styles_moon.xml
+++ b/app/src/main/res/values/styles_moon.xml
@@ -21,21 +21,46 @@
     <!-- Light Blue Style -->
     <style name="KeepassDXStyle.Blue" parent="KeepassDXStyle.Blue.v21" />
     <style name="KeepassDXStyle.Blue.v21" parent="KeepassDXStyle.Light" >
-        <item name="colorPrimary">@color/blue</item>
-        <item name="colorPrimaryDark">@color/blue_dark</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorSecondary">@color/blue_lighter</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorTertiary">@color/blue_white_dark</item>
-        <item name="colorOnTertiary">@color/blue_white</item>
-        <item name="colorSurface">@color/blue_white</item>
+
+        <item name="colorPrimary">@color/moon_theme_light_primary</item>
+        <item name="colorPrimaryDark">@color/moon_theme_light_primaryDark</item>
+        <item name="colorOnPrimary">@color/moon_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/moon_theme_light_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/moon_theme_light_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/moon_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/moon_theme_light_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/moon_theme_light_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/moon_theme_light_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/moon_theme_light_tertiary</item>
+        <item name="colorOnTertiary">@color/moon_theme_light_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/moon_theme_light_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/moon_theme_light_onTertiaryContainer</item>
+        <item name="colorError">@color/moon_theme_light_error</item>
+        <item name="colorErrorContainer">@color/moon_theme_light_errorContainer</item>
+        <item name="colorOnError">@color/moon_theme_light_onError</item>
+        <item name="colorOnErrorContainer">@color/moon_theme_light_onErrorContainer</item>
+        <item name="android:windowBackground">@color/moon_theme_light_background</item>
+        <item name="android:colorBackground">@color/moon_theme_light_background</item>
+        <item name="colorOnBackground">@color/moon_theme_light_onBackground</item>
+        <item name="colorSurface">@color/moon_theme_light_surface</item>
+        <item name="colorOnSurface">@color/moon_theme_light_onSurface</item>
+        <item name="colorSurfaceContainerLowest">@color/moon_theme_light_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/moon_theme_light_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/moon_theme_light_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/moon_theme_light_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/moon_theme_light_surfaceContainerHighest</item>
+        <item name="colorSurfaceVariant">@color/moon_theme_light_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/moon_theme_light_onSurfaceVariant</item>
+        <item name="colorOutline">@color/moon_theme_light_outline</item>
+        <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:windowBackground">@color/blue_white</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Blue</item>
+
         <item name="educationCircleColor">@color/blue_dark</item>
         <item name="educationTextColor">@color/white</item>
 
@@ -50,31 +75,57 @@
         <item name="android:background">@color/blue_white_light</item>
         <item name="background">@color/blue_white_light</item>
     </style>
-    <style name="KeepassDXStyle.Blue.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="KeepassDXStyle.Blue.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
+        <item name="colorPrimary">@color/blue</item>
         <item name="colorSecondary">@color/blue</item>
         <item name="android:textColorPrimary">@color/blue</item>
-        <item name="android:windowBackground">@color/white_dark</item>
+        <item name="android:windowBackground">@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" >
-        <item name="colorPrimary">@color/blue</item>
-        <item name="colorPrimaryDark">@color/blue_dark</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorSecondary">@color/blue_lighter</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorTertiary">@color/blue_black</item>
-        <item name="colorOnTertiary">@color/blue_black_dark</item>
-        <item name="colorSurface">@color/blue_black_dark</item>
+
+        <item name="colorPrimary">@color/moon_theme_night_primary</item>
+        <item name="colorPrimaryDark">@color/moon_theme_night_primaryDark</item>
+        <item name="colorOnPrimary">@color/moon_theme_night_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/moon_theme_night_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/moon_theme_night_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/moon_theme_night_secondary</item>
+        <item name="colorOnSecondary">@color/moon_theme_night_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/moon_theme_night_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/moon_theme_night_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/moon_theme_night_tertiary</item>
+        <item name="colorOnTertiary">@color/moon_theme_night_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/moon_theme_night_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/moon_theme_night_onTertiaryContainer</item>
+        <item name="colorError">@color/moon_theme_night_error</item>
+        <item name="colorErrorContainer">@color/moon_theme_night_errorContainer</item>
+        <item name="colorOnError">@color/moon_theme_night_onError</item>
+        <item name="colorOnErrorContainer">@color/moon_theme_night_onErrorContainer</item>
+        <item name="android:windowBackground">@color/moon_theme_night_background</item>
+        <item name="android:colorBackground">@color/moon_theme_night_background</item>
+        <item name="colorOnBackground">@color/moon_theme_night_onBackground</item>
+        <item name="colorSurface">@color/moon_theme_night_surface</item>
+        <item name="colorOnSurface">@color/moon_theme_night_onSurface</item>
+        <item name="colorSurfaceContainerLowest">@color/moon_theme_night_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/moon_theme_night_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/moon_theme_night_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/moon_theme_night_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/moon_theme_night_surfaceContainerHighest</item>
+        <item name="colorSurfaceVariant">@color/moon_theme_night_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/moon_theme_night_onSurfaceVariant</item>
+        <item name="colorOutline">@color/moon_theme_night_outline</item>
+        <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:windowBackground">@color/blue_black_dark</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Blue.Night</item>
+
         <item name="educationCircleColor">@color/blue_dark</item>
         <item name="educationTextColor">@color/white</item>
 
@@ -89,16 +140,10 @@
         <item name="android:background">@color/blue_black_dark</item>
         <item name="background">@color/blue_black_dark</item>
     </style>
-    <style name="KeepassDXStyle.Blue.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
+    <style name="KeepassDXStyle.Blue.Night.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
+        <item name="colorPrimary">@color/blue</item>
         <item name="colorSecondary">@color/blue</item>
         <item name="android:textColorPrimary">@color/blue</item>
-        <item name="android:windowBackground">@color/grey_dark</item>
-    </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Blue" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/blue_white_light</item>
-    </style>
-    <style name="KeepassDXStyle.Cardview.Blue.Night" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/blue_black</item>
+        <item name="android:windowBackground">@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 8ea00131d..8c799ec30 100644
--- a/app/src/main/res/values/styles_reply.xml
+++ b/app/src/main/res/values/styles_reply.xml
@@ -35,7 +35,7 @@
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Reply.Light</item>
+
         <item name="educationCircleColor">@color/reply_orange</item>
         <item name="educationTextColor">@color/reply_black</item>
 
@@ -50,15 +50,12 @@
         <item name="android:background">@color/reply_blue_lighter</item>
         <item name="background">@color/reply_blue_lighter</item>
     </style>
-    <style name="KeepassDXStyle.Reply.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="KeepassDXStyle.Reply.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
+        <item name="colorPrimary">@color/reply_blue_dark</item>
         <item name="colorSecondary">@color/reply_blue_dark</item>
         <item name="android:textColorPrimary">@color/reply_blue_dark</item>
         <item name="android:windowBackground">@color/reply_blue_lighter</item>
     </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Reply.Light" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/reply_blue_lightest</item>
-    </style>
 
 
     <!-- Dark Reply Style -->
@@ -78,7 +75,7 @@
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Reply.Night</item>
+
         <item name="cardBackgroundTransparentColor">@color/reply_black_transparent</item>
         <item name="educationCircleColor">@color/reply_orange</item>
         <item name="educationTextColor">@color/reply_black</item>
@@ -94,13 +91,10 @@
         <item name="android:background">@color/reply_black</item>
         <item name="background">@color/reply_black</item>
     </style>
-    <style name="KeepassDXStyle.Reply.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
+    <style name="KeepassDXStyle.Reply.Night.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
+        <item name="colorPrimary">@color/reply_blue_dark</item>
         <item name="colorSecondary">@color/reply_blue_dark</item>
         <item name="android:textColorPrimary">@color/reply_orange</item>
         <item name="android:windowBackground">@color/reply_black</item>
     </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Reply.Night" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/reply_black_dark</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_simple.xml b/app/src/main/res/values/styles_simple.xml
index 09c4c22c3..0a4e41b7f 100644
--- a/app/src/main/res/values/styles_simple.xml
+++ b/app/src/main/res/values/styles_simple.xml
@@ -19,26 +19,49 @@
 -->
 <resources>
     <!-- Classic Simple Style -->
-    <style name="KeepassDXStyle.Simple" parent="KeepassDXStyle.Simple.v27" />
-    <style name="KeepassDXStyle.Simple.v27" parent="KeepassDXStyle.Simple.v23" />
-    <style name="KeepassDXStyle.Simple.v23" parent="KeepassDXStyle.Simple.v21" />
-    <style name="KeepassDXStyle.Simple.v21" parent="KeepassDXStyle.Simple.Base" />
-    <style name="KeepassDXStyle.Simple.Base" parent="KeepassDXStyle.Light" >
-        <item name="colorPrimary">@color/white_slight</item>
-        <item name="colorPrimaryDark">@color/white_slight</item>
-        <item name="colorOnPrimary">@color/grey_light</item>
-        <item name="colorSecondary">@color/blue_deep</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorTertiary">@color/white_darkest</item>
-        <item name="colorOnTertiary">@color/white</item>
-        <item name="colorSurface">@color/white_slight</item>
+    <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" >
+
+        <item name="colorPrimary">@color/simple_theme_light_primary</item>
+        <item name="colorPrimaryDark">@color/simple_theme_light_primaryDark</item>
+        <item name="colorOnPrimary">@color/simple_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/simple_theme_light_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/simple_theme_light_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/simple_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/simple_theme_light_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/simple_theme_light_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/simple_theme_light_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/simple_theme_light_tertiary</item>
+        <item name="colorOnTertiary">@color/simple_theme_light_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/simple_theme_light_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/simple_theme_light_onTertiaryContainer</item>
+        <item name="colorError">@color/simple_theme_light_error</item>
+        <item name="colorErrorContainer">@color/simple_theme_light_errorContainer</item>
+        <item name="colorOnError">@color/simple_theme_light_onError</item>
+        <item name="colorOnErrorContainer">@color/simple_theme_light_onErrorContainer</item>
+        <item name="android:windowBackground">@color/simple_theme_light_background</item>
+        <item name="android:colorBackground">@color/simple_theme_light_background</item>
+        <item name="colorOnBackground">@color/simple_theme_light_onBackground</item>
+        <item name="colorSurface">@color/simple_theme_light_surface</item>
+        <item name="colorOnSurface">@color/simple_theme_light_onSurface</item>
+        <item name="colorSurfaceContainerLowest">@color/simple_theme_light_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/simple_theme_light_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/simple_theme_light_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/simple_theme_light_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/simple_theme_light_surfaceContainerHighest</item>
+        <item name="colorSurfaceVariant">@color/simple_theme_light_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/simple_theme_light_onSurfaceVariant</item>
+        <item name="colorOutline">@color/simple_theme_light_outline</item>
+        <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:windowBackground">@color/white_slight</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Simple</item>
+
         <item name="cardBackgroundTransparentColor">@color/white_slight_transparent</item>
         <item name="educationCircleColor">@color/blue_dark</item>
         <item name="educationTextColor">@color/white</item>
@@ -54,33 +77,57 @@
         <item name="android:background">@color/white_slight</item>
         <item name="background">@color/white_slight</item>
     </style>
-    <style name="KeepassDXStyle.Simple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="KeepassDXStyle.Simple.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
+        <item name="colorPrimary">@color/blue_deep</item>
         <item name="colorSecondary">@color/blue_deep</item>
         <item name="android:textColorPrimary">@color/grey</item>
-        <item name="android:windowBackground">@color/white_slight</item>
-    </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Simple" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/white_slight</item>
+        <item name="android:windowBackground">@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.Night" >
-        <item name="colorPrimary">@color/grey_slight</item>
-        <item name="colorPrimaryDark">@color/grey_slight</item>
-        <item name="colorSecondary">@color/blue_slight</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorTertiary">@color/grey_slight_dark</item>
-        <item name="colorOnTertiary">@color/grey_slight</item>
-        <item name="colorSurface">@color/grey_slight_dark</item>
+    <style name="KeepassDXStyle.Simple.Night.v21" parent="KeepassDXStyle.Simple.Night.Base" />
+    <style name="KeepassDXStyle.Simple.Night.Base" parent="KeepassDXStyle.Night" >
+
+        <item name="colorPrimary">@color/simple_theme_night_primary</item>
+        <item name="colorPrimaryDark">@color/simple_theme_night_primaryDark</item>
+        <item name="colorOnPrimary">@color/simple_theme_night_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/simple_theme_night_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/simple_theme_night_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/simple_theme_night_secondary</item>
+        <item name="colorOnSecondary">@color/simple_theme_night_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/simple_theme_night_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/simple_theme_night_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/simple_theme_night_tertiary</item>
+        <item name="colorOnTertiary">@color/simple_theme_night_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/simple_theme_night_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/simple_theme_night_onTertiaryContainer</item>
+        <item name="colorError">@color/simple_theme_night_error</item>
+        <item name="colorErrorContainer">@color/simple_theme_night_errorContainer</item>
+        <item name="colorOnError">@color/simple_theme_night_onError</item>
+        <item name="colorOnErrorContainer">@color/simple_theme_night_onErrorContainer</item>
+        <item name="android:windowBackground">@color/simple_theme_night_background</item>
+        <item name="android:colorBackground">@color/simple_theme_night_background</item>
+        <item name="colorOnBackground">@color/simple_theme_night_onBackground</item>
+        <item name="colorSurface">@color/simple_theme_night_surface</item>
+        <item name="colorOnSurface">@color/simple_theme_night_onSurface</item>
+        <item name="colorSurfaceContainerLowest">@color/simple_theme_night_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/simple_theme_night_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/simple_theme_night_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/simple_theme_night_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/simple_theme_night_surfaceContainerHighest</item>
+        <item name="colorSurfaceVariant">@color/simple_theme_night_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/simple_theme_night_onSurfaceVariant</item>
+        <item name="colorOutline">@color/simple_theme_night_outline</item>
+        <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:windowBackground">@color/grey_slight</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Simple.Night</item>
+
         <item name="cardBackgroundTransparentColor">@color/grey_slight_transparent</item>
         <item name="educationCircleColor">@color/blue_slight</item>
         <item name="educationTextColor">@color/white</item>
@@ -96,13 +143,10 @@
         <item name="android:background">@color/grey_slight</item>
         <item name="background">@color/grey_slight</item>
     </style>
-    <style name="KeepassDXStyle.Simple.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
+    <style name="KeepassDXStyle.Simple.Night.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
+        <item name="colorPrimary">@color/blue_deep</item>
         <item name="colorSecondary">@color/blue_slight</item>
         <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:windowBackground">@color/grey_slight</item>
-    </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Simple.Night" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/grey_slight_dark</item>
+        <item name="android:windowBackground">@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 f5bfb2d5b..c9e7ace88 100644
--- a/app/src/main/res/values/styles_sun.xml
+++ b/app/src/main/res/values/styles_sun.xml
@@ -21,21 +21,46 @@
     <!-- Light Red Style -->
     <style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Red.v21" />
     <style name="KeepassDXStyle.Red.v21" parent="KeepassDXStyle.Light" >
-        <item name="colorPrimary">@color/red</item>
-        <item name="colorPrimaryDark">@color/red_dark</item>
-        <item name="colorOnPrimary">@color/red_white_light</item>
-        <item name="colorSecondary">@color/orange</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorTertiary">@color/red_lightest</item>
-        <item name="colorOnTertiary">@color/red_white_light</item>
-        <item name="colorSurface">@color/red_white_light</item>
+
+        <item name="colorPrimary">@color/sun_theme_light_primary</item>
+        <item name="colorPrimaryDark">@color/sun_theme_light_primaryDark</item>
+        <item name="colorOnPrimary">@color/sun_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/sun_theme_light_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/sun_theme_light_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/sun_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/sun_theme_light_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/sun_theme_light_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/sun_theme_light_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/sun_theme_light_tertiary</item>
+        <item name="colorOnTertiary">@color/sun_theme_light_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/sun_theme_light_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/sun_theme_light_onTertiaryContainer</item>
+        <item name="colorError">@color/sun_theme_light_error</item>
+        <item name="colorErrorContainer">@color/sun_theme_light_errorContainer</item>
+        <item name="colorOnError">@color/sun_theme_light_onError</item>
+        <item name="colorOnErrorContainer">@color/sun_theme_light_onErrorContainer</item>
+        <item name="android:windowBackground">@color/sun_theme_light_background</item>
+        <item name="android:colorBackground">@color/sun_theme_light_background</item>
+        <item name="colorOnBackground">@color/sun_theme_light_onBackground</item>
+        <item name="colorSurface">@color/sun_theme_light_surface</item>
+        <item name="colorOnSurface">@color/sun_theme_light_onSurface</item>
+        <item name="colorSurfaceContainerLowest">@color/sun_theme_light_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/sun_theme_light_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/sun_theme_light_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/sun_theme_light_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/sun_theme_light_surfaceContainerHighest</item>
+        <item name="colorSurfaceVariant">@color/sun_theme_light_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/sun_theme_light_onSurfaceVariant</item>
+        <item name="colorOutline">@color/sun_theme_light_outline</item>
+        <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:windowBackground">@color/red_white_light</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Red</item>
+
         <item name="educationCircleColor">@color/red_dark</item>
         <item name="educationTextColor">@color/white</item>
 
@@ -50,30 +75,56 @@
         <item name="android:background">@color/red_white_light</item>
         <item name="background">@color/red_white_light</item>
     </style>
-    <style name="KeepassDXStyle.Red.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorSecondary">@color/red</item>
-        <item name="android:textColorPrimary">@color/orange</item>
-        <item name="android:windowBackground">@color/white_dark</item>
+    <style name="KeepassDXStyle.Red.DateTime.Dialog" parent="KeepassDXStyle.Light.DateTime.Dialog">
+        <item name="colorPrimary">@color/sun_theme_light_primary</item>
+        <item name="colorSecondary">@color/sun_theme_light_secondary</item>
+        <item name="android:textColorPrimary">@color/sun_theme_light_onBackground</item>
+        <item name="android:windowBackground">@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" >
-        <item name="colorPrimary">@color/red</item>
-        <item name="colorPrimaryDark">@color/red_dark</item>
-        <item name="colorOnPrimary">@color/red_white_light</item>
-        <item name="colorSecondary">@color/orange</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <item name="colorTertiary">@color/red_black</item>
-        <item name="colorOnTertiary">@color/red_black_dark</item>
-        <item name="colorSurface">@color/red_black_dark</item>
+
+        <item name="colorPrimary">@color/sun_theme_night_primary</item>
+        <item name="colorPrimaryDark">@color/sun_theme_night_primaryDark</item>
+        <item name="colorOnPrimary">@color/sun_theme_night_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/sun_theme_night_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/sun_theme_night_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/sun_theme_night_secondary</item>
+        <item name="colorOnSecondary">@color/sun_theme_night_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/sun_theme_night_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/sun_theme_night_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/sun_theme_night_tertiary</item>
+        <item name="colorOnTertiary">@color/sun_theme_night_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/sun_theme_night_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/sun_theme_night_onTertiaryContainer</item>
+        <item name="colorError">@color/sun_theme_night_error</item>
+        <item name="colorErrorContainer">@color/sun_theme_night_errorContainer</item>
+        <item name="colorOnError">@color/sun_theme_night_onError</item>
+        <item name="colorOnErrorContainer">@color/sun_theme_night_onErrorContainer</item>
+        <item name="android:windowBackground">@color/sun_theme_night_background</item>
+        <item name="android:colorBackground">@color/sun_theme_night_background</item>
+        <item name="colorOnBackground">@color/sun_theme_night_onBackground</item>
+        <item name="colorSurface">@color/sun_theme_night_surface</item>
+        <item name="colorOnSurface">@color/sun_theme_night_onSurface</item>
+        <item name="colorSurfaceContainerLowest">@color/sun_theme_night_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/sun_theme_night_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/sun_theme_night_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/sun_theme_night_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/sun_theme_night_surfaceContainerHighest</item>
+        <item name="colorSurfaceVariant">@color/sun_theme_night_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/sun_theme_night_onSurfaceVariant</item>
+        <item name="colorOutline">@color/sun_theme_night_outline</item>
+        <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:windowBackground">@color/red_black_dark</item>
 
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
-        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Red.Night</item>
+
         <item name="educationCircleColor">@color/red_dark</item>
         <item name="educationTextColor">@color/white</item>
 
@@ -88,16 +139,10 @@
         <item name="android:background">@color/red_black_dark</item>
         <item name="background">@color/red_black_dark</item>
     </style>
-    <style name="KeepassDXStyle.Red.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
-        <item name="colorSecondary">@color/red</item>
-        <item name="android:textColorPrimary">@color/orange</item>
-        <item name="android:windowBackground">@color/grey_dark</item>
-    </style>
-    <!-- CardView -->
-    <style name="KeepassDXStyle.Cardview.Red" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/red_white_lightest</item>
-    </style>
-    <style name="KeepassDXStyle.Cardview.Red.Night" parent="KeepassDXStyle.Cardview">
-        <item name="cardBackgroundColor">@color/red_black</item>
+    <style name="KeepassDXStyle.Red.Night.DateTime.Dialog" parent="KeepassDXStyle.Night.DateTime.Dialog">
+        <item name="colorPrimary">@color/sun_theme_night_primary</item>
+        <item name="colorSecondary">@color/sun_theme_night_secondary</item>
+        <item name="android:textColorPrimary">@color/sun_theme_night_onBackground</item>
+        <item name="android:windowBackground">@color/sun_theme_night_background</item>
     </style>
 </resources>
\ No newline at end of file