diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3ea7f9..a7f9f8d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,16 +13,14 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/SplashScreenTheme"
+        android:theme="@style/Theme.App.SplashScreen"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
-            android:theme="@style/SplashScreenTheme">
+            android:theme="@style/Theme.App.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
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 0000000..75fdc97
--- /dev/null
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">#9FD3A8</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">@color/ic_launcher_background</item>
+        <item name="postSplashScreenTheme">@style/Theme.RememberMe</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <!--<item name="android:windowSplashScreenBrandingImage">@drawable/ic_launcher_foreground</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
new file mode 100644
index 0000000..e719d74
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.RememberMe" parent="android:Theme.Material.Light.NoActionBar" />
+
+    <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">#9FD3A8</item>
+        <item name="postSplashScreenTheme">@style/Theme.RememberMe</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</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 0000000..34eccc2
--- /dev/null
+++ b/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources >
+
+    <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">#396846</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">#9FD3A8</item>
+        <item name="postSplashScreenTheme">@style/Theme.RememberMe</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <!--<item name="android:windowSplashScreenBrandingImage">@drawable/ic_launcher_foreground</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 300eaf3..6b6f4fb 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Base theme that combines NoActionBar and SplashScreen attributes -->
-    <style name="Base.Theme.RememberMe" parent="android:Theme.Material.Light.NoActionBar">
-        <!-- Splash screen attributes -->
-        <item name="windowSplashScreenBackground">@android:color/holo_blue_dark</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_avatar_1</item>
-    </style>
 
-    <!-- Custom theme extending the combined base theme -->
-    <style name="Theme.RememberMe" parent="Base.Theme.RememberMe">
-        <!-- Additional customizations for RememberMe theme -->
-    </style>
+    <style name="Theme.RememberMe" parent="android:Theme.Material.Light.NoActionBar"/>
 
-    <!-- Splash screen theme extending the combined base theme -->
-    <style name="SplashScreenTheme" parent="Base.Theme.RememberMe">
+    <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">#396846</item>
+        <item name="android:windowActionBar">false</item>
         <item name="postSplashScreenTheme">@style/Theme.RememberMe</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bbe0264..9ce2e78 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.4.2"
 animation = "1.7.0-beta06"
-coreSplashscreen = "1.0.1"
+coreSplashscreen = "1.2.0-alpha01"
 coreTesting = "2.2.0"
 coreTestingVersion = "1.1.1"
 datastorePreferences = "1.1.1"