diff --git a/apps/mobile/app/hooks/use-app-events.js b/apps/mobile/app/hooks/use-app-events.js
index 4f0a19d78..82daf5800 100644
--- a/apps/mobile/app/hooks/use-app-events.js
+++ b/apps/mobile/app/hooks/use-app-events.js
@@ -594,9 +594,12 @@ export const useAppEvents = () => {
 
   useEffect(() => {
     if (!loading) {
-      doAppLoadActions();
+      (async () => {
+        onUserUpdated();
+        doAppLoadActions();
+      })();
     }
-  }, [loading]);
+  }, [loading, onUserUpdated]);
 
   const initializeDatabase = useCallback(async () => {
     if (!db.isInitialized) {
@@ -604,10 +607,9 @@ export const useAppEvents = () => {
       DatabaseLogger.info("Initializing database");
       await db.init();
     }
-    await onUserUpdated();
     if (IsDatabaseMigrationRequired()) return;
     loadNotes();
-  }, [IsDatabaseMigrationRequired, loadNotes, onUserUpdated]);
+  }, [IsDatabaseMigrationRequired, loadNotes]);
 
   useEffect(() => {
     let sub;
diff --git a/apps/mobile/app/package.json b/apps/mobile/app/package.json
index 270e69c17..346fa0cd9 100644
--- a/apps/mobile/app/package.json
+++ b/apps/mobile/app/package.json
@@ -7,7 +7,6 @@
     "@flyerhq/react-native-link-preview": "^1.6.0",
     "@mdi/js": "^6.7.96",
     "absolutify": "^0.1.0",
-    "buffer": "^6.0.3",
     "dayjs": "^1.10.4",
     "entities": "^3.0.1",
     "html-to-text": "9.0.5",
@@ -30,7 +29,9 @@
     "react-native-blob-util": "0.17.3",
     "react-native-swiper-flatlist": "3.2.2",
     "@streetwriters/showdown": "^3.0.1-alpha.2",
-    "react-native-keyboard-aware-scroll-view": "^0.9.5"
+    "react-native-keyboard-aware-scroll-view": "^0.9.5",
+    "buffer": "^6.0.3",
+    "deprecated-react-native-prop-types": "^4.1.0"
   },
   "sideEffects": false
 }
diff --git a/apps/mobile/native/android/app/build.gradle b/apps/mobile/native/android/app/build.gradle
index 033b3819b..7c108eca8 100644
--- a/apps/mobile/native/android/app/build.gradle
+++ b/apps/mobile/native/android/app/build.gradle
@@ -192,12 +192,13 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
-
+    implementation("androidx.core:core-splashscreen:1.0.0")
+    
     implementation 'androidx.multidex:multidex:2.0.1' 
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.2'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.2'
-    implementation "androidx.core:core-splashscreen:1.0.0-rc01"
+
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.1.0'
 
