diff --git a/build.gradle b/build.gradle
index 59cfa54..024dddd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 ext {
     minSdkVersion = 23
     targetSdkVersion = 28
-    versionCode = 67
+    versionCode = 68
     versionName = '5.0.1'
     kotlinyanVersion = '0.3.0'
     ankoVersion = '0.10.8'
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 8bb3a68..95bec6e 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -62,7 +62,7 @@
 
         <activity
             android:name=".ui.HomeActivity"
-            android:theme="@style/AppTheme.Home">
+            android:theme="@style/AppTheme.BottomAppBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
@@ -81,7 +81,7 @@
         <activity
             android:name=".ui.DetailsActivity"
             android:label="@string/activity_details"
-            android:theme="@style/AppTheme.Home">
+            android:theme="@style/AppTheme.BottomAppBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -90,7 +90,7 @@
         <activity
             android:name=".ui.SettingsActivity"
             android:label="@string/activity_settings"
-            android:theme="@style/AppTheme.Home">
+            android:theme="@style/AppTheme.BottomAppBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -117,7 +117,7 @@
         <activity
             android:name=".ui.ScannerActivity"
             android:label="@string/activity_scanner"
-            android:theme="@style/AppTheme.Home">
+            android:theme="@style/AppTheme.BottomAppBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -126,7 +126,7 @@
         <activity
             android:name=".ui.ImportExportActivity"
             android:label="@string/activity_import_export"
-            android:theme="@style/AppTheme.Grey">
+            android:theme="@style/AppTheme.BottomBar.Grey">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -145,7 +145,7 @@
         <activity
             android:name=".ui.ManageCategoriesActivity"
             android:label="@string/activity_manage_categories"
-            android:theme="@style/AppTheme.Home">
+            android:theme="@style/AppTheme.BottomAppBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/mobile/src/main/kotlin/info/papdt/express/helper/ui/HomeActivity.kt b/mobile/src/main/kotlin/info/papdt/express/helper/ui/HomeActivity.kt
index 41afedb..fcb3ff7 100644
--- a/mobile/src/main/kotlin/info/papdt/express/helper/ui/HomeActivity.kt
+++ b/mobile/src/main/kotlin/info/papdt/express/helper/ui/HomeActivity.kt
@@ -193,6 +193,15 @@ class HomeActivity : AbsActivity(), OnRefreshListener {
         }, action = ChooseCategoryDialog.ACTION_CHOOSE_CATEGORY)
     }
 
