diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e6a595eb..26f3ae9d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,24 +1,20 @@
 <resources>
     <style name="Theme.Findroid" parent="Base.Theme.Findroid">
-        <!-- Main colors -->
-        <item name="colorPrimary">@color/blue_600</item>
-        <item name="colorPrimaryVariant">@color/blue_800</item>
-        <item name="colorSecondary">@color/green_300</item>
-        <item name="colorSecondaryVariant">@color/green_800</item>
+        <!-- Primary -->
+        <item name="colorPrimary">@color/primary_dark</item>
+        <item name="colorOnPrimary">@color/on_primary_dark</item>
+        <item name="colorPrimaryContainer">@color/primary_container_dark</item>
+        <item name="colorOnPrimaryContainer">@color/on_primary_container_dark</item>
 
-        <!-- Background colors and error state color -->
-        <item name="android:colorBackground">@color/black</item>
+        <!-- Secondary -->
+        <item name="colorSecondary">@color/secondary_dark</item>
+        <item name="colorOnSecondary">@color/on_secondary_dark</item>
+        <item name="colorSecondaryContainer">@color/secondary_container_dark</item>
+        <item name="colorOnSecondaryContainer">@color/on_secondary_container_dark</item>
+
+        <!-- Surface -->
+        <item name="android:colorBackground">@color/neutral_1000</item>
         <item name="colorSurface">@color/neutral_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>
 
     <style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 37aaa762..a55b22db 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,11 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Primary -->
+    <color name="primary_light">#0060ac</color>
+    <color name="primary_container_light">#d3e4ff</color>
+    <color name="on_primary_container_light">#001c3a</color>
+
+    <color name="primary_dark">#a1c9ff</color>
+    <color name="on_primary_dark">#00315e</color>
+    <color name="primary_container_dark">#004884</color>
+    <color name="on_primary_container_dark">#d3e4ff</color>
+
+    <!-- Secondary -->
+    <color name="secondary_light">#545f70</color>
+    <color name="secondary_container_light">#d8e3f8</color>
+    <color name="on_secondary_container_light">#111c2b</color>
+
+    <color name="secondary_dark">#bcc7db</color>
+    <color name="on_secondary_dark">#263141</color>
+    <color name="secondary_container_dark">#3c4758</color>
+    <color name="on_secondary_container_dark">#d8e3f8</color>
+
+
     <color name="blue_300">#67b0ed</color>
     <color name="blue_600">#2B82D9</color>
     <color name="blue_800">#2060b4</color>
     <color name="green_300">#71ca92</color>
     <color name="green_500">#24B364</color>
     <color name="green_800">#038043</color>
+    <color name="neutral_1000">#0E141A</color>
     <color name="neutral_900">#121A21</color>
     <color name="neutral_800">#243342</color>
     <color name="neutral_700">#374F67</color>
@@ -13,6 +35,7 @@
     <color name="neutral_300">#A9BDD1</color>
     <color name="neutral_200">#D7E0E9</color>
     <color name="neutral_100">#EEF2F6</color>
+    <color name="neutral_50">#F7FBFF</color>
     <color name="transparent_white_300">#4DFFFFFF</color>
     <color name="transparent_black_300">#4D000000</color>
     <color name="black">#FF000000</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 13956450..0394263e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,22 +3,24 @@
     <style name="Theme.Findroid" parent="Base.Theme.Findroid" />
 
     <style name="Base.Theme.Findroid" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Main colors -->
-        <item name="colorPrimary">@color/blue_600</item>
-        <item name="colorPrimaryVariant">@color/blue_800</item>
-        <item name="colorSecondary">@color/green_500</item>
-        <item name="colorSecondaryVariant">@color/green_800</item>
-
-        <!-- Background colors and error state color -->
-        <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 -->
+        <!-- Primary -->
+        <item name="colorPrimary">@color/primary_light</item>
         <item name="colorOnPrimary">@color/white</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <item name="colorOnBackground">@color/black</item>
-        <item name="colorOnSurface">@color/black</item>
+        <item name="colorPrimaryContainer">@color/primary_container_light</item>
+        <item name="colorOnPrimaryContainer">@color/on_primary_container_light</item>
+
+        <!-- Secondary -->
+        <item name="colorSecondary">@color/secondary_light</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorSecondaryContainer">@color/secondary_container_light</item>
+        <item name="colorOnSecondaryContainer">@color/on_secondary_container_light</item>
+
+        <!-- Surface -->
+        <item name="android:colorBackground">@color/neutral_50</item>
+        <item name="colorSurface">@color/neutral_100</item>
+
+        <!-- Error -->
+        <item name="colorError">@color/red</item>
         <item name="colorOnError">@color/white</item>
 
         <!-- Status bar -->
@@ -31,7 +33,10 @@
         <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.Findroid.LargeComponent</item>
 
         <!-- Toolbar -->
-        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
+        <item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
+
+        <!-- Extra -->
+        <item name="elevationOverlayEnabled">false</item>
     </style>
 
     <style name="Theme.FindroidSplashScreen" parent="Theme.SplashScreen">