diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 130a8f37..69f875c2 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -33,5 +33,8 @@
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="android:windowLightNavigationBar">false</item>
+        <!--Manual setting colors-->
+        <item name="colorPrimary">@color/darkColorPrimary</item>
+        <item name="colorSurface">@color/darkColorSurface</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index f2672d6f..e53f21ee 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -31,6 +31,8 @@
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
-        <item name="android:windowLightNavigationBar">false</item>
+        <!--Manual setting colors-->
+        <item name="colorPrimary">@color/darkColorPrimary</item>
+        <item name="colorSurface">@color/darkColorSurface</item>
     </style>
 </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 6b3b42d4..877d7921 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,14 +19,14 @@
     <color name="darkColorPrimary">#202124</color>
     <color name="darkColorOnPrimary">#ffffff</color>
     <color name="darkColorSecondary">#202124</color>
-    <color name="darkColorBackground">#121212</color>
-    <color name="darkColorSurface">#3C4043</color>
+    <color name="darkColorBackground">#202124</color>
+    <color name="darkColorSurface">#17181a</color>
 
     <color name="blackColorPrimary">#000000</color>
     <color name="blackColorOnPrimary">#ffffff</color>
     <color name="blackColorSecondary">#000000</color>
     <color name="blackColorBackground">#000000</color>
-    <color name="blackColorSurface">#000000</color>
+    <color name="blackColorSurface">#17181a</color>
 
     <color name="transparent">#00000000</color>
     <!-- card colors -->
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index c2c7bdd4..21479685 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -39,6 +39,8 @@
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
 
+        <!--Manual setting colors-->
+        <item name="colorSurface">@color/darkColorSurface</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Black" parent="Theme.MaterialComponents.NoActionBar">