+    override fun onStop() {
+        super.onStop()
+        try {
+            packageDatabase.save()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
     private fun showBottomSheetBackground() {
         bottomSheetBackground.makeVisible()
     }
diff --git a/mobile/src/main/res/layout/activity_details.xml b/mobile/src/main/res/layout/activity_details.xml
index f80decc..b8fbbc6 100644
--- a/mobile/src/main/res/layout/activity_details.xml
+++ b/mobile/src/main/res/layout/activity_details.xml
@@ -58,7 +58,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/bottomBarColor"
+        android:background="?android:attr/colorPrimary"
         android:elevation="8dp"
         app:popupTheme="@style/Toolbar.Popup"
         app:theme="@style/ThemeOverlay.AppCompat.Dark" />
diff --git a/mobile/src/main/res/layout/activity_home.xml b/mobile/src/main/res/layout/activity_home.xml
index a4828b9..027d26e 100644
--- a/mobile/src/main/res/layout/activity_home.xml
+++ b/mobile/src/main/res/layout/activity_home.xml
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-            android:background="?android:colorPrimary">
+            android:background="?android:windowBackground">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
@@ -53,6 +53,7 @@
                 android:id="@android:id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:overScrollMode="never"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
@@ -81,7 +82,7 @@
         android:id="@+id/bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
-        android:background="?attr/bottomBarColor"
+        android:background="?android:attr/colorPrimary"
         android:orientation="horizontal"
         android:layout_gravity="bottom"
         android:elevation="10dp"
diff --git a/mobile/src/main/res/layout/activity_manage_categories.xml b/mobile/src/main/res/layout/activity_manage_categories.xml
index e18f9df..7d33218 100644
--- a/mobile/src/main/res/layout/activity_manage_categories.xml
+++ b/mobile/src/main/res/layout/activity_manage_categories.xml
@@ -66,7 +66,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/bottomBarColor"
+        android:background="?android:attr/colorPrimary"
         android:elevation="@dimen/app_bar_elevation"
         app:theme="@style/Toolbar.Dark"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
diff --git a/mobile/src/main/res/layout/activity_scanner.xml b/mobile/src/main/res/layout/activity_scanner.xml
index e144a7f..8c02c6e 100644
--- a/mobile/src/main/res/layout/activity_scanner.xml
+++ b/mobile/src/main/res/layout/activity_scanner.xml
@@ -23,7 +23,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/bottomBarColor"
+        android:background="?android:attr/colorPrimary"
         android:elevation="@dimen/app_bar_elevation"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
diff --git a/mobile/src/main/res/layout/activity_settings.xml b/mobile/src/main/res/layout/activity_settings.xml
index 0bc3464..cccd154 100644
--- a/mobile/src/main/res/layout/activity_settings.xml
+++ b/mobile/src/main/res/layout/activity_settings.xml
@@ -25,7 +25,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/bottomBarColor"
+        android:background="?android:attr/colorPrimary"
         android:elevation="@dimen/app_bar_elevation"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
diff --git a/mobile/src/main/res/values-night/styles.xml b/mobile/src/main/res/values-night/styles.xml
index 9881737..7d8cf0f 100644
--- a/mobile/src/main/res/values-night/styles.xml
+++ b/mobile/src/main/res/values-night/styles.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<style name="AppTheme.Home" parent="AppTheme">
-		<item name="colorPrimary">@color/grey_850</item>
+	<style name="AppTheme.BottomAppBar" parent="AppTheme">
+		<item name="colorPrimary">@color/blue_grey_500</item>
 		<item name="colorPrimaryDark">@color/grey_900</item>
 		<item name="android:windowLightStatusBar">false</item>
 		<item name="android:windowBackground">?attr/rootViewBackgroundColor</item>
 		<item name="android:navigationBarColor">@color/blue_grey_700</item>
 		<item name="rootViewBackgroundColor">@color/grey_850</item>
-		<item name="bottomBarColor">@color/blue_grey_500</item>
 		<item name="bottomSheetColor">@color/grey_800</item>
 	</style>
 
diff --git a/mobile/src/main/res/values-v27/styles.xml b/mobile/src/main/res/values-v27/styles.xml
new file mode 100644
index 0000000..92b3737
--- /dev/null
+++ b/mobile/src/main/res/values-v27/styles.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="snackbarStyle">@style/Widget.MaterialComponents.Snackbar</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarDividerColor">@android:color/transparent</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/attrs.xml b/mobile/src/main/res/values/attrs.xml
index 0e77e15..9dc0fe5 100644
--- a/mobile/src/main/res/values/attrs.xml
+++ b/mobile/src/main/res/values/attrs.xml
@@ -18,7 +18,6 @@
 		<attr name="rightEnabled" format="boolean"/>
 	</declare-styleable>
 
-	<attr name="bottomBarColor" format="reference"/>
 	<attr name="bottomSheetColor" format="reference"/>
 	<attr name="rootViewBackgroundColor" format="reference"/>
 
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index ad08e69..c75c626 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -45,18 +45,17 @@
         <item name="android:windowEnterAnimation">@null</item>
     </style>
 
-	<style name="AppTheme.Home" parent="AppTheme">
-        <item name="colorPrimary">@color/grey_100</item>
+	<style name="AppTheme.BottomAppBar" parent="AppTheme">
+        <item name="colorPrimary">@color/pink_500</item>
         <item name="colorPrimaryDark">@color/grey_300</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowBackground">?attr/rootViewBackgroundColor</item>
         <item name="android:navigationBarColor">@color/pink_700</item>
 		<item name="rootViewBackgroundColor">@color/grey_100</item>
-        <item name="bottomBarColor">@color/pink_500</item>
         <item name="bottomSheetColor">@android:color/white</item>
     </style>
 
-	<style name="AppTheme.Grey" parent="AppTheme.Home">
+	<style name="AppTheme.BottomBar.Grey" parent="AppTheme.BottomAppBar">
 		<item name="colorPrimary">@color/grey_theme_app_bar</item>
 		<item name="android:navigationBarColor">@color/grey_theme_status_bar</item>
 	</style>