diff --git a/apps/mobile/native/android/app/src/main/AndroidManifest.xml b/apps/mobile/native/android/app/src/main/AndroidManifest.xml
index 6bbe87261..6bbfb420a 100644
--- a/apps/mobile/native/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile/native/android/app/src/main/AndroidManifest.xml
@@ -75,7 +75,6 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:exported="true"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java
index fc97f237d..0bf991501 100644
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java
@@ -16,8 +16,8 @@ public class MainActivity extends ReactActivity {
 
   @Override
     protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(null);
     RNBootSplash.init(this);
+    super.onCreate(null);
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && BuildConfig.DEBUG) {
       WebView.setWebContentsDebuggingEnabled(true);
     }
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-anydpi-v26/logo_dark.xml b/apps/mobile/native/android/app/src/main/res/mipmap-anydpi-v26/logo_dark.xml
deleted file mode 100644
index 1130d2378..000000000
--- a/apps/mobile/native/android/app/src/main/res/mipmap-anydpi-v26/logo_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/logo_dark_background"/>
-    <foreground android:drawable="@mipmap/logo_dark_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/logo_dark_foreground.png b/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/bootsplash_logo_dark.png
similarity index 100%
rename from apps/mobile/native/android/app/src/main/res/mipmap-hdpi/logo_dark_foreground.png
rename to apps/mobile/native/android/app/src/main/res/mipmap-hdpi/bootsplash_logo_dark.png
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/logo_dark.png b/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/logo_dark.png
deleted file mode 100644
index c0a4bd556..000000000
Binary files a/apps/mobile/native/android/app/src/main/res/mipmap-hdpi/logo_dark.png and /dev/null differ
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/logo_dark_foreground.png b/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/bootsplash_logo_dark.png
similarity index 100%
rename from apps/mobile/native/android/app/src/main/res/mipmap-mdpi/logo_dark_foreground.png
rename to apps/mobile/native/android/app/src/main/res/mipmap-mdpi/bootsplash_logo_dark.png
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/logo_dark.png b/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/logo_dark.png
deleted file mode 100644
index 8acc9cbc9..000000000
Binary files a/apps/mobile/native/android/app/src/main/res/mipmap-mdpi/logo_dark.png and /dev/null differ
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/logo_dark_foreground.png b/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo_dark.png
similarity index 100%
rename from apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/logo_dark_foreground.png
rename to apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo_dark.png
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/logo_dark.png b/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/logo_dark.png
deleted file mode 100644
index 7e935ebcf..000000000
Binary files a/apps/mobile/native/android/app/src/main/res/mipmap-xhdpi/logo_dark.png and /dev/null differ
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/logo_dark_foreground.png b/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo_dark.png
similarity index 100%
rename from apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/logo_dark_foreground.png
rename to apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo_dark.png
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/logo_dark.png b/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/logo_dark.png
deleted file mode 100644
index ba9b966ab..000000000
Binary files a/apps/mobile/native/android/app/src/main/res/mipmap-xxhdpi/logo_dark.png and /dev/null differ
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/logo_dark_foreground.png b/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo_dark.png
similarity index 100%
rename from apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/logo_dark_foreground.png
rename to apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo_dark.png
diff --git a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/logo_dark.png b/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/logo_dark.png
deleted file mode 100644
index a210377c4..000000000
Binary files a/apps/mobile/native/android/app/src/main/res/mipmap-xxxhdpi/logo_dark.png and /dev/null differ
diff --git a/apps/mobile/native/android/app/src/main/res/values-night/colors.xml b/apps/mobile/native/android/app/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..e07d4cd5f
--- /dev/null
+++ b/apps/mobile/native/android/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="light_blue_50">#FFE1F5FE</color>
+    <color name="light_blue_200">#FF81D4FA</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
+    <color name="bootsplash_background">#1f1f1f</color>
+</resources>
\ No newline at end of file
diff --git a/apps/mobile/native/android/app/src/main/res/values-night/styles.xml b/apps/mobile/native/android/app/src/main/res/values-night/styles.xml
index 7e653e613..3ec36cbe9 100644
--- a/apps/mobile/native/android/app/src/main/res/values-night/styles.xml
+++ b/apps/mobile/native/android/app/src/main/res/values-night/styles.xml
@@ -1,8 +1,39 @@
 <resources>
- <!-- BootTheme should inherit from Theme.SplashScreen -->
-  <style name="BootTheme" parent="Theme.SplashScreen">
-    <item name="windowSplashScreenBackground">@color/bootsplash_background_dark</item>
-    <item name="windowSplashScreenAnimatedIcon">@mipmap/logo_dark</item>
-    <item name="postSplashScreenTheme">@style/AppTheme</item>
-  </style>
-</resources>
\ No newline at end of file
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+     <!-- Customize your theme here. -->
+        <item name="android:windowDisablePreview">true</item>
+        <item name="android:editTextBackground">@drawable/edit_text</item>
+        
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:datePickerDialogTheme">@style/DialogDatePicker.Theme</item>
+    </style>
+
+     <style name="Share.Window" parent="Theme.AppCompat">
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@null</item>
+        <item name="android:editTextBackground">@drawable/edit_text</item>
+    </style>
+
+      <!-- BootTheme should inherit from Theme.SplashScreen -->
+    <style name="BootTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo_dark</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
+
+    <!-- Base application theme. -->
+
+    <style name="AppThemeB" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:editTextBackground">@drawable/edit_text</item>
+    </style>
+
+    <style name="DialogDatePicker.Theme" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">#2b2b2b</item>
+    </style>
+</resources>
diff --git a/apps/mobile/native/android/app/src/main/res/values-night/themes.xml b/apps/mobile/native/android/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index b37dd7b02..000000000
--- a/apps/mobile/native/android/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <style name="ThemeOverlay.Notesnook.AppWidgetContainer" parent="">
-        <item name="appWidgetBackgroundColor">@color/light_blue_900</item>
-        <item name="appWidgetTextColor">@color/light_blue_200</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/apps/mobile/native/android/app/src/main/res/values/colors.xml b/apps/mobile/native/android/app/src/main/res/values/colors.xml
index e08485171..eeefb4b76 100644
--- a/apps/mobile/native/android/app/src/main/res/values/colors.xml
+++ b/apps/mobile/native/android/app/src/main/res/values/colors.xml
@@ -5,5 +5,4 @@
     <color name="light_blue_600">#FF039BE5</color>
     <color name="light_blue_900">#FF01579B</color>
     <color name="bootsplash_background">#FFFFFF</color>
-    <color name="bootsplash_background_dark">#1f1f1f</color>
 </resources>
