diff --git a/app/libs/classes-dex2jar.jar b/app/libs/classes-dex2jar.jar
index 45096f78f..8351cf89e 100644
Binary files a/app/libs/classes-dex2jar.jar and b/app/libs/classes-dex2jar.jar differ
diff --git a/app/libs/classes2-dex2jar.jar b/app/libs/classes2-dex2jar.jar
index 224adae12..9cd9fc337 100644
Binary files a/app/libs/classes2-dex2jar.jar and b/app/libs/classes2-dex2jar.jar differ
diff --git a/app/libs/classes3-dex2jar.jar b/app/libs/classes3-dex2jar.jar
index 1a0c0e354..e8ca3c8d9 100644
Binary files a/app/libs/classes3-dex2jar.jar and b/app/libs/classes3-dex2jar.jar differ
diff --git a/app/libs/classes4-dex2jar.jar b/app/libs/classes4-dex2jar.jar
index ff5912977..11977a927 100644
Binary files a/app/libs/classes4-dex2jar.jar and b/app/libs/classes4-dex2jar.jar differ
diff --git a/app/libs/classes5-dex2jar.jar b/app/libs/classes5-dex2jar.jar
index ce4ccfc8d..e7a7e9ca4 100644
Binary files a/app/libs/classes5-dex2jar.jar and b/app/libs/classes5-dex2jar.jar differ
diff --git a/app/src/main/java/ru/vtosters/hooks/GmsHook.java b/app/src/main/java/ru/vtosters/hooks/GmsHook.java
index 94499d0de..35a2b10af 100644
--- a/app/src/main/java/ru/vtosters/hooks/GmsHook.java
+++ b/app/src/main/java/ru/vtosters/hooks/GmsHook.java
@@ -6,11 +6,12 @@ import android.content.Context;
 import android.os.Build;
 import com.google.firebase.iid.FirebaseInstanceIdReceiver;
 import com.google.firebase.iid.FirebaseInstanceIdReceiver2;
