diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 40495f21..8a37e9f9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,8 +44,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/AppThemeMain">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
index fbd86441..8d53298e 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
@@ -142,8 +142,9 @@ public class BaseActivity extends AppCompatActivity {
             }
             theme.applyStyle(resid, false);
         }
-        if (!(this instanceof MainActivity)) {
-            theme.applyStyle(getCustomTheme(), true);
+        theme.applyStyle(getCustomTheme(), true);
+        if (this instanceof MainActivity) {
+            theme.applyStyle(R.style.ThemeOverlay_ActivityMain, true);
         }
         theme.applyStyle(getThemeStyleRes(this), true);
         // only pass theme style to super, so styled theme will not be overwritten
diff --git a/app/src/main/res/layout/sticky_header_download.xml b/app/src/main/res/layout/sticky_header_download.xml
index 130ebffa..c6418af5 100644
--- a/app/src/main/res/layout/sticky_header_download.xml
+++ b/app/src/main/res/layout/sticky_header_download.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorStickyHeader"
+    android:background="?colorStickyHeader"
     android:padding="8dp">
 
     <TextView
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 966097bc..3ed7e8e7 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -5,5 +5,5 @@
     <color name="colorPrimaryDark">#2E2E2E</color>
     <color name="colorActionBar">#383838</color>
     <color name="navigationBarColor">#B3000000</color>
-    <color name="colorStickyHeader">#EA424242</color>
+    <color name="colorStickyHeader">#EA303030</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v29/colors.xml b/app/src/main/res/values-v29/colors.xml
index dcedf5da..ae36ae85 100644
--- a/app/src/main/res/values-v29/colors.xml
+++ b/app/src/main/res/values-v29/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="navigationBarColor">@android:color/transparent</color>
+    <color name="navigationBarColorBlack">@android:color/transparent</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5e4cc27e..14d61f49 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="colorActionBar" format="color" />
+    <attr name="colorStickyHeader" format="color" />
     <attr name="actionBarTheme" format="reference" />
     <attr name="actionBarPopupTheme" format="reference" />
     <attr name="tabLayoutTheme" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ed51dd6..8e056802 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,4 +12,5 @@
     <color name="navigationBarColor">?colorPrimary</color>
     <color name="colorStickyHeader">#eafafafa</color>
     <color name="ic_launcher_background">#35C0CA</color>
+    <color name="navigationBarColorBlack">@android:color/black</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0c6a49e3..9bc5850f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,11 +7,12 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorActionBar">@color/colorActionBar</item>
+        <item name="colorStickyHeader">@color/colorStickyHeader</item>
         <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
         <item name="android:colorBackground">@color/colorBackground</item>
         <item name="android:windowBackground">@color/colorBackground</item>
         <item name="actionBarPopupTheme">@style/AppTheme.PopupOverlay</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/lightSystemUI</item>
+        <item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/lightSystemUI
         </item>
         <item name="android:navigationBarColor">@color/navigationBarColor</item>
@@ -25,26 +26,28 @@
         <item name="android:textColor">?attr/colorOnSurface</item>
     </style>
 
-    <style name="AppThemeMain" parent="AppTheme">
-        <item name="colorPrimaryDark">@color/colorBackground</item>
-    </style>
-
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
 
     <style name="ThemeOverlay" />
 
     <style name="ThemeOverlay.ActionBarPrimaryColor">
         <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:windowLightStatusBar">false</item>
         <item name="tabLayoutTheme">@style/Widget.MaterialComponents.TabLayout.Colored</item>
     </style>
 
+    <style name="ThemeOverlay.ActivityMain">
+        <item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
+        <item name="colorPrimaryDark">@color/colorBackground</item>
+    </style>
+
     <style name="ThemeOverlay.Black">
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="colorActionBar">@android:color/black</item>
-        <item name="android:navigationBarColor">@android:color/black</item>
+        <item name="android:navigationBarColor">@color/navigationBarColorBlack</item>
         <item name="android:colorBackground">@android:color/black</item>
         <item name="android:windowBackground">@android:color/black</item>
+        <item name="colorStickyHeader">#ea000000</item>
         <item name="tabLayoutTheme">@style/Widget.MaterialComponents.TabLayout</item>
     </style>
 </resources>
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index 8ff64132..2ba1d2c0 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress ALL -->
+<?xml version="1.0" encoding="utf-8"?><!--suppress ALL -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory