diff --git a/app/build.gradle b/app/build.gradle
index 64785a024..21673764b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -84,18 +84,18 @@ tasks.withType(JavaCompile) {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.activity:activity:1.2.0-rc01"
+    implementation "androidx.activity:activity:1.2.0"
     implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
-    implementation 'androidx.biometric:biometric:1.2.0-alpha01'
+    implementation 'androidx.biometric:biometric:1.1.0'
     implementation "androidx.browser:browser:1.3.0"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
-    implementation "androidx.fragment:fragment:1.3.0-rc01"
+    implementation "androidx.fragment:fragment:1.3.0"
     implementation "androidx.preference:preference:1.1.1"
-    implementation "androidx.recyclerview:recyclerview:1.2.0-beta01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-beta02"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
     implementation 'androidx.webkit:webkit:1.4.0'
-    implementation 'com.google.android.material:material:1.3.0-rc01'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'com.getkeepsafe.relinker:relinker:1.4.1'
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     implementation 'com.github.seven332.a7zip:extract-lite:1b21783'
@@ -119,8 +119,8 @@ dependencies {
     implementation 'com.takisoft.preferencex:preferencex:1.1.0'
     implementation 'com.gitlab.NekoInverter:DrawerLayout:4e79840448'
     implementation 'com.github.NekoInverter:Image:8fd6c1e1df'
-    implementation 'com.github.NekoInverter.preferencex-android:preferencex-simplemenu:88f93154b2'
     implementation 'com.gitlab.NekoInverter:yorozuya:723dc867a9'
+    implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.1'
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     implementation 'org.greenrobot:greendao:3.3.0'
     implementation 'org.jsoup:jsoup:1.13.1'
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index b6e4d837f..afdeefe88 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -49,7 +49,7 @@
         android:title="@string/settings_advanced_clear_memory_cache"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="320"
         android:key="read_cache_size"
         android:summary="%s"
@@ -58,7 +58,7 @@
         app:entryValues="@array/read_cache_size_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="system"
         android:key="app_language"
         android:summary="%s"
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index bec032bec..561c2f0d5 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -30,7 +30,7 @@
         app:summaryOff="@string/settings_download_media_scan_summary_off"
         app:summaryOn="@string/settings_download_media_scan_summary_on" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="3"
         android:key="download_thread"
         android:summary="@string/settings_download_multi_thread_download_summary"
@@ -39,7 +39,7 @@
         app:entryValues="@array/multi_thread_download_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:key="download_delay"
         android:title="@string/settings_download_download_delay"
         android:summary="@string/settings_download_download_delay_summary"
@@ -48,7 +48,7 @@
         android:defaultValue="0"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="5"
         android:key="preload_image"
         android:summary="@string/settings_download_preload_image_summary"
@@ -57,7 +57,7 @@
         app:entryValues="@array/preload_image_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="a"
         android:key="image_size"
         android:summary="@string/settings_download_image_resolution_summary"
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index d5ecbaeeb..2837489c7 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -29,7 +29,7 @@
         android:title="@string/settings_eh_identity_cookies"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="1"
         android:key="gallery_site"
         android:summary="%s"
@@ -52,7 +52,7 @@
         android:fragment="com.hippo.ehviewer.ui.fragment.MyTagsFragment"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="-1"
         android:entries="@array/night_mode_entries"
         android:entryValues="@array/night_mode_values"
@@ -66,7 +66,7 @@
         android:title="@string/black_dark_theme"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="launch_page"
         android:summary="%s"
@@ -75,7 +75,7 @@
         app:entryValues="@array/launch_page_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="list_mode"
         android:summary="%s"
@@ -84,7 +84,7 @@
         app:entryValues="@array/list_mode_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="detail_size"
         android:summary="%s"
@@ -93,7 +93,7 @@
         app:entryValues="@array/detail_size_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="1"
         android:key="thumb_size"
         android:summary="%s"
@@ -102,7 +102,7 @@
         app:entryValues="@array/thumb_size_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="thumb_resolution"
         android:summary="@string/settings_eh_thumb_resolution_summary"
diff --git a/app/src/main/res/xml/read_settings.xml b/app/src/main/res/xml/read_settings.xml
index b8f1eca25..484478bd3 100644
--- a/app/src/main/res/xml/read_settings.xml
+++ b/app/src/main/res/xml/read_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="screen_rotation"
         android:summary="%s"
@@ -26,7 +26,7 @@
         app:entryValues="@array/screen_rotation_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="1"
         android:key="reading_direction"
         android:summary="%s"
@@ -35,7 +35,7 @@
         app:entryValues="@array/reading_direction_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="3"
         android:key="page_scaling"
         android:summary="%s"
@@ -44,7 +44,7 @@
         app:entryValues="@array/page_scaling_entry_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="1"
         android:key="start_position"
         android:summary="%s"
@@ -53,7 +53,7 @@
         app:entryValues="@array/start_position_values"
         app:iconSpaceReserved="false" />
 
-    <com.takisoft.preferencex.SimpleMenuPreference
+    <rikka.preference.SimpleMenuPreference
         android:defaultValue="1"
         android:key="read_theme"
         android:summary="%s"
diff --git a/build.gradle b/build.gradle
index b3153df18..bab9eced5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha05'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b3149f35a..9b23d71dc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-all.zip