diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
index c1322ce0b..a052e77a3 100644
--- a/app/src/main/res/values-v14/styles.xml
+++ b/app/src/main/res/values-v14/styles.xml
@@ -19,10 +19,10 @@
 -->
 <resources>
     <!-- For setting encapsulation -->
-    <style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" >
+    <style name="KeepassDXStyle.Light.v14" parent="KeepassDXStyle.Light.Base" >
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
     </style>
-    <style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" >
+    <style name="KeepassDXStyle.Night.v14" parent="KeepassDXStyle.Night.Base" >
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c7be9d679..cc528f75e 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -23,18 +23,18 @@
         <item name="android:statusBarColor">@color/grey_dark</item>
         <item name="android:navigationBarColor">@color/grey_dark</item>
     </style>
-    <style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" >
+    <style name="KeepassDXStyle.Light.v21" parent="KeepassDXStyle.Light.v14" >
         <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.Light.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Light.DateTime.Dialog</item>
     </style>
-    <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Light.WhiteBar.v21" parent="KeepassDXStyle.Light.Base" >
         <item name="android:statusBarColor">@color/grey_darker</item>
         <item name="android:navigationBarColor">@color/grey_darker</item>
     </style>
-    <style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" >
+    <style name="KeepassDXStyle.Night.v21" parent="KeepassDXStyle.Night.v14" >
         <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
         <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
diff --git a/app/src/main/res/values-v21/styles_moon.xml b/app/src/main/res/values-v21/styles_moon.xml
index a6f71dbc5..40d51ea7b 100644
--- a/app/src/main/res/values-v21/styles_moon.xml
+++ b/app/src/main/res/values-v21/styles_moon.xml
@@ -21,14 +21,12 @@
     <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_sun.xml b/app/src/main/res/values-v21/styles_sun.xml
index 3db8f5caa..88f29ba05 100644
--- a/app/src/main/res/values-v21/styles_sun.xml
+++ b/app/src/main/res/values-v21/styles_sun.xml
@@ -21,14 +21,12 @@
     <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.xml b/app/src/main/res/values-v23/styles.xml
index 4aac1f9e7..292e2bdf9 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -18,7 +18,12 @@
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Light.v23" parent="KeepassDXStyle.Light.v21" >
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+    <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light.WhiteBar.v21" >
+        <item name="android:statusBarColor">?android:attr/windowBackground</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..6ec16f430
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,25 @@
+<?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.Light.v27" parent="KeepassDXStyle.Light.v23" >
+        <item name="android:navigationBarColor">?android:attr/windowBackground</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a0f9f8b62..8e0ab3909 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,9 +27,13 @@
     </style>
     <style name="KeepassDXStyle.SplashScreen" parent="KeepassDXStyle.SplashScreen.v21"/>
 
-    <!-- Base application theme. -->
-    <!-- For setting encapsulation -->
-    <style name="KeepassDXStyle.Light.v21" parent="Theme.MaterialComponents.Light.Bridge">
+    <!-- Light application theme -->
+    <style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v27" />
+    <style name="KeepassDXStyle.Light.v27" parent="KeepassDXStyle.Light.v23" />
+    <style name="KeepassDXStyle.Light.v23" parent="KeepassDXStyle.Light.v21" />
+    <style name="KeepassDXStyle.Light.v21" parent="KeepassDXStyle.Light.v14" />
+    <style name="KeepassDXStyle.Light.v14" parent="KeepassDXStyle.Light.Base" />
+    <style name="KeepassDXStyle.Light.Base" parent="Theme.MaterialComponents.Light.Bridge">
 
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
@@ -100,7 +104,14 @@
         <!-- Edit Text -->
         <item name="textInputStyle">@style/KeepassDXStyle.TextInputLayout</item>
     </style>
-    <style name="KeepassDXStyle.Night.v21" parent="Theme.MaterialComponents.Bridge">
+
+    <!-- Night application theme -->
+    <style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v27" />
+    <style name="KeepassDXStyle.Night.v27" parent="KeepassDXStyle.Night.v23" />
+    <style name="KeepassDXStyle.Night.v23" parent="KeepassDXStyle.Night.v21" />
+    <style name="KeepassDXStyle.Night.v21" parent="KeepassDXStyle.Night.v14" />
+    <style name="KeepassDXStyle.Night.v14" parent="KeepassDXStyle.Night.Base" />
+    <style name="KeepassDXStyle.Night.Base" parent="Theme.MaterialComponents.Bridge">
 
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
@@ -172,12 +183,12 @@
         <item name="textInputStyle">@style/KeepassDXStyle.TextInputLayout</item>
     </style>
 
