diff --git a/app/src/main/res/values-night/attrs.xml b/app/src/main/res/values-night/attrs.xml
new file mode 100644
index 0000000..7c3e671
--- /dev/null
+++ b/app/src/main/res/values-night/attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="is_light_theme">false</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..e402a18
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="primary">@color/white</color>
+    <color name="primaryVariant">#E5E5E5</color>
+    <color name="onPrimary">@color/black</color>
+
+    <color name="statusBar">@color/black</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index bfbf657..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="Theme.ByeDPI" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/white</item>
-        <item name="colorPrimaryVariant">#E5E5E5</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">#5976DF</item>
-        <item name="colorSecondaryVariant">#3C52A3</item>
-        <item name="colorOnSecondary">@color/white</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
new file mode 100644
index 0000000..6aeed6e
--- /dev/null
+++ b/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.ByeDPI.V27" parent="Theme.ByeDPI.Base">
+        <item name="android:windowLightNavigationBar">@bool/is_light_theme</item>
+    </style>
+    <style name="Theme.ByeDPI" parent="Theme.ByeDPI.V27" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..dbfa286
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="is_light_theme">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c8524cd..d5ac8ea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,4 +2,15 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+
+    <color name="primary">#5976DF</color>
+    <color name="primaryVariant">#3C52A3</color>
+    <color name="onPrimary">@color/white</color>
+
+    <color name="secondary">#5976DF</color>
+    <color name="secondaryVariant">#3C52A3</color>
+    <color name="onSecondary">@color/white</color>
+
+    <color name="statusBar">@color/primaryVariant</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5640a33..b49202e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,16 +1,16 @@
 <resources>
-    <!-- Base application theme. -->
-    <style name="Theme.ByeDPI" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">#5976DF</item>
-        <item name="colorPrimaryVariant">#3C52A3</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">#5976DF</item>
-        <item name="colorSecondaryVariant">#3C52A3</item>
-        <item name="colorOnSecondary">@color/white</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+    <style name="Theme.ByeDPI.Base" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primaryVariant</item>
+        <item name="colorOnPrimary">@color/onPrimary</item>
+
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="colorSecondaryVariant">@color/secondaryVariant</item>
+        <item name="colorOnSecondary">@color/onSecondary</item>
+
+        <item name="android:statusBarColor">@color/statusBar</item>
+        <item name="android:navigationBarColor">?android:colorBackground</item>
     </style>
+
+    <style name="Theme.ByeDPI" parent="Theme.ByeDPI.Base" />
 </resources>