diff --git a/app/progaurd-android-optimize.txt b/app/proguard-android-optimize.txt
similarity index 100%
rename from app/progaurd-android-optimize.txt
rename to app/proguard-android-optimize.txt
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index bb9bdd9fc9..c148738b18 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,30 +1,20 @@
 -dontobfuscate
 
-# Keep extension's common dependencies
--keep class eu.kanade.tachiyomi.source.** { public protected *; } # Avoid access modification
--keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
--keep,allowoptimization class androidx.preference.** { *; }
+-keep,allowoptimization class eu.kanade.**
+-keep,allowoptimization class tachiyomi.**
+
+# Keep common dependencies used in extensions
+-keep,allowoptimization class androidx.preference.** { public protected *; }
 -keep,allowoptimization class kotlin.** { public protected *; }
 -keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
--keep class kotlinx.serialization.** { public protected *; }
+-keep,allowoptimization class kotlinx.serialization.** { public protected *; }
 -keep,allowoptimization class okhttp3.** { public protected *; }
 -keep,allowoptimization class okio.** { public protected *; }
 -keep,allowoptimization class rx.** { public protected *; }
 -keep,allowoptimization class org.jsoup.** { public protected *; }
--keep,allowoptimization class com.google.gson.** { public protected *; }
 -keep,allowoptimization class app.cash.quickjs.** { public protected *; }
 -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
 -keep,allowoptimization class eu.davidea.flexibleadapter.** { public protected *; }
--keep class androidx.window.** { *; }
--dontwarn androidx.window.**
--keep class org.slf4j.** { *; }
--dontwarn org.slf4j.**
-
-# Design library
--dontwarn com.google.android.material.**
--keep class com.google.android.material.** { *; }
--keep interface com.google.android.material.** { *; }
--keep public class com.google.android.material.R$* { *; }
 
 # From extensions-lib
 -keep,allowoptimization class eu.kanade.tachiyomi.network.interceptor.RateLimitInterceptorKt { public protected *; }
@@ -34,23 +24,7 @@
 -keep,allowoptimization class eu.kanade.tachiyomi.network.RequestsKt { public protected *; }
 -keep,allowoptimization class eu.kanade.tachiyomi.AppInfo { public protected *; }
 
--keep class com.hippo.image.** { *; }
--keep interface com.hippo.image.** { *; }
--dontwarn nucleus.view.NucleusActionBarActivity
-
-# Extensions may require methods unused in the core app
--keep class org.jsoup.** { *; }
--keep class kotlin.** { *; }
--keep class okhttp3.** { *; }
-
-
-# OkHttp
--dontwarn okhttp3.**
--dontwarn okio.**
--dontwarn javax.annotation.**
-
-
-# RxJava 1.1.0
+##---------------Begin: proguard configuration for RxJava 1.x  ----------
 -dontwarn sun.misc.**
 
 -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
@@ -93,4 +67,8 @@
 -keepclassmembers class kotlinx.serialization.** {
     <methods>;
 }
-##---------------End: proguard configuration for kotlinx.serialization  ----------
\ No newline at end of file
+##---------------End: proguard configuration for kotlinx.serialization  ----------
+
+# Firebase
+-keep class com.google.firebase.installations.** { *; }
+-keep interface com.google.firebase.installations.** { *; }
\ No newline at end of file