diff --git a/README-template.md b/README-template.md
index 9878a709e..96feabf56 100644
--- a/README-template.md
+++ b/README-template.md
@@ -31,7 +31,8 @@ Example:
           "18.21.35",
           "18.22.37",
           "18.23.36",
-          "18.24.37"
+          "18.24.37",
+          "18.25.39"
         ]
       }
     ]
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/fingerprints/FullscreenEngagementPanelFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/fingerprints/FullscreenEngagementPanelFingerprint.kt
index 252f589cf..34783bf4a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/fingerprints/FullscreenEngagementPanelFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/fingerprints/FullscreenEngagementPanelFingerprint.kt
@@ -8,7 +8,8 @@ object FullscreenEngagementPanelFingerprint : MethodFingerprint(
     returnType = "L",
     parameters = listOf("L"),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/FullscreenEngagementPanelOverlay;") &&
-                methodDef.isWideLiteralExists(FullScreenEngagementPanel)
+        methodDef.isWideLiteralExists(
+            FullScreenEngagementPanel
+        )
     }
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt
index 8d64e7541..0fc715a0d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt
@@ -4,6 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 
 object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
     returnType = "V",
@@ -39,6 +40,7 @@ object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
         Opcode.RETURN_VOID
     ),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/MinimizedPlaybackPolicyController;")
-    }
-)
+        methodDef.implementation!!.instructions.any {
+            ((it as? NarrowLiteralInstruction)?.narrowLiteral == 5)
+        }
+    })
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonFingerprint.kt
index 3e307c5dc..244ba16b7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/fingerprints/MusicAppDeeplinkButtonFingerprint.kt
@@ -11,6 +11,7 @@ object MusicAppDeeplinkButtonFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("Z", "Z"),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("MusicAppDeeplinkButtonController;") &&
-                methodDef.isWideLiteralExists(MusicAppDeeplinkButtonView)
+        methodDef.isWideLiteralExists(
+            MusicAppDeeplinkButtonView
+        )
     })
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/fingerprints/TimeCounterFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/fingerprints/TimeCounterFingerprint.kt
index ca2572ad6..3d79ebe9b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/fingerprints/TimeCounterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/fingerprints/TimeCounterFingerprint.kt
@@ -39,6 +39,6 @@ object TimeCounterFingerprint : MethodFingerprint(
     customFingerprint = { _, classDef ->
         // On older devices this fingerprint resolves very slowly.
         // Speed this up by checking for the number of methods.
-        classDef.methods.count() == 14
+        classDef.methods.count() == 14 || classDef.methods.count() == 15
     }
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/annotations/YouTubeCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/annotations/YouTubeCompatibility.kt
index 285bd01e3..d3f39232c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/annotations/YouTubeCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/annotations/YouTubeCompatibility.kt
@@ -10,7 +10,8 @@ import app.revanced.patcher.annotation.Package
             "18.21.35",
             "18.22.37",
             "18.23.36",
-            "18.24.37"
+            "18.24.37",
+            "18.25.39"
         )
     )]
 )
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/YouTubeControlsOverlayFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/YouTubeControlsOverlayFingerprint.kt
index 0b0462cff..73d61cbf6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/YouTubeControlsOverlayFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/YouTubeControlsOverlayFingerprint.kt
@@ -17,7 +17,8 @@ object YouTubeControlsOverlayFingerprint : MethodFingerprint(
         Opcode.IF_EQZ
     ),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/YouTubeControlsOverlay;") &&
-                methodDef.isWideLiteralExists(YoutubeControlsOverlay)
+        methodDef.isWideLiteralExists(
+            YoutubeControlsOverlay
+        )
     }
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/fingerprint/VideoStateFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/fingerprint/VideoStateFingerprint.kt
index b40547ad9..ddaf5804c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/fingerprint/VideoStateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/fingerprint/VideoStateFingerprint.kt
@@ -17,8 +17,5 @@ object VideoStateFingerprint : MethodFingerprint(
         Opcode.IF_EQZ,
         Opcode.IF_EQZ,
         Opcode.IGET_OBJECT, // obfuscated parameter field name
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/YouTubeControlsOverlay;")
-    }
+    )
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/fingerprint/VideoIdParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/fingerprint/VideoIdParentFingerprint.kt
index 33c1f31ad..cc679ee24 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/fingerprint/VideoIdParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/fingerprint/VideoIdParentFingerprint.kt
@@ -6,7 +6,4 @@ object VideoIdParentFingerprint : MethodFingerprint(
     returnType = "V",
     parameters = listOf("Ljava/lang/Object;", "Ljava/lang/Exception;"),
     strings = listOf("error retrieving subtitle"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/SubtitlesOverlayPresenter;")
-    }
 )
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 2547ced1c..2acaf6cc0 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -266,7 +266,7 @@
         <!-- SETTINGS: SPOOF_APP_VERSION
         <SwitchPreference android:title="@string/revanced_spoof_app_version_title" android:key="revanced_spoof_app_version" android:defaultValue="false" android:summary="@string/revanced_spoof_app_version_summary" />
         <ListPreference android:title="@string/revanced_spoof_app_version_target_entry_title" android:key="revanced_spoof_app_version_target" android:entries="@array/revanced_spoof_app_version_target_entry" android:defaultValue="18.20.39" android:entryValues="@array/revanced_spoof_app_version_target_entry_value" />
-        <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="17.30.34" android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
+        <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="18.20.39" android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
 
         <!-- SETTINGS: SPOOF_PLAYER_PARAMETER
         <SwitchPreference android:title="@string/revanced_spoof_player_parameter_title" android:key="revanced_spoof_player_parameter" android:defaultValue="true" android:summary="@string/revanced_spoof_player_parameter_summary" />