-    <!-- Light Style -->
-    <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" />
-    <style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" />
-
-    <!-- Night Style -->
-    <style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" />
+    <!-- Light WhiteBar Style -->
+    <style name="KeepassDXStyle.Light.WhiteBar" parent="KeepassDXStyle.Light.WhiteBar.v27" />
+    <style name="KeepassDXStyle.Light.WhiteBar.v27" parent="KeepassDXStyle.Light.WhiteBar.v23" />
+    <style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light.WhiteBar.v21" />
+    <style name="KeepassDXStyle.Light.WhiteBar.v21" parent="KeepassDXStyle.Light.WhiteBar.Base" />
+    <style name="KeepassDXStyle.Light.WhiteBar.Base" parent="KeepassDXStyle.Light" />
 
     <!-- Toolbar Style -->
     <style name="KeepassDXStyle.Toolbar.Light" parent="KeepassDXStyle.Light.v21">
diff --git a/app/src/main/res/values/style_classic.xml b/app/src/main/res/values/styles_classic.xml
similarity index 100%
rename from app/src/main/res/values/style_classic.xml
rename to app/src/main/res/values/styles_classic.xml
diff --git a/app/src/main/res/values/style_divine.xml b/app/src/main/res/values/styles_divine.xml
similarity index 99%
rename from app/src/main/res/values/style_divine.xml
rename to app/src/main/res/values/styles_divine.xml
index 09744b777..a99d3c1f0 100644
--- a/app/src/main/res/values/style_divine.xml
+++ b/app/src/main/res/values/styles_divine.xml
@@ -111,7 +111,7 @@
 
     <!-- Black Style -->
     <style name="KeepassDXStyle.Black" parent="KeepassDXStyle.Black.v21" />
-    <style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Black.v21" parent="KeepassDXStyle.Night.v21" >
         <item name="colorPrimary">@color/black_light</item>
         <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/orange_darker</item>
diff --git a/app/src/main/res/values/style_kunzite.xml b/app/src/main/res/values/styles_kunzite.xml
similarity index 100%
rename from app/src/main/res/values/style_kunzite.xml
rename to app/src/main/res/values/styles_kunzite.xml
diff --git a/app/src/main/res/values/style_moon.xml b/app/src/main/res/values/styles_moon.xml
similarity index 100%
rename from app/src/main/res/values/style_moon.xml
rename to app/src/main/res/values/styles_moon.xml
diff --git a/app/src/main/res/values/style_reply.xml b/app/src/main/res/values/styles_reply.xml
similarity index 99%
rename from app/src/main/res/values/style_reply.xml
rename to app/src/main/res/values/styles_reply.xml
index 4c563556a..e38c7b4c7 100644
--- a/app/src/main/res/values/style_reply.xml
+++ b/app/src/main/res/values/styles_reply.xml
@@ -20,7 +20,7 @@
 <resources>
     <!-- Light Blue Style -->
     <style name="KeepassDXStyle.Reply" parent="KeepassDXStyle.Reply.v21" />
-    <style name="KeepassDXStyle.Reply.v21" parent="KeepassDXStyle.Light" >
+    <style name="KeepassDXStyle.Reply.v21" parent="KeepassDXStyle.Light.v21" >
         <item name="colorPrimary">@color/reply_blue_dark</item>
         <item name="colorPrimaryDark">@color/reply_blue</item>
         <item name="colorAccent">@color/reply_orange</item>
@@ -94,7 +94,7 @@
 
     <!-- Dark Reply Style -->
     <style name="KeepassDXStyle.Reply.Night" parent="KeepassDXStyle.Reply.Night.v21" />
-    <style name="KeepassDXStyle.Reply.Night.v21" parent="KeepassDXStyle.Night" >
+    <style name="KeepassDXStyle.Reply.Night.v21" parent="KeepassDXStyle.Night.v21" >
         <item name="colorPrimary">@color/reply_blue_dark</item>
         <item name="colorPrimaryDark">@color/reply_black</item>
         <item name="colorAccent">@color/reply_orange</item>
diff --git a/app/src/main/res/values/style_simple.xml b/app/src/main/res/values/styles_simple.xml
similarity index 100%
rename from app/src/main/res/values/style_simple.xml
rename to app/src/main/res/values/styles_simple.xml
diff --git a/app/src/main/res/values/style_sun.xml b/app/src/main/res/values/styles_sun.xml
similarity index 100%
rename from app/src/main/res/values/style_sun.xml
rename to app/src/main/res/values/styles_sun.xml