diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 19ca66722..aa51838c0 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -30,8 +30,8 @@
         tools:targetApi="q">
         <activity
             android:name=".activities.IntroActivity"
-            android:theme="@style/AppTheme.Splash"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/src/main/java/com/machiav3lli/backup/activities/IntroActivity.java b/src/main/java/com/machiav3lli/backup/activities/IntroActivity.java
index 6f7e16487..2fd7b1e52 100644
--- a/src/main/java/com/machiav3lli/backup/activities/IntroActivity.java
+++ b/src/main/java/com/machiav3lli/backup/activities/IntroActivity.java
@@ -170,8 +170,7 @@ private void launchMainActivity() {
         String backupDirPath = getDefaultBackupDirPath(this);
         backupDir = Utils.createBackupDir(this, backupDirPath);
         originalList = AppInfoHelper.getPackageInfo(this, backupDir, true,
-                PreferenceManager.getDefaultSharedPreferences(this)
-                        .getBoolean(Constants.PREFS_ENABLESPECIALBACKUPS, true));
+                PreferenceManager.getDefaultSharedPreferences(this).getBoolean(Constants.PREFS_ENABLESPECIALBACKUPS, true));
         startActivity(new Intent(this, MainActivityX.class));
     }
 
diff --git a/src/main/java/com/machiav3lli/backup/handler/Utils.java b/src/main/java/com/machiav3lli/backup/handler/Utils.java
index 22dd6d82c..eafd6c474 100644
--- a/src/main/java/com/machiav3lli/backup/handler/Utils.java
+++ b/src/main/java/com/machiav3lli/backup/handler/Utils.java
@@ -136,5 +136,4 @@ public static String getPrefsString(Context context, String key) {
     public static void setPrefsString(Context context, String key, String value) {
         context.getSharedPreferences(Constants.PREFS_SHARED, Context.MODE_PRIVATE).edit().putString(key, value).apply();
     }
-
 }
diff --git a/src/main/java/com/machiav3lli/backup/items/AppInfo.java b/src/main/java/com/machiav3lli/backup/items/AppInfo.java
index d1c1f83ce..9f81baf8b 100644
--- a/src/main/java/com/machiav3lli/backup/items/AppInfo.java
+++ b/src/main/java/com/machiav3lli/backup/items/AppInfo.java
@@ -163,6 +163,6 @@ protected AppInfo(Parcel in) {
         system = bools[0];
         installed = bools[1];
         checked = bools[2];
-        icon = (Bitmap) in.readParcelable(getClass().getClassLoader());
+        icon = in.readParcelable(getClass().getClassLoader());
     }
 }
diff --git a/src/main/res/values-night/styles.xml b/src/main/res/values-night/styles.xml
index f5992d9c6..8e264f702 100644
--- a/src/main/res/values-night/styles.xml
+++ b/src/main/res/values-night/styles.xml
@@ -46,14 +46,12 @@
         <item name="android:backgroundTint">?backgroundColor</item>
     </style>
 
-    <style name="AppTheme.PopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
-
-    <style name="AppTheme.PopupTheme.Dark" parent="ThemeOverlay.MaterialComponents.Dark" />
+    <style name="AppTheme.PopupTheme" parent="ThemeOverlay.MaterialComponents.Dark" />
 
     <style name="Widget.Toolbar" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">?android:attr/windowBackground</item>
+        <item name="android:background">?android:windowBackground</item>
         <item name="titleTextAppearance">@style/TextAppearance.Toolbar.Title</item>
-        <item name="popupTheme">@style/AppTheme.PopupTheme.Dark</item>
+        <item name="popupTheme">@style/AppTheme.PopupTheme</item>
     </style>
 
     <style name="Widget.AppBar" parent="@style/Widget.Design.AppBarLayout">
diff --git a/src/main/res/values-notnight/styles.xml b/src/main/res/values-notnight/styles.xml
index ac097c9b1..fe7c18772 100644
--- a/src/main/res/values-notnight/styles.xml
+++ b/src/main/res/values-notnight/styles.xml
@@ -48,12 +48,10 @@
 
     <style name="AppTheme.PopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
 
-    <style name="AppTheme.PopupTheme.Dark" parent="ThemeOverlay.MaterialComponents.Dark" />
-
     <style name="Widget.Toolbar" parent="Widget.AppCompat.Toolbar">
         <item name="android:background">?android:windowBackground</item>
         <item name="titleTextAppearance">@style/TextAppearance.Toolbar.Title</item>
-        <item name="popupTheme">@style/AppTheme.PopupTheme.Dark</item>
+        <item name="popupTheme">@style/AppTheme.PopupTheme</item>
     </style>
 
     <style name="Widget.AppBar" parent="@style/Widget.Design.AppBarLayout">
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 34feaad66..f6b015ae2 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -5,7 +5,7 @@
         android:key="userPrefs"
         android:title="@string/prefs_user"
         app:iconSpaceReserved="false">
-        <ListPreference
+        <androidx.preference.ListPreference
             app:defaultValue="system"
             app:entries="@array/themeEntries"
             app:entryValues="@array/themeEntryValues"