diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
new file mode 100644
index 00000000..00a77255
--- /dev/null
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Findroid" parent="Base.Theme.Findroid">
+        <!-- Main colors -->
+        <item name="colorPrimary">@android:color/system_accent1_400</item>
+        <item name="colorPrimaryVariant">@android:color/system_accent1_800</item>
+        <item name="colorSecondary">@android:color/system_accent2_400</item>
+        <item name="colorSecondaryVariant">@android:color/system_accent2_800</item>
+
+        <!-- Background colors and error state color -->
+        <item name="android:colorBackground">@color/black</item>
+        <item name="colorSurface">@android:color/system_neutral1_900</item>
+        <item name="colorError">@color/red</item>
+
+        <!-- Text, icons and strokes in relation to the surface -->
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorOnBackground">@color/white</item>
+        <item name="colorOnSurface">@color/white</item>
+        <item name="colorOnError">@color/white</item>
+
+        <item name="elevationOverlayEnabled">false</item>
+    </style>
+</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
index 2d775dbe..e6a595eb 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -8,7 +8,7 @@
 
         <!-- Background colors and error state color -->
         <item name="android:colorBackground">@color/black</item>
-        <item name="colorSurface">@color/black</item>
+        <item name="colorSurface">@color/neutral_900</item>
         <item name="colorError">@color/red</item>
 
         <!-- Text, icons and strokes in relation to the surface -->
@@ -23,7 +23,7 @@
 
     <style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
-        <item name="windowSplashScreenBackground">@color/neutral_900</item>
+        <item name="windowSplashScreenBackground">@color/black</item>
         <item name="postSplashScreenTheme">@style/Theme.Findroid</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
new file mode 100644
index 00000000..bcb44740
--- /dev/null
+++ b/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Findroid" parent="Base.Theme.Findroid">
+        <!-- Main colors -->
+        <item name="colorPrimary">@android:color/system_accent1_500</item>
+        <item name="colorPrimaryVariant">@android:color/system_accent1_800</item>
+        <item name="colorSecondary">@android:color/system_accent2_500</item>
+        <item name="colorSecondaryVariant">@android:color/system_accent2_800</item>
+    </style>
+</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 e1b50b9b..45b24cff 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,8 +10,8 @@
         <item name="colorSecondaryVariant">@color/green_800</item>
 
         <!-- Background colors and error state color -->
-        <item name="android:colorBackground">@color/neutral_100</item>
-        <item name="colorSurface">@color/neutral_100</item>
+        <item name="android:colorBackground">@color/white</item>
+        <item name="colorSurface">@color/white</item>
         <item name="colorError">@color/red</item>
 
         <!-- Text, icons and strokes in relation to the surface -->
@@ -22,16 +22,19 @@
         <item name="colorOnError">@color/white</item>
 
         <!-- Status bar -->
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
+        <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
-        <!-- Extra's -->
+        <!-- Navigation bar -->
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+
+        <!-- Toolbar -->
         <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
     </style>
 
     <style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
-        <item name="windowSplashScreenBackground">@color/neutral_100</item>
+        <item name="windowSplashScreenBackground">@color/white</item>
         <item name="postSplashScreenTheme">@style/Theme.Findroid</item>
     </style>