\ No newline at end of file
diff --git a/apps/mobile/native/android/app/src/main/res/values/logo_dark_background.xml b/apps/mobile/native/android/app/src/main/res/values/logo_dark_background.xml
deleted file mode 100644
index 11caa3f4e..000000000
--- a/apps/mobile/native/android/app/src/main/res/values/logo_dark_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="logo_dark_background">#1F1F1F</color>
-</resources>
\ No newline at end of file
diff --git a/apps/mobile/native/android/app/src/main/res/values/strings.xml b/apps/mobile/native/android/app/src/main/res/values/strings.xml
index af33e9651..88a7d1a34 100644
--- a/apps/mobile/native/android/app/src/main/res/values/strings.xml
+++ b/apps/mobile/native/android/app/src/main/res/values/strings.xml
@@ -3,5 +3,4 @@
     <string name="title_activity_share">NotesnookShare</string>
     <string name="appwidget_text">EXAMPLE</string>
     <string name="add_widget">Add widget</string>
-
 </resources>
diff --git a/apps/mobile/native/android/app/src/main/res/values/styles.xml b/apps/mobile/native/android/app/src/main/res/values/styles.xml
index 7abaa4c76..109154a7c 100644
--- a/apps/mobile/native/android/app/src/main/res/values/styles.xml
+++ b/apps/mobile/native/android/app/src/main/res/values/styles.xml
@@ -17,11 +17,11 @@
     </style>
 
       <!-- BootTheme should inherit from Theme.SplashScreen -->
-  <style name="BootTheme" parent="Theme.SplashScreen">
-    <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
-    <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
-    <item name="postSplashScreenTheme">@style/AppTheme</item>
-  </style>
+    <style name="BootTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
 
     <!-- Base application theme. -->
 
diff --git a/apps/mobile/native/package.json b/apps/mobile/native/package.json
index c7972ff3c..c421cfe75 100644
--- a/apps/mobile/native/package.json
+++ b/apps/mobile/native/package.json
@@ -61,7 +61,8 @@
     "react-native-pdf": "6.6.2",
     "react-native-blob-util": "0.17.3",
     "@ammarahmed/react-native-share-extension": "^2.5.5",
-    "react-native-in-app-review": "4.3.3"
+    "react-native-in-app-review": "4.3.3",
+    "react-native-swiper-flatlist": "3.2.2"
   },
   "devDependencies": {
     "@react-native/eslint-config": "^0.72.2",
diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json
index 1c2ca6838..d8b7a7d4c 100644
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -13,13 +13,8 @@
         "app/"
       ],
       "dependencies": {
-        "buffer": "6.0.3",
-        "deprecated-react-native-prop-types": "^4.1.0",
         "react": "18.2.0",
-        "react-native": "0.72.0",
-        "react-native-mmkv-storage": "^0.9.1",
-        "react-native-reanimated": "^3.3.0",
-        "react-native-swiper-flatlist": "3.2.2"
+        "react-native": "0.72.0"
       },
       "devDependencies": {
         "otplib": "12.0.1",
@@ -38,6 +33,7 @@
         "absolutify": "^0.1.0",
         "buffer": "^6.0.3",
         "dayjs": "^1.10.4",
+        "deprecated-react-native-prop-types": "^4.1.0",
         "entities": "^3.0.1",
         "fflate": "^0.7.3",
         "html-to-text": "9.0.5",
@@ -119,6 +115,7 @@
         "react-native-securerandom": "^1.0.1",
         "react-native-share": "^7.2.0",
         "react-native-svg": "^12.3.0",
+        "react-native-swiper-flatlist": "3.2.2",
         "react-native-tooltips": "^1.0.3",
         "react-native-vector-icons": "9.2.0",
         "react-native-webview": "^11.14.1",
@@ -28685,6 +28682,7 @@
         "absolutify": "^0.1.0",
         "buffer": "^6.0.3",
         "dayjs": "^1.10.4",
+        "deprecated-react-native-prop-types": "^4.1.0",
         "entities": "^3.0.1",
         "fflate": "^0.7.3",
         "html-to-text": "9.0.5",
@@ -28801,6 +28799,7 @@
         "react-native-securerandom": "^1.0.1",
         "react-native-share": "^7.2.0",
         "react-native-svg": "^12.3.0",
+        "react-native-swiper-flatlist": "3.2.2",
         "react-native-tooltips": "^1.0.3",
         "react-native-vector-icons": "9.2.0",
         "react-native-webview": "^11.14.1",
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 4fcc2f62b..c676bd7bc 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -33,12 +33,7 @@
     "@notesnook/core": "*",
     "@notesnook/editor": "*",
     "@notesnook/editor-mobile": "*",
-    "react-native-swiper-flatlist": "3.2.2",
     "@notesnook/logger": "*",
-    "@notesnook/common": "*",
-    "react-native-mmkv-storage": "^0.9.1",
-    "react-native-reanimated": "^3.3.0",
-    "deprecated-react-native-prop-types": "^4.1.0",
-    "buffer": "6.0.3"
+    "@notesnook/common": "*"
   }
 }