+import com.google.firebase.iid.FirebaseInstanceIdReceiver3;
 import com.vtosters.lite.R;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class GmsHook {
-    private static final boolean needToSpoof = !isGmsInstalled() && isFakeGmsInstalled();
+    private static final boolean needToSpoof = !isGmsInstalled() && (isFakeGmsInstalled() || isFakeGms2Installed());
 
     public static boolean isGmsInstalled() {
         try {
@@ -30,8 +31,17 @@ public class GmsHook {
         }
     } // Microg Google Market Services check
 
+    public static boolean isFakeGms2Installed() {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("app.revanced.android.gms", 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    } // Microg Google Market Services check
+
     public static boolean isAnyServicesInstalled() {
-        return isGmsInstalled() || isFakeGmsInstalled();
+        return isGmsInstalled() || isFakeGmsInstalled() || isFakeGms2Installed();
     }
 
     public static void fixGapps() {
@@ -45,7 +55,7 @@ public class GmsHook {
     } // Music channels fix
 
     public static String replaceGMSPackage(String str) {
-        return needToSpoof ? str.replaceAll("com.google", "com.mgoogle") : str;
+        return needToSpoof ? str.replaceAll("com.google", (isFakeGms2Installed() ? "app.revanced" : "com.mgoogle")) : str;
     }
 
     public static String getFirebaseInstanceIdReceiver() {
@@ -53,6 +63,6 @@ public class GmsHook {
     }
 
     public static Class getFirebaseInstanceIdReceiverClass() {
-        return needToSpoof ? FirebaseInstanceIdReceiver2.class : FirebaseInstanceIdReceiver.class;
+        return needToSpoof ? (isFakeGms2Installed() ? FirebaseInstanceIdReceiver3.class : FirebaseInstanceIdReceiver2.class) : FirebaseInstanceIdReceiver.class;
     }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
index d36bf1255..ba9012a94 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
@@ -65,7 +65,7 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
         findPreference("microgsettings").setOnPreferenceClickListener(preference -> {
             try {
                 Intent intent = new Intent(Intent.ACTION_MAIN);
-                intent.setComponent(new ComponentName("com.mgoogle.android.gms", "org.microg.gms.ui.SettingsActivity"));
+                intent.setComponent(new ComponentName((GmsHook.isFakeGms2Installed() ? "app.revanced.android.gms" : "com.mgoogle.android.gms"), "org.microg.gms.ui.SettingsActivity"));
                 startActivity(intent);
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/smali/AndroidManifest.xml b/smali/AndroidManifest.xml
index 828b90cf9..b76d80d55 100644
--- a/smali/AndroidManifest.xml
+++ b/smali/AndroidManifest.xml
@@ -138,6 +138,7 @@
     <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_WRITE" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="com.mgoogle.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="app.revanced.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" />
 
@@ -2313,6 +2314,14 @@
                 <action android:name="com.mgoogle.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </receiver>
+        <receiver
+                android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver3"
+                android:exported="true"
+                android:permission="app.revanced.android.c2dm.permission.SEND">
+            <intent-filter>
+                <action android:name="app.revanced.android.c2dm.intent.RECEIVE" />
+            </intent-filter>
+        </receiver>
         <activity
             android:name="com.google.android.gms.common.api.GoogleApiActivity"
             android:exported="false"
diff --git a/smali/smali/com/google/firebase/iid/FirebaseInstanceIdReceiver3.smali b/smali/smali/com/google/firebase/iid/FirebaseInstanceIdReceiver3.smali
new file mode 100644
index 000000000..4f363549e
--- /dev/null
+++ b/smali/smali/com/google/firebase/iid/FirebaseInstanceIdReceiver3.smali
@@ -0,0 +1,460 @@
+.class public final Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;
+.super Landroidx/legacy/content/WakefulBroadcastReceiver;
+.source "com.google.firebase:firebase-iid@@20.0.0"
+
+
+# static fields
+.field private static a:Lcom/google/firebase/iid/d0;
+
+
+# direct methods
+.method public constructor <init>()V
+    .locals 0
+
+    .line 1
+    invoke-direct {p0}, Landroidx/legacy/content/WakefulBroadcastReceiver;-><init>()V
+
+    return-void
+.end method
+
+.method public static a(Landroid/content/BroadcastReceiver;Landroid/content/Context;Landroid/content/Intent;)I
+    .locals 5
+    .annotation build Landroid/annotation/SuppressLint;
+        value = {
+            "InlinedApi"
+        }
+    .end annotation
+
+    .line 1
+    invoke-static {}, Lcom/google/android/gms/common/util/n;->i()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_0
+
+    .line 2
+    invoke-virtual {p1}, Landroid/content/Context;->getApplicationInfo()Landroid/content/pm/ApplicationInfo;
+
+    move-result-object v0
+
+    iget v0, v0, Landroid/content/pm/ApplicationInfo;->targetSdkVersion:I
+
+    const/16 v3, 0x1a
+
+    if-lt v0, v3, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    .line 3
+    :goto_0
+    invoke-virtual {p2}, Landroid/content/Intent;->getFlags()I
+
+    move-result v3
+
+    const/high16 v4, 0x10000000
+
+    and-int/2addr v3, v4
+
+    if-eqz v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_2
+
+    if-nez v1, :cond_2
+
+    .line 4
+    invoke-static {p0, p1, p2}, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->b(Landroid/content/BroadcastReceiver;Landroid/content/Context;Landroid/content/Intent;)I
+
+    move-result p0
+
+    return p0
+
+    .line 5
+    :cond_2
+    invoke-static {}, Lcom/google/firebase/iid/s;->b()Lcom/google/firebase/iid/s;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1, p2}, Lcom/google/firebase/iid/s;->a(Landroid/content/Context;Landroid/content/Intent;)I
+
+    move-result v0
+
+    .line 6
+    invoke-static {}, Lcom/google/android/gms/common/util/n;->i()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    const/16 v1, 0x192
+
+    if-ne v0, v1, :cond_3
+
+    .line 7
+    invoke-static {p0, p1, p2}, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->b(Landroid/content/BroadcastReceiver;Landroid/content/Context;Landroid/content/Intent;)I
+
+    const/16 p0, 0x193
+
+    return p0
+
+    :cond_3
+    return v0
+.end method
+
+.method private static declared-synchronized a(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/d0;
+    .locals 2
+
+    const-class v0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;
+
+    monitor-enter v0
+
+    .line 8
+    :try_start_0
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->a:Lcom/google/firebase/iid/d0;
+
+    if-nez v1, :cond_0
+
+    .line 9
+    new-instance v1, Lcom/google/firebase/iid/d0;
+
+    invoke-direct {v1, p0, p1}, Lcom/google/firebase/iid/d0;-><init>(Landroid/content/Context;Ljava/lang/String;)V
+
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->a:Lcom/google/firebase/iid/d0;
+
+    .line 10
+    :cond_0
+    sget-object p0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->a:Lcom/google/firebase/iid/d0;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-object p0
+
+    :catchall_0
+    move-exception p0
+
+    monitor-exit v0
+
+    throw p0
+.end method
+
+.method private static b(Landroid/content/BroadcastReceiver;Landroid/content/Context;Landroid/content/Intent;)I
+    .locals 2
+
+    const-string v0, "FirebaseInstanceId"
+
+    const/4 v1, 0x3
+
+    .line 20
+    invoke-static {v0, v1}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
+
+    move-result v0
+
+    .line 21
+    invoke-virtual {p0}, Landroid/content/BroadcastReceiver;->isOrderedBroadcast()Z
+
+    move-result v0
+
+    const/4 v1, -0x1
+
+    if-eqz v0, :cond_0
+
+    .line 22
+    invoke-virtual {p0, v1}, Landroid/content/BroadcastReceiver;->setResultCode(I)V
+
+    :cond_0
+    const-string v0, "com.google.firebase.MESSAGING_EVENT"
+
+    .line 23
+    invoke-static {p1, v0}, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->a(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/d0;
+
+    move-result-object p1
+
+    .line 24
+    invoke-virtual {p0}, Landroid/content/BroadcastReceiver;->goAsync()Landroid/content/BroadcastReceiver$PendingResult;
+
+    move-result-object p0
+
+    invoke-virtual {p1, p2, p0}, Lcom/google/firebase/iid/d0;->a(Landroid/content/Intent;Landroid/content/BroadcastReceiver$PendingResult;)V
+
+    return v1
+.end method
+
+.method private final b(Landroid/content/Context;Landroid/content/Intent;)V
+    .locals 3
+
+    const/4 v0, 0x0
+
+    .line 1
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
+
+    .line 2
+    invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
+
+    .line 3
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+    const/16 v1, 0x12
+
+    if-gt v0, v1, :cond_0
+
+    .line 4
+    invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->removeCategory(Ljava/lang/String;)V
+
+    :cond_0
+    const-string v0, "from"
+
+    .line 5
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "google.com/iid"
+
+    .line 6
+    invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_5
+
+    const-string p1, "CMD"
+
+    .line 7
+    invoke-virtual {p2, p1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_4
+
+    const/4 v0, 0x3
+
+    const-string v1, "FirebaseInstanceId"
+
+    .line 8
+    invoke-static {v1, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    .line 9
+    invoke-virtual {p2}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/String;->length()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x15
+
+    invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/String;->length()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    new-instance v1, Ljava/lang/StringBuilder;
+
+    invoke-direct {v1, v0}, Ljava/lang/StringBuilder;-><init>(I)V
+
+    const-string v0, "Received command: "
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v0, " - "
+
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    :cond_1
+    const-string p2, "RST"
+
+    .line 10
+    invoke-virtual {p2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-nez p2, :cond_3
+
+    const-string p2, "RST_FULL"
+
+    invoke-virtual {p2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const-string p2, "SYNC"
+
+    .line 11
+    invoke-virtual {p2, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    .line 12
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->k()Lcom/google/firebase/iid/FirebaseInstanceId;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->i()V
+
+    goto :goto_1
+
+    .line 13
+    :cond_3
+    :goto_0
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->k()Lcom/google/firebase/iid/FirebaseInstanceId;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->g()V
+
+    :cond_4
+    :goto_1
+    const/4 p1, -0x1
+
+    goto :goto_2
+
+    :cond_5
+    const-string v0, "gcm.rawData64"
+
+    .line 14
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_6
+
+    const/4 v2, 0x0
+
+    .line 15
+    invoke-static {v1, v2}, Landroid/util/Base64;->decode(Ljava/lang/String;I)[B
+
+    move-result-object v1
+
+    const-string v2, "rawData"
+
+    invoke-virtual {p2, v2, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;[B)Landroid/content/Intent;
+
+    .line 16
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+
+    .line 17
+    :cond_6
+    invoke-static {p0, p1, p2}, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->a(Landroid/content/BroadcastReceiver;Landroid/content/Context;Landroid/content/Intent;)I
+
+    move-result p1
+
+    .line 18
+    :goto_2
+    invoke-virtual {p0}, Landroid/content/BroadcastReceiver;->isOrderedBroadcast()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_7
+
+    .line 19
+    invoke-virtual {p0, p1}, Landroid/content/BroadcastReceiver;->setResultCode(I)V
+
+    :cond_7
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+    .locals 2
+    .param p1    # Landroid/content/Context;
+        .annotation build Landroidx/annotation/NonNull;
+        .end annotation
+    .end param
+    .param p2    # Landroid/content/Intent;
+        .annotation build Landroidx/annotation/NonNull;
+        .end annotation
+    .end param
+
+    if-nez p2, :cond_0
+
+    return-void
+
+    :cond_0
+    const-string v0, "wrapped_intent"
+
+    .line 1
+    invoke-virtual {p2, v0}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
+
+    move-result-object v0
+
+    .line 2
+    instance-of v1, v0, Landroid/content/Intent;
+
+    if-eqz v1, :cond_1
+
+    check-cast v0, Landroid/content/Intent;
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v0, 0x0
+
+    :goto_0
+    if-eqz v0, :cond_2
+
+    .line 3
+    invoke-direct {p0, p1, v0}, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->b(Landroid/content/Context;Landroid/content/Intent;)V
+
+    return-void
+
+    .line 4
+    :cond_2
+    invoke-direct {p0, p1, p2}, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver3;->b(Landroid/content/Context;Landroid/content/Intent;)V
+
+    return-void
+.end method