diff --git a/README.md b/README.md
index 1365d9be0..c9f8a3daa 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ See the [documentation](https://github.com/inotia00/revanced-documentation#readm
 | `Ambient mode control` | Adds options to disable Ambient mode and to bypass Ambient mode restrictions. | 18.29.38 ~ 19.44.39 |
 | `Bypass image region restrictions` | Adds an option to use a different host for static images, so that images blocked in some countries can be received. | 18.29.38 ~ 19.44.39 |
 | `Change player flyout menu toggles` | Adds an option to use text toggles instead of switch toggles within the additional settings menu. | 18.29.38 ~ 19.44.39 |
-| `Change share sheet` | Add option to change from in-app share sheet to system share sheet. | 18.29.38 ~ 19.44.39 |
+| `Change share sheet` | Adds an option to change the in-app share sheet to the system share sheet. | 18.29.38 ~ 19.44.39 |
 | `Change start page` | Adds an option to set which page the app opens in instead of the homepage. | 18.29.38 ~ 19.44.39 |
 | `Custom Shorts action buttons` | Changes, at compile time, the icon of the action buttons of the Shorts player. | 18.29.38 ~ 19.44.39 |
 | `Custom branding icon for YouTube` | Changes the YouTube app icon to the icon specified in patch options. | 18.29.38 ~ 19.44.39 |
@@ -46,7 +46,7 @@ See the [documentation](https://github.com/inotia00/revanced-documentation#readm
 | `Hide layout components` | Adds options to hide general layout components. | 18.29.38 ~ 19.44.39 |
 | `Hide player buttons` | Adds options to hide buttons in the video player. | 18.29.38 ~ 19.44.39 |
 | `Hide player flyout menu` | Adds options to hide player flyout menu components. | 18.29.38 ~ 19.44.39 |
-| `Hide shortcuts` | Remove, at compile time, the app shortcuts that appears when app icon is long pressed. | 18.29.38 ~ 19.44.39 |
+| `Hide shortcuts` | Remove, at compile time, the app shortcuts that appears when the app icon is long pressed. | 18.29.38 ~ 19.44.39 |
 | `Hook YouTube Music actions` | Adds support for opening music in RVX Music using the in-app YouTube Music button. | 18.29.38 ~ 19.44.39 |
 | `Hook download actions` | Adds support to download videos with an external downloader app using the in-app download button. | 18.29.38 ~ 19.44.39 |
 | `Layout switch` | Adds an option to spoof the dpi in order to use a tablet or phone layout. | 18.29.38 ~ 19.44.39 |
@@ -68,7 +68,7 @@ See the [documentation](https://github.com/inotia00/revanced-documentation#readm
 | `Spoof streaming data` | Adds options to spoof the streaming data to allow playback. | 18.29.38 ~ 19.44.39 |
 | `Swipe controls` | Adds options for controlling volume and brightness with swiping, and whether to enter fullscreen when swiping down below the player. | 18.29.38 ~ 19.44.39 |
 | `Theme` | Changes the app's theme to the values specified in patch options. | 18.29.38 ~ 19.44.39 |
-| `Toolbar components` | Adds options to hide or change components located on the toolbar, such as toolbar buttons, search bar, and header. | 18.29.38 ~ 19.44.39 |
+| `Toolbar components` | Adds options to hide or change components located on the toolbar, such as the search bar, header, and toolbar buttons. | 18.29.38 ~ 19.44.39 |
 | `Translations for YouTube` | Add translations or remove string resources. | 18.29.38 ~ 19.44.39 |
 | `Video playback` | Adds options to customize settings related to video playback, such as default video quality and playback speed. | 18.29.38 ~ 19.44.39 |
 | `Visual preferences icons for YouTube` | Adds icons to specific preferences in the settings. | 18.29.38 ~ 19.44.39 |
@@ -80,19 +80,20 @@ See the [documentation](https://github.com/inotia00/revanced-documentation#readm
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `Amoled` | Applies a pure black theme to some components. | 6.20.51 ~ 7.25.53 |
 | `Bitrate default value` | Sets the audio quality to 'Always High' when you first install the app. | 6.20.51 ~ 7.25.53 |
 | `Bypass image region restrictions` | Adds an option to use a different host for static images, so that images blocked in some countries can be received. | 6.20.51 ~ 7.25.53 |
 | `Certificate spoof` | Enables YouTube Music to work with Android Auto by spoofing the YouTube Music certificate. | 6.20.51 ~ 7.25.53 |
-| `Change share sheet` | Add option to change from in-app share sheet to system share sheet. | 6.20.51 ~ 7.25.53 |
+| `Change share sheet` | Adds an option to change the in-app share sheet to the system share sheet. | 6.20.51 ~ 7.25.53 |
 | `Change start page` | Adds an option to set which page the app opens in instead of the homepage. | 6.20.51 ~ 7.25.53 |
 | `Custom branding icon for YouTube Music` | Changes the YouTube Music app icon to the icon specified in patch options. | 6.20.51 ~ 7.25.53 |
 | `Custom branding name for YouTube Music` | Renames the YouTube Music app to the name specified in patch options. | 6.20.51 ~ 7.25.53 |
 | `Custom header for YouTube Music` | Applies a custom header in the top left corner within the app. | 6.20.51 ~ 7.25.53 |
+| `Dark theme` | Changes the app's dark theme to the values specified in patch options. | 6.20.51 ~ 7.25.53 |
 | `Disable Cairo splash animation` | Adds an option to disable Cairo splash animation. | 7.06.54 ~ 7.25.53 |
 | `Disable DRC audio` | Adds an option to disable DRC (Dynamic Range Compression) audio. | 6.20.51 ~ 7.25.53 |
 | `Disable auto captions` | Adds an option to disable captions from being automatically enabled. | 6.20.51 ~ 7.25.53 |
 | `Disable dislike redirection` | Adds an option to disable redirection to the next track when clicking the Dislike button. | 6.20.51 ~ 7.25.53 |
+| `Disable music video in album` | Adds option to redirect music videos from albums for non-premium users. | 6.20.51 ~ 7.25.53 |
 | `Enable OPUS codec` | Adds an options to enable the OPUS audio codec if the player response includes. | 6.20.51 ~ 7.25.53 |
 | `Enable debug logging` | Adds an option to enable debug logging. | 6.20.51 ~ 7.25.53 |
 | `Enable landscape mode` | Adds an option to enable landscape mode when rotating the screen on phones. | 6.20.51 ~ 7.25.53 |
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/AlbumMusicVideoPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/AlbumMusicVideoPatch.java
new file mode 100644
index 000000000..b6489c720
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/AlbumMusicVideoPatch.java
@@ -0,0 +1,186 @@
+package app.revanced.extension.music.patches.misc;
+
+import android.view.View;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import app.revanced.extension.music.patches.misc.requests.PipedRequester;
+import app.revanced.extension.music.settings.Settings;
+import app.revanced.extension.music.shared.VideoInformation;
+import app.revanced.extension.music.utils.VideoUtils;
+import app.revanced.extension.shared.utils.Logger;
+
+@SuppressWarnings("unused")
+public class AlbumMusicVideoPatch {
+
+    public enum RedirectType {
+        REDIRECT,
+        ON_CLICK,
+        ON_LONG_CLICK
+    }
+
+    private static final RedirectType REDIRECT_TYPE =
+            Settings.DISABLE_MUSIC_VIDEO_IN_ALBUM_REDIRECT_TYPE.get();
+
+    private static final boolean DISABLE_MUSIC_VIDEO_IN_ALBUM =
+            Settings.DISABLE_MUSIC_VIDEO_IN_ALBUM.get();
+
+    private static final boolean REDIRECT = REDIRECT_TYPE == RedirectType.REDIRECT;
+
+    private static final boolean ON_CLICK = REDIRECT_TYPE == RedirectType.ON_CLICK;
+
+    private static final boolean ON_LONG_CLICK = REDIRECT_TYPE == RedirectType.ON_LONG_CLICK;
+
+    private static final String YOUTUBE_MUSIC_ALBUM_PREFIX = "OLAK";
+
+    private static final AtomicBoolean isVideoLaunched = new AtomicBoolean(false);
+
+    @NonNull
+    private static volatile String playerResponseVideoId = "";
+
+    @NonNull
+    private static volatile String currentVideoId = "";
+
+    @GuardedBy("itself")
+    private static final Map<String, String> lastVideoIds = new LinkedHashMap<>() {
+        private static final int NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK = 10;
+
+        @Override
+        protected boolean removeEldestEntry(Map.Entry eldest) {
+            return size() > NUMBER_OF_LAST_VIDEO_IDS_TO_TRACK;
+        }
+    };
+
+    /**
+     * Injection point.
+     */
+    public static void newPlayerResponse(@NonNull String videoId, @NonNull String playlistId, final int playlistIndex) {
+        if (!DISABLE_MUSIC_VIDEO_IN_ALBUM) {
+            return;
+        }
+        if (!playlistId.startsWith(YOUTUBE_MUSIC_ALBUM_PREFIX)) {
+            return;
+        }
+        if (playlistIndex < 0) {
+            return;
+        }
+        if (playerResponseVideoId.equals(videoId)) {
+            return;
+        }
+        playerResponseVideoId = videoId;
+
+        // Fetch Piped instance.
+        PipedRequester.fetchRequestIfNeeded(videoId, playlistId, playlistIndex);
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void newVideoLoaded(@NonNull String videoId) {
+        if (!DISABLE_MUSIC_VIDEO_IN_ALBUM) {
+            return;
+        }
+        if (currentVideoId.equals(videoId)) {
+            return;
+        }
+        currentVideoId = videoId;
+        checkVideo(videoId);
+    }
+
+    private static void checkVideo(@NonNull String videoId) {
+        try {
+            PipedRequester request = PipedRequester.getRequestForVideoId(videoId);
+            if (request == null) {
+                return;
+            }
+            String songId = request.getStream();
+            if (songId == null) {
+                return;
+            }
+            synchronized (lastVideoIds) {
+                if (lastVideoIds.put(videoId, songId) == null) {
+                    Logger.printDebug(() -> "Official song found, videoId: " + videoId + ", songId: " + songId);
+                    if (REDIRECT) {
+                        openMusic(songId);
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "check failure", ex);
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean openMusic() {
+        if (DISABLE_MUSIC_VIDEO_IN_ALBUM && ON_CLICK) {
+            try {
+                String videoId = VideoInformation.getVideoId();
+                synchronized (lastVideoIds) {
+                    String songId = lastVideoIds.get(videoId);
+                    if (songId != null) {
+                        openMusic(songId);
+                        return true;
+                    }
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "openMusic failure", ex);
+            }
+        }
+        return false;
+    }
+
+    private static void openMusic(@NonNull String songId) {
+        try {
+            isVideoLaunched.compareAndSet(false, true);
+
+            // The newly opened video is not a music video.
+            // To prevent fetch requests from being sent, set the video id to the newly opened video
+            VideoUtils.runOnMainThreadDelayed(() -> {
+                playerResponseVideoId = songId;
+                currentVideoId = songId;
+                VideoUtils.openInYouTubeMusic(songId);
+            }, 500);
+
+            VideoUtils.runOnMainThreadDelayed(() -> isVideoLaunched.compareAndSet(true, false), 1500);
+        } catch (Exception ex) {
+            Logger.printException(() -> "openMusic failure", ex);
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void setAudioVideoSwitchToggleOnLongClickListener(View view) {
+        if (DISABLE_MUSIC_VIDEO_IN_ALBUM && ON_LONG_CLICK) {
+            view.setOnLongClickListener(v -> {
+                try {
+                    String videoId = VideoInformation.getVideoId();
+                    synchronized (lastVideoIds) {
+                        String songId = lastVideoIds.get(videoId);
+                        if (songId != null) {
+                            openMusic(songId);
+                        }
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "onLongClickListener failure", ex);
+                }
+                return true;
+            });
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean hideSnackBar() {
+        return DISABLE_MUSIC_VIDEO_IN_ALBUM && isVideoLaunched.get();
+    }
+
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/requests/PipedRequester.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/requests/PipedRequester.java
new file mode 100644
index 000000000..d88623742
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/requests/PipedRequester.java
@@ -0,0 +1,177 @@
+package app.revanced.extension.music.patches.misc.requests;
+
+import android.annotation.SuppressLint;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.utils.Logger;
+import app.revanced.extension.shared.utils.Utils;
+
+public class PipedRequester {
+    /**
+     * How long to keep fetches until they are expired.
+     */
+    private static final long CACHE_RETENTION_TIME_MILLISECONDS = 60 * 1000; // 1 Minute
+
+    private static final long MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000; // 20 seconds
+
+    @GuardedBy("itself")
+    private static final Map<String, PipedRequester> cache = new HashMap<>();
+
+    @SuppressLint("ObsoleteSdkInt")
+    public static void fetchRequestIfNeeded(@NonNull String videoId, @NonNull String playlistId, final int playlistIndex) {
+        synchronized (cache) {
+            final long now = System.currentTimeMillis();
+
+            cache.values().removeIf(request -> {
+                final boolean expired = request.isExpired(now);
+                if (expired) Logger.printDebug(() -> "Removing expired stream: " + request.videoId);
+                return expired;
+            });
+
+            if (!cache.containsKey(videoId)) {
+                PipedRequester pipedRequester = new PipedRequester(videoId, playlistId, playlistIndex);
+                cache.put(videoId, pipedRequester);
+            }
+        }
+    }
+
+    @Nullable
+    public static PipedRequester getRequestForVideoId(@Nullable String videoId) {
+        synchronized (cache) {
+            return cache.get(videoId);
+        }
+    }
+
+    /**
+     * TCP timeout
+     */
+    private static final int TIMEOUT_TCP_DEFAULT_MILLISECONDS = 2 * 1000; // 2 seconds
+
+    /**
+     * HTTP response timeout
+     */
+    private static final int TIMEOUT_HTTP_DEFAULT_MILLISECONDS = 4 * 1000; // 4 seconds
+
+    @Nullable
+    private static JSONObject send(@NonNull String videoId, @NonNull String playlistId, final int playlistIndex) {
+        final long startTime = System.currentTimeMillis();
+        Logger.printDebug(() -> "Fetching piped instances (videoId: '" + videoId +
+                "', playlistId: '" + playlistId + "', playlistIndex: '" + playlistIndex + "'");
+
+        try {
+            HttpURLConnection connection = PipedRoutes.getPlaylistConnectionFromRoute(playlistId);
+            connection.setConnectTimeout(TIMEOUT_TCP_DEFAULT_MILLISECONDS);
+            connection.setReadTimeout(TIMEOUT_HTTP_DEFAULT_MILLISECONDS);
+
+            final int responseCode = connection.getResponseCode();
+            if (responseCode == 200) return Requester.parseJSONObject(connection);
+
+            handleConnectionError("API not available: " + responseCode);
+        } catch (SocketTimeoutException ex) {
+            handleConnectionError("Connection timeout", ex);
+        } catch (IOException ex) {
+            handleConnectionError("Network error", ex);
+        } catch (Exception ex) {
+            Logger.printException(() -> "send failed", ex);
+        } finally {
+            Logger.printDebug(() -> "playlist: " + playlistId + " took: " + (System.currentTimeMillis() - startTime) + "ms");
+        }
+
+        return null;
+    }
+
+    @Nullable
+    private static String fetch(@NonNull String videoId, @NonNull String playlistId, final int playlistIndex) {
+        final JSONObject playlistJson = send(videoId, playlistId, playlistIndex);
+        if (playlistJson != null) {
+            try {
+                final String songId = playlistJson.getJSONArray("relatedStreams")
+                        .getJSONObject(playlistIndex)
+                        .getString("url")
+                        .replaceAll("/.+=", "");
+                if (songId.isEmpty()) {
+                    handleConnectionError("Url is empty!");
+                } else if (!songId.equals(videoId)) {
+                    return songId;
+                }
+            } catch (JSONException e) {
+                Logger.printDebug(() -> "Fetch failed while processing response data for response: " + playlistJson);
+            }
+        }
+
+        return null;
+    }
+
+    private static void handleConnectionError(@NonNull String errorMessage) {
+        handleConnectionError(errorMessage, null);
+    }
+
+    private static void handleConnectionError(@NonNull String errorMessage, @Nullable Exception ex) {
+        if (ex != null) {
+            Logger.printInfo(() -> errorMessage, ex);
+        }
+    }
+
+
+    /**
+     * Time this instance and the fetch future was created.
+     */
+    private final long timeFetched;
+    private final String videoId;
+    private final Future<String> future;
+
+    private PipedRequester(@NonNull String videoId, @NonNull String playlistId, final int playlistIndex) {
+        this.timeFetched = System.currentTimeMillis();
+        this.videoId = videoId;
+        this.future = Utils.submitOnBackgroundThread(() -> fetch(videoId, playlistId, playlistIndex));
+    }
+
+    public boolean isExpired(long now) {
+        final long timeSinceCreation = now - timeFetched;
+        if (timeSinceCreation > CACHE_RETENTION_TIME_MILLISECONDS) {
+            return true;
+        }
+
+        // Only expired if the fetch failed (API null response).
+        return (fetchCompleted() && getStream() == null);
+    }
+
+    /**
+     * @return if the fetch call has completed.
+     */
+    public boolean fetchCompleted() {
+        return future.isDone();
+    }
+
+    public String getStream() {
+        try {
+            return future.get(MAX_MILLISECONDS_TO_WAIT_FOR_FETCH, TimeUnit.MILLISECONDS);
+        } catch (TimeoutException ex) {
+            Logger.printInfo(() -> "getStream timed out", ex);
+        } catch (InterruptedException ex) {
+            Logger.printException(() -> "getStream interrupted", ex);
+            Thread.currentThread().interrupt(); // Restore interrupt status flag.
+        } catch (ExecutionException ex) {
+            Logger.printException(() -> "getStream failure", ex);
+        }
+
+        return null;
+    }
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/requests/PipedRoutes.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/requests/PipedRoutes.java
new file mode 100644
index 000000000..fff5070df
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/requests/PipedRoutes.java
@@ -0,0 +1,22 @@
+package app.revanced.extension.music.patches.misc.requests;
+
+import static app.revanced.extension.shared.requests.Route.Method.GET;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.requests.Route;
+
+class PipedRoutes {
+    private static final String PIPED_URL = "https://pipedapi.kavin.rocks/";
+    private static final Route GET_PLAYLIST = new Route(GET, "playlists/{playlist_id}");
+
+    private PipedRoutes() {
+    }
+
+    static HttpURLConnection getPlaylistConnectionFromRoute(String... params) throws IOException {
+        return Requester.getConnectionFromRoute(PIPED_URL, GET_PLAYLIST, params);
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/navigation/NavigationPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/navigation/NavigationPatch.java
index bf99b8fe6..904aced74 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/navigation/NavigationPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/navigation/NavigationPatch.java
@@ -8,13 +8,16 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
+import app.revanced.extension.music.patches.utils.PatchStatus;
 import app.revanced.extension.music.settings.Settings;
 import app.revanced.extension.shared.utils.ResourceUtils;
 
 @SuppressWarnings("unused")
 public class NavigationPatch {
-    private static final int colorGrey12 =
-            ResourceUtils.getColor("revanced_color_grey_12");
+    private static final int colorGrey12 = PatchStatus.DarkTheme()
+            ? ResourceUtils.getColor("ytm_color_grey_12")
+            : ResourceUtils.getColor("revanced_color_grey_12");
+
     public static Enum<?> lastPivotTab;
 
     public static int enableBlackNavigationBar() {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/DrawableColorPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/DrawableColorPatch.java
index ddb7b0101..1c79d233d 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/DrawableColorPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/DrawableColorPatch.java
@@ -1,21 +1,50 @@
 package app.revanced.extension.music.patches.utils;
 
+import android.graphics.drawable.Drawable;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import app.revanced.extension.shared.utils.ResourceUtils;
+
 @SuppressWarnings("unused")
 public class DrawableColorPatch {
     private static final int[] DARK_VALUES = {
-            -14606047 // comments box background
+            -14606047, // comments box background
+            -16579837, // button container background in album
+            -16777216, // button container background in playlist
     };
 
-    public static int getLithoColor(int originalValue) {
-        if (anyEquals(originalValue, DARK_VALUES))
-            return -16777215;
+    // background colors
+    private static final Drawable headerGradient =
+            ResourceUtils.getDrawable("revanced_header_gradient");
+    private static final int blackColor =
+            ResourceUtils.getColor("yt_black1");
+    private static final int elementsContainerIdentifier =
+            ResourceUtils.getIdIdentifier("elements_container");
 
-        return originalValue;
+    public static int getLithoColor(int originalValue) {
+        return ArrayUtils.contains(DARK_VALUES, originalValue)
+                ? blackColor
+                : originalValue;
     }
 
-    private static boolean anyEquals(int value, int... of) {
-        for (int v : of) if (value == v) return true;
-        return false;
+    public static void setHeaderGradient(ViewGroup viewGroup) {
+        viewGroup.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
+            if (!(viewGroup instanceof FrameLayout frameLayout))
+                return;
+            if (!(frameLayout.getChildAt(0) instanceof ViewGroup parentViewGroup))
+                return;
+            if (!(parentViewGroup.getChildAt(0) instanceof ImageView gradientView))
+                return;
+            // For some reason, it sometimes applies to other lithoViews.
+            // To prevent this, check the viewId before applying the gradient.
+            if (headerGradient != null && viewGroup.getId() == elementsContainerIdentifier) {
+                gradientView.setForeground(headerGradient);
+            }
+        });
     }
 }
 
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/PatchStatus.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/PatchStatus.java
index 08abcf94a..1976df37c 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/PatchStatus.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/utils/PatchStatus.java
@@ -2,6 +2,11 @@ package app.revanced.extension.music.patches.utils;
 
 @SuppressWarnings("unused")
 public class PatchStatus {
+    public static boolean DarkTheme() {
+        // Replace this with true if the Dark theme patch succeeds
+        return false;
+    }
+
     public static boolean SpoofAppVersionDefaultBoolean() {
         return false;
     }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java
index 77bac406c..0bd1fd28b 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/settings/Settings.java
@@ -6,6 +6,7 @@ import static app.revanced.extension.music.sponsorblock.objects.CategoryBehaviou
 
 import androidx.annotation.NonNull;
 
+import app.revanced.extension.music.patches.misc.AlbumMusicVideoPatch.RedirectType;
 import app.revanced.extension.music.patches.misc.client.AppClient.ClientType;
 import app.revanced.extension.music.patches.utils.PatchStatus;
 import app.revanced.extension.music.sponsorblock.SponsorBlockSettings;
@@ -116,7 +117,7 @@ public class Settings extends BaseSettings {
 
 
     // PreferenceScreen: Navigation bar
-    public static final BooleanSetting ENABLE_BLACK_NAVIGATION_BAR = new BooleanSetting("revanced_enable_black_navigation_bar", TRUE);
+    public static final BooleanSetting ENABLE_BLACK_NAVIGATION_BAR = new BooleanSetting("revanced_enable_black_navigation_bar", FALSE);
     public static final BooleanSetting HIDE_NAVIGATION_HOME_BUTTON = new BooleanSetting("revanced_hide_navigation_home_button", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_SAMPLES_BUTTON = new BooleanSetting("revanced_hide_navigation_samples_button", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_EXPLORE_BUTTON = new BooleanSetting("revanced_hide_navigation_explore_button", FALSE, true);
@@ -178,6 +179,8 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting CHANGE_SHARE_SHEET = new BooleanSetting("revanced_change_share_sheet", FALSE, true);
     public static final BooleanSetting DISABLE_CAIRO_SPLASH_ANIMATION = new BooleanSetting("revanced_disable_cairo_splash_animation", FALSE, true);
     public static final BooleanSetting DISABLE_DRC_AUDIO = new BooleanSetting("revanced_disable_drc_audio", FALSE, true);
+    public static final BooleanSetting DISABLE_MUSIC_VIDEO_IN_ALBUM = new BooleanSetting("revanced_disable_music_video_in_album", FALSE, true);
+    public static final EnumSetting<RedirectType> DISABLE_MUSIC_VIDEO_IN_ALBUM_REDIRECT_TYPE = new EnumSetting<>("revanced_disable_music_video_in_album_redirect_type", RedirectType.REDIRECT, true);
     public static final BooleanSetting ENABLE_OPUS_CODEC = new BooleanSetting("revanced_enable_opus_codec", FALSE, true);
     public static final BooleanSetting SETTINGS_IMPORT_EXPORT = new BooleanSetting("revanced_extended_settings_import_export", FALSE, false);
     public static final BooleanSetting SPOOF_CLIENT = new BooleanSetting("revanced_spoof_client", FALSE, true);
@@ -247,6 +250,7 @@ public class Settings extends BaseSettings {
             CHANGE_START_PAGE.key,
             CUSTOM_FILTER_STRINGS.key,
             CUSTOM_PLAYBACK_SPEEDS.key,
+            DISABLE_MUSIC_VIDEO_IN_ALBUM_REDIRECT_TYPE.key,
             EXTERNAL_DOWNLOADER_PACKAGE_NAME.key,
             HIDE_ACCOUNT_MENU_FILTER_STRINGS.key,
             SB_API_URL.key,
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java b/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java
index 313588ef9..1245e8dce 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ReVancedPreferenceFragment.java
@@ -4,6 +4,7 @@ import static app.revanced.extension.music.settings.Settings.BYPASS_IMAGE_REGION
 import static app.revanced.extension.music.settings.Settings.CHANGE_START_PAGE;
 import static app.revanced.extension.music.settings.Settings.CUSTOM_FILTER_STRINGS;
 import static app.revanced.extension.music.settings.Settings.CUSTOM_PLAYBACK_SPEEDS;
+import static app.revanced.extension.music.settings.Settings.DISABLE_MUSIC_VIDEO_IN_ALBUM_REDIRECT_TYPE;
 import static app.revanced.extension.music.settings.Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME;
 import static app.revanced.extension.music.settings.Settings.HIDE_ACCOUNT_MENU_FILTER_STRINGS;
 import static app.revanced.extension.music.settings.Settings.OPEN_DEFAULT_APP_SETTINGS;
@@ -160,9 +161,11 @@ public class ReVancedPreferenceFragment extends PreferenceFragment {
                     Logger.printDebug(() -> "Failed to find the right value: " + dataString);
                 }
             } else if (settings instanceof EnumSetting<?> enumSetting) {
-                if (settings.equals(RETURN_YOUTUBE_USERNAME_DISPLAY_FORMAT)
+                if (settings.equals(DISABLE_MUSIC_VIDEO_IN_ALBUM_REDIRECT_TYPE)
+                        || settings.equals(RETURN_YOUTUBE_USERNAME_DISPLAY_FORMAT)
                         || settings.equals(SPOOF_CLIENT_TYPE)
-                        || settings.equals(SPOOF_STREAMING_DATA_TYPE)) {
+                        || settings.equals(SPOOF_STREAMING_DATA_TYPE)
+                ) {
                     ResettableListPreference.showDialog(mActivity, enumSetting, 0);
                 }
             }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ResettableListPreference.java b/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ResettableListPreference.java
index b01f5bf2d..f0c68b46f 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ResettableListPreference.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/settings/preference/ResettableListPreference.java
@@ -8,7 +8,10 @@ import android.app.Activity;
 
 import androidx.annotation.NonNull;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import java.util.Arrays;
+import java.util.Locale;
 
 import app.revanced.extension.shared.settings.EnumSetting;
 import app.revanced.extension.shared.settings.Setting;
@@ -57,7 +60,7 @@ public class ResettableListPreference {
             final String[] mEntries = getStringArray(entryKey);
             final String[] mEntryValues = getStringArray(entryValueKey);
 
-            final int findIndex = Arrays.binarySearch(mEntryValues, setting.get().toString());
+            final int findIndex = ArrayUtils.indexOf(mEntryValues, setting.get().toString().toUpperCase(Locale.ENGLISH));
             mClickedDialogEntryIndex = findIndex >= 0 ? findIndex : defaultIndex;
 
             getDialogBuilder(mActivity)
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/shared/PlayerType.kt b/extensions/shared/src/main/java/app/revanced/extension/music/shared/PlayerType.kt
index 5ca6ba944..9a274a6cf 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/shared/PlayerType.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/shared/PlayerType.kt
@@ -18,7 +18,7 @@ enum class PlayerType {
 
     companion object {
 
-        private val nameToPlayerType = values().associateBy { it.name }
+        private val nameToPlayerType = entries.associateBy { it.name }
 
         @JvmStatic
         fun setFromString(enumName: String) {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/shared/VideoType.kt b/extensions/shared/src/main/java/app/revanced/extension/music/shared/VideoType.kt
index 87711a27e..af78d1945 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/shared/VideoType.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/shared/VideoType.kt
@@ -19,7 +19,7 @@ enum class VideoType {
 
     companion object {
 
-        private val nameToVideoType = values().associateBy { it.name }
+        private val nameToVideoType = entries.associateBy { it.name }
 
         @JvmStatic
         fun setFromString(enumName: String) {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/utils/VideoUtils.java b/extensions/shared/src/main/java/app/revanced/extension/music/utils/VideoUtils.java
index 059c311bd..9f2b6b22f 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/music/utils/VideoUtils.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/music/utils/VideoUtils.java
@@ -71,6 +71,13 @@ public class VideoUtils extends IntentUtils {
         launchView(url, context.getPackageName());
     }
 
+    /**
+     * Rest of the implementation added by patch.
+     */
+    public static void dismissQueue() {
+        Log.d("Extended: VideoUtils", "Queue dismissed");
+    }
+
     /**
      * Rest of the implementation added by patch.
      */
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BaseSettingsMenuPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BaseSettingsMenuPatch.java
index 4ce7e63a8..04da5c224 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BaseSettingsMenuPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/BaseSettingsMenuPatch.java
@@ -1,5 +1,6 @@
 package app.revanced.extension.shared.patches;
 
+import android.annotation.SuppressLint;
 import android.util.Log;
 
 import androidx.preference.PreferenceScreen;
@@ -10,6 +11,7 @@ public class BaseSettingsMenuPatch {
     /**
      * Rest of the implementation added by patch.
      */
+    @SuppressLint("LongLogTag")
     public static void removePreference(PreferenceScreen mPreferenceScreen, String key) {
         Log.d("Extended: SettingsMenuPatch", "key: " + key);
     }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/GmsCoreSupport.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/GmsCoreSupport.java
index 3b5004d3b..f0c5cd391 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/GmsCoreSupport.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/GmsCoreSupport.java
@@ -120,7 +120,11 @@ public class GmsCoreSupport {
             }
 
             // Check if GmsCore is whitelisted from battery optimizations.
-            if (batteryOptimizationsEnabled(mActivity)) {
+            if (isAndroidAutomotive(mActivity)) {
+                // Ignore Android Automotive devices (Google built-in),
+                // as there is no way to disable battery optimizations.
+                Logger.printDebug(() -> "Device is Android Automotive");
+            } else if (batteryOptimizationsEnabled(mActivity)) {
                 Logger.printInfo(() -> "GmsCore is not whitelisted from battery optimizations");
                 showBatteryOptimizationDialog(mActivity,
                         "gms_core_dialog_not_whitelisted_using_battery_optimizations_message",
@@ -220,6 +224,10 @@ public class GmsCoreSupport {
         return packageName;
     }
 
+    private static boolean isAndroidAutomotive(Context context) {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
+    }
+
     private static String getGmsCoreDownload() {
         final String vendorGroupId = getGmsCoreVendorGroupId();
         return switch (vendorGroupId) {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/PatchStatus.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/PatchStatus.java
index f5bcef97f..20bf9d5e0 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/PatchStatus.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/PatchStatus.java
@@ -6,13 +6,8 @@ public class PatchStatus {
         return false;
     }
 
-    public static boolean SpoofStreamingData() {
-        // Replace this with true If the Spoof streaming data patch succeeds
-        return false;
-    }
-
-    public static boolean SpoofStreamingDataAndroidOnlyDefaultBoolean() {
-        // Replace this with true If the Spoof streaming data patch succeeds in YouTube
+    public static boolean SpoofStreamingDataMusic() {
+        // Replace this with true If the Spoof streaming data patch succeeds in YouTube Music
         return false;
     }
 }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/AppClient.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/AppClient.java
deleted file mode 100644
index 67eee0854..000000000
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/AppClient.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package app.revanced.extension.shared.patches.client;
-
-import static app.revanced.extension.shared.utils.ResourceUtils.getString;
-
-import android.os.Build;
-
-import androidx.annotation.Nullable;
-
-import app.revanced.extension.shared.settings.BaseSettings;
-
-public class AppClient {
-    // IOS
-    /**
-     * Video not playable: Paid / Movie / Private / Age-restricted
-     * Note: Audio track available
-     */
-    private static final String PACKAGE_NAME_IOS = "com.google.ios.youtube";
-    /**
-     * The hardcoded client version of the iOS app used for InnerTube requests with this client.
-     *
-     * <p>
-     * It can be extracted by getting the latest release version of the app on
-     * <a href="https://apps.apple.com/us/app/youtube-watch-listen-stream/id544007664/">the App
-     * Store page of the YouTube app</a>, in the {@code What’s New} section.
-     * </p>
-     */
-    private static final String CLIENT_VERSION_IOS = "19.29.1";
-    /**
-     * The device machine id for the iPhone 15 Pro Max (iPhone16,2), used to get HDR with AV1 hardware decoding.
-     *
-     * <p>
-     * See <a href="https://gist.github.com/adamawolf/3048717">this GitHub Gist</a> for more
-     * information.
-     * </p>
-     */
-    private static final String DEVICE_MODEL_IOS = "iPhone16,2";
-    private static final String OS_VERSION_IOS = "17.7.2.21H221";
-    private static final String USER_AGENT_VERSION_IOS = "17_7_2";
-    private static final String USER_AGENT_IOS =
-            iOSUserAgent(PACKAGE_NAME_IOS, CLIENT_VERSION_IOS);
-
-
-    // IOS UNPLUGGED
-    /**
-     * Video not playable: Paid / Movie
-     * Note: Audio track available
-     */
-    private static final String PACKAGE_NAME_IOS_UNPLUGGED = "com.google.ios.youtubeunplugged";
-    /**
-     * The hardcoded client version of the iOS app used for InnerTube requests with this client.
-     *
-     * <p>
-     * It can be extracted by getting the latest release version of the app on
-     * <a href="https://apps.apple.com/us/app/youtube-tv/id1193350206/">the App
-     * Store page of the YouTube TV app</a>, in the {@code What’s New} section.
-     * </p>
-     */
-    private static final String CLIENT_VERSION_IOS_UNPLUGGED = "8.33";
-    private static final String USER_AGENT_IOS_UNPLUGGED =
-            iOSUserAgent(PACKAGE_NAME_IOS_UNPLUGGED, CLIENT_VERSION_IOS_UNPLUGGED);
-
-
-    // IOS MUSIC
-    /**
-     * Video not playable: All videos that can't be played on YouTube Music
-     */
-    private static final String PACKAGE_NAME_IOS_MUSIC = "com.google.ios.youtubemusic";
-    /**
-     * The hardcoded client version of the iOS app used for InnerTube requests with this client.
-     *
-     * <p>
-     * It can be extracted by getting the latest release version of the app on
-     * <a href="https://apps.apple.com/us/app/youtube-music/id1017492454/">the App
-     * Store page of the YouTube Music app</a>, in the {@code What’s New} section.
-     * </p>
-     */
-    private static final String CLIENT_VERSION_IOS_MUSIC = "7.04";
-    private static final String USER_AGENT_IOS_MUSIC =
-            iOSUserAgent(PACKAGE_NAME_IOS_MUSIC, CLIENT_VERSION_IOS_MUSIC);
-
-
-    // ANDROID VR
-    /**
-     * Video not playable: Kids
-     * Note: Audio track is not available
-     * <p>
-     * Package name for YouTube VR (Google DayDream): com.google.android.apps.youtube.vr (Deprecated)
-     * Package name for YouTube VR (Meta Quests): com.google.android.apps.youtube.vr.oculus
-     * Package name for YouTube VR (ByteDance Pico 4): com.google.android.apps.youtube.vr.pico
-     */
-    private static final String PACKAGE_NAME_ANDROID_VR = "com.google.android.apps.youtube.vr.oculus";
-    /**
-     * The hardcoded client version of the Android VR app used for InnerTube requests with this client.
-     *
-     * <p>
-     * It can be extracted by getting the latest release version of the app on
-     * <a href="https://www.meta.com/en-us/experiences/2002317119880945/">the App
-     * Store page of the YouTube app</a>, in the {@code Additional details} section.
-     * </p>
-     */
-    private static final String CLIENT_VERSION_ANDROID_VR = "1.61.48";
-    /**
-     * The device machine id for the Meta Quest 3, used to get opus codec with the Android VR client.
-     *
-     * <p>
-     * See <a href="https://dumps.tadiphone.dev/dumps/oculus/eureka">this GitLab</a> for more
-     * information.
-     * </p>
-     */
-    private static final String DEVICE_MODEL_ANDROID_VR = "Quest 3";
-    private static final String OS_VERSION_ANDROID_VR = "12";
-    /**
-     * The SDK version for Android 12 is 31,
-     * but for some reason the build.props for the {@code Quest 3} state that the SDK version is 32.
-     */
-    private static final String ANDROID_SDK_VERSION_ANDROID_VR = "32";
-    private static final String USER_AGENT_ANDROID_VR =
-            androidUserAgent(PACKAGE_NAME_ANDROID_VR, CLIENT_VERSION_ANDROID_VR, OS_VERSION_ANDROID_VR);
-
-
-    // ANDROID UNPLUGGED
-    /**
-     * Video not playable: Playlists / Music
-     * Note: Audio track is not available
-     */
-    private static final String PACKAGE_NAME_ANDROID_UNPLUGGED = "com.google.android.apps.youtube.unplugged";
-    private static final String CLIENT_VERSION_ANDROID_UNPLUGGED = "8.16.0";
-    /**
-     * The device machine id for the Chromecast with Google TV 4K.
-     *
-     * <p>
-     * See <a href="https://dumps.tadiphone.dev/dumps/google/kirkwood">this GitLab</a> for more
-     * information.
-     * </p>
-     */
-    private static final String DEVICE_MODEL_ANDROID_UNPLUGGED = "Google TV Streamer";
-    private static final String OS_VERSION_ANDROID_UNPLUGGED = "14";
-    private static final String ANDROID_SDK_VERSION_ANDROID_UNPLUGGED = "34";
-    private static final String USER_AGENT_ANDROID_UNPLUGGED =
-            androidUserAgent(PACKAGE_NAME_ANDROID_UNPLUGGED, CLIENT_VERSION_ANDROID_UNPLUGGED, OS_VERSION_ANDROID_UNPLUGGED);
-
-
-    // ANDROID CREATOR
-    /**
-     * Video not playable: Livestream
-     * Note: Audio track is not available
-     */
-    private static final String PACKAGE_NAME_ANDROID_CREATOR = "com.google.android.apps.youtube.creator";
-    private static final String CLIENT_VERSION_ANDROID_CREATOR = "24.14.101";
-    private static final String DEVICE_MODEL_ANDROID_CREATOR = Build.MODEL;
-    private static final String OS_VERSION_ANDROID_CREATOR = Build.VERSION.RELEASE;
-    private static final String ANDROID_SDK_VERSION_ANDROID_CREATOR = String.valueOf(Build.VERSION.SDK_INT);
-    private static final String USER_AGENT_ANDROID_CREATOR =
-            androidUserAgent(PACKAGE_NAME_ANDROID_CREATOR, CLIENT_VERSION_ANDROID_CREATOR, OS_VERSION_ANDROID_CREATOR);
-
-
-    private AppClient() {
-    }
-
-    private static String androidUserAgent(String packageName, String clientVersion, String osVersion) {
-        return packageName +
-                "/" +
-                clientVersion +
-                " (Linux; U; Android " +
-                osVersion +
-                "; GB) gzip";
-    }
-
-    private static String iOSUserAgent(String packageName, String clientVersion) {
-        return packageName +
-                "/" +
-                clientVersion +
-                "(" +
-                DEVICE_MODEL_IOS +
-                "; U; CPU iOS " +
-                USER_AGENT_VERSION_IOS +
-                " like Mac OS X)";
-    }
-
-    public enum ClientType {
-        IOS(5,
-                DEVICE_MODEL_IOS,
-                OS_VERSION_IOS,
-                USER_AGENT_IOS,
-                null,
-                CLIENT_VERSION_IOS,
-                false
-        ),
-        ANDROID_VR(28,
-                DEVICE_MODEL_ANDROID_VR,
-                OS_VERSION_ANDROID_VR,
-                USER_AGENT_ANDROID_VR,
-                ANDROID_SDK_VERSION_ANDROID_VR,
-                CLIENT_VERSION_ANDROID_VR,
-                true
-        ),
-        ANDROID_UNPLUGGED(29,
-                DEVICE_MODEL_ANDROID_UNPLUGGED,
-                OS_VERSION_ANDROID_UNPLUGGED,
-                USER_AGENT_ANDROID_UNPLUGGED,
-                ANDROID_SDK_VERSION_ANDROID_UNPLUGGED,
-                CLIENT_VERSION_ANDROID_UNPLUGGED,
-                true
-        ),
-        ANDROID_CREATOR(14,
-                DEVICE_MODEL_ANDROID_CREATOR,
-                OS_VERSION_ANDROID_CREATOR,
-                USER_AGENT_ANDROID_CREATOR,
-                ANDROID_SDK_VERSION_ANDROID_CREATOR,
-                CLIENT_VERSION_ANDROID_CREATOR,
-                true
-        ),
-        IOS_UNPLUGGED(33,
-                DEVICE_MODEL_IOS,
-                OS_VERSION_IOS,
-                USER_AGENT_IOS_UNPLUGGED,
-                null,
-                CLIENT_VERSION_IOS_UNPLUGGED,
-                true
-        ),
-        IOS_MUSIC(
-                26,
-                DEVICE_MODEL_IOS,
-                OS_VERSION_IOS,
-                USER_AGENT_IOS_MUSIC,
-                null,
-                CLIENT_VERSION_IOS_MUSIC,
-                true
-        );
-
-        /**
-         * YouTube
-         * <a href="https://github.com/zerodytrash/YouTube-Internal-Clients?tab=readme-ov-file#clients">client type</a>
-         */
-        public final int id;
-
-        public final String clientName;
-
-        /**
-         * Device model, equivalent to {@link Build#MODEL} (System property: ro.product.model)
-         */
-        public final String deviceModel;
-
-        /**
-         * Device OS version.
-         */
-        public final String osVersion;
-
-        /**
-         * Player user-agent.
-         */
-        public final String userAgent;
-
-        /**
-         * Android SDK version, equivalent to {@link Build.VERSION#SDK} (System property: ro.build.version.sdk)
-         * Field is null if not applicable.
-         */
-        @Nullable
-        public final String androidSdkVersion;
-
-        /**
-         * App version.
-         */
-        public final String clientVersion;
-
-        /**
-         * If the client can access the API logged in.
-         */
-        public final boolean canLogin;
-
-        ClientType(int id,
-                   String deviceModel,
-                   String osVersion,
-                   String userAgent,
-                   @Nullable String androidSdkVersion,
-                   String clientVersion,
-                   boolean canLogin
-        ) {
-            this.id = id;
-            this.clientName = name();
-            this.deviceModel = deviceModel;
-            this.clientVersion = clientVersion;
-            this.osVersion = osVersion;
-            this.androidSdkVersion = androidSdkVersion;
-            this.userAgent = userAgent;
-            this.canLogin = canLogin;
-        }
-
-        private static final ClientType[] CLIENT_ORDER_TO_USE_ANDROID = {
-                ANDROID_VR,
-                ANDROID_UNPLUGGED,
-                ANDROID_CREATOR,
-        };
-
-        private static final ClientType[] CLIENT_ORDER_TO_USE_DEFAULT = {
-                IOS,
-                ANDROID_VR,
-                ANDROID_UNPLUGGED,
-                IOS_UNPLUGGED,
-                IOS_MUSIC,
-        };
-
-        public final String getFriendlyName() {
-            return getString("revanced_spoof_streaming_data_type_entry_" + name().toLowerCase());
-        }
-    }
-
-    public static ClientType[] getAvailableClientTypes() {
-        return BaseSettings.SPOOF_STREAMING_DATA_ANDROID_ONLY.get()
-                ? ClientType.CLIENT_ORDER_TO_USE_ANDROID
-                : ClientType.CLIENT_ORDER_TO_USE_DEFAULT;
-    }
-}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/AppClient.kt b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/AppClient.kt
new file mode 100644
index 000000000..4dcb61c31
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/AppClient.kt
@@ -0,0 +1,351 @@
+package app.revanced.extension.shared.patches.client
+
+import android.os.Build
+import app.revanced.extension.shared.patches.PatchStatus
+import app.revanced.extension.shared.settings.BaseSettings
+import org.apache.commons.lang3.ArrayUtils
+
+/**
+ * Used to fetch streaming data.
+ */
+object AppClient {
+    // IOS
+    /**
+     * Video not playable: Paid / Movie / Private / Age-restricted
+     * Note: Audio track available
+     */
+    private const val PACKAGE_NAME_IOS = "com.google.ios.youtube"
+
+    /**
+     * The hardcoded client version of the iOS app used for InnerTube requests with this client.
+     *
+     * It can be extracted by getting the latest release version of the app on
+     * [the App Store page of the YouTube app](https://apps.apple.com/us/app/youtube-watch-listen-stream/id544007664/),
+     * in the `What’s New` section.
+     */
+    private val CLIENT_VERSION_IOS = if (forceAVC())
+        "17.40.5"
+    else
+        "19.29.1"
+
+    private const val DEVICE_MAKE_IOS = "Apple"
+    private const val OS_NAME_IOS = "iOS"
+
+    /**
+     * The device machine id for the iPhone 15 Pro Max (iPhone16,2),
+     * used to get HDR with AV1 hardware decoding.
+     * See [this GitHub Gist](https://gist.github.com/adamawolf/3048717) for more information.
+     */
+    private val DEVICE_MODEL_IOS = if (forceAVC())
+        "iPhone12,5" // 11 Pro Max. (last device with iOS 13)
+    else
+        "iPhone16,2" // 15 Pro Max.
+    private val OS_VERSION_IOS = if (forceAVC())
+        "13.7.17H35" // Last release of iOS 13.
+    else
+        "17.7.2.21H221"
+    private val USER_AGENT_VERSION_IOS = if (forceAVC())
+        "13_7"
+    else
+        "17_7_2"
+    private val USER_AGENT_IOS = iOSUserAgent(PACKAGE_NAME_IOS, CLIENT_VERSION_IOS)
+
+
+    // IOS UNPLUGGED
+    /**
+     * Video not playable: Paid / Movie / Playlists / Music
+     * Note: Audio track available
+     */
+    private const val PACKAGE_NAME_IOS_UNPLUGGED = "com.google.ios.youtubeunplugged"
+
+    /**
+     * The hardcoded client version of the iOS app used for InnerTube requests with this client.
+     *
+     * It can be extracted by getting the latest release version of the app on
+     * [the App Store page of the YouTube TV app](https://apps.apple.com/us/app/youtube-tv/id1193350206/),
+     * in the `What’s New` section.
+     */
+    private val CLIENT_VERSION_IOS_UNPLUGGED = if (forceAVC())
+        "6.45"
+    else
+        "8.33"
+    private val USER_AGENT_IOS_UNPLUGGED =
+        iOSUserAgent(PACKAGE_NAME_IOS_UNPLUGGED, CLIENT_VERSION_IOS_UNPLUGGED)
+
+
+    // ANDROID VR
+    /**
+     * Video not playable: Kids
+     * Note: Audio track is not available
+     *
+     * Package name for YouTube VR (Google DayDream): com.google.android.apps.youtube.vr (Deprecated)
+     * Package name for YouTube VR (Meta Quests): com.google.android.apps.youtube.vr.oculus
+     * Package name for YouTube VR (ByteDance Pico 4): com.google.android.apps.youtube.vr.pico
+     */
+    private const val PACKAGE_NAME_ANDROID_VR = "com.google.android.apps.youtube.vr.oculus"
+
+    /**
+     * The hardcoded client version of the Android VR app used for InnerTube requests with this client.
+     *
+     * It can be extracted by getting the latest release version of the app on
+     * [the App Store page of the YouTube app](https://www.meta.com/en-us/experiences/2002317119880945/),
+     * in the `Additional details` section.
+     */
+    private const val CLIENT_VERSION_ANDROID_VR = "1.61.48"
+
+    /**
+     * The device machine id for the Meta Quest 3, used to get opus codec with the Android VR client.
+     * See [this GitLab](https://dumps.tadiphone.dev/dumps/oculus/eureka) for more information.
+     */
+    private const val DEVICE_MODEL_ANDROID_VR = "Quest 3"
+    private const val DEVICE_MAKE_ANDROID_VR = "Oculus"
+    private const val OS_VERSION_ANDROID_VR = "12"
+
+    /**
+     * The SDK version for Android 12 is 31,
+     * but for some reason the build.props for the `Quest 3` state that the SDK version is 32.
+     */
+    private const val ANDROID_SDK_VERSION_ANDROID_VR = "32"
+    private val USER_AGENT_ANDROID_VR =
+        androidUserAgent(PACKAGE_NAME_ANDROID_VR, CLIENT_VERSION_ANDROID_VR, OS_VERSION_ANDROID_VR)
+
+
+    // ANDROID UNPLUGGED
+    /**
+     * Video not playable: Playlists / Music
+     * Note: Audio track is not available
+     */
+    private const val PACKAGE_NAME_ANDROID_UNPLUGGED = "com.google.android.apps.youtube.unplugged"
+    private const val CLIENT_VERSION_ANDROID_UNPLUGGED = "8.16.0"
+
+    /**
+     * The device machine id for the Chromecast with Google TV 4K.
+     * See [this GitLab](https://dumps.tadiphone.dev/dumps/google/kirkwood) for more information.
+     */
+    private const val DEVICE_MODEL_ANDROID_UNPLUGGED = "Google TV Streamer"
+    private const val DEVICE_MAKE_ANDROID_UNPLUGGED = "Google"
+    private const val OS_VERSION_ANDROID_UNPLUGGED = "14"
+    private const val ANDROID_SDK_VERSION_ANDROID_UNPLUGGED = "34"
+    private val USER_AGENT_ANDROID_UNPLUGGED = androidUserAgent(
+        PACKAGE_NAME_ANDROID_UNPLUGGED,
+        CLIENT_VERSION_ANDROID_UNPLUGGED,
+        OS_VERSION_ANDROID_UNPLUGGED
+    )
+
+
+    // ANDROID CREATOR
+    /**
+     * Video not playable: Livestream / HDR
+     * Note: Audio track is not available
+     */
+    private const val PACKAGE_NAME_ANDROID_CREATOR = "com.google.android.apps.youtube.creator"
+    private const val CLIENT_VERSION_ANDROID_CREATOR = "23.47.101"
+
+    private val USER_AGENT_ANDROID_CREATOR = androidUserAgent(
+        PACKAGE_NAME_ANDROID_CREATOR,
+        CLIENT_VERSION_ANDROID_CREATOR
+    )
+
+
+    // ANDROID MUSIC
+    /**
+     * Video not playable: All videos that can't be played on YouTube Music
+     */
+    private const val PACKAGE_NAME_ANDROID_MUSIC = "com.google.android.apps.youtube.music"
+
+    /**
+     * Older client versions don't seem to require poToken.
+     * It is not the default client yet, as it requires sufficient testing.
+     */
+    private const val CLIENT_VERSION_ANDROID_MUSIC = "4.27.53"
+    private val USER_AGENT_ANDROID_MUSIC = androidUserAgent(
+        PACKAGE_NAME_ANDROID_MUSIC,
+        CLIENT_VERSION_ANDROID_MUSIC
+    )
+
+
+    private fun androidUserAgent(
+        packageName: String,
+        clientVersion: String,
+        osVersion: String? = Build.VERSION.RELEASE
+    ): String {
+        return packageName +
+                "/" +
+                clientVersion +
+                " (Linux; U; Android " +
+                osVersion +
+                "; GB) gzip"
+    }
+
+    private fun iOSUserAgent(packageName: String, clientVersion: String): String {
+        return packageName +
+                "/" +
+                clientVersion +
+                "(" +
+                DEVICE_MODEL_IOS +
+                "; U; CPU iOS " +
+                USER_AGENT_VERSION_IOS +
+                " like Mac OS X)"
+    }
+
+    private fun forceAVC(): Boolean {
+        return BaseSettings.SPOOF_STREAMING_DATA_IOS_FORCE_AVC.get()
+    }
+
+    fun availableClientTypes(preferredClient: ClientType): Array<ClientType> {
+        val availableClientTypes = if (PatchStatus.SpoofStreamingDataMusic())
+            ClientType.CLIENT_ORDER_TO_USE_YOUTUBE_MUSIC
+        else
+            ClientType.CLIENT_ORDER_TO_USE_YOUTUBE
+
+        if (ArrayUtils.contains(availableClientTypes, preferredClient)) {
+            val clientToUse: Array<ClientType?> = arrayOfNulls(availableClientTypes.size)
+            clientToUse[0] = preferredClient
+            var i = 1
+            for (c in availableClientTypes) {
+                if (c != preferredClient) {
+                    clientToUse[i++] = c
+                }
+            }
+            return clientToUse.filterNotNull().toTypedArray()
+        } else {
+            return availableClientTypes
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    enum class ClientType(
+        /**
+         * [YouTube client type](https://github.com/zerodytrash/YouTube-Internal-Clients?tab=readme-ov-file#clients)
+         */
+        val id: Int,
+        /**
+         * Device model, equivalent to [Build.MANUFACTURER] (System property: ro.product.vendor.manufacturer)
+         */
+        val deviceMake: String = Build.MANUFACTURER,
+        /**
+         * Device model, equivalent to [Build.MODEL] (System property: ro.product.model)
+         */
+        val deviceModel: String = Build.MODEL,
+        /**
+         * Device OS name.
+         */
+        val osName: String = "Android",
+        /**
+         * Device OS version, equivalent to [Build.VERSION.RELEASE] (System property: ro.system.build.version.release)
+         */
+        val osVersion: String = Build.VERSION.RELEASE,
+        /**
+         * Client user-agent.
+         */
+        val userAgent: String,
+        /**
+         * Android SDK version, equivalent to [Build.VERSION.SDK] (System property: ro.build.version.sdk)
+         */
+        val androidSdkVersion: String = Build.VERSION.SDK,
+        /**
+         * App version.
+         */
+        val clientVersion: String,
+        /**
+         * If the client can access the API logged in.
+         * If false, 'Authorization' must not be included.
+         */
+        val supportsCookies: Boolean = true,
+        /**
+         * If the client can only access the API logged in.
+         * If true, 'Authorization' must be included.
+         */
+        val requireAuth: Boolean = false,
+        /**
+         * Whether a poToken is required to get playback for more than 1 minute.
+         */
+        val requirePoToken: Boolean = false,
+        /**
+         * Friendly name displayed in stats for nerds.
+         */
+        val friendlyName: String
+    ) {
+        ANDROID_VR(
+            id = 28,
+            deviceMake = DEVICE_MAKE_ANDROID_VR,
+            deviceModel = DEVICE_MODEL_ANDROID_VR,
+            osVersion = OS_VERSION_ANDROID_VR,
+            userAgent = USER_AGENT_ANDROID_VR,
+            androidSdkVersion = ANDROID_SDK_VERSION_ANDROID_VR,
+            clientVersion = CLIENT_VERSION_ANDROID_VR,
+            friendlyName = "Android VR"
+        ),
+        ANDROID_UNPLUGGED(
+            id = 29,
+            deviceMake = DEVICE_MAKE_ANDROID_UNPLUGGED,
+            deviceModel = DEVICE_MODEL_ANDROID_UNPLUGGED,
+            osVersion = OS_VERSION_ANDROID_UNPLUGGED,
+            userAgent = USER_AGENT_ANDROID_UNPLUGGED,
+            androidSdkVersion = ANDROID_SDK_VERSION_ANDROID_UNPLUGGED,
+            clientVersion = CLIENT_VERSION_ANDROID_UNPLUGGED,
+            requireAuth = true,
+            friendlyName = "Android TV"
+        ),
+        ANDROID_CREATOR(
+            id = 14,
+            userAgent = USER_AGENT_ANDROID_CREATOR,
+            clientVersion = CLIENT_VERSION_ANDROID_CREATOR,
+            requireAuth = true,
+            friendlyName = "Android Studio"
+        ),
+        IOS_UNPLUGGED(
+            id = 33,
+            deviceMake = DEVICE_MAKE_IOS,
+            deviceModel = DEVICE_MODEL_IOS,
+            osName = OS_NAME_IOS,
+            osVersion = OS_VERSION_IOS,
+            userAgent = USER_AGENT_IOS_UNPLUGGED,
+            clientVersion = CLIENT_VERSION_IOS_UNPLUGGED,
+            requireAuth = true,
+            friendlyName = if (forceAVC())
+                "iOS TV Force AVC"
+            else
+                "iOS TV"
+        ),
+        IOS(
+            id = 5,
+            deviceMake = DEVICE_MAKE_IOS,
+            deviceModel = DEVICE_MODEL_IOS,
+            osName = OS_NAME_IOS,
+            osVersion = OS_VERSION_IOS,
+            userAgent = USER_AGENT_IOS,
+            clientVersion = CLIENT_VERSION_IOS,
+            supportsCookies = false,
+            requirePoToken = true,
+            friendlyName = if (forceAVC())
+                "iOS Force AVC"
+            else
+                "iOS"
+        ),
+        ANDROID_MUSIC(
+            id = 21,
+            userAgent = USER_AGENT_ANDROID_MUSIC,
+            clientVersion = CLIENT_VERSION_ANDROID_MUSIC,
+            requireAuth = true,
+            friendlyName = "Android Music"
+        );
+
+        val clientName: String = name
+
+        companion object {
+            val CLIENT_ORDER_TO_USE_YOUTUBE: Array<ClientType> = arrayOf(
+                ANDROID_VR,
+                ANDROID_UNPLUGGED,
+                IOS_UNPLUGGED,
+                ANDROID_CREATOR,
+                IOS,
+            )
+
+            internal val CLIENT_ORDER_TO_USE_YOUTUBE_MUSIC: Array<ClientType> = arrayOf(
+                ANDROID_VR,
+                ANDROID_MUSIC,
+            )
+        }
+    }
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/WebClient.kt b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/WebClient.kt
new file mode 100644
index 000000000..f39a56c60
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/WebClient.kt
@@ -0,0 +1,43 @@
+package app.revanced.extension.shared.patches.client
+
+/**
+ * Used to fetch video information.
+ */
+@Suppress("unused")
+object WebClient {
+    /**
+     * This user agent does not require a PoToken in [ClientType.MWEB]
+     * https://github.com/yt-dlp/yt-dlp/blob/0b6b7742c2e7f2a1fcb0b54ef3dd484bab404b3f/yt_dlp/extractor/youtube.py#L259
+     */
+    private const val USER_AGENT_SAFARI =
+        "Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)"
+
+    enum class ClientType(
+        /**
+         * [YouTube client type](https://github.com/zerodytrash/YouTube-Internal-Clients?tab=readme-ov-file#clients)
+         */
+        val id: Int,
+        /**
+         * Client user-agent.
+         */
+        @JvmField
+        val userAgent: String = USER_AGENT_SAFARI,
+        /**
+         * Client version.
+         */
+        @JvmField
+        val clientVersion: String
+    ) {
+        MWEB(
+            id = 2,
+            clientVersion = "2.20241202.07.00"
+        ),
+        WEB_REMIX(
+            id = 29,
+            clientVersion = "1.20241218.01.00",
+        );
+
+        @JvmField
+        val clientName: String = name
+    }
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java
index f1ca98e32..6bf264184 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java
@@ -1,10 +1,12 @@
 package app.revanced.extension.shared.patches.spoof;
 
-import static app.revanced.extension.shared.patches.PatchStatus.SpoofStreamingData;
+import static app.revanced.extension.shared.patches.PatchStatus.SpoofStreamingDataMusic;
 
 import android.net.Uri;
 import android.text.TextUtils;
+import android.util.Base64;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.nio.ByteBuffer;
@@ -19,7 +21,13 @@ import app.revanced.extension.shared.utils.Utils;
 
 @SuppressWarnings("unused")
 public class SpoofStreamingDataPatch {
-    public static final boolean SPOOF_STREAMING_DATA = SpoofStreamingData() && BaseSettings.SPOOF_STREAMING_DATA.get();
+    private static final boolean SPOOF_STREAMING_DATA = BaseSettings.SPOOF_STREAMING_DATA.get();
+    private static final boolean SPOOF_STREAMING_DATA_YOUTUBE = SPOOF_STREAMING_DATA && !SpoofStreamingDataMusic();
+    private static final boolean SPOOF_STREAMING_DATA_MUSIC = SPOOF_STREAMING_DATA && SpoofStreamingDataMusic();
+    private static final String PO_TOKEN =
+            BaseSettings.SPOOF_STREAMING_DATA_PO_TOKEN.get();
+    private static final String VISITOR_DATA =
+            BaseSettings.SPOOF_STREAMING_DATA_VISITOR_DATA.get();
 
     /**
      * Any unreachable ip address.  Used to intentionally fail requests.
@@ -27,6 +35,9 @@ public class SpoofStreamingDataPatch {
     private static final String UNREACHABLE_HOST_URI_STRING = "https://127.0.0.0";
     private static final Uri UNREACHABLE_HOST_URI = Uri.parse(UNREACHABLE_HOST_URI_STRING);
 
+    @NonNull
+    private static volatile String droidGuardPoToken = "";
+
     /**
      * Key: video id
      * Value: original video length [streamingData.formats.approxDurationMs]
@@ -50,16 +61,19 @@ public class SpoofStreamingDataPatch {
      */
     public static Uri blockGetWatchRequest(Uri playerRequestUri) {
         if (SPOOF_STREAMING_DATA) {
-            try {
-                String path = playerRequestUri.getPath();
+            // An exception may be thrown when the /get_watch request is blocked when connected to Wi-Fi in YouTube Music.
+            if (SPOOF_STREAMING_DATA_YOUTUBE || Utils.getNetworkType() == Utils.NetworkType.MOBILE) {
+                try {
+                    String path = playerRequestUri.getPath();
 
-                if (path != null && path.contains("get_watch")) {
-                    Logger.printDebug(() -> "Blocking 'get_watch' by returning unreachable uri");
+                    if (path != null && path.contains("get_watch")) {
+                        Logger.printDebug(() -> "Blocking 'get_watch' by returning unreachable uri");
 
-                    return UNREACHABLE_HOST_URI;
+                        return UNREACHABLE_HOST_URI;
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "blockGetWatchRequest failure", ex);
                 }
-            } catch (Exception ex) {
-                Logger.printException(() -> "blockGetWatchRequest failure", ex);
             }
         }
 
@@ -108,30 +122,99 @@ public class SpoofStreamingDataPatch {
         return false;
     }
 
+    private static volatile String auth = "";
+    private static volatile Map<String, String> requestHeader;
+
+    private static final String AUTHORIZATION_HEADER = "Authorization";
+
+    private static final String[] REQUEST_HEADER_KEYS = {
+            AUTHORIZATION_HEADER,
+            "X-GOOG-API-FORMAT-VERSION",
+            "X-Goog-Visitor-Id"
+    };
+
+    /**
+     * If the /get_watch request is not blocked,
+     * fetchRequest will not be invoked at the point where the video starts.
+     * <p>
+     * An additional method is used to invoke fetchRequest in YouTube Music:
+     * 1. Save the requestHeader in a field.
+     * 2. Invoke fetchRequest with the videoId used in PlaybackStartDescriptor.
+     * <p>
+     *
+     * @param requestHeaders Save the request Headers used for login to a field.
+     *                       Only used in YouTube Music where login is required.
+     */
+    private static void setRequestHeaders(Map<String, String> requestHeaders) {
+        if (SPOOF_STREAMING_DATA_MUSIC) {
+            try {
+                // Save requestHeaders whenever an account is switched.
+                String authorization = requestHeaders.get(AUTHORIZATION_HEADER);
+                if (authorization == null || auth.equals(authorization)) {
+                    return;
+                }
+                for (String key : REQUEST_HEADER_KEYS) {
+                    if (requestHeaders.get(key) == null) {
+                        return;
+                    }
+                }
+                auth = authorization;
+                requestHeader = requestHeaders;
+            } catch (Exception ex) {
+                Logger.printException(() -> "setRequestHeaders failure", ex);
+            }
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void fetchStreams(@NonNull String videoId) {
+        if (SPOOF_STREAMING_DATA_MUSIC) {
+            try {
+                if (requestHeader != null) {
+                    StreamingDataRequest.fetchRequest(videoId, requestHeader, VISITOR_DATA, PO_TOKEN, droidGuardPoToken);
+                } else {
+                    Logger.printDebug(() -> "Ignoring request with no header.");
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "fetchStreams failure", ex);
+            }
+        }
+    }
+
     /**
      * Injection point.
      */
     public static void fetchStreams(String url, Map<String, String> requestHeaders) {
+        setRequestHeaders(requestHeaders);
+
         if (SPOOF_STREAMING_DATA) {
             try {
                 Uri uri = Uri.parse(url);
                 String path = uri.getPath();
+                if (path == null || !path.contains("player")) {
+                    return;
+                }
 
+                // 'get_drm_license' has no video id and appears to happen when waiting for a paid video to start.
                 // 'heartbeat' has no video id and appears to be only after playback has started.
                 // 'refresh' has no video id and appears to happen when waiting for a livestream to start.
-                if (path != null && path.contains("player") && !path.contains("heartbeat")
-                        && !path.contains("refresh")) {
-                    String id = uri.getQueryParameter("id");
-                    if (id == null) {
-                        Logger.printException(() -> "Ignoring request that has no video id." +
-                                " Url: " + url + " headers: " + requestHeaders);
-                        return;
-                    }
-
-                    StreamingDataRequest.fetchRequest(id, requestHeaders);
+                // 'ad_break' has no video id.
+                if (path.contains("get_drm_license") || path.contains("heartbeat") || path.contains("refresh") || path.contains("ad_break")) {
+                    Logger.printDebug(() -> "Ignoring path: " + path);
+                    return;
                 }
+
+                String id = uri.getQueryParameter("id");
+                if (id == null) {
+                    Logger.printException(() -> "Ignoring request with no id: " + url);
+                    return;
+                }
+
+                StreamingDataRequest.fetchRequest(id, requestHeaders, VISITOR_DATA, PO_TOKEN, droidGuardPoToken);
             } catch (Exception ex) {
-                Logger.printException(() -> "buildRequest failure", ex);
+                Logger.printException(() -> "fetchStreams failure", ex);
             }
         }
     }
@@ -181,7 +264,7 @@ public class SpoofStreamingDataPatch {
      * Called after {@link #getStreamingData(String)}.
      */
     public static void setApproxDurationMs(String videoId, long approxDurationMs) {
-        if (approxDurationMs != Long.MAX_VALUE) {
+        if (SPOOF_STREAMING_DATA_YOUTUBE && approxDurationMs != Long.MAX_VALUE) {
             approxDurationMsMap.put(videoId, approxDurationMs);
             Logger.printDebug(() -> "New approxDurationMs loaded, video id: " + videoId + ", video length: " + approxDurationMs);
         }
@@ -203,11 +286,10 @@ public class SpoofStreamingDataPatch {
      * Called after {@link #getStreamingData(String)}.
      */
     public static long getApproxDurationMs(String videoId) {
-        if (SPOOF_STREAMING_DATA && videoId != null) {
+        if (SPOOF_STREAMING_DATA_YOUTUBE && videoId != null) {
             final Long approxDurationMs = approxDurationMsMap.get(videoId);
             if (approxDurationMs != null) {
                 Logger.printDebug(() -> "Replacing video length: " + approxDurationMs + " for videoId: " + videoId);
-                approxDurationMsMap.remove(videoId);
                 return approxDurationMs;
             }
         }
@@ -253,4 +335,17 @@ public class SpoofStreamingDataPatch {
 
         return videoFormat;
     }
+
+    /**
+     * Injection point.
+     */
+    public static void setDroidGuardPoToken(byte[] bytes) {
+        if (SPOOF_STREAMING_DATA && bytes.length > 20) {
+            final String poToken = Base64.encodeToString(bytes, Base64.URL_SAFE);
+            if (!droidGuardPoToken.equals(poToken)) {
+                Logger.printDebug(() -> "New droidGuardPoToken loaded:\n" + poToken);
+                droidGuardPoToken = poToken;
+            }
+        }
+    }
 }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/PlayerRoutes.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/PlayerRoutes.java
deleted file mode 100644
index 4eb16d20c..000000000
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/PlayerRoutes.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package app.revanced.extension.shared.patches.spoof.requests;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-
-import app.revanced.extension.shared.patches.client.AppClient.ClientType;
-import app.revanced.extension.shared.requests.Requester;
-import app.revanced.extension.shared.requests.Route;
-import app.revanced.extension.shared.utils.Logger;
-import app.revanced.extension.shared.utils.Utils;
-
-@SuppressWarnings({"ExtractMethodRecommender", "deprecation"})
-public final class PlayerRoutes {
-    public static final Route.CompiledRoute GET_PLAYLIST_PAGE = new Route(
-            Route.Method.POST,
-            "next" +
-                    "?fields=contents.singleColumnWatchNextResults.playlist.playlist"
-    ).compile();
-    static final Route.CompiledRoute GET_STREAMING_DATA = new Route(
-            Route.Method.POST,
-            "player" +
-                    "?fields=streamingData" +
-                    "&alt=proto"
-    ).compile();
-    private static final String YT_API_URL = "https://youtubei.googleapis.com/youtubei/v1/";
-    /**
-     * TCP connection and HTTP read timeout
-     */
-    private static final int CONNECTION_TIMEOUT_MILLISECONDS = 10 * 1000; // 10 Seconds.
-
-    private static final String LOCALE_LANGUAGE = Utils.getContext().getResources()
-            .getConfiguration().locale.getLanguage();
-
-    private PlayerRoutes() {
-    }
-
-    public static String createInnertubeBody(ClientType clientType) {
-        return createInnertubeBody(clientType, false);
-    }
-
-    public static String createInnertubeBody(ClientType clientType, boolean playlistId) {
-        JSONObject innerTubeBody = new JSONObject();
-
-        try {
-            JSONObject client = new JSONObject();
-            client.put("clientName", clientType.clientName);
-            client.put("clientVersion", clientType.clientVersion);
-            client.put("deviceModel", clientType.deviceModel);
-            client.put("osVersion", clientType.osVersion);
-            if (clientType.androidSdkVersion != null) {
-                client.put("androidSdkVersion", clientType.androidSdkVersion);
-                client.put("osName", "Android");
-            } else {
-                client.put("deviceMake", "Apple");
-                client.put("osName", "iOS");
-            }
-            client.put("hl", LOCALE_LANGUAGE);
-
-            JSONObject context = new JSONObject();
-            context.put("client", client);
-
-            innerTubeBody.put("context", context);
-            innerTubeBody.put("contentCheckOk", true);
-            innerTubeBody.put("racyCheckOk", true);
-            innerTubeBody.put("videoId", "%s");
-            if (playlistId) {
-                innerTubeBody.put("playlistId", "%s");
-            }
-        } catch (JSONException e) {
-            Logger.printException(() -> "Failed to create innerTubeBody", e);
-        }
-
-        return innerTubeBody.toString();
-    }
-
-    /**
-     * @noinspection SameParameterValue
-     */
-    public static HttpURLConnection getPlayerResponseConnectionFromRoute(Route.CompiledRoute route, ClientType clientType) throws IOException {
-        var connection = Requester.getConnectionFromCompiledRoute(YT_API_URL, route);
-
-        connection.setRequestProperty("Content-Type", "application/json");
-        connection.setRequestProperty("User-Agent", clientType.userAgent);
-
-        connection.setUseCaches(false);
-        connection.setDoOutput(true);
-
-        connection.setConnectTimeout(CONNECTION_TIMEOUT_MILLISECONDS);
-        connection.setReadTimeout(CONNECTION_TIMEOUT_MILLISECONDS);
-        return connection;
-    }
-}
\ No newline at end of file
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/PlayerRoutes.kt b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/PlayerRoutes.kt
new file mode 100644
index 000000000..fca54e4f2
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/PlayerRoutes.kt
@@ -0,0 +1,176 @@
+package app.revanced.extension.shared.patches.spoof.requests
+
+import app.revanced.extension.shared.patches.client.AppClient
+import app.revanced.extension.shared.patches.client.WebClient
+import app.revanced.extension.shared.requests.Requester
+import app.revanced.extension.shared.requests.Route
+import app.revanced.extension.shared.requests.Route.CompiledRoute
+import app.revanced.extension.shared.utils.Logger
+import app.revanced.extension.shared.utils.Utils
+import org.apache.commons.lang3.StringUtils
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.net.HttpURLConnection
+import java.nio.charset.StandardCharsets
+
+@Suppress("deprecation")
+object PlayerRoutes {
+    @JvmField
+    val GET_CATEGORY: CompiledRoute = Route(
+        Route.Method.POST,
+        "player" +
+                "?prettyPrint=false" +
+                "&fields=microformat.playerMicroformatRenderer.category"
+    ).compile()
+
+    @JvmField
+    val GET_PLAYLIST_PAGE: CompiledRoute = Route(
+        Route.Method.POST,
+        "next" +
+                "?prettyPrint=false" +
+                "&fields=contents.singleColumnWatchNextResults.playlist.playlist"
+    ).compile()
+
+    @JvmField
+    val GET_STREAMING_DATA: CompiledRoute = Route(
+        Route.Method.POST,
+        "player" +
+                "?fields=streamingData" +
+                "&alt=proto"
+    ).compile()
+
+    private const val YT_API_URL = "https://youtubei.googleapis.com/youtubei/v1/"
+
+    /**
+     * TCP connection and HTTP read timeout
+     */
+    private const val CONNECTION_TIMEOUT_MILLISECONDS = 10 * 1000 // 10 Seconds.
+
+    private val LOCALE_LANGUAGE: String = Utils.getContext().resources
+        .configuration.locale.language
+
+    @JvmStatic
+    fun createApplicationRequestBody(
+        clientType: AppClient.ClientType,
+        videoId: String,
+        playlistId: String? = null,
+        botGuardPoToken: String? = null,
+        visitorId: String? = null,
+    ): ByteArray {
+        val innerTubeBody = JSONObject()
+
+        try {
+            val client = JSONObject()
+            client.put("clientName", clientType.clientName)
+            client.put("clientVersion", clientType.clientVersion)
+            client.put("deviceMake", clientType.deviceMake)
+            client.put("deviceModel", clientType.deviceModel)
+            client.put("osName", clientType.osName)
+            client.put("osVersion", clientType.osVersion)
+            if (clientType.osName == "Android") {
+                client.put("androidSdkVersion", clientType.androidSdkVersion)
+            }
+            if (!clientType.supportsCookies) {
+                client.put("hl", LOCALE_LANGUAGE)
+            }
+
+            val context = JSONObject()
+            context.put("client", client)
+
+            innerTubeBody.put("context", context)
+            innerTubeBody.put("contentCheckOk", true)
+            innerTubeBody.put("racyCheckOk", true)
+            innerTubeBody.put("videoId", videoId)
+
+            if (playlistId != null) {
+                innerTubeBody.put("playlistId", playlistId)
+            }
+
+            if (!StringUtils.isAnyEmpty(botGuardPoToken, visitorId)) {
+                val serviceIntegrityDimensions = JSONObject()
+                serviceIntegrityDimensions.put("poToken", botGuardPoToken)
+                innerTubeBody.put("serviceIntegrityDimensions", serviceIntegrityDimensions)
+            }
+        } catch (e: JSONException) {
+            Logger.printException({ "Failed to create application innerTubeBody" }, e)
+        }
+
+        return innerTubeBody.toString().toByteArray(StandardCharsets.UTF_8)
+    }
+
+    @JvmStatic
+    fun createWebInnertubeBody(
+        clientType: WebClient.ClientType,
+        videoId: String
+    ): ByteArray {
+        val innerTubeBody = JSONObject()
+
+        try {
+            val client = JSONObject()
+            client.put("clientName", clientType.clientName)
+            client.put("clientVersion", clientType.clientVersion)
+            val context = JSONObject()
+            context.put("client", client)
+
+            val lockedSafetyMode = JSONObject()
+            lockedSafetyMode.put("lockedSafetyMode", false)
+            val user = JSONObject()
+            user.put("user", lockedSafetyMode)
+
+            innerTubeBody.put("context", context)
+            innerTubeBody.put("contentCheckOk", true)
+            innerTubeBody.put("racyCheckOk", true)
+            innerTubeBody.put("videoId", videoId)
+        } catch (e: JSONException) {
+            Logger.printException({ "Failed to create web innerTubeBody" }, e)
+        }
+
+        return innerTubeBody.toString().toByteArray(StandardCharsets.UTF_8)
+    }
+
+    @JvmStatic
+    fun getPlayerResponseConnectionFromRoute(
+        route: CompiledRoute,
+        clientType: AppClient.ClientType
+    ): HttpURLConnection {
+        return getPlayerResponseConnectionFromRoute(
+            route,
+            clientType.userAgent,
+            clientType.id.toString()
+        )
+    }
+
+    @JvmStatic
+    fun getPlayerResponseConnectionFromRoute(
+        route: CompiledRoute,
+        clientType: WebClient.ClientType
+    ): HttpURLConnection {
+        return getPlayerResponseConnectionFromRoute(
+            route,
+            clientType.userAgent,
+            clientType.id.toString()
+        )
+    }
+
+    @Throws(IOException::class)
+    fun getPlayerResponseConnectionFromRoute(
+        route: CompiledRoute,
+        userAgent: String,
+        clientVersion: String
+    ): HttpURLConnection {
+        val connection = Requester.getConnectionFromCompiledRoute(YT_API_URL, route)
+
+        connection.setRequestProperty("Content-Type", "application/json")
+        connection.setRequestProperty("User-Agent", userAgent)
+        connection.setRequestProperty("X-YouTube-Client-Version", clientVersion)
+
+        connection.useCaches = false
+        connection.doOutput = true
+
+        connection.connectTimeout = CONNECTION_TIMEOUT_MILLISECONDS
+        connection.readTimeout = CONNECTION_TIMEOUT_MILLISECONDS
+        return connection
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.java
deleted file mode 100644
index a76c8a2df..000000000
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package app.revanced.extension.shared.patches.spoof.requests;
-
-import static app.revanced.extension.shared.patches.client.AppClient.getAvailableClientTypes;
-import static app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes.GET_STREAMING_DATA;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import app.revanced.extension.shared.patches.client.AppClient.ClientType;
-import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.utils.Logger;
-import app.revanced.extension.shared.utils.Utils;
-
-/**
- * Video streaming data.  Fetching is tied to the behavior YT uses,
- * where this class fetches the streams only when YT fetches.
- * <p>
- * Effectively the cache expiration of these fetches is the same as the stock app,
- * since the stock app would not use expired streams and therefor
- * the extension replace stream hook is called only if YT
- * did use its own client streams.
- */
-public class StreamingDataRequest {
-
-    private static final ClientType[] CLIENT_ORDER_TO_USE;
-    private static final String AUTHORIZATION_HEADER = "Authorization";
-    private static final String[] REQUEST_HEADER_KEYS = {
-            AUTHORIZATION_HEADER, // Available only to logged-in users.
-            "X-GOOG-API-FORMAT-VERSION",
-            "X-Goog-Visitor-Id"
-    };
-    private static ClientType lastSpoofedClientType;
-
-
-    /**
-     * TCP connection and HTTP read timeout.
-     */
-    private static final int HTTP_TIMEOUT_MILLISECONDS = 10 * 1000;
-    /**
-     * Any arbitrarily large value, but must be at least twice {@link #HTTP_TIMEOUT_MILLISECONDS}
-     */
-    private static final int MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000;
-    private static final Map<String, StreamingDataRequest> cache = Collections.synchronizedMap(
-            new LinkedHashMap<>(100) {
-                /**
-                 * Cache limit must be greater than the maximum number of videos open at once,
-                 * which theoretically is more than 4 (3 Shorts + one regular minimized video).
-                 * But instead use a much larger value, to handle if a video viewed a while ago
-                 * is somehow still referenced.  Each stream is a small array of Strings
-                 * so memory usage is not a concern.
-                 */
-                private static final int CACHE_LIMIT = 50;
-
-                @Override
-                protected boolean removeEldestEntry(Entry eldest) {
-                    return size() > CACHE_LIMIT; // Evict the oldest entry if over the cache limit.
-                }
-            });
-
-    public static String getLastSpoofedClientName() {
-        return lastSpoofedClientType == null
-                ? "Unknown"
-                : lastSpoofedClientType.getFriendlyName();
-    }
-
-    static {
-        ClientType[] allClientTypes = getAvailableClientTypes();
-        ClientType preferredClient = BaseSettings.SPOOF_STREAMING_DATA_TYPE.get();
-
-        if (Arrays.stream(allClientTypes).noneMatch(preferredClient::equals)) {
-            CLIENT_ORDER_TO_USE = allClientTypes;
-        } else {
-            CLIENT_ORDER_TO_USE = new ClientType[allClientTypes.length];
-            CLIENT_ORDER_TO_USE[0] = preferredClient;
-
-            int i = 1;
-            for (ClientType c : allClientTypes) {
-                if (c != preferredClient) {
-                    CLIENT_ORDER_TO_USE[i++] = c;
-                }
-            }
-        }
-    }
-
-    private final String videoId;
-    private final Future<ByteBuffer> future;
-
-    private StreamingDataRequest(String videoId, Map<String, String> playerHeaders) {
-        Objects.requireNonNull(playerHeaders);
-        this.videoId = videoId;
-        this.future = Utils.submitOnBackgroundThread(() -> fetch(videoId, playerHeaders));
-    }
-
-    public static void fetchRequest(String videoId, Map<String, String> fetchHeaders) {
-        // Always fetch, even if there is an existing request for the same video.
-        cache.put(videoId, new StreamingDataRequest(videoId, fetchHeaders));
-    }
-
-    @Nullable
-    public static StreamingDataRequest getRequestForVideoId(String videoId) {
-        return cache.get(videoId);
-    }
-
-    private static void handleConnectionError(String toastMessage, @Nullable Exception ex) {
-        Logger.printInfo(() -> toastMessage, ex);
-    }
-
-    @Nullable
-    private static HttpURLConnection send(ClientType clientType, String videoId,
-                                          Map<String, String> playerHeaders) {
-        Objects.requireNonNull(clientType);
-        Objects.requireNonNull(videoId);
-        Objects.requireNonNull(playerHeaders);
-
-        final long startTime = System.currentTimeMillis();
-        Logger.printDebug(() -> "Fetching video streams for: " + videoId + " using client: " + clientType);
-
-        try {
-            HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(GET_STREAMING_DATA, clientType);
-            connection.setConnectTimeout(HTTP_TIMEOUT_MILLISECONDS);
-            connection.setReadTimeout(HTTP_TIMEOUT_MILLISECONDS);
-
-            for (String key : REQUEST_HEADER_KEYS) {
-                String value = playerHeaders.get(key);
-                if (value != null) {
-                    if (key.equals(AUTHORIZATION_HEADER)) {
-                        if (!clientType.canLogin) {
-                            Logger.printDebug(() -> "Not including request header: " + key);
-                            continue;
-                        }
-                    }
-
-                    connection.setRequestProperty(key, value);
-                }
-            }
-
-            String innerTubeBody = String.format(PlayerRoutes.createInnertubeBody(clientType), videoId);
-            byte[] requestBody = innerTubeBody.getBytes(StandardCharsets.UTF_8);
-            connection.setFixedLengthStreamingMode(requestBody.length);
-            connection.getOutputStream().write(requestBody);
-
-            final int responseCode = connection.getResponseCode();
-            if (responseCode == 200) return connection;
-
-            // This situation likely means the patches are outdated.
-            // Use a toast message that suggests updating.
-            handleConnectionError("Playback error (App is outdated?) " + clientType + ": "
-                            + responseCode + " response: " + connection.getResponseMessage(),
-                    null);
-        } catch (SocketTimeoutException ex) {
-            handleConnectionError("Connection timeout", ex);
-        } catch (IOException ex) {
-            handleConnectionError("Network error", ex);
-        } catch (Exception ex) {
-            Logger.printException(() -> "send failed", ex);
-        } finally {
-            Logger.printDebug(() -> "video: " + videoId + " took: " + (System.currentTimeMillis() - startTime) + "ms");
-        }
-
-        return null;
-    }
-
-    private static ByteBuffer fetch(String videoId, Map<String, String> playerHeaders) {
-        lastSpoofedClientType = null;
-
-        // Retry with different client if empty response body is received.
-        for (ClientType clientType : CLIENT_ORDER_TO_USE) {
-            HttpURLConnection connection = send(clientType, videoId, playerHeaders);
-            if (connection != null) {
-                try {
-                    // gzip encoding doesn't response with content length (-1),
-                    // but empty response body does.
-                    if (connection.getContentLength() == 0) {
-                        Logger.printDebug(() -> "Received empty response" + "\nClient: " + clientType + "\nVideo: " + videoId);
-                    } else {
-                        try (InputStream inputStream = new BufferedInputStream(connection.getInputStream());
-                             ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                            byte[] buffer = new byte[2048];
-                            int bytesRead;
-                            while ((bytesRead = inputStream.read(buffer)) >= 0) {
-                                baos.write(buffer, 0, bytesRead);
-                            }
-                            lastSpoofedClientType = clientType;
-
-                            return ByteBuffer.wrap(baos.toByteArray());
-                        }
-                    }
-                } catch (IOException ex) {
-                    Logger.printException(() -> "Fetch failed while processing response data", ex);
-                }
-            }
-        }
-
-        handleConnectionError("Could not fetch any client streams", null);
-        return null;
-    }
-
-    public boolean fetchCompleted() {
-        return future.isDone();
-    }
-
-    @Nullable
-    public ByteBuffer getStream() {
-        try {
-            return future.get(MAX_MILLISECONDS_TO_WAIT_FOR_FETCH, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException ex) {
-            Logger.printInfo(() -> "getStream timed out", ex);
-        } catch (InterruptedException ex) {
-            Logger.printException(() -> "getStream interrupted", ex);
-            Thread.currentThread().interrupt(); // Restore interrupt status flag.
-        } catch (ExecutionException ex) {
-            Logger.printException(() -> "getStream failure", ex);
-        }
-
-        return null;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return "StreamingDataRequest{" + "videoId='" + videoId + '\'' + '}';
-    }
-}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.kt b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.kt
new file mode 100644
index 000000000..6389ac1ea
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.kt
@@ -0,0 +1,296 @@
+package app.revanced.extension.shared.patches.spoof.requests
+
+import androidx.annotation.GuardedBy
+import app.revanced.extension.shared.patches.client.AppClient
+import app.revanced.extension.shared.patches.client.AppClient.availableClientTypes
+import app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes.GET_STREAMING_DATA
+import app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes.createApplicationRequestBody
+import app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes.getPlayerResponseConnectionFromRoute
+import app.revanced.extension.shared.settings.BaseSettings
+import app.revanced.extension.shared.utils.Logger
+import app.revanced.extension.shared.utils.Utils
+import org.apache.commons.lang3.StringUtils
+import java.io.BufferedInputStream
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.net.HttpURLConnection
+import java.net.SocketTimeoutException
+import java.nio.ByteBuffer
+import java.util.Collections
+import java.util.Objects
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.Future
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+/**
+ * Video streaming data.  Fetching is tied to the behavior YT uses,
+ * where this class fetches the streams only when YT fetches.
+ *
+ * Effectively the cache expiration of these fetches is the same as the stock app,
+ * since the stock app would not use expired streams and therefor
+ * the extension replace stream hook is called only if YT
+ * did use its own client streams.
+ */
+class StreamingDataRequest private constructor(
+    videoId: String, playerHeaders: Map<String, String>, visitorId: String,
+    botGuardPoToken: String, droidGuardPoToken: String
+) {
+    private val videoId: String
+    private val future: Future<ByteBuffer?>
+
+    init {
+        Objects.requireNonNull(playerHeaders)
+        this.videoId = videoId
+        this.future = Utils.submitOnBackgroundThread {
+            fetch(
+                videoId,
+                playerHeaders,
+                visitorId,
+                botGuardPoToken,
+                droidGuardPoToken
+            )
+        }
+    }
+
+    fun fetchCompleted(): Boolean {
+        return future.isDone
+    }
+
+    val stream: ByteBuffer?
+        get() {
+            try {
+                return future[MAX_MILLISECONDS_TO_WAIT_FOR_FETCH.toLong(), TimeUnit.MILLISECONDS]
+            } catch (ex: TimeoutException) {
+                Logger.printInfo(
+                    { "getStream timed out" },
+                    ex
+                )
+            } catch (ex: InterruptedException) {
+                Logger.printException(
+                    { "getStream interrupted" },
+                    ex
+                )
+                Thread.currentThread().interrupt() // Restore interrupt status flag.
+            } catch (ex: ExecutionException) {
+                Logger.printException(
+                    { "getStream failure" },
+                    ex
+                )
+            }
+
+            return null
+        }
+
+    override fun toString(): String {
+        return "StreamingDataRequest{videoId='$videoId'}"
+    }
+
+    companion object {
+        private const val AUTHORIZATION_HEADER = "Authorization"
+        private const val VISITOR_ID_HEADER = "X-Goog-Visitor-Id"
+        private val REQUEST_HEADER_KEYS = arrayOf(
+            AUTHORIZATION_HEADER,  // Available only to logged-in users.
+            "X-GOOG-API-FORMAT-VERSION",
+            VISITOR_ID_HEADER
+        )
+
+        private val CLIENT_ORDER_TO_USE: Array<AppClient.ClientType> =
+            availableClientTypes(BaseSettings.SPOOF_STREAMING_DATA_TYPE.get())
+
+        private var lastSpoofedClientType: AppClient.ClientType? = null
+
+
+        /**
+         * TCP connection and HTTP read timeout.
+         */
+        private const val HTTP_TIMEOUT_MILLISECONDS = 10 * 1000
+
+        /**
+         * Any arbitrarily large value, but must be at least twice [.HTTP_TIMEOUT_MILLISECONDS]
+         */
+        private const val MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000
+
+        @GuardedBy("itself")
+        val cache: MutableMap<String, StreamingDataRequest> = Collections.synchronizedMap(
+            object : LinkedHashMap<String, StreamingDataRequest>(100) {
+                /**
+                 * Cache limit must be greater than the maximum number of videos open at once,
+                 * which theoretically is more than 4 (3 Shorts + one regular minimized video).
+                 * But instead use a much larger value, to handle if a video viewed a while ago
+                 * is somehow still referenced.  Each stream is a small array of Strings
+                 * so memory usage is not a concern.
+                 */
+                private val CACHE_LIMIT = 50
+
+                override fun removeEldestEntry(eldest: Map.Entry<String, StreamingDataRequest>): Boolean {
+                    return size > CACHE_LIMIT // Evict the oldest entry if over the cache limit.
+                }
+            })
+
+        @JvmStatic
+        val lastSpoofedClientName: String
+            get() = lastSpoofedClientType
+                ?.friendlyName
+                ?: "Unknown"
+
+        @JvmStatic
+        fun fetchRequest(
+            videoId: String, fetchHeaders: Map<String, String>, visitorId: String,
+            botGuardPoToken: String, droidGuardPoToken: String
+        ) {
+            // Always fetch, even if there is an existing request for the same video.
+            cache[videoId] =
+                StreamingDataRequest(
+                    videoId,
+                    fetchHeaders,
+                    visitorId,
+                    botGuardPoToken,
+                    droidGuardPoToken
+                )
+        }
+
+        @JvmStatic
+        fun getRequestForVideoId(videoId: String): StreamingDataRequest? {
+            return cache[videoId]
+        }
+
+        private fun handleConnectionError(toastMessage: String, ex: Exception?) {
+            Logger.printInfo({ toastMessage }, ex)
+        }
+
+        private fun send(
+            clientType: AppClient.ClientType, videoId: String, playerHeaders: Map<String, String>,
+            visitorId: String, botGuardPoToken: String, droidGuardPoToken: String
+        ): HttpURLConnection? {
+            Objects.requireNonNull(clientType)
+            Objects.requireNonNull(videoId)
+            Objects.requireNonNull(playerHeaders)
+
+            val startTime = System.currentTimeMillis()
+            Logger.printDebug { "Fetching video streams for: $videoId using client: $clientType" }
+
+            try {
+                val connection =
+                    getPlayerResponseConnectionFromRoute(GET_STREAMING_DATA, clientType)
+                connection.connectTimeout = HTTP_TIMEOUT_MILLISECONDS
+                connection.readTimeout = HTTP_TIMEOUT_MILLISECONDS
+
+                val usePoToken =
+                    clientType.requirePoToken && !StringUtils.isAnyEmpty(botGuardPoToken, visitorId)
+
+                for (key in REQUEST_HEADER_KEYS) {
+                    var value = playerHeaders[key]
+                    if (value != null) {
+                        if (key == AUTHORIZATION_HEADER) {
+                            if (!clientType.supportsCookies) {
+                                Logger.printDebug { "Not including request header: $key" }
+                                continue
+                            }
+                        }
+                        if (key == VISITOR_ID_HEADER && usePoToken) {
+                            val originalVisitorId: String = value
+                            Logger.printDebug { "Original visitor id:\n$originalVisitorId" }
+                            Logger.printDebug { "Replaced visitor id:\n$visitorId" }
+                            value = visitorId
+                        }
+
+                        connection.setRequestProperty(key, value)
+                    }
+                }
+
+                val requestBody: ByteArray
+                if (usePoToken) {
+                    requestBody = createApplicationRequestBody(
+                        clientType = clientType,
+                        videoId = videoId,
+                        botGuardPoToken = botGuardPoToken,
+                        visitorId = visitorId
+                    )
+                    if (droidGuardPoToken.isNotEmpty()) {
+                        Logger.printDebug { "Original poToken (droidGuardPoToken):\n$droidGuardPoToken" }
+                    }
+                    Logger.printDebug { "Replaced poToken (botGuardPoToken):\n$botGuardPoToken" }
+                } else {
+                    requestBody =
+                        createApplicationRequestBody(clientType = clientType, videoId = videoId)
+                }
+                connection.setFixedLengthStreamingMode(requestBody.size)
+                connection.outputStream.write(requestBody)
+
+                val responseCode = connection.responseCode
+                if (responseCode == 200) return connection
+
+                // This situation likely means the patches are outdated.
+                // Use a toast message that suggests updating.
+                handleConnectionError(
+                    ("Playback error (App is outdated?) " + clientType + ": "
+                            + responseCode + " response: " + connection.responseMessage),
+                    null
+                )
+            } catch (ex: SocketTimeoutException) {
+                handleConnectionError("Connection timeout", ex)
+            } catch (ex: IOException) {
+                handleConnectionError("Network error", ex)
+            } catch (ex: Exception) {
+                Logger.printException({ "send failed" }, ex)
+            } finally {
+                Logger.printDebug { "video: " + videoId + " took: " + (System.currentTimeMillis() - startTime) + "ms" }
+            }
+
+            return null
+        }
+
+        private fun fetch(
+            videoId: String, playerHeaders: Map<String, String>, visitorId: String,
+            botGuardPoToken: String, droidGuardPoToken: String
+        ): ByteBuffer? {
+            lastSpoofedClientType = null
+
+            // Retry with different client if empty response body is received.
+            for (clientType in CLIENT_ORDER_TO_USE) {
+                if (clientType.requireAuth &&
+                    playerHeaders[AUTHORIZATION_HEADER] == null
+                ) {
+                    Logger.printDebug { "Skipped login-required client (incognito mode or not logged in)\nClient: $clientType\nVideo: $videoId" }
+                    continue
+                }
+                send(
+                    clientType,
+                    videoId,
+                    playerHeaders,
+                    visitorId,
+                    botGuardPoToken,
+                    droidGuardPoToken
+                )?.let { connection ->
+                    try {
+                        // gzip encoding doesn't response with content length (-1),
+                        // but empty response body does.
+                        if (connection.contentLength == 0) {
+                            Logger.printDebug { "Received empty response\nClient: $clientType\nVideo: $videoId" }
+                        } else {
+                            BufferedInputStream(connection.inputStream).use { inputStream ->
+                                ByteArrayOutputStream().use { stream ->
+                                    val buffer = ByteArray(2048)
+                                    var bytesRead: Int
+                                    while ((inputStream.read(buffer)
+                                            .also { bytesRead = it }) >= 0
+                                    ) {
+                                        stream.write(buffer, 0, bytesRead)
+                                    }
+                                    lastSpoofedClientType = clientType
+                                    return ByteBuffer.wrap(stream.toByteArray())
+                                }
+                            }
+                        }
+                    } catch (ex: IOException) {
+                        Logger.printException({ "Fetch failed while processing response data" }, ex)
+                    }
+                }
+            }
+
+            handleConnectionError("Could not fetch any client streams", null)
+            return null
+        }
+    }
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/RYDVoteData.java b/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/RYDVoteData.java
index a4a56de04..984fa5042 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/RYDVoteData.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/RYDVoteData.java
@@ -111,22 +111,21 @@ public final class RYDVoteData {
     public void updateUsingVote(Vote vote) {
         final int likesToAdd, dislikesToAdd;
 
-        switch (vote) {
-            case LIKE:
+        dislikesToAdd = switch (vote) {
+            case LIKE -> {
                 likesToAdd = 1;
-                dislikesToAdd = 0;
-                break;
-            case DISLIKE:
+                yield 0;
+            }
+            case DISLIKE -> {
                 likesToAdd = 0;
-                dislikesToAdd = 1;
-                break;
-            case LIKE_REMOVE:
+                yield 1;
+            }
+            case LIKE_REMOVE -> {
                 likesToAdd = 0;
-                dislikesToAdd = 0;
-                break;
-            default:
-                throw new IllegalStateException();
-        }
+                yield 0;
+            }
+            default -> throw new IllegalStateException();
+        };
 
         // If a video has no public likes but RYD has raw like data,
         // then use the raw data instead.
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java b/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java
index df1e503b5..9cbf96c86 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java
@@ -27,6 +27,7 @@ import app.revanced.extension.shared.returnyoutubedislike.ReturnYouTubeDislike;
 import app.revanced.extension.shared.utils.Logger;
 import app.revanced.extension.shared.utils.Utils;
 
+@SuppressWarnings("All")
 public class ReturnYouTubeDislikeApi {
     /**
      * {@link #fetchVotes(String)} TCP connection timeout
@@ -81,9 +82,87 @@ public class ReturnYouTubeDislikeApi {
 
     public static boolean toastOnConnectionError = false;
 
+    /**
+     * Number of times {@link #HTTP_STATUS_CODE_RATE_LIMIT} was requested by RYD api.
+     * Does not include network calls attempted while rate limit is in effect,
+     * and does not include rate limit imposed if a fetch fails.
+     */
+    private static volatile int numberOfRateLimitRequestsEncountered;
+
+    /**
+     * Number of network calls made in {@link #fetchVotes(String)}
+     */
+    private static volatile int fetchCallCount;
+
+    /**
+     * Number of times {@link #fetchVotes(String)} failed due to timeout or any other error.
+     * This does not include when rate limit requests are encountered.
+     */
+    private static volatile int fetchCallNumberOfFailures;
+
+    /**
+     * Total time spent waiting for {@link #fetchVotes(String)} network call to complete.
+     * Value does does not persist on app shut down.
+     */
+    private static volatile long fetchCallResponseTimeTotal;
+
+    /**
+     * Round trip network time for the most recent call to {@link #fetchVotes(String)}
+     */
+    private static volatile long fetchCallResponseTimeLast;
+    private static volatile long fetchCallResponseTimeMin;
+    private static volatile long fetchCallResponseTimeMax;
+
+    public static final int FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT = -1;
+
+    /**
+     * If rate limit was hit, this returns {@link #FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT}
+     */
+    public static long getFetchCallResponseTimeLast() {
+        return fetchCallResponseTimeLast;
+    }
+
+    public static long getFetchCallResponseTimeMin() {
+        return fetchCallResponseTimeMin;
+    }
+
+    public static long getFetchCallResponseTimeMax() {
+        return fetchCallResponseTimeMax;
+    }
+
+    public static long getFetchCallResponseTimeAverage() {
+        return fetchCallCount == 0 ? 0 : (fetchCallResponseTimeTotal / fetchCallCount);
+    }
+
+    public static int getFetchCallCount() {
+        return fetchCallCount;
+    }
+
+    public static int getFetchCallNumberOfFailures() {
+        return fetchCallNumberOfFailures;
+    }
+
+    public static int getNumberOfRateLimitRequestsEncountered() {
+        return numberOfRateLimitRequestsEncountered;
+    }
+
     private ReturnYouTubeDislikeApi() {
     } // utility class
 
+    /**
+     * Simulates a slow response by doing meaningless calculations.
+     * Used to debug the app UI and verify UI timeout logic works
+     */
+    private static void randomlyWaitIfLocallyDebugging() {
+        final boolean DEBUG_RANDOMLY_DELAY_NETWORK_CALLS = false; // set true to debug UI
+
+        if (DEBUG_RANDOMLY_DELAY_NETWORK_CALLS) {
+            final long amountOfTimeToWaste = (long) (Math.random()
+                    * (API_GET_VOTES_TCP_TIMEOUT_MILLISECONDS + API_GET_VOTES_HTTP_TIMEOUT_MILLISECONDS));
+            Utils.doNothingForDuration(amountOfTimeToWaste);
+        }
+    }
+
     /**
      * Clears any backoff rate limits in effect.
      * Should be called if RYD is turned on/off.
@@ -116,41 +195,64 @@ public class ReturnYouTubeDislikeApi {
      * @return True, if a client rate limit was requested
      */
     private static boolean checkIfRateLimitWasHit(int httpResponseCode) {
+        final boolean DEBUG_RATE_LIMIT = false;  // set to true, to verify rate limit works
+
+        if (DEBUG_RATE_LIMIT) {
+            final double RANDOM_RATE_LIMIT_PERCENTAGE = 0.2; // 20% chance of a triggering a rate limit
+            if (Math.random() < RANDOM_RATE_LIMIT_PERCENTAGE) {
+                Logger.printDebug(() -> "Artificially triggering rate limit for debug purposes");
+                httpResponseCode = HTTP_STATUS_CODE_RATE_LIMIT;
+            }
+        }
         return httpResponseCode == HTTP_STATUS_CODE_RATE_LIMIT;
     }
 
-    private static void updateRateLimitAndStats(boolean connectionError, boolean rateLimitHit) {
+    @SuppressWarnings("NonAtomicOperationOnVolatileField") // Don't care, fields are only estimates.
+    private static void updateRateLimitAndStats(long timeNetworkCallStarted, boolean connectionError, boolean rateLimitHit) {
         if (connectionError && rateLimitHit) {
             throw new IllegalArgumentException();
         }
+        final long responseTimeOfFetchCall = System.currentTimeMillis() - timeNetworkCallStarted;
+        fetchCallResponseTimeTotal += responseTimeOfFetchCall;
+        fetchCallResponseTimeMin = (fetchCallResponseTimeMin == 0) ? responseTimeOfFetchCall : Math.min(responseTimeOfFetchCall, fetchCallResponseTimeMin);
+        fetchCallResponseTimeMax = Math.max(responseTimeOfFetchCall, fetchCallResponseTimeMax);
+        fetchCallCount++;
         if (connectionError) {
             timeToResumeAPICalls = System.currentTimeMillis() + BACKOFF_CONNECTION_ERROR_MILLISECONDS;
+            fetchCallResponseTimeLast = responseTimeOfFetchCall;
+            fetchCallNumberOfFailures++;
             lastApiCallFailed = true;
         } else if (rateLimitHit) {
             Logger.printDebug(() -> "API rate limit was hit. Stopping API calls for the next "
                     + BACKOFF_RATE_LIMIT_MILLISECONDS + " seconds");
             timeToResumeAPICalls = System.currentTimeMillis() + BACKOFF_RATE_LIMIT_MILLISECONDS;
+            numberOfRateLimitRequestsEncountered++;
+            fetchCallResponseTimeLast = FETCH_CALL_RESPONSE_TIME_VALUE_RATE_LIMIT;
             if (!lastApiCallFailed && toastOnConnectionError) {
                 Utils.showToastLong(str("revanced_ryd_failure_client_rate_limit_requested"));
             }
             lastApiCallFailed = true;
         } else {
+            fetchCallResponseTimeLast = responseTimeOfFetchCall;
             lastApiCallFailed = false;
         }
     }
 
-    private static void handleConnectionError(@NonNull String toastMessage, @Nullable Exception ex) {
+    private static void handleConnectionError(@NonNull String toastMessage,
+                                              @Nullable Exception ex,
+                                              boolean showLongToast) {
         if (!lastApiCallFailed && toastOnConnectionError) {
-            Utils.showToastShort(toastMessage);
-        }
-        if (ex != null) {
-            Logger.printInfo(() -> toastMessage, ex);
+            if (showLongToast) {
+                Utils.showToastLong(toastMessage);
+            } else {
+                Utils.showToastShort(toastMessage);
+            }
         }
+        lastApiCallFailed = true;
+
+        Logger.printInfo(() -> toastMessage, ex);
     }
 
-    /**
-     * @return NULL if fetch failed, or if a rate limit is in effect.
-     */
     @Nullable
     public static RYDVoteData fetchVotes(String videoId) {
         Utils.verifyOffMainThread();
@@ -160,6 +262,7 @@ public class ReturnYouTubeDislikeApi {
             return null;
         }
         Logger.printDebug(() -> "Fetching votes for: " + videoId);
+        final long timeNetworkCallStarted = System.currentTimeMillis();
 
         try {
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.GET_DISLIKES, videoId);
@@ -173,10 +276,12 @@ public class ReturnYouTubeDislikeApi {
             connection.setConnectTimeout(API_GET_VOTES_TCP_TIMEOUT_MILLISECONDS); // timeout for TCP connection to server
             connection.setReadTimeout(API_GET_VOTES_HTTP_TIMEOUT_MILLISECONDS); // timeout for server response
 
+            randomlyWaitIfLocallyDebugging();
+
             final int responseCode = connection.getResponseCode();
             if (checkIfRateLimitWasHit(responseCode)) {
                 connection.disconnect(); // rate limit hit, should disconnect
-                updateRateLimitAndStats(false, true);
+                updateRateLimitAndStats(timeNetworkCallStarted, false, true);
                 return null;
             }
 
@@ -185,7 +290,7 @@ public class ReturnYouTubeDislikeApi {
                 JSONObject json = Requester.parseJSONObject(connection);
                 try {
                     RYDVoteData votingData = new RYDVoteData(json);
-                    updateRateLimitAndStats(false, false);
+                    updateRateLimitAndStats(timeNetworkCallStarted, false, false);
                     Logger.printDebug(() -> "Voting data fetched: " + votingData);
                     return votingData;
                 } catch (JSONException ex) {
@@ -193,20 +298,21 @@ public class ReturnYouTubeDislikeApi {
                     // fall thru to update statistics
                 }
             } else {
-                handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode), null);
+                // Unexpected response code.  Most likely RYD is temporarily broken.
+                handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
+                        null, true);
             }
-            connection.disconnect(); // something went wrong, might as well disconnect
-        } catch (
-                SocketTimeoutException ex) { // connection timed out, response timeout, or some other network error
-            handleConnectionError((str("revanced_ryd_failure_connection_timeout")), ex);
+            connection.disconnect(); // Something went wrong, might as well disconnect.
+        } catch (SocketTimeoutException ex) {
+            handleConnectionError((str("revanced_ryd_failure_connection_timeout")), ex, false);
         } catch (IOException ex) {
-            handleConnectionError((str("revanced_ryd_failure_generic", ex.getMessage())), ex);
+            handleConnectionError((str("revanced_ryd_failure_generic", ex.getMessage())), ex, true);
         } catch (Exception ex) {
             // should never happen
             Logger.printException(() -> "fetchVotes failure", ex);
         }
 
-        updateRateLimitAndStats(true, false);
+        updateRateLimitAndStats(timeNetworkCallStarted, true, false);
         return null;
     }
 
@@ -220,7 +326,7 @@ public class ReturnYouTubeDislikeApi {
             if (checkIfRateLimitInEffect("registerAsNewUser")) {
                 return null;
             }
-            String userId = randomString();
+            String userId = randomString(36);
             Logger.printDebug(() -> "Trying to register new user");
 
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.GET_REGISTRATION, userId);
@@ -241,12 +347,13 @@ public class ReturnYouTubeDislikeApi {
                 String solution = solvePuzzle(challenge, difficulty);
                 return confirmRegistration(userId, solution);
             }
-            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode), null);
+            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
+                    null, true);
             connection.disconnect();
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
         } catch (IOException ex) {
-            handleConnectionError(str("revanced_ryd_failure_generic", "registration failed"), ex);
+            handleConnectionError(str("revanced_ryd_failure_generic", "registration failed"), ex, true);
         } catch (Exception ex) {
             Logger.printException(() -> "Failed to register user", ex); // should never happen
         }
@@ -283,15 +390,18 @@ public class ReturnYouTubeDislikeApi {
                 Logger.printDebug(() -> "Registration confirmation successful");
                 return userId;
             }
+
             // Something went wrong, might as well disconnect.
             String response = Requester.parseStringAndDisconnect(connection);
             Logger.printInfo(() -> "Failed to confirm registration for user: " + userId
                     + " solution: " + solution + " responseCode: " + responseCode + " response: '" + response + "''");
-            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode), null);
+            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
+                    null, true);
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
         } catch (IOException ex) {
-            handleConnectionError(str("revanced_ryd_failure_generic", "confirm registration failed"), ex);
+            handleConnectionError(str("revanced_ryd_failure_generic", "confirm registration failed"),
+                    ex, true);
         } catch (Exception ex) {
             Logger.printException(() -> "Failed to confirm registration for user: " + userId
                     + "solution: " + solution, ex);
@@ -299,16 +409,16 @@ public class ReturnYouTubeDislikeApi {
         return null;
     }
 
-    public static void sendVote(String userId, String videoId, ReturnYouTubeDislike.Vote vote) {
+    public static boolean sendVote(String userId, String videoId, ReturnYouTubeDislike.Vote vote) {
         Utils.verifyOffMainThread();
         Objects.requireNonNull(videoId);
         Objects.requireNonNull(vote);
 
         try {
-            if (userId == null) return;
+            if (userId == null) return false;
 
             if (checkIfRateLimitInEffect("sendVote")) {
-                return;
+                return false;
             }
             Logger.printDebug(() -> "Trying to vote for video: " + videoId + " with vote: " + vote);
 
@@ -325,7 +435,7 @@ public class ReturnYouTubeDislikeApi {
             final int responseCode = connection.getResponseCode();
             if (checkIfRateLimitWasHit(responseCode)) {
                 connection.disconnect(); // disconnect, as no more connections will be made for a little while
-                return;
+                return false;
             }
             if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 JSONObject json = Requester.parseJSONObject(connection);
@@ -333,25 +443,26 @@ public class ReturnYouTubeDislikeApi {
                 int difficulty = json.getInt("difficulty");
 
                 String solution = solvePuzzle(challenge, difficulty);
-                confirmVote(videoId, userId, solution);
-                return;
+                return confirmVote(videoId, userId, solution);
             }
 
             Logger.printInfo(() -> "Failed to send vote for video: " + videoId + " vote: " + vote
                     + " response code was: " + responseCode);
-            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode), null);
+            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
+                    null, true);
             connection.disconnect(); // something went wrong, might as well disconnect
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
         } catch (IOException ex) {
-            handleConnectionError(str("revanced_ryd_failure_generic", "send vote failed"), ex);
+            handleConnectionError(str("revanced_ryd_failure_generic", "send vote failed"), ex, true);
         } catch (Exception ex) {
             // should never happen
             Logger.printException(() -> "Failed to send vote for video: " + videoId + " vote: " + vote, ex);
         }
+        return false;
     }
 
-    private static void confirmVote(String videoId, String userId, String solution) {
+    private static boolean confirmVote(String videoId, String userId, String solution) {
         Utils.verifyOffMainThread();
         Objects.requireNonNull(videoId);
         Objects.requireNonNull(userId);
@@ -359,7 +470,7 @@ public class ReturnYouTubeDislikeApi {
 
         try {
             if (checkIfRateLimitInEffect("confirmVote")) {
-                return;
+                return false;
             }
             Logger.printDebug(() -> "Trying to confirm vote for video: " + videoId + " solution: " + solution);
             HttpURLConnection connection = getRYDConnectionFromRoute(ReturnYouTubeDislikeRoutes.CONFIRM_VOTE);
@@ -375,25 +486,29 @@ public class ReturnYouTubeDislikeApi {
             final int responseCode = connection.getResponseCode();
             if (checkIfRateLimitWasHit(responseCode)) {
                 connection.disconnect(); // disconnect, as no more connections will be made for a little while
-                return;
+                return false;
             }
             if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
                 Logger.printDebug(() -> "Vote confirm successful for video: " + videoId);
-                return;
+                return true;
             }
+
             // Something went wrong, might as well disconnect.
             String response = Requester.parseStringAndDisconnect(connection);
             Logger.printInfo(() -> "Failed to confirm vote for video: " + videoId
                     + " solution: " + solution + " responseCode: " + responseCode + " response: '" + response + "'");
-            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode), null);
+            handleConnectionError(str("revanced_ryd_failure_connection_status_code", responseCode),
+                    null, true);
         } catch (SocketTimeoutException ex) {
-            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex);
+            handleConnectionError(str("revanced_ryd_failure_connection_timeout"), ex, false);
         } catch (IOException ex) {
-            handleConnectionError(str("revanced_ryd_failure_generic", "confirm vote failed"), ex);
+            handleConnectionError(str("revanced_ryd_failure_generic", "confirm vote failed"),
+                    ex, true);
         } catch (Exception ex) {
             Logger.printException(() -> "Failed to confirm vote for video: " + videoId
                     + " solution: " + solution, ex); // should never happen
         }
+        return false;
     }
 
     private static void applyCommonPostRequestSettings(HttpURLConnection connection) throws ProtocolException {
@@ -440,12 +555,12 @@ public class ReturnYouTubeDislikeApi {
     }
 
     // https://stackoverflow.com/a/157202
-    private static String randomString() {
+    private static String randomString(int len) {
         String AB = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
         SecureRandom rnd = new SecureRandom();
 
-        StringBuilder sb = new StringBuilder(36);
-        for (int i = 0; i < 36; i++)
+        StringBuilder sb = new StringBuilder(len);
+        for (int i = 0; i < len; i++)
             sb.append(AB.charAt(rnd.nextInt(AB.length())));
         return sb.toString();
     }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
index 973550208..886852d2e 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java
@@ -3,7 +3,6 @@ package app.revanced.extension.shared.settings;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static app.revanced.extension.shared.patches.PatchStatus.HideFullscreenAdsDefaultBoolean;
-import static app.revanced.extension.shared.patches.PatchStatus.SpoofStreamingDataAndroidOnlyDefaultBoolean;
 
 import app.revanced.extension.shared.patches.ReturnYouTubeUsernamePatch.DisplayFormat;
 import app.revanced.extension.shared.patches.client.AppClient.ClientType;
@@ -37,9 +36,14 @@ public class BaseSettings {
     public static final StringSetting RETURN_YOUTUBE_USERNAME_YOUTUBE_DATA_API_V3_DEVELOPER_KEY = new StringSetting("revanced_return_youtube_username_youtube_data_api_v3_developer_key", "", true, false);
 
     public static final BooleanSetting SPOOF_STREAMING_DATA = new BooleanSetting("revanced_spoof_streaming_data", TRUE, true, "revanced_spoof_streaming_data_user_dialog_message");
-    public static final EnumSetting<ClientType> SPOOF_STREAMING_DATA_TYPE = new EnumSetting<>("revanced_spoof_streaming_data_type", ClientType.ANDROID_VR, true);
-    public static final BooleanSetting SPOOF_STREAMING_DATA_ANDROID_ONLY = new BooleanSetting("revanced_spoof_streaming_data_android_only", SpoofStreamingDataAndroidOnlyDefaultBoolean(), true, "revanced_spoof_streaming_data_android_only_user_dialog_message");
+    public static final BooleanSetting SPOOF_STREAMING_DATA_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_streaming_data_ios_force_avc", FALSE, true,
+            "revanced_spoof_streaming_data_ios_force_avc_user_dialog_message");
     public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE);
+    // Client type must be last spoof setting due to cyclic references.
+    public static final EnumSetting<ClientType> SPOOF_STREAMING_DATA_TYPE = new EnumSetting<>("revanced_spoof_streaming_data_type", ClientType.ANDROID_VR, true);
+
+    public static final StringSetting SPOOF_STREAMING_DATA_PO_TOKEN = new StringSetting("revanced_spoof_streaming_data_po_token", "", true);
+    public static final StringSetting SPOOF_STREAMING_DATA_VISITOR_DATA = new StringSetting("revanced_spoof_streaming_data_visitor_data", "", true);
 
     /**
      * @noinspection DeprecatedIsStillUsed
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/ResourceUtils.java b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/ResourceUtils.java
index 55b7c1ac6..e3252ef9a 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/ResourceUtils.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/ResourceUtils.java
@@ -1,5 +1,6 @@
 package app.revanced.extension.shared.utils;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.view.animation.Animation;
@@ -16,12 +17,25 @@ public class ResourceUtils extends Utils {
     } // utility class
 
     public static int getIdentifier(@NonNull String str, @NonNull ResourceType resourceType) {
-        return getIdentifier(str, resourceType, getContext());
+        Activity mActivity = getActivity();
+        Context mContext = mActivity != null
+                ? mActivity
+                : getContext();
+        if (mContext == null) {
+            handleException(str, resourceType);
+            return 0;
+        }
+        return getIdentifier(str, resourceType, mContext);
     }
 
     public static int getIdentifier(@NonNull String str, @NonNull ResourceType resourceType,
                                     @NonNull Context context) {
-        return getResources().getIdentifier(str, resourceType.getType(), context.getPackageName());
+        try {
+            return context.getResources().getIdentifier(str, resourceType.getType(), context.getPackageName());
+        } catch (Exception ex) {
+            handleException(str, resourceType);
+        }
+        return 0;
     }
 
     public static int getAnimIdentifier(@NonNull String str) {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/StringRef.java b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/StringRef.java
index f51b49ed0..902e354e2 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/StringRef.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/StringRef.java
@@ -1,6 +1,7 @@
 package app.revanced.extension.shared.utils;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 
@@ -104,7 +105,10 @@ public class StringRef extends Utils {
     public String toString() {
         if (!resolved) {
             try {
-                Context context = getContext();
+                Activity mActivity = getActivity();
+                Context context = mActivity != null
+                        ? mActivity
+                        : getContext();
                 if (resources == null) {
                     resources = getResources();
                 }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java
index d8e6a0afc..ed3e96428 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java
@@ -54,8 +54,6 @@ public class Utils {
     @SuppressLint("StaticFieldLeak")
     public static Context context;
 
-    private static Resources resources;
-
     protected Utils() {
     } // utility class
 
@@ -142,6 +140,24 @@ public class Utils {
         return backgroundThreadPool.submit(call);
     }
 
+    /**
+     * Simulates a delay by doing meaningless calculations.
+     * Used for debugging to verify UI timeout logic.
+     */
+    @SuppressWarnings("UnusedReturnValue")
+    public static long doNothingForDuration(long amountOfTimeToWaste) {
+        final long timeCalculationStarted = System.currentTimeMillis();
+        Logger.printDebug(() -> "Artificially creating delay of: " + amountOfTimeToWaste + "ms");
+
+        long meaninglessValue = 0;
+        while (System.currentTimeMillis() - timeCalculationStarted < amountOfTimeToWaste) {
+            // could do a thread sleep, but that will trigger an exception if the thread is interrupted
+            meaninglessValue += Long.numberOfLeadingZeros((long) Math.exp(Math.random()));
+        }
+        // return the value, otherwise the compiler or VM might optimize and remove the meaningless time wasting work,
+        // leaving an empty loop that hammers on the System.currentTimeMillis native call
+        return meaninglessValue;
+    }
 
     public static boolean containsAny(@NonNull String value, @NonNull String... targets) {
         return indexOfFirstFound(value, targets) >= 0;
@@ -264,11 +280,15 @@ public class Utils {
     }
 
     public static Resources getResources() {
-        if (resources == null) {
-            return getLocalizedContextAndSetResources(getContext()).getResources();
-        } else {
-            return resources;
+        Activity mActivity = activityRef.get();
+        if (mActivity != null) {
+            return mActivity.getResources();
         }
+        Context mContext = getContext();
+        if (mContext != null) {
+            return mContext.getResources();
+        }
+        throw new IllegalStateException("Get resources failed");
     }
 
     /**
@@ -286,6 +306,9 @@ public class Utils {
         if (mActivity == null) {
             return mContext;
         }
+        if (mContext == null) {
+            return null;
+        }
 
         // Locale of MainActivity.
         Locale applicationLocale;
@@ -303,7 +326,6 @@ public class Utils {
 
         // If they are identical, no need to override them.
         if (applicationLocale == contextLocale) {
-            resources = mActivity.getResources();
             return mContext;
         }
 
@@ -311,9 +333,7 @@ public class Utils {
         Locale.setDefault(applicationLocale);
         Configuration configuration = new Configuration(mContext.getResources().getConfiguration());
         configuration.setLocale(applicationLocale);
-        Context localizedContext = mContext.createConfigurationContext(configuration);
-        resources = localizedContext.getResources();
-        return localizedContext;
+        return mContext.createConfigurationContext(configuration);
     }
 
     public static void setActivity(Activity mainActivity) {
@@ -462,16 +482,6 @@ public class Utils {
         return false;
     }
 
-    public static boolean isDarkModeEnabled() {
-        return isDarkModeEnabled(context);
-    }
-
-    public static boolean isDarkModeEnabled(Context context) {
-        Configuration config = context.getResources().getConfiguration();
-        final int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
-    }
-
     /**
      * @return whether the device's API level is higher than a specific SDK version.
      */
@@ -514,6 +524,11 @@ public class Utils {
         );
     }
 
+    public static boolean isLandscapeOrientation() {
+        final int orientation = context.getResources().getConfiguration().orientation;
+        return orientation == Configuration.ORIENTATION_LANDSCAPE;
+    }
+
     /**
      * Automatically logs any exceptions the runnable throws.
      *
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CarouselShelfFilter.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CarouselShelfFilter.java
index 4dd9ace46..e565fe92c 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CarouselShelfFilter.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/CarouselShelfFilter.java
@@ -18,6 +18,7 @@ public final class CarouselShelfFilter extends Filter {
     private static final String BROWSE_ID_CLIP = "FEclips";
     private static final String BROWSE_ID_HOME = "FEwhat_to_watch";
     private static final String BROWSE_ID_LIBRARY = "FElibrary";
+    private static final String BROWSE_ID_MOVIE = "FEstorefront";
     private static final String BROWSE_ID_NOTIFICATION = "FEactivity";
     private static final String BROWSE_ID_NOTIFICATION_INBOX = "FEnotifications_inbox";
     private static final String BROWSE_ID_PLAYLIST = "VLPL";
@@ -32,9 +33,10 @@ public final class CarouselShelfFilter extends Filter {
     );
 
     private static final Supplier<Stream<String>> whitelistBrowseId = () -> Stream.of(
-            BROWSE_ID_LIBRARY,
-            BROWSE_ID_NOTIFICATION_INBOX,
             BROWSE_ID_CLIP,
+            BROWSE_ID_LIBRARY,
+            BROWSE_ID_MOVIE,
+            BROWSE_ID_NOTIFICATION_INBOX,
             BROWSE_ID_PREMIUM
     );
 
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.java
index 272eac1dd..759397604 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.java
@@ -32,12 +32,15 @@ public final class ChangeStartPagePatch {
         HISTORY("FEhistory", TRUE),
         LIBRARY("FElibrary", TRUE),
         MOVIE("FEstorefront", TRUE),
+        NOTIFICATIONS("FEactivity", TRUE),
         SUBSCRIPTIONS("FEsubscriptions", TRUE),
         TRENDING("FEtrending", TRUE),
+        YOUR_CLIPS("FEclips", TRUE),
 
         /**
          * Channel id, this can be used as a browseId.
          */
+        COURSES("UCtFRv9O2AHqOZjjynzrv-xg", TRUE),
         GAMING("UCOpNcN46UbXVtpKMrmU4Abg", TRUE),
         LIVE("UC4R8DWoMoI7CAwX8_LjQHig", TRUE),
         MUSIC("UC-9-kyTW8ZkZNDHQJ6FgpwQ", TRUE),
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java
index 0893398fb..1223d4115 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java
@@ -5,7 +5,6 @@ import static app.revanced.extension.shared.utils.Utils.getChildView;
 import static app.revanced.extension.shared.utils.Utils.hideViewByLayoutParams;
 import static app.revanced.extension.shared.utils.Utils.hideViewGroupByMarginLayoutParams;
 import static app.revanced.extension.shared.utils.Utils.hideViewUnderCondition;
-import static app.revanced.extension.shared.utils.Utils.isSDKAbove;
 import static app.revanced.extension.youtube.patches.utils.PatchStatus.ImageSearchButton;
 import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButton;
 
@@ -41,10 +40,10 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Objects;
 
-import app.revanced.extension.shared.utils.Logger;
 import app.revanced.extension.shared.utils.ResourceUtils;
 import app.revanced.extension.shared.utils.Utils;
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.utils.ExtendedUtils;
 import app.revanced.extension.youtube.utils.ThemeUtils;
 
 @SuppressWarnings("unused")
@@ -109,12 +108,7 @@ public class GeneralPatch {
     // region [Disable splash animation] patch
 
     public static boolean disableSplashAnimation(boolean original) {
-        try {
-            return !Settings.DISABLE_SPLASH_ANIMATION.get() && original;
-        } catch (Exception ex) {
-            Logger.printException(() -> "Failed to load disableSplashAnimation", ex);
-        }
-        return original;
+        return !Settings.DISABLE_SPLASH_ANIMATION.get() && original;
     }
 
     // endregion
@@ -129,6 +123,10 @@ public class GeneralPatch {
 
     // region [Hide layout components] patch
 
+    public static boolean disableTranslucentStatusBar(boolean original) {
+        return !Settings.DISABLE_TRANSLUCENT_STATUS_BAR.get() && original;
+    }
+
     private static String[] accountMenuBlockList;
 
     static {
@@ -198,8 +196,6 @@ public class GeneralPatch {
 
     // region [Hide navigation bar components] patch
 
-    private static final int fillBellCairoBlack = ResourceUtils.getDrawableIdentifier("yt_fill_bell_cairo_black_24");
-
     private static final Map<NavigationButton, Boolean> shouldHideMap = new EnumMap<>(NavigationButton.class) {
         {
             put(NavigationButton.HOME, Settings.HIDE_NAVIGATION_HOME_BUTTON.get());
@@ -215,10 +211,15 @@ public class GeneralPatch {
         return Settings.ENABLE_NARROW_NAVIGATION_BUTTONS.get() || original;
     }
 
+    public static boolean enableTranslucentNavigationBar() {
+        return Settings.ENABLE_TRANSLUCENT_NAVIGATION_BAR.get();
+    }
+
     /**
      * @noinspection ALL
      */
     public static void setCairoNotificationFilledIcon(EnumMap enumMap, Enum tabActivityCairo) {
+        final int fillBellCairoBlack = ResourceUtils.getDrawableIdentifier("yt_fill_bell_cairo_black_24");
         if (fillBellCairoBlack != 0) {
             // It's very unlikely, but Google might fix this issue someday.
             // If so, [fillBellCairoBlack] might already be in enumMap.
@@ -245,48 +246,6 @@ public class GeneralPatch {
         hideViewUnderCondition(Settings.HIDE_NAVIGATION_BAR.get(), view);
     }
 
-    public static boolean useTranslucentNavigationStatusBar(boolean original) {
-        try {
-            if (Settings.DISABLE_TRANSLUCENT_STATUS_BAR.get()) {
-                return false;
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "Failed to load useTranslucentNavigationStatusBar", ex);
-        }
-
-        return original;
-    }
-
-    private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT
-            = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT.get();
-
-    private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
-            = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK.get();
-
-    public static boolean useTranslucentNavigationButtons(boolean original) {
-        try {
-            // Feature requires Android 13+
-            if (!isSDKAbove(33)) {
-                return original;
-            }
-
-            if (!DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
-                return original;
-            }
-
-            if (DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK && DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT) {
-                return false;
-            }
-
-            return Utils.isDarkModeEnabled()
-                    ? !DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
-                    : !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT;
-        } catch (Exception ex) {
-            Logger.printException(() -> "Failed to load useTranslucentNavigationButtons", ex);
-        }
-        return original;
-    }
-
     // endregion
 
     // region [Remove viewer discretion dialog] patch
@@ -428,6 +387,7 @@ public class GeneralPatch {
     public static void setWideSearchBarLayout(View view) {
         if (!wideSearchbarEnabled)
             return;
+
         if (!(view.findViewById(searchBarId) instanceof RelativeLayout searchBarView))
             return;
 
@@ -550,12 +510,27 @@ public class GeneralPatch {
 
     private static final int settingsDrawableId =
             ResourceUtils.getDrawableIdentifier("yt_outline_gear_black_24");
+    private static final int settingsCairoDrawableId =
+            ResourceUtils.getDrawableIdentifier("yt_outline_gear_cairo_black_24");
 
     public static int getCreateButtonDrawableId(int original) {
-        return Settings.REPLACE_TOOLBAR_CREATE_BUTTON.get() &&
-                settingsDrawableId != 0
+        if (!Settings.REPLACE_TOOLBAR_CREATE_BUTTON.get()) {
+            return original;
+        }
+
+        if (settingsDrawableId == 0) {
+            return original;
+        }
+
+        // If the user has patched YouTube 19.26.42,
+        // Or spoofed the app version to 19.26.42 or earlier.
+        if (!ExtendedUtils.IS_19_28_OR_GREATER || ExtendedUtils.isSpoofingToLessThan("19.27.00")) {
+            return settingsDrawableId;
+        }
+
+        return settingsCairoDrawableId == 0
                 ? settingsDrawableId
-                : original;
+                : settingsCairoDrawableId;
     }
 
     public static void replaceCreateButton(String enumString, View toolbarView) {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java
index b231f24d9..615d27e10 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/MiniplayerPatch.java
@@ -12,6 +12,8 @@ import static app.revanced.extension.youtube.utils.ExtendedUtils.IS_19_26_OR_GRE
 import static app.revanced.extension.youtube.utils.ExtendedUtils.IS_19_29_OR_GREATER;
 import static app.revanced.extension.youtube.utils.ExtendedUtils.validateValue;
 
+import android.content.Context;
+import android.content.res.Resources;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
@@ -82,49 +84,56 @@ public final class MiniplayerPatch {
         }
     }
 
-    private static final int MINIPLAYER_SIZE;
+    private static int MINIPLAYER_SIZE = 0;
 
     static {
-        // YT appears to use the device screen dip width, plus an unknown fixed horizontal padding size.
-        DisplayMetrics displayMetrics = Utils.getContext().getResources().getDisplayMetrics();
-        final int deviceDipWidth = (int) (displayMetrics.widthPixels / displayMetrics.density);
+        setMiniPlayerSize();
+    }
 
-        // YT seems to use a minimum height to calculate the minimum miniplayer width based on the video.
-        // 170 seems to be the smallest that can be used and using less makes no difference.
-        final int WIDTH_DIP_MIN = 170; // Seems to be the smallest that works.
-        final int HORIZONTAL_PADDING_DIP = 15; // Estimated padding.
-        // Round down to the nearest 5 pixels, to keep any error toasts easier to read.
-        final int estimatedWidthDipMax = 5 * ((deviceDipWidth - HORIZONTAL_PADDING_DIP) / 5);
-        // On some ultra low end devices the pixel width and density are the same number,
-        // which causes the estimate to always give a value of 1.
-        // Fix this by using a fixed size of double the min width.
-        final int WIDTH_DIP_MAX = estimatedWidthDipMax <= WIDTH_DIP_MIN
-                ? 2 * WIDTH_DIP_MIN
-                : estimatedWidthDipMax;
-        Logger.printDebug(() -> "Screen dip width: " + deviceDipWidth + " maxWidth: " + WIDTH_DIP_MAX);
+    private static void setMiniPlayerSize() {
+        try {
+            Context context = Utils.getContext();
+            if (context == null) {
+                return;
+            }
+            Resources resources = context.getResources();
+            if (resources == null) {
+                return;
+            }
+            // YT appears to use the device screen dip width, plus an unknown fixed horizontal padding size.
+            DisplayMetrics displayMetrics = resources.getDisplayMetrics();
+            final int deviceDipWidth = (int) (displayMetrics.widthPixels / displayMetrics.density);
 
-        int dipWidth = Settings.MINIPLAYER_WIDTH_DIP.get();
+            // YT seems to use a minimum height to calculate the minimum miniplayer width based on the video.
+            // 170 seems to be the smallest that can be used and using less makes no difference.
+            final int WIDTH_DIP_MIN = 170; // Seems to be the smallest that works.
+            final int HORIZONTAL_PADDING_DIP = 15; // Estimated padding.
+            // Round down to the nearest 5 pixels, to keep any error toasts easier to read.
+            final int estimatedWidthDipMax = 5 * ((deviceDipWidth - HORIZONTAL_PADDING_DIP) / 5);
+            // On some ultra low end devices the pixel width and density are the same number,
+            // which causes the estimate to always give a value of 1.
+            // Fix this by using a fixed size of double the min width.
+            final int WIDTH_DIP_MAX = estimatedWidthDipMax <= WIDTH_DIP_MIN
+                    ? 2 * WIDTH_DIP_MIN
+                    : estimatedWidthDipMax;
+            Logger.printDebug(() -> "Screen dip width: " + deviceDipWidth + " maxWidth: " + WIDTH_DIP_MAX);
 
-        if (dipWidth < WIDTH_DIP_MIN || dipWidth > WIDTH_DIP_MAX) {
-            Utils.showToastShort(str("revanced_miniplayer_width_dip_invalid_toast",
-                    WIDTH_DIP_MIN, WIDTH_DIP_MAX));
-            Utils.showToastShort(str("revanced_extended_reset_to_default_toast"));
+            int dipWidth = Settings.MINIPLAYER_WIDTH_DIP.get();
 
-            // Instead of resetting, clamp the size at the bounds.
-            dipWidth = Math.max(WIDTH_DIP_MIN, Math.min(dipWidth, WIDTH_DIP_MAX));
-            Settings.MINIPLAYER_WIDTH_DIP.save(dipWidth);
+            if (dipWidth < WIDTH_DIP_MIN || dipWidth > WIDTH_DIP_MAX) {
+                Utils.showToastShort(str("revanced_miniplayer_width_dip_invalid_toast",
+                        WIDTH_DIP_MIN, WIDTH_DIP_MAX));
+                Utils.showToastShort(str("revanced_extended_reset_to_default_toast"));
+
+                // Instead of resetting, clamp the size at the bounds.
+                dipWidth = Math.max(WIDTH_DIP_MIN, Math.min(dipWidth, WIDTH_DIP_MAX));
+                Settings.MINIPLAYER_WIDTH_DIP.save(dipWidth);
+            }
+
+            MINIPLAYER_SIZE = dipWidth;
+        } catch (Exception ex) {
+            Logger.printException(() -> "setMiniPlayerSize failure", ex);
         }
-
-        MINIPLAYER_SIZE = dipWidth;
-
-        final int opacity = validateValue(
-                Settings.MINIPLAYER_OPACITY,
-                0,
-                100,
-                "revanced_miniplayer_opacity_invalid_toast"
-        );
-
-        OPACITY_LEVEL = (opacity * 255) / 100;
     }
 
     /**
@@ -175,6 +184,17 @@ public final class MiniplayerPatch {
 
     private static final int OPACITY_LEVEL;
 
+    static {
+        final int opacity = validateValue(
+                Settings.MINIPLAYER_OPACITY,
+                0,
+                100,
+                "revanced_miniplayer_opacity_invalid_toast"
+        );
+
+        OPACITY_LEVEL = (opacity * 255) / 100;
+    }
+
     public static final class MiniplayerHorizontalDragAvailability implements Setting.Availability {
         @Override
         public boolean isAvailable() {
@@ -293,7 +313,12 @@ public final class MiniplayerPatch {
      */
     public static int setMiniplayerDefaultSize(int original) {
         if (CURRENT_TYPE.isModern()) {
-            return MINIPLAYER_SIZE;
+            if (MINIPLAYER_SIZE == 0) {
+                setMiniPlayerSize();
+            }
+            if (MINIPLAYER_SIZE != 0) {
+                return MINIPLAYER_SIZE;
+            }
         }
 
         return original;
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/EnterFullscreenPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/EnterFullscreenPatch.java
new file mode 100644
index 000000000..5c5bed7ab
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/EnterFullscreenPatch.java
@@ -0,0 +1,67 @@
+package app.revanced.extension.youtube.patches.player;
+
+import androidx.annotation.NonNull;
+
+import app.revanced.extension.shared.utils.Logger;
+import app.revanced.extension.shared.utils.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
+import app.revanced.extension.youtube.utils.VideoUtils;
+
+@SuppressWarnings("unused")
+public class EnterFullscreenPatch {
+    private static volatile boolean isForeground = true;
+
+    @NonNull
+    private static String videoId = "";
+
+    /**
+     * Injection point.
+     */
+    public static void onAppBackgrounded() {
+        isForeground = false;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void onAppForegrounded() {
+        isForeground = true;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void enterFullscreen(@NonNull String newlyLoadedChannelId, @NonNull String newlyLoadedChannelName,
+                                       @NonNull String newlyLoadedVideoId, @NonNull String newlyLoadedVideoTitle,
+                                       final long newlyLoadedVideoLength, boolean newlyLoadedLiveStreamValue) {
+        try {
+            if (!Settings.ENTER_FULLSCREEN.get()) {
+                return;
+            }
+            PlayerType playerType = PlayerType.getCurrent();
+            // 1. The user opened the video while playing a video in the feed.
+            // 2. This is a valid request, so the videoId is not saved.
+            if (playerType == PlayerType.INLINE_MINIMAL) {
+                return;
+            }
+            if (videoId.equals(newlyLoadedVideoId)) {
+                return;
+            }
+            videoId = newlyLoadedVideoId;
+
+            // 1. User clicks home button in [PlayerType.WATCH_WHILE_MAXIMIZED], thus entering audio only mode.
+            // 2. PlayerType is still [PlayerType.WATCH_WHILE_MAXIMIZED].
+            // 3. Next video starts in audio only mode, then returns to foreground mode.
+            // 4. Enters fullscreen for a moment and then returns.
+            // We can prevent this by checking if the app is in the foreground.
+            if (playerType == PlayerType.WATCH_WHILE_MAXIMIZED && isForeground) {
+                // It works without delay, but in this case sometimes portrait videos have landscape orientation.
+                Utils.runOnMainThreadDelayed(VideoUtils::enterFullscreenMode, 250L);
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "enterFullscreen failure", ex);
+        }
+    }
+
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/ExitFullscreenPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/ExitFullscreenPatch.java
new file mode 100644
index 000000000..c66afb75d
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/ExitFullscreenPatch.java
@@ -0,0 +1,46 @@
+package app.revanced.extension.youtube.patches.player;
+
+import app.revanced.extension.shared.utils.Logger;
+import app.revanced.extension.shared.utils.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
+import app.revanced.extension.youtube.utils.VideoUtils;
+
+@SuppressWarnings("unused")
+public class ExitFullscreenPatch {
+
+    public enum FullscreenMode {
+        DISABLED,
+        PORTRAIT,
+        LANDSCAPE,
+        PORTRAIT_LANDSCAPE,
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void endOfVideoReached() {
+        try {
+            FullscreenMode mode = Settings.EXIT_FULLSCREEN.get();
+            if (mode == FullscreenMode.DISABLED) {
+                return;
+            }
+
+            if (PlayerType.getCurrent() == PlayerType.WATCH_WHILE_FULLSCREEN) {
+                if (mode != FullscreenMode.PORTRAIT_LANDSCAPE) {
+                    if (Utils.isLandscapeOrientation()) {
+                        if (mode == FullscreenMode.PORTRAIT) {
+                            return;
+                        }
+                    } else if (mode == FullscreenMode.LANDSCAPE) {
+                        return;
+                    }
+                }
+
+                Utils.runOnMainThread(VideoUtils::exitFullscreenMode);
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "endOfVideoReached failure", ex);
+        }
+    }
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java
index e7fd135d1..669d57fae 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java
@@ -5,8 +5,6 @@ import static app.revanced.extension.shared.utils.Utils.hideViewByRemovingFromPa
 import static app.revanced.extension.shared.utils.Utils.hideViewUnderCondition;
 import static app.revanced.extension.youtube.utils.ExtendedUtils.validateValue;
 
-import android.app.Activity;
-import android.content.pm.ActivityInfo;
 import android.support.v7.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.View;
@@ -20,7 +18,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
-import java.lang.ref.WeakReference;
 import java.util.Objects;
 
 import app.revanced.extension.shared.settings.BaseSettings;
@@ -328,37 +325,6 @@ public class PlayerPatch {
         Utils.runOnMainThreadDelayed(() -> isScreenOn = false, Settings.KEEP_LANDSCAPE_MODE_TIMEOUT.get());
     }
 
-    private static WeakReference<Activity> watchDescriptorActivityRef = new WeakReference<>(null);
-    private static volatile boolean isLandScapeVideo = true;
-
-    public static void setWatchDescriptorActivity(Activity activity) {
-        watchDescriptorActivityRef = new WeakReference<>(activity);
-    }
-
-    public static boolean forceFullscreen(boolean original) {
-        if (!Settings.FORCE_FULLSCREEN.get())
-            return original;
-
-        Utils.runOnMainThreadDelayed(PlayerPatch::setOrientation, 1000);
-        return true;
-    }
-
-    private static void setOrientation() {
-        final Activity watchDescriptorActivity = watchDescriptorActivityRef.get();
-        final int requestedOrientation = isLandScapeVideo
-                ? ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                : watchDescriptorActivity.getRequestedOrientation();
-
-        watchDescriptorActivity.setRequestedOrientation(requestedOrientation);
-    }
-
-    public static void setVideoPortrait(int width, int height) {
-        if (!Settings.FORCE_FULLSCREEN.get())
-            return;
-
-        isLandScapeVideo = width > height;
-    }
-
     // endregion
 
     // region [Hide comments component] patch
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/swipe/SwipeControlsPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/swipe/SwipeControlsPatch.java
index 01b302675..f4b0d16ad 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/swipe/SwipeControlsPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/swipe/SwipeControlsPatch.java
@@ -27,8 +27,22 @@ public class SwipeControlsPatch {
     /**
      * Injection point.
      */
-    public static boolean disableWatchPanelGestures() {
-        return !Settings.DISABLE_WATCH_PANEL_GESTURES.get();
+    public static boolean disableSwipeToEnterFullscreenModeBelowThePlayer() {
+        return !Settings.DISABLE_SWIPE_TO_ENTER_FULLSCREEN_MODE_BELOW_THE_PLAYER.get();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableSwipeToEnterFullscreenModeInThePlayer(boolean original) {
+        return !Settings.DISABLE_SWIPE_TO_ENTER_FULLSCREEN_MODE_IN_THE_PLAYER.get() && original;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableSwipeToExitFullscreenMode(boolean original) {
+        return !Settings.DISABLE_SWIPE_TO_EXIT_FULLSCREEN_MODE.get() && original;
     }
 
     /**
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PatchStatus.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PatchStatus.java
index 309415c0d..10fefa0e2 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PatchStatus.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PatchStatus.java
@@ -7,11 +7,6 @@ public class PatchStatus {
         return false;
     }
 
-    public static boolean MinimalHeader() {
-        // Replace this with true If the Custom header patch succeeds and the patch option was `youtube_minimal_header`
-        return false;
-    }
-
     public static boolean PlayerButtons() {
         // Replace this with true if the Hide player buttons patch succeeds
         return false;
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerControlsPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerControlsPatch.java
index 5a6e56f6a..7a3442505 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerControlsPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/PlayerControlsPatch.java
@@ -106,7 +106,7 @@ public class PlayerControlsPatch {
         }
     }
 
-    private static void changeVisibilityNegatedImmediately() {
+    public static void changeVisibilityNegatedImmediately() {
         // AlwaysRepeat.changeVisibilityNegatedImmediate();
         // CopyVideoUrl.changeVisibilityNegatedImmediate();
         // CopyVideoUrlTimestamp.changeVisibilityNegatedImmediate();
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/ReturnYouTubeDislikePatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/ReturnYouTubeDislikePatch.java
index 8e29174e5..4c94eb6a4 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/ReturnYouTubeDislikePatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/utils/ReturnYouTubeDislikePatch.java
@@ -360,8 +360,8 @@ public class ReturnYouTubeDislikePatch {
                 removeRollingNumberPatchChanges(view);
                 return original;
             }
-            final boolean isDescriptionPanel = view.getParent() instanceof ViewGroup viewGroupParent
-                    && viewGroupParent.getChildCount() < 2;
+            final boolean isDescriptionPanel = view.getParent() instanceof ViewGroup viewGroupParent &&
+                    viewGroupParent.getChildCount() < 2;
             // Called for all instances of RollingNumber, so must check if text is for a dislikes.
             // Text will already have the correct content but it's missing the drawable separators.
             if (!ReturnYouTubeDislike.isPreviouslyCreatedSegmentedSpan(original.toString()) || isDescriptionPanel) {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/PlaybackSpeedPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/PlaybackSpeedPatch.java
index ca2ad8fc1..5211c6a47 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/PlaybackSpeedPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/PlaybackSpeedPatch.java
@@ -10,13 +10,15 @@ import org.apache.commons.lang3.BooleanUtils;
 import app.revanced.extension.shared.utils.Logger;
 import app.revanced.extension.shared.utils.Utils;
 import app.revanced.extension.youtube.patches.utils.PatchStatus;
-import app.revanced.extension.youtube.patches.video.requests.PlaylistRequest;
+import app.revanced.extension.youtube.patches.video.requests.MusicRequest;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.VideoInformation;
 import app.revanced.extension.youtube.whitelist.Whitelist;
 
 @SuppressWarnings("unused")
 public class PlaybackSpeedPatch {
+    private static final boolean DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC =
+            Settings.DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC.get();
     private static final long TOAST_DELAY_MILLISECONDS = 750;
     private static long lastTimeSpeedChanged;
     private static boolean isLiveStream;
@@ -39,8 +41,8 @@ public class PlaybackSpeedPatch {
     /**
      * Injection point.
      */
-    public static void fetchPlaylistData(@NonNull String videoId, boolean isShortAndOpeningOrPlaying) {
-        if (Settings.DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC.get()) {
+    public static void fetchMusicRequest(@NonNull String videoId, boolean isShortAndOpeningOrPlaying) {
+        if (DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC) {
             try {
                 final boolean videoIdIsShort = VideoInformation.lastPlayerResponseIsShort();
                 // Shorts shelf in home and subscription feed causes player response hook to be called,
@@ -50,9 +52,12 @@ public class PlaybackSpeedPatch {
                     return;
                 }
 
-                PlaylistRequest.fetchRequestIfNeeded(videoId);
+                MusicRequest.fetchRequestIfNeeded(
+                        videoId,
+                        Settings.DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC_TYPE.get()
+                );
             } catch (Exception ex) {
-                Logger.printException(() -> "fetchPlaylistData failure", ex);
+                Logger.printException(() -> "fetchMusicRequest failure", ex);
             }
         }
     }
@@ -61,15 +66,16 @@ public class PlaybackSpeedPatch {
      * Injection point.
      */
     public static float getPlaybackSpeedInShorts(final float playbackSpeed) {
-        if (!VideoInformation.lastPlayerResponseIsShort())
-            return playbackSpeed;
-        if (!Settings.ENABLE_DEFAULT_PLAYBACK_SPEED_SHORTS.get())
-            return playbackSpeed;
+        if (VideoInformation.lastPlayerResponseIsShort() &&
+                Settings.ENABLE_DEFAULT_PLAYBACK_SPEED_SHORTS.get()
+        ) {
+            float defaultPlaybackSpeed = getDefaultPlaybackSpeed(VideoInformation.getChannelId(), null);
+            Logger.printDebug(() -> "overridePlaybackSpeed in Shorts: " + defaultPlaybackSpeed);
 
-        float defaultPlaybackSpeed = getDefaultPlaybackSpeed(VideoInformation.getChannelId(), null);
-        Logger.printDebug(() -> "overridePlaybackSpeed in Shorts: " + defaultPlaybackSpeed);
+            return defaultPlaybackSpeed;
+        }
 
-        return defaultPlaybackSpeed;
+        return playbackSpeed;
     }
 
     /**
@@ -118,23 +124,21 @@ public class PlaybackSpeedPatch {
     }
 
     private static float getDefaultPlaybackSpeed(@NonNull String channelId, @Nullable String videoId) {
-        return (Settings.DISABLE_DEFAULT_PLAYBACK_SPEED_LIVE.get() && isLiveStream) ||
-                Whitelist.isChannelWhitelistedPlaybackSpeed(channelId) ||
-                getPlaylistData(videoId)
+        return (isLiveStream || Whitelist.isChannelWhitelistedPlaybackSpeed(channelId) || isMusic(videoId))
                 ? 1.0f
                 : Settings.DEFAULT_PLAYBACK_SPEED.get();
     }
 
-    private static boolean getPlaylistData(@Nullable String videoId) {
-        if (Settings.DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC.get() && videoId != null) {
+    private static boolean isMusic(@Nullable String videoId) {
+        if (DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC && videoId != null) {
             try {
-                PlaylistRequest request = PlaylistRequest.getRequestForVideoId(videoId);
-                final boolean isPlaylist = request != null && BooleanUtils.toBoolean(request.getStream());
-                Logger.printDebug(() -> "isPlaylist: " + isPlaylist);
+                MusicRequest request = MusicRequest.getRequestForVideoId(videoId);
+                final boolean isMusic = request != null && BooleanUtils.toBoolean(request.getStream());
+                Logger.printDebug(() -> "videoId: " + videoId + ", isMusic: " + isMusic);
 
-                return isPlaylist;
+                return isMusic;
             } catch (Exception ex) {
-                Logger.printException(() -> "getPlaylistData failure", ex);
+                Logger.printException(() -> "getMusicRequest failure", ex);
             }
         }
 
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/VideoQualityPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/VideoQualityPatch.java
index c42125c0d..d13e2e354 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/VideoQualityPatch.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/VideoQualityPatch.java
@@ -38,7 +38,7 @@ public class VideoQualityPatch {
         if (videoId.equals(newlyLoadedVideoId))
             return;
         videoId = newlyLoadedVideoId;
-        setVideoQuality(Settings.SKIP_PRELOADED_BUFFER.get() ? 250 : 500);
+        setVideoQuality(Settings.SKIP_PRELOADED_BUFFER.get() ? 250 : 750);
     }
 
     /**
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/requests/MusicRequest.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/requests/MusicRequest.kt
new file mode 100644
index 000000000..8299757fc
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/requests/MusicRequest.kt
@@ -0,0 +1,249 @@
+package app.revanced.extension.youtube.patches.video.requests
+
+import android.annotation.SuppressLint
+import androidx.annotation.GuardedBy
+import app.revanced.extension.shared.patches.client.AppClient
+import app.revanced.extension.shared.patches.client.WebClient
+import app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes
+import app.revanced.extension.shared.requests.Requester
+import app.revanced.extension.shared.utils.Logger
+import app.revanced.extension.shared.utils.Utils
+import app.revanced.extension.youtube.shared.VideoInformation
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.net.SocketTimeoutException
+import java.util.Objects
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.Future
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+class MusicRequest private constructor(
+    private val videoId: String,
+    private val checkCategory: Boolean
+) {
+    /**
+     * Time this instance and the fetch future was created.
+     */
+    private val timeFetched = System.currentTimeMillis()
+    private val future: Future<Boolean> = Utils.submitOnBackgroundThread {
+        fetch(
+            videoId,
+            checkCategory,
+        )
+    }
+
+    fun isExpired(now: Long): Boolean {
+        val timeSinceCreation = now - timeFetched
+        if (timeSinceCreation > CACHE_RETENTION_TIME_MILLISECONDS) {
+            return true
+        }
+
+        // Only expired if the fetch failed (API null response).
+        return (fetchCompleted() && stream == null)
+    }
+
+    /**
+     * @return if the fetch call has completed.
+     */
+    private fun fetchCompleted(): Boolean {
+        return future.isDone
+    }
+
+    val stream: Boolean?
+        get() {
+            try {
+                return future[MAX_MILLISECONDS_TO_WAIT_FOR_FETCH, TimeUnit.MILLISECONDS]
+            } catch (ex: TimeoutException) {
+                Logger.printInfo(
+                    { "getStream timed out" },
+                    ex
+                )
+            } catch (ex: InterruptedException) {
+                Logger.printException(
+                    { "getStream interrupted" },
+                    ex
+                )
+                Thread.currentThread().interrupt() // Restore interrupt status flag.
+            } catch (ex: ExecutionException) {
+                Logger.printException(
+                    { "getStream failure" },
+                    ex
+                )
+            }
+
+            return null
+        }
+
+    companion object {
+        /**
+         * How long to keep fetches until they are expired.
+         */
+        private const val CACHE_RETENTION_TIME_MILLISECONDS = 60 * 1000L // 1 Minute
+
+        private const val MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000L // 20 seconds
+
+        @GuardedBy("itself")
+        private val cache: MutableMap<String, MusicRequest> = HashMap()
+
+        @JvmStatic
+        @SuppressLint("ObsoleteSdkInt")
+        fun fetchRequestIfNeeded(videoId: String, checkCategory: Boolean) {
+            Objects.requireNonNull(videoId)
+            synchronized(cache) {
+                val now = System.currentTimeMillis()
+                cache.values.removeIf { request: MusicRequest ->
+                    val expired = request.isExpired(now)
+                    if (expired) Logger.printDebug { "Removing expired stream: " + request.videoId }
+                    expired
+                }
+                if (!cache.containsKey(videoId)) {
+                    cache[videoId] = MusicRequest(videoId, checkCategory)
+                }
+            }
+        }
+
+        @JvmStatic
+        fun getRequestForVideoId(videoId: String): MusicRequest? {
+            synchronized(cache) {
+                return cache[videoId]
+            }
+        }
+
+        private fun handleConnectionError(toastMessage: String, ex: Exception?) {
+            Logger.printInfo({ toastMessage }, ex)
+        }
+
+        private fun sendApplicationRequest(videoId: String): JSONObject? {
+            Objects.requireNonNull(videoId)
+
+            val startTime = System.currentTimeMillis()
+            val clientType = AppClient.ClientType.ANDROID_VR
+            val clientTypeName = clientType.name
+            Logger.printDebug { "Fetching playlist request for: $videoId using client: $clientTypeName" }
+
+            try {
+                val connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(
+                    PlayerRoutes.GET_PLAYLIST_PAGE,
+                    clientType
+                )
+                val requestBody =
+                    PlayerRoutes.createApplicationRequestBody(clientType, videoId, "RD$videoId")
+
+                connection.setFixedLengthStreamingMode(requestBody.size)
+                connection.outputStream.write(requestBody)
+
+                val responseCode = connection.responseCode
+                if (responseCode == 200) return Requester.parseJSONObject(connection)
+
+                handleConnectionError(
+                    (clientTypeName + " not available with response code: "
+                            + responseCode + " message: " + connection.responseMessage),
+                    null
+                )
+            } catch (ex: SocketTimeoutException) {
+                handleConnectionError("Connection timeout", ex)
+            } catch (ex: IOException) {
+                handleConnectionError("Network error", ex)
+            } catch (ex: Exception) {
+                Logger.printException({ "sendApplicationRequest failed" }, ex)
+            } finally {
+                Logger.printDebug { "video: " + videoId + " took: " + (System.currentTimeMillis() - startTime) + "ms" }
+            }
+
+            return null
+        }
+
+        private fun sendWebRequest(videoId: String): JSONObject? {
+            Objects.requireNonNull(videoId)
+
+            val startTime = System.currentTimeMillis()
+            val clientType = WebClient.ClientType.MWEB
+            val clientTypeName = clientType.name
+            Logger.printDebug { "Fetching playability request for: $videoId using client: $clientTypeName" }
+
+            try {
+                val connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(
+                    PlayerRoutes.GET_CATEGORY,
+                    clientType
+                )
+                val requestBody =
+                    PlayerRoutes.createWebInnertubeBody(clientType, videoId)
+
+                connection.setFixedLengthStreamingMode(requestBody.size)
+                connection.outputStream.write(requestBody)
+
+                val responseCode = connection.responseCode
+                if (responseCode == 200) return Requester.parseJSONObject(connection)
+
+                handleConnectionError(
+                    (clientTypeName + " not available with response code: "
+                            + responseCode + " message: " + connection.responseMessage),
+                    null
+                )
+            } catch (ex: SocketTimeoutException) {
+                handleConnectionError("Connection timeout", ex)
+            } catch (ex: IOException) {
+                handleConnectionError("Network error", ex)
+            } catch (ex: Exception) {
+                Logger.printException({ "sendWebRequest failed" }, ex)
+            } finally {
+                Logger.printDebug { "video: " + videoId + " took: " + (System.currentTimeMillis() - startTime) + "ms" }
+            }
+
+            return null
+        }
+
+        private fun parseApplicationResponse(playlistJson: JSONObject): Boolean {
+            try {
+                val playerParams: String? = (playlistJson
+                    .getJSONObject("contents")
+                    .getJSONObject("singleColumnWatchNextResults")
+                    .getJSONObject("playlist")
+                    .getJSONObject("playlist")
+                    .getJSONArray("contents")[0] as JSONObject)
+                    .getJSONObject("playlistPanelVideoRenderer")
+                    .getJSONObject("navigationEndpoint")
+                    .getJSONObject("watchEndpoint")
+                    .getString("playerParams")
+
+                return VideoInformation.isMixPlaylistsOpenedByUser(playerParams!!)
+            } catch (e: JSONException) {
+                Logger.printDebug { "Fetch failed while processing Application response data for response: $playlistJson" }
+            }
+
+            return false
+        }
+
+        private fun parseWebResponse(microFormatJson: JSONObject): Boolean {
+            try {
+                return microFormatJson
+                    .getJSONObject("playerMicroformatRenderer")
+                    .getJSONObject("category")
+                    .getString("status")
+                    .equals("Music")
+            } catch (e: JSONException) {
+                Logger.printDebug { "Fetch failed while processing Web response data for response: $microFormatJson" }
+            }
+
+            return false
+        }
+
+        private fun fetch(videoId: String, checkCategory: Boolean): Boolean {
+            if (checkCategory) {
+                val microFormatJson = sendWebRequest(videoId)
+                if (microFormatJson != null) {
+                    return parseWebResponse(microFormatJson)
+                }
+            } else {
+                val playlistJson = sendApplicationRequest(videoId)
+                if (playlistJson != null) {
+                    return parseApplicationResponse(playlistJson)
+                }
+            }
+
+            return false
+        }
+    }
+}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/requests/PlaylistRequest.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/requests/PlaylistRequest.java
deleted file mode 100644
index b7c69cd0a..000000000
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/video/requests/PlaylistRequest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package app.revanced.extension.youtube.patches.video.requests;
-
-import static app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes.GET_PLAYLIST_PAGE;
-
-import android.annotation.SuppressLint;
-
-import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.SocketTimeoutException;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import app.revanced.extension.shared.patches.client.AppClient.ClientType;
-import app.revanced.extension.shared.patches.spoof.requests.PlayerRoutes;
-import app.revanced.extension.shared.requests.Requester;
-import app.revanced.extension.shared.utils.Logger;
-import app.revanced.extension.shared.utils.Utils;
-import app.revanced.extension.youtube.shared.VideoInformation;
-
-public class PlaylistRequest {
-
-    /**
-     * How long to keep fetches until they are expired.
-     */
-    private static final long CACHE_RETENTION_TIME_MILLISECONDS = 60 * 1000; // 1 Minute
-
-    private static final long MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000; // 20 seconds
-
-    @GuardedBy("itself")
-    private static final Map<String, PlaylistRequest> cache = new HashMap<>();
-
-    @SuppressLint("ObsoleteSdkInt")
-    public static void fetchRequestIfNeeded(@Nullable String videoId) {
-        Objects.requireNonNull(videoId);
-        synchronized (cache) {
-            final long now = System.currentTimeMillis();
-
-            cache.values().removeIf(request -> {
-                final boolean expired = request.isExpired(now);
-                if (expired) Logger.printDebug(() -> "Removing expired stream: " + request.videoId);
-                return expired;
-            });
-
-            if (!cache.containsKey(videoId)) {
-                cache.put(videoId, new PlaylistRequest(videoId));
-            }
-        }
-    }
-
-    @Nullable
-    public static PlaylistRequest getRequestForVideoId(@Nullable String videoId) {
-        synchronized (cache) {
-            return cache.get(videoId);
-        }
-    }
-
-    private static void handleConnectionError(String toastMessage, @Nullable Exception ex) {
-        Logger.printInfo(() -> toastMessage, ex);
-    }
-
-    @Nullable
-    private static JSONObject send(ClientType clientType, String videoId) {
-        Objects.requireNonNull(clientType);
-        Objects.requireNonNull(videoId);
-
-        final long startTime = System.currentTimeMillis();
-        String clientTypeName = clientType.name();
-        Logger.printDebug(() -> "Fetching playlist request for: " + videoId + " using client: " + clientTypeName);
-
-        try {
-            HttpURLConnection connection = PlayerRoutes.getPlayerResponseConnectionFromRoute(GET_PLAYLIST_PAGE, clientType);
-
-            String innerTubeBody = String.format(
-                    Locale.ENGLISH,
-                    PlayerRoutes.createInnertubeBody(clientType, true),
-                    videoId,
-                    "RD" + videoId
-            );
-            byte[] requestBody = innerTubeBody.getBytes(StandardCharsets.UTF_8);
-            connection.setFixedLengthStreamingMode(requestBody.length);
-            connection.getOutputStream().write(requestBody);
-
-            final int responseCode = connection.getResponseCode();
-            if (responseCode == 200) return Requester.parseJSONObject(connection);
-
-            handleConnectionError(clientTypeName + " not available with response code: "
-                            + responseCode + " message: " + connection.getResponseMessage(),
-                    null);
-        } catch (SocketTimeoutException ex) {
-            handleConnectionError("Connection timeout", ex);
-        } catch (IOException ex) {
-            handleConnectionError("Network error", ex);
-        } catch (Exception ex) {
-            Logger.printException(() -> "send failed", ex);
-        } finally {
-            Logger.printDebug(() -> "video: " + videoId + " took: " + (System.currentTimeMillis() - startTime) + "ms");
-        }
-
-        return null;
-    }
-
-    private static Boolean fetch(@NonNull String videoId) {
-        final ClientType clientType = ClientType.ANDROID_VR;
-        final JSONObject playlistJson = send(clientType, videoId);
-        if (playlistJson != null) {
-            try {
-                final JSONObject singleColumnWatchNextResultsJsonObject = playlistJson
-                        .getJSONObject("contents")
-                        .getJSONObject("singleColumnWatchNextResults");
-
-                if (!singleColumnWatchNextResultsJsonObject.has("playlist")) {
-                    return false;
-                }
-
-                final JSONObject playlistJsonObject = singleColumnWatchNextResultsJsonObject
-                        .getJSONObject("playlist")
-                        .getJSONObject("playlist");
-
-                final Object currentStreamObject = playlistJsonObject
-                        .getJSONArray("contents")
-                        .get(0);
-
-                if (!(currentStreamObject instanceof JSONObject currentStreamJsonObject)) {
-                    return false;
-                }
-
-                final JSONObject watchEndpointJsonObject = currentStreamJsonObject
-                        .getJSONObject("playlistPanelVideoRenderer")
-                        .getJSONObject("navigationEndpoint")
-                        .getJSONObject("watchEndpoint");
-
-                Logger.printDebug(() -> "watchEndpoint: " + watchEndpointJsonObject);
-
-                return watchEndpointJsonObject.has("playerParams") &&
-                        VideoInformation.isMixPlaylistsOpenedByUser(watchEndpointJsonObject.getString("playerParams"));
-            } catch (JSONException e) {
-                Logger.printDebug(() -> "Fetch failed while processing response data for response: " + playlistJson);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Time this instance and the fetch future was created.
-     */
-    private final long timeFetched;
-    private final String videoId;
-    private final Future<Boolean> future;
-
-    private PlaylistRequest(String videoId) {
-        this.timeFetched = System.currentTimeMillis();
-        this.videoId = videoId;
-        this.future = Utils.submitOnBackgroundThread(() -> fetch(videoId));
-    }
-
-    public boolean isExpired(long now) {
-        final long timeSinceCreation = now - timeFetched;
-        if (timeSinceCreation > CACHE_RETENTION_TIME_MILLISECONDS) {
-            return true;
-        }
-
-        // Only expired if the fetch failed (API null response).
-        return (fetchCompleted() && getStream() == null);
-    }
-
-    /**
-     * @return if the fetch call has completed.
-     */
-    public boolean fetchCompleted() {
-        return future.isDone();
-    }
-
-    public Boolean getStream() {
-        try {
-            return future.get(MAX_MILLISECONDS_TO_WAIT_FOR_FETCH, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException ex) {
-            Logger.printInfo(() -> "getStream timed out", ex);
-        } catch (InterruptedException ex) {
-            Logger.printException(() -> "getStream interrupted", ex);
-            Thread.currentThread().interrupt(); // Restore interrupt status flag.
-        } catch (ExecutionException ex) {
-            Logger.printException(() -> "getStream failure", ex);
-        }
-
-        return null;
-    }
-}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
index dd478f4f0..c2d727885 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java
@@ -118,7 +118,6 @@ public class ReturnYouTubeDislike {
      */
     public static final int leftSeparatorShapePaddingPixels;
     private static final ShapeDrawable leftSeparatorShape;
-    public static final Locale locale;
 
     static {
         final Resources resources = Utils.getResources();
@@ -135,7 +134,6 @@ public class ReturnYouTubeDislike {
 
         leftSeparatorShape = new ShapeDrawable(new RectShape());
         leftSeparatorShape.setBounds(leftSeparatorBounds);
-        locale = resources.getConfiguration().getLocales().get(0);
 
         ReturnYouTubeDislikeApi.toastOnConnectionError = Settings.RYD_TOAST_ON_CONNECTION_ERROR.get();
     }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java
index 9d593c8f5..043af0fee 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java
@@ -38,6 +38,7 @@ import app.revanced.extension.youtube.patches.general.LayoutSwitchPatch.FormFact
 import app.revanced.extension.youtube.patches.general.MiniplayerPatch;
 import app.revanced.extension.youtube.patches.general.YouTubeMusicActionsPatch;
 import app.revanced.extension.youtube.patches.misc.WatchHistoryPatch.WatchHistoryType;
+import app.revanced.extension.youtube.patches.player.ExitFullscreenPatch.FullscreenMode;
 import app.revanced.extension.youtube.patches.shorts.AnimationFeedbackPatch.AnimationType;
 import app.revanced.extension.youtube.patches.shorts.ShortsRepeatStatePatch.ShortsLoopBehavior;
 import app.revanced.extension.youtube.patches.utils.PatchStatus;
@@ -147,7 +148,7 @@ public class Settings extends BaseSettings {
             new ChangeStartPagePatch.ChangeStartPageTypeAvailability());
     public static final BooleanSetting DISABLE_AUTO_AUDIO_TRACKS = new BooleanSetting("revanced_disable_auto_audio_tracks", FALSE);
     public static final BooleanSetting DISABLE_SPLASH_ANIMATION = new BooleanSetting("revanced_disable_splash_animation", FALSE, true);
-    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true);
+    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", TRUE, true);
     public static final BooleanSetting ENABLE_GRADIENT_LOADING_SCREEN = new BooleanSetting("revanced_enable_gradient_loading_screen", FALSE, true);
     public static final BooleanSetting HIDE_FLOATING_MICROPHONE = new BooleanSetting("revanced_hide_floating_microphone", TRUE, true);
     public static final BooleanSetting HIDE_GRAY_SEPARATOR = new BooleanSetting("revanced_hide_gray_separator", TRUE);
@@ -190,8 +191,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_NAVIGATION_SUBSCRIPTIONS_BUTTON = new BooleanSetting("revanced_hide_navigation_subscriptions_button", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_LABEL = new BooleanSetting("revanced_hide_navigation_label", FALSE, true);
     public static final BooleanSetting SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_switch_create_with_notifications_button", TRUE, true, "revanced_switch_create_with_notifications_button_user_dialog_message");
-    public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT = new BooleanSetting("revanced_disable_translucent_navigation_bar_light", FALSE, true);
-    public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK = new BooleanSetting("revanced_disable_translucent_navigation_bar_dark", FALSE, true);
+    public static final BooleanSetting ENABLE_TRANSLUCENT_NAVIGATION_BAR = new BooleanSetting("revanced_enable_translucent_navigation_bar", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_BAR = new BooleanSetting("revanced_hide_navigation_bar", FALSE, true);
 
     // PreferenceScreen: General - Override buttons
@@ -336,6 +336,8 @@ public class Settings extends BaseSettings {
 
     // PreferenceScreen: Player - Fullscreen
     public static final BooleanSetting DISABLE_ENGAGEMENT_PANEL = new BooleanSetting("revanced_disable_engagement_panel", FALSE, true);
+    public static final BooleanSetting ENTER_FULLSCREEN = new BooleanSetting("revanced_enter_fullscreen", FALSE);
+    public static final EnumSetting<FullscreenMode> EXIT_FULLSCREEN = new EnumSetting<>("revanced_exit_fullscreen", FullscreenMode.DISABLED);
     public static final BooleanSetting SHOW_VIDEO_TITLE_SECTION = new BooleanSetting("revanced_show_video_title_section", TRUE, true, parent(DISABLE_ENGAGEMENT_PANEL));
     public static final BooleanSetting HIDE_AUTOPLAY_PREVIEW = new BooleanSetting("revanced_hide_autoplay_preview", FALSE, true);
     public static final BooleanSetting HIDE_LIVE_CHAT_REPLAY_BUTTON = new BooleanSetting("revanced_hide_live_chat_replay_button", FALSE);
@@ -355,7 +357,6 @@ public class Settings extends BaseSettings {
 
     public static final BooleanSetting DISABLE_LANDSCAPE_MODE = new BooleanSetting("revanced_disable_landscape_mode", FALSE, true);
     public static final BooleanSetting ENABLE_COMPACT_CONTROLS_OVERLAY = new BooleanSetting("revanced_enable_compact_controls_overlay", FALSE, true);
-    public static final BooleanSetting FORCE_FULLSCREEN = new BooleanSetting("revanced_force_fullscreen", FALSE, true);
     public static final BooleanSetting KEEP_LANDSCAPE_MODE = new BooleanSetting("revanced_keep_landscape_mode", FALSE, true);
     public static final LongSetting KEEP_LANDSCAPE_MODE_TIMEOUT = new LongSetting("revanced_keep_landscape_mode_timeout", 3000L, true);
 
@@ -515,8 +516,10 @@ public class Settings extends BaseSettings {
      */
     @Deprecated // Patch is obsolete and no longer works with 19.09+
     public static final BooleanSetting DISABLE_HDR_AUTO_BRIGHTNESS = new BooleanSetting("revanced_disable_hdr_auto_brightness", TRUE, true, parent(ENABLE_SWIPE_BRIGHTNESS));
-    public static final BooleanSetting DISABLE_SWIPE_TO_SWITCH_VIDEO = new BooleanSetting("revanced_disable_swipe_to_switch_video", FALSE, true);
-    public static final BooleanSetting DISABLE_WATCH_PANEL_GESTURES = new BooleanSetting("revanced_disable_watch_panel_gestures", FALSE, true);
+    public static final BooleanSetting DISABLE_SWIPE_TO_SWITCH_VIDEO = new BooleanSetting("revanced_disable_swipe_to_switch_video", TRUE, true);
+    public static final BooleanSetting DISABLE_SWIPE_TO_ENTER_FULLSCREEN_MODE_BELOW_THE_PLAYER = new BooleanSetting("revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player", TRUE, true);
+    public static final BooleanSetting DISABLE_SWIPE_TO_ENTER_FULLSCREEN_MODE_IN_THE_PLAYER = new BooleanSetting("revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player", FALSE, true);
+    public static final BooleanSetting DISABLE_SWIPE_TO_EXIT_FULLSCREEN_MODE = new BooleanSetting("revanced_disable_swipe_to_exit_fullscreen_mode", FALSE, true);
     public static final BooleanSetting SWIPE_BRIGHTNESS_AUTO = new BooleanSetting("revanced_swipe_brightness_auto", TRUE, false, false);
     public static final FloatSetting SWIPE_BRIGHTNESS_VALUE = new FloatSetting("revanced_swipe_brightness_value", -1.0f, false, false);
 
@@ -526,7 +529,6 @@ public class Settings extends BaseSettings {
     public static final IntegerSetting DEFAULT_VIDEO_QUALITY_MOBILE = new IntegerSetting("revanced_default_video_quality_mobile", -2);
     public static final IntegerSetting DEFAULT_VIDEO_QUALITY_WIFI = new IntegerSetting("revanced_default_video_quality_wifi", -2);
     public static final BooleanSetting DISABLE_HDR_VIDEO = new BooleanSetting("revanced_disable_hdr_video", FALSE, true);
-    public static final BooleanSetting DISABLE_DEFAULT_PLAYBACK_SPEED_LIVE = new BooleanSetting("revanced_disable_default_playback_speed_live", TRUE);
     public static final BooleanSetting ENABLE_CUSTOM_PLAYBACK_SPEED = new BooleanSetting("revanced_enable_custom_playback_speed", FALSE, true);
     public static final BooleanSetting CUSTOM_PLAYBACK_SPEED_MENU_TYPE = new BooleanSetting("revanced_custom_playback_speed_menu_type", FALSE, parent(ENABLE_CUSTOM_PLAYBACK_SPEED));
     public static final StringSetting CUSTOM_PLAYBACK_SPEEDS = new StringSetting("revanced_custom_playback_speeds", "0.25\n0.5\n0.75\n1.0\n1.25\n1.5\n1.75\n2.0\n2.25\n2.5", true, parent(ENABLE_CUSTOM_PLAYBACK_SPEED));
@@ -537,6 +539,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting RESTORE_OLD_VIDEO_QUALITY_MENU = new BooleanSetting("revanced_restore_old_video_quality_menu", TRUE, true);
     // Experimental Flags
     public static final BooleanSetting DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC = new BooleanSetting("revanced_disable_default_playback_speed_music", FALSE, true);
+    public static final BooleanSetting DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC_TYPE = new BooleanSetting("revanced_disable_default_playback_speed_music_type", FALSE, true, parent(DISABLE_DEFAULT_PLAYBACK_SPEED_MUSIC));
     public static final BooleanSetting ENABLE_DEFAULT_PLAYBACK_SPEED_SHORTS = new BooleanSetting("revanced_enable_default_playback_speed_shorts", FALSE);
     public static final BooleanSetting SKIP_PRELOADED_BUFFER = new BooleanSetting("revanced_skip_preloaded_buffer", FALSE, true, "revanced_skip_preloaded_buffer_user_dialog_message");
     public static final BooleanSetting SKIP_PRELOADED_BUFFER_TOAST = new BooleanSetting("revanced_skip_preloaded_buffer_toast", TRUE);
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
index cf46d1a79..d5abb90e7 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java
@@ -1,5 +1,6 @@
 package app.revanced.extension.youtube.settings.preference;
 
+import static com.google.android.apps.youtube.app.settings.videoquality.VideoQualitySettingsActivity.setToolbarLayoutParams;
 import static app.revanced.extension.shared.settings.preference.AbstractPreferenceFragment.showRestartDialog;
 import static app.revanced.extension.shared.settings.preference.AbstractPreferenceFragment.updateListPreferenceSummary;
 import static app.revanced.extension.shared.utils.ResourceUtils.getXmlIdentifier;
@@ -18,6 +19,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Insets;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
@@ -31,6 +33,7 @@ import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.util.TypedValue;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.widget.TextView;
 import android.widget.Toolbar;
 
@@ -202,6 +205,15 @@ public class ReVancedPreferenceFragment extends PreferenceFragment {
                                 .findViewById(android.R.id.content)
                                 .getParent();
 
+                        // Fix required for Android 15
+                        if (isSDKAbove(35)) {
+                            rootView.setOnApplyWindowInsetsListener((v, insets) -> {
+                                Insets statusInsets = insets.getInsets(WindowInsets.Type.statusBars());
+                                v.setPadding(0, statusInsets.top, 0, 0);
+                                return insets;
+                            });
+                        }
+
                         Toolbar toolbar = new Toolbar(preferenceScreen.getContext());
 
                         toolbar.setTitle(preferenceScreen.getTitle());
@@ -219,6 +231,8 @@ public class ReVancedPreferenceFragment extends PreferenceFragment {
                             toolbarTextView.setTextColor(ThemeUtils.getForegroundColor());
                         }
 
+                        setToolbarLayoutParams(toolbar);
+
                         rootView.addView(toolbar, 0);
                         return false;
                     }
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java
index d1dfbcdb4..a3987e7b9 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedSettingsPreference.java
@@ -46,10 +46,8 @@ public class ReVancedSettingsPreference extends ReVancedPreferenceFragment {
         enableDisablePreferences();
 
         AmbientModePreferenceLinks();
-        ChangeHeaderPreferenceLinks();
         ExternalDownloaderPreferenceLinks();
         FullScreenPanelPreferenceLinks();
-        LayoutOverrideLinks();
         MiniPlayerPreferenceLinks();
         NavigationPreferenceLinks();
         RYDPreferenceLinks();
@@ -71,16 +69,6 @@ public class ReVancedSettingsPreference extends ReVancedPreferenceFragment {
         );
     }
 
-    /**
-     * Enable/Disable Preference related to Change header
-     */
-    private static void ChangeHeaderPreferenceLinks() {
-        enableDisablePreferences(
-                PatchStatus.MinimalHeader(),
-                Settings.CHANGE_YOUTUBE_HEADER
-        );
-    }
-
     /**
      * Enable/Disable Preference for External downloader settings
      */
@@ -93,16 +81,6 @@ public class ReVancedSettingsPreference extends ReVancedPreferenceFragment {
         );
     }
 
-    /**
-     * Enable/Disable Layout Override Preference
-     */
-    private static void LayoutOverrideLinks() {
-        enableDisablePreferences(
-                ExtendedUtils.isTablet(),
-                Settings.FORCE_FULLSCREEN
-        );
-    }
-
     /**
      * Enable/Disable Preferences not working in tablet layout
      */
@@ -139,17 +117,6 @@ public class ReVancedSettingsPreference extends ReVancedPreferenceFragment {
                 Settings.HIDE_QUICK_ACTIONS_SAVE_TO_PLAYLIST_BUTTON,
                 Settings.HIDE_QUICK_ACTIONS_SHARE_BUTTON
         );
-
-        enableDisablePreferences(
-                Settings.DISABLE_LANDSCAPE_MODE.get(),
-                Settings.FORCE_FULLSCREEN
-        );
-
-        enableDisablePreferences(
-                Settings.FORCE_FULLSCREEN.get(),
-                Settings.DISABLE_LANDSCAPE_MODE
-        );
-
     }
 
     /**
@@ -204,9 +171,8 @@ public class ReVancedSettingsPreference extends ReVancedPreferenceFragment {
                 Settings.REPLACE_TOOLBAR_CREATE_BUTTON_TYPE
         );
         enableDisablePreferences(
-                !isSDKAbove(33),
-                Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT,
-                Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
+                !isSDKAbove(31),
+                Settings.ENABLE_TRANSLUCENT_NAVIGATION_BAR
         );
     }
 
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataDefaultClientListPreference.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataDefaultClientListPreference.java
deleted file mode 100644
index b3fabe111..000000000
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataDefaultClientListPreference.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package app.revanced.extension.youtube.settings.preference;
-
-import static app.revanced.extension.shared.utils.ResourceUtils.getStringArray;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.ListPreference;
-import android.preference.PreferenceManager;
-import android.util.AttributeSet;
-
-import app.revanced.extension.shared.patches.client.AppClient.ClientType;
-import app.revanced.extension.shared.settings.EnumSetting;
-import app.revanced.extension.shared.settings.Setting;
-import app.revanced.extension.shared.utils.Utils;
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings({"unused", "deprecation"})
-public class SpoofStreamingDataDefaultClientListPreference extends ListPreference {
-
-    private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
-        // Because this listener may run before the ReVanced settings fragment updates Settings,
-        // this could show the prior config and not the current.
-        //
-        // Push this call to the end of the main run queue,
-        // so all other listeners are done and Settings is up to date.
-        Utils.runOnMainThread(this::updateUI);
-    };
-
-    public SpoofStreamingDataDefaultClientListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public SpoofStreamingDataDefaultClientListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public SpoofStreamingDataDefaultClientListPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public SpoofStreamingDataDefaultClientListPreference(Context context) {
-        super(context);
-    }
-
-    private void addChangeListener() {
-        Setting.preferences.preferences.registerOnSharedPreferenceChangeListener(listener);
-    }
-
-    private void removeChangeListener() {
-        Setting.preferences.preferences.unregisterOnSharedPreferenceChangeListener(listener);
-    }
-
-    @Override
-    protected void onAttachedToHierarchy(PreferenceManager preferenceManager) {
-        super.onAttachedToHierarchy(preferenceManager);
-        updateUI();
-        addChangeListener();
-    }
-
-    @Override
-    protected void onPrepareForRemoval() {
-        super.onPrepareForRemoval();
-        removeChangeListener();
-    }
-
-    private void updateUI() {
-        final boolean spoofStreamingDataAndroidOnly = Settings.SPOOF_STREAMING_DATA_ANDROID_ONLY.get();
-        final String entryKey = spoofStreamingDataAndroidOnly
-                ? "revanced_spoof_streaming_data_type_android_entries"
-                : "revanced_spoof_streaming_data_type_android_ios_entries";
-        final String entryValueKey = spoofStreamingDataAndroidOnly
-                ? "revanced_spoof_streaming_data_type_android_entry_values"
-                : "revanced_spoof_streaming_data_type_android_ios_entry_values";
-        final String[] mEntries = getStringArray(entryKey);
-        final String[] mEntryValues = getStringArray(entryValueKey);
-        setEntries(mEntries);
-        setEntryValues(mEntryValues);
-
-        final EnumSetting<ClientType> clientType = Settings.SPOOF_STREAMING_DATA_TYPE;
-        final boolean isAndroid = clientType.get().name().startsWith("ANDROID");
-        if (spoofStreamingDataAndroidOnly && !isAndroid) {
-            clientType.resetToDefault();
-        }
-
-        setEnabled(Settings.SPOOF_STREAMING_DATA.get());
-    }
-}
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
index f8e062270..99958d018 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java
@@ -63,13 +63,7 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference {
 
     private void updateUI() {
         final String clientName = Settings.SPOOF_STREAMING_DATA_TYPE.get().name().toLowerCase();
-        String summaryTextKey = "revanced_spoof_streaming_data_side_effects_";
-
-        if (Settings.SPOOF_STREAMING_DATA_ANDROID_ONLY.get()) {
-            summaryTextKey += "android";
-        } else {
-            summaryTextKey += clientName;
-        }
+        final String summaryTextKey = "revanced_spoof_streaming_data_side_effects_" + clientName;
 
         setSummary(str(summaryTextKey));
         setEnabled(Settings.SPOOF_STREAMING_DATA.get());
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/BottomSheetState.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/BottomSheetState.kt
index 2d8b513a3..83e4dd514 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/BottomSheetState.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/BottomSheetState.kt
@@ -31,7 +31,7 @@ enum class BottomSheetState {
                 onChange(currentBottomSheetState)
             }
 
-        @Volatile // value is read/write from different threads
+        @Volatile // Read/write from different threads.
         private var currentBottomSheetState = CLOSED
 
         /**
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/LockModeState.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/LockModeState.kt
index 9a330e687..2b7063664 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/LockModeState.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/LockModeState.kt
@@ -40,7 +40,7 @@ enum class LockModeState {
                 onChange(value)
             }
 
-        @Volatile // value is read/write from different threads
+        @Volatile // Read/write from different threads.
         private var currentLockModeState = LOCK_MODE_STATE_ENUM_UNKNOWN
 
         /**
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java
index 0f3c07105..3c65e1d0c 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/NavigationBar.java
@@ -25,20 +25,21 @@ public final class NavigationBar {
      * How long to wait for the set nav button latch to be released.  Maximum wait time must
      * be as small as possible while still allowing enough time for the nav bar to update.
      * <p>
-     * YT calls it's back button handlers out of order,
-     * and litho starts filtering before the navigation bar is updated.
+     * YT calls it's back button handlers out of order, and litho starts filtering before the
+     * navigation bar is updated. Fixing this situation and not needlessly waiting requires
+     * somehow detecting if a back button key/gesture will not change the active tab.
      * <p>
-     * Fixing this situation and not needlessly waiting requires somehow
-     * detecting if a back button key-press will cause a tab change.
+     * On average the time between pressing the back button and the first litho event is
+     * about 10-20ms.  Waiting up to 75-150ms should be enough time to handle normal use cases
+     * and not be noticeable, since YT typically takes 100-200ms (or more) to update the view.
      * <p>
-     * Typically after pressing the back button, the time between the first litho event and
-     * when the nav button is updated is about 10-20ms. Using 50-100ms here should be enough time
-     * and not noticeable, since YT typically takes 100-200ms (or more) to update the view anyways.
+     * This delay is only noticeable when the device back button/gesture will not
+     * change the current navigation tab, such as backing out of the watch history.
      * <p>
      * This issue can also be avoided on a patch by patch basis, by avoiding calls to
      * {@link NavigationButton#getSelectedNavigationButton()} unless absolutely necessary.
      */
-    private static final long LATCH_AWAIT_TIMEOUT_MILLISECONDS = 75;
+    private static final long LATCH_AWAIT_TIMEOUT_MILLISECONDS = 120;
 
     /**
      * Used as a workaround to fix the issue of YT calling back button handlers out of order.
@@ -84,7 +85,8 @@ public final class NavigationBar {
             // The latch is released from the main thread, and waiting from the main thread will always timeout.
             // This situation has only been observed when navigating out of a submenu and not changing tabs.
             // and for that use case the nav bar does not change so it's safe to return here.
-            Logger.printDebug(() -> "Cannot block main thread waiting for nav button. Using last known navbar button status.");
+            Logger.printDebug(() -> "Cannot block main thread waiting for nav button. " +
+                    "Using last known navbar button status.");
             return;
         }
 
@@ -102,7 +104,9 @@ public final class NavigationBar {
             Logger.printDebug(() -> "Latch wait timed out");
 
         } catch (InterruptedException ex) {
-            Logger.printException(() -> "Latch wait interrupted failure", ex); // Will never happen.
+            // Calling YouTube thread was interrupted.
+            Logger.printException(() -> "Latch wait interrupted", ex);
+            Thread.currentThread().interrupt(); // Restore interrupt status flag.
         }
     }
 
@@ -256,8 +260,8 @@ public final class NavigationBar {
          * <p>
          * All code calling this method should handle a null return value.
          * <p>
-         * <b>Due to issues with how YT processes physical back button events,
-         * this patch uses workarounds that can cause this method to take up to 75ms
+         * <b>Due to issues with how YT processes physical back button/gesture events,
+         * this patch uses workarounds that can cause this method to take up to 120ms
          * if the device back button was recently pressed.</b>
          *
          * @return The active navigation tab.
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibility.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibility.kt
index e9d5468d4..c7cf1bbd7 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibility.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerControlsVisibility.kt
@@ -14,7 +14,7 @@ enum class PlayerControlsVisibility {
 
     companion object {
 
-        private val nameToPlayerControlsVisibility = values().associateBy { it.name }
+        private val nameToPlayerControlsVisibility = entries.associateBy { it.name }
 
         @JvmStatic
         fun setFromString(enumName: String) {
@@ -38,6 +38,7 @@ enum class PlayerControlsVisibility {
                 currentPlayerControlsVisibility = value
             }
 
+        @Volatile // Read/write from different threads.
         private var currentPlayerControlsVisibility: PlayerControlsVisibility? = null
     }
 }
\ No newline at end of file
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt
index 9bfaffe58..201d32085 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/PlayerType.kt
@@ -71,7 +71,7 @@ enum class PlayerType {
                 onChange(value)
             }
 
-        @Volatile // value is read/write from different threads
+        @Volatile // Read/write from different threads.
         private var currentPlayerType = NONE
 
         /**
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/ShortsPlayerState.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/ShortsPlayerState.kt
index b0aed2e79..e3e56c58e 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/ShortsPlayerState.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/ShortsPlayerState.kt
@@ -31,7 +31,7 @@ enum class ShortsPlayerState {
                 onChange(value)
             }
 
-        @Volatile // value is read/write from different threads
+        @Volatile // Read/write from different threads.
         private var currentShortsPlayerState = CLOSED
 
         /**
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt
index 4e1888a7c..b26759ce9 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/shared/VideoState.kt
@@ -39,6 +39,7 @@ enum class VideoState {
                 currentVideoState = value
             }
 
+        @Volatile // Read/write from different threads.
         private var currentVideoState: VideoState? = null
     }
 }
\ No newline at end of file
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java
index f2e31a014..b0679a902 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java
@@ -126,8 +126,12 @@ public class SBRequester {
             HttpURLConnection connection = getConnectionFromRoute(SBRoutes.SUBMIT_SEGMENTS, privateUserId, videoId, category, start, end, duration);
             final int responseCode = connection.getResponseCode();
 
-            String userMessage = switch (responseCode) {
-                case HTTP_STATUS_CODE_SUCCESS -> str("revanced_sb_submit_succeeded");
+            if (responseCode == HTTP_STATUS_CODE_SUCCESS) {
+                Utils.showToastLong(str("revanced_sb_submit_succeeded"));
+                return;
+            }
+
+            String userErrorMessage = switch (responseCode) {
                 case 409 -> str("revanced_sb_submit_failed_duplicate");
                 case 403 -> str("revanced_sb_submit_failed_forbidden",
                         Requester.parseErrorStringAndDisconnect(connection));
@@ -137,9 +141,10 @@ public class SBRequester {
                 default -> str("revanced_sb_submit_failed_unknown_error",
                         responseCode, connection.getResponseMessage());
             };
+
             // Message might be about the users account or an error too large to show in a toast.
             // Use a dialog instead.
-            SponsorBlockUtils.showErrorDialog(userMessage);
+            SponsorBlockUtils.showErrorDialog(userErrorMessage);
         } catch (SocketTimeoutException ex) {
             Logger.printDebug(() -> "Timeout", ex);
             Utils.showToastLong(str("revanced_sb_submit_failed_timeout"));
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt
index ac995bfd7..314fb3d76 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt
@@ -87,8 +87,10 @@ abstract class BaseGestureController(
         distanceX: Float,
         distanceY: Float,
     ): Boolean {
+        if (from == null) return false
+
         // submit to swipe detector
-        submitForSwipe(from!!, to, distanceX, distanceY)
+        submitForSwipe(from, to, distanceX, distanceY)
 
         // call swipe callback if in a swipe
         return if (currentSwipe != SwipeDetector.SwipeDirection.NONE) {
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/ExtendedUtils.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/ExtendedUtils.java
index 77f328b52..3af96e1c8 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/ExtendedUtils.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/ExtendedUtils.java
@@ -16,6 +16,7 @@ public class ExtendedUtils extends PackageUtils {
     public static final boolean IS_19_20_OR_GREATER = getAppVersionName().compareTo("19.20.00") >= 0;
     public static final boolean IS_19_21_OR_GREATER = getAppVersionName().compareTo("19.21.00") >= 0;
     public static final boolean IS_19_26_OR_GREATER = getAppVersionName().compareTo("19.26.00") >= 0;
+    public static final boolean IS_19_28_OR_GREATER = getAppVersionName().compareTo("19.28.00") >= 0;
     public static final boolean IS_19_29_OR_GREATER = getAppVersionName().compareTo("19.29.00") >= 0;
     public static final boolean IS_19_34_OR_GREATER = getAppVersionName().compareTo("19.34.00") >= 0;
 
diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/VideoUtils.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/VideoUtils.java
index 2ee1127b7..0a5eb34e6 100644
--- a/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/VideoUtils.java
+++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/utils/VideoUtils.java
@@ -242,6 +242,20 @@ public class VideoUtils extends IntentUtils {
         return !isExternalDownloaderLaunched.get() && original;
     }
 
+    /**
+     * Rest of the implementation added by patch.
+     */
+    public static void enterFullscreenMode() {
+        Logger.printDebug(() -> "Enter fullscreen mode");
+    }
+
+    /**
+     * Rest of the implementation added by patch.
+     */
+    public static void exitFullscreenMode() {
+        Logger.printDebug(() -> "Exit fullscreen mode");
+    }
+
     /**
      * Rest of the implementation added by patch.
      */
diff --git a/extensions/shared/src/main/java/com/google/android/apps/youtube/app/settings/videoquality/VideoQualitySettingsActivity.java b/extensions/shared/src/main/java/com/google/android/apps/youtube/app/settings/videoquality/VideoQualitySettingsActivity.java
index 1d1468478..14d19be64 100644
--- a/extensions/shared/src/main/java/com/google/android/apps/youtube/app/settings/videoquality/VideoQualitySettingsActivity.java
+++ b/extensions/shared/src/main/java/com/google/android/apps/youtube/app/settings/videoquality/VideoQualitySettingsActivity.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.TypedValue;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.SearchView;
@@ -88,17 +87,21 @@ public class VideoQualitySettingsActivity extends Activity {
         fragment.filterPreferences(query);
     }
 
+    private static ViewGroup.LayoutParams lp;
+
+    public static void setToolbarLayoutParams(Toolbar toolbar) {
+        if (lp != null) {
+            toolbar.setLayoutParams(lp);
+        }
+    }
+
     private void setToolbar() {
-        if (!(findViewById(ResourceUtils.getIdIdentifier("revanced_toolbar_parent")) instanceof ViewGroup toolBarParent))
-            return;
+        ViewGroup toolBarParent = findViewById(ResourceUtils.getIdIdentifier("revanced_toolbar_parent"));
 
         // Remove dummy toolbar.
-        for (int i = 0; i < toolBarParent.getChildCount(); i++) {
-            View view = toolBarParent.getChildAt(i);
-            if (view != null) {
-                toolBarParent.removeView(view);
-            }
-        }
+        ViewGroup dummyToolbar = toolBarParent.findViewById(ResourceUtils.getIdIdentifier("revanced_toolbar"));
+        lp = dummyToolbar.getLayoutParams();
+        toolBarParent.removeView(dummyToolbar);
 
         Toolbar toolbar = new Toolbar(toolBarParent.getContext());
         toolbar.setBackgroundColor(ThemeUtils.getToolbarBackgroundColor());
@@ -112,6 +115,7 @@ public class VideoQualitySettingsActivity extends Activity {
         if (toolbarTextView != null) {
             toolbarTextView.setTextColor(ThemeUtils.getForegroundColor());
         }
+        setToolbarLayoutParams(toolbar);
         toolBarParent.addView(toolbar, 0);
     }
 
diff --git a/gradle.properties b/gradle.properties
index 9013491db..5de17c401 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
 kotlin.jvm.target.validation.mode = IGNORE
-version = 5.1.3
+version = 5.2.1
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fb602ee2a..e1b837a19 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/patches.json b/patches.json
index eac961c94..dccb9d4e1 100644
--- a/patches.json
+++ b/patches.json
@@ -43,26 +43,6 @@
     },
     "options": []
   },
-  {
-    "name": "Amoled",
-    "description": "Applies a pure black theme to some components.",
-    "use": true,
-    "dependencies": [
-      "BytecodePatch",
-      "Settings for YouTube Music"
-    ],
-    "compatiblePackages": {
-      "com.google.android.apps.youtube.music": [
-        "6.20.51",
-        "6.29.59",
-        "6.42.55",
-        "6.51.53",
-        "7.16.53",
-        "7.25.53"
-      ]
-    },
-    "options": []
-  },
   {
     "name": "Bitrate default value",
     "description": "Sets the audio quality to \u0027Always High\u0027 when you first install the app.",
@@ -186,7 +166,7 @@
   },
   {
     "name": "Change share sheet",
-    "description": "Add option to change from in-app share sheet to system share sheet.",
+    "description": "Adds an option to change the in-app share sheet to the system share sheet.",
     "use": true,
     "dependencies": [
       "Settings for YouTube Music",
@@ -207,7 +187,7 @@
   },
   {
     "name": "Change share sheet",
-    "description": "Add option to change from in-app share sheet to system share sheet.",
+    "description": "Adds an option to change the in-app share sheet to the system share sheet.",
     "use": true,
     "dependencies": [
       "Settings for YouTube",
@@ -364,7 +344,7 @@
       {
         "key": "changeSplashIcon",
         "title": "Change splash icons",
-        "description": "Apply the custom branding icon to the splash screen.",
+        "description": "Apply the custom branding icon to the splash screen. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
         "required": true,
         "type": "kotlin.Boolean",
         "default": true,
@@ -636,6 +616,53 @@
       }
     ]
   },
+  {
+    "name": "Dark theme",
+    "description": "Changes the app\u0027s dark theme to the values specified in patch options.",
+    "use": true,
+    "dependencies": [
+      "BytecodePatch"
+    ],
+    "compatiblePackages": {
+      "com.google.android.apps.youtube.music": [
+        "6.20.51",
+        "6.29.59",
+        "6.42.55",
+        "6.51.53",
+        "7.16.53",
+        "7.25.53"
+      ]
+    },
+    "options": [
+      {
+        "key": "darkThemeBackgroundColor",
+        "title": "Dark theme background color",
+        "description": "Can be a hex color (#AARRGGBB) or a color resource reference.",
+        "required": false,
+        "type": "kotlin.String",
+        "default": "@android:color/black",
+        "values": {
+          "Amoled Black": "@android:color/black",
+          "Catppuccin (Mocha)": "#FF181825",
+          "Dark Pink": "#FF290025",
+          "Dark Blue": "#FF001029",
+          "Dark Green": "#FF002905",
+          "Dark Yellow": "#FF282900",
+          "Dark Orange": "#FF291800",
+          "Dark Red": "#FF290000"
+        }
+      },
+      {
+        "key": "materialYou",
+        "title": "MaterialYou",
+        "description": "Applies the MaterialYou theme for Android 12+ devices.",
+        "required": true,
+        "type": "kotlin.Boolean",
+        "default": false,
+        "values": null
+      }
+    ]
+  },
   {
     "name": "Description components",
     "description": "Adds options to hide and disable description components.",
@@ -819,6 +846,27 @@
     },
     "options": []
   },
+  {
+    "name": "Disable music video in album",
+    "description": "Adds option to redirect music videos from albums for non-premium users.",
+    "use": false,
+    "dependencies": [
+      "Settings for YouTube Music",
+      "BytecodePatch",
+      "BytecodePatch"
+    ],
+    "compatiblePackages": {
+      "com.google.android.apps.youtube.music": [
+        "6.20.51",
+        "6.29.59",
+        "6.42.55",
+        "6.51.53",
+        "7.16.53",
+        "7.25.53"
+      ]
+    },
+    "options": []
+  },
   {
     "name": "Disable resuming Shorts on startup",
     "description": "Adds an option to disable the Shorts player from resuming on app startup when Shorts were last being watched.",
@@ -1087,6 +1135,9 @@
       "Settings for YouTube",
       "BytecodePatch",
       "BytecodePatch",
+      "BytecodePatch",
+      "BytecodePatch",
+      "BytecodePatch",
       "ResourcePatch",
       "ResourcePatch"
     ],
@@ -1493,7 +1544,8 @@
       "BytecodePatch",
       "ResourcePatch",
       "BytecodePatch",
-      "BytecodePatch"
+      "BytecodePatch",
+      "ResourcePatch"
     ],
     "compatiblePackages": {
       "com.google.android.youtube": [
@@ -1619,7 +1671,7 @@
   },
   {
     "name": "Hide shortcuts",
-    "description": "Remove, at compile time, the app shortcuts that appears when app icon is long pressed.",
+    "description": "Remove, at compile time, the app shortcuts that appears when the app icon is long pressed.",
     "use": false,
     "dependencies": [
       "Settings for YouTube",
@@ -1861,7 +1913,8 @@
       "BytecodePatch",
       "ResourcePatch",
       "ResourcePatch",
-      "Settings for YouTube"
+      "Settings for YouTube",
+      "ResourcePatch"
     ],
     "compatiblePackages": {
       "com.google.android.youtube": [
@@ -1891,7 +1944,7 @@
       {
         "key": "bottomMargin",
         "title": "Bottom margin",
-        "description": "The bottom margin for the overlay buttons and timestamp.",
+        "description": "The bottom margin for the overlay buttons and timestamp. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
         "required": true,
         "type": "kotlin.String",
         "default": "2.5dip",
@@ -1904,7 +1957,7 @@
       {
         "key": "widerButtonsSpace",
         "title": "Wider between-buttons space",
-        "description": "Prevent adjacent button presses by increasing the horizontal spacing between buttons.",
+        "description": "Prevent adjacent button presses by increasing the horizontal spacing between buttons. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
         "required": true,
         "type": "kotlin.Boolean",
         "default": false,
@@ -2530,7 +2583,8 @@
     "use": true,
     "dependencies": [
       "BytecodePatch",
-      "Settings for YouTube Music"
+      "Settings for YouTube Music",
+      "BytecodePatch"
     ],
     "compatiblePackages": {
       "com.google.android.apps.youtube.music": [
@@ -2651,7 +2705,7 @@
   },
   {
     "name": "Toolbar components",
-    "description": "Adds options to hide or change components located on the toolbar, such as toolbar buttons, search bar, and header.",
+    "description": "Adds options to hide or change components located on the toolbar, such as the search bar, header, and toolbar buttons.",
     "use": true,
     "dependencies": [
       "BytecodePatch",
diff --git a/patches/api/patches.api b/patches/api/patches.api
index d19702041..440ced4f9 100644
--- a/patches/api/patches.api
+++ b/patches/api/patches.api
@@ -22,10 +22,6 @@ public final class app/revanced/patches/music/flyoutmenu/components/FlyoutMenuCo
 	public static final fun getFlyoutMenuComponentsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
-public final class app/revanced/patches/music/general/amoled/AmoledPatchKt {
-	public static final fun getAmoledPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
-}
-
 public final class app/revanced/patches/music/general/autocaptions/AutoCaptionsPatchKt {
 	public static final fun getAutoCaptionsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -82,6 +78,11 @@ public final class app/revanced/patches/music/layout/playeroverlay/PlayerOverlay
 	public static final fun getPlayerOverlayFilterPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
+public final class app/revanced/patches/music/layout/theme/DarkThemePatchKt {
+	public static final fun getDARK_COLOR ()[Ljava/lang/String;
+	public static final fun getDarkThemePatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+}
+
 public final class app/revanced/patches/music/layout/translations/TranslationsPatchKt {
 	public static final fun getTranslationsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
@@ -90,6 +91,10 @@ public final class app/revanced/patches/music/layout/visual/VisualPreferencesIco
 	public static final fun getVisualPreferencesIconsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
+public final class app/revanced/patches/music/misc/album/AlbumMusicVideoPatchKt {
+	public static final fun getAlbumMusicVideoPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatchKt {
 	public static final fun getBackgroundPlaybackPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -138,6 +143,10 @@ public final class app/revanced/patches/music/player/components/PlayerComponents
 	public static final fun getPlayerComponentsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/music/utils/dismiss/DismissQueueHookPatchKt {
+	public static final fun getDismissQueueHookPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/music/utils/extension/SharedExtensionPatchKt {
 	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -159,6 +168,7 @@ public final class app/revanced/patches/music/utils/fix/fileprovider/FileProvide
 }
 
 public final class app/revanced/patches/music/utils/fix/streamingdata/SpoofStreamingDataPatchKt {
+	public static final field EXTENSION_CLASS_DESCRIPTOR Ljava/lang/String;
 	public static final fun getSpoofStreamingDataPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
@@ -183,6 +193,7 @@ public final class app/revanced/patches/music/utils/playservice/VersionCheckPatc
 	public static final fun is_6_27_or_greater ()Z
 	public static final fun is_6_36_or_greater ()Z
 	public static final fun is_6_42_or_greater ()Z
+	public static final fun is_7_03_or_greater ()Z
 	public static final fun is_7_06_or_greater ()Z
 	public static final fun is_7_13_or_greater ()Z
 	public static final fun is_7_17_or_greater ()Z
@@ -194,6 +205,8 @@ public final class app/revanced/patches/music/utils/playservice/VersionCheckPatc
 
 public final class app/revanced/patches/music/utils/resourceid/SharedResourceIdPatchKt {
 	public static final fun getAccountSwitcherAccessibility ()J
+	public static final fun getActionBarLogo ()J
+	public static final fun getActionBarLogoRingo2 ()J
 	public static final fun getBottomSheetRecyclerView ()J
 	public static final fun getButtonContainer ()J
 	public static final fun getButtonIconPaddingMedium ()J
@@ -201,6 +214,7 @@ public final class app/revanced/patches/music/utils/resourceid/SharedResourceIdP
 	public static final fun getColorGrey ()J
 	public static final fun getDarkBackground ()J
 	public static final fun getDesignBottomSheetDialog ()J
+	public static final fun getElementsContainer ()J
 	public static final fun getEndButtonsContainer ()J
 	public static final fun getFloatingLayout ()J
 	public static final fun getHistoryMenuItem ()J
@@ -233,6 +247,8 @@ public final class app/revanced/patches/music/utils/resourceid/SharedResourceIdP
 	public static final fun getTouchOutside ()J
 	public static final fun getTrimSilenceSwitch ()J
 	public static final fun getVarispeedUnavailableTitle ()J
+	public static final fun getYtmLogo ()J
+	public static final fun getYtmLogoRingo2 ()J
 	public static final fun isTablet ()J
 }
 
@@ -274,6 +290,12 @@ public final class app/revanced/patches/music/video/playback/VideoPlaybackPatchK
 	public static final fun getVideoPlaybackPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/music/video/playerresponse/PlayerResponseMethodHookPatchKt {
+	public static final fun getPlayerResponseMethodHookPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun hookPlayerResponse (Ljava/lang/String;Z)V
+	public static synthetic fun hookPlayerResponse$default (Ljava/lang/String;ZILjava/lang/Object;)V
+}
+
 public final class app/revanced/patches/reddit/ad/AdsPatchKt {
 	public static final fun getAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -428,6 +450,8 @@ public final class app/revanced/patches/shared/mainactivity/BaseMainActivityReso
 	public static final fun getMainActivityMutableClass ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;
 	public static final fun getOnConfigurationChangedMethod ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
 	public static final fun getOnCreateMethod ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
+	public static final fun getOnStartMethod ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
+	public static final fun getOnStopMethod ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
 }
 
 public final class app/revanced/patches/shared/mapping/ResourceElement {
@@ -469,6 +493,10 @@ public final class app/revanced/patches/shared/mapping/ResourceType : java/lang/
 	public static fun values ()[Lapp/revanced/patches/shared/mapping/ResourceType;
 }
 
+public final class app/revanced/patches/shared/materialyou/BaseMaterialYouPatchKt {
+	public static final fun baseMaterialYou (Lapp/revanced/patcher/patch/ResourcePatchContext;)V
+}
+
 public final class app/revanced/patches/shared/opus/BaseOpusCodecsPatchKt {
 	public static final fun baseOpusCodecsPatch (Ljava/lang/String;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -830,6 +858,10 @@ public final class app/revanced/patches/youtube/utils/flyoutmenu/FlyoutMenuHookP
 	public static final fun getFlyoutMenuHookPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/utils/fullscreen/FullscreenButtonHookPatchKt {
+	public static final fun getFullscreenButtonHookPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/utils/gms/GmsCoreSupportPatchKt {
 	public static final fun getGmsCoreSupportPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1150,6 +1182,7 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun or (Lcom/android/tools/smali/dexlib2/AccessFlags;I)I
 	public static final fun or (Lcom/android/tools/smali/dexlib2/AccessFlags;Lcom/android/tools/smali/dexlib2/AccessFlags;)I
 	public static final fun parametersEqual (Ljava/lang/Iterable;Ljava/lang/Iterable;)Z
+	public static final fun replaceLiteralInstructionCall (Lapp/revanced/patcher/patch/BytecodePatchContext;JJ)V
 	public static final fun replaceLiteralInstructionCall (Lapp/revanced/patcher/patch/BytecodePatchContext;JLjava/lang/String;)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Z)V
 	public static synthetic fun returnEarly$default (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ZILjava/lang/Object;)V
@@ -1178,6 +1211,7 @@ public final class app/revanced/util/ResourceUtilsKt {
 	public static final fun copyXmlNode (Lapp/revanced/patcher/patch/ResourcePatchContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lkotlin/Unit;
 	public static final fun copyXmlNode (Ljava/lang/String;Lapp/revanced/patcher/util/Document;Lapp/revanced/patcher/util/Document;)Ljava/lang/AutoCloseable;
 	public static final fun doRecursively (Lorg/w3c/dom/Node;Lkotlin/jvm/functions/Function1;)V
+	public static final fun getBooleanOptionValue (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;)Lapp/revanced/patcher/patch/Option;
 	public static final fun getResourceGroup (Ljava/util/List;[Ljava/lang/String;)Ljava/util/List;
 	public static final fun getStringOptionValue (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;)Lapp/revanced/patcher/patch/Option;
 	public static final fun insertNode (Lorg/w3c/dom/Node;Ljava/lang/String;Lorg/w3c/dom/Node;Lkotlin/jvm/functions/Function1;)V
diff --git a/patches/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt b/patches/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt
index 2e916af51..3a7b29342 100644
--- a/patches/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt
+++ b/patches/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt
@@ -30,7 +30,9 @@ internal class JsonPatchesFileGenerator : PatchesFileGenerator {
                 },
             )
         }.let {
-            patchesJson.writeText(GsonBuilder().serializeNulls().setPrettyPrinting().create().toJson(it))
+            patchesJson.writeText(
+                GsonBuilder().serializeNulls().setPrettyPrinting().create().toJson(it)
+            )
         }
     }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/general/amoled/AmoledPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/general/amoled/AmoledPatch.kt
deleted file mode 100644
index c2a79075d..000000000
--- a/patches/src/main/kotlin/app/revanced/patches/music/general/amoled/AmoledPatch.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package app.revanced.patches.music.general.amoled
-
-import app.revanced.patcher.patch.resourcePatch
-import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
-import app.revanced.patches.music.utils.extension.Constants.UTILS_PATH
-import app.revanced.patches.music.utils.patch.PatchList.AMOLED
-import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
-import app.revanced.patches.music.utils.settings.settingsPatch
-import app.revanced.patches.shared.drawable.addDrawableColorHook
-import app.revanced.patches.shared.drawable.drawableColorHookPatch
-import org.w3c.dom.Element
-
-@Suppress("unused")
-val amoledPatch = resourcePatch(
-    AMOLED.title,
-    AMOLED.summary,
-) {
-    compatibleWith(COMPATIBLE_PACKAGE)
-
-    dependsOn(
-        drawableColorHookPatch,
-        settingsPatch
-    )
-
-    execute {
-        addDrawableColorHook("$UTILS_PATH/DrawableColorPatch;->getLithoColor(I)I")
-
-        document("res/values/colors.xml").use { document ->
-            val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
-
-            for (i in 0 until resourcesNode.childNodes.length) {
-                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
-
-                node.textContent = when (node.getAttribute("name")) {
-                    "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3",
-                    "yt_black4", "yt_status_bar_background_dark", "ytm_color_grey_12", "material_grey_850" -> "@android:color/black"
-
-                    else -> continue
-                }
-            }
-        }
-
-        updatePatchStatus(AMOLED)
-
-    }
-}
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/header/ChangeHeaderPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/header/ChangeHeaderPatch.kt
index db08f642f..8143cfddd 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/header/ChangeHeaderPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/header/ChangeHeaderPatch.kt
@@ -5,6 +5,13 @@ import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringOption
 import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.music.utils.patch.PatchList.CUSTOM_HEADER_FOR_YOUTUBE_MUSIC
+import app.revanced.patches.music.utils.playservice.is_7_06_or_greater
+import app.revanced.patches.music.utils.playservice.versionCheckPatch
+import app.revanced.patches.music.utils.resourceid.actionBarLogo
+import app.revanced.patches.music.utils.resourceid.actionBarLogoRingo2
+import app.revanced.patches.music.utils.resourceid.sharedResourceIdPatch
+import app.revanced.patches.music.utils.resourceid.ytmLogo
+import app.revanced.patches.music.utils.resourceid.ytmLogoRingo2
 import app.revanced.patches.music.utils.settings.ResourceUtils.getIconType
 import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
 import app.revanced.patches.music.utils.settings.settingsPatch
@@ -13,8 +20,7 @@ import app.revanced.util.Utils.printWarn
 import app.revanced.util.Utils.trimIndentMultiline
 import app.revanced.util.copyFile
 import app.revanced.util.copyResources
-import app.revanced.util.fingerprint.injectLiteralInstructionBooleanCall
-import app.revanced.util.fingerprint.resolvable
+import app.revanced.util.replaceLiteralInstructionCall
 import app.revanced.util.underBarOrThrow
 import app.revanced.util.valueOrThrow
 
@@ -100,24 +106,31 @@ private val getDescription = {
 private val changeHeaderBytecodePatch = bytecodePatch(
     description = "changeHeaderBytecodePatch"
 ) {
+    dependsOn(
+        sharedResourceIdPatch,
+        versionCheckPatch,
+    )
+
     execute {
+
         /**
          * New Header has been added from YouTube Music v7.04.51.
          *
-         * The new header's file names are  'action_bar_logo_ringo2.png' and 'ytm_logo_ringo2.png'.
+         * The new header's file names are 'action_bar_logo_ringo2.png' and 'ytm_logo_ringo2.png'.
          * The only difference between the existing header and the new header is the dimensions of the image.
          *
          * The affected patch is [changeHeaderPatch].
-         *
-         * TODO: Add a new header image file to [changeHeaderPatch] later.
          */
-        if (!headerSwitchConfigFingerprint.resolvable()) {
+        if (!is_7_06_or_greater) {
             return@execute
         }
-        headerSwitchConfigFingerprint.injectLiteralInstructionBooleanCall(
-            45617851L,
-            "0x0"
-        )
+
+        listOf(
+            actionBarLogoRingo2 to actionBarLogo,
+            ytmLogoRingo2 to ytmLogo,
+        ).forEach { (originalResource, replacementResource) ->
+            replaceLiteralInstructionCall(originalResource, replacementResource)
+        }
     }
 }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/header/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/header/Fingerprints.kt
deleted file mode 100644
index 866303d2f..000000000
--- a/patches/src/main/kotlin/app/revanced/patches/music/layout/header/Fingerprints.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package app.revanced.patches.music.layout.header
-
-import app.revanced.util.fingerprint.legacyFingerprint
-import app.revanced.util.or
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal val headerSwitchConfigFingerprint = legacyFingerprint(
-    name = "headerSwitchConfigFingerprint",
-    returnType = "Z",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    literals = listOf(45617851L)
-)
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/theme/DarkThemePatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/theme/DarkThemePatch.kt
new file mode 100644
index 000000000..45f85b967
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/theme/DarkThemePatch.kt
@@ -0,0 +1,153 @@
+package app.revanced.patches.music.layout.theme
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.booleanOption
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.patcher.patch.stringOption
+import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
+import app.revanced.patches.music.utils.extension.Constants.PATCH_STATUS_CLASS_DESCRIPTOR
+import app.revanced.patches.music.utils.extension.Constants.UTILS_PATH
+import app.revanced.patches.music.utils.patch.PatchList.DARK_THEME
+import app.revanced.patches.music.utils.resourceid.sharedResourceIdPatch
+import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
+import app.revanced.patches.music.utils.settings.settingsPatch
+import app.revanced.patches.shared.drawable.addDrawableColorHook
+import app.revanced.patches.shared.drawable.drawableColorHookPatch
+import app.revanced.patches.shared.materialyou.baseMaterialYou
+import app.revanced.util.ResourceGroup
+import app.revanced.util.copyResources
+import app.revanced.util.findMethodOrThrow
+import app.revanced.util.fingerprint.methodOrThrow
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
+import app.revanced.util.valueOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import org.w3c.dom.Element
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "$UTILS_PATH/DrawableColorPatch;"
+
+private val darkThemeBytecodePatch = bytecodePatch(
+    description = "darkThemeBytecodePatch"
+) {
+    dependsOn(
+        settingsPatch,
+        sharedResourceIdPatch,
+        drawableColorHookPatch,
+    )
+
+    execute {
+        addDrawableColorHook("$EXTENSION_CLASS_DESCRIPTOR->getLithoColor(I)I")
+
+        // The images in the playlist and album headers have a black gradient (probably applied server-side).
+        // Applies a new gradient to the images in the playlist and album headers.
+        elementsContainerFingerprint.methodOrThrow().apply {
+            val index = indexOfFirstInstructionReversedOrThrow(Opcode.CHECK_CAST)
+            val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+            addInstruction(
+                index + 1,
+                "invoke-static {v$register}, $EXTENSION_CLASS_DESCRIPTOR->setHeaderGradient(Landroid/view/ViewGroup;)V"
+            )
+        }
+
+        findMethodOrThrow(PATCH_STATUS_CLASS_DESCRIPTOR) {
+            name == "DarkTheme"
+        }.replaceInstruction(
+            0,
+            "const/4 v0, 0x1"
+        )
+    }
+}
+
+val DARK_COLOR = arrayOf(
+    "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98",
+    "yt_black2", "yt_black3", "yt_black4", "yt_black_pure",
+    "yt_black_pure_opacity80", "yt_status_bar_background_dark",
+    "ytm_color_grey_12", "material_grey_800", "material_grey_850",
+)
+
+@Suppress("unused")
+val darkThemePatch = resourcePatch(
+    DARK_THEME.title,
+    DARK_THEME.summary,
+) {
+    compatibleWith(COMPATIBLE_PACKAGE)
+
+    dependsOn(darkThemeBytecodePatch)
+
+    val amoledBlackColor = "@android:color/black"
+
+    val darkThemeBackgroundColor = stringOption(
+        key = "darkThemeBackgroundColor",
+        default = amoledBlackColor,
+        values = mapOf(
+            "Amoled Black" to amoledBlackColor,
+            "Catppuccin (Mocha)" to "#FF181825",
+            "Dark Pink" to "#FF290025",
+            "Dark Blue" to "#FF001029",
+            "Dark Green" to "#FF002905",
+            "Dark Yellow" to "#FF282900",
+            "Dark Orange" to "#FF291800",
+            "Dark Red" to "#FF290000",
+        ),
+        title = "Dark theme background color",
+        description = "Can be a hex color (#AARRGGBB) or a color resource reference.",
+    )
+
+    val materialYou by booleanOption(
+        key = "materialYou",
+        default = false,
+        title = "MaterialYou",
+        description = "Applies the MaterialYou theme for Android 12+ devices.",
+        required = true
+    )
+
+    execute {
+        // Check patch options first.
+        val darkThemeColor = darkThemeBackgroundColor
+            .valueOrThrow()
+
+        document("res/values/colors.xml").use { document ->
+            val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
+
+            for (i in 0 until resourcesNode.childNodes.length) {
+                val node = resourcesNode.childNodes.item(i) as? Element ?: continue
+                val colorName = node.getAttribute("name")
+
+                if (DARK_COLOR.contains(colorName)) {
+                    node.textContent = darkThemeColor
+                }
+            }
+        }
+
+        arrayOf(
+            ResourceGroup(
+                "drawable",
+                "revanced_header_gradient.xml",
+            )
+        ).forEach { resourceGroup ->
+            copyResources("music/theme", resourceGroup)
+        }
+
+        if (materialYou == true) {
+            baseMaterialYou()
+
+            document("res/values-v31/colors.xml").use { document ->
+                DARK_COLOR.forEach { name ->
+                    val colorElement = document.createElement("color")
+                    colorElement.setAttribute("name", name)
+                    colorElement.textContent = "@android:color/system_neutral1_900"
+
+                    document.getElementsByTagName("resources").item(0).appendChild(colorElement)
+                }
+            }
+        }
+
+        updatePatchStatus(DARK_THEME)
+
+    }
+}
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/layout/theme/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/layout/theme/Fingerprints.kt
new file mode 100644
index 000000000..7b5a00b94
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/layout/theme/Fingerprints.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.music.layout.theme
+
+import app.revanced.patches.music.utils.resourceid.elementsContainer
+import app.revanced.util.fingerprint.legacyFingerprint
+import app.revanced.util.or
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal val elementsContainerFingerprint = legacyFingerprint(
+    name = "elementsContainerFingerprint",
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE),
+    literals = listOf(elementsContainer)
+)
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/album/AlbumMusicVideoPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/album/AlbumMusicVideoPatch.kt
new file mode 100644
index 000000000..f72a914ee
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/album/AlbumMusicVideoPatch.kt
@@ -0,0 +1,125 @@
+package app.revanced.patches.music.misc.album
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
+import app.revanced.patches.music.utils.extension.Constants.MISC_PATH
+import app.revanced.patches.music.utils.patch.PatchList.DISABLE_MUSIC_VIDEO_IN_ALBUM
+import app.revanced.patches.music.utils.settings.CategoryType
+import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
+import app.revanced.patches.music.utils.settings.addPreferenceWithIntent
+import app.revanced.patches.music.utils.settings.addSwitchPreference
+import app.revanced.patches.music.utils.settings.settingsPatch
+import app.revanced.patches.music.video.information.videoIdHook
+import app.revanced.patches.music.video.information.videoInformationPatch
+import app.revanced.patches.music.video.playerresponse.hookPlayerResponse
+import app.revanced.patches.music.video.playerresponse.playerResponseMethodHookPatch
+import app.revanced.util.findMethodOrThrow
+import app.revanced.util.fingerprint.methodOrThrow
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "$MISC_PATH/AlbumMusicVideoPatch;"
+
+@Suppress("unused")
+val albumMusicVideoPatch = bytecodePatch(
+    DISABLE_MUSIC_VIDEO_IN_ALBUM.title,
+    DISABLE_MUSIC_VIDEO_IN_ALBUM.summary,
+    false,
+) {
+    compatibleWith(COMPATIBLE_PACKAGE)
+
+    dependsOn(
+        settingsPatch,
+        videoInformationPatch,
+        playerResponseMethodHookPatch,
+    )
+
+    execute {
+
+        // region hook player response
+
+        hookPlayerResponse("$EXTENSION_CLASS_DESCRIPTOR->newPlayerResponse(Ljava/lang/String;Ljava/lang/String;I)V")
+
+        // endregion
+
+        // region hook video id
+
+        videoIdHook("$EXTENSION_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
+
+        // endregion
+
+        // region patch for hide snack bar
+
+        snackBarParentFingerprint.methodOrThrow().addInstructionsWithLabels(
+            0, """
+                invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->hideSnackBar()Z
+                move-result v0
+                if-eqz v0, :hide
+                return-void
+                :hide
+                nop
+                """
+        )
+
+        // endregion
+
+        // region patch for setOnClick / setOnLongClick listener
+
+        audioVideoSwitchToggleConstructorFingerprint.methodOrThrow().apply {
+            val onClickListenerIndex = indexOfAudioVideoSwitchSetOnClickListenerInstruction(this)
+            val viewRegister =
+                getInstruction<FiveRegisterInstruction>(onClickListenerIndex).registerC
+
+            addInstruction(
+                onClickListenerIndex + 1,
+                "invoke-static { v$viewRegister }, " +
+                        "$EXTENSION_CLASS_DESCRIPTOR->setAudioVideoSwitchToggleOnLongClickListener(Landroid/view/View;)V"
+            )
+
+            val onClickListenerSyntheticIndex =
+                indexOfFirstInstructionReversedOrThrow(onClickListenerIndex) {
+                    opcode == Opcode.INVOKE_DIRECT &&
+                            getReference<MethodReference>()?.name == "<init>"
+                }
+            val onClickListenerSyntheticClass =
+                (getInstruction<ReferenceInstruction>(onClickListenerSyntheticIndex).reference as MethodReference).definingClass
+
+            findMethodOrThrow(onClickListenerSyntheticClass) {
+                name == "onClick"
+            }.addInstructionsWithLabels(
+                0, """
+                    invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->openMusic()Z
+                    move-result v0
+                    if-eqz v0, :ignore
+                    return-void
+                    :ignore
+                    nop
+                    """
+            )
+        }
+
+        // endregion
+
+        addSwitchPreference(
+            CategoryType.MISC,
+            "revanced_disable_music_video_in_album",
+            "false"
+        )
+        addPreferenceWithIntent(
+            CategoryType.MISC,
+            "revanced_disable_music_video_in_album_redirect_type",
+            "revanced_disable_music_video_in_album"
+        )
+
+        updatePatchStatus(DISABLE_MUSIC_VIDEO_IN_ALBUM)
+
+    }
+}
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/misc/album/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/misc/album/Fingerprints.kt
new file mode 100644
index 000000000..52f0bf163
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/misc/album/Fingerprints.kt
@@ -0,0 +1,34 @@
+package app.revanced.patches.music.misc.album
+
+import app.revanced.util.fingerprint.legacyFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import app.revanced.util.or
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal val audioVideoSwitchToggleConstructorFingerprint = legacyFingerprint(
+    name = "audioVideoSwitchToggleConstructorFingerprint",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    returnType = "V",
+    opcodes = listOf(Opcode.INVOKE_DIRECT),
+    customFingerprint = { method, _ ->
+        indexOfAudioVideoSwitchSetOnClickListenerInstruction(method) >= 0
+    }
+)
+
+internal fun indexOfAudioVideoSwitchSetOnClickListenerInstruction(method: Method) =
+    method.indexOfFirstInstruction {
+        opcode == Opcode.INVOKE_VIRTUAL &&
+                getReference<MethodReference>()?.toString() == "Lcom/google/android/apps/youtube/music/player/AudioVideoSwitcherToggleView;->setOnClickListener(Landroid/view/View${'$'}OnClickListener;)V"
+    }
+
+internal val snackBarParentFingerprint = legacyFingerprint(
+    name = "snackBarParentFingerprint",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("L"),
+    strings = listOf("No suitable parent found from the given view. Please provide a valid view.")
+)
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/player/components/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/player/components/Fingerprints.kt
index ea0046e1b..bf5204063 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/player/components/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/player/components/Fingerprints.kt
@@ -11,6 +11,7 @@ import app.revanced.patches.music.utils.resourceid.miniPlayerViewPager
 import app.revanced.patches.music.utils.resourceid.playerViewPager
 import app.revanced.patches.music.utils.resourceid.remixGenericButtonSize
 import app.revanced.patches.music.utils.resourceid.tapBloomView
+import app.revanced.util.containsLiteralInstruction
 import app.revanced.util.fingerprint.legacyFingerprint
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
@@ -50,10 +51,11 @@ internal val engagementPanelHeightFingerprint = legacyFingerprint(
     ),
     parameters = emptyList(),
     customFingerprint = { method, _ ->
-        method.indexOfFirstInstruction {
-            opcode == Opcode.INVOKE_VIRTUAL &&
-                    getReference<MethodReference>()?.name == "booleanValue"
-        } >= 0
+        method.containsLiteralInstruction(1) &&
+                method.indexOfFirstInstruction {
+                    opcode == Opcode.INVOKE_VIRTUAL &&
+                            getReference<MethodReference>()?.name == "booleanValue"
+                } >= 0
     }
 )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/utils/dismiss/DismissQueueHookPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/utils/dismiss/DismissQueueHookPatch.kt
new file mode 100644
index 000000000..7cb76868f
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/dismiss/DismissQueueHookPatch.kt
@@ -0,0 +1,42 @@
+package app.revanced.patches.music.utils.dismiss
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.music.utils.extension.Constants.EXTENSION_PATH
+import app.revanced.util.addStaticFieldToExtension
+import app.revanced.util.fingerprint.methodOrThrow
+import app.revanced.util.getWalkerMethod
+
+private const val EXTENSION_VIDEO_UTILS_CLASS_DESCRIPTOR =
+    "$EXTENSION_PATH/utils/VideoUtils;"
+
+@Suppress("unused")
+val dismissQueueHookPatch = bytecodePatch(
+    description = "dismissQueueHookPatch"
+) {
+
+    execute {
+
+        dismissQueueFingerprint.methodOrThrow().apply {
+            val dismissQueueIndex = indexOfDismissQueueInstruction(this)
+
+            getWalkerMethod(dismissQueueIndex).apply {
+                val smaliInstructions =
+                    """
+                        if-eqz v0, :ignore
+                        invoke-virtual {v0}, $definingClass->$name()V
+                        :ignore
+                        return-void
+                        """
+
+                addStaticFieldToExtension(
+                    EXTENSION_VIDEO_UTILS_CLASS_DESCRIPTOR,
+                    "dismissQueue",
+                    "dismissQueueClass",
+                    definingClass,
+                    smaliInstructions
+                )
+            }
+        }
+
+    }
+}
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/utils/dismiss/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/utils/dismiss/Fingerprints.kt
new file mode 100644
index 000000000..49c00a3b7
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/dismiss/Fingerprints.kt
@@ -0,0 +1,24 @@
+package app.revanced.patches.music.utils.dismiss
+
+import app.revanced.util.fingerprint.legacyFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+internal val dismissQueueFingerprint = legacyFingerprint(
+    name = "dismissQueueFingerprint",
+    returnType = "V",
+    parameters = listOf("L"),
+    customFingerprint = { method, _ ->
+        method.name == "handleDismissWatchEvent" &&
+                indexOfDismissQueueInstruction(method) >= 0
+    }
+)
+
+internal fun indexOfDismissQueueInstruction(method: Method) =
+    method.indexOfFirstInstruction {
+        opcode == Opcode.INVOKE_VIRTUAL &&
+                getReference<MethodReference>()?.definingClass?.endsWith("/MppWatchWhileLayout;") == true
+    }
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/streamingdata/SpoofStreamingDataPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
index a37eeeeb8..a30c435c2 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
@@ -1,5 +1,6 @@
 package app.revanced.patches.music.utils.fix.streamingdata
 
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.music.utils.compatibility.Constants.YOUTUBE_MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.utils.patch.PatchList.SPOOF_STREAMING_DATA
@@ -8,8 +9,16 @@ import app.revanced.patches.music.utils.settings.ResourceUtils.updatePatchStatus
 import app.revanced.patches.music.utils.settings.addPreferenceWithIntent
 import app.revanced.patches.music.utils.settings.addSwitchPreference
 import app.revanced.patches.music.utils.settings.settingsPatch
+import app.revanced.patches.music.video.playerresponse.hookPlayerResponse
+import app.revanced.patches.music.video.playerresponse.playerResponseMethodHookPatch
+import app.revanced.patches.shared.extension.Constants.PATCHES_PATH
+import app.revanced.patches.shared.extension.Constants.SPOOF_PATH
 import app.revanced.patches.shared.spoof.streamingdata.baseSpoofStreamingDataPatch
 import app.revanced.patches.shared.spoof.useragent.baseSpoofUserAgentPatch
+import app.revanced.util.findMethodOrThrow
+
+const val EXTENSION_CLASS_DESCRIPTOR =
+    "$SPOOF_PATH/SpoofStreamingDataPatch;"
 
 @Suppress("unused")
 val spoofStreamingDataPatch = baseSpoofStreamingDataPatch(
@@ -19,9 +28,22 @@ val spoofStreamingDataPatch = baseSpoofStreamingDataPatch(
         dependsOn(
             baseSpoofUserAgentPatch(YOUTUBE_MUSIC_PACKAGE_NAME),
             settingsPatch,
+            playerResponseMethodHookPatch,
         )
     },
     {
+        findMethodOrThrow("$PATCHES_PATH/PatchStatus;") {
+            name == "SpoofStreamingDataMusic"
+        }.replaceInstruction(
+            0,
+            "const/4 v0, 0x1"
+        )
+
+        hookPlayerResponse(
+            "$EXTENSION_CLASS_DESCRIPTOR->fetchStreams(Ljava/lang/String;)V",
+            true
+        )
+
         addSwitchPreference(
             CategoryType.MISC,
             "revanced_spoof_streaming_data",
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/utils/patch/PatchList.kt b/patches/src/main/kotlin/app/revanced/patches/music/utils/patch/PatchList.kt
index c814a7d97..11d02b637 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/utils/patch/PatchList.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/patch/PatchList.kt
@@ -5,10 +5,6 @@ internal enum class PatchList(
     val summary: String,
     var included: Boolean? = false
 ) {
-    AMOLED(
-        "Amoled",
-        "Applies a pure black theme to some components."
-    ),
     BITRATE_DEFAULT_VALUE(
         "Bitrate default value",
         "Sets the audio quality to 'Always High' when you first install the app."
@@ -23,7 +19,7 @@ internal enum class PatchList(
     ),
     CHANGE_SHARE_SHEET(
         "Change share sheet",
-        "Add option to change from in-app share sheet to system share sheet."
+        "Adds an option to change the in-app share sheet to the system share sheet."
     ),
     CHANGE_START_PAGE(
         "Change start page",
@@ -41,6 +37,10 @@ internal enum class PatchList(
         "Custom header for YouTube Music",
         "Applies a custom header in the top left corner within the app."
     ),
+    DARK_THEME(
+        "Dark theme",
+        "Changes the app's dark theme to the values specified in patch options."
+    ),
     DISABLE_CAIRO_SPLASH_ANIMATION(
         "Disable Cairo splash animation",
         "Adds an option to disable Cairo splash animation."
@@ -57,6 +57,10 @@ internal enum class PatchList(
         "Disable dislike redirection",
         "Adds an option to disable redirection to the next track when clicking the Dislike button."
     ),
+    DISABLE_MUSIC_VIDEO_IN_ALBUM(
+        "Disable music video in album",
+        "Adds option to redirect music videos from albums for non-premium users."
+    ),
     ENABLE_OPUS_CODEC(
         "Enable OPUS codec",
         "Adds an options to enable the OPUS audio codec if the player response includes."
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/utils/playservice/VersionCheckPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/utils/playservice/VersionCheckPatch.kt
index 372251b2b..6344ff17a 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/utils/playservice/VersionCheckPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/playservice/VersionCheckPatch.kt
@@ -11,6 +11,8 @@ var is_6_36_or_greater = false
     private set
 var is_6_42_or_greater = false
     private set
+var is_7_03_or_greater = false
+    private set
 var is_7_06_or_greater = false
     private set
 var is_7_13_or_greater = false
@@ -43,6 +45,7 @@ val versionCheckPatch = resourcePatch(
         is_6_27_or_greater = 234412000 <= playStoreServicesVersion
         is_6_36_or_greater = 240399000 <= playStoreServicesVersion
         is_6_42_or_greater = 240999000 <= playStoreServicesVersion
+        is_7_03_or_greater = 242199000 <= playStoreServicesVersion
         is_7_06_or_greater = 242499000 <= playStoreServicesVersion
         is_7_13_or_greater = 243199000 <= playStoreServicesVersion
         is_7_17_or_greater = 243530000 <= playStoreServicesVersion
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/utils/resourceid/SharedResourceIdPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/utils/resourceid/SharedResourceIdPatch.kt
index a3358901f..3363e56b0 100644
--- a/patches/src/main/kotlin/app/revanced/patches/music/utils/resourceid/SharedResourceIdPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/music/utils/resourceid/SharedResourceIdPatch.kt
@@ -4,6 +4,7 @@ import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.shared.mapping.ResourceType.BOOL
 import app.revanced.patches.shared.mapping.ResourceType.COLOR
 import app.revanced.patches.shared.mapping.ResourceType.DIMEN
+import app.revanced.patches.shared.mapping.ResourceType.DRAWABLE
 import app.revanced.patches.shared.mapping.ResourceType.ID
 import app.revanced.patches.shared.mapping.ResourceType.LAYOUT
 import app.revanced.patches.shared.mapping.ResourceType.STRING
@@ -14,6 +15,10 @@ import app.revanced.patches.shared.mapping.resourceMappings
 
 var accountSwitcherAccessibility = -1L
     private set
+var actionBarLogo = -1L
+    private set
+var actionBarLogoRingo2 = -1L
+    private set
 var bottomSheetRecyclerView = -1L
     private set
 var buttonContainer = -1L
@@ -28,6 +33,8 @@ var darkBackground = -1L
     private set
 var designBottomSheetDialog = -1L
     private set
+var elementsContainer = -1L
+    private set
 var endButtonsContainer = -1L
     private set
 var floatingLayout = -1L
@@ -94,6 +101,10 @@ var trimSilenceSwitch = -1L
     private set
 var varispeedUnavailableTitle = -1L
     private set
+var ytmLogo = -1L
+    private set
+var ytmLogoRingo2 = -1L
+    private set
 
 internal val sharedResourceIdPatch = resourcePatch(
     description = "sharedResourceIdPatch"
@@ -105,6 +116,14 @@ internal val sharedResourceIdPatch = resourcePatch(
             STRING,
             "account_switcher_accessibility_label",
         ]
+        actionBarLogo = resourceMappings[
+            DRAWABLE,
+            "action_bar_logo",
+        ]
+        actionBarLogoRingo2 = resourceMappings[
+            DRAWABLE,
+            "action_bar_logo_ringo2",
+        ]
         bottomSheetRecyclerView = resourceMappings[
             LAYOUT,
             "bottom_sheet_recycler_view"
@@ -133,6 +152,10 @@ internal val sharedResourceIdPatch = resourcePatch(
             LAYOUT,
             "design_bottom_sheet_dialog"
         ]
+        elementsContainer = resourceMappings[
+            ID,
+            "elements_container"
+        ]
         endButtonsContainer = resourceMappings[
             ID,
             "end_buttons_container"
@@ -265,5 +288,13 @@ internal val sharedResourceIdPatch = resourcePatch(
             STRING,
             "varispeed_unavailable_title"
         ]
+        ytmLogo = resourceMappings[
+            DRAWABLE,
+            "ytm_logo",
+        ]
+        ytmLogoRingo2 = resourceMappings[
+            DRAWABLE,
+            "ytm_logo_ringo2",
+        ]
     }
 }
\ No newline at end of file
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/video/playerresponse/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/music/video/playerresponse/Fingerprints.kt
new file mode 100644
index 000000000..0564715e1
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/video/playerresponse/Fingerprints.kt
@@ -0,0 +1,61 @@
+package app.revanced.patches.music.video.playerresponse
+
+import app.revanced.util.fingerprint.legacyFingerprint
+import app.revanced.util.or
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+/**
+ * For targets 7.03 and later.
+ */
+internal val playerParameterBuilderFingerprint = legacyFingerprint(
+    name = "playerParameterBuilderFingerprint",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "L",
+    parameters = listOf(
+        "Ljava/lang/String;", // VideoId.
+        "[B",
+        "Ljava/lang/String;", // Player parameters proto buffer.
+        "Ljava/lang/String;", // PlaylistId.
+        "I",                  // PlaylistIndex.
+        "I",
+        "L",
+        "Ljava/util/Set;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L",
+        "Z",
+        "Z",
+        "Z", // Appears to indicate if the video id is being opened or is currently playing.
+    ),
+    strings = listOf("psps")
+)
+
+/**
+ * For targets 7.02 and earlier.
+ */
+internal val playerParameterBuilderLegacyFingerprint = legacyFingerprint(
+    name = "playerParameterBuilderLegacyFingerprint",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "L",
+    parameters = listOf(
+        "Ljava/lang/String;", // VideoId.
+        "[B",
+        "Ljava/lang/String;", // Player parameters proto buffer.
+        "Ljava/lang/String;", // PlaylistId.
+        "I",                  // PlaylistIndex.
+        "I",
+        "Ljava/util/Set;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L",
+        "Z",
+        "Z", // Appears to indicate if the video id is being opened or is currently playing.
+    ),
+    opcodes = listOf(
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_INTERFACE
+    )
+)
\ No newline at end of file
diff --git a/patches/src/main/kotlin/app/revanced/patches/music/video/playerresponse/PlayerResponseMethodHookPatch.kt b/patches/src/main/kotlin/app/revanced/patches/music/video/playerresponse/PlayerResponseMethodHookPatch.kt
new file mode 100644
index 000000000..8570097d0
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/music/video/playerresponse/PlayerResponseMethodHookPatch.kt
@@ -0,0 +1,40 @@
+package app.revanced.patches.music.video.playerresponse
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.music.utils.playservice.is_7_03_or_greater
+import app.revanced.patches.music.utils.playservice.versionCheckPatch
+import app.revanced.util.fingerprint.methodOrThrow
+
+private const val REGISTER_VIDEO_ID = "p1"
+private const val REGISTER_PLAYLIST_ID = "p4"
+private const val REGISTER_PLAYLIST_INDEX = "p5"
+
+private lateinit var playerResponseMethod: MutableMethod
+
+val playerResponseMethodHookPatch = bytecodePatch(
+    description = "playerResponseMethodHookPatch"
+) {
+    dependsOn(versionCheckPatch)
+
+    execute {
+        playerResponseMethod = if (is_7_03_or_greater) {
+            playerParameterBuilderFingerprint
+        } else {
+            playerParameterBuilderLegacyFingerprint
+        }.methodOrThrow()
+    }
+}
+
+fun hookPlayerResponse(
+    descriptor: String,
+    onlyVideoId: Boolean = false
+) {
+    val smaliInstruction = if (onlyVideoId)
+        "invoke-static {$REGISTER_VIDEO_ID}, $descriptor"
+    else
+        "invoke-static {$REGISTER_VIDEO_ID, $REGISTER_PLAYLIST_ID, $REGISTER_PLAYLIST_INDEX}, $descriptor"
+
+    playerResponseMethod.addInstruction(0, smaliInstruction)
+}
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/ads/BaseAdsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/ads/BaseAdsPatch.kt
index 66863f474..02cf1f243 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/ads/BaseAdsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/ads/BaseAdsPatch.kt
@@ -10,7 +10,6 @@ import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.extension.Constants.PATCHES_PATH
-import app.revanced.util.fingerprint.matchOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.getWalkerMethod
@@ -33,20 +32,15 @@ fun baseAdsPatch(
 ) {
     execute {
 
-        setOf(
-            sslGuardFingerprint,
-            videoAdsFingerprint,
-        ).forEach { fingerprint ->
-            fingerprint.methodOrThrow().apply {
-                addInstructionsWithLabels(
-                    0, """
-                        invoke-static {}, $classDescriptor->$methodDescriptor()Z
-                        move-result v0
-                        if-nez v0, :show_ads
-                        return-void
-                        """, ExternalLabel("show_ads", getInstruction(0))
-                )
-            }
+        videoAdsFingerprint.methodOrThrow().apply {
+            addInstructionsWithLabels(
+                0, """
+                    invoke-static {}, $classDescriptor->$methodDescriptor()Z
+                    move-result v0
+                    if-nez v0, :show_ads
+                    return-void
+                    """, ExternalLabel("show_ads", getInstruction(0))
+            )
         }
 
         musicAdsFingerprint.methodOrThrow().apply {
@@ -67,21 +61,6 @@ fun baseAdsPatch(
                 )
         }
 
-        advertisingIdFingerprint.matchOrThrow().let {
-            it.method.apply {
-                val insertIndex = it.stringMatches!!.first().index
-                val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
-                addInstructionsWithLabels(
-                    insertIndex, """
-                        invoke-static {}, $classDescriptor->$methodDescriptor()Z
-                        move-result v$insertRegister
-                        if-nez v$insertRegister, :enable_id
-                        return-void
-                        """, ExternalLabel("enable_id", getInstruction(insertIndex))
-                )
-            }
-        }
-
     }
 }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/ads/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/ads/Fingerprints.kt
index 6853546b4..9ec138962 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/ads/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/ads/Fingerprints.kt
@@ -4,24 +4,6 @@ import app.revanced.util.fingerprint.legacyFingerprint
 import app.revanced.util.or
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.util.MethodUtil
-
-internal val advertisingIdFingerprint = legacyFingerprint(
-    name = "advertisingIdFingerprint",
-    returnType = "V",
-    strings = listOf("a."),
-    customFingerprint = { method, classDef ->
-        MethodUtil.isConstructor(method) &&
-                classDef.fields.find { it.type == "Ljava/util/Random;" } != null
-    }
-)
-
-internal val sslGuardFingerprint = legacyFingerprint(
-    name = "sslGuardFingerprint",
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf("Cannot initialize SslGuardSocketFactory will null"),
-)
 
 internal val musicAdsFingerprint = legacyFingerprint(
     name = "musicAdsFingerprint",
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/gms/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/gms/Fingerprints.kt
index 8734a722f..1cff11b8f 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/gms/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/gms/Fingerprints.kt
@@ -5,11 +5,8 @@ import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
 import app.revanced.util.or
 import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.iface.reference.StringReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
 
 const val GET_GMS_CORE_VENDOR_GROUP_ID_METHOD_NAME = "getGmsCoreVendorGroupId"
 
@@ -25,15 +22,6 @@ internal val castContextFetchFingerprint = legacyFingerprint(
     strings = listOf("Error fetching CastContext.")
 )
 
-internal val castDynamiteModuleFingerprint = legacyFingerprint(
-    name = "castDynamiteModuleFingerprint",
-    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-)
-internal val castDynamiteModuleV2Fingerprint = legacyFingerprint(
-    name = "castDynamiteModuleV2Fingerprint",
-    strings = listOf("Failed to load module via V2: ")
-)
-
 internal val googlePlayUtilityFingerprint = legacyFingerprint(
     name = "castContextFetchFingerprint",
     returnType = "I",
@@ -53,42 +41,9 @@ internal val serviceCheckFingerprint = legacyFingerprint(
     strings = listOf("Google Play Services not available")
 )
 
-internal val primesApiFingerprint = legacyFingerprint(
-    name = "primesApiFingerprint",
-    returnType = "V",
-    strings = listOf("PrimesApiImpl.java"),
-    customFingerprint = { method, _ ->
-        MethodUtil.isConstructor(method)
-    }
-)
-
-internal val primesBackgroundInitializationFingerprint = legacyFingerprint(
-    name = "primesBackgroundInitializationFingerprint",
-    opcodes = listOf(Opcode.NEW_INSTANCE),
-    customFingerprint = { method, _ ->
-        method.indexOfFirstInstruction {
-            opcode == Opcode.CONST_STRING &&
-                    getReference<StringReference>()
-                        ?.string.toString()
-                        .startsWith("Primes init triggered from background in package:")
-        } >= 0
-    }
-)
-
-internal val primesLifecycleEventFingerprint = legacyFingerprint(
-    name = "primesLifecycleEventFingerprint",
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = emptyList(),
-    opcodes = listOf(Opcode.NEW_INSTANCE),
-    customFingerprint = { method, _ ->
-        method.indexOfFirstInstruction {
-            opcode == Opcode.CONST_STRING &&
-                    getReference<StringReference>()
-                        ?.string.toString()
-                        .startsWith("Primes did not observe lifecycle events in the expected order.")
-        } >= 0
-    }
+internal val primeMethodFingerprint = legacyFingerprint(
+    name = "primeMethodFingerprint",
+    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )
 
 internal val certificateFingerprint = legacyFingerprint(
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/gms/GmsCoreSupportPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/gms/GmsCoreSupportPatch.kt
index f22bd9fb4..57d27416f 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/gms/GmsCoreSupportPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/gms/GmsCoreSupportPatch.kt
@@ -1,9 +1,9 @@
 package app.revanced.patches.shared.gms
 
 import app.revanced.patcher.Fingerprint
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.instructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatchBuilder
 import app.revanced.patcher.patch.BytecodePatchContext
@@ -25,15 +25,12 @@ import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.fingerprint.mutableClassOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
-import app.revanced.util.indexOfFirstInstructionOrThrow
-import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import app.revanced.util.returnEarly
 import app.revanced.util.valueOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.iface.reference.StringReference
@@ -233,41 +230,18 @@ fun gmsCoreSupportPatch(
             }
         }
 
-        fun transformPrimeMethod() {
-            setOf(
-                primesBackgroundInitializationFingerprint,
-                primesLifecycleEventFingerprint
-            ).forEach { fingerprint ->
-                fingerprint.methodOrThrow().apply {
-                    val exceptionIndex = indexOfFirstInstructionReversedOrThrow {
-                        opcode == Opcode.NEW_INSTANCE &&
-                                (this as? ReferenceInstruction)?.reference?.toString() == "Ljava/lang/IllegalStateException;"
-                    }
-                    val index =
-                        indexOfFirstInstructionReversedOrThrow(exceptionIndex, Opcode.IF_EQZ)
-                    val register = getInstruction<OneRegisterInstruction>(index).registerA
-                    addInstruction(
-                        index,
-                        "const/4 v$register, 0x1"
-                    )
-                }
-            }
-            primesApiFingerprint.mutableClassOrThrow().methods.filter { method ->
-                method.name != "<clinit>" &&
-                        method.returnType == "V"
-            }.forEach { method ->
-                method.apply {
-                    val index = if (MethodUtil.isConstructor(method))
-                        indexOfFirstInstructionOrThrow {
-                            opcode == Opcode.INVOKE_DIRECT &&
-                                    getReference<MethodReference>()?.name == "<init>"
-                        } + 1
-                    else 0
-                    addInstruction(
-                        index,
-                        "return-void"
-                    )
+        fun transformPrimeMethod(packageName: String) {
+            primeMethodFingerprint.methodOrThrow().apply {
+                var register = 2
+
+                val index = instructions.indexOfFirst {
+                    if (it.getReference<StringReference>()?.string != fromPackageName) return@indexOfFirst false
+
+                    register = (it as OneRegisterInstruction).registerA
+                    return@indexOfFirst true
                 }
+
+                replaceInstruction(index, "const-string v$register, \"$packageName\"")
             }
         }
 
@@ -293,14 +267,12 @@ fun gmsCoreSupportPatch(
         // Return these methods early to prevent the app from crashing.
         setOf(
             castContextFetchFingerprint,
-            castDynamiteModuleFingerprint,
-            castDynamiteModuleV2Fingerprint,
             googlePlayUtilityFingerprint,
             serviceCheckFingerprint,
         ).forEach { it.methodOrThrow().returnEarly() }
 
         // Specific method that needs to be patched.
-        transformPrimeMethod()
+        transformPrimeMethod(packageName)
 
         // Verify GmsCore is installed and whitelisted for power optimizations and background usage.
         mainActivityOnCreateFingerprint.method.apply {
@@ -358,134 +330,262 @@ private object Constants {
      * All permissions.
      */
     val PERMISSIONS = setOf(
-        // C2DM / GCM
         "com.google.android.c2dm.permission.RECEIVE",
         "com.google.android.c2dm.permission.SEND",
-        "com.google.android.gtalkservice.permission.GTALK_SERVICE",
-        "com.google.android.providers.gsf.permission.READ_GSERVICES",
-
-        // GAuth
+        "com.google.android.gms.auth.api.phone.permission.SEND",
+        "com.google.android.gms.permission.AD_ID",
+        "com.google.android.gms.permission.AD_ID_NOTIFICATION",
+        "com.google.android.gms.permission.CAR_FUEL",
+        "com.google.android.gms.permission.CAR_INFORMATION",
+        "com.google.android.gms.permission.CAR_MILEAGE",
+        "com.google.android.gms.permission.CAR_SPEED",
+        "com.google.android.gms.permission.CAR_VENDOR_EXTENSION",
         "com.google.android.googleapps.permission.GOOGLE_AUTH",
         "com.google.android.googleapps.permission.GOOGLE_AUTH.cp",
         "com.google.android.googleapps.permission.GOOGLE_AUTH.local",
         "com.google.android.googleapps.permission.GOOGLE_AUTH.mail",
         "com.google.android.googleapps.permission.GOOGLE_AUTH.writely",
-
-        // Ad
-        "com.google.android.gms.permission.AD_ID_NOTIFICATION",
-        "com.google.android.gms.permission.AD_ID",
+        "com.google.android.gtalkservice.permission.GTALK_SERVICE",
+        "com.google.android.providers.gsf.permission.READ_GSERVICES",
     )
 
     /**
      * All intent actions.
      */
     val ACTIONS = setOf(
-        // location
-        "com.google.android.gms.location.places.ui.PICK_PLACE",
-        "com.google.android.gms.location.places.GeoDataApi",
-        "com.google.android.gms.location.places.PlacesApi",
-        "com.google.android.gms.location.places.PlaceDetectionApi",
-        "com.google.android.gms.wearable.MESSAGE_RECEIVED",
-        "com.google.android.gms.checkin.BIND_TO_SERVICE",
-
-        // C2DM / GCM
+        "com.google.android.c2dm.intent.RECEIVE",
         "com.google.android.c2dm.intent.REGISTER",
         "com.google.android.c2dm.intent.REGISTRATION",
         "com.google.android.c2dm.intent.UNREGISTER",
-        "com.google.android.c2dm.intent.RECEIVE",
-        "com.google.iid.TOKEN_REQUEST",
+        "com.google.android.contextmanager.service.ContextManagerService.START",
         "com.google.android.gcm.intent.SEND",
-
-        // car
-        "com.google.android.gms.car.service.START",
-
-        // people
-        "com.google.android.gms.people.service.START",
-
-        // wearable
-        "com.google.android.gms.wearable.BIND",
-
-        // auth
-        "com.google.android.gsf.login",
-        "com.google.android.gsf.action.GET_GLS",
-        "com.google.android.gms.common.account.CHOOSE_ACCOUNT",
-        "com.google.android.gms.auth.login.LOGIN",
+        "com.google.android.gms.accounts.ACCOUNT_SERVICE",
+        "com.google.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS",
+        "com.google.android.gms.accountsettings.action.BROWSE_SETTINGS",
+        "com.google.android.gms.accountsettings.action.VIEW_SETTINGS",
+        "com.google.android.gms.accountsettings.MY_ACCOUNT",
+        "com.google.android.gms.accountsettings.PRIVACY_SETTINGS",
+        "com.google.android.gms.accountsettings.SECURITY_SETTINGS",
+        "com.google.android.gms.ads.gservice.START",
+        "com.google.android.gms.ads.identifier.service.EVENT_ATTESTATION",
+        "com.google.android.gms.ads.service.CACHE",
+        "com.google.android.gms.ads.service.CONSENT_LOOKUP",
+        "com.google.android.gms.ads.service.HTTP",
+        "com.google.android.gms.analytics.service.START",
+        "com.google.android.gms.app.settings.GoogleSettingsLink",
+        "com.google.android.gms.appstate.service.START",
+        "com.google.android.gms.appusage.service.START",
+        "com.google.android.gms.asterism.service.START",
+        "com.google.android.gms.audiomodem.service.AudioModemService.START",
+        "com.google.android.gms.audit.service.START",
+        "com.google.android.gms.auth.account.authapi.START",
+        "com.google.android.gms.auth.account.authenticator.auto.service.START",
+        "com.google.android.gms.auth.account.authenticator.chromeos.START",
+        "com.google.android.gms.auth.account.authenticator.tv.service.START",
+        "com.google.android.gms.auth.account.data.service.START",
         "com.google.android.gms.auth.api.credentials.PICKER",
         "com.google.android.gms.auth.api.credentials.service.START",
-        "com.google.android.gms.auth.service.START",
-        "com.google.firebase.auth.api.gms.service.START",
-        "com.google.android.gms.auth.be.appcert.AppCertService",
-        "com.google.android.gms.credential.manager.service.firstparty.START",
-        "com.google.android.gms.auth.GOOGLE_SIGN_IN",
-        "com.google.android.gms.signin.service.START",
-        "com.google.android.gms.auth.api.signin.service.START",
+        "com.google.android.gms.auth.api.identity.service.authorization.START",
+        "com.google.android.gms.auth.api.identity.service.credentialsaving.START",
         "com.google.android.gms.auth.api.identity.service.signin.START",
-        "com.google.android.gms.accountsettings.action.VIEW_SETTINGS",
-
-        // fido
-        "com.google.android.gms.fido.fido2.privileged.START",
-
-        // gass
-        "com.google.android.gms.gass.START",
-
-        // games
-        "com.google.android.gms.games.service.START",
-        "com.google.android.gms.games.PLAY_GAMES_UPGRADE",
-        "com.google.android.gms.games.internal.connect.service.START",
-
-        // help
-        "com.google.android.gms.googlehelp.service.GoogleHelpService.START",
-        "com.google.android.gms.googlehelp.HELP",
-        "com.google.android.gms.feedback.internal.IFeedbackService",
-
-        // cast
+        "com.google.android.gms.auth.api.phone.service.InternalService.START",
+        "com.google.android.gms.auth.api.signin.service.START",
+        "com.google.android.gms.auth.be.appcert.AppCertService",
+        "com.google.android.gms.auth.blockstore.service.START",
+        "com.google.android.gms.auth.config.service.START",
+        "com.google.android.gms.auth.cryptauth.cryptauthservice.START",
+        "com.google.android.gms.auth.GOOGLE_SIGN_IN",
+        "com.google.android.gms.auth.login.LOGIN",
+        "com.google.android.gms.auth.proximity.devicesyncservice.START",
+        "com.google.android.gms.auth.proximity.securechannelservice.START",
+        "com.google.android.gms.auth.proximity.START",
+        "com.google.android.gms.auth.service.START",
+        "com.google.android.gms.backup.ACTION_BACKUP_SETTINGS",
+        "com.google.android.gms.backup.G1_BACKUP",
+        "com.google.android.gms.backup.G1_RESTORE",
+        "com.google.android.gms.backup.GMS_MODULE_RESTORE",
+        "com.google.android.gms.beacon.internal.IBleService.START",
+        "com.google.android.gms.car.service.START",
+        "com.google.android.gms.carrierauth.service.START",
         "com.google.android.gms.cast.firstparty.START",
+        "com.google.android.gms.cast.remote_display.service.START",
         "com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE",
-
-        // fonts
-        "com.google.android.gms.fonts",
-
-        // phenotype
-        "com.google.android.gms.phenotype.service.START",
-
-        // location
-        "com.google.android.gms.location.reporting.service.START",
-
-        // misc
-        "com.google.android.gms.gmscompliance.service.START",
-        "com.google.android.gms.oss.licenses.service.START",
-        "com.google.android.gms.tapandpay.service.BIND",
-        "com.google.android.gms.measurement.START",
-        "com.google.android.gms.languageprofile.service.START",
+        "com.google.android.gms.cast_mirroring.service.START",
+        "com.google.android.gms.checkin.BIND_TO_SERVICE",
+        "com.google.android.gms.chromesync.service.START",
         "com.google.android.gms.clearcut.service.START",
-        "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE",
-        "com.google.android.gms.icing.INDEX_SERVICE",
-        "com.google.android.gms.mdm.services.START",
-
-        // potoken
-        "com.google.android.gms.potokens.service.START",
-
-        // droidguard, safetynet
+        "com.google.android.gms.common.account.CHOOSE_ACCOUNT",
+        "com.google.android.gms.common.download.START",
+        "com.google.android.gms.common.service.START",
+        "com.google.android.gms.common.telemetry.service.START",
+        "com.google.android.gms.config.START",
+        "com.google.android.gms.constellation.service.START",
+        "com.google.android.gms.credential.manager.service.firstparty.START",
+        "com.google.android.gms.deviceconnection.service.START",
+        "com.google.android.gms.drive.ApiService.RESET_AFTER_BOOT",
+        "com.google.android.gms.drive.ApiService.START",
+        "com.google.android.gms.drive.ApiService.STOP",
+        "com.google.android.gms.droidguard.service.INIT",
+        "com.google.android.gms.droidguard.service.PING",
         "com.google.android.gms.droidguard.service.START",
+        "com.google.android.gms.enterprise.loader.service.START",
+        "com.google.android.gms.facs.cache.service.START",
+        "com.google.android.gms.facs.internal.service.START",
+        "com.google.android.gms.feedback.internal.IFeedbackService",
+        "com.google.android.gms.fido.credentialstore.internal_service.START",
+        "com.google.android.gms.fido.fido2.privileged.START",
+        "com.google.android.gms.fido.fido2.regular.START",
+        "com.google.android.gms.fido.fido2.zeroparty.START",
+        "com.google.android.gms.fido.sourcedevice.service.START",
+        "com.google.android.gms.fido.targetdevice.internal_service.START",
+        "com.google.android.gms.fido.u2f.privileged.START",
+        "com.google.android.gms.fido.u2f.thirdparty.START",
+        "com.google.android.gms.fido.u2f.zeroparty.START",
+        "com.google.android.gms.fitness.BleApi",
+        "com.google.android.gms.fitness.ConfigApi",
+        "com.google.android.gms.fitness.GoalsApi",
+        "com.google.android.gms.fitness.GoogleFitnessService.START",
+        "com.google.android.gms.fitness.HistoryApi",
+        "com.google.android.gms.fitness.InternalApi",
+        "com.google.android.gms.fitness.RecordingApi",
+        "com.google.android.gms.fitness.SensorsApi",
+        "com.google.android.gms.fitness.SessionsApi",
+        "com.google.android.gms.fonts.service.START",
+        "com.google.android.gms.freighter.service.START",
+        "com.google.android.gms.games.internal.connect.service.START",
+        "com.google.android.gms.games.PLAY_GAMES_UPGRADE",
+        "com.google.android.gms.games.service.START",
+        "com.google.android.gms.gass.START",
+        "com.google.android.gms.gmscompliance.service.START",
+        "com.google.android.gms.googlehelp.HELP",
+        "com.google.android.gms.googlehelp.service.GoogleHelpService.START",
+        "com.google.android.gms.growth.service.START",
+        "com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START",
+        "com.google.android.gms.icing.INDEX_SERVICE",
+        "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE",
+        "com.google.android.gms.identity.service.BIND",
+        "com.google.android.gms.inappreach.service.START",
+        "com.google.android.gms.instantapps.START",
+        "com.google.android.gms.kids.service.START",
+        "com.google.android.gms.languageprofile.service.START",
+        "com.google.android.gms.learning.internal.dynamitesupport.START",
+        "com.google.android.gms.learning.intservice.START",
+        "com.google.android.gms.learning.predictor.START",
+        "com.google.android.gms.learning.trainer.START",
+        "com.google.android.gms.learning.training.background.START",
+        "com.google.android.gms.location.places.GeoDataApi",
+        "com.google.android.gms.location.places.PlaceDetectionApi",
+        "com.google.android.gms.location.places.PlacesApi",
+        "com.google.android.gms.location.reporting.service.START",
+        "com.google.android.gms.location.settings.LOCATION_HISTORY",
+        "com.google.android.gms.location.settings.LOCATION_REPORTING_SETTINGS",
+        "com.google.android.gms.locationsharing.api.START",
+        "com.google.android.gms.locationsharingreporter.service.START",
+        "com.google.android.gms.lockbox.service.START",
+        "com.google.android.gms.matchstick.lighter.service.START",
+        "com.google.android.gms.mdm.services.DeviceManagerApiService.START",
+        "com.google.android.gms.mdm.services.START",
+        "com.google.android.gms.mdns.service.START",
+        "com.google.android.gms.measurement.START",
+        "com.google.android.gms.nearby.bootstrap.service.NearbyBootstrapService.START",
+        "com.google.android.gms.nearby.connection.service.START",
+        "com.google.android.gms.nearby.fastpair.START",
+        "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START",
+        "com.google.android.gms.nearby.sharing.service.NearbySharingService.START",
+        "com.google.android.gms.nearby.sharing.START_SERVICE",
+        "com.google.android.gms.notifications.service.START",
+        "com.google.android.gms.ocr.service.internal.START",
+        "com.google.android.gms.ocr.service.START",
+        "com.google.android.gms.oss.licenses.service.START",
+        "com.google.android.gms.payse.service.BIND",
+        "com.google.android.gms.people.contactssync.service.START",
+        "com.google.android.gms.people.service.START",
+        "com.google.android.gms.phenotype.service.START",
+        "com.google.android.gms.photos.autobackup.service.START",
+        "com.google.android.gms.playlog.service.START",
+        "com.google.android.gms.plus.service.default.INTENT",
+        "com.google.android.gms.plus.service.image.INTENT",
+        "com.google.android.gms.plus.service.internal.START",
+        "com.google.android.gms.plus.service.START",
+        "com.google.android.gms.potokens.service.START",
+        "com.google.android.gms.pseudonymous.service.START",
+        "com.google.android.gms.rcs.START",
+        "com.google.android.gms.reminders.service.START",
+        "com.google.android.gms.romanesco.MODULE_BACKUP_AGENT",
+        "com.google.android.gms.romanesco.service.START",
         "com.google.android.gms.safetynet.service.START",
+        "com.google.android.gms.scheduler.ACTION_PROXY_SCHEDULE",
+        "com.google.android.gms.search.service.SEARCH_AUTH_START",
+        "com.google.android.gms.semanticlocation.service.START_ODLH",
+        "com.google.android.gms.sesame.service.BIND",
+        "com.google.android.gms.settings.EXPOSURE_NOTIFICATION_SETTINGS",
+        "com.google.android.gms.setup.auth.SecondDeviceAuth.START",
+        "com.google.android.gms.signin.service.START",
+        "com.google.android.gms.smartdevice.d2d.SourceDeviceService.START",
+        "com.google.android.gms.smartdevice.d2d.TargetDeviceService.START",
+        "com.google.android.gms.smartdevice.directtransfer.SourceDirectTransferService.START",
+        "com.google.android.gms.smartdevice.directtransfer.TargetDirectTransferService.START",
+        "com.google.android.gms.smartdevice.postsetup.PostSetupService.START",
+        "com.google.android.gms.smartdevice.setup.accounts.AccountsService.START",
+        "com.google.android.gms.smartdevice.wifi.START_WIFI_HELPER_SERVICE",
+        "com.google.android.gms.social.location.activity.service.START",
+        "com.google.android.gms.speech.service.START",
+        "com.google.android.gms.statementservice.EXECUTE",
+        "com.google.android.gms.stats.ACTION_UPLOAD_DROPBOX_ENTRIES",
+        "com.google.android.gms.tapandpay.service.BIND",
+        "com.google.android.gms.telephonyspam.service.START",
+        "com.google.android.gms.testsupport.service.START",
+        "com.google.android.gms.thunderbird.service.START",
+        "com.google.android.gms.trustagent.BridgeApi.START",
+        "com.google.android.gms.trustagent.StateApi.START",
+        "com.google.android.gms.trustagent.trustlet.trustletmanagerservice.BIND",
+        "com.google.android.gms.trustlet.bluetooth.service.BIND",
+        "com.google.android.gms.trustlet.connectionlessble.service.BIND",
+        "com.google.android.gms.trustlet.face.service.BIND",
+        "com.google.android.gms.trustlet.nfc.service.BIND",
+        "com.google.android.gms.trustlet.onbody.service.BIND",
+        "com.google.android.gms.trustlet.place.service.BIND",
+        "com.google.android.gms.trustlet.voiceunlock.service.BIND",
+        "com.google.android.gms.udc.service.START",
+        "com.google.android.gms.update.START_API_SERVICE",
+        "com.google.android.gms.update.START_SERVICE",
+        "com.google.android.gms.update.START_SINGLE_USER_API_SERVICE",
+        "com.google.android.gms.update.START_TV_API_SERVICE",
+        "com.google.android.gms.usagereporting.service.START",
+        "com.google.android.gms.userlocation.service.START",
+        "com.google.android.gms.vehicle.cabin.service.START",
+        "com.google.android.gms.vehicle.climate.service.START",
+        "com.google.android.gms.vehicle.info.service.START",
+        "com.google.android.gms.wallet.service.BIND",
+        "com.google.android.gms.walletp2p.service.firstparty.BIND",
+        "com.google.android.gms.walletp2p.service.zeroparty.BIND",
+        "com.google.android.gms.wearable.BIND",
+        "com.google.android.gms.wearable.BIND_LISTENER",
+        "com.google.android.gms.wearable.DATA_CHANGED",
+        "com.google.android.gms.wearable.MESSAGE_RECEIVED",
+        "com.google.android.gms.wearable.NODE_CHANGED",
+        "com.google.android.gsf.action.GET_GLS",
+        "com.google.android.location.settings.LOCATION_REPORTING_SETTINGS",
+        "com.google.android.mdd.service.START",
+        "com.google.android.mdh.service.listener.START",
+        "com.google.android.mdh.service.START",
+        "com.google.android.mobstore.service.START",
+        "com.google.firebase.auth.api.gms.service.START",
+        "com.google.firebase.dynamiclinks.service.START",
+        "com.google.iid.TOKEN_REQUEST",
+        "com.google.android.gms.location.places.ui.PICK_PLACE",
     )
 
     /**
      * All content provider authorities.
      */
     val AUTHORITIES = setOf(
-        // gsf
+        "com.google.android.gms.auth.accounts",
+        "com.google.android.gms.chimera",
+        "com.google.android.gms.fonts",
+        "com.google.android.gms.phenotype",
         "com.google.android.gsf.gservices",
         "com.google.settings",
-
-        // auth
-        "com.google.android.gms.auth.accounts",
-
-        // fonts
-        "com.google.android.gms.fonts",
-
-        // phenotype
-        "com.google.android.gms.phenotype",
     )
 }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/mainactivity/BaseMainActivityResolvePatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/mainactivity/BaseMainActivityResolvePatch.kt
index 8122949da..af3c7355f 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/mainactivity/BaseMainActivityResolvePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/mainactivity/BaseMainActivityResolvePatch.kt
@@ -18,6 +18,10 @@ lateinit var onConfigurationChangedMethod: MutableMethod
     private set
 lateinit var onCreateMethod: MutableMethod
     private set
+lateinit var onStartMethod: MutableMethod
+    private set
+lateinit var onStopMethod: MutableMethod
+    private set
 
 private lateinit var constructorMethod: MutableMethod
 private lateinit var onBackPressedMethod: MutableMethod
@@ -45,6 +49,9 @@ fun baseMainActivityResolvePatch(
 
         // set onConfigurationChanged method
         onConfigurationChangedMethod = getMainActivityMethod("onConfigurationChanged")
+
+        onStartMethod = getMainActivityMethod("onStart")
+        onStopMethod = getMainActivityMethod("onStop")
     }
 }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/materialyou/BaseMaterialYouPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/materialyou/BaseMaterialYouPatch.kt
new file mode 100644
index 000000000..ca07af5af
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/materialyou/BaseMaterialYouPatch.kt
@@ -0,0 +1,119 @@
+package app.revanced.patches.shared.materialyou
+
+import app.revanced.patcher.patch.ResourcePatchContext
+import org.w3c.dom.Element
+import java.nio.file.Files
+
+private fun ResourcePatchContext.patchXmlFile(
+    fromDir: String,
+    toDir: String,
+    xmlFileName: String,
+    parentNode: String,
+    targetNode: String? = null,
+    attribute: String,
+    newValue: String
+) {
+    val resourceDirectory = get("res")
+    val fromDirectory = resourceDirectory.resolve(fromDir)
+    val toDirectory = resourceDirectory.resolve(toDir)
+
+    if (!toDirectory.isDirectory) Files.createDirectories(toDirectory.toPath())
+
+    val fromXmlFile = fromDirectory.resolve(xmlFileName)
+    val toXmlFile = toDirectory.resolve(xmlFileName)
+
+    if (!fromXmlFile.exists()) {
+        return
+    }
+
+    if (!toXmlFile.exists()) {
+        Files.copy(
+            fromXmlFile.toPath(),
+            toXmlFile.toPath()
+        )
+    }
+
+    document("res/$toDir/$xmlFileName").use { document ->
+        val parentList = document.getElementsByTagName(parentNode).item(0) as Element
+
+        if (targetNode != null) {
+            for (i in 0 until parentList.childNodes.length) {
+                val node = parentList.childNodes.item(i) as? Element ?: continue
+
+                if (node.nodeName == targetNode && node.hasAttribute(attribute)) {
+                    node.getAttributeNode(attribute).textContent = newValue
+                }
+            }
+        } else {
+            if (parentList.hasAttribute(attribute)) {
+                parentList.getAttributeNode(attribute).textContent = newValue
+            }
+        }
+    }
+}
+
+fun ResourcePatchContext.baseMaterialYou() {
+    patchXmlFile(
+        "drawable",
+        "drawable-night-v31",
+        "new_content_dot_background.xml",
+        "shape",
+        "solid",
+        "android:color",
+        "@android:color/system_accent1_100"
+    )
+    patchXmlFile(
+        "drawable",
+        "drawable-night-v31",
+        "new_content_dot_background_cairo.xml",
+        "shape",
+        "solid",
+        "android:color",
+        "@android:color/system_accent1_100"
+    )
+    patchXmlFile(
+        "drawable",
+        "drawable-v31",
+        "new_content_dot_background.xml",
+        "shape",
+        "solid",
+        "android:color",
+        "@android:color/system_accent1_200"
+    )
+    patchXmlFile(
+        "drawable",
+        "drawable-v31",
+        "new_content_dot_background_cairo.xml",
+        "shape",
+        "solid",
+        "android:color",
+        "@android:color/system_accent1_200"
+    )
+    patchXmlFile(
+        "drawable",
+        "drawable-v31",
+        "new_content_count_background.xml",
+        "shape",
+        "solid",
+        "android:color",
+        "@android:color/system_accent1_100"
+    )
+    patchXmlFile(
+        "drawable",
+        "drawable-v31",
+        "new_content_count_background_cairo.xml",
+        "shape",
+        "solid",
+        "android:color",
+        "@android:color/system_accent1_100"
+    )
+    patchXmlFile(
+        "layout",
+        "layout-v31",
+        "new_content_count.xml",
+        "TextView",
+        null,
+        "android:textColor",
+        "@android:color/system_neutral1_900"
+    )
+}
\ No newline at end of file
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt
index 0ddda9abf..6d9012f87 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/BaseSpoofStreamingDataPatch.kt
@@ -6,13 +6,11 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.instructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatchBuilder
 import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.patches.shared.extension.Constants.PATCHES_PATH
 import app.revanced.patches.shared.extension.Constants.SPOOF_PATH
 import app.revanced.patches.shared.formatStreamModelConstructorFingerprint
 import app.revanced.util.findInstructionIndicesReversedOrThrow
@@ -21,6 +19,7 @@ import app.revanced.util.fingerprint.definingClassOrThrow
 import app.revanced.util.fingerprint.injectLiteralInstructionBooleanCall
 import app.revanced.util.fingerprint.matchOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
+import app.revanced.util.fingerprint.mutableClassOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.AccessFlags
@@ -117,15 +116,20 @@ fun baseSpoofStreamingDataPatch(
         // region Replace the streaming data.
 
         val approxDurationMsReference = formatStreamModelConstructorFingerprint.matchOrThrow().let {
-            with (it.method) {
+            with(it.method) {
                 getInstruction<ReferenceInstruction>(it.patternMatch!!.startIndex).reference
             }
         }
 
-        val streamingDataFormatsReference = with(videoStreamingDataConstructorFingerprint.methodOrThrow(videoStreamingDataToStringFingerprint)) {
+        val streamingDataFormatsReference = with(
+            videoStreamingDataConstructorFingerprint.methodOrThrow(
+                videoStreamingDataToStringFingerprint
+            )
+        ) {
             val getFormatsFieldIndex = indexOfGetFormatsFieldInstruction(this)
             val longMaxValueIndex = indexOfLongMaxValueInstruction(this, getFormatsFieldIndex)
-            val longMaxValueRegister = getInstruction<OneRegisterInstruction>(longMaxValueIndex).registerA
+            val longMaxValueRegister =
+                getInstruction<OneRegisterInstruction>(longMaxValueIndex).registerA
             val videoIdIndex =
                 indexOfFirstInstructionOrThrow(longMaxValueIndex) {
                     val reference = getReference<FieldReference>()
@@ -362,12 +366,23 @@ fun baseSpoofStreamingDataPatch(
 
         // endregion
 
-        findMethodOrThrow("$PATCHES_PATH/PatchStatus;") {
-            name == "SpoofStreamingData"
-        }.replaceInstruction(
-            0,
-            "const/4 v0, 0x1"
-        )
+        // region Set DroidGuard poToken.
+
+        poTokenToStringFingerprint.mutableClassOrThrow().let {
+            val poTokenClass = it.fields.find { field ->
+                field.accessFlags == AccessFlags.PRIVATE.value && field.type.startsWith("L")
+            }!!.type
+
+            findMethodOrThrow(poTokenClass) {
+                name == "<init>" &&
+                        parameters == listOf("[B")
+            }.addInstruction(
+                1,
+                "invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->setDroidGuardPoToken([B)V"
+            )
+        }
+
+        // endregion
 
         executeBlock()
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/Fingerprints.kt
index 36ae9360b..265b1c245 100644
--- a/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/spoof/streamingdata/Fingerprints.kt
@@ -197,3 +197,22 @@ internal val hlsCurrentTimeFingerprint = legacyFingerprint(
     parameters = listOf("Z", "L"),
     literals = listOf(HLS_CURRENT_TIME_FEATURE_FLAG),
 )
+
+internal val poTokenToStringFingerprint = legacyFingerprint(
+    name = "poTokenToStringFingerprint",
+    returnType = "Ljava/lang/String;",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = emptyList(),
+    strings = listOf("UTF-8"),
+    customFingerprint = { method, classDef ->
+        method.name == "toString" &&
+                classDef.fields.find { it.type == "[B" } != null &&
+                // In YouTube, this field's type is 'Lcom/google/android/gms/potokens/PoToken;'.
+                // In YouTube Music, this class name is obfuscated.
+                classDef.fields.find {
+                    it.accessFlags == AccessFlags.PRIVATE.value && it.type.startsWith(
+                        "L"
+                    )
+                } != null
+    },
+)
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/Fingerprints.kt
index e37d96d1d..0acbf1fa6 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/Fingerprints.kt
@@ -134,3 +134,12 @@ internal val tooltipContentViewFingerprint = legacyFingerprint(
     literals = listOf(toolTipContentView),
 )
 
+internal const val TRANSLUCENT_STATUS_BAR_FEATURE_FLAG = 45400535L
+
+internal val translucentStatusBarFeatureFlagFingerprint = legacyFingerprint(
+    name = "translucentStatusBarFeatureFlagFingerprint",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "Z",
+    literals = listOf(TRANSLUCENT_STATUS_BAR_FEATURE_FLAG)
+)
+
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt
index a80c7b44b..05b29167a 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt
@@ -17,10 +17,13 @@ import app.revanced.patches.youtube.utils.extension.Constants.COMPONENTS_PATH
 import app.revanced.patches.youtube.utils.extension.Constants.GENERAL_CLASS_DESCRIPTOR
 import app.revanced.patches.youtube.utils.extension.Constants.GENERAL_PATH
 import app.revanced.patches.youtube.utils.patch.PatchList.HIDE_LAYOUT_COMPONENTS
+import app.revanced.patches.youtube.utils.playservice.is_19_25_or_greater
+import app.revanced.patches.youtube.utils.playservice.versionCheckPatch
 import app.revanced.patches.youtube.utils.resourceid.accountSwitcherAccessibility
 import app.revanced.patches.youtube.utils.resourceid.sharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.addPreference
 import app.revanced.patches.youtube.utils.settings.settingsPatch
+import app.revanced.util.fingerprint.injectLiteralInstructionBooleanCall
 import app.revanced.util.fingerprint.matchOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.fingerprint.mutableClassOrThrow
@@ -55,10 +58,16 @@ val layoutComponentsPatch = bytecodePatch(
         sharedResourceIdPatch,
         settingsMenuPatch,
         viewGroupMarginLayoutParamsHookPatch,
+        versionCheckPatch,
     )
 
     execute {
 
+        var settingArray = arrayOf(
+            "PREFERENCE_SCREEN: GENERAL",
+            "SETTINGS: HIDE_LAYOUT_COMPONENTS"
+        )
+
         // region patch for disable pip notification
 
         pipNotificationFingerprint.matchOrThrow().let {
@@ -86,6 +95,19 @@ val layoutComponentsPatch = bytecodePatch(
 
         // endregion
 
+        // region patch for disable translucent status bar
+
+        if (is_19_25_or_greater) {
+            translucentStatusBarFeatureFlagFingerprint.injectLiteralInstructionBooleanCall(
+                TRANSLUCENT_STATUS_BAR_FEATURE_FLAG,
+                "$GENERAL_CLASS_DESCRIPTOR->disableTranslucentStatusBar(Z)Z"
+            )
+
+            settingArray += "SETTINGS: DISABLE_TRANSLUCENT_STATUS_BAR"
+        }
+
+        // endregion
+
         // region patch for disable update screen
 
         appBlockingCheckResultToStringFingerprint.mutableClassOrThrow().methods.first { method ->
@@ -234,10 +256,7 @@ val layoutComponentsPatch = bytecodePatch(
         // region add settings
 
         addPreference(
-            arrayOf(
-                "PREFERENCE_SCREEN: GENERAL",
-                "SETTINGS: HIDE_LAYOUT_COMPONENTS"
-            ),
+            settingArray,
             HIDE_LAYOUT_COMPONENTS
         )
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt
index fd74a28bd..33821a219 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/Fingerprints.kt
@@ -74,32 +74,9 @@ internal val setEnumMapFingerprint = legacyFingerprint(
     literals = listOf(ytFillBell),
 )
 
-internal const val TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG = 45400535L
+internal const val TRANSLUCENT_NAVIGATION_BAR_FEATURE_FLAG = 45630927L
 
-internal val translucentNavigationStatusBarFeatureFlagFingerprint = legacyFingerprint(
-    name = "translucentNavigationStatusBarFeatureFlagFingerprint",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Z",
-    literals = listOf(TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG)
-)
-
-internal const val TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG = 45630927L
-
-internal val translucentNavigationButtonsFeatureFlagFingerprint = legacyFingerprint(
-    name = "translucentNavigationButtonsFeatureFlagFingerprint",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    literals = listOf(TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG)
-)
-
-/**
- * The device on screen back/home/recent buttons.
- */
-internal const val TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG = 45632194L
-
-internal val translucentNavigationButtonsSystemFeatureFlagFingerprint = legacyFingerprint(
-    name = "translucentNavigationButtonsSystemFeatureFlagFingerprint",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Z",
-    literals = listOf(TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG)
+internal val translucentNavigationBarFingerprint = legacyFingerprint(
+    name = "translucentNavigationBarFingerprint",
+    literals = listOf(TRANSLUCENT_NAVIGATION_BAR_FEATURE_FLAG),
 )
\ No newline at end of file
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt
index 8e8d38987..ee584d225 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/general/navigation/NavigationBarComponentsPatch.kt
@@ -85,30 +85,11 @@ val navigationBarComponentsPatch = bytecodePatch(
         // region patch for enable translucent navigation bar
 
         if (is_19_25_or_greater) {
-            arrayOf(
-                Triple(
-                    translucentNavigationStatusBarFeatureFlagFingerprint,
-                    TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG,
-                    "useTranslucentNavigationStatusBar"
-                ),
-                Triple(
-                    translucentNavigationButtonsFeatureFlagFingerprint,
-                    TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG,
-                    "useTranslucentNavigationButtons"
-                ),
-                Triple(
-                    translucentNavigationButtonsSystemFeatureFlagFingerprint,
-                    TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG,
-                    "useTranslucentNavigationButtons"
-                )
-            ).forEach {
-                it.first.injectLiteralInstructionBooleanCall(
-                    it.second,
-                    "$GENERAL_CLASS_DESCRIPTOR->${it.third}(Z)Z"
-                )
-            }
+            translucentNavigationBarFingerprint.injectLiteralInstructionBooleanCall(
+                TRANSLUCENT_NAVIGATION_BAR_FEATURE_FLAG,
+                "$GENERAL_CLASS_DESCRIPTOR->enableTranslucentNavigationBar()Z"
+            )
 
-            settingArray += "SETTINGS: DISABLE_TRANSLUCENT_STATUS_BAR"
             settingArray += "SETTINGS: TRANSLUCENT_NAVIGATION_BAR"
         }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt
index 74f762141..46233d174 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt
@@ -342,10 +342,11 @@ val toolBarComponentsPatch = bytecodePatch(
                         opcode == Opcode.INVOKE_VIRTUAL &&
                                 getReference<MethodReference>()?.toString() == voiceInputControllerActivityMethodCall
                     }
-                val setOnClickListenerIndex = indexOfFirstInstructionOrThrow(voiceInputControllerActivityIndex) {
-                    opcode == Opcode.INVOKE_VIRTUAL &&
-                            getReference<MethodReference>()?.name == "setOnClickListener"
-                }
+                val setOnClickListenerIndex =
+                    indexOfFirstInstructionOrThrow(voiceInputControllerActivityIndex) {
+                        opcode == Opcode.INVOKE_VIRTUAL &&
+                                getReference<MethodReference>()?.name == "setOnClickListener"
+                    }
                 val viewRegister =
                     getInstruction<FiveRegisterInstruction>(setOnClickListenerIndex).registerC
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt
index ededd6ab4..797477de2 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt
@@ -5,12 +5,14 @@ import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringOption
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.youtube.utils.patch.PatchList.CUSTOM_BRANDING_ICON_FOR_YOUTUBE
+import app.revanced.patches.youtube.utils.playservice.is_19_17_or_greater
 import app.revanced.patches.youtube.utils.playservice.is_19_32_or_greater
 import app.revanced.patches.youtube.utils.playservice.is_19_34_or_greater
 import app.revanced.patches.youtube.utils.playservice.versionCheckPatch
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.updatePatchStatusIcon
 import app.revanced.patches.youtube.utils.settings.settingsPatch
 import app.revanced.util.ResourceGroup
+import app.revanced.util.Utils.printWarn
 import app.revanced.util.Utils.trimIndentMultiline
 import app.revanced.util.copyAdaptiveIcon
 import app.revanced.util.copyFile
@@ -122,7 +124,7 @@ val customBrandingIconPatch = resourcePatch(
         key = "changeSplashIcon",
         default = true,
         title = "Change splash icons",
-        description = "Apply the custom branding icon to the splash screen.",
+        description = "Apply the custom branding icon to the splash screen. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
         required = true
     )
 
@@ -171,29 +173,33 @@ val customBrandingIconPatch = resourcePatch(
 
             // Change splash icon.
             if (changeSplashIconOption == true) {
-                splashIconResourceGroups.let { resourceGroups ->
-                    resourceGroups.forEach {
-                        copyResources("$appIconResourcePath/splash", it)
-                    }
-                }
-
-                document("res/values/styles.xml").use { document ->
-                    val resourcesNode =
-                        document.getElementsByTagName("resources").item(0) as Element
-                    val childNodes = resourcesNode.childNodes
-
-                    for (i in 0 until childNodes.length) {
-                        val node = childNodes.item(i) as? Element ?: continue
-                        val nodeAttributeName = node.getAttribute("name")
-                        if (nodeAttributeName.startsWith("Theme.YouTube.Launcher")) {
-                            val style = document.createElement("style")
-                            style.setAttribute("name", nodeAttributeName)
-                            style.setAttribute("parent", "@style/Base.Theme.YouTube.Launcher")
-
-                            resourcesNode.removeChild(node)
-                            resourcesNode.appendChild(style)
+                if (!is_19_17_or_greater) {
+                    splashIconResourceGroups.let { resourceGroups ->
+                        resourceGroups.forEach {
+                            copyResources("$appIconResourcePath/splash", it)
                         }
                     }
+
+                    document("res/values/styles.xml").use { document ->
+                        val resourcesNode =
+                            document.getElementsByTagName("resources").item(0) as Element
+                        val childNodes = resourcesNode.childNodes
+
+                        for (i in 0 until childNodes.length) {
+                            val node = childNodes.item(i) as? Element ?: continue
+                            val nodeAttributeName = node.getAttribute("name")
+                            if (nodeAttributeName.startsWith("Theme.YouTube.Launcher")) {
+                                val style = document.createElement("style")
+                                style.setAttribute("name", nodeAttributeName)
+                                style.setAttribute("parent", "@style/Base.Theme.YouTube.Launcher")
+
+                                resourcesNode.removeChild(node)
+                                resourcesNode.appendChild(style)
+                            }
+                        }
+                    }
+                } else {
+                    printWarn("\"Change splash icons\" is not supported in this version. Use YouTube 19.16.39 or earlier.")
                 }
             }
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/MaterialYouPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/MaterialYouPatch.kt
index 9688864a0..c148fcb4d 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/MaterialYouPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/MaterialYouPatch.kt
@@ -1,14 +1,13 @@
 package app.revanced.patches.youtube.layout.theme
 
 import app.revanced.patcher.patch.resourcePatch
+import app.revanced.patches.shared.materialyou.baseMaterialYou
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.youtube.utils.patch.PatchList.MATERIALYOU
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.addPreference
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.updatePatchStatusTheme
 import app.revanced.patches.youtube.utils.settings.settingsPatch
 import app.revanced.util.copyXmlNode
-import org.w3c.dom.Element
-import java.nio.file.Files
 
 @Suppress("unused")
 val materialYouPatch = resourcePatch(
@@ -24,117 +23,7 @@ val materialYouPatch = resourcePatch(
     )
 
     execute {
-        fun patchXmlFile(
-            fromDir: String,
-            toDir: String,
-            xmlFileName: String,
-            parentNode: String,
-            targetNode: String? = null,
-            attribute: String,
-            newValue: String
-        ) {
-            val resourceDirectory = get("res")
-            val fromDirectory = resourceDirectory.resolve(fromDir)
-            val toDirectory = resourceDirectory.resolve(toDir)
-
-            if (!toDirectory.isDirectory) Files.createDirectories(toDirectory.toPath())
-
-            val fromXmlFile = fromDirectory.resolve(xmlFileName)
-            val toXmlFile = toDirectory.resolve(xmlFileName)
-
-            if (!fromXmlFile.exists()) {
-                return
-            }
-
-            if (!toXmlFile.exists()) {
-                Files.copy(
-                    fromXmlFile.toPath(),
-                    toXmlFile.toPath()
-                )
-            }
-
-            document("res/$toDir/$xmlFileName").use { document ->
-                val parentList = document.getElementsByTagName(parentNode).item(0) as Element
-
-                if (targetNode != null) {
-                    for (i in 0 until parentList.childNodes.length) {
-                        val node = parentList.childNodes.item(i) as? Element ?: continue
-
-                        if (node.nodeName == targetNode && node.hasAttribute(attribute)) {
-                            node.getAttributeNode(attribute).textContent = newValue
-                        }
-                    }
-                } else {
-                    if (parentList.hasAttribute(attribute)) {
-                        parentList.getAttributeNode(attribute).textContent = newValue
-                    }
-                }
-            }
-        }
-
-        patchXmlFile(
-            "drawable",
-            "drawable-night-v31",
-            "new_content_dot_background.xml",
-            "shape",
-            "solid",
-            "android:color",
-            "@android:color/system_accent1_100"
-        )
-        patchXmlFile(
-            "drawable",
-            "drawable-night-v31",
-            "new_content_dot_background_cairo.xml",
-            "shape",
-            "solid",
-            "android:color",
-            "@android:color/system_accent1_100"
-        )
-        patchXmlFile(
-            "drawable",
-            "drawable-v31",
-            "new_content_dot_background.xml",
-            "shape",
-            "solid",
-            "android:color",
-            "@android:color/system_accent1_200"
-        )
-        patchXmlFile(
-            "drawable",
-            "drawable-v31",
-            "new_content_dot_background_cairo.xml",
-            "shape",
-            "solid",
-            "android:color",
-            "@android:color/system_accent1_200"
-        )
-        patchXmlFile(
-            "drawable",
-            "drawable-v31",
-            "new_content_count_background.xml",
-            "shape",
-            "solid",
-            "android:color",
-            "@android:color/system_accent1_100"
-        )
-        patchXmlFile(
-            "drawable",
-            "drawable-v31",
-            "new_content_count_background_cairo.xml",
-            "shape",
-            "solid",
-            "android:color",
-            "@android:color/system_accent1_100"
-        )
-        patchXmlFile(
-            "layout",
-            "layout-v31",
-            "new_content_count.xml",
-            "TextView",
-            null,
-            "android:textColor",
-            "@android:color/system_neutral1_900"
-        )
+        baseMaterialYou()
 
         copyXmlNode("youtube/materialyou/host", "values-v31/colors.xml", "resources")
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/Fingerprints.kt
index d89496da6..f65a4b917 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/Fingerprints.kt
@@ -23,19 +23,6 @@ internal val broadcastReceiverFingerprint = legacyFingerprint(
     }
 )
 
-internal val clientSettingEndpointFingerprint = legacyFingerprint(
-    name = "clientSettingEndpointFingerprint",
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L", "Ljava/util/Map;"),
-    strings = listOf(
-        "OVERRIDE_EXIT_FULLSCREEN_TO_MAXIMIZED",
-        "force_fullscreen",
-        "start_watch_minimized",
-        "watch"
-    )
-)
-
 internal val engagementPanelFingerprint = legacyFingerprint(
     name = "engagementPanelFingerprint",
     returnType = "L",
@@ -72,10 +59,3 @@ internal val relatedEndScreenResultsFingerprint = legacyFingerprint(
     literals = listOf(appRelatedEndScreenResults),
 )
 
-internal val videoPortraitParentFingerprint = legacyFingerprint(
-    name = "videoPortraitParentFingerprint",
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L", "Ljava/util/Map;"),
-    strings = listOf("Acquiring NetLatencyActionLogger failed. taskId=")
-)
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/FullscreenComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/FullscreenComponentsPatch.kt
index f00ad80bd..21f315edc 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/FullscreenComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/FullscreenComponentsPatch.kt
@@ -11,13 +11,18 @@ import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.litho.addLithoFilter
 import app.revanced.patches.shared.litho.lithoFilterPatch
 import app.revanced.patches.shared.mainactivity.onConfigurationChangedMethod
+import app.revanced.patches.shared.mainactivity.onStartMethod
+import app.revanced.patches.shared.mainactivity.onStopMethod
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.youtube.utils.extension.Constants.COMPONENTS_PATH
 import app.revanced.patches.youtube.utils.extension.Constants.PATCH_STATUS_CLASS_DESCRIPTOR
 import app.revanced.patches.youtube.utils.extension.Constants.PLAYER_CLASS_DESCRIPTOR
+import app.revanced.patches.youtube.utils.extension.Constants.PLAYER_PATH
+import app.revanced.patches.youtube.utils.fullscreen.fullscreenButtonHookPatch
 import app.revanced.patches.youtube.utils.layoutConstructorFingerprint
 import app.revanced.patches.youtube.utils.mainactivity.mainActivityResolvePatch
 import app.revanced.patches.youtube.utils.patch.PatchList.FULLSCREEN_COMPONENTS
+import app.revanced.patches.youtube.utils.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.utils.playservice.is_18_42_or_greater
 import app.revanced.patches.youtube.utils.playservice.is_19_41_or_greater
 import app.revanced.patches.youtube.utils.playservice.versionCheckPatch
@@ -28,7 +33,11 @@ import app.revanced.patches.youtube.utils.resourceid.sharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.addPreference
 import app.revanced.patches.youtube.utils.settings.settingsPatch
 import app.revanced.patches.youtube.utils.youtubeControlsOverlayFingerprint
+import app.revanced.patches.youtube.video.information.hookBackgroundPlayVideoInformation
+import app.revanced.patches.youtube.video.information.videoEndMethod
+import app.revanced.patches.youtube.video.information.videoInformationPatch
 import app.revanced.util.Utils.printWarn
+import app.revanced.util.addInstructionsAtControlFlowLabel
 import app.revanced.util.findMethodOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.fingerprint.mutableClassOrThrow
@@ -42,13 +51,18 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 private const val FILTER_CLASS_DESCRIPTOR =
     "$COMPONENTS_PATH/QuickActionFilter;"
 
+private const val EXTENSION_ENTER_FULLSCREEN_CLASS_DESCRIPTOR =
+    "$PLAYER_PATH/EnterFullscreenPatch;"
+
+private const val EXTENSION_EXIT_FULLSCREEN_CLASS_DESCRIPTOR =
+    "$PLAYER_PATH/ExitFullscreenPatch;"
+
 @Suppress("unused")
 val fullscreenComponentsPatch = bytecodePatch(
     FULLSCREEN_COMPONENTS.title,
@@ -58,8 +72,11 @@ val fullscreenComponentsPatch = bytecodePatch(
 
     dependsOn(
         settingsPatch,
+        playerTypeHookPatch,
         lithoFilterPatch,
         mainActivityResolvePatch,
+        fullscreenButtonHookPatch,
+        videoInformationPatch,
         sharedResourceIdPatch,
         versionCheckPatch,
     )
@@ -107,6 +124,33 @@ val fullscreenComponentsPatch = bytecodePatch(
 
         // endregion
 
+        // region patch for enter fullscreen
+
+        mapOf(
+            onStartMethod to "onAppForegrounded",
+            onStopMethod to "onAppBackgrounded"
+        ).forEach { (method, name) ->
+            method.addInstruction(
+                0,
+                "invoke-static {}, $EXTENSION_ENTER_FULLSCREEN_CLASS_DESCRIPTOR->$name()V"
+            )
+        }
+
+        hookBackgroundPlayVideoInformation("$EXTENSION_ENTER_FULLSCREEN_CLASS_DESCRIPTOR->enterFullscreen(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JZ)V")
+
+        // endregion
+
+        // region patch for exit fullscreen
+
+        videoEndMethod.apply {
+            addInstructionsAtControlFlowLabel(
+                implementation!!.instructions.lastIndex,
+                "invoke-static {}, $EXTENSION_EXIT_FULLSCREEN_CLASS_DESCRIPTOR->endOfVideoReached()V",
+            )
+        }
+
+        // endregion
+
         // region patch for hide autoplay preview
 
         layoutConstructorFingerprint.methodOrThrow().apply {
@@ -198,60 +242,6 @@ val fullscreenComponentsPatch = bytecodePatch(
 
         // endregion
 
-        // region patch for force fullscreen
-
-        clientSettingEndpointFingerprint.methodOrThrow().apply {
-            val getActivityIndex = indexOfFirstStringInstructionOrThrow("watch") + 2
-            val getActivityReference =
-                getInstruction<ReferenceInstruction>(getActivityIndex).reference
-            val classRegister =
-                getInstruction<TwoRegisterInstruction>(getActivityIndex).registerB
-
-            val watchDescriptorMethodIndex =
-                indexOfFirstStringInstructionOrThrow("start_watch_minimized") - 1
-            val watchDescriptorRegister =
-                getInstruction<FiveRegisterInstruction>(watchDescriptorMethodIndex).registerD
-
-            addInstructions(
-                watchDescriptorMethodIndex, """
-                    invoke-static {v$watchDescriptorRegister}, $PLAYER_CLASS_DESCRIPTOR->forceFullscreen(Z)Z
-                    move-result v$watchDescriptorRegister
-                    """
-            )
-
-            // hooks Activity.
-            val insertIndex = indexOfFirstStringInstructionOrThrow("force_fullscreen")
-            val freeRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
-
-            addInstructions(
-                insertIndex, """
-                    iget-object v$freeRegister, v$classRegister, $getActivityReference
-                    check-cast v$freeRegister, Landroid/app/Activity;
-                    invoke-static {v$freeRegister}, $PLAYER_CLASS_DESCRIPTOR->setWatchDescriptorActivity(Landroid/app/Activity;)V
-                    """
-            )
-        }
-
-        videoPortraitParentFingerprint.methodOrThrow().apply {
-            val stringIndex =
-                indexOfFirstStringInstructionOrThrow("Acquiring NetLatencyActionLogger failed. taskId=")
-            val invokeIndex =
-                indexOfFirstInstructionOrThrow(stringIndex, Opcode.INVOKE_INTERFACE)
-            val targetIndex = indexOfFirstInstructionOrThrow(invokeIndex, Opcode.CHECK_CAST)
-            val targetClass =
-                getInstruction<ReferenceInstruction>(targetIndex).reference.toString()
-
-            // add an instruction to check the vertical video
-            findMethodOrThrow(targetClass) {
-                parameters == listOf("I", "I", "Z")
-            }.addInstruction(
-                1,
-                "invoke-static {p1, p2}, $PLAYER_CLASS_DESCRIPTOR->setVideoPortrait(II)V"
-            )
-        }
-
-        // endregion
-
         // region patch for disable landscape mode
 
         onConfigurationChangedMethod.apply {
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/hapticFeedbackPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/hapticFeedbackPatch.kt
index 22888a480..373619800 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/hapticFeedbackPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/hapticFeedbackPatch.kt
@@ -10,10 +10,12 @@ import app.revanced.patches.youtube.utils.extension.Constants.PLAYER_CLASS_DESCR
 import app.revanced.patches.youtube.utils.patch.PatchList.DISABLE_HAPTIC_FEEDBACK
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.addPreference
 import app.revanced.patches.youtube.utils.settings.settingsPatch
-import app.revanced.util.fingerprint.methodOrThrow
-import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.fingerprint.matchOrThrow
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 @Suppress("unused")
 val hapticFeedbackPatch = bytecodePatch(
@@ -26,23 +28,29 @@ val hapticFeedbackPatch = bytecodePatch(
 
     execute {
         fun Pair<String, Fingerprint>.hookHapticFeedback(methodName: String) =
-            methodOrThrow().apply {
-                var index = 0
-                var register = 0
+            matchOrThrow().let {
+                it.method.apply {
+                    var index = 0
+                    var register = 0
 
-                if (name == "run") {
-                    index = indexOfFirstInstructionOrThrow(Opcode.SGET)
-                    register = getInstruction<OneRegisterInstruction>(index).registerA
-                }
+                    if (name == "run") {
+                        val stringIndex = it.stringMatches!!.first().index
+                        index = indexOfFirstInstructionReversedOrThrow(stringIndex) {
+                            opcode == Opcode.SGET &&
+                                    getReference<FieldReference>()?.toString() == "Landroid/os/Build${'$'}VERSION;->SDK_INT:I"
+                        }
+                        register = getInstruction<OneRegisterInstruction>(index).registerA
+                    }
 
-                addInstructionsWithLabels(
-                    index, """
+                    addInstructionsWithLabels(
+                        index, """
                         invoke-static {}, $PLAYER_CLASS_DESCRIPTOR->$methodName()Z
                         move-result v$register
                         if-eqz v$register, :vibrate
                         return-void
                         """, ExternalLabel("vibrate", getInstruction(index))
-                )
+                    )
+                }
             }
 
         arrayOf(
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt
index 5c023b1eb..3c07be84b 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt
@@ -15,12 +15,15 @@ import app.revanced.patches.youtube.utils.patch.PatchList.OVERLAY_BUTTONS
 import app.revanced.patches.youtube.utils.pip.pipStateHookPatch
 import app.revanced.patches.youtube.utils.playercontrols.hookBottomControlButton
 import app.revanced.patches.youtube.utils.playercontrols.playerControlsPatch
+import app.revanced.patches.youtube.utils.playservice.is_19_17_or_greater
+import app.revanced.patches.youtube.utils.playservice.versionCheckPatch
 import app.revanced.patches.youtube.utils.resourceid.sharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.addPreference
 import app.revanced.patches.youtube.utils.settings.settingsPatch
 import app.revanced.patches.youtube.video.information.videoEndMethod
 import app.revanced.patches.youtube.video.information.videoInformationPatch
 import app.revanced.util.ResourceGroup
+import app.revanced.util.Utils.printWarn
 import app.revanced.util.copyResources
 import app.revanced.util.copyXmlNode
 import app.revanced.util.doRecursively
@@ -75,6 +78,7 @@ val overlayButtonsPatch = resourcePatch(
         playerControlsPatch,
         sharedResourceIdPatch,
         settingsPatch,
+        versionCheckPatch,
     )
 
     val iconTypeOption = stringOption(
@@ -99,7 +103,7 @@ val overlayButtonsPatch = resourcePatch(
             "Wider" to MARGIN_WIDER,
         ),
         title = "Bottom margin",
-        description = "The bottom margin for the overlay buttons and timestamp.",
+        description = "The bottom margin for the overlay buttons and timestamp. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
         required = true
     )
 
@@ -107,7 +111,7 @@ val overlayButtonsPatch = resourcePatch(
         key = "widerButtonsSpace",
         default = false,
         title = "Wider between-buttons space",
-        description = "Prevent adjacent button presses by increasing the horizontal spacing between buttons.",
+        description = "Prevent adjacent button presses by increasing the horizontal spacing between buttons. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
         required = true
     )
 
@@ -125,9 +129,19 @@ val overlayButtonsPatch = resourcePatch(
         val iconType = iconTypeOption
             .lowerCaseOrThrow()
 
-        val marginBottom = bottomMarginOption
+        var marginBottom = bottomMarginOption
             .lowerCaseOrThrow()
 
+        if (marginBottom != MARGIN_DEFAULT && is_19_17_or_greater) {
+            printWarn("\"Bottom margin\" is not supported in this version. Use YouTube 19.16.39 or earlier.")
+            marginBottom = MARGIN_DEFAULT
+        }
+
+        if (widerButtonsSpace == true && is_19_17_or_greater) {
+            printWarn("\"Wider between-buttons space\" is not supported in this version. Use YouTube 19.16.39 or earlier.")
+        }
+        val useWiderButtonsSpace = widerButtonsSpace == true && !is_19_17_or_greater
+
         // Inject hooks for overlay buttons.
         setOf(
             "AlwaysRepeat;",
@@ -201,59 +215,76 @@ val overlayButtonsPatch = resourcePatch(
             "android.support.constraint.ConstraintLayout"
         )
 
-        // Note: Do not modify fullscreen button and multiview button
-        document("res/layout/youtube_controls_bottom_ui_container.xml").use { document ->
-            document.doRecursively loop@{ node ->
-                if (node !is Element) return@loop
+        var xmlFiles = arrayOf(
+            "youtube_controls_bottom_ui_container.xml"
+        )
+        if (!is_19_17_or_greater) {
+            xmlFiles += "youtube_controls_fullscreen_button.xml"
+            xmlFiles += "youtube_controls_cf_fullscreen_button.xml"
+        }
 
-                // Change the relationship between buttons
-                node.getAttributeNode("yt:layout_constraintRight_toLeftOf")
-                    ?.let { attribute ->
-                        if (attribute.textContent == "@id/fullscreen_button") {
-                            attribute.textContent = "@+id/speed_dialog_button"
+        xmlFiles.forEach { xmlFile ->
+            val targetXml = get("res").resolve("layout").resolve(xmlFile)
+            if (targetXml.exists()) {
+                document("res/layout/$xmlFile").use { document ->
+                    document.doRecursively loop@{ node ->
+                        if (node !is Element) return@loop
+
+                        // Change the relationship between buttons
+                        node.getAttributeNode("yt:layout_constraintRight_toLeftOf")
+                            ?.let { attribute ->
+                                if (attribute.textContent == "@id/fullscreen_button") {
+                                    attribute.textContent = "@+id/speed_dialog_button"
+                                }
+                            }
+
+                        val (id, height, width) = Triple(
+                            node.getAttribute("android:id"),
+                            node.getAttribute("android:layout_height"),
+                            node.getAttribute("android:layout_width")
+                        )
+                        val (heightIsNotZero, widthIsNotZero) = Pair(
+                            height != "0.0dip",
+                            width != "0.0dip",
+                        )
+
+                        val isButton = if (is_19_17_or_greater)
+                        // Note: Do not modify fullscreen button and multiview button
+                            id.endsWith("_button") && id != "@id/multiview_button"
+                        else
+                            id.endsWith("_button") || id == "@id/youtube_controls_fullscreen_button_stub"
+
+                        // Adjust TimeBar and Chapter bottom padding
+                        val timBarItem = mutableMapOf(
+                            "@id/time_bar_chapter_title" to "16.0dip",
+                            "@id/timestamps_container" to "14.0dip"
+                        )
+
+                        val layoutHeightWidth = if (useWiderButtonsSpace)
+                            "56.0dip"
+                        else
+                            "48.0dip"
+
+                        if (isButton) {
+                            node.setAttribute("android:layout_marginBottom", marginBottom)
+                            node.setAttribute("android:paddingLeft", "0.0dip")
+                            node.setAttribute("android:paddingRight", "0.0dip")
+                            node.setAttribute("android:paddingBottom", "22.0dip")
+                            if (heightIsNotZero && widthIsNotZero) {
+                                node.setAttribute("android:layout_height", layoutHeightWidth)
+                                node.setAttribute("android:layout_width", layoutHeightWidth)
+                            }
+                        } else if (timBarItem.containsKey(id)) {
+                            node.setAttribute("android:layout_marginBottom", marginBottom)
+                            if (!useWiderButtonsSpace) {
+                                node.setAttribute("android:paddingBottom", timBarItem.getValue(id))
+                            }
+                        }
+
+                        if (!is_19_17_or_greater && id.equals("@id/youtube_controls_fullscreen_button_stub")) {
+                            node.setAttribute("android:layout_width", layoutHeightWidth)
                         }
                     }
-
-                val (id, height, width) = Triple(
-                    node.getAttribute("android:id"),
-                    node.getAttribute("android:layout_height"),
-                    node.getAttribute("android:layout_width")
-                )
-                val (heightIsNotZero, widthIsNotZero, isButton) = Triple(
-                    height != "0.0dip",
-                    width != "0.0dip",
-                    id.endsWith("_button") && id != "@id/multiview_button"
-                )
-
-                // Adjust TimeBar and Chapter bottom padding
-                val timBarItem = mutableMapOf(
-                    "@id/time_bar_chapter_title" to "16.0dip",
-                    "@id/timestamps_container" to "14.0dip"
-                )
-
-                val layoutHeightWidth = if (widerButtonsSpace == true)
-                    "56.0dip"
-                else
-                    "48.0dip"
-
-                if (isButton) {
-                    node.setAttribute("android:layout_marginBottom", marginBottom)
-                    node.setAttribute("android:paddingLeft", "0.0dip")
-                    node.setAttribute("android:paddingRight", "0.0dip")
-                    node.setAttribute("android:paddingBottom", "22.0dip")
-                    if (heightIsNotZero && widthIsNotZero) {
-                        node.setAttribute("android:layout_height", layoutHeightWidth)
-                        node.setAttribute("android:layout_width", layoutHeightWidth)
-                    }
-                } else if (timBarItem.containsKey(id)) {
-                    node.setAttribute("android:layout_marginBottom", marginBottom)
-                    if (widerButtonsSpace != true) {
-                        node.setAttribute("android:paddingBottom", timBarItem.getValue(id))
-                    }
-                }
-
-                if (id.equals("@id/youtube_controls_fullscreen_button_stub")) {
-                    node.setAttribute("android:layout_width", layoutHeightWidth)
                 }
             }
         }
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt
index 49c3fb886..f3f587372 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt
@@ -11,12 +11,14 @@ import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.drawable.addDrawableColorHook
 import app.revanced.patches.shared.drawable.drawableColorHookPatch
 import app.revanced.patches.shared.mainactivity.onCreateMethod
+import app.revanced.patches.youtube.layout.branding.icon.customBrandingIconPatch
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
 import app.revanced.patches.youtube.utils.extension.Constants.PATCH_STATUS_CLASS_DESCRIPTOR
 import app.revanced.patches.youtube.utils.extension.Constants.PLAYER_CLASS_DESCRIPTOR
 import app.revanced.patches.youtube.utils.extension.Constants.PLAYER_PATH
 import app.revanced.patches.youtube.utils.flyoutmenu.flyoutMenuHookPatch
 import app.revanced.patches.youtube.utils.mainactivity.mainActivityResolvePatch
+import app.revanced.patches.youtube.utils.patch.PatchList.CUSTOM_BRANDING_ICON_FOR_YOUTUBE
 import app.revanced.patches.youtube.utils.patch.PatchList.SEEKBAR_COMPONENTS
 import app.revanced.patches.youtube.utils.playerButtonsResourcesFingerprint
 import app.revanced.patches.youtube.utils.playerButtonsVisibilityFingerprint
@@ -43,6 +45,7 @@ import app.revanced.util.fingerprint.injectLiteralInstructionBooleanCall
 import app.revanced.util.fingerprint.matchOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.fingerprint.resolvable
+import app.revanced.util.getBooleanOptionValue
 import app.revanced.util.getReference
 import app.revanced.util.getWalkerMethod
 import app.revanced.util.indexOfFirstInstructionOrThrow
@@ -116,6 +119,9 @@ val seekbarComponentsPatch = bytecodePatch(
 
     execute {
 
+        val restoreOldSplashAnimationIncluded = CUSTOM_BRANDING_ICON_FOR_YOUTUBE.included == true &&
+                customBrandingIconPatch.getBooleanOptionValue("restoreOldSplashAnimationOption").value == true
+
         var settingArray = arrayOf(
             "PREFERENCE_SCREEN: PLAYER",
             "SETTINGS: SEEKBAR_COMPONENTS"
@@ -257,25 +263,29 @@ val seekbarComponentsPatch = bytecodePatch(
                 "invoke-static/range { p4 .. p5 },  $EXTENSION_SEEKBAR_COLOR_CLASS_DESCRIPTOR->setLinearGradient([I[F)V"
             )
 
-            // Don't use the lotte splash screen layout if using custom seekbar.
-            arrayOf(
-                launchScreenLayoutTypeFingerprint.methodOrThrow(),
-                onCreateMethod
-            ).forEach { method ->
-                method.apply {
-                    val literalIndex =
-                        indexOfFirstLiteralInstructionOrThrow(launchScreenLayoutTypeLotteFeatureFlag)
-                    val resultIndex =
-                        indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
-                    val register = getInstruction<OneRegisterInstruction>(resultIndex).registerA
+            if (!restoreOldSplashAnimationIncluded) {
+                // Don't use the lotte splash screen layout if using custom seekbar.
+                arrayOf(
+                    launchScreenLayoutTypeFingerprint.methodOrThrow(),
+                    onCreateMethod
+                ).forEach { method ->
+                    method.apply {
+                        val literalIndex =
+                            indexOfFirstLiteralInstructionOrThrow(
+                                launchScreenLayoutTypeLotteFeatureFlag
+                            )
+                        val resultIndex =
+                            indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
+                        val register = getInstruction<OneRegisterInstruction>(resultIndex).registerA
 
-                    addInstructions(
-                        resultIndex + 1,
-                        """
+                        addInstructions(
+                            resultIndex + 1,
+                            """
                             invoke-static { v$register }, $EXTENSION_SEEKBAR_COLOR_CLASS_DESCRIPTOR->useLotteLaunchSplashScreen(Z)Z
                             move-result v$register
                             """
-                    )
+                        )
+                    }
                 }
             }
 
@@ -317,7 +327,7 @@ val seekbarComponentsPatch = bytecodePatch(
                 scaleNode.replaceChild(replacementNode, shapeNode)
             }
 
-        if (is_19_25_or_greater) {
+        if (is_19_25_or_greater && !restoreOldSplashAnimationIncluded) {
             // Add attribute and styles for splash screen custom color.
             // Using a style is the only way to selectively change just the seekbar fill color.
             //
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/Fingerprints.kt
index 1447cc97c..838a52ecf 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/Fingerprints.kt
@@ -3,9 +3,14 @@ package app.revanced.patches.youtube.swipe.controls
 import app.revanced.patches.youtube.utils.extension.Constants.EXTENSION_PATH
 import app.revanced.patches.youtube.utils.resourceid.autoNavScrollCancelPadding
 import app.revanced.patches.youtube.utils.resourceid.fullScreenEngagementOverlay
+import app.revanced.util.containsLiteralInstruction
 import app.revanced.util.fingerprint.legacyFingerprint
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
 import app.revanced.util.or
 import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 internal val fullScreenEngagementOverlayFingerprint = legacyFingerprint(
     name = "fullScreenEngagementOverlayFingerprint",
@@ -39,7 +44,7 @@ internal val swipeToSwitchVideoFingerprint = legacyFingerprint(
     literals = listOf(SWIPE_TO_SWITCH_VIDEO_FEATURE_FLAG),
 )
 
-internal const val WATCH_PANEL_GESTURES_FEATURE_FLAG = 45372793L
+internal const val WATCH_PANEL_GESTURES_PRIMARY_FEATURE_FLAG = 45372793L
 
 /**
  * This fingerprint is compatible with YouTube v18.29.38 ~ v19.34.42
@@ -47,10 +52,72 @@ internal const val WATCH_PANEL_GESTURES_FEATURE_FLAG = 45372793L
 internal val watchPanelGesturesFingerprint = legacyFingerprint(
     name = "watchPanelGesturesFingerprint",
     returnType = "V",
-    literals = listOf(WATCH_PANEL_GESTURES_FEATURE_FLAG),
+    literals = listOf(WATCH_PANEL_GESTURES_PRIMARY_FEATURE_FLAG),
 )
 
 internal val watchPanelGesturesAlternativeFingerprint = legacyFingerprint(
     name = "watchPanelGesturesAlternativeFingerprint",
     literals = listOf(autoNavScrollCancelPadding),
+)
+
+internal const val WATCH_PANEL_GESTURES_SECONDARY_FEATURE_FLAG = 45619395L
+
+/**
+ * Watch panel gestures in channel bar
+ * This fingerprint is compatible with YouTube v19.15.36 ~
+ */
+internal val watchPanelGesturesChannelBarFingerprint = legacyFingerprint(
+    name = "watchPanelGesturesChannelBarFingerprint",
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Landroid/view/MotionEvent;"),
+    customFingerprint = { method, _ ->
+        method.definingClass.endsWith("/NextGenWatchLayout;") &&
+                method.name == "onInterceptTouchEvent" &&
+                method.containsLiteralInstruction(WATCH_PANEL_GESTURES_SECONDARY_FEATURE_FLAG)
+    }
+)
+
+/**
+ * fuzzyPatternScanThreshold is required to maintain compatibility with YouTube v18.29.38 ~ v18.32.39.
+ *
+ * TODO: Remove fuzzyPatternScanThreshold if support for YouTube v18.29.38 to v18.32.39 is dropped.
+ */
+internal val playerGestureConfigSyntheticFingerprint = legacyFingerprint(
+    name = "playerGestureConfigSyntheticFingerprint",
+    fuzzyPatternScanThreshold = 5,
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Ljava/lang/Object;"),
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,      // playerGestureConfig.downAndOutLandscapeAllowed
+        Opcode.MOVE_RESULT,
+        Opcode.CHECK_CAST,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,      // playerGestureConfig.downAndOutPortraitAllowed
+        Opcode.MOVE_RESULT,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.RETURN_VOID,
+    ),
+    customFingerprint = { method, classDef ->
+        // This method is always called "a" because this kind of class always has a single method.
+        method.name == "a" &&
+                classDef.methods.count() == 2 &&
+                method.indexOfFirstInstruction {
+                    val reference = getReference<MethodReference>()
+                    reference?.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;" &&
+                            reference.parameterTypes.isEmpty() &&
+                            reference.returnType == "Z"
+                } >= 0
+    },
 )
\ No newline at end of file
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
index 3d404f4b7..af0c104b5 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
@@ -1,6 +1,7 @@
 package app.revanced.patches.youtube.swipe.controls
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
@@ -16,6 +17,7 @@ import app.revanced.patches.youtube.utils.mainactivity.mainActivityResolvePatch
 import app.revanced.patches.youtube.utils.patch.PatchList.SWIPE_CONTROLS
 import app.revanced.patches.youtube.utils.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.utils.playservice.is_19_09_or_greater
+import app.revanced.patches.youtube.utils.playservice.is_19_15_or_greater
 import app.revanced.patches.youtube.utils.playservice.is_19_23_or_greater
 import app.revanced.patches.youtube.utils.playservice.is_19_36_or_greater
 import app.revanced.patches.youtube.utils.playservice.versionCheckPatch
@@ -28,9 +30,11 @@ import app.revanced.patches.youtube.utils.settings.settingsPatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 import app.revanced.util.fingerprint.injectLiteralInstructionBooleanCall
+import app.revanced.util.fingerprint.matchOrThrow
 import app.revanced.util.fingerprint.methodOrThrow
 import app.revanced.util.fingerprint.mutableClassOrThrow
 import app.revanced.util.getReference
+import app.revanced.util.getWalkerMethod
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstLiteralInstruction
 import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
@@ -106,7 +110,7 @@ val swipeControlsPatch = bytecodePatch(
 
         var settingArray = arrayOf(
             "PREFERENCE_SCREEN: SWIPE_CONTROLS",
-            "SETTINGS: DISABLE_WATCH_PANEL_GESTURES"
+            "SETTINGS: DISABLE_SWIPE_TO_ENTER_FULLSCREEN_MODE_BELOW_THE_PLAYER"
         )
 
         // region patch for disable HDR auto brightness
@@ -142,12 +146,12 @@ val swipeControlsPatch = bytecodePatch(
 
         // endregion
 
-        // region patch for disable watch panel gestures
+        // region patch for disable swipe to enter fullscreen mode (below the player)
 
         if (!is_19_36_or_greater) {
             watchPanelGesturesFingerprint.injectLiteralInstructionBooleanCall(
-                WATCH_PANEL_GESTURES_FEATURE_FLAG,
-                "$EXTENSION_SWIPE_CONTROLS_PATCH_CLASS_DESCRIPTOR->disableWatchPanelGestures()Z"
+                WATCH_PANEL_GESTURES_PRIMARY_FEATURE_FLAG,
+                "$EXTENSION_SWIPE_CONTROLS_PATCH_CLASS_DESCRIPTOR->disableSwipeToEnterFullscreenModeBelowThePlayer()Z"
             )
         } else {
             watchPanelGesturesAlternativeFingerprint.methodOrThrow().apply {
@@ -187,7 +191,7 @@ val swipeControlsPatch = bytecodePatch(
 
                 addInstructionsWithLabels(
                     targetIndex, """
-                        invoke-static {}, $EXTENSION_SWIPE_CONTROLS_PATCH_CLASS_DESCRIPTOR->disableWatchPanelGestures()Z
+                        invoke-static {}, $EXTENSION_SWIPE_CONTROLS_PATCH_CLASS_DESCRIPTOR->disableSwipeToEnterFullscreenModeBelowThePlayer()Z
                         move-result v${fieldInstruction.registerA}
                         if-eqz v${fieldInstruction.registerA}, :disable
                         iget-object v${fieldInstruction.registerA}, v${fieldInstruction.registerB}, $fieldReference
@@ -197,6 +201,39 @@ val swipeControlsPatch = bytecodePatch(
             }
         }
 
+        if (is_19_15_or_greater) {
+            watchPanelGesturesChannelBarFingerprint.injectLiteralInstructionBooleanCall(
+                WATCH_PANEL_GESTURES_SECONDARY_FEATURE_FLAG,
+                "$EXTENSION_SWIPE_CONTROLS_PATCH_CLASS_DESCRIPTOR->disableSwipeToEnterFullscreenModeBelowThePlayer()Z"
+            )
+        }
+
+        // endregion
+
+        // region patch for disable swipe to enter fullscreen mode (in the player) and disable swipe to exit fullscreen mode
+
+        playerGestureConfigSyntheticFingerprint.matchOrThrow().let {
+            val endIndex = it.patternMatch!!.endIndex
+
+            mapOf(
+                3 to "disableSwipeToEnterFullscreenModeInThePlayer",
+                9 to "disableSwipeToExitFullscreenMode"
+            ).forEach { (offSet, methodName) ->
+                it.getWalkerMethod(endIndex - offSet).apply {
+                    val index = implementation!!.instructions.lastIndex
+                    val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                    addInstructions(
+                        index,
+                        """
+                            invoke-static {v$register}, $EXTENSION_SWIPE_CONTROLS_PATCH_CLASS_DESCRIPTOR->$methodName(Z)Z
+                            move-result v$register
+                            """
+                    )
+                }
+            }
+        }
+
         // endregion
 
         // region copy resources
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/extension/SharedExtensionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/extension/SharedExtensionPatch.kt
index bab6ee3da..263d4fb8c 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/extension/SharedExtensionPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/extension/SharedExtensionPatch.kt
@@ -2,8 +2,10 @@ package app.revanced.patches.youtube.utils.extension
 
 import app.revanced.patches.shared.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.utils.extension.hooks.applicationInitHook
+import app.revanced.patches.youtube.utils.extension.hooks.mainActivityBaseContextHook
 
 // TODO: Move this to a "Hook.kt" file. Same for other extension hook patches.
 val sharedExtensionPatch = sharedExtensionPatch(
     applicationInitHook,
+    mainActivityBaseContextHook,
 )
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/extension/hooks/MainActivityBaseContextHook.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/extension/hooks/MainActivityBaseContextHook.kt
new file mode 100644
index 000000000..1f17ed305
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/extension/hooks/MainActivityBaseContextHook.kt
@@ -0,0 +1,36 @@
+package app.revanced.patches.youtube.utils.extension.hooks
+
+import app.revanced.patches.shared.extension.extensionHook
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+private var attachBaseContextIndex = -1
+
+internal val mainActivityBaseContextHook = extensionHook(
+    insertIndexResolver = { method ->
+        attachBaseContextIndex = method.indexOfFirstInstructionOrThrow {
+            getReference<MethodReference>()?.name == "attachBaseContext"
+        }
+
+        attachBaseContextIndex + 1
+    },
+    contextRegisterResolver = { method ->
+        val overrideInstruction =
+            method.implementation!!.instructions.elementAt(attachBaseContextIndex)
+                    as FiveRegisterInstruction
+        "v${overrideInstruction.registerD}"
+    },
+) {
+    returns("V")
+    parameters("Landroid/content/Context;")
+    custom { method, classDef ->
+        method.name == "attachBaseContext" &&
+                (
+                        classDef.endsWith("/MainActivity;") ||
+                                // Old versions of YouTube called this class "WatchWhileActivity" instead.
+                                classDef.endsWith("/WatchWhileActivity;")
+                        )
+    }
+}
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fix/streamingdata/SpoofStreamingDataPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
index c82bbb612..a2ba66890 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fix/streamingdata/SpoofStreamingDataPatch.kt
@@ -1,7 +1,5 @@
 package app.revanced.patches.youtube.utils.fix.streamingdata
 
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patches.shared.extension.Constants.PATCHES_PATH
 import app.revanced.patches.shared.spoof.streamingdata.baseSpoofStreamingDataPatch
 import app.revanced.patches.shared.spoof.useragent.baseSpoofUserAgentPatch
 import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
@@ -9,7 +7,6 @@ import app.revanced.patches.youtube.utils.compatibility.Constants.YOUTUBE_PACKAG
 import app.revanced.patches.youtube.utils.patch.PatchList.SPOOF_STREAMING_DATA
 import app.revanced.patches.youtube.utils.settings.ResourceUtils.addPreference
 import app.revanced.patches.youtube.utils.settings.settingsPatch
-import app.revanced.util.findMethodOrThrow
 
 val spoofStreamingDataPatch = baseSpoofStreamingDataPatch(
     {
@@ -21,13 +18,6 @@ val spoofStreamingDataPatch = baseSpoofStreamingDataPatch(
         )
     },
     {
-        findMethodOrThrow("$PATCHES_PATH/PatchStatus;") {
-            name == "SpoofStreamingDataAndroidOnlyDefaultBoolean"
-        }.replaceInstruction(
-            0,
-            "const/4 v0, 0x1"
-        )
-
         addPreference(
             arrayOf(
                 "SETTINGS: SPOOF_STREAMING_DATA"
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fullscreen/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fullscreen/Fingerprints.kt
new file mode 100644
index 000000000..17f94470f
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fullscreen/Fingerprints.kt
@@ -0,0 +1,35 @@
+package app.revanced.patches.youtube.utils.fullscreen
+
+import app.revanced.util.containsLiteralInstruction
+import app.revanced.util.fingerprint.legacyFingerprint
+import app.revanced.util.or
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+private const val NEXT_GEN_WATCH_LAYOUT_CLASS_DESCRIPTOR =
+    "Lcom/google/android/apps/youtube/app/watch/nextgenwatch/ui/NextGenWatchLayout;"
+
+internal val nextGenWatchLayoutConstructorFingerprint = legacyFingerprint(
+    name = "nextGenWatchLayoutConstructorFingerprint",
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    parameters = listOf("Landroid/content/Context;", "Landroid/util/AttributeSet;", "I"),
+    opcodes = listOf(Opcode.CHECK_CAST),
+    customFingerprint = { method, _ ->
+        method.definingClass == NEXT_GEN_WATCH_LAYOUT_CLASS_DESCRIPTOR
+    },
+)
+
+internal val nextGenWatchLayoutFullscreenModeFingerprint = legacyFingerprint(
+    name = "nextGenWatchLayoutFullscreenModeFingerprint",
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("I"),
+    opcodes = listOf(Opcode.INVOKE_DIRECT),
+    customFingerprint = { method, _ ->
+        method.definingClass == NEXT_GEN_WATCH_LAYOUT_CLASS_DESCRIPTOR &&
+                method.containsLiteralInstruction(32)
+    },
+)
+
+
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fullscreen/FullscreenButtonHookPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fullscreen/FullscreenButtonHookPatch.kt
new file mode 100644
index 000000000..489b38a11
--- /dev/null
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/fullscreen/FullscreenButtonHookPatch.kt
@@ -0,0 +1,139 @@
+package app.revanced.patches.youtube.utils.fullscreen
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.youtube.utils.extension.Constants.EXTENSION_PATH
+import app.revanced.patches.youtube.utils.extension.sharedExtensionPatch
+import app.revanced.util.addStaticFieldToExtension
+import app.revanced.util.findMethodOrThrow
+import app.revanced.util.fingerprint.methodOrThrow
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference
+
+private const val EXTENSION_VIDEO_UTILS_CLASS_DESCRIPTOR =
+    "$EXTENSION_PATH/utils/VideoUtils;"
+
+internal lateinit var enterFullscreenMethod: MutableMethod
+
+val fullscreenButtonHookPatch = bytecodePatch(
+    description = "fullscreenButtonHookPatch"
+) {
+
+    dependsOn(sharedExtensionPatch)
+
+    execute {
+        val (referenceClass, fullscreenActionClass) = with(
+            nextGenWatchLayoutFullscreenModeFingerprint.methodOrThrow()
+        ) {
+            val targetIndex = indexOfFirstInstructionReversedOrThrow {
+                opcode == Opcode.INVOKE_DIRECT &&
+                        getReference<MethodReference>()?.parameterTypes?.size == 2
+            }
+            val targetReference =
+                getInstruction<ReferenceInstruction>(targetIndex).reference as MethodReference
+
+            Pair(targetReference.definingClass, targetReference.parameterTypes[1].toString())
+        }
+
+        val (enterFullscreenReference, exitFullscreenReference, opcodeName) =
+            with(findMethodOrThrow(referenceClass) { parameters == listOf("I") }) {
+                val enterFullscreenIndex = indexOfFirstInstructionOrThrow {
+                    val reference = getReference<MethodReference>()
+                    reference?.returnType == "V" &&
+                            reference.definingClass == fullscreenActionClass &&
+                            reference.parameterTypes.size == 0
+                }
+                val exitFullscreenIndex = indexOfFirstInstructionReversedOrThrow {
+                    val reference = getReference<MethodReference>()
+                    reference?.returnType == "V" &&
+                            reference.definingClass == fullscreenActionClass &&
+                            reference.parameterTypes.size == 0
+                }
+
+                val enterFullscreenReference =
+                    getInstruction<ReferenceInstruction>(enterFullscreenIndex).reference
+                val exitFullscreenReference =
+                    getInstruction<ReferenceInstruction>(exitFullscreenIndex).reference
+                val opcode = getInstruction(enterFullscreenIndex).opcode
+
+                val enterFullscreenClass =
+                    (enterFullscreenReference as MethodReference).definingClass
+
+                enterFullscreenMethod = if (opcode == Opcode.INVOKE_INTERFACE) {
+                    classes.find { classDef -> classDef.interfaces.contains(enterFullscreenClass) }
+                        ?.let { classDef ->
+                            proxy(classDef)
+                                .mutableClass
+                                .methods
+                                .find { method -> method.name == enterFullscreenReference.name }
+                        } ?: throw PatchException("No matching classes: $enterFullscreenClass")
+                } else {
+                    findMethodOrThrow(enterFullscreenClass) {
+                        name == enterFullscreenReference.name
+                    }
+                }
+
+                Triple(
+                    enterFullscreenReference,
+                    exitFullscreenReference,
+                    opcode.name
+                )
+            }
+
+        nextGenWatchLayoutConstructorFingerprint.methodOrThrow().apply {
+            val targetIndex = indexOfFirstInstructionReversedOrThrow {
+                opcode == Opcode.CHECK_CAST &&
+                        getReference<TypeReference>()?.type == fullscreenActionClass
+            }
+            val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+
+            addInstruction(
+                targetIndex + 1,
+                "sput-object v$targetRegister, $EXTENSION_VIDEO_UTILS_CLASS_DESCRIPTOR->fullscreenActionClass:$fullscreenActionClass"
+            )
+
+            val enterFullscreenModeSmaliInstructions =
+                """
+                    if-eqz v0, :ignore
+                    $opcodeName {v0}, $enterFullscreenReference
+                    :ignore
+                    return-void
+                    """
+
+            val exitFullscreenModeSmaliInstructions =
+                """
+                    if-eqz v0, :ignore
+                    $opcodeName {v0}, $exitFullscreenReference
+                    :ignore
+                    return-void
+                    """
+
+            addStaticFieldToExtension(
+                EXTENSION_VIDEO_UTILS_CLASS_DESCRIPTOR,
+                "enterFullscreenMode",
+                "fullscreenActionClass",
+                fullscreenActionClass,
+                enterFullscreenModeSmaliInstructions,
+                false
+            )
+
+            addStaticFieldToExtension(
+                EXTENSION_VIDEO_UTILS_CLASS_DESCRIPTOR,
+                "exitFullscreenMode",
+                "fullscreenActionClass",
+                fullscreenActionClass,
+                exitFullscreenModeSmaliInstructions,
+                false
+            )
+        }
+    }
+}
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/patch/PatchList.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/patch/PatchList.kt
index 5ebdc1893..2e944d1ba 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/patch/PatchList.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/patch/PatchList.kt
@@ -23,7 +23,7 @@ internal enum class PatchList(
     ),
     CHANGE_SHARE_SHEET(
         "Change share sheet",
-        "Add option to change from in-app share sheet to system share sheet."
+        "Adds an option to change the in-app share sheet to the system share sheet."
     ),
     CHANGE_START_PAGE(
         "Change start page",
@@ -147,7 +147,7 @@ internal enum class PatchList(
     ),
     HIDE_SHORTCUTS(
         "Hide shortcuts",
-        "Remove, at compile time, the app shortcuts that appears when app icon is long pressed."
+        "Remove, at compile time, the app shortcuts that appears when the app icon is long pressed."
     ),
     HOOK_YOUTUBE_MUSIC_ACTIONS(
         "Hook YouTube Music actions",
@@ -235,7 +235,7 @@ internal enum class PatchList(
     ),
     TOOLBAR_COMPONENTS(
         "Toolbar components",
-        "Adds options to hide or change components located on the toolbar, such as toolbar buttons, search bar, and header."
+        "Adds options to hide or change components located on the toolbar, such as the search bar, header, and toolbar buttons."
     ),
     TRANSLATIONS_FOR_YOUTUBE(
         "Translations for YouTube",
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt
index 8a648f0f4..e0e54f204 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt
@@ -9,8 +9,11 @@ import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.utils.extension.Constants.UTILS_PATH
 import app.revanced.patches.youtube.utils.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.utils.fullscreen.enterFullscreenMethod
+import app.revanced.patches.youtube.utils.fullscreen.fullscreenButtonHookPatch
 import app.revanced.patches.youtube.utils.playerButtonsResourcesFingerprint
 import app.revanced.patches.youtube.utils.playerButtonsVisibilityFingerprint
+import app.revanced.patches.youtube.utils.playservice.is_19_23_or_greater
 import app.revanced.patches.youtube.utils.playservice.is_19_25_or_greater
 import app.revanced.patches.youtube.utils.playservice.versionCheckPatch
 import app.revanced.patches.youtube.utils.resourceid.sharedResourceIdPatch
@@ -46,6 +49,7 @@ private val playerControlsBytecodePatch = bytecodePatch(
         sharedExtensionPatch,
         sharedResourceIdPatch,
         versionCheckPatch,
+        fullscreenButtonHookPatch,
     )
 
     execute {
@@ -114,6 +118,18 @@ private val playerControlsBytecodePatch = bytecodePatch(
 
         // endregion
 
+        // region patch for fix buttons do not hide immediately when fullscreen button is clicked
+
+        // Reproduced only in RVX
+        if (is_19_23_or_greater) {
+            enterFullscreenMethod.addInstruction(
+                0,
+                "invoke-static {}, $EXTENSION_PLAYER_CONTROLS_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediately()V"
+            )
+        }
+
+        // endregion
+
         // region patch initialize of overlay button or SponsorBlock button
 
         mapOf(
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
index 13e59bb69..caa5ebb0c 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
@@ -54,9 +54,9 @@ private val settingsBytecodePatch = bytecodePatch(
 
             addInstructions(
                 index + 1, """
-                invoke-static {v$register}, $EXTENSION_THEME_METHOD_DESCRIPTOR
-                return-object v$register
-                """
+                    invoke-static {v$register}, $EXTENSION_THEME_METHOD_DESCRIPTOR
+                    return-object v$register
+                    """
             )
             removeInstruction(index)
         }
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt
index ccebc248a..895d7b505 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt
@@ -173,7 +173,7 @@ val videoPlaybackPatch = bytecodePatch(
         }
 
         hookBackgroundPlayVideoInformation("$EXTENSION_PLAYBACK_SPEED_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JZ)V")
-        hookPlayerResponseVideoId("$EXTENSION_PLAYBACK_SPEED_CLASS_DESCRIPTOR->fetchPlaylistData(Ljava/lang/String;Z)V")
+        hookPlayerResponseVideoId("$EXTENSION_PLAYBACK_SPEED_CLASS_DESCRIPTOR->fetchMusicRequest(Ljava/lang/String;Z)V")
 
         updatePatchStatus(PATCH_STATUS_CLASS_DESCRIPTOR, "RememberPlaybackSpeed")
 
diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
index 901ef8d7a..ae9c22223 100644
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
@@ -70,7 +70,7 @@ val playerResponseMethodHookPatch = bytecodePatch(
                 """
                     invoke-static {$registerVideoId, $registerPlayerParameter, $registerPlaylistId, $registerIsShortAndOpeningOrPlaying}, $hook
                     move-result-object $registerPlayerParameter
-            """,
+                    """,
             )
             numberOfInstructionsAdded += 2
         }
diff --git a/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt b/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
index 9f9c0989d..cd58c6e34 100644
--- a/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
+++ b/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
@@ -263,6 +263,34 @@ fun MutableMethod.injectLiteralInstructionViewCall(
     )
 }
 
+fun BytecodePatchContext.replaceLiteralInstructionCall(
+    originalLiteral: Long,
+    replaceLiteral: Long
+) {
+    classes.forEach { classDef ->
+        classDef.methods.forEach { method ->
+            method.implementation.apply {
+                this?.instructions?.forEachIndexed { _, instruction ->
+                    if (instruction.opcode != Opcode.CONST)
+                        return@forEachIndexed
+                    if ((instruction as Instruction31i).wideLiteral != originalLiteral)
+                        return@forEachIndexed
+
+                    proxy(classDef)
+                        .mutableClass
+                        .findMutableMethodOf(method).apply {
+                            val index = indexOfFirstLiteralInstructionOrThrow(originalLiteral)
+                            val register =
+                                (instruction as OneRegisterInstruction).registerA
+
+                            replaceInstruction(index, "const v$register, $replaceLiteral")
+                        }
+                }
+            }
+        }
+    }
+}
+
 fun BytecodePatchContext.replaceLiteralInstructionCall(
     literal: Long,
     smaliInstruction: String
diff --git a/patches/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/patches/src/main/kotlin/app/revanced/util/ResourceUtils.kt
index 89be81890..9f172b065 100644
--- a/patches/src/main/kotlin/app/revanced/util/ResourceUtils.kt
+++ b/patches/src/main/kotlin/app/revanced/util/ResourceUtils.kt
@@ -20,6 +20,10 @@ private val classLoader = object {}.javaClass.classLoader
 fun Patch<*>.getStringOptionValue(key: String) =
     options[key] as Option<String>
 
+@Suppress("UNCHECKED_CAST")
+fun Patch<*>.getBooleanOptionValue(key: String) =
+    options[key] as Option<Boolean>
+
 fun Option<String>.valueOrThrow() = value
     ?: throw PatchException("Invalid patch option: $title.")
 
diff --git a/patches/src/main/kotlin/app/revanced/util/fingerprint/LegacyFingerprint.kt b/patches/src/main/kotlin/app/revanced/util/fingerprint/LegacyFingerprint.kt
index ef7e9dbcb..36dc8bdb2 100644
--- a/patches/src/main/kotlin/app/revanced/util/fingerprint/LegacyFingerprint.kt
+++ b/patches/src/main/kotlin/app/revanced/util/fingerprint/LegacyFingerprint.kt
@@ -134,16 +134,17 @@ fun Pair<String, Fingerprint>.injectLiteralInstructionViewCall(
 
 internal fun legacyFingerprint(
     name: String,
+    fuzzyPatternScanThreshold: Int = 0,
     accessFlags: Int? = null,
     returnType: String? = null,
     parameters: List<String>? = null,
     opcodes: List<Opcode?>? = null,
     strings: List<String>? = null,
     literals: List<Long>? = null,
-    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null
+    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
 ) = Pair(
     name,
-    fingerprint {
+    fingerprint(fuzzyPatternScanThreshold = fuzzyPatternScanThreshold) {
         if (accessFlags != null) {
             accessFlags(accessFlags)
         }
diff --git a/patches/src/main/resources/music/settings/host/values/arrays.xml b/patches/src/main/resources/music/settings/host/values/arrays.xml
index 81986ed4c..c1adaccde 100644
--- a/patches/src/main/resources/music/settings/host/values/arrays.xml
+++ b/patches/src/main/resources/music/settings/host/values/arrays.xml
@@ -14,6 +14,16 @@
         <item>FEmusic_library_landing</item>
         <item>FEmusic_library_corpus_artists</item>
     </string-array>
+    <string-array name="revanced_disable_music_video_in_album_redirect_type_entries">
+        <item>@string/revanced_disable_music_video_in_album_redirect_type_entry_redirect</item>
+        <item>@string/revanced_disable_music_video_in_album_redirect_type_entry_on_click</item>
+        <item>@string/revanced_disable_music_video_in_album_redirect_type_entry_on_long_click</item>
+    </string-array>
+    <string-array name="revanced_disable_music_video_in_album_redirect_type_entry_values">
+        <item>REDIRECT</item>
+        <item>ON_CLICK</item>
+        <item>ON_LONG_CLICK</item>
+    </string-array>
     <string-array name="revanced_extended_settings_import_export_entries">
         <item>@string/revanced_extended_settings_export_as_file</item>
         <item>@string/revanced_extended_settings_import_as_file</item>
@@ -67,12 +77,10 @@
     </string-array>
     <string-array name="revanced_spoof_streaming_data_type_entries">
         <item>@string/revanced_spoof_streaming_data_type_entry_android_vr</item>
-        <item>@string/revanced_spoof_streaming_data_type_entry_ios</item>
-        <item>@string/revanced_spoof_streaming_data_type_entry_ios_music</item>
+        <item>@string/revanced_spoof_streaming_data_type_entry_android_music</item>
     </string-array>
     <string-array name="revanced_spoof_streaming_data_type_entry_values">
         <item>ANDROID_VR</item>
-        <item>IOS</item>
-        <item>IOS_MUSIC</item>
+        <item>ANDROID_MUSIC</item>
     </string-array>
 </resources>
diff --git a/patches/src/main/resources/music/settings/host/values/strings.xml b/patches/src/main/resources/music/settings/host/values/strings.xml
index d04d6e15b..c3479c6a5 100644
--- a/patches/src/main/resources/music/settings/host/values/strings.xml
+++ b/patches/src/main/resources/music/settings/host/values/strings.xml
@@ -420,6 +420,17 @@ Click to see how to issue a API key."</string>
     <string name="revanced_disable_cairo_splash_animation_summary">Disables Cairo splash animation when the app starts up.</string>
     <string name="revanced_disable_drc_audio_title">Disable DRC audio</string>
     <string name="revanced_disable_drc_audio_summary">Disables DRC (Dynamic Range Compression) applied to audio.</string>
+    <string name="revanced_disable_music_video_in_album_title">Disable music video in album</string>
+    <string name="revanced_disable_music_video_in_album_summary">"When a non-premium user plays a song included in an album, the music video is sometimes played instead of the official song.
+
+Find the official song if a music video is detected playing from an album.
+
+• Powered by Piped Instance API."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Redirection type</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Specifies how to redirect to official song.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Redirect</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Tap Audio / Video toggle</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Tap and hold Audio / Video toggle</string>
     <string name="revanced_enable_debug_logging_title">Enable debug logging</string>
     <string name="revanced_enable_debug_logging_summary">Prints the debug log.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Enable debug buffer logging</string>
@@ -451,11 +462,11 @@ Tap the continue button and allow optimization changes."</string>
     <string name="revanced_spoof_client_title">Spoof client</string>
     <string name="revanced_spoof_client_summary">"Spoof the client to prevent playback issues.
 
-※ When used with 'Spoofing streaming data', playback issues may occur."</string>
+• When used with 'Spoofing streaming data', playback issues may occur."</string>
     <string name="revanced_spoof_client_type_title">Default client</string>
-    <string name="revanced_spoof_client_type_summary">"Defines a default client to spoofing.
+    <string name="revanced_spoof_client_type_summary">"Defines a default client for spoofing.
 
-※ When using the Android client, it is recommended to use it with 'Spoof app version'."</string>
+• When using the Android client, it is recommended to also use 'Spoof app version'."</string>
     <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
     <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
     <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
@@ -463,15 +474,13 @@ Tap the continue button and allow optimization changes."</string>
     <string name="revanced_spoof_streaming_data_title">Spoof streaming data</string>
     <string name="revanced_spoof_streaming_data_summary">"Spoof the streaming data to prevent playback issues.
 
-※ When used with 'Spoof client', playback issues may occur."</string>
+• When used with 'Spoof client', playback issues may occur."</string>
     <string name="revanced_spoof_streaming_data_type_title">Default client</string>
     <string name="revanced_spoof_streaming_data_type_summary">Defines a default client that fetches streaming data.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Show in Stats for nerds</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Shows the client used to fetch streaming data in Stats for nerds.</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
 
     <string name="revanced_sanitize_sharing_links_title">Sanitize sharing links</string>
     <string name="revanced_sanitize_sharing_links_summary">Removes tracking query parameters from URLs when sharing links.</string>
diff --git a/patches/src/main/resources/music/theme/drawable/revanced_header_gradient.xml b/patches/src/main/resources/music/theme/drawable/revanced_header_gradient.xml
new file mode 100644
index 000000000..f024c86f5
--- /dev/null
+++ b/patches/src/main/resources/music/theme/drawable/revanced_header_gradient.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:startColor="@android:color/transparent" android:centerColor="@android:color/transparent" android:endColor="@color/yt_black1" android:type="linear" android:angle="270.0" />
+</shape>
\ No newline at end of file
diff --git a/patches/src/main/resources/music/translations/el-rGR/strings.xml b/patches/src/main/resources/music/translations/el-rGR/strings.xml
index e332009ef..28a5a435f 100644
--- a/patches/src/main/resources/music/translations/el-rGR/strings.xml
+++ b/patches/src/main/resources/music/translations/el-rGR/strings.xml
@@ -375,6 +375,17 @@
     <string name="revanced_disable_cairo_splash_animation_summary">Απενεργοποίηση των εφέ θέματος Cairo κατά την εκκίνηση της εφαρμογής.</string>
     <string name="revanced_disable_drc_audio_title">Απενεργοποίηση ήχου DRC</string>
     <string name="revanced_disable_drc_audio_summary">Απενεργοποίηση του DRC (Συμπίεση Δυναμικού Εύρους) που εφαρμόζεται στον ήχο.</string>
+    <string name="revanced_disable_music_video_in_album_title">Απενεργοποίηση μουσικών βίντεο στα άλμπουμ</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Όταν ένας μη-premium χρήστης παίζει ένα τραγούδι που περιλαμβάνεται σε ένα άλμπουμ, μερικές φορές αναπαράγεται το μουσικό βίντεο αντί για το επίσημο τραγούδι.
+
+Αν ανιχνεύεται αναπαραγωγή ενός μουσικού βίντεο που περιλαμβάνεται σε άλμπουμ, ανακατευθύνεται στο επίσημο τραγούδι.
+
+• Χρησιμοποιείται το Piped Instance API."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Τύπος ανακατεύθυνσης</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Καθορισμός του τρόπου ανακατεύθυνσης στο επίσημο τραγούδι.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Ανακατεύθυνση</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Πάτημα εναλλαγής ήχου / βίντεο</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Παρατεταμένο πάτημα εναλλαγής ήχου / βίντεο</string>
     <string name="revanced_enable_debug_logging_title">Ενεργοποίηση καταγραφής σφαλμάτων</string>
     <string name="revanced_enable_debug_logging_summary">Εκτύπωση του αρχείου καταγραφής σφαλμάτων.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Συμπερίληψη του buffer στην καταγραφή</string>
@@ -406,7 +417,7 @@
     <string name="revanced_spoof_client_type_title">Προεπιλεγμένο πρόγραμμα πελάτη</string>
     <string name="revanced_spoof_client_type_summary">"Καθορισμός ενός προεπιλεγμένου πρόγραμμα πελάτη για παραποίηση.
 
-※ Όταν ορίζεται πρόγραμμα πελάτη τύπου Android, συνιστάται να το χρησιμοποιήσετε μαζί με την λειτουργία «Παραποίηση έκδοσης εφαρμογής»."</string>
+※ Όταν ορίζεται πρόγραμμα πελάτη Android, συνιστάται να το χρησιμοποιήσετε μαζί με την λειτουργία «Παραποίηση έκδοσης εφαρμογής»."</string>
     <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
     <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
     <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
@@ -418,10 +429,8 @@
     <string name="revanced_spoof_streaming_data_type_summary">Καθορισμός ενός προεπιλεγμένου προγράμματος-πελάτη για την λήψη δεδομένων ροής.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Εμφάνιση στο «Στατιστικά για σπασίκλες»</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Εμφάνιση του προγράμματος πελάτη που χρησιμοποιείται για τη λήψη δεδομένων ροής στο μενού «Στατιστικά για σπασίκλες».</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Καθαρισμός συνδέσμων κοινοποίησης</string>
     <string name="revanced_sanitize_sharing_links_summary">Αφαίρεση των παραμέτρων παρακολούθησης από τις διευθύνσεις URL κατά την κοινοποίηση συνδέσμων.</string>
     <string name="revanced_default_app_settings_title">Άνοιγμα ρυθμίσεων προεπιλεγμένων εφαρμογών</string>
diff --git a/patches/src/main/resources/music/translations/es-rES/strings.xml b/patches/src/main/resources/music/translations/es-rES/strings.xml
index dbc4586da..a6d0ee1c7 100644
--- a/patches/src/main/resources/music/translations/es-rES/strings.xml
+++ b/patches/src/main/resources/music/translations/es-rES/strings.xml
@@ -68,7 +68,7 @@ Descarga %2$s desde el sitio web."</string>
     <string name="revanced_enable_compact_dialog_summary">"Activa el diálogo compacto en el teléfono.
 
 Problemas conocidos:
-- La carátula del álbum en la estantería de la biblioteca también se hace más pequeña.
+- Las carátulas de los álbumes en la página de biblioteca se hacen pequeñas cuando se organizan por cuadrícula.
 - El diseño del temporizador puede parecer inusual."</string>
     <string name="revanced_enable_trim_silence_title">Añadir interruptor para recortar silencios</string>
     <string name="revanced_enable_trim_silence_summary">"Añade un interruptor para recortar silencios en el menú desplegable de velocidad de reproducción.
@@ -89,6 +89,7 @@ Esta función aún está en desarrollo, por lo que puede ser inestable."</string
     <string name="revanced_hide_flyout_menu_go_to_episode_title">Ocultar menú de ir a episodios</string>
     <string name="revanced_hide_flyout_menu_go_to_podcast_title">Ocultar menú de ir al podcast</string>
     <string name="revanced_hide_flyout_menu_help_title">Ocultar menú Ayuda &amp; Comentarios</string>
+    <string name="revanced_hide_flyout_menu_pin_to_speed_dial_title">Ocultar el pin al menú de marcación rápida</string>
     <string name="revanced_hide_flyout_menu_play_next_title">Ocultar menú de reproducción siguiente</string>
     <string name="revanced_hide_flyout_menu_quality_title">Ocultar menú de calidad</string>
     <string name="revanced_hide_flyout_menu_remove_from_library_title">Ocultar menú de eliminar de la biblioteca</string>
@@ -103,6 +104,7 @@ Esta función aún está en desarrollo, por lo que puede ser inestable."</string
     <string name="revanced_hide_flyout_menu_start_radio_title">Ocultar menú de Iniciar radio</string>
     <string name="revanced_hide_flyout_menu_stats_for_nerds_title">Ocultar menú Estadísticas para Nerds</string>
     <string name="revanced_hide_flyout_menu_subscribe_title">Ocultar menú Suscribirse / Desuscribirse</string>
+    <string name="revanced_hide_flyout_menu_unpin_from_speed_dial_title">Ocultar Desfijar del menú de marcación rápida</string>
     <string name="revanced_hide_flyout_menu_view_song_credit_title">Ocultar menú de vista de créditos de canción</string>
     <string name="revanced_replace_flyout_menu_dismiss_queue_continue_watch_title">Continuar viendo</string>
     <string name="revanced_replace_flyout_menu_dismiss_queue_continue_watch_summary">Continúa el vídeo desde el tiempo actual cuando se cambia a YouTube.</string>
@@ -368,6 +370,19 @@ Toca para ver cómo crear una clave de API."</string>
     <string name="revanced_change_share_sheet_summary">Cambia la hoja de compartir en la app a la hoja de compartir del sistema.</string>
     <string name="revanced_disable_cairo_splash_animation_title">Desactiva la animación Cairo</string>
     <string name="revanced_disable_cairo_splash_animation_summary">Deshabilita la animación de bienvenida \"Cairo\" cuando se inicia la aplicación.</string>
+    <string name="revanced_disable_drc_audio_title">Desactivar audio DRC</string>
+    <string name="revanced_disable_drc_audio_summary">Deshabilita DRC (Dynamic Range Compression) aplicado al audio.</string>
+    <string name="revanced_disable_music_video_in_album_title">Desactivar vídeo de música en el álbum</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Cuando un usuario no premium escoge una canción incluida en un álbum, un vídeo musical a veces se muestra en lugar de la canción original.
+
+Si este video se detecta durante la reproducción, será redireccionado a la canción original.
+
+Se usa una instancia redireccionada, pero la API puede no estar disponible en algunas regiones."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Tipo de redirección</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Especifica cómo redirigir a la canción oficial.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Redirigir</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Interruptor de Audio / Video</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Mantén pulsado el interruptor de Audio / Video</string>
     <string name="revanced_enable_debug_logging_title">Activar registro de depuración</string>
     <string name="revanced_enable_debug_logging_summary">Imprime el registro de depuración.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Incluir búfer en registro de depuración</string>
@@ -395,6 +410,23 @@ Limitaciones:
 • Código de audio OPUS puede no ser compatible.
 • La miniatura de la barra de Seekbar puede no estar presente.
 • El historial de la vista no funciona con una cuenta de marca."</string>
+    <string name="revanced_spoof_client_type_title">Cliente por defecto</string>
+    <string name="revanced_spoof_client_type_summary">"Define un cliente predeterminado a falsear.
+
+※ Al usar el cliente Android, se recomienda usarlo con 'Versión de aplicación Spoof'."</string>
+    <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
+    <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
+    <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
+    <string name="revanced_spoof_streaming_data_title">Falsificar datos de transmisión</string>
+    <string name="revanced_spoof_streaming_data_summary">"Falsificar los datos de streaming para evitar problemas de reproducción.
+
+※ Cuando se utiliza con 'Cliente de spoof', problemas de reproducción pueden producirse."</string>
+    <string name="revanced_spoof_streaming_data_type_title">Cliente por defecto</string>
+    <string name="revanced_spoof_streaming_data_type_summary">Define un cliente por defecto que obtiene datos de streaming.</string>
+    <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostrar en estadísticas para nerds</string>
+    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Muestra el cliente utilizado para obtener datos de streaming en Estadísticas para nerds.</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Desinfectar enlaces compartidos</string>
     <string name="revanced_sanitize_sharing_links_summary">Elimina los parámetros de consulta de seguimiento de las URL al compartir enlaces.</string>
     <string name="revanced_default_app_settings_title">Abrir ajustes predeterminados de la app</string>
diff --git a/patches/src/main/resources/music/translations/hu-rHU/strings.xml b/patches/src/main/resources/music/translations/hu-rHU/strings.xml
index ccac0dbb1..87bd26fb0 100644
--- a/patches/src/main/resources/music/translations/hu-rHU/strings.xml
+++ b/patches/src/main/resources/music/translations/hu-rHU/strings.xml
@@ -275,7 +275,7 @@ Előfordulhat, hogy egyes funkciók nem működnek megfelelően a régi lejátsz
     <string name="revanced_ryd_dislike_percentage_summary">A nem tetszések százalékos arányát jeleníti meg a nem tetszések száma helyett.</string>
     <string name="revanced_ryd_compact_layout_title">Kompakt kedvelés gomb</string>
     <string name="revanced_ryd_compact_layout_summary">Elrejti a kedvelés gomb elválasztóját.</string>
-    <string name="revanced_ryd_estimated_like_title">Mutassa a becsült kedveléseket</string>
+    <string name="revanced_ryd_estimated_like_title">Becsült kedvelések megjelenítése</string>
     <string name="revanced_ryd_estimated_like_summary">Megjeleníti a becsült kedvelések számát a videóknál.</string>
     <string name="revanced_ryd_toast_on_connection_error_title">Köszöntő megjelenítése, ha az API nem elérhető</string>
     <string name="revanced_ryd_toast_on_connection_error_summary">Megjelenik egy üzenet, ha a YouTube nem tetszések visszaállítása API nem érhető el.</string>
@@ -372,6 +372,12 @@ Kattints ide az API-kulcs megszerzéséhez."</string>
     <string name="revanced_disable_cairo_splash_animation_summary">Letiltja a betöltési animációt amikor az app indul.</string>
     <string name="revanced_disable_drc_audio_title">DRC hang letiltása</string>
     <string name="revanced_disable_drc_audio_summary">Letiltja a hangra alkalmazott DRC-t (dinamikatartomány-kompresszió).</string>
+    <string name="revanced_disable_music_video_in_album_title">Zenei videó letiltása az albumban</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Amikor egy nem prémium felhasználó lejátszik egy albumban szereplő dalt, néha a hivatalos dal helyett a klip kerül lejátszásra.
+
+Ha egy albumban szereplő zenei videó lejátszását észleli, a rendszer a hivatalos dalra irányítja át.
+
+Piped instance használatban van, és előfordulhat, hogy az API egyes régiókban nem elérhető."</string>
     <string name="revanced_enable_debug_logging_title">Hibanaplók engedélyezése</string>
     <string name="revanced_enable_debug_logging_summary">Kiírja a hibanaplót.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Hibakeresési puffer naplózásának engedélyezése</string>
@@ -399,28 +405,26 @@ A GmsCore akkumulátor-optimalizálás letiltása nem fogyasztja jobban az akkum
 Nyomj a folytatás gombra, és engedélyezd az optimalizálási módosításokat."</string>
     <string name="gms_core_dialog_continue_text">Folytatás</string>
     <string name="revanced_spoof_client_title">Kliens hamisítása</string>
-    <string name="revanced_spoof_client_summary">"A kliens hamisítása a lejátszási problémák elkerülése érdekében.
+    <string name="revanced_spoof_client_summary">"Az kliens meghamisítása a lejátszási problémák megelőzése érdekében.
 
-※ Az 'Adatfolyam meghamisítása' használata esetén lejátszási problémák léphetnek fel."</string>
+• Az 'Adatfolyam meghamisítása' funkcióval együtt használva lejátszási problémák léphetnek fel."</string>
     <string name="revanced_spoof_client_type_title">Alapértelmezett kliens</string>
     <string name="revanced_spoof_client_type_summary">"Meghatározza az alapértelmezett klienst a hamisításhoz.
 
-※ Az Android kliens használata esetén ajánlott a 'Alkalmazás verziójának meghamisítása' használni."</string>
+• Az Android kliens használata esetén ajánlott a 'Alkalmazás verziójának meghamisítása' használni."</string>
     <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
     <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
     <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
     <string name="revanced_spoof_streaming_data_title">Adatfolyam meghamisítása</string>
     <string name="revanced_spoof_streaming_data_summary">"A lejátszási problémák megelőzése érdekében hamisítja a streaming-adatokat.
 
-※ A 'Kliens hamisítása' használata esetén lejátszási problémák léphetnek fel."</string>
+• A 'Kliens hamisítása' használata esetén lejátszási problémák léphetnek fel."</string>
     <string name="revanced_spoof_streaming_data_type_title">Alapértelmezett kliens</string>
     <string name="revanced_spoof_streaming_data_type_summary">Meghatároz egy alapértelmezett klienst, amely streaming adatokat hív le.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Megjelenik a statisztikák kockáknakban</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Megmutatja a streaming adatok lekérdezésére használt klienst a Statisztikák kockáknakban.</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Megosztási linkek tisztítása</string>
     <string name="revanced_sanitize_sharing_links_summary">Linkek megosztásakor eltávolítja a nyomkövetési paramétereket az URL-ekből.</string>
     <string name="revanced_default_app_settings_title">Alapértelmezett program beállítások megnyitása</string>
diff --git a/patches/src/main/resources/music/translations/ja-rJP/strings.xml b/patches/src/main/resources/music/translations/ja-rJP/strings.xml
index c1300fea2..26e984459 100644
--- a/patches/src/main/resources/music/translations/ja-rJP/strings.xml
+++ b/patches/src/main/resources/music/translations/ja-rJP/strings.xml
@@ -369,6 +369,16 @@ API キーの発行方法については、ここをタップしてください
     <string name="revanced_disable_cairo_splash_animation_title">Cairo スプラッシュアニメーションを無効にする</string>
     <string name="revanced_disable_cairo_splash_animation_summary">アプリ起動時のCairo のスプラッシュアニメーションを無効にします。</string>
     <string name="revanced_disable_drc_audio_title">DRCオーディオを無効にする</string>
+    <string name="revanced_disable_drc_audio_summary">音声に適用されるDRC (Dynamic Range Compression) を無効にします。</string>
+    <string name="revanced_disable_music_video_in_album_title">アルバム内のミュージックビデオを無効にする</string>
+    <string name="revanced_disable_music_video_in_album_summary">"非プレミアムユーザーがアルバムに含まれる曲を再生すると、公式の楽曲でなくMVが再生されることがあります。
+
+アルバムからMVの再生が検出された場合、公式の楽曲を検索します。
+
+• Piped Instance APIを利用しています。"</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">リダイレクトのタイプ</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">公式楽曲にリダイレクトする方法を指定します。</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">リダイレクト</string>
     <string name="revanced_enable_debug_logging_title">デバッグログ</string>
     <string name="revanced_enable_debug_logging_summary">デバッグログを出力します。</string>
     <string name="revanced_enable_debug_buffer_logging_title">デバッグバッファログを有効化</string>
@@ -392,9 +402,14 @@ API キーの発行方法については、ここをタップしてください
 • OPUSオーディオコーデックはサポートされていない可能性があります。
 • シークバーのサムネイルが表示されない場合があります。
 • 再生履歴はブランドアカウントでは動作しません。"</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_client_type_title">既定のクライアント</string>
+    <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
+    <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
+    <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
+    <string name="revanced_spoof_streaming_data_title">ストリーミングデータを偽装</string>
+    <string name="revanced_spoof_streaming_data_type_title">既定のクライアント</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">共有リンクのクリーンアップ</string>
     <string name="revanced_sanitize_sharing_links_summary">リンクを共有する際に、URL からトラッキングクエリパラメーターを削除します。</string>
     <string name="revanced_default_app_settings_title">「デフォルトで開く」の設定</string>
diff --git a/patches/src/main/resources/music/translations/ko-rKR/strings.xml b/patches/src/main/resources/music/translations/ko-rKR/strings.xml
index 0ff9670d8..c54c2a638 100644
--- a/patches/src/main/resources/music/translations/ko-rKR/strings.xml
+++ b/patches/src/main/resources/music/translations/ko-rKR/strings.xml
@@ -220,8 +220,8 @@
     <string name="revanced_enable_zen_mode_summary">동영상 플레이어의 색상을 회색조로 설정해 눈의 피로를 줄입니다.</string>
     <string name="revanced_enable_zen_mode_podcast_title">팟캐스트에서 집중 모드 활성화</string>
     <string name="revanced_enable_zen_mode_podcast_summary">팟캐스트에서 집중 모드를 활성화합니다.</string>
-    <string name="revanced_hide_audio_video_switch_toggle_title">\'노래↔동영상\' 전환 토글 제거</string>
-    <string name="revanced_hide_audio_video_switch_toggle_summary">플레이어에서 \'노래↔동영상\' 전환 토글을 숨깁니다.</string>
+    <string name="revanced_hide_audio_video_switch_toggle_title">\'노래↔동영상\' 토글 제거</string>
+    <string name="revanced_hide_audio_video_switch_toggle_summary">플레이어에서 \'노래↔동영상\' 토글을 숨깁니다.</string>
     <string name="revanced_hide_comment_channel_guidelines_title">커뮤니티 가이드라인 제거</string>
     <string name="revanced_hide_comment_channel_guidelines_summary">댓글 섹션 상단에서 커뮤니티 가이드라인을 숨깁니다.</string>
     <string name="revanced_hide_comment_timestamp_and_emoji_buttons_title">타임스탬프, 이모지 버튼 제거</string>
@@ -376,6 +376,17 @@ API Key를 발급받는 방법을 보려면 여기를 누르세요."</string>
     <string name="revanced_disable_cairo_splash_animation_summary">앱을 시작할 때, Cairo 스플래시 애니메이션을 비활성화합니다.</string>
     <string name="revanced_disable_drc_audio_title">DRC 오디오 비활성화</string>
     <string name="revanced_disable_drc_audio_summary">오디오에 적용된 DRC (Dynamic Range Compression)를 비활성화합니다.</string>
+    <string name="revanced_disable_music_video_in_album_title">앨범에서 뮤직 비디오 비활성화</string>
+    <string name="revanced_disable_music_video_in_album_summary">"프리미엄이 아닌 사용자가 앨범에 포함된 노래를 재생할 때, 간혹 공식 음악 대신 뮤직 비디오가 재생되는 경우가 있습니다.
+
+앨범에서 뮤직 비디오가 재생되는 것이 감지되면 공식 음원을 찾아줍니다.
+
+• 파이핑된 인스턴스 API로 구동됩니다."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">리다이렉션 유형</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">공식 음원으로 리다이렉션하는 방법을 지정할 수 있습니다.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">리다이렉션</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">\'노래↔동영상\' 토글 누르기</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">\'노래↔동영상\' 토글 길게 누르기</string>
     <string name="revanced_enable_debug_logging_title">디버그 로깅 활성화</string>
     <string name="revanced_enable_debug_logging_summary">디버그 로그를 출력합니다.</string>
     <string name="revanced_enable_debug_buffer_logging_title">디버그 버퍼 로깅 활성화</string>
@@ -403,26 +414,24 @@ API Key를 발급받는 방법을 보려면 여기를 누르세요."</string>
     <string name="revanced_spoof_client_title">클라이언트 변경</string>
     <string name="revanced_spoof_client_summary">"클라이언트를 변경하여 재생 문제를 방지할 수 있습니다.
 
-※ '스트리밍 데이터 변경'과 함께 사용할 경우에 재생 문제가 발생할 수 있습니다."</string>
+• '스트리밍 데이터 변경'과 함께 사용할 경우에 재생 문제가 발생할 수 있습니다."</string>
     <string name="revanced_spoof_client_type_title">기본 클라이언트</string>
     <string name="revanced_spoof_client_type_summary">"변경할 기본 클라이언트를 정의합니다.
 
-※ Android 클라이언트를 사용할 경우에 '앱 버전 변경'과 함께 사용하는 것을 권장합니다."</string>
+• Android 클라이언트를 사용할 경우에 '앱 버전 변경'과 함께 사용하는 것을 권장합니다."</string>
     <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
     <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
     <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
     <string name="revanced_spoof_streaming_data_title">스트리밍 데이터 변경</string>
     <string name="revanced_spoof_streaming_data_summary">"스트리밍 데이터를 변경하여 재생 문제를 방지합니다.
 
-※ '클라이언트 변경'과 함께 사용할 경우에 재생 문제가 발생할 수 있습니다."</string>
+• '클라이언트 변경'과 함께 사용할 경우에 재생 문제가 발생할 수 있습니다."</string>
     <string name="revanced_spoof_streaming_data_type_title">기본 클라이언트</string>
     <string name="revanced_spoof_streaming_data_type_summary">스트리밍 데이터를 가져오는 데 사용되는 기본 클라이언트를 정의할 수 있습니다.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">동영상 통계에서 표시</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">\'스트리밍 데이터를 가져오는 데 사용되는 클라이언트\'가 동영상 통계에서 표시됩니다.</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">추적 쿼리를 제거한 링크 공유</string>
     <string name="revanced_sanitize_sharing_links_summary">링크를 공유할 때, URL에서 추적 쿼리 매개변수를 제거합니다.</string>
     <string name="revanced_default_app_settings_title">기본 앱 설정 열기</string>
diff --git a/patches/src/main/resources/music/translations/pl-rPL/strings.xml b/patches/src/main/resources/music/translations/pl-rPL/strings.xml
index b8b202749..7def1c10f 100644
--- a/patches/src/main/resources/music/translations/pl-rPL/strings.xml
+++ b/patches/src/main/resources/music/translations/pl-rPL/strings.xml
@@ -375,6 +375,17 @@ Kliknij, by zobaczyć, jak zgłosić klucz API."</string>
     <string name="revanced_disable_cairo_splash_animation_summary">Wyłącza animację ładowania aplikacji związaną z motywem Cairo podczas otwierania aplikacji.</string>
     <string name="revanced_disable_drc_audio_title">Wyłącz audio DRC</string>
     <string name="revanced_disable_drc_audio_summary">Wyłącza DRC (Dynamic Range Compression) stosowane w utworach.</string>
+    <string name="revanced_disable_music_video_in_album_title">Wyłącz teledyski w albumach</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Gdy użytkownik non-premium odtwarza utwór zawarty w albumie, czasami zamiast oficjalnego utworu, odtwarzany jest teledysk.
+
+Opcja znajduje oficjalny utwór, jeśli wykryje odtwarzanie teledysku z albumu.
+
+• Obsługiwane przez Piped Instance API."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Typ przekierowania</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Określa, w jaki sposób przekierowuje do oficjalnego utworu</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Przekieruj</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Kliknij przełącznik utwór-teledysk</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Kliknij i przytrzymaj przełącznik utwór-teledysk</string>
     <string name="revanced_enable_debug_logging_title">Włącz logowanie debugowania</string>
     <string name="revanced_enable_debug_logging_summary">Wyświetla log od debugowania.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Logi do debugowania buforu</string>
@@ -421,10 +432,8 @@ Stuknij przycisk kontynuacji i zezwól na zmiany w optymalizacji."</string>
     <string name="revanced_spoof_streaming_data_type_summary">Denifiuje domyślnego klienta, z którego będzie przechwytywany strumień danych.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Informacja w statystykach dla nerdów</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Pokazuje używanego klienta do przechwytywania strumienia danych w statystykach dla nerdów.</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Oczyść udostępniane linki</string>
     <string name="revanced_sanitize_sharing_links_summary">Usuwa parametry śledzących zapytań z adresów URL podczas udostępniania linków.</string>
     <string name="revanced_default_app_settings_title">Otwórz systemowe ustawienia aplikacji</string>
diff --git a/patches/src/main/resources/music/translations/pt-rBR/strings.xml b/patches/src/main/resources/music/translations/pt-rBR/strings.xml
index acbc47703..2b97da865 100644
--- a/patches/src/main/resources/music/translations/pt-rBR/strings.xml
+++ b/patches/src/main/resources/music/translations/pt-rBR/strings.xml
@@ -375,6 +375,17 @@ Clique para ver como emitir uma chave de API."</string>
     <string name="revanced_disable_cairo_splash_animation_summary">Desabilita a animação inicial do Cairo quando o aplicativo é iniciado.</string>
     <string name="revanced_disable_drc_audio_title">Desativar áudio DRC</string>
     <string name="revanced_disable_drc_audio_summary">Desativa o DRC (Compressão de faixa dinâmica) aplicada ao áudio.</string>
+    <string name="revanced_disable_music_video_in_album_title">Desativar vídeo da música no álbum</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Quando um usuário não premium toca uma música incluída em um álbum, o videoclipe às vezes é tocado em vez da música oficial.
+
+Encontre a música oficial se um videoclipe for detectado tocando de um álbum.
+
+• Desenvolvido pela API de instância do Piped."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Tipo de redirecionamento</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Especifica como redirecionar para a música oficial.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Redirecionar</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Tocar alternador de Áudio / Vídeo</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Tocar e segurar alternador de Áudio / Vídeo</string>
     <string name="revanced_enable_debug_logging_title">Ativar o relatório de depuração</string>
     <string name="revanced_enable_debug_logging_summary">Imprime o relatório de depuração</string>
     <string name="revanced_enable_debug_buffer_logging_title">Ativar o registro de depuração do buffer</string>
@@ -404,21 +415,24 @@ Toque no botão continuar e permita as alterações de otimização."</string>
     <string name="revanced_spoof_client_title">Falsificar cliente</string>
     <string name="revanced_spoof_client_summary">"Falsificar o cliente para evitar problemas de reprodução.
 
-※ Quando usado com 'Dados de streaming falsos', podem ocorrer problemas de reprodução."</string>
+• Quando usado com 'Dados de streaming falsos', podem ocorrer problemas de reprodução."</string>
     <string name="revanced_spoof_client_type_title">Cliente padrão</string>
-    <string name="revanced_spoof_client_type_summary">"Define um cliente padrão para falsificar."</string>
+    <string name="revanced_spoof_client_type_summary">"Define um cliente padrão para falsificar.
+
+• Ao usar o cliente Android, é recomendado usar também 'Falsificar versão do aplicativo'."</string>
+    <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
+    <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
+    <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
     <string name="revanced_spoof_streaming_data_title">Dados de streaming falsos</string>
     <string name="revanced_spoof_streaming_data_summary">"Falsifique os dados de streaming para evitar problemas de reprodução.
 
-※ Quando usado com 'Falsificar cliente', podem ocorrer problemas de reprodução."</string>
+• Quando usado com 'Falsificar cliente', podem ocorrer problemas de reprodução."</string>
     <string name="revanced_spoof_streaming_data_type_title">Cliente padrão</string>
     <string name="revanced_spoof_streaming_data_type_summary">Define um cliente padrão que busca dados de streaming.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Exibir em Estatísticas para nerds</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Exibir o cliente usado para buscar dados de streaming em estatísticas para nerds.</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Limpar links compartilhados</string>
     <string name="revanced_sanitize_sharing_links_summary">Remove os parâmetros de consulta de rastreamento das URLs ao compartilhar os links.</string>
     <string name="revanced_default_app_settings_title">Abrir configurações padrão do aplicativo</string>
diff --git a/patches/src/main/resources/music/translations/ru-rRU/strings.xml b/patches/src/main/resources/music/translations/ru-rRU/strings.xml
index 00dea8b8d..49e4a7a57 100644
--- a/patches/src/main/resources/music/translations/ru-rRU/strings.xml
+++ b/patches/src/main/resources/music/translations/ru-rRU/strings.xml
@@ -372,6 +372,17 @@
     <string name="revanced_disable_cairo_splash_animation_summary">Отключает анимацию Кайро при запуске приложения.</string>
     <string name="revanced_disable_drc_audio_title">Отключить DRC аудио</string>
     <string name="revanced_disable_drc_audio_summary">Выключает DRC (сжатие динамического диапазона), применяемого к аудио.</string>
+    <string name="revanced_disable_music_video_in_album_title">Отключить музыкальные видео в альбоме</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Когда пользователь без премиума воспроизводит песню из альбома, иногда вместо официальной песни воспроизводится музыкальное видео.
+
+Если будет обнаружено воспроизведение музыкального видео, будет перенаправлено на официальную песню.
+
+• Используется \"Piped Instance\", но в некоторых регионах API может быть недоступен."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Тип перенаправления</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Определение способа перенаправления на официальную песню.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Перенаправление</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Нажмите на переключатель Аудио/Видео</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Нажмите и удерживайте переключатель Аудио/Видео</string>
     <string name="revanced_enable_debug_logging_title">Ведение журнала отладки</string>
     <string name="revanced_enable_debug_logging_summary">Выводит журнал отладки.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Ведение журналов отладки буфера</string>
@@ -403,6 +414,13 @@
 • Кодек OPUS может не работать.
 • Превью во время перемотки может отсутствовать.
 • История просмотра не работает при использовании аккаунта компании."</string>
+    <string name="revanced_spoof_client_type_title">Клиент по умолчанию</string>
+    <string name="revanced_spoof_client_type_summary">"Определяет клиент по умолчанию для подмены.
+
+※ При использовании клиента Android рекомендуется использовать его вместе с \"Подмена версии приложения\"."</string>
+    <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
+    <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
+    <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
     <string name="revanced_spoof_streaming_data_title">Подделка потоковых данных</string>
     <string name="revanced_spoof_streaming_data_summary">"Подделать потоковые данные, чтобы предотвратить проблемы с воспроизведением.
 
@@ -411,10 +429,8 @@
     <string name="revanced_spoof_streaming_data_type_summary">Определяет клиент по умолчанию, получающий потоковые данные.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Показывать в \"Статистике для сисадминов\"</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Показывает клиент, используемый для получения потоковых данных в Статистике для сисадминов.</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Подчищать ссылки</string>
     <string name="revanced_sanitize_sharing_links_summary">Убирает параметры отслеживания запросов из адресов при отправке ссылки.</string>
     <string name="revanced_default_app_settings_title">Открыть настройки по умолчанию</string>
diff --git a/patches/src/main/resources/music/translations/uk-rUA/strings.xml b/patches/src/main/resources/music/translations/uk-rUA/strings.xml
index 08b50da88..5266c6e64 100644
--- a/patches/src/main/resources/music/translations/uk-rUA/strings.xml
+++ b/patches/src/main/resources/music/translations/uk-rUA/strings.xml
@@ -375,6 +375,17 @@
     <string name="revanced_disable_cairo_splash_animation_summary">Вимикає сплеш анімацію Каїр під час запуску застосунку.</string>
     <string name="revanced_disable_drc_audio_title">Вимкнути DRC аудіо</string>
     <string name="revanced_disable_drc_audio_summary">Вимикає DRC (стиснення динамічного діапазону), застосованого до аудіо.</string>
+    <string name="revanced_disable_music_video_in_album_title">Вимкнути музичні відео в альбомі</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Коли користувач без преміуму відтворює пісню з альбому, іноді замість офіційної пісні відтворюється музичне відео.
+
+Знайти офіційну пісню, якщо виявлено музичне відео з альбому. 
+
+• На базі Piped Instance API."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Тип перенаправлення</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Визначає спосіб перенаправлення до офіційної пісні.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Перенаправлення</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Натиснення перемикача \"пісня | відео\"</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Натиснення та утримання перемикача \"пісня | відео\"</string>
     <string name="revanced_enable_debug_logging_title">Увімкнути протоколи налагодження</string>
     <string name="revanced_enable_debug_logging_summary">Виводить протокол налагодження.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Увімкнути ведення журналу буфера налагодження</string>
@@ -404,12 +415,14 @@
     <string name="revanced_spoof_client_title">Підміна клієнта</string>
     <string name="revanced_spoof_client_summary">"Підробити клієнт, щоб запобігти проблемам із відтворенням.
 
-Обмеження:
-• Аудіокодек OPUS може не підтримуватися.
-• Мініатюри перемотки можуть бути відсутніми.
-• Історія переглядів не працює з обліковим записом бренду.
+※ Під час використання разом з \"Підробка потокових даних\" можуть виникнути проблеми з відтворенням."</string>
+    <string name="revanced_spoof_client_type_title">Клієнт за замовчуванням</string>
+    <string name="revanced_spoof_client_type_summary">"Визначає клієнт за замовчуванням для підробки. 
 
-※ Під час використання разом з \"Підміною клієнта\" можуть виникнути проблеми з відтворенням."</string>
+※ Під час використання клієнта Android рекомендується використовувати його разом з \"Підробити версію програми\"."</string>
+    <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
+    <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
+    <string name="revanced_spoof_client_type_entry_ios_music_6_21">iOS Music 6.21</string>
     <string name="revanced_spoof_streaming_data_title">Підробка потокових даних</string>
     <string name="revanced_spoof_streaming_data_summary">"Підробити потокові дані, щоб запобігти проблемам із відтворенням.
 
@@ -418,10 +431,8 @@
     <string name="revanced_spoof_streaming_data_type_summary">Визначає клієнт за замовчуванням, який отримує потокові дані.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Показувати у \"Статистиці для сисадмінів\"</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Показує клієнт, який використовується для отримання потокових даних у \"Статистиці для сисадмінів\".</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Обробляти поширення посилань</string>
     <string name="revanced_sanitize_sharing_links_summary">Видаляє параметри запиту відстеження з URL-адрес під час обміну посиланнями.</string>
     <string name="revanced_default_app_settings_title">Відкрити налаштування за замовчуванням</string>
diff --git a/patches/src/main/resources/music/translations/vi-rVN/strings.xml b/patches/src/main/resources/music/translations/vi-rVN/strings.xml
index 9814f38c7..018f9d3dc 100644
--- a/patches/src/main/resources/music/translations/vi-rVN/strings.xml
+++ b/patches/src/main/resources/music/translations/vi-rVN/strings.xml
@@ -35,7 +35,7 @@
     <string name="revanced_hide_action_button_label_title">Ẩn tên nút</string>
     <string name="revanced_hide_action_button_label_summary">Ẩn tên nút trong thanh thao tác.</string>
     <string name="revanced_external_downloader_action_title">Ghi đè nút tải xuống</string>
-    <string name="revanced_external_downloader_action_summary">"Nút tải xuống sẽ mở trình tải xuống bên ngoài của bạn.
+    <string name="revanced_external_downloader_action_summary">"Khi thao tác với nút tải xuống sẽ mở trình tải xuống bên ngoài của bạn.
 
 • Chỉ ghi đè lên nút Tải xuống trong trình phát.
 • Không ghi đè lên nút Tải xuống trong Trình đơn tuỳ chọn hoặc trong thẻ Thư viện."</string>
@@ -172,8 +172,8 @@ Hạn chế:
     <string name="revanced_spoof_app_version_title">Giả mạo phiên bản ứng dụng</string>
     <string name="revanced_spoof_app_version_summary">"Giả mạo phiên bản YouTube Music hiện tại thành phiên bản cũ.
 
-Lưu ý:\n- Tuỳ chọn này sẽ thay đổi giao diện ứng dụng, tuy nhiên có thể xảy ra các sự cố chưa xác định khác.
-- Nếu tắt tuỳ chọn này sau đó, giao diện cũ có thể vẫn tồn tại cho đến khi bạn xoá dữ liệu ứng dụng."</string>
+• Tuỳ chọn này sẽ làm thay đổi giao diện của ứng dụng, tuy nhiên có thể xảy ra các sự cố chưa xác định khác.
+• Nếu tắt tuỳ chọn này sau đó, giao diện cũ có thể vẫn tồn tại cho đến khi bạn xoá dữ liệu ứng dụng."</string>
     <string name="revanced_spoof_app_version_target_title">Phiên bản giả mạo</string>
     <string name="revanced_spoof_app_version_target_summary">Chọn phiên bản YouTube Music mà bạn muốn giả mạo.</string>
     <string name="revanced_spoof_app_version_target_entry_4_27_53">4.27.53 - Tắt chế độ Đài phát ở một số vùng của Canada</string>
@@ -375,6 +375,17 @@ Nhấp vào đây để xem các bước phát hành khóa API."</string>
     <string name="revanced_disable_cairo_splash_animation_summary">Vô hiệu hóa hoạt ảnh kiểu Cairo khi ứng dụng khởi chạy.</string>
     <string name="revanced_disable_drc_audio_title">Vô hiệu hoá audio DRC</string>
     <string name="revanced_disable_drc_audio_summary">Vô hiệu hoá tính năng nén dải âm thanh động.</string>
+    <string name="revanced_disable_music_video_in_album_title">Tắt video âm nhạc trong đĩa nhạc</string>
+    <string name="revanced_disable_music_video_in_album_summary">"Khi người dùng không mua gói Premium, đôi khi nghe nhạc có trong đĩa nhạc, video âm nhạc được phát thay vì bài hát chính thức.
+
+Trong trường hợp đó, hệ thống sẽ tìm và chuyển hướng tới bài hát chính thức.
+
+• Được hỗ trợ bởi API của Piped Instance."</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_title">Kiểu chuyển hướng</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_summary">Xác định cách chuyển tới bài hát chính thức.</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_redirect">Chuyển hướng</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_click">Nhấn vào nút chuyển đổi giữa Bài hát và Video</string>
+    <string name="revanced_disable_music_video_in_album_redirect_type_entry_on_long_click">Nhấn và giữ nút chuyển đổi giữa Bài hát và Video</string>
     <string name="revanced_enable_debug_logging_title">Nhật ký gỡ lỗi</string>
     <string name="revanced_enable_debug_logging_summary">Bật ghi nhật ký gỡ lỗi.</string>
     <string name="revanced_enable_debug_buffer_logging_title">Bật nhật ký bộ đệm gỡ lỗi</string>
@@ -386,7 +397,7 @@ Cụ thể:
 • Các phiên bản YouTube Music mới nhất sử dụng codec OPUS như mặc định.
 • Điều này chỉ áp dụng cho người dùng giả mạo với các phiên bản ứng dụng rất cũ."</string>
     <string name="gms_core_settings_title">GmsCore</string>
-    <string name="gms_core_settings_summary">Chuyển hướng tới cài đặt GmsCore và kích hoạt Cloud Messaging để nhận thông báo đẩy.</string>
+    <string name="gms_core_settings_summary">Chuyển hướng tới cài đặt MicroG và kích hoạt Cloud Messaging để nhận thông báo đẩy.</string>
     <string name="gms_core_toast_not_installed_message">GmsCore chưa được cài đặt. Hãy cài đặt nó đi nào.</string>
     <string name="gms_core_dialog_title">Hành động cần thiết</string>
     <string name="gms_core_dialog_not_whitelisted_not_allowed_in_background_message">"Hiện GmsCore không có quyền chạy nền.
@@ -404,26 +415,24 @@ Nhấn vào Tiếp tục và cho phép thay đổi lựa chọn tối ưu hoá p
     <string name="revanced_spoof_client_title">Giả mạo ứng dụng khách</string>
     <string name="revanced_spoof_client_summary">"Giả mạo ứng dụng khách nhằm khắc phục sự cố phát.
 
-※ Khi được sử dụng đồng thời với \"Giả mạo luồng dữ liệu trực tuyến\", có thể gây ra sự cố phát."</string>
+• Khi được sử dụng đồng thời với \"Giả mạo luồng dữ liệu trực tuyến\", có thể gây ra sự cố phát."</string>
     <string name="revanced_spoof_client_type_title">Ứng dụng khách mặc định</string>
     <string name="revanced_spoof_client_type_summary">"Xác định ứng dụng khách mặc định để giả mạo.
 
-※ Khi sử dụng ứng dụng khách Android, tính năng này nên được sử dụng đồng thời với \"Giả mạo phiên bản ứng dụng\"."</string>
-    <string name="revanced_spoof_client_type_entry_android_music_4_27">Music Android 4.27.53</string>
-    <string name="revanced_spoof_client_type_entry_android_music_5_29">Music Android 5.29.53</string>
+• Khi sử dụng ứng dụng khách Android, tính năng này nên được sử dụng đồng thời với \"Giả mạo phiên bản ứng dụng\"."</string>
+    <string name="revanced_spoof_client_type_entry_android_music_4_27">Android Music 4.27.53</string>
+    <string name="revanced_spoof_client_type_entry_android_music_5_29">Android Music 5.29.53</string>
     <string name="revanced_spoof_client_type_entry_ios_music_6_21">Music iOS 6.21</string>
     <string name="revanced_spoof_streaming_data_title">Giả mạo luồng dữ liệu trực tuyến</string>
     <string name="revanced_spoof_streaming_data_summary">"Giả mạo luồng dữ liệu trực tuyến nhằm khắc phục sự cố phát.
 
-※ Khi được sử dụng đồng thời với \"Giả mạo ứng dụng khách\", có thể gây ra sự cố phát."</string>
+• Khi được sử dụng đồng thời với \"Giả mạo ứng dụng khách\", có thể gây ra sự cố phát."</string>
     <string name="revanced_spoof_streaming_data_type_title">Ứng dụng khách mặc định</string>
     <string name="revanced_spoof_streaming_data_type_summary">Xác định một ứng dụng khách mặc định để nạp luồng dữ liệu trực tuyến.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Hiển thị trong Thống kê chi tiết</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary">Hiển thị ứng dụng khách được sử dụng để nạp luồng dữ liệu trực tuyến trong Thống kê chi tiết.</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">Music iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_music">Android Music</string>
     <string name="revanced_sanitize_sharing_links_title">Liên kết sạch khi chia sẻ</string>
     <string name="revanced_sanitize_sharing_links_summary">Loại bỏ các tham số truy vấn theo dõi khỏi URL khi chia sẻ liên kết.</string>
     <string name="revanced_default_app_settings_title">Mở theo mặc định</string>
diff --git a/patches/src/main/resources/music/translations/zh-rTW/strings.xml b/patches/src/main/resources/music/translations/zh-rTW/strings.xml
index 6ea62fa6d..0c902f71a 100644
--- a/patches/src/main/resources/music/translations/zh-rTW/strings.xml
+++ b/patches/src/main/resources/music/translations/zh-rTW/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Shared -->
     <string name="revanced_extended_settings_title">ReVanced 擴充功能</string>
+    <string name="revanced_extended_reset_to_default_toast">重設為預設值。</string>
     <!-- Shared Category -->
     <string name="revanced_extended_restart_first_run">重新啟動以套用更改後的介面</string>
     <string name="revanced_extended_restart_message">套用並重新啟動</string>
@@ -59,6 +60,8 @@
     <string name="revanced_hide_premium_promotion_summary">隱藏 Premium 升級彈出選單</string>
     <string name="revanced_hide_premium_renewal_title">隱藏 Premium 續訂橫幅</string>
     <string name="revanced_hide_premium_renewal_summary">隱藏 Premium 續訂橫幅</string>
+    <string name="revanced_hide_promotion_alert_banner_title">Hide promotion alert banner</string>
+    <string name="revanced_hide_promotion_alert_banner_summary">隱藏促銷提醒橫幅。</string>
     <!-- PreferenceScreen: Flyout -->
     <string name="revanced_preference_screen_flyout_title">彈出式選單</string>
     <string name="revanced_enable_compact_dialog_title">啟用精簡選單</string>
@@ -86,6 +89,7 @@
     <string name="revanced_hide_flyout_menu_go_to_episode_title">隱藏前往插曲選項</string>
     <string name="revanced_hide_flyout_menu_go_to_podcast_title">隱藏前往播客選項</string>
     <string name="revanced_hide_flyout_menu_help_title">隱藏說明&amp; 回報問題選項</string>
+    <string name="revanced_hide_flyout_menu_pin_to_speed_dial_title">隱藏在快速播放專區中置頂選單</string>
     <string name="revanced_hide_flyout_menu_play_next_title">隱藏播放下一個選項</string>
     <string name="revanced_hide_flyout_menu_quality_title">隱藏畫質選項</string>
     <string name="revanced_hide_flyout_menu_remove_from_library_title">隱藏從媒體庫中移除選項</string>
@@ -100,6 +104,7 @@
     <string name="revanced_hide_flyout_menu_start_radio_title">隱藏開啟電台選項</string>
     <string name="revanced_hide_flyout_menu_stats_for_nerds_title">隱藏資訊統計選項</string>
     <string name="revanced_hide_flyout_menu_subscribe_title">隱藏訂閱/取消訂閱選項</string>
+    <string name="revanced_hide_flyout_menu_unpin_from_speed_dial_title">隱藏從快速播放取消置頂選單</string>
     <string name="revanced_hide_flyout_menu_view_song_credit_title">隱藏查看歌曲製作人員選項</string>
     <string name="revanced_replace_flyout_menu_dismiss_queue_continue_watch_title">繼續觀看</string>
     <string name="revanced_replace_flyout_menu_dismiss_queue_continue_watch_summary">在Youtube上觀看時，從上次時間繼續觀看</string>
@@ -171,6 +176,7 @@
     <string name="revanced_spoof_app_version_target_summary">選擇欲偽裝的應用程式版本</string>
     <string name="revanced_spoof_app_version_target_entry_4_27_53">4.27.53 - 在加拿大地區停用電台模式</string>
     <string name="revanced_spoof_app_version_target_entry_6_11_52">6.11.52 - 停用即時歌詞</string>
+    <string name="revanced_spoof_app_version_target_entry_7_16_53">7.16.53 - 還原舊的動作欄</string>
     <!-- PreferenceScreen: Navigation Bar -->
     <string name="revanced_preference_screen_navigation_title">導覽列</string>
     <string name="revanced_enable_black_navigation_bar_title">啟用黑色導覽列</string>
@@ -191,6 +197,10 @@
     <string name="revanced_hide_navigation_label_summary">隱藏位於導覽列的標籤</string>
     <!-- PreferenceScreen: Player -->
     <string name="revanced_preference_screen_player_title">播放器</string>
+    <string name="revanced_disable_mini_player_gesture_title">停用迷你播放器手勢</string>
+    <string name="revanced_disable_mini_player_gesture_summary">停用迷你播放器中的滑動切換曲目功能。</string>
+    <string name="revanced_disable_player_gesture_title">停用播放器手勢</string>
+    <string name="revanced_disable_player_gesture_summary">停用播放器中的滑動切換歌曲。</string>
     <string name="revanced_enable_black_player_background_title">啟用黑色播放器背景</string>
     <string name="revanced_enable_black_player_background_summary">將播放器背景顏色設成為黑色</string>
     <string name="revanced_enable_color_match_player_title">啟用彩色播放列</string>
@@ -213,6 +223,8 @@
     <string name="revanced_hide_comment_channel_guidelines_summary">隱藏留言頂部的頻道指南</string>
     <string name="revanced_hide_comment_timestamp_and_emoji_buttons_title">隱藏時間戳與表情符號按鈕</string>
     <string name="revanced_hide_comment_timestamp_and_emoji_buttons_summary">輸入留言時隱藏時間戳記和表情符號按鈕</string>
+    <string name="revanced_hide_double_tap_overlay_filter_title">隱藏連點兩下疊加濾鏡</string>
+    <string name="revanced_hide_double_tap_overlay_filter_summary">隱藏點兩下以快轉或倒退時出現的深色疊加層。</string>
     <string name="revanced_hide_fullscreen_share_button_title">隱藏全螢幕播放器中的分享按鈕</string>
     <string name="revanced_hide_fullscreen_share_button_summary">在全螢幕播放器中隱藏分享按鈕</string>
     <string name="revanced_remember_repeat_state_title">記住重複播放狀態</string>
@@ -227,14 +239,29 @@
     <string name="revanced_restore_old_player_layout_summary">"將播放器介面恢復為舊樣式
 某些功能在舊的播放器介面中可能無法正常運作"</string>
     <!-- PreferenceScreen: Settings menu -->
+    <string name="revanced_preference_screen_settings_title">設定選單</string>
+    <string name="revanced_hide_settings_menu_parent_tools_title">隱藏家庭中心選單</string>
+    <string name="revanced_hide_settings_menu_general_title">隱藏一般選單</string>
+    <string name="revanced_hide_settings_menu_playback_title">隱藏播放選單</string>
+    <string name="revanced_hide_settings_menu_data_saving_title">隱藏資料儲存選單</string>
+    <string name="revanced_hide_settings_menu_downloads_and_storage_title">隱藏下載&amp;儲存選單</string>
+    <string name="revanced_hide_settings_menu_notification_title">隱藏通知選單</string>
+    <string name="revanced_hide_settings_menu_privacy_and_location_title">隱藏隱私權&amp;資料選單</string>
+    <string name="revanced_hide_settings_menu_recommendations_title">隱藏推薦選單</string>
+    <string name="revanced_hide_settings_menu_paid_memberships_title">隱藏取得 Music Premium 選單</string>
+    <string name="revanced_hide_settings_menu_about_title">隱藏關於選單</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">影片</string>
     <string name="revanced_custom_playback_speeds_title">編輯自訂播放速度</string>
     <string name="revanced_custom_playback_speeds_summary">新增或變更可以使用的播放速度</string>
     <string name="revanced_remember_playback_speed_last_selected_title">記住播放速度的變更</string>
     <string name="revanced_remember_playback_speed_last_selected_summary">記住上次選擇的播放速度</string>
+    <string name="revanced_remember_playback_speed_last_selected_toast_title">顯示提示訊息</string>
+    <string name="revanced_remember_playback_speed_last_selected_toast_summary">變更預設播放速度時顯示提示訊息。</string>
     <string name="revanced_remember_video_quality_last_selected_title">記住影片畫質變更</string>
     <string name="revanced_remember_video_quality_last_selected_summary">記住上次選擇的影片畫質</string>
+    <string name="revanced_remember_video_quality_last_selected_toast_title">顯示提示訊息</string>
+    <string name="revanced_remember_video_quality_last_selected_toast_summary">變更預設播放速度時顯示提示訊息。</string>
     <string name="revanced_custom_playback_speeds_invalid">自訂速度必須小於 %sx 使用預設值</string>
     <string name="revanced_custom_playback_speeds_parse_exception">自訂播放速度無效 使用預設值</string>
     <string name="revanced_remember_playback_speed_toast">將預設速度更改為 %s</string>
@@ -249,6 +276,8 @@
     <string name="revanced_ryd_dislike_percentage_summary">將倒讚數以百分比的形式顯示</string>
     <string name="revanced_ryd_compact_layout_title">緊湊型按讚按鈕</string>
     <string name="revanced_ryd_compact_layout_summary">隱藏按讚按鈕中間的分隔線</string>
+    <string name="revanced_ryd_estimated_like_title">顯示估計喜歡的次數</string>
+    <string name="revanced_ryd_estimated_like_summary">顯示影片的喜歡次數</string>
     <string name="revanced_ryd_toast_on_connection_error_title">當API無法使用時顯示提示訊息</string>
     <string name="revanced_ryd_toast_on_connection_error_summary">當 Return YouTube Dislike API 無法使用時顯示提示訊息</string>
     <string name="revanced_ryd_about">關於</string>
@@ -259,7 +288,22 @@
     <string name="revanced_ryd_failure_connection_status_code">倒讚數無法使用 (狀態 %d)</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">倒讚顯示不正常（已達到客戶端 API 限制）</string>
     <string name="revanced_ryd_failure_generic">倒讚數無法使用 (狀態 %s)</string>
+    <string name="revanced_ryd_video_likes_hidden_by_video_owner">隱藏</string>
     <!-- PreferenceScreen: Return YouTube Username -->
+    <string name="revanced_preference_screen_return_youtube_username_title">恢復 YouTube 使用者名稱</string>
+    <string name="revanced_return_youtube_username_enabled_title">啟用恢復 YouTube 使用者名稱</string>
+    <string name="revanced_return_youtube_username_enabled_summary">在留言中將使用者名稱取代帳號名稱。</string>
+    <string name="revanced_return_youtube_username_display_format_title">顯示樣式</string>
+    <string name="revanced_return_youtube_username_display_format_summary">選擇使用者名稱顯示樣式。</string>
+    <string name="revanced_return_youtube_username_display_format_username_only">使用者名稱</string>
+    <string name="revanced_return_youtube_username_display_format_username_handle">使用者名稱 (@帳號名稱)</string>
+    <string name="revanced_return_youtube_username_display_format_handle_username">\@帳號名稱 (使用者名稱)</string>
+    <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_title">YouTube 資料 API 金鑰</string>
+    <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_summary">使用 YouTube 資料 API v3 的開發人員金鑰</string>
+    <string name="revanced_return_youtube_username_youtube_data_api_v3_about_title">關於 YouTube 資料 API 金鑰</string>
+    <string name="revanced_return_youtube_username_youtube_data_api_v3_about_summary">"需要 YouTube Data API v3 開發者金鑰才能將帳號名稱替換為使用者名稱。免費方案的 API 金鑰每日配額為 10,000 次，每替換一次留言中的帳號名稱為使用者名稱會消耗 1 次配額。點擊此處了解如何申請 API 金鑰。"</string>
+    <string name="revanced_return_youtube_username_youtube_data_api_v3_dialog_title">取得 YouTube 資料 API v3 開發人員金鑰</string>
+    <string name="revanced_return_youtube_username_youtube_data_api_v3_dialog_message">1. 前往 &lt;a href=%1$s&gt;建立新專案&amp;p;.&lt;br&gt;2.點擊&lt;b&gt;創建&lt;/b&gt; 按鈕。&lt;br&gt;3.&lt;br&gt;轉到 &lt;a href=%2$s&gt;YouTube 資料 API v3&lt;/a&gt;.&lt;br&gt;4.點選&lt;b&gt;啟用&lt;/b&gt; 按鈕。&lt;br&gt;5.點選&lt;b&gt;建立憑證&lt;b&gt; 按鈕。 &lt;br&gt;6.選擇&lt;b&gt;公共資料&lt;/b&gt; 選項。&lt;br&gt;7.點選&lt;b&gt;下一步&lt;/b&gt; 按鈕。&lt;br&gt;8.複製 API 金鑰。&lt;br&gt;&lt;br&gt;※ API 金鑰不應與其他人共用，因此它不包含在匯入/匯出設定中。</string>
     <!-- PreferenceScreen: SponsorBlock -->
     <string name="revanced_preference_screen_sb_title">贊助區塊阻擋（SponsorBlock）</string>
     <string name="revanced_sb_enabled">啟用SponsorBlock</string>
@@ -299,11 +343,24 @@
     <string name="revanced_sb_segments_nomusic_sum">此功能僅供音樂影片使用。本功能僅應該用於音樂錄影帶中並未包含其他類別的段落。</string>
     <string name="revanced_sb_skipped_sponsor">已跳過贊助</string>
     <string name="revanced_sb_skipped_selfpromo">已跳過自我宣傳</string>
+    <string name="revanced_sb_skipped_interaction">已跳過煩人的提醒</string>
+    <string name="revanced_sb_skipped_intro_beginning">已跳過開頭</string>
+    <string name="revanced_sb_skipped_intro_middle">已跳過中場休息</string>
+    <string name="revanced_sb_skipped_intro_end">已跳過中場休息</string>
+    <string name="revanced_sb_skipped_outro">已跳過結尾</string>
+    <string name="revanced_sb_skipped_preview_beginning">已跳過預覽</string>
+    <string name="revanced_sb_skipped_preview_middle">已跳過預覽</string>
+    <string name="revanced_sb_skipped_preview_end">已跳過前情提要</string>
+    <string name="revanced_sb_skipped_filler">已跳過贅詞</string>
+    <string name="revanced_sb_skipped_nomusic">已跳過非音樂片段</string>
+    <string name="revanced_sb_skipped_multiple_segments">已跳過多個片段</string>
+    <string name="revanced_sb_skip_automatically">自動跳過</string>
     <!-- PreferenceScreen: Miscellaneous -->
     <string name="revanced_enable_debug_logging_title">啟用除錯紀錄</string>
     <string name="revanced_enable_debug_logging_summary">列出除錯記錄檔</string>
     <string name="revanced_enable_opus_codec_title">啟用解碼器覆寫</string>
     <string name="revanced_enable_opus_codec_summary">"播放音樂時啟用 250/251 opus 解碼器。"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
     <string name="revanced_sanitize_sharing_links_title">清理分享連結</string>
     <string name="revanced_sanitize_sharing_links_summary">分享連結時從 URL 中刪除追蹤參數。</string>
     <string name="revanced_extended_settings_import_export_title">匯入/匯出設定</string>
@@ -318,5 +375,6 @@
     <string name="revanced_extended_settings_import_failed">匯入失敗: %s</string>
     <string name="revanced_extended_settings_import_reset">設定已重設為預設值</string>
     <string name="revanced_extended_settings_import_success">已匯入設定: %d</string>
+    <string name="revanced_extended_settings_reset">重置</string>
     <string name="revanced_share_copy_settings_success">設定已複製到剪貼簿</string>
 </resources>
diff --git a/patches/src/main/resources/youtube/settings/host/values/arrays.xml b/patches/src/main/resources/youtube/settings/host/values/arrays.xml
index 8538bf654..55d4d5583 100644
--- a/patches/src/main/resources/youtube/settings/host/values/arrays.xml
+++ b/patches/src/main/resources/youtube/settings/host/values/arrays.xml
@@ -42,11 +42,14 @@
         <item>@string/revanced_change_start_page_entry_shorts</item>
         <item>@string/revanced_change_start_page_entry_subscriptions</item>
         <item>@string/revanced_change_start_page_entry_explore</item>
+        <item>@string/revanced_change_start_page_entry_notifications</item>
         <item>@string/revanced_change_start_page_entry_library</item>
+        <item>@string/revanced_change_start_page_entry_your_clips</item>
         <item>@string/revanced_change_start_page_entry_liked_videos</item>
         <item>@string/revanced_change_start_page_entry_watch_later</item>
         <item>@string/revanced_change_start_page_entry_history</item>
         <item>@string/revanced_change_start_page_entry_trending</item>
+        <item>@string/revanced_change_start_page_entry_courses</item>
         <item>@string/revanced_change_start_page_entry_gaming</item>
         <item>@string/revanced_change_start_page_entry_live</item>
         <item>@string/revanced_change_start_page_entry_music</item>
@@ -62,11 +65,14 @@
         <!-- Browser Id -->
         <item>SUBSCRIPTIONS</item>
         <item>EXPLORE</item>
+        <item>NOTIFICATIONS</item>
         <item>LIBRARY</item>
+        <item>YOUR_CLIPS</item>
         <item>LIKED_VIDEO</item>
         <item>WATCH_LATER</item>
         <item>HISTORY</item>
         <item>TRENDING</item>
+        <item>COURSES</item>
         <item>GAMING</item>
         <item>LIVE</item>
         <item>MUSIC</item>
@@ -108,6 +114,18 @@
         <item>1440</item>
         <item>2160</item>
     </string-array>
+    <string-array name="revanced_exit_fullscreen_entries">
+        <item>@string/revanced_exit_fullscreen_entry_1</item>
+        <item>@string/revanced_exit_fullscreen_entry_2</item>
+        <item>@string/revanced_exit_fullscreen_entry_3</item>
+        <item>@string/revanced_exit_fullscreen_entry_4</item>
+    </string-array>
+    <string-array name="revanced_exit_fullscreen_entry_values">
+        <item>DISABLED</item>
+        <item>PORTRAIT</item>
+        <item>LANDSCAPE</item>
+        <item>PORTRAIT_LANDSCAPE</item>
+    </string-array>
     <string-array name="revanced_external_downloader_video_label">
         <item>NewPipe</item>
         <item>Seal</item>
@@ -235,25 +253,17 @@
         <item>HEART_TINT</item>
         <item>HIDDEN</item>
     </string-array>
-    <string-array name="revanced_spoof_streaming_data_type_android_entries">
-        <item>@string/revanced_spoof_streaming_data_type_entry_android_unplugged</item>
+    <string-array name="revanced_spoof_streaming_data_type_entries">
         <item>@string/revanced_spoof_streaming_data_type_entry_android_vr</item>
-    </string-array>
-    <string-array name="revanced_spoof_streaming_data_type_android_entry_values">
-        <item>ANDROID_UNPLUGGED</item>
-        <item>ANDROID_VR</item>
-    </string-array>
-    <string-array name="revanced_spoof_streaming_data_type_android_ios_entries">
-        <item>@string/revanced_spoof_streaming_data_type_entry_ios</item>
+        <item>@string/revanced_spoof_streaming_data_type_entry_android_unplugged</item>
         <item>@string/revanced_spoof_streaming_data_type_entry_ios_unplugged</item>
-        <item>@string/revanced_spoof_streaming_data_type_entry_android_unplugged</item>
-        <item>@string/revanced_spoof_streaming_data_type_entry_android_vr</item>
+        <item>@string/revanced_spoof_streaming_data_type_entry_ios</item>
     </string-array>
-    <string-array name="revanced_spoof_streaming_data_type_android_ios_entry_values">
-        <item>IOS</item>
-        <item>IOS_UNPLUGGED</item>
-        <item>ANDROID_UNPLUGGED</item>
+    <string-array name="revanced_spoof_streaming_data_type_entry_values">
         <item>ANDROID_VR</item>
+        <item>ANDROID_UNPLUGGED</item>
+        <item>IOS_UNPLUGGED</item>
+        <item>IOS</item>
     </string-array>
     <string-array name="revanced_spoof_app_version_target_entries">
     </string-array>
diff --git a/patches/src/main/resources/youtube/settings/host/values/strings.xml b/patches/src/main/resources/youtube/settings/host/values/strings.xml
index 57025c2a6..3b0b6825a 100644
--- a/patches/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/patches/src/main/resources/youtube/settings/host/values/strings.xml
@@ -320,6 +320,7 @@ If the layout of the player screen changes due to server-side changes, unintende
 
     <string name="revanced_change_start_page_title">Change start page</string>
     <string name="revanced_change_start_page_entry_browse">Browse channels</string>
+    <string name="revanced_change_start_page_entry_courses">Courses / Learning</string>
     <string name="revanced_change_start_page_entry_default">Default</string>
     <string name="revanced_change_start_page_entry_explore">Explore</string>
     <string name="revanced_change_start_page_entry_gaming">Gaming</string>
@@ -329,12 +330,14 @@ If the layout of the player screen changes due to server-side changes, unintende
     <string name="revanced_change_start_page_entry_live">Live</string>
     <string name="revanced_change_start_page_entry_movies">Movies</string>
     <string name="revanced_change_start_page_entry_music">Music</string>
+    <string name="revanced_change_start_page_entry_notifications">Notifications</string>
     <string name="revanced_change_start_page_entry_search">Search</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Sports</string>
     <string name="revanced_change_start_page_entry_subscriptions">Subscriptions</string>
     <string name="revanced_change_start_page_entry_trending">Trending</string>
     <string name="revanced_change_start_page_entry_watch_later">Watch later</string>
+    <string name="revanced_change_start_page_entry_your_clips">Your clips</string>
     <string name="revanced_change_start_page_type_title">Change start page type</string>
     <string name="revanced_change_start_page_type_summary_on">"Start page always changes.
 
@@ -540,12 +543,9 @@ Also, ads will no longer be blocked in Shorts.
 
 If this setting do not take effect, try switching to Incognito mode."</string>
 
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Disable light translucent bar</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Light mode navigation bar is opaque.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Light mode navigation bar is opaque or translucent.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Disable dark translucent bar</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Dark mode navigation bar is opaque.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Dark mode navigation bar is opaque or translucent.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Enable translucent navigation bar</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">Navigation bar is translucent.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">Navigation bar is opaque.</string>
     <string name="revanced_hide_navigation_bar_title">Hide navigation bar</string>
     <string name="revanced_hide_navigation_bar_summary_on">Navigation bar is hidden.</string>
     <string name="revanced_hide_navigation_bar_summary_off">Navigation bar is shown.</string>
@@ -926,6 +926,16 @@ Settings → Autoplay → Autoplay next video"</string>
     <string name="revanced_disable_engagement_panel_title">Disable engagement panel</string>
     <string name="revanced_disable_engagement_panel_summary_on">Engagement panel is disabled.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Engagement panel is enabled.</string>
+    <string name="revanced_enter_fullscreen_title">Enter fullscreen mode when video starts</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Enter fullscreen mode when the video starts.
+
+Limitation: Does not work if the player is minimized, in PiP mode, or in the background."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Do not enter fullscreen mode when the video starts.</string>
+    <string name="revanced_exit_fullscreen_title">Exit fullscreen mode at end of video</string>
+    <string name="revanced_exit_fullscreen_entry_1">Disabled</string>
+    <string name="revanced_exit_fullscreen_entry_2">Portrait</string>
+    <string name="revanced_exit_fullscreen_entry_3">Landscape</string>
+    <string name="revanced_exit_fullscreen_entry_4">Portrait and landscape</string>
     <string name="revanced_show_video_title_section_title">Show video title section</string>
     <string name="revanced_show_video_title_section_summary">"Shows the video title section in fullscreen.
 
@@ -983,11 +993,6 @@ Limitation: Video title disappears when clicked."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Enable compact controls overlay</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Controls overlay does not fill the fullscreen.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Controls overlay fills the fullscreen.</string>
-    <string name="revanced_force_fullscreen_title">Force fullscreen</string>
-    <string name="revanced_force_fullscreen_summary">"Videos will be switched to fullscreen in the following situations:
-
-• When a video is started.
-• When a timestamp in the comments is clicked on."</string>
     <string name="revanced_keep_landscape_mode_title">Keep landscape mode</string>
     <string name="revanced_keep_landscape_mode_summary">Keeps landscape mode when turning the screen off and on in fullscreen.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Keep landscape mode timeout</string>
@@ -1482,12 +1487,18 @@ No margins on top and bottom of player."</string>
     <string name="revanced_disable_hdr_auto_brightness_title">Disable auto HDR brightness</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Auto HDR brightness is disabled.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Auto HDR brightness is enabled.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Disable watch panel gestures</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Entering fullscreen when swiping down below the video player is disabled.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Entering fullscreen when swiping down below the video player is enabled.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Disable swipe to change video</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">Swiping up / down will not play the next / previous video.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">Swiping up / down will play the next / previous video.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">Swiping up / down in fullscreen mode will not change to the next / previous video.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">Swiping up / down in fullscreen mode will change to the next / previous video.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Disable swipe to enter fullscreen mode (below the player)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Swiping down below the player will not enter fullscreen mode.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Swiping down below the player will enter fullscreen mode.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Disable swipe to enter fullscreen mode (in the player)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Swiping up in the player will not enter fullscreen mode.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Swiping up in the player will enter fullscreen mode.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Disable swipe to exit fullscreen mode</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Swiping down in fullscreen will not exit fullscreen mode.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Swiping down in fullscreen will exit fullscreen mode.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Auto</string>
 
 
@@ -1500,9 +1511,6 @@ No margins on top and bottom of player."</string>
     <string name="revanced_disable_hdr_video_title">Disable HDR video</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR video is disabled.</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR video is enabled.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Disable playback speed for live streams</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Default playback speed is disabled for live streams.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Default playback speed is enabled for live streams.</string>
     <string name="revanced_enable_custom_playback_speed_title">Enable custom playback speed</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Custom playback speed is enabled.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Custom playback speed is disabled.</string>
@@ -1527,10 +1535,11 @@ No margins on top and bottom of player."</string>
     <string name="revanced_restore_old_video_quality_menu_summary_on">Old video quality menu is shown.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Old video quality menu is not shown.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Disable playback speed for music</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"Default playback speed is disabled for music.
-
-Limitation: This setting may not apply to videos that do not include the 'Listen on YouTube Music' banner."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">Default playback speed is disabled for music.</string>
     <string name="revanced_disable_default_playback_speed_music_off">Default playback speed is enabled for music.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Validate using categories</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">Default playback speed is disabled if the video category is Music.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">Default playback speed is disabled for videos playable on YouTube Music.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Enable Shorts default playback speed</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Default playback speed applies to Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Default playback speed does not apply to Shorts.</string>
@@ -1912,26 +1921,44 @@ Tap the continue button and allow optimization changes."</string>
     <string name="revanced_spoof_streaming_data_summary_off">"Streaming data is not spoofed. Video playback may not work."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Turning off this setting may cause video playback issues.</string>
     <string name="revanced_spoof_streaming_data_type_title">Default client</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Login required)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(PoToken required)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Login required)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Spoofing side effects</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Not yet found.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Movies or paid videos may not play.</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• Audio track menu is missing.
 • Stable volume is not available.
-• Disable forced auto audio tracks is not available."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Use Android clients only</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Android clients are used to fetch streaming data.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Android and iOS clients are used to fetch streaming data.</string>
-    <string name="revanced_spoof_streaming_data_android_only_user_dialog_message">Turning off this setting may cause video playback issues.</string>
+• Disable forced auto audio tracks is not available.
+• Kids videos may not play when logged out or in incognito mode."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• There may be playback issues (PoToken required).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Movies or paid videos may not play.
+• Kids videos may not play when logged out or in incognito mode."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Force iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Video codec is forced to AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Video codec is determined automatically.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Enabling this might improve battery life and fix playback stuttering.
+
+AVC has a maximum resolution of 1080p, Opus audio codec is not available, and video playback will use more internet data than VP9 or AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Show in Stats for nerds</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Client used to fetch streaming data is shown in Stats for nerds.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Client used to fetch streaming data is hidden in Stats for nerds.</string>
 
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken to use</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken issued by BotGuard in a trusted browser.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData to use</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData issued by BotGuard in a trusted browser.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">About PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Some clients require PoToken and VisitorData to get a valid streaming data response.
+
+If you are trying to use iOS as the default client, you may need these values.
+
+Click to see more information."</string>
+
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Watch history</string>
     <string name="revanced_preference_screen_watch_history_summary">Change settings related with watch history.</string>
diff --git a/patches/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml b/patches/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
index a28d8d595..97927c4fa 100644
--- a/patches/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
+++ b/patches/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
@@ -16,10 +16,10 @@
             android:background="@color/yt_white1"
             android:elevation="0dp">
 
-            <android.widget.Toolbar
+            <android.support.v7.widget.Toolbar
                 android:id="@+id/revanced_toolbar"
-                android:layout_width="0.0dip"
-                android:layout_height="0.0dip"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
                 android:background="?attr/ytBrandBackgroundSolid"
                 app:navigationIcon="@drawable/yt_outline_arrow_left_black_24"
                 app:title="@string/revanced_extended_settings_title" />
diff --git a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index dbe7b8c0e..f3124f384 100644
--- a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -214,8 +214,7 @@
             <PreferenceCategory android:title="@string/revanced_preference_category_experimental_flag" android:layout="@layout/revanced_settings_preferences_category"/>SETTINGS: HIDE_NAVIGATION_COMPONENTS -->
 
             <!-- SETTINGS: TRANSLUCENT_NAVIGATION_BAR
-            <SwitchPreference android:title="@string/revanced_disable_translucent_navigation_bar_light_title" android:key="revanced_disable_translucent_navigation_bar_light" android:summaryOn="@string/revanced_disable_translucent_navigation_bar_light_summary_on" android:summaryOff="@string/revanced_disable_translucent_navigation_bar_light_summary_off" />
-            <SwitchPreference android:title="@string/revanced_disable_translucent_navigation_bar_dark_title" android:key="revanced_disable_translucent_navigation_bar_dark" android:summaryOn="@string/revanced_disable_translucent_navigation_bar_dark_summary_on" android:summaryOff="@string/revanced_disable_translucent_navigation_bar_dark_summary_off" />SETTINGS: TRANSLUCENT_NAVIGATION_BAR -->
+            <SwitchPreference android:title="@string/revanced_enable_translucent_navigation_bar_title" android:key="revanced_enable_translucent_navigation_bar" android:summaryOn="@string/revanced_enable_translucent_navigation_bar_summary_on" android:summaryOff="@string/revanced_enable_translucent_navigation_bar_summary_off" />SETTINGS: TRANSLUCENT_NAVIGATION_BAR -->
 
             <!-- SETTINGS: HIDE_NAVIGATION_COMPONENTS
             <SwitchPreference android:title="@string/revanced_hide_navigation_bar_title" android:key="revanced_hide_navigation_bar" android:summaryOn="@string/revanced_hide_navigation_bar_summary_on" android:summaryOff="@string/revanced_hide_navigation_bar_summary_off" />
@@ -401,6 +400,8 @@
         <!-- SETTINGS: FULLSCREEN_COMPONENTS
         <PreferenceScreen android:title="@string/revanced_preference_screen_fullscreen_title" android:key="revanced_preference_screen_fullscreen" android:summary="@string/revanced_preference_screen_fullscreen_summary">
             <SwitchPreference android:title="@string/revanced_disable_engagement_panel_title" android:key="revanced_disable_engagement_panel" android:summaryOn="@string/revanced_disable_engagement_panel_summary_on" android:summaryOff="@string/revanced_disable_engagement_panel_summary_off" />
+            <SwitchPreference android:title="@string/revanced_enter_fullscreen_title" android:key="revanced_enter_fullscreen" android:summaryOn="@string/revanced_enter_fullscreen_summary_on" android:summaryOff="@string/revanced_enter_fullscreen_summary_off" />
+            <ListPreference android:entries="@array/revanced_exit_fullscreen_entries" android:title="@string/revanced_exit_fullscreen_title" android:key="revanced_exit_fullscreen" android:entryValues="@array/revanced_exit_fullscreen_entry_values" />
             <SwitchPreference android:title="@string/revanced_show_video_title_section_title" android:key="revanced_show_video_title_section" android:summary="@string/revanced_show_video_title_section_summary" />
             <SwitchPreference android:title="@string/revanced_hide_autoplay_preview_title" android:key="revanced_hide_autoplay_preview" android:summaryOn="@string/revanced_hide_autoplay_preview_summary_on" android:summaryOff="@string/revanced_hide_autoplay_preview_summary_off" />
             <SwitchPreference android:title="@string/revanced_hide_live_chat_replay_button_title" android:key="revanced_hide_live_chat_replay_button" android:summaryOn="@string/revanced_hide_live_chat_replay_button_summary_on" android:summaryOff="@string/revanced_hide_live_chat_replay_button_summary_off" />
@@ -420,8 +421,7 @@
             </PreferenceCategory>
             <PreferenceCategory android:title="@string/revanced_preference_category_experimental_flag" android:layout="@layout/revanced_settings_preferences_category"/>
             <SwitchPreference android:title="@string/revanced_disable_landscape_mode_title" android:key="revanced_disable_landscape_mode" android:summaryOn="@string/revanced_disable_landscape_mode_summary_on" android:summaryOff="@string/revanced_disable_landscape_mode_summary_off" />
-            <SwitchPreference android:title="@string/revanced_enable_compact_controls_overlay_title" android:key="revanced_enable_compact_controls_overlay" android:summaryOn="@string/revanced_enable_compact_controls_overlay_summary_on" android:summaryOff="@string/revanced_enable_compact_controls_overlay_summary_off" />
-            <SwitchPreference android:title="@string/revanced_force_fullscreen_title" android:key="revanced_force_fullscreen" android:summary="@string/revanced_force_fullscreen_summary" />SETTINGS: FULLSCREEN_COMPONENTS -->
+            <SwitchPreference android:title="@string/revanced_enable_compact_controls_overlay_title" android:key="revanced_enable_compact_controls_overlay" android:summaryOn="@string/revanced_enable_compact_controls_overlay_summary_on" android:summaryOff="@string/revanced_enable_compact_controls_overlay_summary_off" />SETTINGS: FULLSCREEN_COMPONENTS -->
 
             <!-- SETTINGS: KEEP_LANDSCAPE_MODE
             <SwitchPreference android:title="@string/revanced_keep_landscape_mode_title" android:key="revanced_keep_landscape_mode" android:summary="@string/revanced_keep_landscape_mode_summary" />
@@ -675,10 +675,12 @@
         <!-- SETTINGS: DISABLE_SWIPE_TO_SWITCH_VIDEO
         <SwitchPreference android:title="@string/revanced_disable_swipe_to_switch_video_title" android:key="revanced_disable_swipe_to_switch_video" android:summaryOn="@string/revanced_disable_swipe_to_switch_video_summary_on" android:summaryOff="@string/revanced_disable_swipe_to_switch_video_summary_off" />SETTINGS: DISABLE_SWIPE_TO_SWITCH_VIDEO -->
 
-        <!-- SETTINGS: DISABLE_WATCH_PANEL_GESTURES
-        <SwitchPreference android:title="@string/revanced_disable_watch_panel_gestures_title" android:key="revanced_disable_watch_panel_gestures" android:summaryOn="@string/revanced_disable_watch_panel_gestures_summary_on" android:summaryOff="@string/revanced_disable_watch_panel_gestures_summary_off" />SETTINGS: DISABLE_WATCH_PANEL_GESTURES -->
+        <!-- SETTINGS: DISABLE_SWIPE_TO_ENTER_FULLSCREEN_MODE_BELOW_THE_PLAYER
+        <SwitchPreference android:title="@string/revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title" android:key="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player" android:summaryOn="@string/revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on" android:summaryOff="@string/revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off" />SETTINGS: DISABLE_SWIPE_TO_ENTER_FULLSCREEN_MODE_BELOW_THE_PLAYER -->
 
-    <!-- PREFERENCE_SCREEN: SWIPE_CONTROLS
+        <!-- PREFERENCE_SCREEN: SWIPE_CONTROLS
+        <SwitchPreference android:title="@string/revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title" android:key="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player" android:summaryOn="@string/revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on" android:summaryOff="@string/revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_swipe_to_exit_fullscreen_mode_title" android:key="revanced_disable_swipe_to_exit_fullscreen_mode" android:summaryOn="@string/revanced_disable_swipe_to_exit_fullscreen_mode_summary_on" android:summaryOff="@string/revanced_disable_swipe_to_exit_fullscreen_mode_summary_off" />
     </PreferenceScreen>PREFERENCE_SCREEN: SWIPE_CONTROLS -->
 
 
@@ -688,7 +690,6 @@
         <ListPreference android:title="@string/revanced_default_video_quality_mobile_title" android:key="revanced_default_video_quality_mobile" android:entries="@array/revanced_default_video_quality_entries" android:entryValues="@array/revanced_default_video_quality_entry_values" />
         <ListPreference android:title="@string/revanced_default_video_quality_wifi_title" android:key="revanced_default_video_quality_wifi" android:entries="@array/revanced_default_video_quality_entries" android:entryValues="@array/revanced_default_video_quality_entry_values" />
         <SwitchPreference android:title="@string/revanced_disable_hdr_video_title" android:key="revanced_disable_hdr_video" android:summaryOn="@string/revanced_disable_hdr_video_summary_on" android:summaryOff="@string/revanced_disable_hdr_video_summary_off" />
-        <SwitchPreference android:title="@string/revanced_disable_default_playback_speed_live_title" android:key="revanced_disable_default_playback_speed_live" android:summaryOn="@string/revanced_disable_default_playback_speed_live_summary_on" android:summaryOff="@string/revanced_disable_default_playback_speed_live_summary_off" />
         <SwitchPreference android:title="@string/revanced_enable_custom_playback_speed_title" android:key="revanced_enable_custom_playback_speed" android:summaryOn="@string/revanced_enable_custom_playback_speed_summary_on" android:summaryOff="@string/revanced_enable_custom_playback_speed_summary_off" />
         <SwitchPreference android:title="@string/revanced_custom_playback_speed_menu_type_title" android:key="revanced_custom_playback_speed_menu_type" android:summaryOn="@string/revanced_custom_playback_speed_menu_type_summary_on" android:summaryOff="@string/revanced_custom_playback_speed_menu_type_summary_off" />
         <app.revanced.extension.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_custom_playback_speeds_title" android:key="revanced_custom_playback_speeds" android:summary="@string/revanced_custom_playback_speeds_summary" android:inputType="textMultiLine" />
@@ -699,6 +700,7 @@
         <SwitchPreference android:title="@string/revanced_restore_old_video_quality_menu_title" android:key="revanced_restore_old_video_quality_menu" android:summaryOn="@string/revanced_restore_old_video_quality_menu_summary_on" android:summaryOff="@string/revanced_restore_old_video_quality_menu_summary_off" />
         <PreferenceCategory android:title="@string/revanced_preference_category_experimental_flag" android:layout="@layout/revanced_settings_preferences_category"/>
         <SwitchPreference android:title="@string/revanced_disable_default_playback_speed_music_title" android:key="revanced_disable_default_playback_speed_music" android:summaryOn="@string/revanced_disable_default_playback_speed_music_on" android:summaryOff="@string/revanced_disable_default_playback_speed_music_off" />
+        <SwitchPreference android:title="@string/revanced_disable_default_playback_speed_music_type_title" android:key="revanced_disable_default_playback_speed_music_type" android:summaryOn="@string/revanced_disable_default_playback_speed_music_type_on" android:summaryOff="@string/revanced_disable_default_playback_speed_music_type_off" />
         <SwitchPreference android:title="@string/revanced_enable_default_playback_speed_shorts_title" android:key="revanced_enable_default_playback_speed_shorts" android:summaryOn="@string/revanced_enable_default_playback_speed_shorts_summary_on" android:summaryOff="@string/revanced_enable_default_playback_speed_shorts_summary_off" />
         <SwitchPreference android:title="@string/revanced_skip_preloaded_buffer_title" android:key="revanced_skip_preloaded_buffer" android:summary="@string/revanced_skip_preloaded_buffer_summary" />
         <SwitchPreference android:title="@string/revanced_skip_preloaded_buffer_toast_title" android:key="revanced_skip_preloaded_buffer_toast" android:summaryOn="@string/revanced_skip_preloaded_buffer_toast_summary_on" android:summaryOff="@string/revanced_skip_preloaded_buffer_toast_summary_off" android:dependency="revanced_skip_preloaded_buffer" />
@@ -791,10 +793,16 @@
         <!-- SETTINGS: SPOOF_STREAMING_DATA
         <PreferenceScreen android:title="@string/revanced_preference_screen_spoof_streaming_data_title" android:key="revanced_preference_screen_spoof_streaming_data" android:summary="@string/revanced_preference_screen_spoof_streaming_data_summary">
             <SwitchPreference android:title="@string/revanced_spoof_streaming_data_title" android:key="revanced_spoof_streaming_data" android:summaryOn="@string/revanced_spoof_streaming_data_summary_on" android:summaryOff="@string/revanced_spoof_streaming_data_summary_off" />
-            <app.revanced.extension.youtube.settings.preference.SpoofStreamingDataDefaultClientListPreference android:title="@string/revanced_spoof_streaming_data_type_title" android:key="revanced_spoof_streaming_data_type" />
+            <ListPreference android:entries="@array/revanced_spoof_streaming_data_type_entries" android:title="@string/revanced_spoof_streaming_data_type_title" android:key="revanced_spoof_streaming_data_type" android:entryValues="@array/revanced_spoof_streaming_data_type_entry_values" android:dependency="revanced_spoof_streaming_data" />
             <app.revanced.extension.youtube.settings.preference.SpoofStreamingDataSideEffectsPreference android:title="@string/revanced_spoof_streaming_data_side_effects_title" />
-            <SwitchPreference android:title="@string/revanced_spoof_streaming_data_android_only_title" android:key="revanced_spoof_streaming_data_android_only" android:summaryOn="@string/revanced_spoof_streaming_data_android_only_summary_on" android:summaryOff="@string/revanced_spoof_streaming_data_android_only_summary_off" android:dependency="revanced_spoof_streaming_data" />
+            <SwitchPreference android:title="@string/revanced_spoof_streaming_data_ios_force_avc_title" android:key="revanced_spoof_streaming_data_ios_force_avc" android:summaryOn="@string/revanced_spoof_streaming_data_ios_force_avc_summary_on" android:summaryOff="@string/revanced_spoof_streaming_data_ios_force_avc_summary_off" android:dependency="revanced_spoof_streaming_data" />
             <SwitchPreference android:title="@string/revanced_spoof_streaming_data_stats_for_nerds_title" android:key="revanced_spoof_streaming_data_stats_for_nerds" android:summaryOn="@string/revanced_spoof_streaming_data_stats_for_nerds_summary_on" android:summaryOff="@string/revanced_spoof_streaming_data_stats_for_nerds_summary_off" android:dependency="revanced_spoof_streaming_data" />
+            <PreferenceCategory android:title="@string/revanced_preference_category_po_token_visitor_data" android:layout="@layout/revanced_settings_preferences_category" />
+            <app.revanced.extension.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_spoof_streaming_data_po_token_title" android:key="revanced_spoof_streaming_data_po_token" android:summary="@string/revanced_spoof_streaming_data_po_token_summary" android:inputType="text" android:dependency="revanced_spoof_streaming_data" />
+            <app.revanced.extension.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_spoof_streaming_data_visitor_data_title" android:key="revanced_spoof_streaming_data_visitor_data" android:summary="@string/revanced_spoof_streaming_data_visitor_data_summary" android:inputType="text" android:dependency="revanced_spoof_streaming_data" />
+            <Preference android:title="@string/revanced_spoof_streaming_data_po_token_visitor_data_about_title" android:summary="@string/revanced_spoof_streaming_data_po_token_visitor_data_about_summary" android:dependency="revanced_spoof_streaming_data">
+                <intent android:action="android.intent.action.VIEW" android:data="https://github.com/iv-org/youtube-trusted-session-generator?tab=readme-ov-file#youtube-trusted-session-generator" />
+            </Preference>
         </PreferenceScreen>SETTINGS: SPOOF_STREAMING_DATA -->
 
         <!-- SETTINGS: WATCH_HISTORY
diff --git a/patches/src/main/resources/youtube/translations/ar/strings.xml b/patches/src/main/resources/youtube/translations/ar/strings.xml
index 9ff0df85f..1de084fcb 100644
--- a/patches/src/main/resources/youtube/translations/ar/strings.xml
+++ b/patches/src/main/resources/youtube/translations/ar/strings.xml
@@ -66,7 +66,7 @@
     <string name="revanced_alt_thumbnail_options_entry_3">DeArrow &amp; اللقطات الثابتة</string>
     <string name="revanced_alt_thumbnail_options_entry_4">اللقطات الثابتة</string>
     <string name="revanced_alt_thumbnail_dearrow_about_title">DeArrow</string>
-    <string name="revanced_alt_thumbnail_dearrow_about_summary">"يوفر DeArrow مُصغَّرات فيديو من مصادر جماعية لمقاطع فيديو YouTube. غالبًا ما تكون مُصغَّرات فيديو هذه ذات صلة أكثر من تلك التي يقدمها موقع YouTube.
+    <string name="revanced_alt_thumbnail_dearrow_about_summary">"يوفر DeArrow مُصغَّرات فيديو من مصادر جماعية لفيديوهات YouTube. غالبًا ما تكون مُصغَّرات الفيديو هذه ذات صلة أكثر من تلك التي يقدمها موقع YouTube.
 
 في حالة التمكين، سيتم إرسال عناوين URL للفيديو إلى خادم API ولن يتم إرسال أي بيانات أخرى. إذا لم يكن الفيديو يحتوي على مُصغَّرات لـ DeArrow، فسيتم عرض اللقطات الأصلية أو الثابتة.
 
@@ -109,7 +109,7 @@
     <string name="revanced_hide_chips_shelf_title">إخفاء رف الشرائح</string>
     <string name="revanced_hide_chips_shelf_on">تم إخفاء رف الشرائح.</string>
     <string name="revanced_hide_chips_shelf_off">يتم عرض رف الشرائح.</string>
-    <string name="revanced_hide_expandable_chip_title">إخفاء الشريحة القابلة للتوسع تحت مقاطع الفيديو</string>
+    <string name="revanced_hide_expandable_chip_title">إخفاء الشريحة القابلة للتوسع تحت الفيديوهات</string>
     <string name="revanced_hide_expandable_chip_summary_on">تم إخفاء الرقائق القابلة للتوسيع.</string>
     <string name="revanced_hide_expandable_chip_summary_off">يتم عرض الرقائق القابلة للتوسيع.</string>
     <string name="revanced_hide_expandable_shelf_title">إخفاء الرفوف القابلة للتوسع</string>
@@ -133,9 +133,9 @@
     <string name="revanced_hide_latest_posts_title">إخفاء آخر المشاركات</string>
     <string name="revanced_hide_latest_posts_summary_on">تم إخفاء أحدث المشاركات.</string>
     <string name="revanced_hide_latest_posts_summary_off">يتم عرض أحدث المشاركات.</string>
-    <string name="revanced_hide_latest_videos_button_title">إخفاء زر أحدث مقاطع الفيديو</string>
-    <string name="revanced_hide_latest_videos_button_summary_on">تم إخفاء زر أحدث مقاطع الفيديو.</string>
-    <string name="revanced_hide_latest_videos_button_summary_off">يتم عرض زر أحدث مقاطع الفيديو.</string>
+    <string name="revanced_hide_latest_videos_button_title">إخفاء زر أحدث الفيديوهات</string>
+    <string name="revanced_hide_latest_videos_button_summary_on">تم إخفاء زر أحدث الفيديوهات.</string>
+    <string name="revanced_hide_latest_videos_button_summary_off">يتم عرض زر أحدث الفيديوهات.</string>
     <string name="revanced_hide_mix_playlists_title">إخفاء قوائم تشغيل التشكيلة</string>
     <string name="revanced_hide_mix_playlists_summary_on">تم إخفاء قوائم تشغيل التشكيلة.</string>
     <string name="revanced_hide_mix_playlists_summary_off">يتم عرض قوائم تشغيل التشكيلة.</string>
@@ -159,13 +159,13 @@
     <string name="revanced_hide_ticket_shelf_summary_off">يتم عرض رفوف التذاكر.</string>
     <!-- PreferenceScreen: Feed, PreferenceCategory: Feed, PreferenceScreen: Category bar -->
     <string name="revanced_preference_screen_category_bar_title">شريط الفئة</string>
-    <string name="revanced_preference_screen_category_bar_summary">إخفاء شريط الفئة أو عرضه في الموجز والبحث ومقاطع الفيديو ذات الصلة.</string>
+    <string name="revanced_preference_screen_category_bar_summary">إخفاء شريط الفئة أو عرضه في الموجز والبحث والفيديوهات ذات الصلة.</string>
     <string name="revanced_hide_category_bar_in_feed_title">إخفاء في الموجز</string>
     <string name="revanced_hide_category_bar_in_feed_summary_on">مخفي في الموجز.</string>
     <string name="revanced_hide_category_bar_in_feed_summary_off">يُعرض في الموجز.</string>
-    <string name="revanced_hide_category_bar_in_related_videos_title">إخفاء في مقاطع الفيديو ذات الصلة</string>
-    <string name="revanced_hide_category_bar_in_related_videos_summary_on">مخفي في مقاطع الفيديو ذات الصلة.</string>
-    <string name="revanced_hide_category_bar_in_related_videos_summary_off">يُعرض في مقاطع الفيديو ذات الصلة.</string>
+    <string name="revanced_hide_category_bar_in_related_videos_title">إخفاء في الفيديوهات ذات الصلة</string>
+    <string name="revanced_hide_category_bar_in_related_videos_summary_on">مخفي في الفيديوهات ذات الصلة.</string>
+    <string name="revanced_hide_category_bar_in_related_videos_summary_off">يُعرض في الفيديوهات ذات الصلة.</string>
     <string name="revanced_hide_category_bar_in_search_title">إخفاء في نتائج البحث</string>
     <string name="revanced_hide_category_bar_in_search_summary_on">مخفي في نتائج البحث.</string>
     <string name="revanced_hide_category_bar_in_search_summary_off">يُعرض في نتائج البحث.</string>
@@ -252,12 +252,12 @@
     <!-- PreferenceScreen: Feed, PreferenceCategory: Feed, PreferenceScreen: Video filter, PreferenceCategory: Recommended video -->
     <string name="revanced_preference_category_recommended_video">الفيديو الموصى به</string>
     <string name="revanced_hide_recommended_video_title">إخفاء الفيديوهات الموصى بها</string>
-    <string name="revanced_hide_recommended_video_summary">"يخفي مقاطع الفيديو الموصى بها التالية:
+    <string name="revanced_hide_recommended_video_summary">"يخفي الفيديوهات الموصى بها التالية:
 
-• مقاطع الفيديو التي تحمل علامة للأعضاء فقط.
-• مقاطع فيديو تحتوي على عبارات مثل 'شاهد الأشخاص أيضًا' أسفلها."</string>
+• الفيديوهات التي تحمل علامة للأعضاء فقط.
+• فيديوهات تحتوي على عبارات مثل 'شاهد الأشخاص أيضًا' أسفلها."</string>
     <string name="revanced_hide_low_views_video_title">إخفاء فيديو المشاهدات المنخفضة</string>
-    <string name="revanced_hide_low_views_video_summary">إخفاء مقاطع الفيديو التي حصلت على أقل من 1000 مشاهدة من موجز الصفحة الرئيسية التي تم تحميلها من القنوات غير المشترك بها.</string>
+    <string name="revanced_hide_low_views_video_summary">إخفاء الفيديوهات التي حصلت على أقل من 1000 مشاهدة من موجز الصفحة الرئيسية التي تم تحميلها من القنوات غير المشترك بها.</string>
     <!-- PreferenceScreen: Feed, PreferenceCategory: Feed, PreferenceScreen: Video filter, PreferenceCategory: View count filter -->
     <string name="revanced_preference_category_view_counts_filter">تصفية عدد المشاهدات</string>
     <string name="revanced_hide_video_by_view_counts_home_title">إخفاء فيديوهات الصفحة الرئيسية حسب عدد المشاهدات</string>
@@ -277,10 +277,9 @@
     <string name="revanced_hide_video_view_counts_multiplier_summary">حدد قالب اللغة الخاص بك لعدد مرات المشاهدة الموضحة أسفل كل فيديو في واجهة المستخدم. كل مفتاح (حرف/كلمة في لغتك) -&gt; قيمة (معنى المفتاح) يجب أن يكون على سطر جديد. المفاتيح تذهب قبل علامة \"-&gt;\". إذا قمت بتغيير التطبيق أو لغة النظام، فستحتاج إلى إعادة تعيين هذا الإعداد.\n\nأمثلة:\nEnglish: 10K views = K -&gt; 1000, views -&gt; views\nSpanish: 10 K vistas = K -&gt; 1000, vistas -&gt; views</string>
     <string name="revanced_hide_video_view_counts_multiplier_default_value">K -&gt; 1 000\nM -&gt; 1 000 000\nB -&gt; 1 000 000 000\nمشاهد -&gt; مشاهد</string>
     <string name="revanced_hide_video_by_view_counts_about_title">حول تصفية عدد المشاهدات</string>
-    <string name="revanced_hide_video_by_view_counts_about_summary">"الصفحة الرئيسية / الاشتراكات / تتم تصفية نتائج البحث لإخفاء مقاطع الفيديو التي حصلت على عدد مشاهدات أقل أو أكبر من عدد محدد.
+    <string name="revanced_hide_video_by_view_counts_about_summary">"الصفحة الرئيسية / الاشتراكات / تتم تصفية نتائج البحث لإخفاء الفيديوهات التي حصلت على عدد مشاهدات أقل أو أكبر من عدد محدد.
 
 القيود:
-
 • لا يمكن إخفاء فيديوهات Shorts.
 • لا تتم تصفية الفيديوهات التي حصلت على 0 مشاهدة."</string>
     <string name="revanced_hide_related_videos_title">إخفاء الفيديوهات ذات الصلة</string>
@@ -294,6 +293,7 @@
     <string name="revanced_preference_screen_general_title">عام</string>
     <string name="revanced_change_start_page_title">تغيير صفحة البداية</string>
     <string name="revanced_change_start_page_entry_browse">تصفح القنوات</string>
+    <string name="revanced_change_start_page_entry_courses">الدورات / التعلم</string>
     <string name="revanced_change_start_page_entry_default">الافتراضي</string>
     <string name="revanced_change_start_page_entry_explore">اكتشف</string>
     <string name="revanced_change_start_page_entry_gaming">ألعاب فيديو</string>
@@ -303,12 +303,14 @@
     <string name="revanced_change_start_page_entry_live">بث مباشر</string>
     <string name="revanced_change_start_page_entry_movies">أفلام</string>
     <string name="revanced_change_start_page_entry_music">موسيقى</string>
+    <string name="revanced_change_start_page_entry_notifications">الإشعارات</string>
     <string name="revanced_change_start_page_entry_search">البحث</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">رياضة</string>
     <string name="revanced_change_start_page_entry_subscriptions">الاشتراكات</string>
     <string name="revanced_change_start_page_entry_trending">المحتوى الرائج</string>
     <string name="revanced_change_start_page_entry_watch_later">المشاهدة لاحقًا</string>
+    <string name="revanced_change_start_page_entry_your_clips">فيديوهاتك</string>
     <string name="revanced_change_start_page_type_title">تغيير نوع صفحة البداية</string>
     <string name="revanced_change_start_page_type_summary_on">"تتغير صفحة البدء دائمًا.
 
@@ -497,12 +499,9 @@
 كما لن يتم حظر الإعلانات في فيديوهات Shorts بعد الآن.
 
 إذا لم يتم تفعيل هذا الإعداد، فحاول التبديل إلى وضع التصفح المتخفي."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">تعطيل الشريط الشفاف الفاتح</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">شريط التنقل في الوضع الفاتح غير شفاف.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">شريط التنقل في الوضع الفاتح معتم او شفاف.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">تعطيل الشريط الشفاف الداكن</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">شريط التنقل في الوضع الداكن غير شفاف.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">شريط التنقل في الوضع الداكن معتم او شفاف.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">تمكين شريط التنقل الشفاف</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">شريط التنقل شفاف.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">شريط التنقل غير شفاف.</string>
     <string name="revanced_hide_navigation_bar_title">إخفاء شريط التنقل</string>
     <string name="revanced_hide_navigation_bar_summary_on">تم إخفاء شريط التنقل.</string>
     <string name="revanced_hide_navigation_bar_summary_off">يتم عرض شريط التنقل.</string>
@@ -748,7 +747,7 @@
     <string name="revanced_disable_ambient_mode_in_fullscreen_summary_off">تم تمكين وضع الإضاءة السينمائية في ملء الشاشة.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Channel bar -->
     <string name="revanced_preference_screen_channel_bar_title">شريط القناة</string>
-    <string name="revanced_preference_screen_channel_bar_summary">إخفاء أو عرض مكونات شريط القناة تحت مقاطع الفيديو.</string>
+    <string name="revanced_preference_screen_channel_bar_summary">إخفاء أو عرض مكونات شريط القناة تحت الفيديوهات.</string>
     <string name="revanced_hide_join_button_title">إخفاء زر الانضمام</string>
     <string name="revanced_hide_join_button_summary_on">تم إخفاء زر الانضمام.</string>
     <string name="revanced_hide_join_button_summary_off">يتم عرض زر الانضمام.</string>
@@ -862,6 +861,16 @@
     <string name="revanced_disable_engagement_panel_title">تعطيل لوحة المشاركة</string>
     <string name="revanced_disable_engagement_panel_summary_on">تم تعطيل لوحة المشاركة.</string>
     <string name="revanced_disable_engagement_panel_summary_off">تم تمكين لوحة المشاركة.</string>
+    <string name="revanced_enter_fullscreen_title">الدخول إلى وضع ملء الشاشة عند بدء تشغيل الفيديو</string>
+    <string name="revanced_enter_fullscreen_summary_on">"الدخول إلى وضع ملء الشاشة عند بدء تشغيل الفيديو.
+
+القيود: لا يعمل إذا تم تصغير المشغل أو في وضع صورة داخل صورة أو في الخلفية."</string>
+    <string name="revanced_enter_fullscreen_summary_off">لا تدخل وضع ملء الشاشة عند بدء تشغيل الفيديو.</string>
+    <string name="revanced_exit_fullscreen_title">الخروج من وضع ملء الشاشة في نهاية الفيديو</string>
+    <string name="revanced_exit_fullscreen_entry_1">معطَّل</string>
+    <string name="revanced_exit_fullscreen_entry_2">بالطول</string>
+    <string name="revanced_exit_fullscreen_entry_3">بالعرض</string>
+    <string name="revanced_exit_fullscreen_entry_4">بالطول و العرض</string>
     <string name="revanced_show_video_title_section_title">عرض قسم عنوان الفيديو</string>
     <string name="revanced_show_video_title_section_summary">"يعرض قسم عنوان الفيديو في وضع ملء الشاشة.
 
@@ -873,8 +882,8 @@
     <string name="revanced_hide_live_chat_replay_button_summary_on">تم إخفاء زر إعادة تشغيل المحادثات المباشرة.\n\nيظهر في وضع ملء الشاشة عند إغلاق المحادثات المباشرة.</string>
     <string name="revanced_hide_live_chat_replay_button_summary_off">يتم عرض زر إعادة تشغيل المحادثات المباشرة.\n\nيظهر في وضع ملء الشاشة عند إغلاق المحادثات المباشرة.</string>
     <string name="revanced_hide_related_video_overlay_title">إخفاء تراكب الفيديو ذي الصلة</string>
-    <string name="revanced_hide_related_video_overlay_summary_on">تم إخفاء قسم المزيد من مقاطع الفيديو في حاوية الإجراءات السريعة وواجهة الفيديو ذي الصلة.</string>
-    <string name="revanced_hide_related_video_overlay_summary_off">يتم عرض قسم المزيد من مقاطع الفيديو في حاوية الإجراءات السريعة وواجهة الفيديو ذي الصلة.</string>
+    <string name="revanced_hide_related_video_overlay_summary_on">تم إخفاء قسم المزيد من الفيديوهات في حاوية الإجراءات السريعة وواجهة الفيديو ذي الصلة.</string>
+    <string name="revanced_hide_related_video_overlay_summary_off">يتم عرض قسم المزيد من الفيديوهات في حاوية الإجراءات السريعة وواجهة الفيديو ذي الصلة.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Fullscreen, PreferenceCategory: Quick actions -->
     <string name="revanced_preference_category_quick_actions">الإجراءات السريعة</string>
     <string name="revanced_hide_quick_actions_title">إخفاء حاوية الإجراءات السريعة</string>
@@ -917,11 +926,6 @@
     <string name="revanced_enable_compact_controls_overlay_title">تمكين تراكب التحكم المدمج</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">لا يملأ تراكب عناصر التحكم الشاشة الكاملة.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">يملأ تراكب عناصر التحكم الشاشة الكاملة.</string>
-    <string name="revanced_force_fullscreen_title">فرض ملء الشاشة</string>
-    <string name="revanced_force_fullscreen_summary">"سيتم تحويل مقاطع الفيديو إلى وضع ملء الشاشة في المواقف التالية:
-
-• عند بدء تشغيل الفيديو.
-• عندما يتم النقر على الطابع الزمني في التعليقات."</string>
     <string name="revanced_keep_landscape_mode_title">الإبقاء على الوضع الأفقي</string>
     <string name="revanced_keep_landscape_mode_summary">يحافظ على الوضع الأفقي عند إيقاف تشغيل الشاشة وتشغيلها في وضع ملء الشاشة.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">مهلة إبقاء الوضع الأفقي</string>
@@ -1394,12 +1398,18 @@
     <string name="revanced_disable_hdr_auto_brightness_title">تعطيل سطوع HDR التلقائي</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">تم تعطيل سطوع HDR التلقائي.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">تم تمكين سطوع HDR التلقائي.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">تعطيل إيماءات لوح المشاهدة</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">تم تعطيل الدخول إلى وضع ملء الشاشة عند التمرير لأسفل أسفل مشغل الفيديو.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">تم تمكين الدخول إلى وضع ملء الشاشة عند التمرير لأسفل أسفل مشغل الفيديو.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">تعطيل التمرير لتغيير الفيديو</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">لن يؤدي التمرير لأعلى/لأسفل إلى تشغيل الفيديو التالي/السابق.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">سيؤدي التمرير لأعلى/لأسفل إلى تشغيل الفيديو التالي/السابق.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">لن يؤدي التمرير لأعلى/لأسفل في وضع ملء الشاشة إلى الانتقال إلى الفيديو التالي/السابق.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">سيؤدي التمرير لأعلى/لأسفل في وضع ملء الشاشة إلى الانتقال إلى الفيديو التالي/السابق.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">تعطيل التمرير للدخول إلى وضع ملء الشاشة (أسفل المشغل)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">لن يؤدي التمرير لأسفل أسفل المشغل إلى الدخول إلى وضع ملء الشاشة.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">سيؤدي التمرير لأسفل أسفل المشغل إلى الدخول إلى وضع ملء الشاشة.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">تعطيل التمرير للدخول إلى وضع ملء الشاشة (في المشغل)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">لن يؤدي التمرير لأعلى في المشغل إلى الدخول إلى وضع ملء الشاشة.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">سيؤدي التمرير لأعلى في المشغل إلى الدخول إلى وضع ملء الشاشة.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">تعطيل التمرير للخروج من وضع ملء الشاشة</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">لن يؤدي التمرير لأسفل في وضع ملء الشاشة إلى الخروج من وضع ملء الشاشة.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">سيؤدي التمرير لأسفل في وضع ملء الشاشة إلى الخروج من وضع ملء الشاشة.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">تلقائي</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">الفيديو</string>
@@ -1409,9 +1419,6 @@
     <string name="revanced_disable_hdr_video_title">تعطيل فيديو HDR</string>
     <string name="revanced_disable_hdr_video_summary_on">تم تعطيل فيديو HDR.</string>
     <string name="revanced_disable_hdr_video_summary_off">تم تمكين فيديو HDR.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">تعطيل سرعة التشغيل للبث المباشر</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">تم تعطيل سرعة التشغيل الافتراضية للبث المباشر.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">تم تمكين سرعة التشغيل الافتراضية للبث المباشر.</string>
     <string name="revanced_enable_custom_playback_speed_title">تمكين سرعة التشغيل المخصصة</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">تم تمكين سرعة التشغيل المخصصة.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">تم تعطيل سرعة التشغيل المخصصة.</string>
@@ -1436,26 +1443,27 @@
     <string name="revanced_restore_old_video_quality_menu_summary_on">يتم عرض قائمة جودة الفيديو القديمة.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">لا يتم عرض قائمة جودة الفيديو القديمة.</string>
     <string name="revanced_disable_default_playback_speed_music_title">تعطيل سرعة التشغيل للموسيقى</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"تم تعطيل سرعة التشغيل الافتراضية للموسيقى.
-
-التقييد: قد لا ينطبق هذا الإعداد على مقاطع الفيديو التي لا تتضمن لافتة \"الاستماع على YouTube Music\"."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">تم تعطيل سرعة التشغيل الافتراضية للموسيقى.</string>
     <string name="revanced_disable_default_playback_speed_music_off">تم تمكين سرعة التشغيل الافتراضية للموسيقى.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">التحقق باستخدام الفئات</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">سيتم تعطيل سرعة التشغيل الافتراضية إذا كانت فئة الفيديو هي موسيقى.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">تم تعطيل سرعة التشغيل الافتراضية لمقاطع الفيديو القابلة للتشغيل على YouTube Music.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">تمكين سرعة التشغيل الافتراضية لفيديوهات Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">تنطبق سرعة التشغيل الافتراضية على Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">لا تنطبق سرعة التشغيل الافتراضية على Shorts.</string>
     <string name="revanced_skipped_preloaded_buffer">تم تخطي التخزين المؤقت الذي تم تحميله مسبقًا.</string>
     <string name="revanced_skip_preloaded_buffer_title">تخطي التخزين المؤقت المحمل مسبقًا</string>
-    <string name="revanced_skip_preloaded_buffer_summary">"لتخطي التخزين المؤقت المحمل مسبقًا في بداية مقاطع الفيديو لتطبيق جودة الفيديو الافتراضية على الفور.
+    <string name="revanced_skip_preloaded_buffer_summary">"لتخطي التخزين المؤقت المحمل مسبقًا في بداية الفيديوهات لتطبيق جودة الفيديو الافتراضية على الفور.
 
 • عند بَدْء تشغيل الفيديو، يكون هناك تأخير قدره 0.3 ثانية تقريبًا.
-• لا ينطبق على مقاطع فيديو HDR, مقاطع فيديو البث المباشر, مقاطع الفيديو التي تقل مدتها عن 15 ثوانٍ."</string>
+• لا ينطبق على فيديوهات HDR, فيديوهات البث المباشر, الفيديوهات التي تقل مدتها عن 15 ثوانٍ."</string>
     <string name="revanced_skip_preloaded_buffer_user_dialog_message">تشغيل هذا الإعداد قد يسبب مشاكل في تشغيل الفيديو.</string>
     <string name="revanced_skip_preloaded_buffer_toast_title">عرض ملاحظة عند التخطي</string>
     <string name="revanced_skip_preloaded_buffer_toast_summary_on">يتم عرض الملاحظة.</string>
     <string name="revanced_skip_preloaded_buffer_toast_summary_off">لا يتم عرض الملاحظة.</string>
     <string name="revanced_spoof_device_dimensions_title">إيهام أبعاد الجهاز</string>
     <string name="revanced_spoof_device_dimensions_summary">"يوهم أبعاد الجهاز من أجل فتح جودة فيديو أعلى قد لا تكون متوفرة على جهازك.
-قد يتم توفير الجودة العالية في بعض مقاطع الفيديو التي تتطلب أبعادًا عالية للجهاز، ولكن ليس كل مقاطع الفيديو."</string>
+قد يتم توفير الجودة العالية في بعض الفيديوهات التي تتطلب أبعادًا عالية للجهاز، ولكن ليس كل الفيديوهات."</string>
     <string name="revanced_disable_vp9_codec_title">تعطيل ترميز VP9</string>
     <string name="revanced_disable_vp9_codec_summary_on">"تم تعطيل برنامج ترميز VP9.
 
@@ -1480,12 +1488,12 @@
     <string name="revanced_ryd_enable_title">تمكين Return YouTube Dislike</string>
     <string name="revanced_ryd_enable_summary_on">يتم عرض لم يعجبني.</string>
     <string name="revanced_ryd_enable_summary_off">لا يتم عرض لم يعجبني.</string>
-    <string name="revanced_ryd_shorts_title">عرض لم يعجني في مقاطع Shorts</string>
-    <string name="revanced_ryd_shorts_summary_on">يتم عرض لم يعجني في مقاطع Shorts.</string>
+    <string name="revanced_ryd_shorts_title">عرض لم يعجني في فيديوهات Shorts</string>
+    <string name="revanced_ryd_shorts_summary_on">يتم عرض لم يعجني في فيديوهات Shorts.</string>
     <string name="revanced_ryd_shorts_summary_on_disclaimer">"إبداءات لم يعجبني التي تظهر على فيديوهات Shorts.
 
 التقييد: قد لا تظهر إبداءات لم يعجبني إذا لم يقم المستخدم بتسجيل الدخول أو في وضع التصفح المتخفي."</string>
-    <string name="revanced_ryd_shorts_summary_off">تم إخفاء لم يعجني في مقاطع Shorts.</string>
+    <string name="revanced_ryd_shorts_summary_off">تم إخفاء لم يعجني في فيديوهات Shorts.</string>
     <string name="revanced_ryd_dislike_percentage_title">لم يعجبني كــ نسبة مئوية</string>
     <string name="revanced_ryd_dislike_percentage_summary_on">يعرض عدد لم يعجبني كـ نسبة مئوية.</string>
     <string name="revanced_ryd_dislike_percentage_summary_off">يعرض عدد لم يعجبني كـ رَقَم.</string>
@@ -1501,7 +1509,7 @@
     <!-- PreferenceScreen: Return YouTube Dislike, PreferenceCategory: About -->
     <string name="revanced_ryd_about">لمحة</string>
     <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
-    <string name="revanced_ryd_attribution_summary">يتم توفير بيانات لم يعجبني بمقاطع YouTube بواسطة the Return YouTube Dislike API. اضغط هنا لمعرفة المزيد.</string>
+    <string name="revanced_ryd_attribution_summary">يتم توفير بيانات لم يعجبني بفيديوهات YouTube بواسطة the Return YouTube Dislike API. اضغط هنا لمعرفة المزيد.</string>
     <string name="revanced_ryd_failure_connection_timeout">لم يعجبني غير متوفر مؤقتًا (انتهت مهلة API).</string>
     <string name="revanced_ryd_failure_connection_status_code">لم يعجبني غير متوفر (الحالة %d).</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">لم يعجبني غير متوفر (تم الوصول إلى حد API العميل).</string>
@@ -1530,7 +1538,7 @@
     <!-- PreferenceScreen: SponsorBlock -->
     <string name="revanced_preference_screen_sb_title">SponsorBlock</string>
     <string name="revanced_sb_enable_sb">تمكين SponsorBlock</string>
-    <string name="revanced_sb_enable_sb_sum">مانِع الرُعَاة هو نظام جماعي لتخطي الأجزاء المُمِلَّة في مقاطع YouTube.</string>
+    <string name="revanced_sb_enable_sb_sum">مانِع الرُعَاة هو نظام جماعي لتخطي الأجزاء المُمِلَّة في فيديوهات YouTube.</string>
     <!-- PreferenceScreen: SponsorBlock, PreferenceCategory: Appearance -->
     <string name="revanced_sb_appearance_category">المظهر</string>
     <string name="revanced_sb_enable_voting">عرض زر التصويت</string>
@@ -1784,24 +1792,42 @@
     <string name="revanced_spoof_streaming_data_summary_off">"لا يتم تزييف بيانات البث. قد لا يعمل تشغيل الفيديو."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">إيقاف تشغيل هذا الإعداد قد يسبب مشاكل في تشغيل الفيديو.</string>
     <string name="revanced_spoof_streaming_data_type_title">العميل الافتراضي</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">موسيقى iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(يتطلب تسجيل الدخول)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(يتطلب PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(يتطلب تسجيل الدخول)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">التأثيرات الجانبية للتزييف</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• لم يتم العثور عليه بعد.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• قد لا يتم تشغيل الأفلام أو الفيديوهات المدفوعة.</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• قائمة المقطع الصوتي مفقودة.
 • مستوى الصوت الثابت غير متاح.
-• تعطيل مقاطع الصوت التلقائية المفروضة غير متاح."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">استخدام عملاء Android فقط</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">يتم استخدام عملاء Android لجلب البيانات المتدفقة.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">يتم استخدام عملاء Android و iOS لجلب البيانات المتدفقة.</string>
+• لا يتوفر تعطيل المقطع الصوتي التلقائي المفروض.
+• قد لا يتم تشغيل الفيديوهات المخصصة للأطفال عند تسجيل الخروج أو في وضع التصفح المتخفي."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• قد تكون هناك مشكلات في التشغيل (يتطلب PoToken).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• قد لا يتم تشغيل الأفلام أو الفيديوهات المدفوعة.
+• قد لا يتم تشغيل الفيديوهات المخصصة للأطفال عند تسجيل الخروج أو في وضع التصفح المتخفي."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">فرض iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">يتم فرض ترميز الفيديو على AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">يتم تحديد ترميز الفيديو تلقائيًا.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"قد يؤدي تمكين هذا إلى تحسين عمر البطارية وإصلاح تقطيع التشغيل.
+
+AVC لديه حد أقصى للدقة 1080p، لا يتوفر ترميز الصوت Opus، وسوف يستخدم تشغيل الفيديو بيانات إنترنت أكثر من VP9 أو AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">عرض في إحصاءات تقنية</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">يتم عرض العميل المستخدم لجلب بيانات البث في إحصاءات تقنية.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">تم إخفاء العميل المستخدم لجلب بيانات البث في إحصاءات تقنية.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">استخدام PoToken</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken الصادرة عن BotGuard في متصفح موثوق به.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">استخدام VisitorData</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorsData الصادرة عن BotGuard في متصفح موثوق به.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">لمحة عن PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"يتطلب بعض العملاء PoToken و VisitorData للحصول على استجابة صالحة لتدفق البيانات.
+
+إذا كنت تحاول استخدام iOS كعميل افتراضي، فقد تحتاج إلى هذه القيم.
+
+انقر لمعرفة المزيد من المعلومات."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">سجل المشاهدة</string>
     <string name="revanced_preference_screen_watch_history_summary">تغيير الإعدادات المتعلقة بسجل المشاهدة.</string>
diff --git a/patches/src/main/resources/youtube/translations/bg-rBG/strings.xml b/patches/src/main/resources/youtube/translations/bg-rBG/strings.xml
index a9164629d..e25171826 100644
--- a/patches/src/main/resources/youtube/translations/bg-rBG/strings.xml
+++ b/patches/src/main/resources/youtube/translations/bg-rBG/strings.xml
@@ -290,6 +290,7 @@
     <string name="revanced_change_start_page_entry_live">На Живо</string>
     <string name="revanced_change_start_page_entry_movies">Филми</string>
     <string name="revanced_change_start_page_entry_music">Музика</string>
+    <string name="revanced_change_start_page_entry_notifications">Известия</string>
     <string name="revanced_change_start_page_entry_search">Търсене</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Спорт</string>
@@ -829,6 +830,9 @@
     <string name="revanced_disable_engagement_panel_title">Панел за взаимодействие</string>
     <string name="revanced_disable_engagement_panel_summary_on">Панелът за взаимодействие е деактивиран.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Панелът за взаимодействие е активиран.</string>
+    <string name="revanced_exit_fullscreen_entry_1">Изключено</string>
+    <string name="revanced_exit_fullscreen_entry_2">Портрет</string>
+    <string name="revanced_exit_fullscreen_entry_3">Пейзаж</string>
     <string name="revanced_show_video_title_section_title">Показване на раздел със заглавие на видеоклипа</string>
     <string name="revanced_show_video_title_section_summary">"Показва раздела със заглавието на видеоклипа на цял екран.
 
@@ -886,11 +890,6 @@
     <string name="revanced_enable_compact_controls_overlay_title">Вкл. компактни контроли</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">По-малките стилови контроли са активирани.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">По-малките стилови контроли са деактивирани.</string>
-    <string name="revanced_force_fullscreen_title">Принудително винаги на цял екран</string>
-    <string name="revanced_force_fullscreen_summary">"Видеоклиповете ще превключат в режим на цял екран в следните случаи:
-
-• Когато започне видео.
-• Когато се натисне клеймо за време в коментарите."</string>
     <string name="revanced_keep_landscape_mode_title">Запазете пейзажен режим</string>
     <string name="revanced_keep_landscape_mode_summary">Запазва пейзажен режим при изключване и включване на цял екран.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Запазване на времето за изчакване в пейзажен режим</string>
@@ -1240,6 +1239,9 @@
     <string name="revanced_shorts_double_tap_to_like_animation_entry_5">Сърце (цветно)</string>
     <string name="revanced_shorts_double_tap_to_like_animation_entry_6">Скрит</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts, PreferenceScreen: Shorts player, PreferenceCategory: Custom actions -->
+    <string name="revanced_preference_category_custom_actions">Персонализирани действия</string>
+    <string name="revanced_shorts_custom_actions_copy_video_url_label">Копиране адреса на видеото</string>
+    <string name="revanced_shorts_custom_actions_external_downloader_label">Външна програма за изтегляне</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts, PreferenceScreen: Shorts player, PreferenceCategory: Experimental Flags -->
     <string name="revanced_enable_shorts_time_stamp_title">Активиране на дата и час</string>
     <string name="revanced_enable_shorts_time_stamp_summary_on">"Времевите показатели са активирани.
@@ -1316,9 +1318,6 @@
     <string name="revanced_disable_hdr_video_title">Изкл. HDR клипове</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR клиповете са изключени.</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR клиповете са включени.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Деактивирайте скоростта на възпроизвеждане за потоци на живо</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Скоростта на възпроизвеждане по подразбиране е деактивирана за потоци на живо.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Скоростта на възпроизвеждане по подразбиране е активирана за потоци на живо.</string>
     <string name="revanced_enable_custom_playback_speed_title">Вкл. на скорост на видеото по избор</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Скоростта по избор на видеото е включена.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Скоростта по избор на видеото е изключена.</string>
@@ -1343,9 +1342,6 @@
     <string name="revanced_restore_old_video_quality_menu_summary_on">Показва се старото меню за видео качество.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Старото меню за видео качество е скрито.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Деактивирайте скоростта на възпроизвеждане за музика</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"Скоростта на възпроизвеждане по подразбиране не се прилага за музикални видеоклипове
-
- Тази настройка може да не се прилага за видеоклипове, които не включват функцията „Слушане с YouTube Music“."</string>
     <string name="revanced_disable_default_playback_speed_music_off">Скоростта на възпроизвеждане по подразбиране е активирана за музика.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Променете скоростта на възпроизвеждане на Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Скоростта на възпроизвеждане по подразбиране се прилага за Shorts.</string>
@@ -1685,13 +1681,11 @@
     <string name="revanced_spoof_streaming_data_summary_off">"Данните за поточно предаване не са подправени. Възпроизвеждането на видео може да не работи."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Изключването на тази настройка може да причини проблеми с възпроизвеждането на видео.</string>
     <string name="revanced_spoof_streaming_data_type_title">Клиент по подразбиране</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Ефекти от замяната</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Показване в \"Разширени статистики\"</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Клиентът, използван за получаване на данни за потока, се показва в Статистика за системни администратори.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Клиентът, използван за получаване на данни за поток, е скрит в Статистика за системни администратори.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">История на гледане</string>
     <string name="revanced_preference_screen_watch_history_summary">Променя настройките, за хронологията на гледане.</string>
diff --git a/patches/src/main/resources/youtube/translations/de-rDE/strings.xml b/patches/src/main/resources/youtube/translations/de-rDE/strings.xml
index b42624280..61087ed4c 100644
--- a/patches/src/main/resources/youtube/translations/de-rDE/strings.xml
+++ b/patches/src/main/resources/youtube/translations/de-rDE/strings.xml
@@ -12,6 +12,8 @@
     <string name="revanced_extended_restart_first_run">Neustarten um das Layout zu laden</string>
     <string name="revanced_extended_restart_message">Aktualisieren und Neustarten</string>
     <string name="revanced_playback_speed_normal">Normal</string>
+    <string name="revanced_external_downloader_package_name_video_title">Paketname des Video-Downloaders</string>
+    <string name="revanced_external_downloader_package_name_video_summary">Paketname der installierten externen Video-Downloader-App wie NewPipe oder YTDLnis.</string>
     <string name="revanced_external_downloader_dialog_title">Externer Downloader</string>
     <string name="revanced_external_downloader_not_installed_dialog_title">Warnung</string>
     <string name="revanced_external_downloader_not_installed_dialog_message">"%1$s ist nicht installiert.
@@ -109,6 +111,9 @@ Tippen Sie hier, um mehr über DeArrow zu erfahren."</string>
     <string name="revanced_hide_expandable_chip_title">Erweiterbaren Chip unter Videos ausblenden</string>
     <string name="revanced_hide_expandable_chip_summary_on">Erweiterbare Chips sind versteckt</string>
     <string name="revanced_hide_expandable_chip_summary_off">Erweiterbare Chips werden angezeigt</string>
+    <string name="revanced_hide_expandable_shelf_title">Erweiterbare Regale ausblenden</string>
+    <string name="revanced_hide_expandable_shelf_summary_on">Erweiterbare Regale sind ausgeblendet.</string>
+    <string name="revanced_hide_expandable_shelf_summary_off">Erweiterbare Regale werden angezeigt.</string>
     <string name="revanced_hide_feed_captions_button_title">Verstecke \"Untertitel\" Schaltfläche</string>
     <string name="revanced_hide_feed_captions_button_on">Schaltfläche \"Untertitel\" ist versteckt.</string>
     <string name="revanced_hide_feed_captions_button_off">Schaltfläche \"Untertitel\" wird angezeigt.</string>
@@ -279,6 +284,7 @@ Beschränkungen:
     <string name="revanced_hide_related_videos_user_dialog_message">"Diese Einstellung begrenzt die maximale Anzahl von Layouts, die auf dem Wiedergabebildschirm geladen werden können.
 
 Wenn sich das Layout des Wiedergabebildschirms aufgrund serverseitiger Änderungen ändert, können unbeabsichtigte Layouts auf dem Wiedergabebildschirm ausgeblendet werden."</string>
+    <string name="revanced_related_videos_offset_title">Offset</string>
     <!-- PreferenceScreen: General -->
     <string name="revanced_preference_screen_general_title">Allgemein</string>
     <string name="revanced_change_start_page_title">Startseite ändern</string>
@@ -375,17 +381,35 @@ Manche Komponenten könnten nicht versteckt werden."</string>
     <string name="revanced_preference_screen_hook_buttons_title">Hook Buttons</string>
     <string name="revanced_preference_screen_hook_buttons_summary">Überschreibt die Klick-Aktion von In-App-Tasten.</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Hook buttons, PreferenceCategory: Download button -->
+    <string name="revanced_preference_category_download_button">Download-Button</string>
+    <string name="revanced_override_video_download_button_title">Überschreibe Video-Download-Button</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Hook buttons, PreferenceCategory: Experimental Flags -->
+    <string name="revanced_override_youtube_music_button_title">YouTube Musik-Button überschreiben</string>
+    <string name="revanced_override_youtube_music_button_summary_on">YouTube Music Button öffnet RVX Music.</string>
+    <string name="revanced_override_youtube_music_button_summary_off">YouTube Musik-Button öffnet die native App.</string>
+    <string name="revanced_third_party_youtube_music_package_name_title">RVX Music Paketname</string>
+    <string name="revanced_third_party_youtube_music_package_name_summary">Paketname des installierten RVX Music.</string>
+    <string name="revanced_third_party_youtube_music_dialog_title">RVX Music</string>
+    <string name="revanced_third_party_youtube_music_not_installed_dialog_title">Warnung</string>
+    <string name="revanced_third_party_youtube_music_not_installed_warning">%s ist nicht installiert. Bitte installieren.</string>
+    <string name="revanced_override_youtube_music_button_about_prerequisite_title">Voraussetzung</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Miniplayer -->
     <string name="revanced_preference_screen_miniplayer_title">Miniplayer</string>
     <string name="revanced_preference_screen_miniplayer_summary">Ändern Sie den Stil des in App minimierten Players.</string>
     <string name="revanced_miniplayer_type_title">Miniplayer Typ</string>
+    <string name="revanced_miniplayer_type_entry_0">Deaktiviert</string>
     <string name="revanced_miniplayer_type_entry_1">Original</string>
     <string name="revanced_miniplayer_type_entry_2">Telefon</string>
     <string name="revanced_miniplayer_type_entry_3">Tablet</string>
     <string name="revanced_miniplayer_type_entry_4">Modern 1</string>
     <string name="revanced_miniplayer_type_entry_5">Modern 2</string>
     <string name="revanced_miniplayer_type_entry_6">Modern 3</string>
+    <string name="revanced_miniplayer_rounded_corners_title">Abgerundete Ecken aktivieren</string>
+    <string name="revanced_miniplayer_rounded_corners_summary_on">Ecken sind abgerundet.</string>
+    <string name="revanced_miniplayer_rounded_corners_summary_off">Ecken sind nicht abgerundet.</string>
+    <string name="revanced_miniplayer_double_tap_action_title">Aktiviere doppeltes Tippen und Pinchen um die Größe zu ändern</string>
+    <string name="revanced_miniplayer_drag_and_drop_title">Drag and Drop aktivieren</string>
+    <string name="revanced_miniplayer_drag_and_drop_summary_off">Drag and Drop ist deaktiviert.</string>
     <string name="revanced_miniplayer_hide_expand_close_title">Ausklappen und Schließen der Tasten ausblenden</string>
     <string name="revanced_miniplayer_hide_expand_close_summary_on">Tasten sind ausgeblendet.\n(wischen Sie den Miniplayer zum erweitern oder schließen)</string>
     <string name="revanced_miniplayer_hide_expand_close_summary_off">Erweitern und Schließen Schaltflächen werden angezeigt.</string>
@@ -395,10 +419,15 @@ Manche Komponenten könnten nicht versteckt werden."</string>
     <string name="revanced_miniplayer_hide_rewind_forward_title">Vorwärts- und Rückwärts-Buttons ausblenden</string>
     <string name="revanced_miniplayer_hide_rewind_forward_summary_on">Vorwärts springen und zurück sind versteckt.</string>
     <string name="revanced_miniplayer_hide_rewind_forward_summary_off">Vor- und zurückspringen wird angezeigt.</string>
+    <string name="revanced_miniplayer_width_dip_title">Initiale Größe</string>
+    <string name="revanced_miniplayer_width_dip_summary">Initiale Bildschirmgröße (in Pixel).</string>
+    <string name="revanced_miniplayer_width_dip_invalid_toast">Pixelgröße muss zwischen %1$s und %2$s liegen.</string>
     <string name="revanced_miniplayer_opacity_title">Deckkraft der Überlagerung</string>
     <string name="revanced_miniplayer_opacity_summary">Deckkraft Wert zwischen 0-100, wobei 0 transparent ist.</string>
     <string name="revanced_miniplayer_opacity_invalid_toast">Die Transparenz des Miniplayers muss zwischen 0-100 liegen. Zurückgesetzt auf Standardwerte.</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Navigation bar -->
+    <string name="revanced_preference_screen_navigation_bar_title">Navigationsleiste</string>
+    <string name="revanced_preference_screen_navigation_bar_summary">Komponenten der Navigationsleiste ausblenden oder anzeigen.</string>
     <string name="revanced_enable_narrow_navigation_buttons_title">Aktiviere schmale Navigationstasten</string>
     <string name="revanced_enable_narrow_navigation_buttons_summary_on">Der Abstand zwischen den Navigationstasten ist schmal.</string>
     <string name="revanced_enable_narrow_navigation_buttons_summary_off">Abstand zwischen den Navigationstasten ist normal.</string>
@@ -424,12 +453,81 @@ Manche Komponenten könnten nicht versteckt werden."</string>
     <string name="revanced_hide_navigation_label_summary_on">Navigationslabel ist versteckt</string>
     <string name="revanced_hide_navigation_label_summary_off">Navigationslabel wird angezeigt</string>
     <string name="revanced_switch_create_with_notifications_button_title">Erstellungs- und Benachrichtigungs-Buttons tauschen</string>
+    <string name="revanced_switch_create_with_notifications_button_summary_on">"Die Schaltfläche \"Erstellen\" wird mit der Schaltfläche \"Benachrichtigungen\" vertauscht.
+
+Hinweis: Durch Aktivieren dieser Option wird auch die Videowerbung zwangsweise ausgeblendet."</string>
+    <string name="revanced_switch_create_with_notifications_button_summary_off">Erstellen-Button ist nicht mit Benachrichtigungs-Button getauscht.</string>
+    <string name="revanced_switch_create_with_notifications_button_user_dialog_message">"Das Deaktivieren kann mehr Werbung vom Server laden.
+
+Auch Werbung wird nicht mehr in Shorts blockiert.
+
+Wenn diese Einstellung nicht wirksam ist, versuchen Sie in den Inkognito-Modus zu wechseln."</string>
+    <string name="revanced_hide_navigation_bar_title">Navigationsleiste verstecken</string>
+    <string name="revanced_hide_navigation_bar_summary_on">Navigationsleiste ist ausgeblendet.</string>
+    <string name="revanced_hide_navigation_bar_summary_off">Navigationsleiste wird angezeigt.</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Settings menu -->
     <string name="revanced_preference_screen_settings_menu_title">Einstellungsmenü</string>
     <string name="revanced_preference_screen_settings_menu_summary">Elemente im YouTube-Einstellungsmenü verstecken</string>
-    <string name="revanced_hide_settings_menu_pair_with_tv_summary_off">\"Im TV anschauen\"-Menü wird angezeigt.</string>
-    <string name="revanced_hide_settings_menu_privacy_title"></string>
+    <string name="revanced_hide_settings_menu_parent_tools_title">Familiencenter Menü ausblenden</string>
+    <string name="revanced_hide_settings_menu_parent_tools_summary_on">Familiencenter Menü wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_parent_tools_summary_off">Familiencenter Menü wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_general_title">Allgemein ausblenden</string>
+    <string name="revanced_hide_settings_menu_general_summary_on">Allgemein wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_general_summary_off">Allgemein wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_account_title">Konto ausblenden</string>
+    <string name="revanced_hide_settings_menu_account_summary_on">Konto wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_account_summary_off">Konto wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_data_saving_title">\"Niedrigerer Datenverbrauch\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_data_saving_summary_on">\"Niedrigerer Datenverbrauch\" wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_data_saving_summary_off">\"Niedrigerer Datenverbrauch\" wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_auto_play_title">Autoplay ausblenden</string>
+    <string name="revanced_hide_settings_menu_auto_play_summary_on">Autoplay wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_auto_play_summary_off">Autoplay wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_video_quality_title">Einstellungen für Videoqualität ausblenden</string>
+    <string name="revanced_hide_settings_menu_video_quality_summary_on">Einstellungen für Videoqualität wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_video_quality_summary_off">Einstellungen für Videoqualität wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_offline_title">Hintergrundmenü ausblenden</string>
+    <string name="revanced_hide_settings_menu_offline_summary_on">Hintergrundmenü wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_offline_summary_off">Hintergrundmenü wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_pair_with_tv_title">\"Auf Fernseher ansehen\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_pair_with_tv_summary_on">Auf Fernseher ansehen wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_pair_with_tv_summary_off">\"Auf Fernseher ansehen\" wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_history_title">\"Verlauf verwalten\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_history_summary_on">\"Verlauf verwalten\" wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_history_summary_off">\"Verlauf verwalten\" wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_your_data_title">\"Meine Daten auf YouTube\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_your_data_summary_on">\"Meine Daten auf YouTube\" wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_your_data_summary_off">\"Meine Daten auf YouTube\" wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_privacy_title">Datenschutz ausblenden</string>
+    <string name="revanced_hide_settings_menu_privacy_summary_on">Datenschutz wird ausgeblendet.</string>
     <string name="revanced_hide_settings_menu_privacy_summary_off">Privatsphäre-Menü wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_premium_early_access_title">\"Neue Testfunktionen ausprobieren\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_premium_early_access_summary_on">\"Neue Testfunktionen ausprobieren\" wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_premium_early_access_summary_off">\"Neue Testfunktionen ausprobieren\" wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_subscription_product_title">\"Käufe und Mitgliedschaften\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_subscription_product_summary_on">\"Käufe und Mitgliedschaften\" wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_subscription_product_summary_off">\"Käufe und Mitgliedschaften\" wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_billing_and_payment_title">\"Abrechnung &amp; Zahlungen\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_billing_and_payment_summary_on">\"Abrechnung &amp; Zahlungen\" wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_billing_and_payment_summary_off">\"Abrechnung &amp; Zahlungen\" wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_notification_title">Benachrichtigungen ausblenden</string>
+    <string name="revanced_hide_settings_menu_notification_summary_on">Benachrichtigungen wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_notification_summary_off">Benachrichtigungen wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_connected_accounts_title">Verbundene Apps ausblenden</string>
+    <string name="revanced_hide_settings_menu_connected_accounts_summary_on">Verbundene Apps wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_connected_accounts_summary_off">Verbundene Apps wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_live_chat_title">Livechat ausblenden</string>
+    <string name="revanced_hide_settings_menu_live_chat_summary_on">Livechat wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_live_chat_summary_off">Livechat wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_captions_title">Untertitel ausblenden</string>
+    <string name="revanced_hide_settings_menu_captions_summary_on">Untertitel wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_captions_summary_off">Untertitel wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_accessibility_title">Bedienungshilfen ausblenden</string>
+    <string name="revanced_hide_settings_menu_accessibility_summary_on">Bedienungshilfen wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_accessibility_summary_off">Bedienungshilfen wird angezeigt.</string>
+    <string name="revanced_hide_settings_menu_about_title">\"Über\" ausblenden</string>
+    <string name="revanced_hide_settings_menu_about_summary_on">\"Über\" wird ausgeblendet.</string>
+    <string name="revanced_hide_settings_menu_about_summary_off">\"Über\" wird angezeigt.</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Toolbar -->
     <string name="revanced_preference_screen_toolbar_title">Werkzeugleiste</string>
     <string name="revanced_preference_screen_toolbar_summary">Verstecke oder ändere Toolbar-Komponenten, wie die Suchleiste, Buttons und Header.</string>
@@ -465,6 +563,12 @@ Sie Registerkarte &gt; Kanal &gt; Menü &gt; Einstellungen."</string>
     <string name="revanced_hide_voice_search_button_title">Sprachsuche ausblenden</string>
     <string name="revanced_hide_voice_search_button_summary_on">Sprachsuche ist ausgeblendet.</string>
     <string name="revanced_hide_voice_search_button_summary_off">Sprachsuche wird angezeigt.</string>
+    <string name="revanced_hide_youtube_doodles_title">YouTube Doodles ausblenden</string>
+    <string name="revanced_hide_youtube_doodles_summary_on">YouTube Doodles sind versteckt.</string>
+    <string name="revanced_hide_youtube_doodles_summary_off">YouTube Doodles werden angezeigt.</string>
+    <string name="revanced_hide_youtube_doodles_user_dialog_message">"YouTube Doodles erscheinen jedes Jahr ein paar Tage.
+
+Wenn ein YouTube Doodle gerade in deiner Region angezeigt wird und diese Einstellung aktiviert ist die Filterleiste unterhalb der Suchleiste wird ebenfalls ausgeblendet."</string>
     <string name="revanced_replace_toolbar_create_button_title">Ersetze Erstellen-Schaltfläche</string>
     <string name="revanced_replace_toolbar_create_button_summary">Ersetzt die Erstellen-Schaltfläche mit Einstellungen.</string>
     <string name="revanced_replace_toolbar_create_button_type_title">Aktionstyp zum Zuweisen der Taste</string>
@@ -480,6 +584,8 @@ Tippe und halte zum Öffnen der RVX-Einstellungen."</string>
     <string name="revanced_disable_auto_player_popup_panels_title">Player-Popup-Panels deaktivieren</string>
     <string name="revanced_disable_auto_player_popup_panels_summary_on">Auto-Player-Popup-Panels sind deaktiviert.</string>
     <string name="revanced_disable_auto_player_popup_panels_summary_off">Auto-Player-Popup-Panels sind deaktiviert.</string>
+    <string name="revanced_disable_auto_switch_mix_playlists_title">Mix-Playlists deaktivieren</string>
+    <string name="revanced_disable_auto_switch_mix_playlists_summary_on">Mix-Playlists sind deaktiviert.</string>
     <string name="revanced_disable_speed_overlay_title">Geschwindigkeitsüberlagerung deaktivieren</string>
     <string name="revanced_disable_speed_overlay_summary">"Deaktiviere 'Abspielen mit 2x Geschwindigkeit' während du gedrückt hältst.
 
@@ -625,6 +731,15 @@ Einstellungen → Autoplay → Nächstes Video automatisch abspielen"</string>
     <string name="revanced_preference_screen_player_flyout_menu_title">Flyout Menü</string>
     <string name="revanced_preference_screen_player_flyout_menu_summary">Komponenten des Flyout-Menüs im Feed verstecken oder anzeigen.</string>
     <string name="revanced_change_player_flyout_menu_toggle_title">Toggle Typ ändern</string>
+    <string name="revanced_hide_player_flyout_menu_enhanced_bitrate_title">1080p Premium ausblenden</string>
+    <string name="revanced_hide_player_flyout_menu_enhanced_bitrate_summary_on">1080p Premium wird ausgeblendet.</string>
+    <string name="revanced_hide_player_flyout_menu_enhanced_bitrate_summary_off">1080p Premium wird angezeigt.</string>
+    <string name="revanced_hide_player_flyout_menu_audio_track_title">Audiospurmenü ausblenden</string>
+    <string name="revanced_hide_player_flyout_menu_audio_track_summary_on">Audiospur-Menü ist ausgeblendet.</string>
+    <string name="revanced_hide_player_flyout_menu_audio_track_summary_off">Audio-Track Menü wird angezeigt.</string>
+    <string name="revanced_hide_player_flyout_menu_captions_title">Untertitel-Menü verstecken</string>
+    <string name="revanced_hide_player_flyout_menu_captions_summary_on">Untertitel-Menü ist versteckt.</string>
+    <string name="revanced_hide_player_flyout_menu_captions_summary_off">Untertitel-Menü wird angezeigt.</string>
     <string name="revanced_hide_player_flyout_menu_captions_footer_summary_on">Captions menu footer is hidden.</string>
     <string name="revanced_hide_player_flyout_menu_captions_footer_summary_off">Captions menu footer is shown.</string>
     <string name="revanced_hide_player_flyout_menu_lock_screen_title">Hide lock screen menu</string>
@@ -647,6 +762,9 @@ Einstellungen → Autoplay → Nächstes Video automatisch abspielen"</string>
     <string name="revanced_hide_player_flyout_menu_report_summary_off">Report menu is shown.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Flyout menu, PreferenceCategory: Additional settings -->
     <string name="revanced_preference_category_additional_settings">Additional settings</string>
+    <string name="revanced_hide_player_flyout_menu_ambient_mode_title">Ambient-Modus ausblenden</string>
+    <string name="revanced_hide_player_flyout_menu_ambient_mode_summary_on">Ambient-Modus ist versteckt.</string>
+    <string name="revanced_hide_player_flyout_menu_ambient_mode_summary_off">Ambient-Modus wird angezeigt.</string>
     <string name="revanced_hide_player_flyout_menu_help_title">Hide help &amp; feedback menu</string>
     <string name="revanced_hide_player_flyout_menu_help_summary_on">Help &amp; feedback menu is hidden.</string>
     <string name="revanced_hide_player_flyout_menu_help_summary_off">Help &amp; feedback menu is shown.</string>
@@ -667,17 +785,25 @@ Einstellungen → Autoplay → Nächstes Video automatisch abspielen"</string>
     <string name="revanced_hide_player_flyout_menu_stable_volume_summary_on">Stable volume menu is hidden.</string>
     <string name="revanced_hide_player_flyout_menu_stats_for_nerds_title">Hide stats for nerds menu</string>
     <string name="revanced_hide_player_flyout_menu_stats_for_nerds_summary_on">Stats for nerds menu is hidden.</string>
+    <string name="revanced_hide_player_flyout_menu_watch_in_vr_summary_on">\'In VR ansehen\'-Menü wird ausgeblendet.</string>
+    <string name="revanced_hide_player_flyout_menu_watch_in_vr_summary_off">\'In VR ansehen\'-Menü wird angezeigt.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Fullscreen -->
     <string name="revanced_preference_screen_fullscreen_title">Vollbild</string>
     <string name="revanced_preference_screen_fullscreen_summary">Komponenten im Zusammenhang mit Vollbild ausblenden oder ändern.</string>
+    <string name="revanced_show_video_title_section_title">Video-Titelbereich anzeigen</string>
+    <string name="revanced_show_video_title_section_summary">"Zeigt den Video-Titelbereich im Vollbild.
+
+Einschränkung: Videotitel verschwindet beim Klicken auf den Bildschirm."</string>
     <string name="revanced_hide_autoplay_preview_title">Autoplay-Vorschau-Container ausblenden</string>
     <string name="revanced_hide_autoplay_preview_summary_on">Autoplay-Vorschau-Container wird ausgeblendet</string>
     <string name="revanced_hide_autoplay_preview_summary_off">Autoplay-Vorschau-Container wird angezeigt</string>
     <string name="revanced_hide_live_chat_replay_button_title">Live-Chat Replay-Button ausblenden</string>
     <string name="revanced_hide_live_chat_replay_button_summary_on">Der Live-Chat-Replay-Button ist verborgen.\n\nEr erscheint im Vollbild, wenn Live-Chat geschlossen wird.</string>
     <string name="revanced_hide_live_chat_replay_button_summary_off">Der Live-Chat-Replay-Button ist verborgen.\n\nEr erscheint im Vollbild, wenn Live-Chat geschlossen wird.</string>
+    <string name="revanced_hide_related_video_overlay_summary_on">Im Schnellaktionscontainer werden weitere Videos sowie die zugehörige Videoüberlagerung ausgeblendet.</string>
     <string name="revanced_hide_related_video_overlay_summary_off">Im Schnellaktionscontainer werden weitere Videos angezeigt sowie die zugehörige Videoüberlagerung.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Fullscreen, PreferenceCategory: Quick actions -->
+    <string name="revanced_preference_category_quick_actions">Schnelle Aktionen</string>
     <string name="revanced_hide_quick_actions_title">Verstecke \"Schnellaktionen\" Container</string>
     <string name="revanced_hide_quick_actions_summary_on">\"Schnellaktionen\" Container wird versteckt</string>
     <string name="revanced_hide_quick_actions_summary_off">\"Schnellaktionen\" Container wird angezeigt</string>
@@ -708,6 +834,7 @@ Einstellungen → Autoplay → Nächstes Video automatisch abspielen"</string>
     <string name="revanced_hide_quick_actions_share_button_title">Verstecke \"Teilen\" Schaltfläche</string>
     <string name="revanced_hide_quick_actions_share_button_summary_on">Teilen-Schaltfläche ist versteckt.</string>
     <string name="revanced_hide_quick_actions_share_button_summary_off">Teilen-Schaltfläche wird angezeigt.</string>
+    <string name="revanced_quick_actions_top_margin_title">Schnelle Aktionen oberer Rand</string>
     <string name="revanced_quick_actions_top_margin_summary">Konfigurieren Sie den Abstand von der Suchleiste auf die Meta-Leiste zwischen 0-32.</string>
     <string name="revanced_quick_actions_top_margin_invalid_toast">Der obere Rand der Schnellaktionen muss zwischen 0-32 liegen. Zurückgesetzt auf Standardwerte.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Fullscreen, PreferenceCategory: Experimental Flags -->
@@ -717,14 +844,10 @@ Einstellungen → Autoplay → Nächstes Video automatisch abspielen"</string>
     <string name="revanced_enable_compact_controls_overlay_title">Kompaktsteuerungs-Overlay aktivieren</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Kompaktsteuerungs-Overlay ist aktiviert</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Kompaktsteuerungs-Overlay ist deaktiviert</string>
-    <string name="revanced_force_fullscreen_title">Vollbild erzwingen</string>
-    <string name="revanced_force_fullscreen_summary">"Videos werden in den folgenden Situation im Vollbild wieder gegeben:
-
-• Wenn ein Video gestartet wird.
-• Wenn ein Zeitstempel in den Kommentaren geklickt wird."</string>
     <string name="revanced_keep_landscape_mode_title">Querformat behalten</string>
     <string name="revanced_keep_landscape_mode_summary">Bewahrt den Querformat beim Ausschalten des Bildschirms im Vollbild.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Timeout für den Wechsel zum Querformat</string>
+    <string name="revanced_keep_landscape_mode_timeout_summary">Die Anzahl der Millisekunden nach dem Einschalten des Bildschirms, nachdem Querformat erzwungen wird.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Haptic feedback -->
     <string name="revanced_preference_screen_haptic_feedback_title">Haptisches Feedback</string>
     <string name="revanced_preference_screen_haptic_feedback_summary">Haptisches Feedback aktivieren oder deaktivieren</string>
@@ -744,6 +867,23 @@ Einstellungen → Autoplay → Nächstes Video automatisch abspielen"</string>
     <string name="revanced_disable_haptic_feedback_zoom_summary_on">Haptisches Feedback ist deaktiviert.</string>
     <string name="revanced_disable_haptic_feedback_zoom_summary_off">Haptisches Feedback ist aktiviert.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Player buttons -->
+    <string name="revanced_preference_screen_player_buttons_title">Player Buttons</string>
+    <string name="revanced_preference_screen_player_buttons_summary">Verstecke oder zeige Buttons im Video-Player.</string>
+    <string name="revanced_hide_player_autoplay_button_title">Verstecke Autoplay-Schaltfläche</string>
+    <string name="revanced_hide_player_autoplay_button_summary_on">Autoplay-Schaltfläche ist versteckt.</string>
+    <string name="revanced_hide_player_autoplay_button_summary_off">Autoplay-Schaltfläche wird angezeigt.</string>
+    <string name="revanced_hide_player_captions_button_title">Verstecke \"Untertitel\" Schaltfläche</string>
+    <string name="revanced_hide_player_captions_button_summary_on">Schaltfläche \"Untertitel\" ist versteckt.</string>
+    <string name="revanced_hide_player_captions_button_summary_off">Schaltfläche \"Untertitel\" wird angezeigt.</string>
+    <string name="revanced_hide_player_cast_button_title">Verstecke Cast-Schaltfläche</string>
+    <string name="revanced_hide_player_cast_button_summary_on">Die Cast-Schaltfläche ist versteckt.</string>
+    <string name="revanced_hide_player_cast_button_summary_off">Die Cast-Schaltfläche wird angezeigt.</string>
+    <string name="revanced_hide_player_collapse_button_title">Schaltfläche „Ausklappen” ausblenden</string>
+    <string name="revanced_hide_player_collapse_button_summary_on">Schaltfläche \"Ausklappen\" wird ausgeblendet.</string>
+    <string name="revanced_hide_player_collapse_button_summary_off">Schaltfläche \"Ausklappen\" wird angezeigt.</string>
+    <string name="revanced_hide_player_fullscreen_button_title">Vollbild-Schaltfläche ausblenden</string>
+    <string name="revanced_hide_player_fullscreen_button_summary_on">Vollbild-Schaltfläche wird ausgeblendet.</string>
+    <string name="revanced_hide_player_fullscreen_button_summary_off">Vollbild-Schaltfläche wird angezeigt.</string>
     <string name="revanced_hide_player_previous_next_button_title">Hide previous &amp; next button</string>
     <string name="revanced_hide_player_previous_next_button_summary_on">Buttons are hidden.</string>
     <string name="revanced_hide_player_previous_next_button_summary_off">Buttons are shown.</string>
@@ -761,6 +901,8 @@ Tap and hold to copy video URL with timestamp."</string>
     <string name="revanced_overlay_button_copy_video_url_timestamp_title">Show copy timestamp URL button</string>
     <string name="revanced_overlay_button_copy_video_url_timestamp_summary">"Tap to copy video URL with timestamp.
 Tap and hold to copy video timestamp."</string>
+    <string name="revanced_overlay_button_mute_volume_title">Stummschalten-Schaltfläche anzeigen</string>
+    <string name="revanced_overlay_button_mute_volume_summary">Tippen um Lautstärke des aktuellen Videos stumm zu schalten. Zum laut schalten erneut tippen.</string>
     <string name="revanced_overlay_button_external_downloader_title">Show external download button</string>
     <string name="revanced_overlay_button_external_downloader_summary">Tap to launch external downloader.</string>
     <string name="revanced_overlay_button_speed_dialog_title">Zeige Geschwindigkeitsdialog Taste</string>
@@ -769,6 +911,7 @@ Tippen und halten um die Wiedergabegeschwindigkeit auf 1.0x zurückzusetzen. Hal
     <string name="revanced_overlay_button_whitelist_title">Zeige Whitelist-Button</string>
     <string name="revanced_overlay_button_whitelist_summary">\"Tippen, um den Whitelist-Dialog zu öffnen.
 Tippen und halten Sie, um den Einstellungsdialog für die Whitelist anzuzeigen.</string>
+    <string name="revanced_overlay_button_play_all_title">\"Alle abspielen\"-Button anzeigen</string>
     <string name="revanced_whitelist_settings_title">Kanal Whitelist</string>
     <string name="revanced_whitelist_settings_summary">Überprüfen oder die Liste der Kanäle entfernen, die zur Whitelist hinzugefügt wurden.</string>
     <string name="revanced_whitelist_added">Der Kanal \'%1$s\' wurde auf die Whitelist für %2$s gesetzt.</string>
@@ -884,15 +1027,36 @@ Nebeneffekt: Offizielle Kopfzeilen in Suchergebnissen werden ausgeblendet."</str
     <string name="revanced_hide_shorts_join_button_title">Teilnehmen-Schaltfläche verstecken</string>
     <string name="revanced_hide_shorts_subscribe_button_title">Abonnement-Button ausblenden</string>
     <string name="revanced_hide_shorts_paused_overlay_buttons_title">Pausierte Overlay-Tasten ausblenden</string>
+    <string name="revanced_hide_shorts_trends_button_title">Verstecke \"Trends\" Schaltfläche</string>
+    <string name="revanced_hide_shorts_trends_button_summary_on">\"Trends\" Schaltfläche wird versteckt.</string>
+    <string name="revanced_hide_shorts_trends_button_summary_off">\"Trends\" Schaltfläche wird angezeigt.</string>
+    <string name="revanced_hide_shorts_shopping_button_title">Shop-Schaltfläche verstecken</string>
+    <string name="revanced_hide_shorts_shopping_button_summary_on">Shop-Schaltfläche wird versteckt.</string>
+    <string name="revanced_hide_shorts_shopping_button_summary_off">Shop-Schaltfläche wird angezeigt.</string>
+    <string name="revanced_hide_shorts_stickers_title">Sticker ausblenden</string>
+    <string name="revanced_hide_shorts_stickers_summary_on">Sticker sind versteckt.</string>
+    <string name="revanced_hide_shorts_stickers_summary_off">Sticker werden angezeigt.</string>
     <string name="revanced_hide_shorts_paid_promotion_label_title">Verstecke Label für bezahlte Promotion</string>
+    <string name="revanced_hide_shorts_paid_promotion_label_summary_on">Label für bezahlte Promotion wird versteckt.</string>
+    <string name="revanced_hide_shorts_paid_promotion_label_summary_off">Label für bezahlte Promotion wird angezeigt.</string>
     <string name="revanced_hide_shorts_info_panel_title">Info-Panels ausblenden</string>
+    <string name="revanced_hide_shorts_info_panel_summary_on">Infokarten werden ausgeblendet.</string>
+    <string name="revanced_hide_shorts_info_panel_summary_off">Infokarten werden angezeigt.</string>
     <string name="revanced_hide_shorts_live_header_title">Live-Chat-Kopfzeile ausblenden</string>
     <string name="revanced_hide_shorts_live_header_summary_on">Live-Chat-Kopfzeile wird ausgeblendet.\n\nZurück Button wird nicht ausgeblendet.</string>
     <string name="revanced_hide_shorts_live_header_summary_off">Live-Chat-Kopfzeile wird angezeigt.\n\nZurück Button wird nicht ausgeblendet.</string>
     <string name="revanced_hide_shorts_channel_bar_title">Kanalleiste ausblenden</string>
+    <string name="revanced_hide_shorts_channel_bar_summary_on">Kanalleiste ist ausgeblendet.</string>
+    <string name="revanced_hide_shorts_channel_bar_summary_off">Kanalleiste wird angezeigt.</string>
     <string name="revanced_hide_shorts_video_title_title">Videotitel ausblenden</string>
+    <string name="revanced_hide_shorts_video_title_summary_on">Titel ist ausgeblendet.</string>
+    <string name="revanced_hide_shorts_video_title_summary_off">Titel wird angezeigt.</string>
     <string name="revanced_hide_shorts_sound_metadata_label_title">Sound-Metadaten-Label ausblenden</string>
+    <string name="revanced_hide_shorts_sound_metadata_label_summary_on">Metadatenlabel ist ausgeblendet.</string>
+    <string name="revanced_hide_shorts_sound_metadata_label_summary_off">Metadaten-Label wird angezeigt.</string>
     <string name="revanced_hide_shorts_full_video_link_label_title">Verstecke vollständige Video-Linkbezeichnung</string>
+    <string name="revanced_hide_shorts_full_video_link_label_summary_on">Video-Link-Label ist ausgeblendet.</string>
+    <string name="revanced_hide_shorts_full_video_link_label_summary_off">Video-Link-Label wird angezeigt.</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts, PreferenceScreen: Shorts player, PreferenceCategory: Suggested actions -->
     <string name="revanced_hide_shorts_shop_button_title">Shop-Schaltfläche verstecken</string>
     <string name="revanced_hide_shorts_super_thanks_button_title">Super Dankeschön ausblenden</string>
@@ -924,6 +1088,11 @@ Nebeneffekt: Offizielle Kopfzeilen in Suchergebnissen werden ausgeblendet."</str
     <string name="revanced_shorts_double_tap_to_like_animation_entry_5">Herz (Farbton)</string>
     <string name="revanced_shorts_double_tap_to_like_animation_entry_6">Ausgeblendet</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts, PreferenceScreen: Shorts player, PreferenceCategory: Custom actions -->
+    <string name="revanced_preference_category_custom_actions">Benutzerdefinierte Aktionen</string>
+    <string name="revanced_enable_shorts_custom_actions_flyout_menu_title">Benutzerdefinierte Aktionen im Flyout-Menü aktivieren</string>
+    <string name="revanced_shorts_custom_actions_toolbar_dialog_title">Benutzerdefinierte Aktionen</string>
+    <string name="revanced_shorts_custom_actions_copy_video_url_label">Video-URL kopieren</string>
+    <string name="revanced_shorts_custom_actions_open_video_label">Video öffnen</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts, PreferenceScreen: Shorts player, PreferenceCategory: Experimental Flags -->
     <string name="revanced_enable_shorts_time_stamp_title">Zeitstempel aktivieren</string>
     <string name="revanced_enable_shorts_time_stamp_summary_on">"Zeitstempel ist aktiviert.
@@ -961,6 +1130,7 @@ Bekannte Probleme: Da dies eine Funktion in der Entwicklungsphase von Google ist
     <string name="revanced_enable_swipe_haptic_feedback_title">Haptisches Feedback aktivieren</string>
     <string name="revanced_enable_swipe_haptic_feedback_summary_on">Haptisches Feedback ist aktiviert.</string>
     <string name="revanced_enable_swipe_haptic_feedback_summary_off">Haptisches Feedback ist deaktiviert.</string>
+    <string name="revanced_swipe_gestures_lock_mode_summary_off">Wischgesten sind im Sperrbildschirmmodus deaktiviert.</string>
     <string name="revanced_swipe_overlay_background_alpha_title">Wischen Hintergrund Sichtbarkeit</string>
     <string name="revanced_swipe_overlay_background_alpha_summary">Die Sichtbarkeit des Wischen Overlay-Hintergrunds</string>
     <string name="revanced_swipe_magnitude_threshold_title">Wischgrößen-Schwellenwert</string>
@@ -975,6 +1145,9 @@ Bekannte Probleme: Da dies eine Funktion in der Entwicklungsphase von Google ist
     <string name="revanced_disable_hdr_auto_brightness_title">Deaktiviere automatische HDR-Helligkeit</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Automatische HDR-Helligkeit ist deaktiviert</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Automatische HDR-Helligkeit ist aktiviert</string>
+    <string name="revanced_disable_swipe_to_switch_video_title">Geste zum Wechseln des Videos deaktiviern</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">Wischen nach oben / nach unten wird nicht das nächste / vorherige Video abspielen.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">Wischen nach oben / unten wird das nächste / vorherige Video abspielen.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Auto</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Video</string>
@@ -984,9 +1157,6 @@ Bekannte Probleme: Da dies eine Funktion in der Entwicklungsphase von Google ist
     <string name="revanced_disable_hdr_video_title">HDR-Video deaktivieren</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR-Video ist deaktiviert</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR-Video ist aktiviert</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Wiedergabegeschwindigkeit im Live-Stream deaktivieren</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Standard Wiedergabegeschwindigkeit ist im Live-Stream deaktiviert</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Standard Wiedergabegeschwindigkeit ist im Live-Stream aktiviert</string>
     <string name="revanced_enable_custom_playback_speed_title">Benutzerdefinierte Wiedergabegeschwindigkeit aktivieren</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Benutzerdefinierte Wiedergabegeschwindigkeit ist aktiviert</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Benutzerdefinierte Wiedergabegeschwindigkeit ist deaktiviert</string>
@@ -1019,6 +1189,13 @@ Info:
     <string name="revanced_skip_preloaded_buffer_toast_summary_off">Benachrichtigung wird nicht angezeigt.</string>
     <string name="revanced_spoof_device_dimensions_title">Spoof device dimensions</string>
     <string name="revanced_spoof_device_dimensions_summary">"Spoofs the device dimensions in order to unlock higher video qualities that may not be available on your device."</string>
+    <string name="revanced_disable_vp9_codec_title">VP9 Codec deaktivieren</string>
+    <string name="revanced_disable_vp9_codec_summary_on">"VP9-Codec ist deaktiviert.
+
+• Maximale Auflösung beträgt 1080p.
+• Videowiedergabe wird mehr Internet-Daten als VP9 verwenden.
+• VP9-Codec wird immer noch für HDR-Videos verwendet."</string>
+    <string name="revanced_disable_vp9_codec_summary_off">VP9-Codec ist aktiviert.</string>
     <string name="revanced_replace_av1_codec_title">Replace software AV1 codec</string>
     <string name="revanced_replace_av1_codec_summary">Replaces the software AV1 codec with the VP9 codec.</string>
     <string name="revanced_reject_av1_codec_title">Reject software AV1 codec response</string>
@@ -1048,6 +1225,9 @@ Einschränkung: Dislikes werden im Inkognito Modus nicht angezeigt."</string>
     <string name="revanced_ryd_compact_layout_title">Kompakter Like-Button</string>
     <string name="revanced_ryd_compact_layout_summary_on">Like-Button für minimale Breite</string>
     <string name="revanced_ryd_compact_layout_summary_off">Like-Button für bestes Aussehen</string>
+    <string name="revanced_ryd_estimated_like_title">Geschätzte Likes anzeigen</string>
+    <string name="revanced_ryd_estimated_like_summary_on">Geschätzte Likes werden angezeigt.</string>
+    <string name="revanced_ryd_estimated_like_summary_off">Geschätzte Likes sind versteckt.</string>
     <string name="revanced_ryd_toast_on_connection_error_title">Zeige eine Benachrichtigung an, wenn die API nicht verfügbar ist</string>
     <string name="revanced_ryd_toast_on_connection_error_summary_on">Benachrichtigung wird angezeigt, wenn „Return YouTube Dislike“ nicht verfügbar ist.</string>
     <string name="revanced_ryd_toast_on_connection_error_summary_off">Benachrichtigung wird nicht angezeigt, wenn „Return YouTube Dislike“ nicht verfügbar ist.</string>
@@ -1055,7 +1235,12 @@ Einschränkung: Dislikes werden im Inkognito Modus nicht angezeigt."</string>
     <string name="revanced_ryd_about">Über</string>
     <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
     <string name="revanced_ryd_attribution_summary">Dislikes Daten werden von der True RYD Worker API zur Verfügung gestellt. Tippe hier, um mehr zu erfahren.</string>
+    <string name="revanced_ryd_failure_connection_timeout">Dislikes vorübergehend nicht verfügbar (API Timeout).</string>
+    <string name="revanced_ryd_failure_connection_status_code">Dislikes nicht verfügbar (status %d).</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">Dislikes nicht verfügbar (Client-API Limit erreicht)</string>
+    <string name="revanced_ryd_failure_generic">Dislikes nicht verfügbar (%s).</string>
+    <string name="revanced_ryd_failure_ryd_enabled_while_playing_video_then_user_voted">Video neu laden, um mit Return YouTube Dislike abzustimmen</string>
+    <string name="revanced_ryd_video_likes_hidden_by_video_owner">Versteckt</string>
     <!-- PreferenceScreen: Return YouTube Username -->
     <!-- PreferenceScreen: SponsorBlock -->
     <string name="revanced_preference_screen_sb_title">SponsorBlock</string>
@@ -1289,6 +1474,7 @@ Drücke Weiter und deaktiviere Akku-Optimierungen."</string>
     <string name="revanced_extended_settings_import_success">Einstellungen wurden erfolgreich importiert.</string>
     <string name="revanced_extended_settings_reset">Zurücksetzen</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data -->
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceCategory: Patch information -->
     <string name="revanced_preference_category_patch_information">Patch-Informationen</string>
diff --git a/patches/src/main/resources/youtube/translations/el-rGR/strings.xml b/patches/src/main/resources/youtube/translations/el-rGR/strings.xml
index 4a6fe30b3..3566bd07a 100644
--- a/patches/src/main/resources/youtube/translations/el-rGR/strings.xml
+++ b/patches/src/main/resources/youtube/translations/el-rGR/strings.xml
@@ -283,12 +283,13 @@ Playlists
     <string name="revanced_hide_related_videos_summary_off">Εμφανίζονται.</string>
     <string name="revanced_hide_related_videos_user_dialog_message">"Αυτή η ρύθμιση περιορίζει τον μέγιστο αριθμό διατάξεων που μπορούν να εμφανιστούν στην οθόνη αναπαραγωγής.
 
-Στην περίπτωση που η διάταξη της οθόνης αναπαραγωγής αλλάξει λόγω αλλαγών από πλευράς του διακομιστή, ορισμένες διατάξεις της ενδέχεται να κρυφτούν χωρίς να είναι επιθυμητό."</string>
+Στην περίπτωση που η διεπαφή της οθόνης αναπαραγωγής αλλάξει λόγω αλλαγών από πλευράς του διακομιστή, ορισμένες διατάξεις της ενδέχεται να είναι κρυμμένες χωρίς να είναι επιθυμητό."</string>
     <string name="revanced_related_videos_offset_title">Μετατόπιση</string>
     <!-- PreferenceScreen: General -->
     <string name="revanced_preference_screen_general_title">Γενικά</string>
     <string name="revanced_change_start_page_title">Αλλαγή αρχικής σελίδας</string>
     <string name="revanced_change_start_page_entry_browse">Περιήγηση καναλιών</string>
+    <string name="revanced_change_start_page_entry_courses">Μαθήματα / Εκμάθηση</string>
     <string name="revanced_change_start_page_entry_default">Προεπιλογή</string>
     <string name="revanced_change_start_page_entry_explore">Εξερεύνηση</string>
     <string name="revanced_change_start_page_entry_gaming">Παιχνίδια</string>
@@ -298,12 +299,14 @@ Playlists
     <string name="revanced_change_start_page_entry_live">Live</string>
     <string name="revanced_change_start_page_entry_movies">Ταινίες</string>
     <string name="revanced_change_start_page_entry_music">Μουσική</string>
+    <string name="revanced_change_start_page_entry_notifications">Ειδοποιήσεις</string>
     <string name="revanced_change_start_page_entry_search">Αναζήτηση</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Αθλητικά</string>
     <string name="revanced_change_start_page_entry_subscriptions">Εγγραφές</string>
     <string name="revanced_change_start_page_entry_trending">Τάσεις</string>
     <string name="revanced_change_start_page_entry_watch_later">Παρακολούθηση αργότερα</string>
+    <string name="revanced_change_start_page_entry_your_clips">Τα κλιπ σας</string>
     <string name="revanced_change_start_page_type_title">Αλλαγή τύπου αρχικής σελίδας</string>
     <string name="revanced_change_start_page_type_summary_on">"Η αρχική σελίδα αλλάζει πάντα.
 
@@ -493,12 +496,9 @@ Playlists
 Επίσης, ενδέχεται να εμφανίζονται διαφημίσεις στα Shorts.
 
 Αν η απενεργοποίηση δεν τεθεί σε ισχύ, δοκιμάστε να μεταβείτε σε λειτουργία ανώνυμης περιήγησης."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Απενεργοποίηση διαφανούς γραμμής στο φωτεινό θέμα</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Η γραμμή πλοήγησης στο φωτεινό θέμα δεν είναι διαφανής.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Η διαφάνεια της γραμμής πλοήγησης στο φωτεινό θέμα ορίζεται αυτόματα.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Απενεργοποίηση διαφανούς γραμμής στο σκούρο θέμα</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Η γραμμή πλοήγησης στο σκούρο θέμα δεν είναι διαφανής.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Η διαφάνεια της γραμμής πλοήγησης στο σκούρο θέμα ορίζεται αυτόματα.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Διαφανή γραμμή πλοήγησης</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">Η γραμμή πλοήγησης είναι διαφανής.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">Η γραμμή πλοήγησης δεν είναι διαφανής.</string>
     <string name="revanced_hide_navigation_bar_title">Γραμμή πλοήγησης</string>
     <string name="revanced_hide_navigation_bar_summary_on">Κρυμμένη.</string>
     <string name="revanced_hide_navigation_bar_summary_off">Εμφανίζεται.</string>
@@ -859,6 +859,16 @@ Playlists
     <string name="revanced_disable_engagement_panel_title">Απενεργοποίηση πίνακα αλληλεπίδρασης</string>
     <string name="revanced_disable_engagement_panel_summary_on">Ο πίνακας αλληλεπίδρασης είναι απενεργοποιημένος.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Ο πίνακας αλληλεπίδρασης είναι ενεργοποιημένος.</string>
+    <string name="revanced_enter_fullscreen_title">Άνοιγμα των βίντεο σε λειτουργία πλήρους οθόνης</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Γίνεται εισαγωγή σε πλήρη οθόνη κατά την έναρξη των βίντεο.
+
+Περιορισμός: Δεν ισχύει αν το βίντεο είναι ελαχιστοποιημένο, σε λειτουργία PiP, ή στο παρασκήνιο."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Δεν γίνεται εισαγωγή σε πλήρη οθόνη κατά την έναρξη των βίντεο.</string>
+    <string name="revanced_exit_fullscreen_title">Έξοδος από τη λειτουργία πλήρους οθόνης στο τέλος του βίντεο</string>
+    <string name="revanced_exit_fullscreen_entry_1">Απενεργοποιημένο</string>
+    <string name="revanced_exit_fullscreen_entry_2">Κατακόρυφη</string>
+    <string name="revanced_exit_fullscreen_entry_3">Οριζόντια</string>
+    <string name="revanced_exit_fullscreen_entry_4">Κατακόρυφη και οριζόντια</string>
     <string name="revanced_show_video_title_section_title">Εμφάνιση τίτλου βίντεο</string>
     <string name="revanced_show_video_title_section_summary">"Εμφάνιση τίτλου του βίντεο σε πλήρη οθόνη.
 
@@ -918,11 +928,6 @@ Playlists
     <string name="revanced_enable_compact_controls_overlay_title">Στοιχεία ελέγχου μικρότερου στυλ</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Τα στοιχεία ελέγχου μικρότερου στυλ είναι ενεργοποιημένα.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Τα στοιχεία ελέγχου μικρότερου στυλ είναι απενεργοποιημένα.</string>
-    <string name="revanced_force_fullscreen_title">Εξαναγκασμός πλήρης οθόνης πάντα</string>
-    <string name="revanced_force_fullscreen_summary">"Τα βίντεο θα αλλάξουν σε λειτουργία πλήρους οθόνης στις ακόλουθες περιπτώσεις:
-
-• Όταν ξεκινάει ένα βίντεο.
-• Όταν πατιέται μια χρονοσήμανση στα σχόλια."</string>
     <string name="revanced_keep_landscape_mode_title">Διατήρηση οριζόντιας λειτουργίας</string>
     <string name="revanced_keep_landscape_mode_summary">Διατήρηση της οριζόντιας λειτουργίας στο κλείσιμο και άνοιγμα της οθόνης ενώ βρίσκεστε σε λειτουργία πλήρους οθόνης.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Χρονικό όριο οριζόντιας λειτουργίας</string>
@@ -1341,7 +1346,7 @@ Playlists
 
 Περιορισμοί:
 • Αυτή η ρύθμιση ενεργοποιεί όχι μόνο τις χρονοσφραγίδες, αλλά επιτρέπει την απόκρυψη των στοιχείων UI πατώντας στο φόντο της οθόνης αναπαραγωγής.
-• Δεδομένου ότι αυτή είναι μια λειτουργία της Google που βρίσκεται ακόμη στο στάδιο ανάπτυξης, η διάταξη μπορεί να χαλάσει."</string>
+• Δεδομένου ότι αυτή είναι μια λειτουργία της Google που βρίσκεται ακόμη στο στάδιο ανάπτυξης, η διεπαφή μπορεί να χαλάσει."</string>
     <string name="revanced_enable_shorts_time_stamp_summary_off">Οι χρονοσφραγίδες είναι απενεργοποιημένες.</string>
     <string name="revanced_shorts_time_stamp_change_repeat_state_title">Ενέργεια πατήματος χρονοσφραγίδας</string>
     <string name="revanced_shorts_time_stamp_change_repeat_state_summary">Πατήστε παρατεταμένα την χρονοσφραγίδα για να αλλάξει η κατάσταση επανάληψης των Shorts.</string>
@@ -1407,12 +1412,18 @@ Playlists
     <string name="revanced_disable_hdr_auto_brightness_title">Απενεργοποίηση αυτόματης φωτεινότητας HDR</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Η αυτόματη φωτεινότητα HDR είναι απενεργοποιημένη.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Η αυτόματη φωτεινότητα HDR είναι ενεργοποιημένη.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Απενεργοποίηση χειρονομίας εναλλαγής σε πλήρη οθόνη</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Η εναλλαγή σε λειτουργία πλήρους οθόνης με σάρωση στην περιοχή κάτω από την οθόνη αναπαραγωγής είναι απενεργοποιημένη.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Η εναλλαγή σε λειτουργία πλήρους οθόνης με σάρωση στην περιοχή κάτω από την οθόνη αναπαραγωγής είναι ενεργοποιημένη.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Απενεργοποίηση χειρονομίας σάρωσης για αλλαγή βίντεο</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">Η σάρωση προς τα πάνω / κάτω δε θα αναπαράγει το επόμενο / προηγούμενο βίντεο.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">Η σάρωση προς τα πάνω / κάτω θα αναπαράγει το επόμενο / προηγούμενο βίντεο.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">Η σάρωση προς τα πάνω / κάτω κατά τη λειτουργία πλήρους οθόνης δε θα αναπαράγει το επόμενο / προηγούμενο βίντεο.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">Η σάρωση προς τα πάνω / κάτω κατά τη λειτουργία πλήρους οθόνης θα αναπαράγει το επόμενο / προηγούμενο βίντεο.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Απενεργοποίηση σάρωσης για εισαγωγή σε πλήρη οθόνη (κάτω από την οθόνη αναπαραγωγής)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Η σάρωση προς τα κάτω κάτω από την οθόνη αναπαραγωγής δε θα ενεργοποιήσει τη λειτουργία πλήρους οθόνης.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Η σάρωση προς τα κάτω κάτω από την οθόνη αναπαραγωγής θα ενεργοποιήσει τη λειτουργία πλήρους οθόνης.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Απενεργοποίηση σάρωσης για εισαγωγή σε πλήρη οθόνη (μέσα στην οθόνη αναπαραγωγής)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Η σάρωση προς τα πάνω στην οθόνη αναπαραγωγής δε θα ενεργοποιήσει τη λειτουργία πλήρους οθόνης.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Η σάρωση προς τα πάνω στην οθόνη αναπαραγωγής θα ενεργοποιήσει τη λειτουργία πλήρους οθόνης.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Απενεργοποίηση σάρωσης για έξοδο από πλήρη οθόνη</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Η σάρωση προς τα κάτω δε θα τερματίζει τη λειτουργία πλήρους οθόνης.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Η σάρωση προς τα κάτω θα τερματίζει τη λειτουργία πλήρους οθόνης.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Αυτόματη</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Βίντεο</string>
@@ -1422,9 +1433,6 @@ Playlists
     <string name="revanced_disable_hdr_video_title">Απενεργοποίηση βίντεο HDR</string>
     <string name="revanced_disable_hdr_video_summary_on">Τα βίντεο που υποστηρίζουν HDR δεν θα παίζουν σε HDR ποιότητα.</string>
     <string name="revanced_disable_hdr_video_summary_off">Τα βίντεο που υποστηρίζουν HDR θα παίζουν σε HDR ποιότητα.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Απενεργοποίηση αλλαγής ταχύτητας σε ζωντανές μεταδόσεις</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Η προεπιλεγμένη ταχύτητα αναπαραγωγής δεν εφαρμόζεται σε ζωντανές μεταδόσεις.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Η προεπιλεγμένη ταχύτητα αναπαραγωγής εφαρμόζεται σε ζωντανές μεταδόσεις.</string>
     <string name="revanced_enable_custom_playback_speed_title">Προσαρμοσμένη ταχύτητα αναπαραγωγής</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Η προσαρμοσμένη ταχύτητα αναπαραγωγής είναι ενεργοποιημένη.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Η προσαρμοσμένη ταχύτητα αναπαραγωγής είναι απενεργοποιημένη.</string>
@@ -1449,10 +1457,11 @@ Playlists
     <string name="revanced_restore_old_video_quality_menu_summary_on">Εμφανίζεται το μενού αλλαγής ποιότητας βίντεο παλιού στυλ.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Εμφανίζεται το μενού αλλαγής ποιότητας βίντεο νέου στυλ.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Απενεργοποίηση αλλαγής ταχύτητας σε βίντεο μουσικής</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"Η προεπιλεγμένη ταχύτητα αναπαραγωγής δεν εφαρμόζεται για τα βίντεο μουσικής.
-
-Περιορισμός: Αυτή η ρύθμιση ενδέχεται να μην ισχύει για τα βίντεο που δεν περιλαμβάνουν την λειτουργία «Ακρόαση με YouTube Music»."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">Η προεπιλεγμένη ταχύτητα δεν εφαρμόζεται σε βίντεο μουσικής.</string>
     <string name="revanced_disable_default_playback_speed_music_off">Η προεπιλεγμένη ταχύτητα εφαρμόζεται σε βίντεο μουσικής.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Επικύρωση με βάση τις κατηγορίες</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">Η προεπιλεγμένη ταχύτητα αναπαραγωγής είναι απενεργοποιημένη αν η κατηγορία βίντεο είναι μουσική.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">Η προεπιλεγμένη ταχύτητα αναπαραγωγής είναι απενεργοποιημένη για βίντεο που μπορούν να αναπαραχθούν στο YouTube Music.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Αλλαγή προεπιλεγμένης ταχύτητας Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Η προεπιλεγμένη ταχύτητα αναπαραγωγής εφαρμόζεται στα Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Η προεπιλεγμένη ταχύτητα αναπαραγωγής δεν εφαρμόζεται στα Shorts.</string>
@@ -1799,24 +1808,42 @@ Playlists
     <string name="revanced_spoof_streaming_data_summary_off">"Τα δεδομένα ροής δεν παραποιούνται. Η αναπαραγωγή βίντεο ενδέχεται να μη λειτουργεί σωστά."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Η απενεργοποίηση αυτής της ρύθμισης ενδέχεται να προκαλέσει προβλήματα αναπαραγωγής βίντεο.</string>
     <string name="revanced_spoof_streaming_data_type_title">Προεπιλογή</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Απαιτείται σύνδεση)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(Απαιτείται αναγνωριστικό PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Απαιτείται σύνδεση)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Παρενέργειες παραποίησης</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Δεν ανακαλύφθηκαν ακόμη.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Οι ταινίες ή τα βίντεο επί πληρωμή ενδέχεται να μην αναπαράγονται.</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• Το μενού «Κομμάτι ήχου» λείπει.
 • Η λειτουργία «Σταθερή ένταση» δεν είναι διαθέσιμη.
-• Η λειτουργία «Απενεργοποίηση υποχρεωτικών κομματιών ήχου» δεν είναι διαθέσιμη."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Χρήση των προγραμμάτων πελάτη Android μόνο</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Τα προγράμματα πελάτη Android χρησιμοποιούνται τη λήψη δεδομένων ροής.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Τα προγράμματα πελάτη Android και iOS χρησιμοποιούνται τη λήψη δεδομένων ροής.</string>
+• Η λειτουργία «Απενεργοποίηση υποχρεωτικών κομματιών ήχου» δεν είναι διαθέσιμη.
+• Τα βίντεο για παιδιά ενδέχεται να μην αναπαράγονται αν είστε αποσυνδεμένοι ή σε λειτουργία ανώνυμης περιήγησης."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Ενδέχεται να υπάρχουν προβλήματα αναπαραγωγής (Απαιτείται αναγνωριστικό PoToken).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Οι ταινίες ή τα επί πληρωμή βίντεο ενδέχεται να μην αναπαράγονται.
+• Τα βίντεο για παιδιά ενδέχεται να μην αναπαράγονται αν είστε αποσυνδεμένοι ή σε λειτουργία ανώνυμης περιήγησης."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Εξαναγκασμός iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Ο κωδικοποιητής βίντεο έχει οριστεί υποχρεωτικά σε AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Ο κωδικοποιητής βίντεο ορίζεται αυτόματα.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Η ενεργοποίηση αυτής της λειτουργίας ενδέχεται να βελτιώσει τη διάρκεια ζωής της μπαταρίας και να διορθώσει κολλήματα αναπαραγωγής.
+
+Ο AVC έχει μέγιστη ανάλυση 1080p, ο κωδικοποιητής ήχου Opus δεν είναι διαθέσιμος και η αναπαραγωγή βίντεο θα χρησιμοποιεί περισσότερα δεδομένα ίντερνετ από τον VP9 ή τον AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Εμφάνιση στο «Στατιστικά για σπασίκλες»</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Το πρόγραμμα πελάτη που χρησιμοποιείται για τη λήψη δεδομένων ροής εμφανίζεται στο μενού «Στατιστικά για σπασίκλες».</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Το πρόγραμμα πελάτη που χρησιμοποιείται για τη λήψη δεδομένων ροής δεν εμφανίζεται στο μενού «Στατιστικά για σπασίκλες».</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken προς χρήση</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken που εκδίδεται από το BotGuard σε ένα έμπιστο πρόγραμμα περιήγησης.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData προς χρήση</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData που εκδίδεται από το BotGuard σε ένα έμπιστο πρόγραμμα περιήγησης.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">Σχετικά με τα αναγνωριστικά PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Κάποια προγράμματα απαιτούν αναγνωριστικά PoToken και VisitorData για να λάβουν έγκυρη απόκριση δεδομένων ροής.
+
+Αν προσπαθείτε να χρησιμοποιήσετε το iOS ως προεπιλεγμένο πρόγραμμα-πελάτη, μπορεί να χρειαστείτε αυτές τις τιμές.
+
+Πατήστε για να δείτε περισσότερες πληροφορίες."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Ιστορικό παρακολούθησης</string>
     <string name="revanced_preference_screen_watch_history_summary">Διαχείριση των ρυθμίσεων που σχετίζονται με το ιστορικό παρακολούθησης.</string>
diff --git a/patches/src/main/resources/youtube/translations/es-rES/strings.xml b/patches/src/main/resources/youtube/translations/es-rES/strings.xml
index 86aadb752..cfbb1cdbb 100644
--- a/patches/src/main/resources/youtube/translations/es-rES/strings.xml
+++ b/patches/src/main/resources/youtube/translations/es-rES/strings.xml
@@ -291,6 +291,7 @@ Si el diseño de la pantalla del reproductor cambia debido a cambios en el servi
     <string name="revanced_preference_screen_general_title">General</string>
     <string name="revanced_change_start_page_title">Cambiar página de inicio</string>
     <string name="revanced_change_start_page_entry_browse">Explorar canales</string>
+    <string name="revanced_change_start_page_entry_courses">Cursos / Aprendizaje</string>
     <string name="revanced_change_start_page_entry_default">Predeterminada</string>
     <string name="revanced_change_start_page_entry_explore">Explorar</string>
     <string name="revanced_change_start_page_entry_gaming">Juegos</string>
@@ -300,12 +301,14 @@ Si el diseño de la pantalla del reproductor cambia debido a cambios en el servi
     <string name="revanced_change_start_page_entry_live">En directo</string>
     <string name="revanced_change_start_page_entry_movies">Películas</string>
     <string name="revanced_change_start_page_entry_music">Música</string>
+    <string name="revanced_change_start_page_entry_notifications">Notificaciones</string>
     <string name="revanced_change_start_page_entry_search">Búsqueda</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Deportes</string>
     <string name="revanced_change_start_page_entry_subscriptions">Suscripciones</string>
     <string name="revanced_change_start_page_entry_trending">Tendencias</string>
     <string name="revanced_change_start_page_entry_watch_later">Ver más tarde</string>
+    <string name="revanced_change_start_page_entry_your_clips">Tus clips</string>
     <string name="revanced_change_start_page_type_title">Cambiar tipo de página de inicio</string>
     <string name="revanced_change_start_page_type_summary_on">"La página de inicio siempre cambia.
 
@@ -495,12 +498,9 @@ Nota: Al activar esto también se ocultan forzosamente los anuncios de vídeos."
 Además, los anuncios ya no se bloquearán en Shorts.
 
 Si este ajuste no surte efecto, prueba a cambiar al modo incógnito."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Desactivar barra translúcida luminosa</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">La barra de navegación en modo claro es opaca.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Desactivar barra translúcida oscura</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">La barra de navegación en modo oscuro es opaca.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">La barra de navegación en modo oscuro es opaca o translúcida.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Activar barra de navegación translúcida</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">La barra de navegación es translúcida.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">La barra de navegación es opaca.</string>
     <string name="revanced_hide_navigation_bar_title">Ocultar barra de navegación</string>
     <string name="revanced_hide_navigation_bar_summary_on">La barra de navegación está oculta.</string>
     <string name="revanced_hide_navigation_bar_summary_off">La barra de navegación está visible.</string>
@@ -860,6 +860,16 @@ La reproducción automática se puede cambiar en la configuración de YouTube:
     <string name="revanced_disable_engagement_panel_title">Desactivar panel de interacción</string>
     <string name="revanced_disable_engagement_panel_summary_on">El panel de interacción está desactivado.</string>
     <string name="revanced_disable_engagement_panel_summary_off">El panel de interacción está activado.</string>
+    <string name="revanced_enter_fullscreen_title">Entrar en modo de pantalla completa cuando se inicia el vídeo</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Entra en modo de pantalla completa cuando se inicia el vídeo.
+
+Limitación: No funciona si el reproductor está minimizado, en modo PiP o en segundo plano."</string>
+    <string name="revanced_enter_fullscreen_summary_off">No entra en modo de pantalla completa cuando se inicia el vídeo.</string>
+    <string name="revanced_exit_fullscreen_title">Salir del modo de pantalla completa al final del vídeo</string>
+    <string name="revanced_exit_fullscreen_entry_1">Desactivado</string>
+    <string name="revanced_exit_fullscreen_entry_2">Vertical</string>
+    <string name="revanced_exit_fullscreen_entry_3">Horizontal</string>
+    <string name="revanced_exit_fullscreen_entry_4">Vertical y horizontal</string>
     <string name="revanced_show_video_title_section_title">Mostrar sección de título de vídeo</string>
     <string name="revanced_show_video_title_section_summary">"Muestra la sección de título de vídeo en pantalla completa.
 
@@ -915,11 +925,6 @@ Limitación: el título de vídeo desaparece cuando se pulsa."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Activar superposición compacta de controles</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">La superposición de controles no ocupa la pantalla completa.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">La superposición de controles ocupa la pantalla completa.</string>
-    <string name="revanced_force_fullscreen_title">Forzar pantalla completa</string>
-    <string name="revanced_force_fullscreen_summary">"Los vídeos pasarán a pantalla completa en las siguientes situaciones:
-
-• Cuando se pulsa sobre una marca de tiempo en los comentarios.
-• Cuando se inicia un vídeo."</string>
     <string name="revanced_keep_landscape_mode_title">Mantener modo horizontal</string>
     <string name="revanced_keep_landscape_mode_summary">Mantiene el modo horizontal al apagar y encender la pantalla en pantalla completa.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Mantener tiempo de espera del modo horizontal</string>
@@ -1380,12 +1385,18 @@ No hay márgenes en la parte superior e inferior del reproductor."</string>
     <string name="revanced_disable_hdr_auto_brightness_title">Desactivar brillo HDR automático</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">El brillo HDR automático está desactivado.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">El brillo HDR automático está activado.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Desactivar gestos del panel de visualización</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">El cambio a pantalla completa deslizando el dedo por la zona inferior del reproductor está desactivado.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">El cambio a pantalla completa deslizando el dedo por la zona inferior del reproductor está activado.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Desactivar deslizar para cambiar el vídeo</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_on">Deslizar hacia arriba / abajo no reproducirá el vídeo siguiente / anterior.</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_off">Deslizar hacia arriba / abajo reproducirá el vídeo siguiente / anterior.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Desactivar deslizamiento para entrar en modo de pantalla completa (debajo del reproductor)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Si deslizas el dedo hacia abajo por debajo del reproductor, no entrará en el modo de pantalla completa.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Si deslizas el dedo hacia abajo por debajo del reproductor, entrará en el modo de pantalla completa.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Desactivar deslizamiento para entrar en modo de pantalla completa (en el reproductor)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Si deslizas el dedo hacia arriba en el reproductor, no entrará en el modo de pantalla completa.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Si deslizas el dedo hacia arriba en el reproductor, entrará en el modo de pantalla completa.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Desactivar deslizamiento para salir del modo de pantalla completa</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Si deslizas el dedo hacia abajo en pantalla completa, no saldrá del modo de pantalla completa.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Si deslizas el dedo hacia abajo en pantalla completa, saldrá del modo de pantalla completa.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Automático</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Vídeo</string>
@@ -1395,9 +1406,6 @@ No hay márgenes en la parte superior e inferior del reproductor."</string>
     <string name="revanced_disable_hdr_video_title">Desactivar vídeo HDR</string>
     <string name="revanced_disable_hdr_video_summary_on">El vídeo HDR está desactivado.</string>
     <string name="revanced_disable_hdr_video_summary_off">El vídeo HDR está activado.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Desactivar la velocidad de reproducción en directo</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">La velocidad predeterminada de reproducción está desactivada en directo.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">La velocidad predeterminada de reproducción está activada en directo.</string>
     <string name="revanced_enable_custom_playback_speed_title">Activar velocidad personalizada de reproducción</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">La velocidad personalizada de reproducción está activada.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">La velocidad personalizada de reproducción está desactivada.</string>
@@ -1422,10 +1430,11 @@ No hay márgenes en la parte superior e inferior del reproductor."</string>
     <string name="revanced_restore_old_video_quality_menu_summary_on">El antiguo menú de calidad de vídeo está visible.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">El antiguo menú de calidad de vídeo está oculto.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Desactivar velocidad de reproducción para música</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"La velocidad predeterminada de reproducción está desactivada para la música.
-
-Limitación: Es posible que este ajuste no se aplique a los vídeos que no incluyan el banner \"Escuchar en YouTube Music\"."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">La velocidad predeterminada de reproducción está desactivada para la música.</string>
     <string name="revanced_disable_default_playback_speed_music_off">La velocidad predeterminada de reproducción está activada para la música.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Validar mediante categorías</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">La velocidad predeterminada de reproducción se desactiva si la categoría de vídeo es Música.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">La velocidad predeterminada de reproducción está desactivada para los vídeos reproducibles en YouTube Music.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Activar velocidad predeterminada de reproducción de Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">La velocidad predeterminada de reproducción se aplica a los Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">La velocidad predeterminada de reproducción no se aplica a los Shorts.</string>
@@ -1768,24 +1777,42 @@ Pulsa el botón de continuar y desactiva las optimizaciones de la batería."</st
     <string name="revanced_spoof_streaming_data_summary_off">"Los datos de transmisión no están falsificados. Es posible que la reproducción de vídeo no funcione."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Desactivar este ajuste puede causar problemas de reproducción de vídeo.</string>
     <string name="revanced_spoof_streaming_data_type_title">Cliente predeterminado</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">Música iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Creador de Android</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Inicio de sesión requerido)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(PoToken requerido)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Inicio de sesión requerido)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Efectos secundarios de falsificación</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Aún no encontrado.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Las películas o vídeos de pago no pueden reproducirse.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_android">"• Falta el menú de pista de audio.
+    <string name="revanced_spoof_streaming_data_side_effects_android">"• Falta el menú de la pista de audio.
 • El volumen estable no está disponible.
-• Desactivar pistas de audio automáticas forzadas no está disponible."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Utilizar solo clientes Android</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Los clientes Android se utilizan para obtener datos de streaming.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Los clientes Android e iOS se utilizan para obtener datos de streaming.</string>
+• Desactivar pistas de audio automáticas forzadas no está disponible.
+• Es posible que los vídeos infantiles no se reproduzcan al cerrar la sesión o en modo incógnito."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Puede haber problemas de reproducción (PoToken requerido).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Es posible que las películas o los vídeos de pago no se reproduzcan.
+• Es posible que los vídeos infantiles no se reproduzcan al cerrar la sesión o en modo incógnito."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Forzar iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">El códec de vídeo es AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">El códec de vídeo se determina automáticamente.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Activar este ajuste podría mejorar la duración de la batería y solucionar el problema de la reproducción entrecortada.
+
+AVC tiene una resolución máxima de 1080p, el códec de audio Opus no está disponible y la reproducción de vídeo utilizará más datos de Internet que VP9 o AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostrar en estadísticas para nerds</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">El cliente utilizado para obtener datos de transmisión se muestra en estadísticas para nerds.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">El cliente utilizado para obtener datos de transmisión no se muestra en estadísticas para nerds.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken a utilizar</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken emitido por BotGuard en un navegador de confianza.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData a utilizar</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData emitido por BotGuard en un navegador de confianza.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">Acerca de PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Algunos clientes requieren PoToken y VisitorData para obtener una respuesta de datos de streaming válida.
+
+Si estás intentando utilizar iOS como cliente predeterminado, es posible que necesites estos valores.
+
+Pulsa aquí para ver más información."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Historial de reproducciones</string>
     <string name="revanced_preference_screen_watch_history_summary">Cambiar ajustes relacionados con el historial de reproducciones.</string>
diff --git a/patches/src/main/resources/youtube/translations/fr-rFR/strings.xml b/patches/src/main/resources/youtube/translations/fr-rFR/strings.xml
index c925ff19f..2b353da0b 100644
--- a/patches/src/main/resources/youtube/translations/fr-rFR/strings.xml
+++ b/patches/src/main/resources/youtube/translations/fr-rFR/strings.xml
@@ -293,6 +293,7 @@ Si la mise en page de l'écran du lecteur change en raison de modifications côt
     <string name="revanced_preference_screen_general_title">Interface</string>
     <string name="revanced_change_start_page_title">Modifier la page de démarrage</string>
     <string name="revanced_change_start_page_entry_browse">Parcourir les chaînes</string>
+    <string name="revanced_change_start_page_entry_courses">Savoir / Culture</string>
     <string name="revanced_change_start_page_entry_default">Par défaut</string>
     <string name="revanced_change_start_page_entry_explore">Explorer</string>
     <string name="revanced_change_start_page_entry_gaming">Jeux vidéos</string>
@@ -302,12 +303,14 @@ Si la mise en page de l'écran du lecteur change en raison de modifications côt
     <string name="revanced_change_start_page_entry_live">Direct</string>
     <string name="revanced_change_start_page_entry_movies">Films</string>
     <string name="revanced_change_start_page_entry_music">Musique</string>
+    <string name="revanced_change_start_page_entry_notifications">Notifications</string>
     <string name="revanced_change_start_page_entry_search">Rechercher sur YouTube</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Sports</string>
     <string name="revanced_change_start_page_entry_subscriptions">Abonnements</string>
     <string name="revanced_change_start_page_entry_trending">Tendances</string>
     <string name="revanced_change_start_page_entry_watch_later">Regarder plus tard</string>
+    <string name="revanced_change_start_page_entry_your_clips">Vos clips</string>
     <string name="revanced_change_start_page_type_title">Type de modification de la page de démarrage</string>
     <string name="revanced_change_start_page_type_summary_on">"La page de démarrage est toujours modifiée.
 
@@ -497,12 +500,9 @@ Note : Activer ceci masquera également les publicités vidéos."</string>
 Également, les publicités ne seront plus bloquées sur les Shorts.
 
 Si ce paramètre ne fait pas effet, essayer de passer en mode Incognito."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Désactiver la barre translucide clair</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">La barre de navigation en mode clair est opaque.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">La barre de navigation en mode clair est opaque ou translucide.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Désactiver la barre translucide en mode sombre</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">La barre translucide en mode sombre est opaque.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">La barre translucide en mode sombre est opaque ou translucide.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Activer la barre de navigation translucide</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">La barre de navigation est translucide.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">La barre de navigation est opaque.</string>
     <string name="revanced_hide_navigation_bar_title">Masquer la barre de navigation</string>
     <string name="revanced_hide_navigation_bar_summary_on">La barre de navigation est masqué.</string>
     <string name="revanced_hide_navigation_bar_summary_off">La barre de navigation est affichée.</string>
@@ -862,6 +862,16 @@ La lecture automatique peut être modifiée dans les paramètres de YouTube :
     <string name="revanced_disable_engagement_panel_title">Désactiver description en plein écran</string>
     <string name="revanced_disable_engagement_panel_summary_on">La description en plein écran est désactivée.</string>
     <string name="revanced_disable_engagement_panel_summary_off">La description en plein écran est activée.</string>
+    <string name="revanced_enter_fullscreen_title">Passer en mode plein écran au démarrage de la vidéo</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Passer en mode plein écran lorsque la vidéo démarre.
+
+Limitation : Ne fonctionne pas si le lecteur est minimisé, en mode PiP, ou en arrière-plan."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Ne pas passer en mode plein écran au démarrage de la vidéo.</string>
+    <string name="revanced_exit_fullscreen_title">Quitter le mode plein écran à la fin de la vidéo</string>
+    <string name="revanced_exit_fullscreen_entry_1">Désactivé</string>
+    <string name="revanced_exit_fullscreen_entry_2">Portrait</string>
+    <string name="revanced_exit_fullscreen_entry_3">Paysage</string>
+    <string name="revanced_exit_fullscreen_entry_4">Portrait et paysage</string>
     <string name="revanced_show_video_title_section_title">Afficher la section titre de la vidéo</string>
     <string name="revanced_show_video_title_section_summary">"Affiche la section du titre de la vidéo en plein écran.
 
@@ -917,11 +927,6 @@ Limitation : Le titre de la vidéo disparaît lorsque vous cliquez dessus."</str
     <string name="revanced_enable_compact_controls_overlay_title">Activer le fond des contrôles compacts</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">La voile des contrôles ne remplit pas le plein écran.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">La voile des contrôles remplit le plein écran.</string>
-    <string name="revanced_force_fullscreen_title">Forcer le plein écran</string>
-    <string name="revanced_force_fullscreen_summary">"La vidéo passera en mode plein écran dans les situations suivantes :
-
-• Lors du démarrage de la vidéo.
-• Clic sur un horodatage dans les commentaires."</string>
     <string name="revanced_keep_landscape_mode_title">Maintenir le mode paysage</string>
     <string name="revanced_keep_landscape_mode_summary">Maintient le mode paysage lorsque l\'écran est éteint et rallumé en mode plein écran.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Durée du maintien du mode paysage</string>
@@ -1386,12 +1391,18 @@ Pas de marges en haut et en bas du lecteur."</string>
     <string name="revanced_disable_hdr_auto_brightness_title">Luminosité HDR automatique</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">La luminosité HDR automatique est désactivée.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">La luminosité HDR automatique est activée.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Désactiver les gestes inférieurs du lecteur</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Le passage plein écran en faisant glisser vers le bas sous le lecteur vidéo est désactivé.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Le passage plein écran en faisant glisser vers le bas sous le lecteur vidéo est activé.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Désactiver les gestes pour changer de vidéo</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">Glisser vers le haut / bas ne lira pas la vidéo suivante / précédente.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">Glisser vers le haut / bas pour lire la vidéo suivante / précédente.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">Glisser vers le haut / bas en plein écran ne lira pas la vidéo suivante / précédente.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">Glisser vers le haut / bas en plein écran lira la vidéo suivante / précédente.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Désactiver les gestes pour entrer en mode plein écran (sous le lecteur)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Glisser vers le bas sous le lecteur ne permet pas d\'entrer en mode plein écran.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Glisser vers le bas sous le lecteur permet d\'entrer en mode plein écran.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Désactiver les gestes pour entrer en mode plein écran (dans le lecteur)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Glisser vers le haut dans le lecteur ne permets pas d\'entrer en mode plein écran.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Glisser vers le haut dans le lecteur permets d\'entrer en mode plein écran.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Désactiver les gestes pour sortir du mode plein écran</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Glisser vers le bas en mode plein écran ne permet pas de sortir du mode plein écran.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Glisser vers le bas en plein écran permets de sortir du mode plein écran.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Auto</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Vitesses et qualités vidéo</string>
@@ -1401,9 +1412,6 @@ Pas de marges en haut et en bas du lecteur."</string>
     <string name="revanced_disable_hdr_video_title">Déaactiver les vidéos HDR</string>
     <string name="revanced_disable_hdr_video_summary_on">Les vidéos en HDR sont désactivés.</string>
     <string name="revanced_disable_hdr_video_summary_off">Les vidéos en HDR sont activés.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Désact. vitesse lecture des diffusions en direct</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">La vitesse de lecture par défaut est désactivée pour les diffusions en direct.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">La vitesse de lecture par défaut est activée pour les diffusions en direct.</string>
     <string name="revanced_enable_custom_playback_speed_title">Activer vitesses de lecture perso.</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Les vitesses de lecture personnalisées sont activées.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Les vitesses de lecture personnalisées sont désactivées.</string>
@@ -1428,10 +1436,11 @@ Pas de marges en haut et en bas du lecteur."</string>
     <string name="revanced_restore_old_video_quality_menu_summary_on">Affiche l\'ancienne interface de qualité vidéo.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Masque la nouvelle interface de qualité vidéo.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Désactiver la vitesse de lecture pour la musique</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"La vitesse de lecture par défaut est désactivée pour la musique.
-
-Limitation : Ce paramètre peut ne pas s'appliquer aux vidéos qui n'incluent pas la bannière 'Écouter sur YouTube Music'."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">La vitesse de lecture par défaut est activée pour la musique.</string>
     <string name="revanced_disable_default_playback_speed_music_off">La vitesse de lecture par défaut est activée pour la musique.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Valider en utilisant les catégories</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">La vitesse de lecture par défaut est désactivée si la catégorie de la vidéo est Musique.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">La vitesse de lecture par défaut est désactivée pour les vidéos lues sur YouTube Music.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Activ. vitesses de lecture shorts par défaut</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">La vitesse de lecture par défaut s\'applique aux Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">La vitesse de lecture par défaut ne s\'applique pas aux Shorts.</string>
@@ -1777,18 +1786,42 @@ Cliquez sur le bouton Continuer et autorisez les modifications d'optimisations."
     <string name="revanced_spoof_streaming_data_summary_off">"Les données de lecture en direct ne sont pas falsifiées. La lecture vidéo peut ne pas fonctionner."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Désactiver ce paramètre peut entraîner des problèmes de lecture vidéo.</string>
     <string name="revanced_spoof_streaming_data_type_title">Client par défaut</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">Musique iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">TV iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Connexion requise)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(PoToken requis)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Connexion requise)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Effets inconnus de la falsification</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Les vidéos privées conçues pour enfants peuvent ne pas être lues.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Les vidéos privées conçues pour enfants peuvent ne pas être lues.
-• Les films ou vidéos payantes peuvent ne pas être lues.</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android">"• Le menu 'piste audio' n'est pas disponible.
+• Le volume stable n'est pas disponible.
+• La désactivation forcée des pistes audio automatiques n'est pas disponible.
+• Les vidéos pour enfants peuvent ne pas être lues en cas de déconnexion ou en mode incognito."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Il peut y avoir des problèmes de lecture (PoToken required).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Les films ou vidéos payantes peut ne pas être lus.
+• Les vidéos pour enfants peuvent ne pas être lues en cas de déconnexion ou en mode incognito."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Forcer le codec AVC de iOS (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Le codec vidéo est forcé sur AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Le codec vidéo est déterminé automatiquement.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Activer ceci peut améliorer la durée de vie de la batterie et résoudre les problèmes de lecture saccadée.
+
+AVC a une résolution maximale de 1080p, le codec audio Opus n'est pas disponible et la lecture vidéo utilisera plus de données internet que VP9 ou AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Afficher dans \'Statistiques pour les nerds\'</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Le client utilisé pour récupérer les données de lecture en direct est affiché dans \'Statistiques pour les nerds\'.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Le client utilisé pour récupérer les données de lecture en direct est masqué dans \'Statistiques pour les nerds\'.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken à utiliser</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken publié par BotGuard dans un navigateur de confiance.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData à utiliser</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData publié par BotGuard dans un navigateur de confiance.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">À propos de PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Certains clients ont besoin de PoToken et de VisitorData pour obtenir une réponse de données en continu valide.
+
+Si vous essayez d'utiliser iOS comme client par défaut, il se peut que vous ayez besoin de ces valeurs.
+
+Cliquez pour plus d'informations."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Historique de visionnage</string>
     <string name="revanced_preference_screen_watch_history_summary">Modifie les paramètres liés à l\'historique de visionnage.</string>
diff --git a/patches/src/main/resources/youtube/translations/hu-rHU/strings.xml b/patches/src/main/resources/youtube/translations/hu-rHU/strings.xml
index 85713bdf4..9df129e67 100644
--- a/patches/src/main/resources/youtube/translations/hu-rHU/strings.xml
+++ b/patches/src/main/resources/youtube/translations/hu-rHU/strings.xml
@@ -115,17 +115,17 @@ Koppints ide, ha többet szeretnél megtudni a DeArrow-ról."</string>
     <string name="revanced_hide_expandable_shelf_title">Kinyitható polcok elrejtése</string>
     <string name="revanced_hide_expandable_shelf_summary_on">A kinyitható polcok el vannak rejtve.</string>
     <string name="revanced_hide_expandable_shelf_summary_off">A kinyitható polcok láthatóak.</string>
-    <string name="revanced_hide_feed_captions_button_title">Rejtsd el a hírfolyam feliratok gombját</string>
+    <string name="revanced_hide_feed_captions_button_title">Feliratok gomb elrejtése</string>
     <string name="revanced_hide_feed_captions_button_on">A Feliratok gomb el van rejtve.</string>
     <string name="revanced_hide_feed_captions_button_off">A Feliratok gomb megjelenik.</string>
-    <string name="revanced_hide_feed_search_bar_title">Hírfolyam keresősáv elrejtése</string>
-    <string name="revanced_hide_feed_search_bar_summary_on">A hírfolyam keresősáv elrejtve.</string>
-    <string name="revanced_hide_feed_search_bar_summary_off">A hírfolyam keresősáv látható.</string>
-    <string name="revanced_hide_feed_survey_title">Hírfolyam kérdőívek elrejtése</string>
-    <string name="revanced_hide_feed_survey_summary_on">A hírfolyam kérdőívek el vannak rejtve.</string>
-    <string name="revanced_hide_feed_survey_summary_off">A hírfolyam kérdőívek láthatóak.</string>
+    <string name="revanced_hide_feed_search_bar_title">Keresősáv elrejtése</string>
+    <string name="revanced_hide_feed_search_bar_summary_on">A keresősáv elrejtve.</string>
+    <string name="revanced_hide_feed_search_bar_summary_off">A keresősáv látható.</string>
+    <string name="revanced_hide_feed_survey_title">Kérdőívek elrejtése</string>
+    <string name="revanced_hide_feed_survey_summary_on">A kérdőívek elrejtve.</string>
+    <string name="revanced_hide_feed_survey_summary_off">A kérdőívek megjelennek.</string>
     <string name="revanced_hide_floating_button_title">Lebegő gomb elrejtése</string>
-    <string name="revanced_hide_floating_button_summary_on">A lebegő gomb el van rejtve.</string>
+    <string name="revanced_hide_floating_button_summary_on">A lebegő gomb elrejtve.</string>
     <string name="revanced_hide_floating_button_summary_off">A lebegő gomb látható.</string>
     <string name="revanced_hide_image_shelf_title">Kép polc elrejtése</string>
     <string name="revanced_hide_image_shelf_summary_on">A kép polcok el vannak rejtve.</string>
@@ -230,7 +230,11 @@ Lejátszási listák
     <string name="revanced_hide_keyword_content_comments_summary_on">A kommentek szűrve vannak.</string>
     <string name="revanced_hide_keyword_content_comments_summary_off">A kommentek nincsenek szűrve.</string>
     <string name="revanced_hide_keyword_content_phrases_title">Elrejtendő kulcsszavak</string>
-    <string name="revanced_hide_keyword_content_phrases_summary">"Elrejteni kívánt kulcsszavak és kifejezések, új sorokkal elválasztva.\n\nA kulcsszavak lehetnek csatornanevek vagy bármilyen szöveg, amely a videók címében látható.\n\nA középen nagybetűs szavakat a kis- és nagybetűkkel együtt kell megadni (pl. iPhone, TikTok, LeBlanc)."</string>
+    <string name="revanced_hide_keyword_content_phrases_summary">"Elrejteni kívánt kulcsszavak és kifejezések, új sorokkal elválasztva.
+
+A kulcsszavak lehetnek csatornanevek vagy bármilyen szöveg, amely a videók címében látható.
+
+A középen nagybetűs szavakat a kis- és nagybetűkkel együtt kell megadni (pl. iPhone, TikTok, LeBlanc)."</string>
     <string name="revanced_hide_keyword_content_about_title">A kulcsszó alapú szűrésről</string>
     <string name="revanced_hide_keyword_content_about_summary">"Kezdőlapi / Feliratkozási / Keresési eredmények szűrve vannak egyező kulcsszavak alapján.
 
@@ -272,14 +276,14 @@ Korlátozások:
     <string name="revanced_hide_video_view_counts_multiplier_title">Kulcsok megtekintése</string>
     <string name="revanced_hide_video_view_counts_multiplier_summary">Adja meg nyelvi sablonját a videók alatt megjelenő nézetek számához a felhasználói felületen. Minden kulcs (a nyelvében levő betű/szó) -&gt; érték (a kulcs jelentése) új sorban legyen. A kulcsok a \"-&gt;\" előtt helyezkednek el. Ha megváltoztatja az alkalmazás vagy a rendszer nyelvét, akkor vissza kell állítania ezt a beállítást.\n\nPéldák:\nAngol: 10K views = K -&gt; 1000, views -&gt; megtekintések\nSpanyol: 10 K vistas = K -&gt; 1000, vistas -&gt; megtekintések</string>
     <string name="revanced_hide_video_view_counts_multiplier_default_value">K -&gt; 1 000\nM -&gt; 1 000 000\nB -&gt; 1 000 000 000\nviews -&gt; megtekintések</string>
-    <string name="revanced_hide_video_by_view_counts_about_title">Szűrés nézettség alapján névjegy</string>
+    <string name="revanced_hide_video_by_view_counts_about_title">Szűrés nézettség alapjánról</string>
     <string name="revanced_hide_video_by_view_counts_about_summary">"Kezdőlap / Feliratkozás / Keresés eredményei szűrve vannak, hogy elrejtse a meghatározott számnál kisebb vagy nagyobb nézettségű videókat.
 
 Korlátozások:
 • A Shortokat nem lehet elrejteni.
 • A 0 megtekintésű videók nincsenek kiszűrve."</string>
     <string name="revanced_hide_related_videos_title">Kapcsolódó videók elrejtése</string>
-    <string name="revanced_hide_related_videos_summary_on">A kapcsolódó videók el vannak rejtve.</string>
+    <string name="revanced_hide_related_videos_summary_on">A kapcsolódó videók elrejtve.</string>
     <string name="revanced_hide_related_videos_summary_off">A kapcsolódó videók láthatóak.</string>
     <string name="revanced_hide_related_videos_user_dialog_message">"Ez a beállítás korlátozza a lejátszó képernyőjére betölthető elrendezések maximális számát.
 
@@ -289,6 +293,7 @@ Ha a lejátszó képernyőjének elrendezése a szerveroldali változtatások mi
     <string name="revanced_preference_screen_general_title">Általános</string>
     <string name="revanced_change_start_page_title">Kezdőlap megváltoztatása</string>
     <string name="revanced_change_start_page_entry_browse">Csatornák böngészése</string>
+    <string name="revanced_change_start_page_entry_courses">Kurzusok / Tanulás</string>
     <string name="revanced_change_start_page_entry_default">Alapértelmezett</string>
     <string name="revanced_change_start_page_entry_explore">Felfedezés</string>
     <string name="revanced_change_start_page_entry_gaming">Játékok</string>
@@ -298,12 +303,14 @@ Ha a lejátszó képernyőjének elrendezése a szerveroldali változtatások mi
     <string name="revanced_change_start_page_entry_live">Élő</string>
     <string name="revanced_change_start_page_entry_movies">Filmek</string>
     <string name="revanced_change_start_page_entry_music">Zene</string>
+    <string name="revanced_change_start_page_entry_notifications">Értesítések</string>
     <string name="revanced_change_start_page_entry_search">Keresés</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Sport</string>
     <string name="revanced_change_start_page_entry_subscriptions">Feliratkozások</string>
     <string name="revanced_change_start_page_entry_trending">Felkapott</string>
     <string name="revanced_change_start_page_entry_watch_later">Megnézem később</string>
+    <string name="revanced_change_start_page_entry_your_clips">Klipjeid</string>
     <string name="revanced_change_start_page_type_title">Kiinduló lap megváltoztatása</string>
     <string name="revanced_change_start_page_type_summary_on">"A kiinduló lap mindig változik.
 
@@ -365,7 +372,7 @@ Ha kikapcsolja, akkor ajánlott törölni az app adatait, hogy elkerülje a UI h
     <string name="revanced_preference_screen_account_menu_title">Fiók menü</string>
     <string name="revanced_preference_screen_account_menu_summary">Elemek elrejtése vagy megjelenítése a fiók menüben és a Te fülön.</string>
     <string name="revanced_hide_account_menu_title">Fiókmenü elrejtése</string>
-    <string name="revanced_hide_account_menu_summary">"Fiókmenü és az Ön lap elemeinek elrejtése.
+    <string name="revanced_hide_account_menu_summary">"Fiókmenü és az Te lap elemeinek elrejtése.
 Előfordulhat, hogy egyes komponensek nincsenek elrejtve."</string>
     <string name="revanced_hide_account_menu_filter_strings_title">Fiók menü szűrő</string>
     <string name="revanced_hide_account_menu_filter_strings_summary">A fiók menüben szűrendő menüpontok listája, új sorokkal elválasztva.</string>
@@ -376,8 +383,8 @@ Előfordulhat, hogy egyes komponensek nincsenek elrejtve."</string>
     <string name="revanced_preference_screen_custom_filter_title">Egyéni szűrő</string>
     <string name="revanced_preference_screen_custom_filter_summary">Komponensek elrejtése egyéni szűrőkkel.</string>
     <string name="revanced_custom_filter_title">Egyéni szűrő engedélyezése</string>
-    <string name="revanced_custom_filter_summary_on">Az egyéni szűrő engedélyezett.</string>
-    <string name="revanced_custom_filter_summary_off">Az egyéni szűrő le van tiltva.</string>
+    <string name="revanced_custom_filter_summary_on">Az egyéni szűrő engedélyezve.</string>
+    <string name="revanced_custom_filter_summary_off">Az egyéni szűrő letiltva.</string>
     <string name="revanced_custom_filter_strings_title">Egyéni szűrő</string>
     <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
     <string name="revanced_custom_filter_strings_summary">A szűrendő összetevők listája új sorokkal elválasztva.</string>
@@ -391,8 +398,8 @@ Előfordulhat, hogy egyes komponensek nincsenek elrejtve."</string>
     <string name="revanced_override_video_download_button_summary_on">Az eredeti letöltés gomb megnyitja a külső letöltőt.</string>
     <string name="revanced_override_video_download_button_summary_off">Az eredeti letöltés gomb megnyitja az eredeti, beépített letöltőt.</string>
     <string name="revanced_override_playlist_download_button_title">Lejátszási lista letöltése gomb felülbírálása</string>
-    <string name="revanced_override_playlist_download_button_summary_on">Az eredeti lejátszási lista letöltése gomb megnyitja a külső letöltőt.</string>
-    <string name="revanced_override_playlist_download_button_summary_off">Az eredeti lejátszási lista letöltése gomb megnyitja az eredeti, beépített letöltőt.</string>
+    <string name="revanced_override_playlist_download_button_summary_on">A eredeti lejátszási lista letöltése gomb mindig megjelenik, és a nyilvános lejátszási listákban megnyitja a külső letöltőt.</string>
+    <string name="revanced_override_playlist_download_button_summary_off">Ha megjelenik, az eredeti lejátszási lista letöltése gomb megnyitja az alkalmazáson belüli letöltőt.</string>
     <string name="revanced_external_downloader_package_name_playlist_title">Lejátszási lista letöltő csomag neve</string>
     <string name="revanced_external_downloader_package_name_playlist_summary">A telepített külső letöltő alkalmazás csomagneve, például YTDLnis.</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Hook buttons, PreferenceCategory: Experimental Flags -->
@@ -412,7 +419,7 @@ Előfordulhat, hogy egyes komponensek nincsenek elrejtve."</string>
     <string name="revanced_miniplayer_type_title">Minilejátszó típusa</string>
     <string name="revanced_miniplayer_type_entry_0">Letiltva</string>
     <string name="revanced_miniplayer_type_entry_1">Eredeti</string>
-    <string name="revanced_miniplayer_type_entry_2">Telefon</string>
+    <string name="revanced_miniplayer_type_entry_2">Minimális</string>
     <string name="revanced_miniplayer_type_entry_3">Tablet</string>
     <string name="revanced_miniplayer_type_entry_4">Modern 1</string>
     <string name="revanced_miniplayer_type_entry_5">Modern 2</string>
@@ -427,7 +434,9 @@ Előfordulhat, hogy egyes komponensek nincsenek elrejtve."</string>
 • Koppintson duplán az eredeti méret visszaállításához."</string>
     <string name="revanced_miniplayer_double_tap_action_summary_off">A dupla koppintás és összehúzás átméretezéshez le van tiltva.</string>
     <string name="revanced_miniplayer_drag_and_drop_title">Fogd és vidd engedélyezése</string>
-    <string name="revanced_miniplayer_drag_and_drop_summary_on">"A fogd és vidd engedélyezett\n\nA minilejátszó a képernyő bármely sarkába elhúzható."</string>
+    <string name="revanced_miniplayer_drag_and_drop_summary_on">"A fogd és vidd engedélyezett
+
+A minilejátszó a képernyő bármely sarkába elhúzható."</string>
     <string name="revanced_miniplayer_drag_and_drop_summary_off">A fogd és vidd le van tiltva.</string>
     <string name="revanced_miniplayer_horizontal_drag_title">Vízszintes húzás engedélyezése.</string>
     <string name="revanced_miniplayer_horizontal_drag_summary_on">"A vízszintes húzás engedélyezett.
@@ -482,19 +491,18 @@ Csúsztasson a kibontáshoz vagy bezáráshoz."</string>
     <string name="revanced_hide_navigation_label_summary_on">A navigációs sáv el van rejtve.</string>
     <string name="revanced_hide_navigation_label_summary_off">A navigációs sáv látható.</string>
     <string name="revanced_switch_create_with_notifications_button_title">Létrehozás és értesítések gombok felcserélése</string>
-    <string name="revanced_switch_create_with_notifications_button_summary_on">"A Létrehozás gomb megcserélése az Értesítések gombbal.\n\nMegjegyzés: Engedélyezés esetén a videó hirdetéseket is elrejti."</string>
+    <string name="revanced_switch_create_with_notifications_button_summary_on">"A Létrehozás gomb megcserélése az Értesítések gombbal.
+
+Megjegyzés: Engedélyezés esetén a videó hirdetéseket is elrejti."</string>
     <string name="revanced_switch_create_with_notifications_button_summary_off">A Létrehozás gomb nincs felcserélve az Értesítések gombbal.</string>
     <string name="revanced_switch_create_with_notifications_button_user_dialog_message">"Ennek kikapcsolása esetleg több reklámot tölt be a szerverről.
 
 Tovább, a reklámok nem lesznek tiltva a Shortokban.
 
 Ha ez a beállítás nem működik, váltson inkognító módra."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Világos mód áttetsző sáv letiltása</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">A világos mód navigációs sávja nem látszik át.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">A világos mód navigációs sávja átlátszatlan vagy áttetsző.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Sötét mód áttetsző sáv letiltása</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">A sötét mód navigációs sávja nem látszik át.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">A sötét mód navigációs sávja átlátszatlan vagy áttetsző.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Áttetsző navigációs sáv engedélyezése</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">A navigációs sáv áttetsző.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">A navigációs sáv nem áttetsző.</string>
     <string name="revanced_hide_navigation_bar_title">Navigációs sáv elrejtése</string>
     <string name="revanced_hide_navigation_bar_summary_on">A navigációs sáv el van rejtve.</string>
     <string name="revanced_hide_navigation_bar_summary_off">A navigációs sáv látható.</string>
@@ -852,6 +860,16 @@ Beállítások → Automatikus lejátszás → Következő videó automatikus le
     <string name="revanced_disable_engagement_panel_title">Interakciós panel letiltása</string>
     <string name="revanced_disable_engagement_panel_summary_on">Az interakciós panel le van tiltva.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Az interakciós panel engedélyezve.</string>
+    <string name="revanced_enter_fullscreen_title">Videó indításakor lépjen be teljes képernyős módba</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Videó indításakor lépjen be teljes képernyős módba.
+
+Korlátozás: Nem működik, ha a lejátszó kicsinyített, PiP módban vagy a háttérben van."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Ne lépjen teljes képernyős módba, amikor a videó elindul.</string>
+    <string name="revanced_exit_fullscreen_title">Lépjen ki a teljes képernyős módból a videó végén</string>
+    <string name="revanced_exit_fullscreen_entry_1">Letiltva</string>
+    <string name="revanced_exit_fullscreen_entry_2">Álló mód</string>
+    <string name="revanced_exit_fullscreen_entry_3">Fekvő mód</string>
+    <string name="revanced_exit_fullscreen_entry_4">Álló- és fekvő mód</string>
     <string name="revanced_show_video_title_section_title">Videócím rész megjelenítése</string>
     <string name="revanced_show_video_title_section_summary">"Megjeleníti a videócím részt teljes képernyős módban.
 
@@ -899,7 +917,7 @@ Korlátozás: A videó címe eltűnik, ha rákattint."</string>
     <string name="revanced_hide_quick_actions_share_button_summary_off">A megosztás gomb látható.</string>
     <string name="revanced_quick_actions_top_margin_title">Gyorsműveletek felső margó</string>
     <string name="revanced_quick_actions_top_margin_summary">Állítsa be a keresősáv és a gyorsművelet rész közötti távolságot 0-32 között.</string>
-    <string name="revanced_quick_actions_top_margin_invalid_toast">A gyors műveletek felső margójának 0 és 32 között kell lennie. Visszaállítás alapértelmezettre.</string>
+    <string name="revanced_quick_actions_top_margin_invalid_toast">A gyors műveletek felső margójának 0 és 32 között kell lennie.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Fullscreen, PreferenceCategory: Experimental Flags -->
     <string name="revanced_disable_landscape_mode_title">Fekvő mód letiltása</string>
     <string name="revanced_disable_landscape_mode_summary_on">A videó tájolása álló mód teljes képernyő esetén.</string>
@@ -907,11 +925,6 @@ Korlátozás: A videó címe eltűnik, ha rákattint."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Kompakt vezérlők engedélyezése</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">A vezérlők nem töltik ki a teljes képernyőt.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">A vezérlők kitöltik a teljes képernyőt.</string>
-    <string name="revanced_force_fullscreen_title">Teljes képernyő erőltetése</string>
-    <string name="revanced_force_fullscreen_summary">"A videók teljes képernyősre váltanak a következő esetekben:
-
-• Amikor egy videó elindul.
-• Amikor egy időbélyegre kattintanak a hozzászólásokban."</string>
     <string name="revanced_keep_landscape_mode_title">Tartsa a fekvő módot</string>
     <string name="revanced_keep_landscape_mode_summary">Megtartja a fekvő módot a képernyő ki- és bekapcsolásakor teljes képernyőn.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Fekvő mód tartás időtúllépése</string>
@@ -1041,13 +1054,13 @@ Információ:
     <string name="revanced_custom_seekbar_color_value_invalid_invalid_toast">Érvénytelen keresősáv színértéke.</string>
     <string name="revanced_enable_seekbar_tapping_title">Érintés engedélyezése a kereső sávon</string>
     <string name="revanced_enable_seekbar_tapping_summary_on">A keresősávon történő érintés engedélyezett.</string>
-    <string name="revanced_enable_seekbar_tapping_summary_off">A keresősávon történő érintés ki van kapcsolva.</string>
-    <string name="revanced_hide_seekbar_title">Folyamatsáv elrejtése a videólejátszóban</string>
-    <string name="revanced_hide_seekbar_summary_on">A videólejátszó folyamatsávja el van rejtve</string>
-    <string name="revanced_hide_seekbar_summary_off">A videólejátszó folyamatsávja megjelenik</string>
+    <string name="revanced_enable_seekbar_tapping_summary_off">A keresősávon történő érintés le van tiltva.</string>
+    <string name="revanced_hide_seekbar_title">Keresősáv elrejtése a videólejátszóban</string>
+    <string name="revanced_hide_seekbar_summary_on">A videólejátszó folyamatsávja el van rejtve.</string>
+    <string name="revanced_hide_seekbar_summary_off">A videólejátszó folyamatsávja látható.</string>
     <string name="revanced_hide_seekbar_thumbnail_title">Folyamatsáv elrejtése a minilejátszóban</string>
-    <string name="revanced_hide_seekbar_thumbnail_summary_on">A minilejátszó folyamatsávja el van rejtve</string>
-    <string name="revanced_hide_seekbar_thumbnail_summary_off">A minilejátszó folyamatsávja megjelenik</string>
+    <string name="revanced_hide_seekbar_thumbnail_summary_on">A minilejátszó folyamatsávja el van rejtve.</string>
+    <string name="revanced_hide_seekbar_thumbnail_summary_off">A minilejátszó folyamatsávja látható.</string>
     <string name="revanced_disable_seekbar_chapters_title">Keresősáv fejezeteinek letiltása</string>
     <string name="revanced_disable_seekbar_chapters_summary_on">A keresősáv fejezetei le vannak tiltva.</string>
     <string name="revanced_disable_seekbar_chapters_summary_off">A keresősáv fejezetei engedélyezettek.</string>
@@ -1057,9 +1070,9 @@ Információ:
     <string name="revanced_hide_time_stamp_title">Időbélyeg elrejtése</string>
     <string name="revanced_hide_time_stamp_summary_on">Az időbélyeg el van rejtve.</string>
     <string name="revanced_hide_time_stamp_summary_off">Az időbélyeg látható.</string>
-    <string name="revanced_restore_old_seekbar_thumbnails_title">Régi keresősáv bélyegképek visszaállítása</string>
-    <string name="revanced_restore_old_seekbar_thumbnails_summary_on">A keresősáv bélyegképei megjelennek a keresősáv felett</string>
-    <string name="revanced_restore_old_seekbar_thumbnails_summary_off">A keresősáv bélyegképei megjelennek a teljes képernyőn</string>
+    <string name="revanced_restore_old_seekbar_thumbnails_title">Régi folyamatsáv bélyegképek visszaállítása</string>
+    <string name="revanced_restore_old_seekbar_thumbnails_summary_on">A folyamatsáv bélyegképei megjelennek a keresősáv felett.</string>
+    <string name="revanced_restore_old_seekbar_thumbnails_summary_off">A folyamatsáv bélyegképei megjelennek teljes képernyőn.</string>
     <string name="revanced_enable_seekbar_thumbnails_high_quality_title">Jó minőségű miniatűrök engedélyezése</string>
     <string name="revanced_enable_seekbar_thumbnails_high_quality_summary_on">A keresősáv bélyegképei kiváló minőségűek.</string>
     <string name="revanced_enable_seekbar_thumbnails_high_quality_summary_off">A keresősáv bélyegképei közepes minőségűek.</string>
@@ -1069,7 +1082,7 @@ Az internetes adathasználat magasabb lehet, és a keresősáv bélyegképei kis
 
 Ez a funkció nagyon gyors internetkapcsolat mellett működik a legjobban."</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Video description -->
-    <string name="revanced_preference_screen_video_description_title">Video leírás</string>
+    <string name="revanced_preference_screen_video_description_title">Videó leírás</string>
     <string name="revanced_preference_screen_video_description_summary">A videóleíró komponenseinek elrejtése vagy megjelenítése.</string>
     <string name="revanced_disable_rolling_number_animations_title">Gördülő szám animációk letiltása</string>
     <string name="revanced_disable_rolling_number_animations_summary_on">A gördülő számok nem animáltak.</string>
@@ -1087,20 +1100,20 @@ Ez a funkció nagyon gyors internetkapcsolat mellett működik a legjobban."</st
     <string name="revanced_hide_contents_section_summary_on">A tartalom készítésének módja rész elrejtve.</string>
     <string name="revanced_hide_contents_section_summary_off">A tartalom készítésének módja rész látható.</string>
     <string name="revanced_hide_info_cards_section_title">Infó kártyák rész elrejtése</string>
-    <string name="revanced_hide_info_cards_section_summary_on">Az infó kártyák rész el van rejtve</string>
-    <string name="revanced_hide_info_cards_section_summary_off">Az infó kártyák rész látható</string>
+    <string name="revanced_hide_info_cards_section_summary_on">Az infó kártyák rész el van rejtve.</string>
+    <string name="revanced_hide_info_cards_section_summary_off">Az infó kártyák rész látható.</string>
     <string name="revanced_hide_key_concepts_section_title">Kulcs koncepciók rész elrejtése</string>
     <string name="revanced_hide_key_concepts_section_summary_on">A kulcs koncepciók rész elrejtve.</string>
     <string name="revanced_hide_key_concepts_section_summary_off">A kulcs koncepciók rész látható.</string>
     <string name="revanced_hide_podcast_section_title">Podcast rész elrejtése</string>
     <string name="revanced_hide_podcast_section_summary_on">A podcast rész el van rejtve.</string>
     <string name="revanced_hide_podcast_section_summary_off">A podcast rész látható.</string>
-    <string name="revanced_hide_shopping_links_title">Vásárlási linkek elrejtése a videó leírásában</string>
-    <string name="revanced_hide_shopping_links_summary_on">A vásárlási linkek rejtve vannak</string>
-    <string name="revanced_hide_shopping_links_summary_off">A vásárlási linkek láthatóak</string>
+    <string name="revanced_hide_shopping_links_title">Vásárlási linkek elrejtése</string>
+    <string name="revanced_hide_shopping_links_summary_on">A vásárlási linkek el vannak rejtve.</string>
+    <string name="revanced_hide_shopping_links_summary_off">A vásárlási linkek láthatóak.</string>
     <string name="revanced_hide_transcript_section_title">Átirat rész elrejtése</string>
-    <string name="revanced_hide_transcript_section_summary_on">Az átirat rész el van rejtve</string>
-    <string name="revanced_hide_transcript_section_summary_off">Az átirat rész megjelenik</string>
+    <string name="revanced_hide_transcript_section_summary_on">Az átirat rész el van rejtve.</string>
+    <string name="revanced_hide_transcript_section_summary_off">Az átirat rész látható.</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Video description, PreferenceCategory: Experimental Flags -->
     <string name="revanced_disable_video_description_interaction_title">Videoleírás interakció letiltása</string>
     <string name="revanced_disable_video_description_interaction_summary">"Letiltja a következő interakciókat, ha a videoleírás kibővítve van:
@@ -1329,6 +1342,10 @@ Korlátozások:
     <string name="revanced_replace_channel_handle_title">Cserélje ki a csatorna kezelőt</string>
     <string name="revanced_replace_channel_handle_summary_on">A csatorna név használatban van.</string>
     <string name="revanced_replace_channel_handle_summary_off">A csatorna kezelő használatban van.</string>
+    <string name="revanced_restore_shorts_old_player_layout_title">Régi lejátszó felület visszaállítása</string>
+    <string name="revanced_restore_shorts_old_player_layout_summary_on">"A régi lejátszó felület van használva.
+Nincs margó a lejátszó tetején és alján."</string>
+    <string name="revanced_restore_shorts_old_player_layout_summary_off">A régi lejátszó felülete nincs használatban.</string>
     <!-- PreferenceScreen: Swipe controls -->
     <string name="revanced_preference_screen_swipe_controls_title">Húzásvezérlések</string>
     <string name="revanced_enable_swipe_lowest_value_auto_brightness_title">Automatikus fényerő bekapcsolása gesztussal</string>
@@ -1361,7 +1378,7 @@ Korlátozások:
     <string name="revanced_swipe_overlay_rect_size_title">Csúsztatható átfedés mérete</string>
     <string name="revanced_swipe_overlay_rect_size_summary">Az lehúzható képernyőterület százalékos aránya.\n\n
 Megjegyzés: Ezzel a képernyőterület méretét is megváltoztatja, ahol érzékeli az ugráshoz szükséges dupla koppintást.</string>
-    <string name="revanced_swipe_overlay_rect_size_invalid_toast">A lehúzható terület mérete nem lehet nagyobb 50-nél. Visszaállítás az alapértelmezettre.</string>
+    <string name="revanced_swipe_overlay_rect_size_invalid_toast">A csúsztatható terület mérete nem lehet nagyobb 50-nél. Visszaállítás az alapértelmezettre.</string>
     <string name="revanced_swipe_overlay_timeout_title">Csúsztatási átfedés időkorlátja</string>
     <string name="revanced_swipe_overlay_timeout_summary">Az átfedés láthatóságának időtartama ezredmásodpercben</string>
     <string name="revanced_swipe_brightness_sensitivity_title">Fényerő csúsztatás érzékenység</string>
@@ -1373,6 +1390,18 @@ Megjegyzés: Ezzel a képernyőterület méretét is megváltoztatja, ahol érz
     <string name="revanced_disable_hdr_auto_brightness_title">Automatikus HDR fényerő letiltása</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Az automatikus HDR fényerő le van tiltva.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Az automatikus HDR fényerő engedélyezett.</string>
+    <string name="revanced_disable_swipe_to_switch_video_title">A videóváltás lapozással letiltása</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">A felfelé/lefelé lapozás nem játssza le a következő/előző videót.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">A felfelé/lefelé lapozással a következő/előző videót játsza le.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Teljes képernyős módba való belépés letiltása (a lejátszó alatt)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">A lejátszó alatti lefelé lapozás nem léptet be teljes képernyős módba.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">A lejátszó alatt lefelé lapozással teljes képernyős módba léptet.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Teljes képernyős módba való belépés letiltása (a lejátszóban)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">A lejátszóban a felfelé lapozás nem léptet be a teljes képernyős módba.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">A lejátszóban a felfelé lapozás beléptet a teljes képernyős módba.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Teljes képernyős üzemmódból való kilépés lapozással letiltása</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">A teljes képernyőn történő lefelé lapozás nem léptet ki a teljes képernyős módból.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">A teljes képernyős módból való lapozás a teljes képernyős módból való kilépéshez vezet.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Automatikus</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Videó</string>
@@ -1382,9 +1411,6 @@ Megjegyzés: Ezzel a képernyőterület méretét is megváltoztatja, ahol érz
     <string name="revanced_disable_hdr_video_title">HDR videó letiltása</string>
     <string name="revanced_disable_hdr_video_summary_on">A HDR videó le van tiltva.</string>
     <string name="revanced_disable_hdr_video_summary_off">A HDR videó engedélyezve van.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Lejátszási sebesség letiltása élő közvetítésnél</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Az alapértelmezett lejátszási sebesség le van tiltva élő közvetítésnél.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Az alapértelmezett lejátszási sebesség engedélyezve van az élő közvetítésnél.</string>
     <string name="revanced_enable_custom_playback_speed_title">Egyéni lejátszási sebesség engedélyezése</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Az egyéni lejátszási sebesség engedélyezve van.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Az egyéni lejátszási sebesség le van tiltva.</string>
@@ -1409,10 +1435,11 @@ Megjegyzés: Ezzel a képernyőterület méretét is megváltoztatja, ahol érz
     <string name="revanced_restore_old_video_quality_menu_summary_on">A régi videóminőség menü jelenik meg</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">A régi videóminőség menü nem jelenik meg</string>
     <string name="revanced_disable_default_playback_speed_music_title">Lejátszási sebesség zenéhez kiválasztás elrejtése</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"A zene alapértelmezett lejátszási sebessége le van tiltva.
-
-Korlátozás: Előfordulhat, hogy ez a beállítás nem vonatkozik azokra a videókra, amelyek nem tartalmazzák a „Hallgassa meg a YouTube Musicon” bannert."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">Az alapértelmezett lejátszási sebesség le van tiltva zene lejátszásnál.</string>
     <string name="revanced_disable_default_playback_speed_music_off">Az alapértelmezett lejátszási sebesség engedélyezett zene lejátszásnál.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Érvényesítés kategóriák használatával</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">Az alapértelmezett lejátszási sebesség le van tiltva, ha a videó kategóriája zene.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">Az alapértelmezett lejátszási sebesség le van tiltva a YouTube Music szolgáltatásban lejátszható videóknál.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Shortok alapértelmezett lejátszási sebességének engedélyezése</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Az alapértelmezett lejátszási sebesség vonatkozik a Shortokra.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Az alapértelmezett lejátszási sebesség nem vonatkozik a Shortokra.</string>
@@ -1485,12 +1512,12 @@ Korlátozás: A nem tetszések lehet nem jelennek meg kijelentkezett felhasznál
     <string name="revanced_preference_screen_return_youtube_username_title">YouTube-felhasználónév visszaadása</string>
     <string name="revanced_return_youtube_username_enabled_title">A YouTube-felhasználónév visszaadás engedélyezése</string>
     <string name="revanced_return_youtube_username_enabled_summary_on">A felhasználónév van használatban.</string>
-    <string name="revanced_return_youtube_username_enabled_summary_off">A kezelő van használatban.</string>
+    <string name="revanced_return_youtube_username_enabled_summary_off">Az azonosító van használatban.</string>
     <string name="revanced_return_youtube_username_display_format_title">Megjelenítési formátum</string>
     <string name="revanced_return_youtube_username_display_format_username_only">Felhasználónév</string>
-    <string name="revanced_return_youtube_username_display_format_username_handle">Felhasználónév (@kezelő)</string>
-    <string name="revanced_return_youtube_username_display_format_handle_username">\@kezelő (felhasználónév)</string>
-    <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_title">YouTube adat API kulcs</string>
+    <string name="revanced_return_youtube_username_display_format_username_handle">Felhasználónév (@azonosító)</string>
+    <string name="revanced_return_youtube_username_display_format_handle_username">\@azonosító (felhasználónév)</string>
+    <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_title">YouTube Data API kulcs</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_developer_key_summary">A fejlesztői kulcs a YouTube Data API v3 használatához.</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_about_title">A YouTube Data API-kulcsról</string>
     <string name="revanced_return_youtube_username_youtube_data_api_v3_about_summary">"A YouTube Data API v3 fejlesztői kulcsa szükséges ahhoz, hogy a Kezelő-t Felhasználónév-re cseréljék.
@@ -1749,15 +1776,42 @@ Kattintson az API-kulcs kiadás folyamatának megtekintéséhez."</string>
     <string name="revanced_spoof_streaming_data_summary_off">"Az adatfolyam nincs meghamisítva. Lehet, hogy a videó lejátszás nem működik."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">A beállítás kikapcsolása videólejátszási problémákat okozhat.</string>
     <string name="revanced_spoof_streaming_data_type_title">Alapértelmezett kliens</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS zene</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Belépés szükséges)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(PoToken szükséges)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Belépés szükséges)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Hamisítás mellékhatásai</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Még nem található.</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android">"• A hangsáv menü hiányzik.
+• A stabil hangerő nem áll rendelkezésre.
+• A kényszerített automatikus hangsávok letiltása nem elérhető.
+• Előfordulhat, hogy a gyerekeknek szánt tartalmat nem lehet lejátszani, ha ki van jelentkezve vagy inkognitó módban van."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Lejátszási problémák lehetnek (PoToken szükséges).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Előfordulhat, hogy a filmeket vagy a fizetős videókat nem lehet lejátszani.
+• Előfordulhat, hogy a gyerekeknek szánt tartalmat nem lehet lejátszani, ha ki van jelentkezve vagy inkognitó módban van."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Kényszerített iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">A videó kodek AVC-re (H.264) van kényszerítve.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">A videokodek meghatározása automatikusan történik.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Ennek engedélyezése javíthatja az akkumulátor élettartamát és javíthatja a lejátszás akadozását.
+
+Az AVC maximális felbontása 1080p, az Opus hangkodek nem érhető el, és a videolejátszás több adatforgalmat igényel, mint a VP9 vagy az AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Megjelenítés a statisztikában kockáknak</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Az adatfolyam lekérésére használt kliens a statisztikában kockáknak látható.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Az adatfolyam lekérésére használt kliens a statisztikában kockáknak nem látható.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken használatához</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">A BotGuard által kibocsátott PoToken egy megbízható böngészőben.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData használatához</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">A BotGuard által kibocsátott VisitorData egy megbízható böngészőben.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">A PoTokenről / VisitorData-ról</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Néhány kliensnek PoToken és VisitorData szükséges az adatok érvényes folyamatos adatátvitelére adott válaszhoz.
+
+Ha az iOS-t próbálja alapértelmezett kliensként használni, szüksége lehet ezekre az értékekre.
+
+Kattintson a további információkért."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Megtekintési előzmények</string>
     <string name="revanced_preference_screen_watch_history_summary">A megtekintési előzményekhez kapcsolódó beállítások módosítása.</string>
diff --git a/patches/src/main/resources/youtube/translations/it-rIT/strings.xml b/patches/src/main/resources/youtube/translations/it-rIT/strings.xml
index a1e78d884..73d0687d0 100644
--- a/patches/src/main/resources/youtube/translations/it-rIT/strings.xml
+++ b/patches/src/main/resources/youtube/translations/it-rIT/strings.xml
@@ -292,6 +292,7 @@ Se l'interfaccia della schermata del riproduttore cambia a causa di modifiche la
     <string name="revanced_preference_screen_general_title">Generale</string>
     <string name="revanced_change_start_page_title">Cambia la scheda iniziale</string>
     <string name="revanced_change_start_page_entry_browse">Esplora canali</string>
+    <string name="revanced_change_start_page_entry_courses">Apprendimento</string>
     <string name="revanced_change_start_page_entry_default">Predefinita (Home)</string>
     <string name="revanced_change_start_page_entry_explore">Esplora</string>
     <string name="revanced_change_start_page_entry_gaming">Giochi</string>
@@ -301,12 +302,14 @@ Se l'interfaccia della schermata del riproduttore cambia a causa di modifiche la
     <string name="revanced_change_start_page_entry_live">Live</string>
     <string name="revanced_change_start_page_entry_movies">Film e TV</string>
     <string name="revanced_change_start_page_entry_music">Musica</string>
+    <string name="revanced_change_start_page_entry_notifications">Notifiche</string>
     <string name="revanced_change_start_page_entry_search">Cerca</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Sport</string>
     <string name="revanced_change_start_page_entry_subscriptions">Iscrizioni</string>
     <string name="revanced_change_start_page_entry_trending">Tendenze</string>
     <string name="revanced_change_start_page_entry_watch_later">Guarda più tardi</string>
+    <string name="revanced_change_start_page_entry_your_clips">I tuoi clip</string>
     <string name="revanced_change_start_page_type_title">Cambia il comportamento della pagina iniziale</string>
     <string name="revanced_change_start_page_type_summary_on">"La pagina iniziale cambia sempre.
 
@@ -497,12 +500,9 @@ Nota: anche gli annunci video saranno nascosti."</string>
 Inoltre, gli annunci degli Shorts non saranno più bloccati.
 
 Se questa impostazione non ha effetto, prova a passare alla navigazione in incognito."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Disattiva la barra di navigazione traslucida con tema chiaro</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">La barra di navigazione con tema chiaro è opaca.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">La barra di navigazione con tema chiaro è opaca o traslucida.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Disattiva la barra di navigazione traslucida con tema scuro</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">La barra di navigazione con tema scuro è opaca.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">La barra di navigazione con tema scuro è opaca o traslucida.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Attiva la barra di navigazione traslucida</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">La barra di navigazione è traslucida.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">La barra di navigazione è opaca.</string>
     <string name="revanced_hide_navigation_bar_title">Nascondi la barra di navigazione</string>
     <string name="revanced_hide_navigation_bar_summary_on">La barra di navigazione è nascosta.</string>
     <string name="revanced_hide_navigation_bar_summary_off">La barra di navigazione è visibile.</string>
@@ -863,6 +863,16 @@ Impostazioni → Riproduzione automatica → Telefono cellulare/tablet"</string>
     <string name="revanced_disable_engagement_panel_title">Disattiva il pannello di coinvolgimento</string>
     <string name="revanced_disable_engagement_panel_summary_on">Il pannello di coinvolgimento è disattivato.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Il pannello di coinvolgimento è attivato.</string>
+    <string name="revanced_enter_fullscreen_title">Passa a schermo intero all\'avvio dei video</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Passa a schermo intero all'avvio dei video.
+
+Nota: non funziona se il riproduttore è minimizzato, in modalità PiP o in background."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Non passa a schermo intero all\'avvio dei video.</string>
+    <string name="revanced_exit_fullscreen_title">Esci da schermo intero alla fine dei video</string>
+    <string name="revanced_exit_fullscreen_entry_1">Disattivato</string>
+    <string name="revanced_exit_fullscreen_entry_2">Verticale</string>
+    <string name="revanced_exit_fullscreen_entry_3">Orizzontale</string>
+    <string name="revanced_exit_fullscreen_entry_4">Verticale e orizzontale</string>
     <string name="revanced_show_video_title_section_title">Mostra il titolo dei video</string>
     <string name="revanced_show_video_title_section_summary">"Mostra il titolo dei video a schermo intero.
 
@@ -918,10 +928,6 @@ Nota: il titolo scompare quando lo si tocca."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Attiva i controlli compatti</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">I controlli compatti sono attivati.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">I controlli compatti sono disattivati.</string>
-    <string name="revanced_force_fullscreen_title">Forza lo schermo intero</string>
-    <string name="revanced_force_fullscreen_summary">"I video passeranno automaticamente a schermo intero nelle seguenti situazioni:
-• Appena un video inizia.
-• Toccando su un timestamp nei commenti."</string>
     <string name="revanced_keep_landscape_mode_title">Mantieni la modalità orizzontale</string>
     <string name="revanced_keep_landscape_mode_summary">Mantiene la modalità orizzontale quando lo schermo viene spento e acceso a schermo intero.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Durata della modalità orizzontale forzata</string>
@@ -1089,8 +1095,8 @@ Questa impostazione funziona meglio con una connessione internet molto veloce."<
     <string name="revanced_hide_ai_generated_video_summary_section_summary_on">La sezione Riepilogo Video Generato dall\'IA è nascosta.</string>
     <string name="revanced_hide_ai_generated_video_summary_section_summary_off">La sezione Riepilogo Video Generato dall\'IA è visibile.</string>
     <string name="revanced_hide_attributes_section_title">Nascondi le sezioni Musica, Giochi e Luoghi in Primo Piano</string>
-    <string name="revanced_hide_attributes_section_summary_on">Le sezioni Musica, Giochi, Persone e Luoghi in Primo Piano sono nascosti.</string>
-    <string name="revanced_hide_attributes_section_summary_off">Le sezioni Musica, Giochi, Persone e Luoghi in Primo Piano sono visibili.</string>
+    <string name="revanced_hide_attributes_section_summary_on">Le sezioni Musica, Giochi, Persone Menzionate e Luoghi in Primo Piano sono nascoste.</string>
+    <string name="revanced_hide_attributes_section_summary_off">Le sezioni Musica, Giochi, Persone Menzionate e Luoghi in Primo Piano sono visibili.</string>
     <string name="revanced_hide_chapters_section_title">Nascondi la sezione Capitoli</string>
     <string name="revanced_hide_chapters_section_summary_on">La sezione Capitoli è nascosta.</string>
     <string name="revanced_hide_chapters_section_summary_off">La sezione Capitoli è visibile.</string>
@@ -1384,12 +1390,18 @@ Note:
     <string name="revanced_disable_hdr_auto_brightness_title">Disattiva la luminosità HDR automatica</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">La luminosità HDR automatica è disattivata.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">La luminosità HDR automatica è attivata.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Disattiva il gesto per passare a schermo intero trascinando verso il basso sotto il riproduttore</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Il gesto per passare a schermo intero trascinando verso il basso sotto il riproduttore è disattivato.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Il gesto per passare a schermo intero trascinando verso il basso sotto il riproduttore è attivato.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Disattiva il gesto per cambiare video</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">Trascinando verso l\'alto o il basso non verrà riprodotto il video successivo o precedente.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">Trascinando verso l\'alto o il basso verrà riprodotto il video successivo o precedente.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">Trascinando verso l\'alto o il basso a schermo intero non verrà riprodotto il video successivo o precedente.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">Trascinando verso l\'alto o il basso a schermo intero verrà riprodotto il video successivo o precedente.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Disattiva il gesto per passare a schermo intero trascinando verso il basso da sotto il riproduttore</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Il gesto per passare a schermo intero trascinando verso il basso da sotto il riproduttore è disattivato.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Il gesto per passare a schermo intero trascinando verso il basso da sotto il riproduttore è attivato.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Disattiva il gesto per passare a schermo intero trascinando verso l\'alto toccando il riproduttore</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Il gesto per passare a schermo intero trascinando verso l\'alto toccando il riproduttore è disattivato.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Il gesto per passare a schermo intero trascinando verso l\'alto toccando il riproduttore è attivato.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Disattiva il gesto per uscire dallo schermo intero trascinando verso il basso</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Il gesto per uscire dallo schermo intero trascinando verso il basso è disattivato.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Il gesto per uscire dallo schermo intero trascinando verso il basso è attivato.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Automatico</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Video</string>
@@ -1399,9 +1411,6 @@ Note:
     <string name="revanced_disable_hdr_video_title">Disattiva l\'HDR dei video</string>
     <string name="revanced_disable_hdr_video_summary_on">L\'HDR dei video è disattivato.</string>
     <string name="revanced_disable_hdr_video_summary_off">L\'HDR dei video è attivato.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Disattiva la velocità di riproduzione predefinita nei video live</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">La velocità di riproduzione predefinita nei video live è disattivata.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">La velocità di riproduzione predefinita nei video live è attivata.</string>
     <string name="revanced_enable_custom_playback_speed_title">Attiva la velocità di riproduzione personalizzata</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">La velocità di riproduzione personalizzata è attivata.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">La velocità di riproduzione personalizzata è disattivata.</string>
@@ -1426,10 +1435,11 @@ Note:
     <string name="revanced_restore_old_video_quality_menu_summary_on">Il vecchio menù Qualità è attivato.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Il vecchio menù Qualità è disattivato.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Disattiva la velocità di riproduzione predefinita per la musica</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"La velocità di riproduzione predefinita è disattivata per la musica.
-
-Nota: potrebbe non funzionare con i video che non hanno il banner Ascolta su YouTube Music."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">La velocità di riproduzione predefinita per la musica è disattivata.</string>
     <string name="revanced_disable_default_playback_speed_music_off">La velocità di riproduzione predefinita per la musica è attivata.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Convalida usando le categorie</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">La velocità di riproduzione predefinita è disattivata se la categoria video è Musica.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">La velocità di riproduzione predefinita è attivata se la categoria video è Musica.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Attiva la velocità di riproduzione predefinita negli Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">La velocità di riproduzione predefinita negli Shorts è attivata.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">La velocità di riproduzione predefinita negli Shorts è disattivata.</string>
@@ -1773,25 +1783,42 @@ Tocca il pulsante Continua e consenti le modifiche di ottimizzazione."</string>
     <string name="revanced_spoof_streaming_data_summary_off">"I dati in streaming non sono camuffati. La riproduzione potrebbe non funzionare."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">La disattivazione di questa impostazione potrebbe causare problemi di riproduzione.</string>
     <string name="revanced_spoof_streaming_data_type_title">Client predefinito</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Accesso richiesto)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(PoToken richiesto)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Accesso richiesto)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Effetti collaterali del camuffamento</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Nessuno ancora trovato.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• I film o i video a pagamento potrebbero non essere riprodotti.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_android">"• Il menù Traccia Audio è mancante.
-• Il menù Volume Stabile è mancante.
-• La disattivazione della traccia audio automatica forzata non funziona."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Usa solo il client Android</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Il client Android è usato per recuperare i dati in streaming.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">I client Android e iOS sono usati per recuperare i dati in streaming.</string>
-    <string name="revanced_spoof_streaming_data_android_only_user_dialog_message">La disattivazione di questa impostazione potrebbe causare problemi di riproduzione.</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android">"• Il menù Traccia Audio è nascosto.
+• Il volume stabile non funziona.
+• La disattivazione delle tracce audio automatiche forzate non funziona.
+• I video per bambini potrebbero non essere riprodotti se si è disconnessi o in incognito."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Ci potrebbero essere problemi di riproduzione (PoToken richiesto).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• I film o i video a pagamento potrebbero non essere riproducibili.
+• I video per bambini potrebbero non essere riprodotti se si è disconnessi o in incognito."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Forza iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Il codec video è forzato ad AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Il codec video è determinato automaticamente.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"L'attivazione di questa impostazione potrebbe migliorare la durata della batteria e risolvere il problema della riproduzione a scatti.
+
+Nota: AVC ha una risoluzione massima di 1080p, il codec Opus non è disponibile e la riproduzione userà più dati internet rispetto a VP9 o AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostra nelle statistiche per nerd</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Il client usato per recuperare i dati in streaming è visibile nelle statistiche per nerd.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Il client usato per recuperare i dati in streaming è nascosto nelle statistiche per nerd.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken da usare</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken emesso da BotGuard in un browser affidabile.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData da usare</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData emesso da BotGuard in un browser affidabile.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">Informazioni su PoToken e VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Alcuni client richiedono PoToken e VisitorData per ottenere una risposta valida per i dati in streaming.
+
+Se stai cercando di utilizzare iOS come client predefinito, potresti aver bisogno di questi valori.
+
+Tocca per vedere maggiori informazioni."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Cronologia</string>
     <string name="revanced_preference_screen_watch_history_summary">Cambia le impostazioni della cronologia.</string>
diff --git a/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml b/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml
index 0eab6fd63..82e87fb09 100644
--- a/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml
+++ b/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Translations for YouTube -->
-    <string name="accessibility_settings_edu_opt_in_text">動画プレーヤーのアクセシビリティコントロールを有効化しますか？</string>
-    <string name="accessibility_settings_edu_opt_out_text">ユーザー補助サービスがオンになっているため、操作方法が変わります。</string>
+    <string name="accessibility_settings_edu_opt_in_text">動画プレーヤーのアクセシビリティコントロールを有効にしますか？</string>
+    <string name="accessibility_settings_edu_opt_out_text">ユーザー補助サービスが有効化されているため、操作方法が変わります。</string>
     <!-- Shared -->
     <string name="revanced_extended_settings_title">ReVanced Extended</string>
     <string name="revanced_extended_settings_search_title">設定を検索</string>
@@ -56,9 +56,9 @@
     <string name="revanced_hide_get_premium_summary_off">プレーヤーと動画の説明の間に表示される YouTube Premium のバナーを非表示にします。</string>
     <!-- PreferenceScreen: Alternative thumbnails -->
     <string name="revanced_preference_screen_alt_thumbnails_title">代替サムネイル</string>
-    <string name="revanced_alt_thumbnail_home_title">[ホーム]タブ</string>
-    <string name="revanced_alt_thumbnail_subscriptions_title">[登録チャンネル]タブ</string>
-    <string name="revanced_alt_thumbnail_library_title">[マイページ]タブ</string>
+    <string name="revanced_alt_thumbnail_home_title">[ホーム] タブ</string>
+    <string name="revanced_alt_thumbnail_subscriptions_title">[登録チャンネル] タブ</string>
+    <string name="revanced_alt_thumbnail_library_title">[マイページ] タブ</string>
     <string name="revanced_alt_thumbnail_player_title">再生リスト、おすすめ</string>
     <string name="revanced_alt_thumbnail_search_title">検索結果</string>
     <string name="revanced_alt_thumbnail_options_entry_1">オリジナルサムネイル</string>
@@ -66,7 +66,7 @@
     <string name="revanced_alt_thumbnail_options_entry_3">DeArrow &amp; 静止画サムネイル</string>
     <string name="revanced_alt_thumbnail_options_entry_4">静止画サムネイル</string>
     <string name="revanced_alt_thumbnail_dearrow_about_title">DeArrow</string>
-    <string name="revanced_alt_thumbnail_dearrow_about_summary">"DeArrow は、YouTube 動画のサムネイルをクラウドソーシングで提供する機能です。DeArrow のサムネイルは、YouTube が提供するサムネイルよりも適切なことが多いです。 これを有効にすると、動画のURLが API サーバーに送信されますが、他のデータは送信されません。 動画に DeArrow サムネイルがない場合は、オリジナルまたは静止画サムネイルが表示されます。
+    <string name="revanced_alt_thumbnail_dearrow_about_summary">"DeArrow は、YouTube 動画のサムネイルをクラウドソーシングで提供する機能です。DeArrow のサムネイルは、YouTube が提供するサムネイルよりも適切なことが多いです。これを有効にすると、動画のURLが API サーバーに送信されますが、他のデータは送信されません。動画に DeArrow サムネイルがない場合は、オリジナルまたは静止画サムネイルが表示されます。
 
 DeArrow の詳細については、ここをタップしてください。"</string>
     <string name="revanced_alt_thumbnail_dearrow_connection_toast_title">API が利用できない場合にトーストを表示</string>
@@ -78,7 +78,7 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_alt_thumbnail_stills_about_title">静止画サムネイルについて</string>
     <string name="revanced_alt_thumbnail_stills_about_summary">静止画サムネイルは、各動画の最初/中間/最後の部分から取得されます。これらの画像は YouTube に直接組み込まれており、外部 API は使用されません。</string>
     <string name="revanced_alt_thumbnail_stills_fast_title">高速な静止画サムネイル</string>
-    <string name="revanced_alt_thumbnail_stills_fast_summary_on">現在の設定: 中画質の静止画サムネイルを使用します。\n\n注意: 読み込みは速くなりますが、ライブ、公開予定、非常に古い動画は、サムネイルが空白になることがあります。</string>
+    <string name="revanced_alt_thumbnail_stills_fast_summary_on">現在の設定: 中画質の静止画サムネイルを使用します。\n\n注意: 読み込みは速くなりますが、ライブ配信、公開予定、非常に古い動画は、サムネイルが空白になることがあります。</string>
     <string name="revanced_alt_thumbnail_stills_fast_summary_off">現在の設定: 高画質の静止画サムネイルを使用します。</string>
     <string name="revanced_alt_thumbnail_stills_time_title">取得する静止画のサムネイルの位置</string>
     <string name="revanced_alt_thumbnail_stills_time_entry_1">動画の最初</string>
@@ -98,12 +98,12 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_hide_album_card_summary_off">アーティストの概要欄の下部に表示されるアルバムカードを非表示にします。</string>
     <string name="revanced_hide_carousel_shelf_title">おすすめ欄を非表示</string>
     <string name="revanced_hide_carousel_shelf_summary">"以下の欄を非表示にします:
-• ニュース速報
-• 続きを見る
-• もう一度見る
-• もう一度聴く
-• 他のチャンネルを探す
-• ショッピング"</string>
+・ニュース速報
+・続きを見る
+・もう一度見る
+・もう一度聴く
+・他のチャンネルを探す
+・ショッピング"</string>
     <string name="revanced_hide_chips_shelf_title">チップ欄を非表示</string>
     <string name="revanced_hide_chips_shelf_on">フィードに表示される、似ている動画のチップ欄を非表示にします。</string>
     <string name="revanced_hide_chips_shelf_off">フィードに表示される、似ている動画のチップ欄を非表示にします。</string>
@@ -237,9 +237,9 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_hide_keyword_content_about_summary">"ホーム / 登録チャンネル / 検索結果 は、キーワードやフレーズに一致するコンテンツを非表示にするようにフィルタリングされます。
 
 注意:
-• 一部のショート動画は非表示にならない場合があります。
-• 一部の UI コンポーネントは非表示にならない場合があります。
-• キーワードで検索しても結果が表示されない場合があります。"</string>
+・一部のショート動画は非表示にならない場合があります。
+・一部の UI コンポーネントは非表示にならない場合があります。
+・キーワードで検索しても結果が表示されない場合があります。"</string>
     <string name="revanced_hide_keyword_content_about_whole_words_title">単語全体を一致させる</string>
     <string name="revanced_hide_keyword_content_about_whole_words_summary">キーワードやフレーズを二重引用符 (\" \") で囲むことで、動画のタイトルやチャンネル名の部分一致を防ぐことができます。&lt;br&gt;&lt;br&gt;例えば、&lt;br&gt;&lt;b&gt;\"ai\"&lt;/b&gt; とすると、動画 &lt;b&gt;「AI はどのように機能するのか？」&lt;/b&gt;&lt;br&gt; は表示されなくなりますが、&lt;b&gt;「フェアユースとは何か？ (What does f“ai”r use mean?) 」&lt;/b&gt; は表示されます。</string>
     <string name="revanced_hide_keyword_toast_invalid_common">無効なキーワードです。\'%s\' はフィルターとして使用できません</string>
@@ -252,9 +252,9 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_hide_recommended_video_title">おすすめ動画を非表示</string>
     <string name="revanced_hide_recommended_video_summary">"以下のおすすめ動画を非表示にします:
 
-• 「メンバーシップ限定」タグの付いた動画
-• 動画の下部に「他のユーザーも視聴しています」などのフレーズがある動画
-• 登録していないチャンネルからアップロードされた、再生回数が 1,000 回未満の動画"</string>
+・「メンバーシップ限定」タグの付いた動画
+・動画の下部に「他のユーザーも視聴しています」などのフレーズがある動画
+・登録していないチャンネルからアップロードされた、再生回数が 1,000 回未満の動画"</string>
     <string name="revanced_hide_low_views_video_title">再生回数が少ない動画を非表示</string>
     <string name="revanced_hide_low_views_video_summary">登録していないチャンネルからアップロードされた、再生回数が 1,000 回未満の動画をホームフィードから非表示にします。</string>
     <!-- PreferenceScreen: Feed, PreferenceCategory: Feed, PreferenceScreen: Video filter, PreferenceCategory: View count filter -->
@@ -273,13 +273,13 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_hide_video_view_counts_less_than_title">再生回数が少ない動画を非表示</string>
     <string name="revanced_hide_video_view_counts_less_than_summary">この数値より少ない再生回数の動画を非表示にします。</string>
     <string name="revanced_hide_video_view_counts_multiplier_title">キーを表示</string>
-    <string name="revanced_hide_video_view_counts_multiplier_summary">UIの各動画の下に表示される再生回数の言語テンプレートを設定します。各キー (言語の文字/単語) -&gt; 値 (キーの意味) は、改行して記述する必要があります。キーは「-&gt;」記号の前に記述します。言語設定を更新した場合は、この設定をリセットする必要があります。\n\n例:\n英語: 10K views = K -&gt; 1000、views -&gt; 回\nスペイン語: 10 K vistas = K -&gt; 1000、vistas -&gt; 回</string>
+    <string name="revanced_hide_video_view_counts_multiplier_summary">UI の各動画の下に表示される再生回数の言語テンプレートを設定します。各キー (言語の文字/単語) -&gt; 値 (キーの意味) は、改行して記述する必要があります。キーは「-&gt;」記号の前に記述します。言語設定を更新した場合は、この設定をリセットする必要があります。\n\n例:\n英語: 10K views = K -&gt; 1000、views -&gt; 回\nスペイン語: 10 K vistas = K -&gt; 1000、vistas -&gt; 回</string>
     <string name="revanced_hide_video_view_counts_multiplier_default_value">万 -&gt; 10 000\n億 -&gt; 100 000 000\n回視聴 -&gt; views</string>
     <string name="revanced_hide_video_by_view_counts_about_title">再生回数のフィルタリングについて</string>
     <string name="revanced_hide_video_by_view_counts_about_summary">"ホーム / 登録チャンネル / 検索結果はフィルタリングされ、設定した値よりも少ない再生回数の動画を非表示にします。
 
 注意: 
-・ショート動画は非表示にできません。
+・ショートは非表示にできません。
 ・再生回数が 0 の動画はフィルタリングされません。"</string>
     <string name="revanced_hide_related_videos_title">関連動画を非表示</string>
     <string name="revanced_hide_related_videos_summary_on">ホームフィードから関連動画を非表示にします。</string>
@@ -292,6 +292,7 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_preference_screen_general_title">全般</string>
     <string name="revanced_change_start_page_title">起動時のページを変更</string>
     <string name="revanced_change_start_page_entry_browse">チャンネルを探す</string>
+    <string name="revanced_change_start_page_entry_courses">コース / 教育</string>
     <string name="revanced_change_start_page_entry_default">デフォルト</string>
     <string name="revanced_change_start_page_entry_explore">探索</string>
     <string name="revanced_change_start_page_entry_gaming">ゲーム</string>
@@ -301,12 +302,14 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_change_start_page_entry_live">ライブ</string>
     <string name="revanced_change_start_page_entry_movies">映画</string>
     <string name="revanced_change_start_page_entry_music">音楽</string>
+    <string name="revanced_change_start_page_entry_notifications">通知</string>
     <string name="revanced_change_start_page_entry_search">検索</string>
     <string name="revanced_change_start_page_entry_shorts">ショート</string>
     <string name="revanced_change_start_page_entry_sports">スポーツ</string>
     <string name="revanced_change_start_page_entry_subscriptions">登録チャンネル</string>
     <string name="revanced_change_start_page_entry_trending">トレンド</string>
     <string name="revanced_change_start_page_entry_watch_later">後で見る</string>
+    <string name="revanced_change_start_page_entry_your_clips">クリップ</string>
     <string name="revanced_change_start_page_type_title">「起動時のページを変更」の種類</string>
     <string name="revanced_change_start_page_type_summary_on">"現在の設定: 起動時のページを常に変更します。
 
@@ -342,7 +345,8 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_hide_snack_bar_summary_off">共有からリンクをコピーした際などに画面下部に表示されるポップアップを非表示にします。</string>
     <string name="revanced_remove_viewer_discretion_dialog_title">年齢制限ダイアログを削除</string>
     <string name="revanced_remove_viewer_discretion_dialog_summary">"年齢制限ダイアログを削除します。 
-これにより年齢制限を回避することはできませんが、自動的に同意します。"</string>
+
+注意: 年齢制限を回避することはできませんが、自動的に同意します。"</string>
     <string name="revanced_change_layout_title">レイアウトを変更</string>
     <string name="revanced_change_layout_entry_1">オリジナル</string>
     <string name="revanced_change_layout_entry_2">スマホ</string>
@@ -350,13 +354,13 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_change_layout_entry_4">タブレット</string>
     <string name="revanced_change_layout_entry_5">タブレット(最小 600 dp)</string>
     <string name="revanced_spoof_app_version_title">アプリのバージョンを偽装</string>
-    <string name="revanced_spoof_app_version_summary_on">アプリのバージョンは偽装されています。</string>
-    <string name="revanced_spoof_app_version_summary_off">アプリのバージョンは偽装されていません。</string>
+    <string name="revanced_spoof_app_version_summary_on">アプリのバージョンを偽装できます。</string>
+    <string name="revanced_spoof_app_version_summary_off">アプリのバージョンを偽装できます。</string>
     <string name="revanced_spoof_app_version_user_dialog_message">"アプリのバージョンを以前のバージョンに偽装します。
 
 これによりアプリの外観や機能が変更されますが、予期しない副作用が発生する可能性があります。
 
-後でこの機能をオフにする場合は、UIのバグを防ぐためにアプリのデータを消去することをお勧めします。"</string>
+後でこの機能をオフにする場合は、UI のバグを防ぐためにアプリのデータを消去することをおすすめします。"</string>
     <string name="revanced_spoof_app_version_target_title">偽装するアプリのバージョンを編集</string>
     <string name="revanced_spoof_app_version_target_summary">偽装するバージョンを入力してください。</string>
     <string name="revanced_spoof_app_version_target_entry_title">偽装するバージョン</string>
@@ -500,12 +504,9 @@ DeArrow の詳細については、ここをタップしてください。"</str
 また、ショートで広告がブロックされなくなります。
 
 この設定が有効にならない場合は、シークレットモードに切り替えてみてください。"</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">明るい半透明なナビゲーションバーを無効化</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">ライトモードで半透明なナビゲーションバーを無効化します。</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">ライトモードで半透明なナビゲーションバーを無効化します。</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">暗い半透明なナビゲーションバーを無効化</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">ダークモードで半透明なナビゲーションバーを無効化します。</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">ダークモードで半透明なナビゲーションバーを無効化します。</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">半透明のナビゲーションバーを有効化</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">ナビゲーションバー (ホーム、登録チャンネルなどのボタン) を半透明にします。</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">ナビゲーションバー (ホーム、登録チャンネルなどのボタン) を半透明にします。</string>
     <string name="revanced_hide_navigation_bar_title">ナビゲーションバーを非表示</string>
     <string name="revanced_hide_navigation_bar_summary_on">ナビゲーションバー(ホーム、登録チャンネルなどのボタン)を非表示にします。</string>
     <string name="revanced_hide_navigation_bar_summary_off">ナビゲーションバー(ホーム、登録チャンネルなどのボタン)を非表示にします。</string>
@@ -859,6 +860,16 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_disable_engagement_panel_title">エンゲージメントパネルを無効化</string>
     <string name="revanced_disable_engagement_panel_summary_on">エンゲージメントパネルを無効化します。</string>
     <string name="revanced_disable_engagement_panel_summary_off">エンゲージメントパネルを無効化します。</string>
+    <string name="revanced_enter_fullscreen_title">動画開始時に全画面表示を開始</string>
+    <string name="revanced_enter_fullscreen_summary_on">"動画の再生開始時に全画面表示に切り替えます。
+
+注意: ミニプレーヤーで再生している、ピクチャーインピクチャーモードになっている、またはバックグラウンド再生をしている場合は動作しません。"</string>
+    <string name="revanced_enter_fullscreen_summary_off">動画の再生開始時に全画面表示に切り替えます。\n\n注意: ミニプレーヤーで再生している、ピクチャーインピクチャーモードになっている、またはバックグラウンド再生をしている場合は動作しません。</string>
+    <string name="revanced_exit_fullscreen_title">動画終了時に全画面表示を終了</string>
+    <string name="revanced_exit_fullscreen_entry_1">無効</string>
+    <string name="revanced_exit_fullscreen_entry_2">縦向きの動画のみ</string>
+    <string name="revanced_exit_fullscreen_entry_3">横向きの動画のみ</string>
+    <string name="revanced_exit_fullscreen_entry_4">縦向きの動画と横向きの動画</string>
     <string name="revanced_show_video_title_section_title">タイトル欄を表示</string>
     <string name="revanced_show_video_title_section_summary">"全画面表示時にタイトルを表示します。
 
@@ -867,8 +878,8 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_hide_autoplay_preview_summary_on">「次の動画」コンテナーを非表示にします。</string>
     <string name="revanced_hide_autoplay_preview_summary_off">「次の動画」コンテナーを非表示にします。</string>
     <string name="revanced_hide_live_chat_replay_button_title">チャットのリプレイボタンを非表示</string>
-    <string name="revanced_hide_live_chat_replay_button_summary_on">ライブで全画面表示時に右下に表示される「チャットのリプレイ」ボタンを非表示にします。\n\nライブチャットを終了すると全画面表示になります。</string>
-    <string name="revanced_hide_live_chat_replay_button_summary_off">ライブで全画面表示時に右下に表示される「チャットのリプレイ」ボタンを非表示にします。\n\nライブチャットを終了すると全画面表示になります。</string>
+    <string name="revanced_hide_live_chat_replay_button_summary_on">ライブ配信で全画面表示時に右下に表示される「チャットのリプレイ」ボタンを非表示にします。\n\nライブチャットを終了すると全画面表示になります。</string>
+    <string name="revanced_hide_live_chat_replay_button_summary_off">ライブ配信で全画面表示時に右下に表示される「チャットのリプレイ」ボタンを非表示にします。\n\nライブチャットを終了すると全画面表示になります。</string>
     <string name="revanced_hide_related_video_overlay_title">関連動画を非表示</string>
     <string name="revanced_hide_related_video_overlay_summary_on">関連動画のオーバーレイを無効化します。</string>
     <string name="revanced_hide_related_video_overlay_summary_off">関連動画のオーバーレイを無効化します。</string>
@@ -914,11 +925,6 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_enable_compact_controls_overlay_title">コンパクトなコントロールオーバーレイを有効化</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">コントロールのオーバーレイを全画面に表示せず、コンパクトに表示します。</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">コントロールのオーバーレイを全画面に表示せず、コンパクトに表示します。</string>
-    <string name="revanced_force_fullscreen_title">強制的に全画面表示</string>
-    <string name="revanced_force_fullscreen_summary">"以下の状況で全画面に切り替わります: 
-
-・動画開始時
-・コメントのタイムスタンプをタップしたとき"</string>
     <string name="revanced_keep_landscape_mode_title">横画面モードを維持</string>
     <string name="revanced_keep_landscape_mode_summary">全画面表示時に、画面をオン/オフしても、横向きモードを維持します。</string>
     <string name="revanced_keep_landscape_mode_timeout_title">横画面モードのタイムアウトを維持</string>
@@ -987,10 +993,10 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_overlay_button_whitelist_summary">タップするとホワイトリストのダイアログが開きます。
 長押しするとホワイトリストの設定のダイアログが開きます。</string>
     <string name="revanced_overlay_button_play_all_title">「すべて再生」ボタンを表示</string>
-    <string name="revanced_overlay_button_play_all_summary">"1 回タップすると、チャンネルに投稿されているすべての動画の再生リストを生成します。
+    <string name="revanced_overlay_button_play_all_summary">"タップすると、チャンネルに投稿されているすべての動画の再生リストを生成します。
 タップして長押しすると、元に戻ります。
 
-注意: ライブでは動作しない可能性があります。"</string>
+注意: ライブ配信では動作しない可能性があります。"</string>
     <string name="revanced_overlay_button_play_all_type_title">再生リストの生成モード</string>
     <string name="revanced_overlay_button_play_all_type_entry_0">すべてのコンテンツ (時間順、昇順)</string>
     <string name="revanced_overlay_button_play_all_type_entry_1">すべてのコンテンツ (時間順)</string>
@@ -1004,7 +1010,7 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_overlay_button_play_all_type_entry_9">全員が閲覧可能なコンテンツのみ</string>
     <string name="revanced_overlay_button_play_all_type_entry_10">「メンバーのみ」の動画</string>
     <string name="revanced_overlay_button_play_all_type_entry_11">「メンバーのみ」のショート</string>
-    <string name="revanced_overlay_button_play_all_type_entry_12">「メンバーのみ」のライブ</string>
+    <string name="revanced_overlay_button_play_all_type_entry_12">「メンバーのみ」のライブ配信</string>
     <string name="revanced_overlay_button_play_all_not_available_toast">チャンネル ID が一致しないため、再生リストを生成できません。</string>
     <string name="revanced_whitelist_settings_title">チャンネルのホワイトリスト</string>
     <string name="revanced_whitelist_settings_summary">ホワイトリストに登録したチャンネルのリストを確認/削除します。</string>
@@ -1068,7 +1074,7 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_enable_seekbar_thumbnails_high_quality_title">高画質のサムネイルを有効化</string>
     <string name="revanced_enable_seekbar_thumbnails_high_quality_summary_on">シークバーサムネイルを高画質化します。</string>
     <string name="revanced_enable_seekbar_thumbnails_high_quality_summary_off">シークバーサムネイルを高画質化します。</string>
-    <string name="revanced_enable_seekbar_thumbnails_high_quality_dialog_message">"この機能を有効化することにより、シークバーサムネイルがないライブのアーカイブにサムネイルが復元されます。
+    <string name="revanced_enable_seekbar_thumbnails_high_quality_dialog_message">"これを有効化すると、シークバーサムネイルがないライブ配信のアーカイブにサムネイルが復元されます。
 
 注意: 
 ・通信量が増える可能性があります。
@@ -1110,8 +1116,8 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_disable_video_description_interaction_title">概要欄の操作を無効化</string>
     <string name="revanced_disable_video_description_interaction_summary">"概要欄が展開されている場合、以下のインタラクションを無効にします:
 
-• タップしてスクロールする。
-• タップしたままテキストを選択する。"</string>
+• タップしてスクロール
+• タップしたままテキストを選択"</string>
     <string name="revanced_expand_video_description_title">概要欄を自動で展開</string>
     <string name="revanced_expand_video_description_summary_on">概要欄を自動で展開します。</string>
     <string name="revanced_expand_video_description_summary_off">概要欄を自動で展開します。</string>
@@ -1276,8 +1282,8 @@ DeArrow の詳細については、ここをタップしてください。"</str
 
 注意: 
 ・YouTube のバージョンが 18.49.37 以前に偽装されている場合は機能しません。
-・ライブでは機能しません。"</string>
-    <string name="revanced_enable_shorts_custom_actions_flyout_menu_summary_off">フライアウトメニューでカスタムアクションを使用できるようにします。\n\n注意: \n・YouTube のバージョンが 18.49.37 以前に偽装されている場合は機能しません。\n・ライブでは機能しません。</string>
+・ライブ配信では機能しません。"</string>
+    <string name="revanced_enable_shorts_custom_actions_flyout_menu_summary_off">フライアウトメニューでカスタムアクションを使用できるようにします。\n\n注意: \n・YouTube のバージョンが 18.49.37 以前に偽装されている場合は機能しません。\n・ライブ配信では機能しません。</string>
     <string name="revanced_enable_shorts_custom_actions_toolbar_title">ツールバーのカスタムアクションを有効化</string>
     <string name="revanced_enable_shorts_custom_actions_toolbar_summary_on">"ツールバーでカスタムアクションを使用できるようにします。
 
@@ -1336,9 +1342,8 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_replace_channel_handle_summary_off">現在の設定: チャンネルのハンドル名が表示されます。</string>
     <string name="revanced_restore_shorts_old_player_layout_title">古いプレーヤーレイアウトを復元</string>
     <string name="revanced_restore_shorts_old_player_layout_summary_on">"古いプレーヤーレイアウトを復元します。
-プレーヤーの上部と下部に余白はありません。"</string>
-    <string name="revanced_restore_shorts_old_player_layout_summary_off">古いプレーヤーレイアウトを復元します。
-プレーヤーの上部と下部に余白はありません。</string>
+これによりプレーヤーの上部と下部から余白が削除されます。"</string>
+    <string name="revanced_restore_shorts_old_player_layout_summary_off">古いプレーヤーレイアウトを復元します。\nこれによりプレーヤーの上部と下部から余白が削除されます。</string>
     <!-- PreferenceScreen: Swipe controls -->
     <string name="revanced_preference_screen_swipe_controls_title">スワイプコントロール</string>
     <string name="revanced_enable_swipe_lowest_value_auto_brightness_title">スワイプして明るさの自動調節を有効化</string>
@@ -1363,7 +1368,7 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_swipe_gestures_lock_mode_summary_on">スワイプジェスチャーを「画面のロック」モードで有効化します。</string>
     <string name="revanced_swipe_gestures_lock_mode_summary_off">スワイプジェスチャーを「画面のロック」モードで有効化します。</string>
     <string name="revanced_swipe_overlay_background_alpha_title">スワイプオーバーレイの背景の透明度</string>
-    <string name="revanced_swipe_overlay_background_alpha_summary">背景の不透明度の値は 0 ~255 の間で、0 が透明です。</string>
+    <string name="revanced_swipe_overlay_background_alpha_summary">背景の不透明度の値は 0 ~ 255 の間で、0 が透明です。</string>
     <string name="revanced_swipe_magnitude_threshold_title">スワイプ可能な領域のしきい値</string>
     <string name="revanced_swipe_magnitude_threshold_summary">スワイプとして検出する量のしきい値です。</string>
     <string name="revanced_swipe_overlay_text_size_title">スワイプオーバーレイのテキストサイズ</string>
@@ -1382,12 +1387,18 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_disable_hdr_auto_brightness_title">HDR 動画の明るさ自動調節を無効化</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">HDR 動画の明るさの自動調節を無効にします。</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">HDR 動画の明るさの自動調節を無効にします。</string>
-    <string name="revanced_disable_watch_panel_gestures_title">全画面表示ジェスチャーを無効化</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">動画のタイトルより下の領域を下にスワイプすると全画面表示に切り替える機能を無効化します。</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">動画のタイトルより下の領域を下にスワイプすると全画面表示に切り替える機能を無効化します。</string>
     <string name="revanced_disable_swipe_to_switch_video_title">スワイプして動画を切り替えるのを無効化</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_on">全画面表示時に、上/下にスワイプして次の動画/前の動画に切り替えられるようにします。</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_off">全画面表示時に、上/下にスワイプして次の動画/前の動画に切り替えられるようにします。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">スワイプして全画面表示に切り替えるのを無効化(動画のタイトルより下を下にスワイプした時)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">動画のタイトルより下をスワイプしても全画面表示に切り替えないようにします。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">動画のタイトルより下をスワイプしても全画面表示に切り替えないようにします。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">スワイプして全画面表示に切り替えるのを無効化(プレーヤーを下にスワイプした時)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">プレーヤーを下にスワイプしても全画面表示に切り替えないようにします。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">プレーヤーを下にスワイプしても全画面表示に切り替えないようにします。</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">スワイプして全画面表示を終了するのを無効化</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">プレーヤーを下にスワイプしても全画面表示を終了しないようにします。</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">プレーヤーを下にスワイプしても全画面表示を終了しないようにします。</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">自動</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">動画</string>
@@ -1397,9 +1408,6 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_disable_hdr_video_title">HDR 動画を無効化</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR 動画を無効化します。</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR 動画を無効化します。</string>
-    <string name="revanced_disable_default_playback_speed_live_title">ライブ配信でデフォルトの再生速度を無効化</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">ライブ配信ではデフォルトに設定された再生速度を無効化します。</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">ライブ配信ではデフォルトに設定された再生速度を無効化します。</string>
     <string name="revanced_enable_custom_playback_speed_title">カスタム再生速度を有効化</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">再生速度のカスタムを有効化します。</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">再生速度のカスタムを有効化します。</string>
@@ -1424,19 +1432,20 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_restore_old_video_quality_menu_summary_on">古いスタイルの画質設定メニューを復活させます。</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">古いスタイルの画質設定メニューを復活させます。</string>
     <string name="revanced_disable_default_playback_speed_music_title">音楽再生時にデフォルトの再生速度を無効化</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"音楽を再生する際に、「デフォルトの再生速度」で設定した再生速度を無効化します。
-
-注意: この設定は、「YouTube Music で聴く」バナーが表示されている動画にのみ適用されます。"</string>
+    <string name="revanced_disable_default_playback_speed_music_on">音楽を再生する際に「デフォルトの再生速度」で設定した再生速度を無効化します。</string>
     <string name="revanced_disable_default_playback_speed_music_off">音楽を再生する際に、「デフォルトの再生速度」で設定した再生速度を無効化します。\n\n注意: この設定は、「YouTube Music で聴く」バナーが表示されている動画にのみ適用されます。</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">自動的にデフォルトの再生速度を無効化</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">動画のカテゴリが「音楽」の場合、デフォルトの再生速度を無効にします。</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">動画のカテゴリが「音楽」の場合、デフォルトの再生速度を無効にします。</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">ショートのデフォルト再生速度を有効化</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">デフォルトの再生速度をショートに適用します。</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">デフォルトの再生速度をショートに適用します。</string>
     <string name="revanced_skipped_preloaded_buffer">プリロードバッファをスキップしました。</string>
     <string name="revanced_skip_preloaded_buffer_title">プリロードバッファをスキップ</string>
-    <string name="revanced_skip_preloaded_buffer_summary">"動画開始時に予め読み込まれたバッファをスキップして、デフォルトの画質強制の遅延を回避します。
+    <string name="revanced_skip_preloaded_buffer_summary">"動画開始時に予め読み込まれたバッファをスキップして、デフォルトの画質を即座に適用します。
 
 注意:
-・動画開始時に約 0.3 秒の遅延が発生しますが、デフォルトの画質はすぐに適用されます。
+・動画開始時に約 0.3 秒の遅延が発生します。
 ・HDR 動画、ライブ配信、15 秒未満の動画には適用されません。"</string>
     <string name="revanced_skip_preloaded_buffer_user_dialog_message">この設定をオンにした場合、バッファリングの問題が発生する可能性があります。</string>
     <string name="revanced_skip_preloaded_buffer_toast_title">スキップ時にトーストを表示</string>
@@ -1449,16 +1458,15 @@ DeArrow の詳細については、ここをタップしてください。"</str
     <string name="revanced_disable_vp9_codec_summary_on">"VP9 コーデックを無効化します。
 
 注意: 
-• 最大解像度は 1080p です。
-• 動画を再生する際には VP9 コーデックよりも多くの通信量を消費します。
-• HDR 再生を可能にするために、HDR 動画では引き続き VP9 コーデックが使用されます。"</string>
-    <string name="revanced_disable_vp9_codec_summary_off">VP9 コーデックを無効化します。\n\n注意: \n
-• 最大解像度は 1080p です。\n• 動画を再生する際には VP9 コーデックよりも多くの通信量を消費します。\n • HDR 再生を可能にするために、HDR 動画では引き続き VP9 コーデックが使用されます。</string>
+・最大解像度は 1080p です。
+・動画を再生する際には VP9 コーデックよりも多くの通信量を消費します。
+・HDR 再生を可能にするために、HDR 動画では引き続き VP9 コーデックが使用されます。"</string>
+    <string name="revanced_disable_vp9_codec_summary_off">VP9 コーデックを無効化します。\n\n注意: \n・最大解像度は 1080p です。\n・動画を再生する際には VP9 コーデックよりも多くの通信量を消費します。\n・HDR 再生を可能にするために、HDR 動画では引き続き VP9 コーデックが使用されます。</string>
     <string name="revanced_replace_av1_codec_title">AV1 コーデックを置換</string>
     <string name="revanced_replace_av1_codec_summary">AV1 コーデックを VP9 コーデックに置き換えます。</string>
     <string name="revanced_reject_av1_codec_title">AV1 コーデックの応答を拒否</string>
     <string name="revanced_reject_av1_codec_summary">"AV1 コーデック応答を強制的に拒否します。
-約20秒間のバッファリングの後、異なるコーデックに切り替わります。"</string>
+約 20 秒間のバッファリングの後、異なるコーデックに切り替わります。"</string>
     <string name="revanced_reject_av1_codec_toast">フォールバック処理で約20秒のバッファリングが発生します。</string>
     <string name="revanced_remember_playback_speed_toast">デフォルトの再生速度を %s に変更しました。</string>
     <string name="revanced_remember_video_quality_mobile">モバイルネットワーク使用時のデフォルト画質を %s に変更しました。</string>
@@ -1775,20 +1783,45 @@ GmsCore の電池の最適化を無効にしても、バッテリーの使用に
     <string name="revanced_spoof_streaming_data_summary_off">"ストリーミングデータを偽装していない場合、動画の再生ができない可能性があります。"</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">この設定をオフにした場合、バッファリングの問題が発生する可能性があります。</string>
     <string name="revanced_spoof_streaming_data_type_title">偽装するクライアントの種類</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Google アカウントへのログインが必要)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(PoToken が必要)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Google アカウントへのログインが必要)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">ストリーミングデータを偽装することによる副作用</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">・まだ見つかっていません。</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">・子供向け動画は再生できない可能性があります。
-・映画や有料動画は再生できない可能性があります。</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Android クライアントのみを使用</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android">"・「音声トラック」メニューは表示されません。
+・「一定音量」は使用できません。
+・「音声トラックの強制を無効化」は利用できません。
+・ログインをしていない or シークレットモードを有効化している場合、子供向け動画は再生できない可能性があります。"</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">・動画が再生できない可能性があります(PoToken が必要です)。</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"・映画や有料動画は再生できない可能性があります。
+・ログインをしていない or シークレットモードを有効化している場合、子供向け動画は再生できない可能性があります。"</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">iOS クライアントで AVC (H.264) を強制</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">iOS クライアントで AVC (H.264) を強制します。</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">iOS クライアントで AVC (H.264) を強制します。</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"これを有効にすると、バッテリーの持ちが改善され、再生時のカクつきが修正される可能性があります。
+
+注意:
+・AVC (H.264) の最大解像度は 1080p です。
+・Opus オーディオコーデックは使用できません。
+・動画の再生時には VP9 や AV1 よりも多くの通信量を消費します。"</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">統計情報に偽装したクライアントを表示</string>
-    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">統計情報に偽装したストリーミングデータを表示します。</string>
-    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">統計情報に偽装したストリーミングデータを表示します。</string>
+    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">統計情報に偽装したクライアントを表示します。</string>
+    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">統計情報に偽装したクライアントを表示します。</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">使用する PoToken を入力</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">信頼できるブラウザで BotGuard によって発行された PoToken です。</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">使用する VisitorData を入力</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">信頼できるブラウザで BotGuard によって発行された VisitorData です。</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">PoToken / VisitorData について</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"一部のクライアントでは、有効なストリーミングデータ応答を取得するために PoToken と VisitorData が必要です。
+
+iOS クライアント選択する場合は、これらの値が必要になる場合があります。
+
+詳細についてはここをタップしてください。"</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">再生履歴</string>
     <string name="revanced_preference_screen_watch_history_summary">再生履歴に関連する設定を変更します。</string>
@@ -1799,10 +1832,10 @@ GmsCore の電池の最適化を無効にしても、バッテリーの使用に
     <string name="revanced_watch_history_type_entry_2">ドメインを置換</string>
     <string name="revanced_watch_history_type_entry_3">再生履歴をブロック</string>
     <string name="revanced_watch_history_about_title">再生履歴のステータス</string>
-    <string name="revanced_watch_history_about_status_blocked">• 再生履歴をブロックします。</string>
-    <string name="revanced_watch_history_about_status_replaced">• Google アカウントの再生履歴の設定に従います。</string>
-    <string name="revanced_watch_history_about_status_original">"• Google アカウントの再生履歴の設定に従います。
-• DNS や VPN が原因で再生履歴が動作しない可能性があります。"</string>
+    <string name="revanced_watch_history_about_status_blocked">・再生履歴をブロックします。</string>
+    <string name="revanced_watch_history_about_status_replaced">・Google アカウントの再生履歴の設定に従います。</string>
+    <string name="revanced_watch_history_about_status_original">"・Google アカウントの再生履歴の設定に従います。
+・DNS や VPN が原因で再生履歴が動作しない可能性があります。"</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceCategory: Patch information -->
     <string name="revanced_preference_category_patch_information">パッチ情報</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Patch information -->
diff --git a/patches/src/main/resources/youtube/translations/ko-rKR/strings.xml b/patches/src/main/resources/youtube/translations/ko-rKR/strings.xml
index 8245552dc..abba0802d 100644
--- a/patches/src/main/resources/youtube/translations/ko-rKR/strings.xml
+++ b/patches/src/main/resources/youtube/translations/ko-rKR/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Translations for YouTube -->
-    <string name="accessibility_settings_edu_opt_in_text">플레이어에 접근성 컨트롤을 표시하시겠습니까?</string>
+    <string name="accessibility_settings_edu_opt_in_text">플레이어에서 접근성 컨트롤을 표시하시겠습니까?</string>
     <string name="accessibility_settings_edu_opt_out_text">접근성 서비스가 켜져있기 때문에 플레이어 컨트롤을 변경합니다.</string>
     <!-- Shared -->
     <string name="revanced_extended_settings_title">ReVanced Extended 설정</string>
@@ -294,6 +294,7 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_preference_screen_general_title">일반</string>
     <string name="revanced_change_start_page_title">앱 시작 페이지 변경하기</string>
     <string name="revanced_change_start_page_entry_browse">채널 둘러보기</string>
+    <string name="revanced_change_start_page_entry_courses">학습 프로그램</string>
     <string name="revanced_change_start_page_entry_default">홈 (기본값)</string>
     <string name="revanced_change_start_page_entry_explore">탐색</string>
     <string name="revanced_change_start_page_entry_gaming">게임</string>
@@ -303,16 +304,19 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_change_start_page_entry_live">실시간</string>
     <string name="revanced_change_start_page_entry_movies">영화</string>
     <string name="revanced_change_start_page_entry_music">음악</string>
+    <string name="revanced_change_start_page_entry_notifications">알림</string>
     <string name="revanced_change_start_page_entry_search">검색</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">스포츠</string>
     <string name="revanced_change_start_page_entry_subscriptions">구독</string>
     <string name="revanced_change_start_page_entry_trending">인기 급상승</string>
     <string name="revanced_change_start_page_entry_watch_later">나중에 볼 동영상</string>
+    <string name="revanced_change_start_page_entry_your_clips">내 클립</string>
     <string name="revanced_change_start_page_type_title">앱 시작 페이지 유형 변경하기</string>
     <string name="revanced_change_start_page_type_summary_on">"앱 시작 페이지가 항상 변경됩니다.
 
-알려진 문제점: 툴바에서 '뒤로 가기' 버튼이 작동되지 않을 수 있습니다."</string>
+알려진 문제점:
+• 툴바에서 '뒤로 가기' 버튼이 작동되지 않을 수 있습니다."</string>
     <string name="revanced_change_start_page_type_summary_off">앱 시작 페이지가 한 번만 변경됩니다.</string>
     <string name="revanced_disable_auto_audio_tracks_title">자동 오디오 트랙 비활성화하기</string>
     <string name="revanced_disable_auto_audio_tracks_summary_on">자동 오디오 트랙을 비활성화합니다.</string>
@@ -410,7 +414,7 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_preference_screen_miniplayer_title">미니 플레이어</string>
     <string name="revanced_preference_screen_miniplayer_summary">앱 내에서 최소화된 플레이어의 스타일을 변경할 수 있습니다.</string>
     <string name="revanced_miniplayer_type_title">미니 플레이어 유형</string>
-    <string name="revanced_miniplayer_type_entry_0">사용하지 않음</string>
+    <string name="revanced_miniplayer_type_entry_0">사용 안함</string>
     <string name="revanced_miniplayer_type_entry_1">기기 기본값 사용</string>
     <string name="revanced_miniplayer_type_entry_2">최소화</string>
     <string name="revanced_miniplayer_type_entry_3">태블릿</string>
@@ -428,9 +432,8 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_miniplayer_double_tap_action_summary_off">\'두 번 누르기 동작\' 및 \'핀치하여 크기 조정\'을 비활성화합니다</string>
     <string name="revanced_miniplayer_drag_and_drop_title">드래그 &amp; 드롭 활성화하기</string>
     <string name="revanced_miniplayer_drag_and_drop_summary_on">"드래그 &amp; 드롭을 활성화합니다.
-
 • 미니 플레이어를 화면 구석으로 드래그 할 수 있습니다."</string>
-    <string name="revanced_miniplayer_drag_and_drop_summary_off">드래그 &amp; 드롭을 비활성화합니다.</string>
+    <string name="revanced_miniplayer_drag_and_drop_summary_off">드래그 &amp; 드롭을 비활성화합니다.\n• YouTube v19.44.39 에서는 드래그 &amp; 드롭을 비활성화하고 모던 스타일 1, 2, 3을 사용하면, 미니 플레이어 상태에서 \'위로 스와이프하여 화면 펼치기\'와 \'아래로 스와이프하여 화면 닫기\'를 사용할 수 없습니다.\n• YouTube v19.16.39 에서는 위에 설명된 기능은 전부 사용할 수는 있지만, 드래그 &amp; 드롭 기능이 지원되지 않습니다.</string>
     <string name="revanced_miniplayer_horizontal_drag_title">수평 드래그 제스처 활성화하기</string>
     <string name="revanced_miniplayer_horizontal_drag_summary_on">"수평 드래그 제스처를 활성화합니다.
 
@@ -493,12 +496,9 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
 또한, Shorts에서 광고가 더 이상 숨겨지지 않습니다.
 
 이 설정이 적용되지 않는 경우에는 시크릿 모드로 전환해 보세요."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">밝은 반투명 하단바 비활성화하기</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">밝은 테마 하단바가 불투명합니다.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">밝은 테마 하단바가 불투명하거나 반투명합니다.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">어두운 반투명 하단바 비활성화하기</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">어두운 테마 하단바가 불투명합니다.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">어두운 테마 하단바가 불투명하거나 반투명합니다.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">반투명 하단바 활성화하기</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">하단바가 반투명합니다.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">하단바가 불투명합니다.</string>
     <string name="revanced_hide_navigation_bar_title">하단바 숨기기</string>
     <string name="revanced_hide_navigation_bar_summary_on">하단바가 숨겨집니다.</string>
     <string name="revanced_hide_navigation_bar_summary_off">하단바가 표시됩니다.</string>
@@ -693,8 +693,8 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_hide_zoom_overlay_summary_on">줌 오버레이가 숨겨집니다.</string>
     <string name="revanced_hide_zoom_overlay_summary_off">줌 오버레이가 표시됩니다.</string>
     <string name="revanced_sanitize_video_subtitle_title">동영상 제목 하단 정리하기</string>
-    <string name="revanced_sanitize_video_subtitle_summary_on">"제목 하단에서 다음 문구들이 숨겨집니다:\n#(해시태그), 모금 행사, 쇼핑, n개 제품,\n인기 급상승 동영상 #순위, 회원 전용 ..."</string>
-    <string name="revanced_sanitize_video_subtitle_summary_off">"제목 하단에서 다음 문구들이 표시됩니다:\n#(해시태그), 모금 행사, 쇼핑, n개 제품,\n인기 급상승 동영상 #순위, 회원 전용 ..."</string>
+    <string name="revanced_sanitize_video_subtitle_summary_on">"제목 하단에서 다음 문구들이 숨겨집니다:\n#(해시태그), 모금 행사, 쇼핑, n개 제품, 더빙,\n인기 급상승 동영상 #순위, 회원 전용 ..."</string>
+    <string name="revanced_sanitize_video_subtitle_summary_off">"제목 하단에서 다음 문구들이 표시됩니다:\n#(해시태그), 모금 행사, 쇼핑, n개 제품, 더빙,\n인기 급상승 동영상 #순위, 회원 전용 ..."</string>
     <!-- PreferenceScreen: Player, PreferenceCategory: Player, PreferenceScreen: Action buttons -->
     <string name="revanced_preference_screen_action_buttons_title">액션 버튼</string>
     <string name="revanced_preference_screen_action_buttons_summary">플레이어 하단에 있는 액션 버튼을 숨기거나 표시할 수 있습니다.</string>
@@ -859,10 +859,22 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_disable_engagement_panel_title">참여 패널 비활성화하기</string>
     <string name="revanced_disable_engagement_panel_summary_on">참여 패널을 비활성화합니다.</string>
     <string name="revanced_disable_engagement_panel_summary_off">참여 패널을 활성화합니다.</string>
+    <string name="revanced_enter_fullscreen_title">동영상이 시작할 때, 전체 화면 모드로 들어가기</string>
+    <string name="revanced_enter_fullscreen_summary_on">"동영상이 시작할 때, 전체 화면 모드로 들어갑니다.
+
+알려진 문제점: 
+• 플레이어가 최소화되어 있거나 PIP 모드 또는 백그라운드 재생에 있는 경우에는 작동되지 않습니다."</string>
+    <string name="revanced_enter_fullscreen_summary_off">동영상이 시작할 때, 전체 화면 모드로 들어가지 않습니다.</string>
+    <string name="revanced_exit_fullscreen_title">동영상이 종료할 때, 전체 화면 모드에서 나가기</string>
+    <string name="revanced_exit_fullscreen_entry_1">사용 안함</string>
+    <string name="revanced_exit_fullscreen_entry_2">세로 모드</string>
+    <string name="revanced_exit_fullscreen_entry_3">가로 모드</string>
+    <string name="revanced_exit_fullscreen_entry_4">세로 및 가로 모드</string>
     <string name="revanced_show_video_title_section_title">동영상 제목 섹션 표시하기</string>
     <string name="revanced_show_video_title_section_summary">"전체 화면에서 동영상 제목 섹션을 표시합니다.
 
-알려진 문제점: 동영상 제목을 누르면 사라집니다."</string>
+알려진 문제점: 
+• 동영상 제목을 누르면 사라집니다."</string>
     <string name="revanced_hide_autoplay_preview_title">자동재생 미리보기 컨테이너 숨기기</string>
     <string name="revanced_hide_autoplay_preview_summary_on">자동재생 미리보기 컨테이너가 숨겨집니다.</string>
     <string name="revanced_hide_autoplay_preview_summary_off">자동재생 미리보기 컨테이너가 표시됩니다.</string>
@@ -914,13 +926,6 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_enable_compact_controls_overlay_title">컴팩트 컨트롤 오버레이 활성화하기</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">전체 화면에서 컨트롤 오버레이를 작게 표시합니다.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">전체 화면에서 컨트롤 오버레이를 작게 표시하지 않습니다.</string>
-    <string name="revanced_force_fullscreen_title">전체 화면 강제 전환하기</string>
-    <string name="revanced_force_fullscreen_summary">"
-다음과 같은 상황에서 동영상이 전체 화면으로 전환됩니다:
-
-• 동영상이 시작되었을 경우.
-• 동영상 설명에서 챕터를 선택했을 경우.
-• 댓글 내용에서 타임스탬프를 눌렀을 경우."</string>
     <string name="revanced_keep_landscape_mode_title">가로 모드 유지하기</string>
     <string name="revanced_keep_landscape_mode_summary">자동 회전 모드를 켜지 않고, 전체 화면으로 시청 중 화면을 껐다 켰을 때, 가로 모드를 유지합니다.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">가로 모드 유지하기 제한 시간</string>
@@ -1139,7 +1144,8 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_hide_shorts_shelf_title">Shorts 선반 숨기기</string>
     <string name="revanced_hide_shorts_shelf_summary">"Shorts 선반이 숨겨집니다.
 
-알려진 문제점: 검색 결과에서 다음 헤더가 숨겨집니다.
+알려진 문제점: 
+검색 결과에서 다음 헤더가 숨겨집니다.
 • 아티스트 또는 크리에이터의 최신 동영상
 • 이전에 시청한 동영상
 • 관련 검색어의 검색결과
@@ -1159,9 +1165,9 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_hide_shorts_shelf_search_title">검색 결과에서 Shorts 선반 숨기기</string>
     <string name="revanced_hide_shorts_shelf_search_summary_on">검색 결과에서 Shorts 선반이 숨겨집니다.</string>
     <string name="revanced_hide_shorts_shelf_search_summary_off">검색 결과에서 Shorts 선반이 표시됩니다.</string>
-    <string name="revanced_hide_shorts_shelf_history_title">시청 기록에서 Shorts 선반이 숨기기</string>
-    <string name="revanced_hide_shorts_shelf_history_summary_on">시청 기록에서 Shorts 선반이 숨겨집니다.</string>
-    <string name="revanced_hide_shorts_shelf_history_summary_off">시청 기록에서 Shorts 선반이 표시됩니다.</string>
+    <string name="revanced_hide_shorts_shelf_history_title">시청 기록에서 Shorts 숨기기</string>
+    <string name="revanced_hide_shorts_shelf_history_summary_on">시청 기록에서 Shorts가 숨겨집니다.</string>
+    <string name="revanced_hide_shorts_shelf_history_summary_off">시청 기록에서 Shorts가 표시됩니다.</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Experimental Flags -->
     <string name="revanced_change_shorts_repeat_state_title">Shorts 반복 상태 변경하기</string>
     <string name="revanced_change_shorts_background_repeat_state_title">Shorts 백그라운드 재생 반복 상태 변경하기</string>
@@ -1389,12 +1395,18 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_disable_hdr_auto_brightness_title">HDR 자동 밝기 비활성화하기</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">HDR 자동 밝기를 비활성화합니다.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">HDR 자동 밝기를 활성화합니다.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">시청 패널 제스처 비활성화하기</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">동영상 플레이어 하단에서 아래로 스와이프하여 전체 화면으로 전환하지 않습니다.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">동영상 플레이어 하단에서 아래로 스와이프하여 전체 화면으로 전환합니다.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">스와이프 제스처로 동영상 전환 비활성화하기</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">스와이프 제스처로 다음/이전 동영상으로 전환하지 않습니다.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">스와이프 제스처로 다음/이전 동영상으로 전환합니다.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">전체 화면 모드에서 위로/아래로 스와이프하여 다음/이전 동영상으로 전환하지 않습니다.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">전체 화면 모드에서 위로/아래로 스와이프하여 다음/이전 동영상으로 전환합니다.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">스와이프 제스처로 전체 화면 모드 전환 비활성화하기 (플레이어 하단)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">플레이어 하단에서 아래로 스와이프하여 전체 화면 모드로 들어가지 않습니다.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">플레이어 하단에서 아래로 스와이프하여 전체 화면 모드로 들어갑니다.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">스와이프 제스처로 전체 화면 모드 전환 비활성화하기 (플레이어 내부)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">플레이어 내부에서 위로 스와이프하여 전체 화면 모드로 들어가지 않습니다.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">플레이어 내부에서 위로 스와이프하여 전체 화면 모드로 들어갑니다.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">스와이프 제스처로 전체 화면 모드 종료 비활성화하기</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">전체 화면에서 아래로 스와이프하여 전체 화면 모드를 나가지 않습니다.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">전체 화면에서 아래로 스와이프하여 전체 화면 모드를 나갑니다.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">자동</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">동영상</string>
@@ -1404,9 +1416,6 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_disable_hdr_video_title">HDR 동영상 비활성화하기</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR 동영상을 비활성화합니다.</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR 동영상을 활성화합니다.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">실시간 스트림에서 기본 동영상 재생 속도 비활성화하기</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">실시간 스트림에서 기본 동영상 재생 속도를 비활성화합니다.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">실시간 스트림에서 기본 동영상 재생 속도를 활성화합니다.</string>
     <string name="revanced_enable_custom_playback_speed_title">사용자 정의 동영상 재생 속도 활성화하기</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">사용자 정의 동영상 재생 속도를 활성화합니다.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">사용자 정의 동영상 재생 속도를 비활성화합니다.</string>
@@ -1431,10 +1440,11 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_restore_old_video_quality_menu_summary_on">이전 동영상 화질 설정 메뉴를 활성화합니다.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">이전 동영상 화질 설정을 비활성화합니다.</string>
     <string name="revanced_disable_default_playback_speed_music_title">음악에서 기본 동영상 재생 속도 비활성화하기</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"음악 동영상에서 기본 동영상 재생 속도를 비활성화합니다.
-
-알려진 문제점: 이 설정은 'YouTube Music에서 감상하기' 배너가 포함되지 않은 동영상에는 적용되지 않을 수 있습니다."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">음악 동영상에서 기본 동영상 재생 속도를 비활성화합니다.</string>
     <string name="revanced_disable_default_playback_speed_music_off">음악 동영상에서 기본 동영상 재생 속도를 활성화합니다.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">카테고리를 사용하여 유효성 검사하기</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">동영상 카테고리가 음악인 경우에는 기본 동영상 재생 속도를 비활성화합니다.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">YouTube Music에서 재생할 수 있는 동영상인 경우에는 기본 동영상 재생 속도를 비활성화합니다.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Shorts에서 기본 동영상 재생 속도 활성화하기</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Shorts에서 기본 동영상 재생 속도를 활성화합니다.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Shorts에서 기본 동영상 재생 속도를 비활성화합니다.</string>
@@ -1453,8 +1463,8 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
 • 일부 스마트폰에서 이 설정을 활성화하면, 동영상 재생이 끊기거나 배터리 수명이 단축될 수 있으며, 알려지지 않은 문제점도 발생할 수 있습니다."</string>
     <string name="revanced_disable_vp9_codec_title">VP9 코덱 비활성화하기</string>
     <string name="revanced_disable_vp9_codec_summary_on">"VP9 코덱을 비활성화합니다.
-• 재생 문제가 없는 계정이거나 iOS 클라이언트만 AV1 코덱을 지원하고 나머지 클라이언트는 VP9 코덱까지만 지원하기 때문에 iOS만 4K 동영상까지 재생될 수 있고, 나머지는 1080p까지 재생될 수 있습니다.
-• AVC 코덱 동영상을 재생했을 경우에는 VP9보다 더 많은 데이터가 사용됩니다.
+• 재생 문제가 없는 계정이거나 iOS 클라이언트는 AV1 코덱까지 지원되기 때문에 2160p까지 재생될 수 있고, 나머지 클라이언트는 VP9 코덱까지만 지원되기 때문에 1080p까지 재생될 수 있습니다.
+• AVC 코덱 동영상을 재생했을 경우에는 VP9보다 더 많은 데이터가 사용되오니 주의하세요.
 • HDR 동영상을 재생하기 위해 HDR 동영상에서는 VP9 또는 AV1 코덱이 사용됩니다."</string>
     <string name="revanced_disable_vp9_codec_summary_off">VP9 코덱을 활성화합니다.\n• 예전에 업로드된 동영상에서 일부 화질 값들이 제거되어 360p와 1080p(Premium 기능)만 선택할 수 있거나 화질 메뉴를 선택할 수 없을 수 있습니다.</string>
     <string name="revanced_replace_av1_codec_title">AV1 코덱 변경하기</string>
@@ -1478,7 +1488,8 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <string name="revanced_ryd_shorts_summary_on">Shorts에서 싫어요 수를 표시합니다.</string>
     <string name="revanced_ryd_shorts_summary_on_disclaimer">"Shorts에서 싫어요 수를 표시합니다.
 
-알려진 문제점: 사용자가 로그인을 하지 않았거나 시크릿 모드에서는 싫어요 수가 표시되지 않을 수 있습니다."</string>
+알려진 문제점:
+• 사용자가 로그인을 하지 않았거나 시크릿 모드에서는 싫어요 수가 표시되지 않을 수 있습니다."</string>
     <string name="revanced_ryd_shorts_summary_off">Shorts에서 싫어요 수를 표시하지 않습니다.</string>
     <string name="revanced_ryd_dislike_percentage_title">싫어요 수를 퍼센트로 표시하기</string>
     <string name="revanced_ryd_dislike_percentage_summary_on">싫어요 수를 퍼센트로 표시합니다.</string>
@@ -1495,7 +1506,7 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."</string>
     <!-- PreferenceScreen: Return YouTube Dislike, PreferenceCategory: About -->
     <string name="revanced_ryd_about">정보</string>
     <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
-    <string name="revanced_ryd_attribution_summary">싫어요 수의 데이터는 Return YouTube Dislike API에 의해 제공됩니다. 자세한 내용을 보려면 여기를 누르세요.</string>
+    <string name="revanced_ryd_attribution_summary">싫어요 수의 데이터는 Return YouTube Dislike API에 의해 제공됩니다. 자세한 정보를 보려면 여기를 누르세요.</string>
     <string name="revanced_ryd_failure_connection_timeout">싫어요 수를 일시적으로 표시할 수 없습니다 (응답 시간 초과).</string>
     <string name="revanced_ryd_failure_connection_status_code">싫어요 수를 표시할 수 없습니다 (상태 코드: %d).</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">싫어요 수를 표시할 수 없습니다 (클라이언트 API 제한 도달).</string>
@@ -1706,7 +1717,7 @@ API Key를 발급받는 방법을 보려면 여기를 누르세요."</string>
     <!-- PreferenceScreen: SponsorBlock, PreferenceCategory: About -->
     <string name="revanced_sb_about">정보</string>
     <string name="revanced_sb_about_api">sponsor.ajay.app</string>
-    <string name="revanced_sb_about_api_sum">건너뛸 구간의 데이터는 SponsorBlock API에 의해 제공됩니다. 자세한 내용을 보려면 여기를 누르세요.</string>
+    <string name="revanced_sb_about_api_sum">건너뛸 구간의 데이터는 SponsorBlock API에 의해 제공됩니다. 자세한 정보를 보려면 여기를 누르세요.</string>
     <!-- PreferenceScreen: Miscellaneous -->
     <string name="revanced_preference_screen_misc_title">기타</string>
     <string name="revanced_enable_debug_logging_title">디버그 로깅 활성화하기</string>
@@ -1733,11 +1744,11 @@ API Key를 발급받는 방법을 보려면 여기를 누르세요."</string>
 
 앱을 실행하려면 이 과정이 필요합니다."</string>
     <string name="gms_core_dialog_open_website_text">웹사이트 열기</string>
-    <string name="gms_core_dialog_not_whitelisted_using_battery_optimizations_message">"GmsCore를 배터리 최적화 목록에서 제외하여 앱 문제를 방지할 수 있습니다.
+    <string name="gms_core_dialog_not_whitelisted_using_battery_optimizations_message">"GmsCore 앱 배터리 최적화를 비활성화(제한 없음)하여 앱 문제를 방지할 수 있습니다.
 
-GmsCore를 배터리 최적화 목록에서 제외하더라도, 배터리 사용량에 부정적인 영향을 미치지 않습니다.
+GmsCore 앱 배터리 최적화를 비활성화(제한 없음)하더라도, 배터리 사용량에 부정적인 영향을 미치지 않습니다.
 
-배터리 최적화 목록에서 제외하려면 '계속하기' 버튼을 누르세요."</string>
+앱 배터리 최적화를 비활성화(제한 없음)하려면 '계속하기' 버튼을 누르세요."</string>
     <string name="gms_core_dialog_continue_text">계속하기</string>
     <string name="revanced_sanitize_sharing_links_title">추적 쿼리를 제거한 링크 공유하기</string>
     <string name="revanced_sanitize_sharing_links_summary">링크를 공유할 때, URL에서 추적 쿼리 매개변수를 제거합니다. (URL의 뒷부분 \'?si=...\' 이 제거됨.)</string>
@@ -1778,24 +1789,47 @@ GmsCore를 배터리 최적화 목록에서 제외하더라도, 배터리 사용
     <string name="revanced_spoof_streaming_data_summary_off">"스트리밍 데이터를 변경하지 않습니다.\n동영상 재생 문제가 발생할 수 있습니다."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">이 설정을 비활성화하면 동영상 재생 문제가 발생할 수 있습니다.</string>
     <string name="revanced_spoof_streaming_data_type_title">기본 클라이언트</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(로그인이 요구됨)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(PoToken이 요구됨)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(로그인이 요구됨)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">알려진 문제점</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• 아직 발견되지 않았습니다.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• 영화 또는 회원 전용 동영상과 같은 유료 동영상이 재생되지 않을 수 있습니다.</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• 오디오 트랙 메뉴가 표시되지 않습니다.
 • 안정적인 볼륨을 사용할 수 없습니다.
-• 자동 오디오 트랙을 비활성화할 수 없습니다."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Android 클라이언트만 사용하기</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Android 클라이언트를 스트리밍 데이터를 가져오는 데 사용합니다.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Android 와 iOS 클라이언트를 스트리밍 데이터를 가져오는 데 사용합니다.</string>
+• 자동 오디오 트랙을 비활성화할 수 없습니다.
+• 사용자가 로그인을 하지 않았거나 시크릿 모드에서는 Kids 동영상이 재생되지 않을 수 있습니다.
+• VR은 Kids // TV는 재생목록과 음악 동영상에서 다른 클라이언트가 사용될 수 있습니다.
+• TV는 AV1 코덱이 지원되지 않습니다."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• 재생 문제가 발생할 수 있습니다 (PoToken이 요구됨).\n• 영화, 유료, 비공개 그리고 연령 제한 동영상에서 다른 클라이언트가 사용될 수 있습니다.</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• 영화 또는 유료 동영상이 재생되지 않을 수 있습니다.
+• 안정적인 볼륨을 사용할 수 없습니다.
+• 사용자가 로그인을 하지 않았거나 시크릿 모드에서는 Kids 동영상이 재생되지 않을 수 있습니다.
+• 음악 동영상에서 다른 클라이언트가 사용될 수 있습니다.
+• AV1 코덱이 지원되지 않습니다."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">iOS AVC (H.264) 강제로 활성화하기</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">동영상 코덱을 AVC (H.264)로 강제로 활성화합니다.\n\n• 일부 VP9 코덱 동영상에서 제거되었던 화질 값이 표시될 수 있습니다.\n• 최대 화질 값이 1080p이므로, 초고화질 동영상을 재생할 수 없습니다.\n• HDR 동영상을 재생할 수 없습니다.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">동영상 코덱을 자동으로 결정합니다.\n\n• 예전에 업로드된 동영상을 재생했는데 VP9 코덱 응답을 받았을 경우, 일부 화질값이 제거되어 360p와 1080p(Premium 기능)만 선택가능할 수 있거나 화질 메뉴를 선택불가능할 수 있습니다.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"이 설정를 활성화하면 배터리 수명이 향상되고, 동영상 재생 끊김 문제가 해결될 수 있습니다.
+
+AVC의 최대 화질 값은 1080p이고, OPUS 코덱을 사용불가 및 HDR 동영상을 재생할 수 없으며, 동영상을 재생했을 경우에는 VP9 또는 AV1보다 더 많은 모바일 데이터를 사용되오니 주의하세요."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">전문 통계에서 표시하기</string>
-    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">\'스트리밍 데이터를 가져오는 데 사용되는 클라이언트\'가 전문 통계에서 표시됩니다.</string>
-    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">\'스트리밍 데이터를 가져오는 데 사용되는 클라이언트\'가 전문 통계에서 숨겨집니다.</string>
+    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">\'스트리밍 데이터를 가져오는 데 사용되는 클라이언트\'가 전문 통계에서 표시됩니다.\n\n• 만약 선택한 기본 클라이언트가 재생할 수 없는 동영상을 재생하려하거나 클라이언트 재생 문제가 발생하면, 그 문제를 해결하기 위해 다른 클라이언트가 사용되는 경우도 있기 때문에 전문 통계에서 다르게 표시될 수 있습니다.</string>
+    <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">\'스트리밍 데이터를 가져오는 데 사용되는 클라이언트\'가 전문 통계에서 숨겨집니다.\n\n• 만약 선택한 기본 클라이언트가 재생할 수 없는 동영상을 재생하려하거나 클라이언트 재생 문제가 발생하면, 그 문제를 해결하기 위해 다른 클라이언트가 사용되는 경우도 있기 때문에 전문 통계에서 다르게 표시될 수 있습니다.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">사용할 PoToken</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">\'신뢰할 수 있는 브라우저에서 BotGuard로 발행한 PoToken\'을 사용할 수 있습니다.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">사용할 VisitorData</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">\'신뢰할 수 있는 브라우저에서 BotGuard로 발행한 VisitorData\'를 사용할 수 있습니다.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">PoToken / VisitorData에 대한 정보</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"일부 클라이언트는 유효한 스트리밍 데이터 응답을 받기 위해 PoToken과 VisitorData가 필요합니다.
+
+iOS를 기본 클라이언트로 사용하려는 경우에 이 값이 필요할 수 있습니다.
+
+자세한 정보를 보려면 여기를 누르세요."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">시청 기록</string>
     <string name="revanced_preference_screen_watch_history_summary">시청 기록과 관련된 설정을 변경할 수 있습니다.</string>
diff --git a/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml b/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml
index 18f67e6a6..71413f0f1 100644
--- a/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml
+++ b/patches/src/main/resources/youtube/translations/pl-rPL/strings.xml
@@ -291,6 +291,7 @@ Jeśli układ ekranu odtwarzacza zmieni się w skutek zmian po stronie serwera,
     <string name="revanced_preference_screen_general_title">Ogólne</string>
     <string name="revanced_change_start_page_title">Strona startowa</string>
     <string name="revanced_change_start_page_entry_browse">Przeglądaj kanały</string>
+    <string name="revanced_change_start_page_entry_courses">Nauka</string>
     <string name="revanced_change_start_page_entry_default">Domyślna</string>
     <string name="revanced_change_start_page_entry_explore">Odkrywanie</string>
     <string name="revanced_change_start_page_entry_gaming">Gry</string>
@@ -300,12 +301,14 @@ Jeśli układ ekranu odtwarzacza zmieni się w skutek zmian po stronie serwera,
     <string name="revanced_change_start_page_entry_live">Na żywo</string>
     <string name="revanced_change_start_page_entry_movies">Filmy</string>
     <string name="revanced_change_start_page_entry_music">Muzyka</string>
+    <string name="revanced_change_start_page_entry_notifications">Powiadomienia</string>
     <string name="revanced_change_start_page_entry_search">Wyszukiwanie</string>
     <string name="revanced_change_start_page_entry_shorts">Shortsy</string>
     <string name="revanced_change_start_page_entry_sports">Sport</string>
     <string name="revanced_change_start_page_entry_subscriptions">Subskrypcje</string>
     <string name="revanced_change_start_page_entry_trending">Na czasie</string>
     <string name="revanced_change_start_page_entry_watch_later">Do obejrzenia</string>
+    <string name="revanced_change_start_page_entry_your_clips">Twoje klipy</string>
     <string name="revanced_change_start_page_type_title">Działanie zmieniania strony głównej</string>
     <string name="revanced_change_start_page_type_summary_on">"Strona główna zawsze się zmienia
 
@@ -494,12 +497,9 @@ Notka: włączenie tej opcji wymusza ukrywanie reklam w filmach."</string>
 Dodatkowo, reklamy nie będą już blokowane w Shortsach.
 
 Jeśli opcja nie przynosi skutku, spróbuj przełączyć się na tryb incognito."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Półprzezroczystość paska nawigacji na jasnym motywie</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Wyłączona</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Włączona</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Półprzezroczystość paska nawigacji na ciemnym motywie</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Wyłączona</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Włączona</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Wygląd paska nawigacji</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">Półprzezroczysty</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">Nieprzezroczysty</string>
     <string name="revanced_hide_navigation_bar_title">Pasek nawigacji</string>
     <string name="revanced_hide_navigation_bar_summary_on">Ukryty</string>
     <string name="revanced_hide_navigation_bar_summary_off">Widoczny</string>
@@ -859,6 +859,16 @@ Autoodtwarzanie można zmienić w ustawieniach YouTube:
     <string name="revanced_disable_engagement_panel_title">Panel zaangażowania</string>
     <string name="revanced_disable_engagement_panel_summary_on">Ukryty</string>
     <string name="revanced_disable_engagement_panel_summary_off">Widoczny</string>
+    <string name="revanced_enter_fullscreen_title">Pełny ekran po rozpoczęciu filmu</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Włączony
+
+Ograniczenie: nie działa jeśli odtwarzacz jest zminimalizowany, w trybie PiP lub w tle."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Wyłączony</string>
+    <string name="revanced_exit_fullscreen_title">Wyjście z pełnego ekranu po zakończeniu filmu</string>
+    <string name="revanced_exit_fullscreen_entry_1">Wyłączone</string>
+    <string name="revanced_exit_fullscreen_entry_2">Tryb pionowy</string>
+    <string name="revanced_exit_fullscreen_entry_3">Tryb poziomy</string>
+    <string name="revanced_exit_fullscreen_entry_4">Tryb pionowy i poziomy</string>
     <string name="revanced_show_video_title_section_title">Tytuły filmów</string>
     <string name="revanced_show_video_title_section_summary">"Tytuły filmów w trybie pełnoekranowym są widoczne.
 
@@ -914,11 +924,6 @@ Ograniczenie: tytuły filmów znikają po stuknięciu w nie."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Przyciski w odtwarzaczu bliżej środka</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Przyciski w odtwarzaczu nie zajmują całego ekranu</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Przyciski w odtwarzaczu zajmują cały ekran</string>
-    <string name="revanced_force_fullscreen_title">Wymuś tryb pełnoekranowy</string>
-    <string name="revanced_force_fullscreen_summary">"Filmy zostaną przełączone w tryb pełnoekranowy w następujących sytuacjach:
-
-• Po rozpoczęciu filmu
-• Po stuknięciu w czas filmu w komentarzach"</string>
     <string name="revanced_keep_landscape_mode_title">Zachowaj tryb poziomy</string>
     <string name="revanced_keep_landscape_mode_summary">Zachowuje tryb poziomy, gdy wyłączysz i włączysz ekran w trybie pełnoekranowym.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Limit czasu zachowania trybu poziomego</string>
@@ -1379,12 +1384,18 @@ Ograniczenia:
     <string name="revanced_disable_hdr_auto_brightness_title">Automatyczna jasność w filmach z HDR</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Wyłączona</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Włączona</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Pełny ekran gestem przesunięcia</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Wejście w tryb pełnoekranowy przesunięciem w dół poniżej odtwarzacza filmu jest wyłączone</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Wejście w tryb pełnoekranowy przesunięciem w dół poniżej odtwarzacza filmu jest włączone</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Gest zmiany filmu przesunięciem w górę lub dół </string>
     <string name="revanced_disable_swipe_to_switch_video_summary_on">Wyłączony</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_off">Włączony</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Gest wejścia w tryb pełnoekranowy przesunięciem pod odtwarzaczem</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Wyłączony</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Włączony</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Gest wejścia w tryb pełnoekranowy przesunięciem w odtwarzaczu</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Wyłączony</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Włączony</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Gest wyjścia z trybu pełnoekranowego przesunięciem</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Wyłączony</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Włączony</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Automatyczna</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Filmy</string>
@@ -1394,9 +1405,6 @@ Ograniczenia:
     <string name="revanced_disable_hdr_video_title">Filmy z HDR</string>
     <string name="revanced_disable_hdr_video_summary_on">Wyłączone</string>
     <string name="revanced_disable_hdr_video_summary_off">Włączone</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Domyślna prędkość odtwarzania podczas transmisji na żywo</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Wyłączona</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Włączona</string>
     <string name="revanced_enable_custom_playback_speed_title">Niestandardowa prędkość odtwarzania</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Włączona</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Wyłączona</string>
@@ -1421,10 +1429,11 @@ Ograniczenia:
     <string name="revanced_restore_old_video_quality_menu_summary_on">Widoczne</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Niewidoczne</string>
     <string name="revanced_disable_default_playback_speed_music_title">Domyślna prędkość odtwarzania dla muzyki</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"Wyłączona
-
-Ograniczenie: To ustawienie może nie działać dla filmów bez baneru 'Słuchaj w YouTube Music'."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">Wyłączona</string>
     <string name="revanced_disable_default_playback_speed_music_off">Włączona</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Sprawdzaj przy użyciu kategorii</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">Wyłączone dla filmów z kategorią muzyki</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">Wyłączone dla filmów odtwarzalnych w YouTube Music</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Domyślna prędkość odtwarzania w Shortsach</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Włączona</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Wyłączona</string>
@@ -1770,25 +1779,42 @@ Stuknij przycisk kontynuacji i zezwól na zmiany w optymalizacji."</string>
     <string name="revanced_spoof_streaming_data_summary_off">"Wyłączone. Odtwarzanie filmów może nie działać"</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Wyłączenie tej opcji może spowodować problemy z odtwarzaniem filmów.</string>
     <string name="revanced_spoof_streaming_data_type_title">Domyślny klient</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Kreator Androida</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Wymagane zalogowanie)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(Wymagany PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Wymagane zalogowanie)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Efekty uboczne oszukiwania</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Jeszcze nie znaleziono</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Filmy kinowe lub płatne filmy mogą się nie odtwarzać</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• Brakuje menu od ścieżki dźwiękowej
 • Stabilna głośność nie jest dostępna
-• Wyłączenie automatycznego wymuszania ścieżki dźwiękowej nie jest dostępne"</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Używaj wyłącznie klientów Androida</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Tak</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Nie</string>
-    <string name="revanced_spoof_streaming_data_android_only_user_dialog_message">Wyłączenie tego ustawienia może spowodować problemy z odtwarzaniem filmów.</string>
+• Automatyczne wymuszenie ścieżki dźwiękowej nie jest dostępne
+• Filmy dla dzieci mogą się nie odtwarzać będąc zalogowanym lub w trybie incognito"</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Mogą wystąpić problemy z odtwarzaniem (wymagany PoToken)</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Filmy kinowe lub płatne mogą się nie odtwarzać
+• Filmy dla dzieci mogą się nie odtwarzać będąc zalogowanym lub w trybie incognito"</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Wymuś kodek iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Wymuszony</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Określany automatycznie</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Włączenie tego może poprawić czas pracy baterii i naprawić zacinanie się odtwarzacza.
+
+AVC obsługuje maksymalnie rozdzielczość 1080p, kodek audio OPUS nie jest dostępny, a odtwarzanie wideo będzie zużywać więcej danych internetowych niż VP9 lub AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Informacja w statystykach dla nerdów</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Widoczna</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Ukryta</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken do użycia</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken wydany przez BotGuard w zaufanej przeglądarce.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData do użycia</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData wydany przez BotGuard w zaufanej przeglądarce.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">O PoTokenie / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Niektóre klienty wymagają PoTokena lub VisitorData, by otrzymać prawidłową odpowiedź na strumień danych.
+
+Jeśli próbujesz użyć iOS jako domyślnego klienta, będziesz potrzebować tych wartości.
+
+Kliknij, by zobaczyć więcej informacji."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Historia oglądania</string>
     <string name="revanced_preference_screen_watch_history_summary">Zmień ustawienia związane z historią oglądania</string>
diff --git a/patches/src/main/resources/youtube/translations/pt-rBR/strings.xml b/patches/src/main/resources/youtube/translations/pt-rBR/strings.xml
index b7c30d974..ac0936b66 100644
--- a/patches/src/main/resources/youtube/translations/pt-rBR/strings.xml
+++ b/patches/src/main/resources/youtube/translations/pt-rBR/strings.xml
@@ -291,6 +291,7 @@ Se o layout da tela do reprodutor mudar devido a alterações no lado do servido
     <string name="revanced_preference_screen_general_title">Geral</string>
     <string name="revanced_change_start_page_title">Alterar a página inicial</string>
     <string name="revanced_change_start_page_entry_browse">Explorar canais</string>
+    <string name="revanced_change_start_page_entry_courses">Cursos / Aprendizagem</string>
     <string name="revanced_change_start_page_entry_default">Padrão</string>
     <string name="revanced_change_start_page_entry_explore">Explorar</string>
     <string name="revanced_change_start_page_entry_gaming">Jogos</string>
@@ -300,12 +301,14 @@ Se o layout da tela do reprodutor mudar devido a alterações no lado do servido
     <string name="revanced_change_start_page_entry_live">Ao Vivo</string>
     <string name="revanced_change_start_page_entry_movies">Filmes</string>
     <string name="revanced_change_start_page_entry_music">Música</string>
+    <string name="revanced_change_start_page_entry_notifications">Notificações</string>
     <string name="revanced_change_start_page_entry_search">Buscar</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Esportes</string>
     <string name="revanced_change_start_page_entry_subscriptions">Inscrições</string>
     <string name="revanced_change_start_page_entry_trending">Em alta</string>
     <string name="revanced_change_start_page_entry_watch_later">Assistir mais tarde</string>
+    <string name="revanced_change_start_page_entry_your_clips">Seus clipes</string>
     <string name="revanced_change_start_page_type_title">Alterar tipo de página inicial</string>
     <string name="revanced_change_start_page_type_summary_on">"Página inicial sempre muda.
 
@@ -495,12 +498,9 @@ Nota: Ativar isso também oculta anúncios de vídeo à força."</string>
 Além disso, os anúncios não serão mais bloqueados no Shorts.
 
 Se essa configuração não surtir efeito, tente alternar para o modo anônimo."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Desativar barra transparente no modo claro</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">A barra de navegação no modo claro está opaca.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">A barra de navegação no modo claro está opaca ou transparente.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Desativar barra transparente no modo escuro</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">A barra de navegação no modo escuro está opaca.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">A barra de navegação no modo escuro está opaca ou transparente.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Ativar barra de navegação transparente</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">A barra de navegação está transparente.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">A barra de navegação está opaca.</string>
     <string name="revanced_hide_navigation_bar_title">Ocultar barra de navegação</string>
     <string name="revanced_hide_navigation_bar_summary_on">A barra de navegação está oculta.</string>
     <string name="revanced_hide_navigation_bar_summary_off">A barra de navegação será exibida.</string>
@@ -860,6 +860,16 @@ A reprodução automática pode ser alterada nas configurações do YouTube:
     <string name="revanced_disable_engagement_panel_title">Desativar painel de engajamento</string>
     <string name="revanced_disable_engagement_panel_summary_on">O painel de engajamento está desativado.</string>
     <string name="revanced_disable_engagement_panel_summary_off">O painel de engajamento está ativado.</string>
+    <string name="revanced_enter_fullscreen_title">Entrar no modo de tela cheia quando o vídeo iniciar</string>
+    <string name="revanced_enter_fullscreen_summary_on">"\"Entre no modo tela cheia quando o vídeo é iniciado.
+
+Limitação: não funciona se o reprodutor estiver minimizado, no modo PiP ou em segundo plano."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Não entre em modo de tela cheia quando o vídeo iniciar.</string>
+    <string name="revanced_exit_fullscreen_title">Sair do modo de tela cheia ao final do vídeo</string>
+    <string name="revanced_exit_fullscreen_entry_1">Desativado</string>
+    <string name="revanced_exit_fullscreen_entry_2">Retrato</string>
+    <string name="revanced_exit_fullscreen_entry_3">Paisagem</string>
+    <string name="revanced_exit_fullscreen_entry_4">Retrato e paisagem</string>
     <string name="revanced_show_video_title_section_title">Exibir seção de título do vídeo</string>
     <string name="revanced_show_video_title_section_summary">"Exibe a seção de título do vídeo em tela cheia.
 
@@ -915,11 +925,6 @@ Limitação: Título do vídeo desaparece quando clicado."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Ativar sobreposição de controles compactos</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">A sobreposição de controles não preenche a tela inteira.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">A sobreposição de controles preenche a tela inteira.</string>
-    <string name="revanced_force_fullscreen_title">Forçar tela cheia</string>
-    <string name="revanced_force_fullscreen_summary">"O vídeo será alternado para tela cheia nas seguintes situações:
-
-• Quando uma marcação de tempo nos comentários é clicada.
-• Quando um vídeo é iniciado."</string>
     <string name="revanced_keep_landscape_mode_title">Manter o modo paisagem</string>
     <string name="revanced_keep_landscape_mode_summary">Mantenha o modo paisagem ao desligar e ligar em tela cheia.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Tempo limite para manter o modo paisagem</string>
@@ -1381,12 +1386,18 @@ Sem margens na parte superior e inferior do reprodutor."</string>
     <string name="revanced_disable_hdr_auto_brightness_title">Desativar brilho automático HDR</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">O brilho automático HDR está desativado.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">O brilho automático HDR está ativado.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Desativar gestos do painel de observação</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Entrar em tela cheia ao deslizar para baixo no reprodutor de vídeo está desativado.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Entrar em tela cheia ao deslizar para baixo no reprodutor de vídeo está ativado.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Desativar deslizar para alterar o vídeo</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_on">Deslizar para cima / baixo não reproduzirá o vídeo seguinte / anterior.</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_off">Deslizar para cima / baixo reproduzirá o vídeo seguinte / anterior.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Desativar deslizar para entrar no modo de tela cheia (abaixo do reprodutor)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Deslizar para baixo no reprodutor não entrará no modo de tela cheia.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Deslizar para baixo no reprodutor entrará no modo de tela cheia.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Desativar deslizar para entrar no modo de tela cheia (no reprodutor)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Deslizar para cima no reprodutor não entrará no modo de tela cheia.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Deslizar para cima no reprodutor entrará no modo de tela cheia.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Desativar deslizar para sair do modo tela cheia</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Deslizar para baixo na tela cheia não sairá do modo de tela cheia.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Deslizar para baixo na tela cheia sairá do modo de tela cheia.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Automático</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Vídeo</string>
@@ -1396,9 +1407,6 @@ Sem margens na parte superior e inferior do reprodutor."</string>
     <string name="revanced_disable_hdr_video_title">Desativar vídeo HDR</string>
     <string name="revanced_disable_hdr_video_summary_on">O vídeo HDR está desativado.</string>
     <string name="revanced_disable_hdr_video_summary_off">O vídeo HDR está ativado.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Desativar a velocidade de reprodução na transmissão ao vivo</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">A velocidade de reprodução padrão está desativada na transmissão ao vivo.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">A velocidade de reprodução padrão está ativada na transmissão ao vivo.</string>
     <string name="revanced_enable_custom_playback_speed_title">Ativar velocidade de reprodução personalizada</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">A velocidade de reprodução personalizada está ativada.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">A velocidade de reprodução personalizada está desativada.</string>
@@ -1423,10 +1431,11 @@ Sem margens na parte superior e inferior do reprodutor."</string>
     <string name="revanced_restore_old_video_quality_menu_summary_on">O menu antigo de qualidade de vídeo está sendo exibido.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">O menu antigo de qualidade de vídeo não está sendo exibido.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Desativar a velocidade de reprodução para música</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"A velocidade de reprodução padrão é desabilitada para música.
-
-Limitação: esta configuração pode não se aplicar a vídeos que não incluem o banner 'Ouvir no YouTube Music'."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">A velocidade de reprodução padrão está desativada para música.</string>
     <string name="revanced_disable_default_playback_speed_music_off">A velocidade de reprodução padrão está ativada para música.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Validar usando categorias</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">A velocidade de reprodução padrão está desativada se a categoria de vídeo for Música.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">A velocidade padrão de reprodução está desativada para vídeos reproduzíveis no YouTube.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Ativar velocidade de reprodução padrão no Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">A velocidade de reprodução padrão se aplica ao Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">A velocidade de reprodução padrão não se aplica ao Shorts.</string>
@@ -1769,15 +1778,42 @@ Toque no botão continuar e desative as otimizações da bateria."</string>
     <string name="revanced_spoof_streaming_data_summary_off">"Os dados de streaming não são falsificados. A reprodução de vídeo pode não funcionar."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Desativar esta configuração pode causar problemas de reprodução de vídeo.</string>
     <string name="revanced_spoof_streaming_data_type_title">Cliente padrão</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(é necessário logar)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(requer PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(é necessário logar)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Efeitos colaterais da falsificação</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Ainda não encontrado.</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android">"• O menu de faixa de áudio está faltando.
+• Volume estável não está disponível.
+• Desativar faixas de áudio automático forçadas não estão disponíveis.
+• Os vídeos para crianças podem não reproduzir quando desconectado ou em modo incógnito."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Pode haver problemas de reprodução (PoToken necessário).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Filmes ou vídeos pagos podem não reproduzir.
+• Os vídeos para crianças podem não ser reproduzidos quando desconectado ou em modo incógnito."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Forçar iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">O codec de vídeo é forçado para AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">O codec de vídeo é determinado automaticamente.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Ativar isso pode melhorar a duração da bateria e corrigir travamentos na reprodução.
+
+O AVC tem uma resolução máxima de 1080p, o codec de áudio Opus não está disponível e a reprodução de vídeo usará mais dados da internet do que VP9 ou AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Exibir em Estatísticas para nerds</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">O cliente usado para buscar dados de streaming é mostrado em Estatísticas para nerds.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">O cliente usado para buscar dados de streaming está oculto em Estatísticas para nerds.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken a ser utilizado</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken emitido pelo BotGuard em um navegador confiável.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">Dados de visitante a ser utilizado</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">Dados de visitante emitido pelo BotGuard em um navegador confiável.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">Sobre o PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Alguns clientes exigem PoToken e VisitorData para obter uma resposta de dados de streaming válida.
+
+Se você estiver tentando usar o iOS como cliente padrão, pode precisar desses valores.
+
+Clique para ver mais informações."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Histórico de exibição</string>
     <string name="revanced_preference_screen_watch_history_summary">Altere as configurações relacionadas ao histórico de exibição.</string>
diff --git a/patches/src/main/resources/youtube/translations/ru-rRU/strings.xml b/patches/src/main/resources/youtube/translations/ru-rRU/strings.xml
index 5b11bf3ed..6649a1390 100644
--- a/patches/src/main/resources/youtube/translations/ru-rRU/strings.xml
+++ b/patches/src/main/resources/youtube/translations/ru-rRU/strings.xml
@@ -304,6 +304,7 @@ Shorts
     <string name="revanced_preference_screen_general_title">Основные настройки</string>
     <string name="revanced_change_start_page_title">Начальная страница</string>
     <string name="revanced_change_start_page_entry_browse">Обзор каналов</string>
+    <string name="revanced_change_start_page_entry_courses">Курсы / Обучение</string>
     <string name="revanced_change_start_page_entry_default">По умолчанию</string>
     <string name="revanced_change_start_page_entry_explore">Навигатор</string>
     <string name="revanced_change_start_page_entry_gaming">Игры</string>
@@ -313,12 +314,14 @@ Shorts
     <string name="revanced_change_start_page_entry_live">Трансляции</string>
     <string name="revanced_change_start_page_entry_movies">Фильмы</string>
     <string name="revanced_change_start_page_entry_music">Музыка</string>
+    <string name="revanced_change_start_page_entry_notifications">Уведомления</string>
     <string name="revanced_change_start_page_entry_search">Поиск</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Спорт</string>
     <string name="revanced_change_start_page_entry_subscriptions">Подписки</string>
     <string name="revanced_change_start_page_entry_trending">В тренде</string>
     <string name="revanced_change_start_page_entry_watch_later">Смотреть позже</string>
+    <string name="revanced_change_start_page_entry_your_clips">Ваши клипы</string>
     <string name="revanced_change_start_page_type_title">Тип начальной страницы</string>
     <string name="revanced_change_start_page_type_summary_on">"Начальная страница постоянно изменяется.
 Ограничение: Кнопка возврат может не работать."</string>
@@ -332,9 +335,9 @@ Shorts
     <string name="revanced_disable_splash_animation_title">Анимированная заставка</string>
     <string name="revanced_disable_splash_animation_summary_on">Анимированная заставка отключена.</string>
     <string name="revanced_disable_splash_animation_summary_off">Анимированная заставка включена.</string>
-    <string name="revanced_disable_translucent_status_bar_title">Полупрозрачная строка состояния</string>
-    <string name="revanced_disable_translucent_status_bar_summary_on">Отключена.</string>
-    <string name="revanced_disable_translucent_status_bar_summary_off">Включена.</string>
+    <string name="revanced_disable_translucent_status_bar_title">Полупрозрачность строки состояния</string>
+    <string name="revanced_disable_translucent_status_bar_summary_on">Полупрозрачность включена.</string>
+    <string name="revanced_disable_translucent_status_bar_summary_off">Полупрозрачность отключена.</string>
     <string name="revanced_enable_gradient_loading_screen_title">Переливающийся экран загрузки</string>
     <string name="revanced_enable_gradient_loading_screen_summary_on">Переливающийся экран загрузки включен.</string>
     <string name="revanced_enable_gradient_loading_screen_summary_off">Переливающийся экран загрузки отключен.</string>
@@ -507,12 +510,9 @@ Shorts
 Кроме того, реклама больше не будет блокироваться в Shorts.
 
 Если эта настройка не вступила в силу, попробуйте перейти в режим инкогнито."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Светлая полупрозрачная панель навигации</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Отключена.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Включена.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Темная полупрозрачная панель навигации</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Отключена.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Включена.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Полупрозрачность панели навигации</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">Полупрозрачность включена.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">Полупрозрачность отключена.</string>
     <string name="revanced_hide_navigation_bar_title">Панель навигации</string>
     <string name="revanced_hide_navigation_bar_summary_on">Панель навигации скрыта.</string>
     <string name="revanced_hide_navigation_bar_summary_off">Панель навигации отображена.</string>
@@ -871,6 +871,19 @@ Shorts
     <string name="revanced_disable_engagement_panel_title">Панель взаимодействия</string>
     <string name="revanced_disable_engagement_panel_summary_on">Панель взаимодействия отключена.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Панель взаимодействия включена.</string>
+    <string name="revanced_enter_fullscreen_title">Полноэкранный режим при запуске видео</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Полноэкранный режим при запуске видео включен.
+
+Не работает когда:
+- плеер свернут
+- картинка в картинке (PiP)
+- фоновый режим."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Полноэкранный режим при запуске видео отключен.</string>
+    <string name="revanced_exit_fullscreen_title">Полноэкранный режим в конце видео</string>
+    <string name="revanced_exit_fullscreen_entry_1">Отключено</string>
+    <string name="revanced_exit_fullscreen_entry_2">Портретный вид</string>
+    <string name="revanced_exit_fullscreen_entry_3">Альбомный вид</string>
+    <string name="revanced_exit_fullscreen_entry_4">Авто поворот</string>
     <string name="revanced_show_video_title_section_title">Секция заголовка видео</string>
     <string name="revanced_show_video_title_section_summary">"Показывает секцию заголовка видео в полноэкранном режиме.
 
@@ -926,11 +939,6 @@ Shorts
     <string name="revanced_enable_compact_controls_overlay_title">Компактные элементы управления</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Наложение элементов управления не полноэкранное.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Наложение элементов управления полноэкранное.</string>
-    <string name="revanced_force_fullscreen_title">Принудительный полноэкранный режим</string>
-    <string name="revanced_force_fullscreen_summary">"Видео будут переведены в полноэкранный режим при:
-
-• Нажатии на временную метку в комментариях.
-• Запуске видео."</string>
     <string name="revanced_keep_landscape_mode_title">Удерживать альбомный режим</string>
     <string name="revanced_keep_landscape_mode_summary">Удерживает альбомный режим в полноэкранном режиме.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Сохранять таймаут альбомного режима</string>
@@ -1401,12 +1409,18 @@ Shorts
     <string name="revanced_disable_hdr_auto_brightness_title">Автояркость HDR</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Автояркость HDR отключена.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Автояркость HDR включена.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Жесты панели просмотра</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Полноэкранный режим жестом вниз отключен.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Полноэкранный режим жестом вниз включен.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Переключение видео жестом</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_on">Переключение видео жестами отключены.</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_off">Переключение видео жестами включены.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Жест полноэкранного режима (под плеером)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Жест под плеером отключен.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Жест под плеером включен.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Жест полноэкранного режима (в плеере)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Жест в плеере отключен.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Жест в плеере включен.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Жест выхода из полноэкранного режима</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Жест выхода из режима отключен.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Жест выхода из режима включен.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Авто</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Видео</string>
@@ -1416,9 +1430,6 @@ Shorts
     <string name="revanced_disable_hdr_video_title">HDR видео</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR видео отключены.</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR видео включены.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Скорость в прямых трансляциях</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Скорость воспроизведения в трансляциях отключена.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Скорость воспроизведения в трансляциях включена.</string>
     <string name="revanced_enable_custom_playback_speed_title">Пользовательская скорость воспроизведения</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Пользовательская скорость воспроизведения включена.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Пользовательская скорость воспроизведения отключена.</string>
@@ -1443,11 +1454,11 @@ Shorts
     <string name="revanced_restore_old_video_quality_menu_summary_on">Старое меню качества отображено.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Старое меню качества скрыто.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Скорость воспроизведения для музыки</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"Скорость воспроизведения по умолчанию для музыки отключена.
-
-Ограничение:
-Этот параметр не может применяться к видео, которые не содержат баннер 'Слушать в YouTube Music'."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">Скорость по умолчанию для категории YouTube Музыка включена.</string>
     <string name="revanced_disable_default_playback_speed_music_off">Скорость воспроизведения по умолчанию для музыки включена.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Выбирать скорость ориентируясь на категории</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">Скорость по умолчанию для категории YouTube Музыка отключена.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">Скорость по умолчанию для категории YouTube Музыка включена.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Скорость воспроизведения по умолчанию в Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Скорость воспроизведения по умолчанию в Shorts включена.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Скорость воспроизведения по умолчанию в Shorts отключена.</string>
@@ -1793,24 +1804,44 @@ Shorts
 Воспроизведение видео может не работать."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Отключение этой настройки вызовет проблемы с воспроизведением видео.</string>
     <string name="revanced_spoof_streaming_data_type_title">Клиент по умолчанию</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">Музыка iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Редактор Android</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Требуется вход)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(Необходим PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS
+<small>(Необходим вход)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Эффекты от подмены</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Еще не найдено.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Платные видео и фильмы могут не проигрываться.</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• Меню аудио дорожки отсутствует.
 • Стабильная громкость недоступна.
-• Отключить принудительные автозвуковые дорожки недоступна."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Использовать только клиенты Android</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Android клиенты используются для получения потоковых данных.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Android и iOS клиенты используются для получения потоковых данных.</string>
+• Отключить принудительные авто звуковые дорожки недоступна.
+• Детские видео не могут воспроизводиться в режиме инкогнито или выхода."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Возможно проблемы (требуется PoToken).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Фильмы или платные видео могут не воспроизводиться.
+• Детские видео могут не воспроизводиться при выходе из системы или в режиме инкогнито."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Принудительно iOS, AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Принудительное использование AVC (H.264) включено.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Принудительное использование AVC (H.264) отключено.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Включение может:
+- улучшить время автономной работы
+- устранить прерывания при воспроизведении.
+
+Максимальное разрешение видео AVC составляет 1080p. Кодек Opus недоступен. Потребление интернет трафика будет больше, чем при VP9 или AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Статистике для сисадминов</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Клиент потоковых данных отображается в Статистике для сисадминов.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Клиент потоковых данных скрыт в Статистике для сисадминов.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken выпущен с BotGuard в доверенном браузере.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData выданный с BotGuard в надежном браузере.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">О PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Некоторые клиенты требуют PoToken и VisitorData для получения правильного потокового ответа данных.
+
+При использовании iOS клиента по умолчанию, эти значения могут потребоваться.
+
+Нажмите, чтобы увидеть дополнительную информацию."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">История просмотра</string>
     <string name="revanced_preference_screen_watch_history_summary">Изменить настройки истории просмотра.</string>
diff --git a/patches/src/main/resources/youtube/translations/tr-rTR/strings.xml b/patches/src/main/resources/youtube/translations/tr-rTR/strings.xml
index 70b5e91e9..f8fe9ad57 100644
--- a/patches/src/main/resources/youtube/translations/tr-rTR/strings.xml
+++ b/patches/src/main/resources/youtube/translations/tr-rTR/strings.xml
@@ -834,11 +834,6 @@ Sınırlama: Tıklandığında video başlığı kayboluyor."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Tam ekranda sıkışık oynatıcıyı etkinleştir</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Tam ekran videoda sıkışık oynatıcı etkin.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Tam ekran videoda sıkışık oynatıcı etkin değil</string>
-    <string name="revanced_force_fullscreen_title">Tam ekrana zorla</string>
-    <string name="revanced_force_fullscreen_summary">"Aşağıdaki durumlarda video tam ekrana geçecektir:
-
-• Yorumlardaki zaman damgasına tıklandığında.
-• Video başladığında."</string>
     <string name="revanced_keep_landscape_mode_title">Manzara modunu tut</string>
     <string name="revanced_keep_landscape_mode_summary">Ekranı tam ekranda kapatıp açarken yatay modu korur.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Manzara modunu tutma zaman aşımı</string>
@@ -1186,9 +1181,6 @@ Bilinen sorunlar:
     <string name="revanced_disable_hdr_video_title">HDR\'lı videolarda, HDR\'ı devre dışı bırak</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR devre dışı</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR etkin</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Canlı yayınlarda varsayılan oynatma hızını devre dışı bırak</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Canlı yayınlarda varsayılan oynatma hızı devre dışı</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Canlı yayınlarda varsayılan oynatma hızı etkin</string>
     <string name="revanced_enable_custom_playback_speed_title">Özel oynatma hızlarını etkinleştir</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Özel oynatma hızları etkin</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Özel oynatma hızları kapalı</string>
@@ -1507,6 +1499,7 @@ Devam düğmesine dokunun ve pil optimizasyonlarını devre dışı bırakın."<
     <string name="revanced_extended_settings_reset">Sıfırla</string>
     <string name="revanced_share_copy_settings_success">Ayarlar panoya kopyalandı</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data -->
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">İzleme geçmişi</string>
     <string name="revanced_preference_screen_watch_history_summary">İzlemek geçmişi ile alakalı ayarları değiştirir.</string>
diff --git a/patches/src/main/resources/youtube/translations/uk-rUA/strings.xml b/patches/src/main/resources/youtube/translations/uk-rUA/strings.xml
index ce1410442..8925f43dd 100644
--- a/patches/src/main/resources/youtube/translations/uk-rUA/strings.xml
+++ b/patches/src/main/resources/youtube/translations/uk-rUA/strings.xml
@@ -291,6 +291,7 @@
     <string name="revanced_preference_screen_general_title">Загальне</string>
     <string name="revanced_change_start_page_title">Змінити початкову сторінку</string>
     <string name="revanced_change_start_page_entry_browse">Перегляд каналів</string>
+    <string name="revanced_change_start_page_entry_courses">Навчання</string>
     <string name="revanced_change_start_page_entry_default">Стандартна</string>
     <string name="revanced_change_start_page_entry_explore">Що нового</string>
     <string name="revanced_change_start_page_entry_gaming">Ігри</string>
@@ -300,12 +301,14 @@
     <string name="revanced_change_start_page_entry_live">Наживо</string>
     <string name="revanced_change_start_page_entry_movies">Фільми</string>
     <string name="revanced_change_start_page_entry_music">Музика</string>
+    <string name="revanced_change_start_page_entry_notifications">Сповіщення</string>
     <string name="revanced_change_start_page_entry_search">Пошук</string>
     <string name="revanced_change_start_page_entry_shorts">YouTube Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Спорт</string>
     <string name="revanced_change_start_page_entry_subscriptions">Підписки</string>
     <string name="revanced_change_start_page_entry_trending">Тенденції</string>
     <string name="revanced_change_start_page_entry_watch_later">Переглянути пізніше</string>
+    <string name="revanced_change_start_page_entry_your_clips">Ваші кліпи</string>
     <string name="revanced_change_start_page_type_title">Тип зміни початкової сторінки</string>
     <string name="revanced_change_start_page_type_summary_on">"Початкова сторінка змінюється завжди.
 
@@ -495,12 +498,9 @@
 А також, рекламу більше не блокуватиметься в Shorts.
 
 Якщо це налаштування не діє, спробуйте перемкнути Анонімний режим."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Вимкнути напівпрозорість світлої панелі</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Панель навігації у світлому режимі непрозора.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Панель навігації у світлому режимі непрозора чи напівпрозора.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Вимкнути напівпрозорість темної панелі</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Панель навігації у темному режимі непрозора.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Панель навігації у темному режимі непрозора чи напівпрозора.</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Увімкнути напівпрозорість панелі навігації</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">Панель навігації напівпрозора.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">Панель навігації непрозора.</string>
     <string name="revanced_hide_navigation_bar_title">Приховати панель навігації</string>
     <string name="revanced_hide_navigation_bar_summary_on">Панель навігації приховано.</string>
     <string name="revanced_hide_navigation_bar_summary_off">Панель навігації показується.</string>
@@ -860,6 +860,16 @@
     <string name="revanced_disable_engagement_panel_title">Вимкнути панель залучення</string>
     <string name="revanced_disable_engagement_panel_summary_on">Панель залучення вимкнено.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Панель залучення увімкнено.</string>
+    <string name="revanced_enter_fullscreen_title">Переходити у повноекранний режим при запуску відео</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Переходиться у повноекранний режим при запуску відео.
+
+Застереження: Не працюватиме якщо плеєр мінімізовано, у режимі PiP, чи у фоні."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Не переходиться у повноекранний режим при запуску відео.</string>
+    <string name="revanced_exit_fullscreen_title">Виходити з повноекранного режиму в кінці відео</string>
+    <string name="revanced_exit_fullscreen_entry_1">Вимкнено</string>
+    <string name="revanced_exit_fullscreen_entry_2">Портретна</string>
+    <string name="revanced_exit_fullscreen_entry_3">Ландшафтна</string>
+    <string name="revanced_exit_fullscreen_entry_4">Портретна та ландшафтна</string>
     <string name="revanced_show_video_title_section_title">Показувати секцію назви відео</string>
     <string name="revanced_show_video_title_section_summary">"Показується секцію назви відео в повноекранному режимі.
 
@@ -915,11 +925,6 @@
     <string name="revanced_enable_compact_controls_overlay_title">Увімкнути компактне керування</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Компактне керування не заповнює весь екран.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Компактне керування заповнює весь екран.</string>
-    <string name="revanced_force_fullscreen_title">Примусово на повний екран</string>
-    <string name="revanced_force_fullscreen_summary">"Відео перемикатиметься на повний екран в таких ситуаціях:
-
-• Натиснуто на мітку часу у коментарях.
-• Відео розпочалося."</string>
     <string name="revanced_keep_landscape_mode_title">Зберігати ландшафтний режим</string>
     <string name="revanced_keep_landscape_mode_summary">Зберігає ландшафтний режим під час вимкнення та ввімкнення екрана у повноекранному режимі.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Скільки зберігати ландшафтний режим</string>
@@ -1385,12 +1390,18 @@
     <string name="revanced_disable_hdr_auto_brightness_title">Вимкнути авто яскравість HDR</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Авто яскравість HDR вимкнено.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Авто яскравість HDR увімкнено.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Вимкнути жести панелі перегляду</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Перехід на повний екран при проведенні вниз під відеоплеєром вимкнено.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Перехід на повний екран при проведенні вниз під відеоплеєром увімкнено.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Вимкнути зміну відео проведенням</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">Проведення вгору / вниз не відтворюватиме наступне / попереднє відео.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">Проведення вгору / вниз відтворюватиме наступне / попереднє відео.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">Проведення вгору / вниз у повноекранному режимі не змінюватиме на наступне / попереднє відео.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">Проведення вгору / вниз у повноекранному режимі змінюватиме на наступне / попереднє відео.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Вимкнути проведення для переходу у повноекранний режим (знизу плеєра)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Проведенням униз не переходитиметься у повноекранний режим.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Проведенням униз переходитиметься у повноекранний режим.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Вимкнути проведення для переходу у повноекранний режим (у плеєрі)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Проведенням угору не переходитиметься у повноекранний режим.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Проведенням угору переходитиметься у повноекранний режим.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Вимкнути проведення для виходу з повноекранного режиму</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Проведенням вниз не виходитиметься з повноекранного режиму.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Проведенням вниз виходитиметься з повноекранного режиму.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Авто</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Відео</string>
@@ -1400,9 +1411,6 @@
     <string name="revanced_disable_hdr_video_title">Вимкнути HDR відео</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR відео вимкнено.</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR відео увімкнено.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Вимкнути швидкість відтворення в прямих трансляціях</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Типову швидкість відтворення вимкнено в прямих трансляціях.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Типову швидкість відтворення увімкнено в прямих трансляціях.</string>
     <string name="revanced_enable_custom_playback_speed_title">Увімкнути користувацьку швидкість відтворення</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Користувацьку швидкість відтворення увімкнено.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Користувацьку швидкість відтворення вимкнено.</string>
@@ -1427,10 +1435,11 @@
     <string name="revanced_restore_old_video_quality_menu_summary_on">Старе меню якості відео показується.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Старе меню якості відео не показується.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Вимкнути швидкість відтворення для музики</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"Типову швидкість відтворення вимкнено для музики.
-
-Застереження: Це налаштування може не застосовуватись до відео, які не містять напис 'Слухати через YouTube Music'."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">Типову швидкість відтворення вимкнено для музики.</string>
     <string name="revanced_disable_default_playback_speed_music_off">Типову швидкість відтворення увімкнено для музики.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Перевіряти за допомогою категорій</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">Типову швидкість відтворення вимкнено якщо категорія відео Музика.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">Типову швидкість відтворення вимкнено для відтворення відео на YouTube Music.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Увімкнути типову швидкість відтворення Shorts</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Типову швидкість відтворення застосовується для Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Типову швидкість відтворення не застосовується для Shorts.</string>
@@ -1771,24 +1780,42 @@
     <string name="revanced_spoof_streaming_data_summary_off">"Дані трансляції не підроблено. Відтворення відео може не працювати."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Вимикання цього налаштування може призвести до проблем відтворення відео.</string>
     <string name="revanced_spoof_streaming_data_type_title">Основний клієнт</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">Музика iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Розробник Android</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Потрібна авторизація)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(Потрібен PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Потрібна авторизація)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Побічні ефекти імітування</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Ще не знайдено.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Фільми чи платні відео можуть не відтворюватися.</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• Меню звукової доріжки відсутнє.
 • Стабілізація гучності недоступна.
-• Вимикання примусових звукових доріжок недоступне."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Використовувати лише клієнти Android</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Використовується клієнти Android для отримання потокових даних.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Використовується клієнти Android та iOS для отримання потокових даних.</string>
+• Вимкнення примусових авто звукових доріжок недоступне.
+• Відео для дітей можуть не відтворюватися коли вийшли з системи або в анонімному режимі."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Можуть бути проблеми з відтворенням (Потрібен PoToken).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Фільми та платні відео можуть не відтворюватися.
+• Відео для дітей можуть не відтворюватися коли вийшли з системи або в анонімному режимі."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Примусово AVC (H.264) iOS</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Примусово увімкнено відеокодек AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Відеокодек визначається автоматично.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Увімкнення може зменшити споживання акумулятора та виправити затинання відтворення.
+
+AVC має максимальну роздільну здатність 1080p, аудіокодек Opus недоступний, а відтворення відео використовуватиме більше інтернет-даних, ніж кодек VP9 чи AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Показувати в Статистика для сисадмінів</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Клієнт, що використовується для отримання даних трансляції показується у Статистика для сисадмінів.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Клієнт, що використовується для отримання даних трансляції приховано у Статистика для сисадмінів.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken для використання</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken виданий BotGuard в довіреному браузері.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData для використання</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">VisitorData виданий BotGuard в довіреному браузері.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">Про PoToken / VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Деякі клієнти вимагають PoToken і VisitorData для отримання коректної відповіді даних трансляції.
+
+Якщо намагаєтеся використовувати клієнт iOS, можуть знадобитися ці значення.
+
+Натисніть, щоб переглянути більше інформації."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Історія перегляду</string>
     <string name="revanced_preference_screen_watch_history_summary">Змінити налаштування пов\'язані з історією перегляду.</string>
diff --git a/patches/src/main/resources/youtube/translations/vi-rVN/strings.xml b/patches/src/main/resources/youtube/translations/vi-rVN/strings.xml
index fd0eb4912..0f23eab8e 100644
--- a/patches/src/main/resources/youtube/translations/vi-rVN/strings.xml
+++ b/patches/src/main/resources/youtube/translations/vi-rVN/strings.xml
@@ -13,7 +13,7 @@
     <string name="revanced_extended_restart_message">Làm mới và khởi động lại</string>
     <string name="revanced_playback_speed_normal">Bình thường</string>
     <string name="revanced_external_downloader_package_name_video_title">Tên gói trình tải xuống video</string>
-    <string name="revanced_external_downloader_package_name_video_summary">Nhập tên gói ứng dụng trình tải xuống đã cài đặt trên thiết bị của bạn, chẳng hạn như NewPipe hoặc YTDLnis.</string>
+    <string name="revanced_external_downloader_package_name_video_summary">Chọn trình tải xuống hoặc nhập tên gói ứng dụng trình tải xuống đã được cài đặt trên thiết bị của bạn, chẳng hạn như NewPipe hoặc YTDLnis.</string>
     <string name="revanced_external_downloader_dialog_title">Trình tải xuống bên ngoài</string>
     <string name="revanced_external_downloader_not_installed_dialog_title">Chú ý</string>
     <string name="revanced_external_downloader_not_installed_dialog_message">"Có vẻ như %1$s chưa được cài đặt.
@@ -30,9 +30,9 @@
     <string name="revanced_hide_merchandise_shelf_title">Ẩn kệ Sản phẩm</string>
     <string name="revanced_hide_merchandise_shelf_summary_on">Kệ Sản phẩm đã ẩn.</string>
     <string name="revanced_hide_merchandise_shelf_summary_off">Kệ Sản phẩm được hiển thị.</string>
-    <string name="revanced_hide_player_store_shelf_title">Ẩn kệ cửa hàng</string>
-    <string name="revanced_hide_player_store_shelf_summary_on">Kệ cửa hàng được hiển thị bên dưới trình phát.</string>
-    <string name="revanced_hide_player_store_shelf_summary_off">Kệ cửa hàng đã ẩn bên dưới trình phát.</string>
+    <string name="revanced_hide_player_store_shelf_title">Ẩn kệ Cửa hàng bên dưới trình phát</string>
+    <string name="revanced_hide_player_store_shelf_summary_on">Kệ Cửa hàng được hiển thị.</string>
+    <string name="revanced_hide_player_store_shelf_summary_off">Kệ Cửa hàng đã ẩn.</string>
     <string name="revanced_hide_paid_promotion_label_title">Ẩn nhãn nội dung được trả tiền để quảng cáo</string>
     <string name="revanced_hide_paid_promotion_label_summary_on">Nhãn nội dung được trả tiền để quảng cáo đã ẩn.</string>
     <string name="revanced_hide_paid_promotion_label_summary_off">Nhãn nội dung được trả tiền để quảng cáo được hiển thị.</string>
@@ -95,9 +95,9 @@ Nhấn vào đây để tìm hiểu thêm về DeArrow."</string>
     <string name="revanced_bypass_image_region_restrictions_summary_off">Sử dụng máy chủ lưu trữ hình ảnh gốc.\n\nBật tính năng này có thể khắc phục tình trạng hình ảnh bị chặn ở một số khu vực.</string>
     <!-- PreferenceScreen: Feed -->
     <string name="revanced_preference_screen_feed_title">Bảng tin</string>
-    <string name="revanced_hide_album_card_title">Ẩn Đĩa nhạc</string>
-    <string name="revanced_hide_album_card_summary_on">Đĩa nhạc đã ẩn khỏi kết quả tìm kiếm.</string>
-    <string name="revanced_hide_album_card_summary_off">Đĩa nhạc được hiển thị trong kết quả tìm kiếm.</string>
+    <string name="revanced_hide_album_card_title">Ẩn thẻ Đĩa nhạc</string>
+    <string name="revanced_hide_album_card_summary_on">Thẻ đĩa nhạc đã ẩn khỏi kết quả tìm kiếm.</string>
+    <string name="revanced_hide_album_card_summary_off">Thẻ đĩa nhạc được hiển thị trong kết quả tìm kiếm.</string>
     <string name="revanced_hide_carousel_shelf_title">Ẩn các kệ được cá nhân hoá</string>
     <string name="revanced_hide_carousel_shelf_summary">"Ẩn các kệ sau:
 
@@ -143,7 +143,7 @@ Nhấn vào đây để tìm hiểu thêm về DeArrow."</string>
     <string name="revanced_hide_movie_shelf_title">Ẩn kệ Phim và chương trình</string>
     <string name="revanced_hide_movie_shelf_summary_on">Kệ phim và chương trình đã ẩn.</string>
     <string name="revanced_hide_movie_shelf_summary_off">Kệ phim và chương trình được hiển thị.</string>
-    <string name="revanced_hide_notify_me_button_title">Ẩn nút Thông báo cho tôi</string>
+    <string name="revanced_hide_notify_me_button_title">Ẩn nút \"Thông báo cho tôi\"</string>
     <string name="revanced_hide_notify_me_button_summary_on">Nút \"Thông báo cho tôi\" đã ẩn bên dưới video sắp diễn ra.</string>
     <string name="revanced_hide_notify_me_button_summary_off">Nút \"Thông báo cho tôi\" được hiển thị bên dưới video sắp diễn ra.</string>
     <string name="revanced_hide_playables_title">Ẩn kệ Chơi game trên YouTube</string>
@@ -244,7 +244,7 @@ Bộ lọc có phân biệt chữ hoa chữ thường, vì vậy bạn cần nh
 • Một số thành phần giao diện người dùng có thể không bị ẩn.
 • Tìm kiếm từ khoá có thể không cho kết quả nào."</string>
     <string name="revanced_hide_keyword_content_about_whole_words_title">Khớp toàn bộ từ</string>
-    <string name="revanced_hide_keyword_content_about_whole_words_summary">Đặt từ/cụm từ cần lọc trong dấu ngoặc kép sẽ ngăn chặn các kết quả chỉ trùng một phần với tiêu đề video và tên kênh.&lt;br&gt;&lt;br&gt;Ví dụ,&lt;br&gt;&lt;b&gt;\"ai\"&lt;/b&gt; sẽ ẩn video: &lt;b&gt;How does AI work?&lt;/b&gt;&lt;br&gt;nhưng sẽ không ẩn: &lt;b&gt;What does fair use mean?&lt;/b&gt;</string>
+    <string name="revanced_hide_keyword_content_about_whole_words_summary">Đặt từ hoặc cụm từ cần lọc trong dấu ngoặc kép sẽ ngăn chặn các kết quả chỉ trùng một phần với tiêu đề video và tên kênh.&lt;br&gt;&lt;br&gt;Ví dụ,&lt;br&gt;&lt;b&gt;\"ai\"&lt;/b&gt; sẽ ẩn video: &lt;b&gt;How does AI work?&lt;/b&gt;&lt;br&gt;nhưng sẽ không ẩn: &lt;b&gt;What does fair use mean?&lt;/b&gt;</string>
     <string name="revanced_hide_keyword_toast_invalid_common">Từ khoá không hợp lệ: %s.</string>
     <string name="revanced_hide_keyword_toast_invalid_common_whole_word_required">Hãy thêm dấu ngoặc kép để sử dụng từ khoá: %s.</string>
     <string name="revanced_hide_keyword_toast_invalid_conflicting">Từ khóa có các định nghĩa mâu thuẫn với nhau. %s.</string>
@@ -294,6 +294,7 @@ Nếu bố cục của màn hình trình phát thay đổi do các thay đổi t
     <string name="revanced_preference_screen_general_title">Tổng quan</string>
     <string name="revanced_change_start_page_title">Thay đổi trang khởi động</string>
     <string name="revanced_change_start_page_entry_browse">Duyệt kênh</string>
+    <string name="revanced_change_start_page_entry_courses">Học tập</string>
     <string name="revanced_change_start_page_entry_default">Mặc định</string>
     <string name="revanced_change_start_page_entry_explore">Khám phá</string>
     <string name="revanced_change_start_page_entry_gaming">Trò chơi</string>
@@ -303,12 +304,14 @@ Nếu bố cục của màn hình trình phát thay đổi do các thay đổi t
     <string name="revanced_change_start_page_entry_live">Trực tiếp</string>
     <string name="revanced_change_start_page_entry_movies">Phim</string>
     <string name="revanced_change_start_page_entry_music">Âm nhạc</string>
+    <string name="revanced_change_start_page_entry_notifications">Thông báo</string>
     <string name="revanced_change_start_page_entry_search">Tìm kiếm</string>
     <string name="revanced_change_start_page_entry_shorts">Shorts</string>
     <string name="revanced_change_start_page_entry_sports">Thể thao</string>
     <string name="revanced_change_start_page_entry_subscriptions">Kênh đăng ký</string>
     <string name="revanced_change_start_page_entry_trending">Thịnh hành</string>
     <string name="revanced_change_start_page_entry_watch_later">Xem sau</string>
+    <string name="revanced_change_start_page_entry_your_clips">Đoạn video của bạn</string>
     <string name="revanced_change_start_page_type_title">Thay đổi kiểu trang khởi động</string>
     <string name="revanced_change_start_page_type_summary_on">"Trang khởi động sẽ liên tục thay đổi.
 
@@ -393,13 +396,13 @@ Một số mục có thể không bị ẩn."</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Hook buttons, PreferenceCategory: Download button -->
     <string name="revanced_preference_category_download_button">Nút tải xuống</string>
     <string name="revanced_override_video_download_button_title">Ghi đè nút tải xuống video</string>
-    <string name="revanced_override_video_download_button_summary_on">Nút tải xuống video sẽ mở trình tải xuống bên ngoài của bạn.</string>
-    <string name="revanced_override_video_download_button_summary_off">Nút tải xuống video sẽ mở trình tải xuống tích hợp sẵn trong ứng dụng.</string>
+    <string name="revanced_override_video_download_button_summary_on">Khi thao tác với nút tải xuống video sẽ mở trình tải xuống bên ngoài của bạn.</string>
+    <string name="revanced_override_video_download_button_summary_off">Khi thao tác với nút tải xuống video sẽ mở trình tải xuống được tích hợp sẵn của Youtube.</string>
     <string name="revanced_override_playlist_download_button_title">Ghi đè nút tải xuống danh sách phát</string>
-    <string name="revanced_override_playlist_download_button_summary_on">Nút tải xuống danh sách phát sẽ luôn được hiển thị, và khi thao tác sẽ mở trình tải xuống bên ngoài đối với các danh sách phát công khai.</string>
-    <string name="revanced_override_playlist_download_button_summary_off">Nếu được hiển thị, nút tải xuống danh sách phát sẽ mở trình tải xuống tích hợp sẵn trong ứng dụng.</string>
+    <string name="revanced_override_playlist_download_button_summary_on">Nút tải xuống danh sách phát sẽ luôn được hiển thị, và đối với danh sách phát công khai, khi thao tác với nút sẽ mở trình tải xuống bên ngoài của bạn.</string>
+    <string name="revanced_override_playlist_download_button_summary_off">Nếu được hiển thị, nút tải xuống danh sách phát sẽ mở trình tải xuống được tích hợp sẵn của Youtube.</string>
     <string name="revanced_external_downloader_package_name_playlist_title">Tên gói trình tải xuống danh sách phát</string>
-    <string name="revanced_external_downloader_package_name_playlist_summary">Nhập tên gói ứng dụng trình tải xuống đã cài đặt trên thiết bị của bạn, chẳng hạn như YTDLnis.</string>
+    <string name="revanced_external_downloader_package_name_playlist_summary">Chọn trình tải xuống hoặc nhập tên gói ứng dụng trình tải xuống đã được cài đặt trên thiết bị của bạn, chẳng hạn như YTDLnis.</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Hook buttons, PreferenceCategory: Experimental Flags -->
     <string name="revanced_override_youtube_music_button_title">Ghi đè nút Youtube Music</string>
     <string name="revanced_override_youtube_music_button_summary_on">Nút Youtube Music sẽ mở ứng dụng RVX Music.</string>
@@ -456,7 +459,7 @@ Vuốt trình phát thu nhỏ để mở rộng hoặc đóng."</string>
     <string name="revanced_miniplayer_hide_rewind_forward_summary_on">Các nút tua nhanh và tua lại đã ẩn.</string>
     <string name="revanced_miniplayer_hide_rewind_forward_summary_off">Các nút tua nhanh và tua lại được hiển thị.</string>
     <string name="revanced_miniplayer_width_dip_title">Kích thước ban đầu</string>
-    <string name="revanced_miniplayer_width_dip_summary">Nhập kích thước ban đầu trên màn hình tính bằng pixel.</string>
+    <string name="revanced_miniplayer_width_dip_summary">Nhập kích thước ban đầu của trình phát thu nhỏ, tính bằng pixel.</string>
     <string name="revanced_miniplayer_width_dip_invalid_toast">Kích thước pixel phải nằm trong khoảng từ %1$s tới %2$s.</string>
     <string name="revanced_miniplayer_opacity_title">Độ mờ lớp phủ</string>
     <string name="revanced_miniplayer_opacity_summary">Giá trị độ mờ của lớp phủ trình phát thu nhỏ trong khoảng từ 0 đến 100, trong đó 0 là trong suốt.</string>
@@ -488,7 +491,7 @@ Vuốt trình phát thu nhỏ để mở rộng hoặc đóng."</string>
     <string name="revanced_hide_navigation_label_title">Ẩn tên các thẻ</string>
     <string name="revanced_hide_navigation_label_summary_on">Tên các thẻ đã ẩn.</string>
     <string name="revanced_hide_navigation_label_summary_off">Tên các thẻ được hiển thị.</string>
-    <string name="revanced_switch_create_with_notifications_button_title">Đổi vị trí nút Tạo và nút Thông báo</string>
+    <string name="revanced_switch_create_with_notifications_button_title">Hoán đổi nút Tạo và nút Thông báo</string>
     <string name="revanced_switch_create_with_notifications_button_summary_on">"Nút Tạo đã được đổi vị trí với nút Thông báo.
 
 Lưu ý: Bật tuỳ chọn này cũng sẽ ẩn các quảng cáo dạng video."</string>
@@ -498,13 +501,10 @@ Lưu ý: Bật tuỳ chọn này cũng sẽ ẩn các quảng cáo dạng video.
 Ngoài ra, quảng cáo sẽ không còn bị chặn trong trình phát Shorts.
 
 Nếu cài đặt này không có hiệu lực, hãy thử chuyển sang chế độ Ẩn danh."</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">Vô hiệu hoá thanh trong suốt ở giao diện sáng</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Thanh điều hướng ở giao diện sáng không còn trong suốt.</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Thanh điều hướng ở giao diện sáng có thể trong suốt hoặc không.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">Vô hiệu hoá thanh trong suốt ở giao diện tối</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">Thanh điều hướng ở giao diện tối không còn trong suốt.</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">Thanh điều hướng ở giao diện tối có thể trong suốt hoặc không.</string>
-    <string name="revanced_hide_navigation_bar_title">Ẩn Thanh điều hướng</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">Thanh điều hướng trong suốt</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">Thanh điều hướng trong suốt đang được áp dụng.</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">Thanh điều hướng mặc định đang được áp dụng.</string>
+    <string name="revanced_hide_navigation_bar_title">Ẩn thanh điều hướng</string>
     <string name="revanced_hide_navigation_bar_summary_on">Thanh điều hướng đã ẩn.</string>
     <string name="revanced_hide_navigation_bar_summary_off">Thanh điều hướng được hiển thị.</string>
     <!-- PreferenceScreen: General, PreferenceCategory: General, PreferenceScreen: Settings menu -->
@@ -863,6 +863,16 @@ Cài đặt → Tự động phát → Tự động phát video tiếp theo."</s
     <string name="revanced_disable_engagement_panel_title">Tắt bảng tương tác</string>
     <string name="revanced_disable_engagement_panel_summary_on">Bảng tương tác đã tắt.</string>
     <string name="revanced_disable_engagement_panel_summary_off">Bảng điều khiển tương tác được bật.</string>
+    <string name="revanced_enter_fullscreen_title">Vào chế độ toàn màn hình khi video bắt đầu</string>
+    <string name="revanced_enter_fullscreen_summary_on">"Vào chế độ toàn màn hình khi video bắt đầu.
+
+Hạn chế: Không hoạt động nếu trình phát đang thu nhỏ, trong chế độ Hình trong hình, hoặc phát trong nền."</string>
+    <string name="revanced_enter_fullscreen_summary_off">Không vào chế độ toàn màn hình khi video bắt đầu.</string>
+    <string name="revanced_exit_fullscreen_title">Thoát chế độ màn hình khi video kết thúc</string>
+    <string name="revanced_exit_fullscreen_entry_1">Tắt</string>
+    <string name="revanced_exit_fullscreen_entry_2">Dọc</string>
+    <string name="revanced_exit_fullscreen_entry_3">Ngang</string>
+    <string name="revanced_exit_fullscreen_entry_4">Cả dọc và ngang</string>
     <string name="revanced_show_video_title_section_title">Hiển thị phần tiêu đề video</string>
     <string name="revanced_show_video_title_section_summary">"Hiển thị phần tiêu đề video ở chế độ toàn màn hình.
 
@@ -918,11 +928,6 @@ Hạn chế: Tiêu đề video sẽ biến mất khi nhấn vào."</string>
     <string name="revanced_enable_compact_controls_overlay_title">Lớp phủ điều khiển trình phát thu gọn</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">Lớp phủ điều khiển trình phát thu gọn đã bật.</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">Lớp phủ điều khiển trình phát thu gọn đã tắt.</string>
-    <string name="revanced_force_fullscreen_title">Buộc áp dụng chế độ toàn màn hình</string>
-    <string name="revanced_force_fullscreen_summary">"Video sẽ chuyển sang chế độ toàn màn hình trong các trường hợp sau:
-
-• Khi video bắt đầu.
-• Khi nhấn vào dấu thời gian trong Phần bình luận."</string>
     <string name="revanced_keep_landscape_mode_title">Giữ chế độ toàn màn hình</string>
     <string name="revanced_keep_landscape_mode_summary">Giữ chế độ toàn màn hình hoạt động trong lúc bạn tắt và đánh thức thiết bị khi đang xem chế độ toàn màn hình.</string>
     <string name="revanced_keep_landscape_mode_timeout_title">Thời gian giữ chế độ toàn màn hình (mili giây)</string>
@@ -1013,14 +1018,14 @@ Hạn chế:
     <string name="revanced_overlay_button_play_all_not_available_toast">Không thể tạo danh sách phát do ID kênh không trùng khớp.</string>
     <string name="revanced_whitelist_settings_title">Danh sách trắng</string>
     <string name="revanced_whitelist_settings_summary">Kiểm tra hoặc xóa các kênh đã thêm vào Danh sách trắng.</string>
-    <string name="revanced_whitelist_added">Kênh \'%1$s\' đã được thêm vào Danh sách trắng %2$s.</string>
-    <string name="revanced_whitelist_add_failed">Không thể thêm kênh \'%1$s\' vào Danh sách trắng %2$s.</string>
-    <string name="revanced_whitelist_removed">Kênh \'%1$s\' đã bị xóa khỏi Danh sách trắng %2$s.</string>
-    <string name="revanced_whitelist_remove_failed">Không thể xóa kênh \'%1$s\' khỏi Danh sách trắng %2$s.</string>
-    <string name="revanced_whitelist_remove_dialog_message">Xóa kênh \'%1$s\' khỏi Danh sách trắng %2$s?</string>
-    <string name="revanced_whitelist_empty">Không có kênh nào nằm trong Danh sách trắng.</string>
-    <string name="revanced_whitelist_excluded">Chưa được thêm vào Danh sách trắng.</string>
-    <string name="revanced_whitelist_included">Đã thêm vào Danh sách trắng.</string>
+    <string name="revanced_whitelist_added">Kênh \'%1$s\' đã được thêm vào Danh sách trắng của %2$s.</string>
+    <string name="revanced_whitelist_add_failed">Không thêm được kênh \'%1$s\' vào Danh sách trắng của %2$s.</string>
+    <string name="revanced_whitelist_removed">Kênh \'%1$s\' đã bị xóa khỏi Danh sách trắng của %2$s.</string>
+    <string name="revanced_whitelist_remove_failed">Không xóa được kênh \'%1$s\' khỏi Danh sách trắng của %2$s.</string>
+    <string name="revanced_whitelist_remove_dialog_message">Chắc chắn xóa kênh \'%1$s\' khỏi Danh sách trắng của %2$s?</string>
+    <string name="revanced_whitelist_empty">Không có kênh nào.</string>
+    <string name="revanced_whitelist_excluded">Chưa thêm.</string>
+    <string name="revanced_whitelist_included">Đã thêm.</string>
     <string name="revanced_whitelist_playback_speed">Tốc độ phát</string>
     <string name="revanced_whitelist_sponsor_block">SponsorBlock</string>
     <string name="revanced_whitelist_failure_generic">Không tải được thông tin kênh.</string>
@@ -1134,8 +1139,8 @@ Mở rộng mô tả video có thể không hoạt động nếu bạn nhập n
     <string name="revanced_disable_resuming_shorts_player_summary_on">Trinh phát Shorts sẽ không tiếp tục khi ứng dụng khởi chạy.</string>
     <string name="revanced_disable_resuming_shorts_player_summary_off">Trinh phát Shorts sẽ tiếp tục khi ứng dụng khởi chạy.</string>
     <string name="revanced_hide_shorts_floating_button_title">Ẩn nút nổi</string>
-    <string name="revanced_hide_shorts_floating_button_summary_on">"Các nút nổi như 'Dùng âm thanh này' đã ẩn trong thẻ kênh Shorts."</string>
-    <string name="revanced_hide_shorts_floating_button_summary_off">"Các nút nổi như 'Dùng âm thanh này' được hiển thị trong thẻ kênh Shorts."</string>
+    <string name="revanced_hide_shorts_floating_button_summary_on">"Các nút nổi như \"Dùng âm thanh này\" đã ẩn trong thẻ kênh Shorts."</string>
+    <string name="revanced_hide_shorts_floating_button_summary_off">"Các nút nổi như \"Dùng âm thanh này\" được hiển thị trong thẻ kênh Shorts."</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts shelf -->
     <string name="revanced_preference_category_shorts_shelf">Kệ Shorts</string>
     <string name="revanced_hide_shorts_shelf_title">Ẩn kệ Shorts</string>
@@ -1159,8 +1164,8 @@ Cụ thể:
     <string name="revanced_hide_shorts_shelf_history_summary_on">Ẩn trong phần Nhật ký xem.</string>
     <string name="revanced_hide_shorts_shelf_history_summary_off">Hiển thị trong phần Nhật ký xem.</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Experimental Flags -->
-    <string name="revanced_change_shorts_repeat_state_title">Thay đổi trạng thái lặp lại video ngắn</string>
-    <string name="revanced_change_shorts_background_repeat_state_title">Thay đổi trạng thái lặp lại dưới nền của video ngắn</string>
+    <string name="revanced_change_shorts_repeat_state_title">Thay đổi trạng thái lặp lại của video ngắn</string>
+    <string name="revanced_change_shorts_background_repeat_state_title">Thay đổi trạng thái lặp lại khi phát trong nền của video ngắn</string>
     <string name="revanced_change_shorts_repeat_state_entry_auto_play">Tự động phát</string>
     <string name="revanced_change_shorts_repeat_state_entry_default">Mặc định</string>
     <string name="revanced_change_shorts_repeat_state_entry_pause">Dừng</string>
@@ -1198,7 +1203,7 @@ Cụ thể:
     <string name="revanced_hide_shorts_live_header_title">Ẩn tiêu đề Trò chuyện trực tiếp</string>
     <string name="revanced_hide_shorts_live_header_summary_on">Tiêu đề Trò chuyện trực tiếp đã ẩn.\n\nNút Quay lại trong tiêu đề sẽ không bị ẩn.</string>
     <string name="revanced_hide_shorts_live_header_summary_off">Tiêu đề Trò chuyện trực tiếp được hiển thị.\n\nNút Quay lại trong tiêu đề sẽ không bị ẩn.</string>
-    <string name="revanced_hide_shorts_channel_bar_title">Ẩn Thanh kênh</string>
+    <string name="revanced_hide_shorts_channel_bar_title">Ẩn thanh kênh</string>
     <string name="revanced_hide_shorts_channel_bar_summary_on">Thanh kênh đã ẩn.</string>
     <string name="revanced_hide_shorts_channel_bar_summary_off">Thanh kênh được hiển thị.</string>
     <string name="revanced_hide_shorts_video_title_title">Ẩn tiêu đề video</string>
@@ -1256,9 +1261,9 @@ Cụ thể:
     <string name="revanced_hide_shorts_share_button_title">Ẩn nút Chia sẻ</string>
     <string name="revanced_hide_shorts_share_button_summary_on">Nút Chia sẻ đã ẩn.</string>
     <string name="revanced_hide_shorts_share_button_summary_off">Nút Chia sẻ được hiển thị.</string>
-    <string name="revanced_hide_shorts_sound_button_title">Nút Âm thanh</string>
-    <string name="revanced_hide_shorts_sound_button_summary_on">Nút âm thanh đã ẩn.</string>
-    <string name="revanced_hide_shorts_sound_button_summary_off">Nút âm thanh được hiển thị.</string>
+    <string name="revanced_hide_shorts_sound_button_title">Ẩn nút Âm thanh</string>
+    <string name="revanced_hide_shorts_sound_button_summary_on">Nút Âm thanh đã ẩn.</string>
+    <string name="revanced_hide_shorts_sound_button_summary_off">Nút Âm thanh được hiển thị.</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts, PreferenceScreen: Shorts player, PreferenceCategory: Animation / Feedback -->
     <string name="revanced_preference_category_animation_feedback">Hoạt ảnh/Phản hồi</string>
     <string name="revanced_disable_shorts_like_button_fountain_animation_title">Tắt hiệu ứng nút Thích</string>
@@ -1286,7 +1291,7 @@ Hạn chế:
     <string name="revanced_enable_shorts_custom_actions_toolbar_title">Tác vụ tuỳ chỉnh trong thanh công cụ</string>
     <string name="revanced_enable_shorts_custom_actions_toolbar_summary_on">"Tác vụ tuỳ chỉnh được bật trong thanh công cụ.
 
-Nhấn và giữ nút Thêm để hiển thị hộp thoại Tác vụ tuỳ chỉnh."</string>
+Nhấn và giữ nút Thêm (⋮) để hiển thị hộp thoại Tác vụ tuỳ chỉnh."</string>
     <string name="revanced_enable_shorts_custom_actions_toolbar_summary_off">Tác vụ tuỳ chỉnh đã tắt trong thanh công cụ.</string>
     <string name="revanced_shorts_custom_actions_toolbar_dialog_title">Tác vụ tuỳ chỉnh</string>
     <string name="revanced_shorts_custom_actions_copy_video_url_label">Sao chép URL của video</string>
@@ -1312,7 +1317,7 @@ Nhấn và giữ nút Thêm để hiển thị hộp thoại Tác vụ tuỳ ch
     <string name="revanced_shorts_custom_actions_about_title">Giới thiệu về Tác vụ tuỳ chọn</string>
     <string name="revanced_shorts_custom_actions_about_about_summary">"Hiện tính năng này vẫn đang trong giai đoạn thử nghiệm, vì vậy không có gì đảm bảo rằng tính năng này sẽ hoạt động một cách hoàn hảo.
 
-Hầu hết các lỗi không thể sửa được do hạn chế tới từ phía ứng dụng, vì vậy vui lòng chỉ sử dụng cho mục đích thử nghiệm."</string>
+Hầu hết các lỗi không thể sửa được do hạn chế tới từ phía ứng dụng, cuối cùng vui lòng chỉ sử dụng chúng cho mục đích thử nghiệm."</string>
     <!-- PreferenceScreen: Shorts, PreferenceCategory: Shorts, PreferenceScreen: Shorts player, PreferenceCategory: Experimental Flags -->
     <string name="revanced_enable_shorts_time_stamp_title">Dấu thời gian</string>
     <string name="revanced_enable_shorts_time_stamp_summary_on">"Dấu thời gian được bật.
@@ -1329,7 +1334,7 @@ Hạn chế:
     <string name="revanced_hide_shorts_toolbar_title">Ẩn thanh công cụ</string>
     <string name="revanced_hide_shorts_toolbar_summary_on">Thanh công cụ đã ẩn.</string>
     <string name="revanced_hide_shorts_toolbar_summary_off">Thanh công cụ được hiển thị.</string>
-    <string name="revanced_hide_shorts_navigation_bar_title">Ẩn Thanh điều hướng</string>
+    <string name="revanced_hide_shorts_navigation_bar_title">Ẩn thanh điều hướng</string>
     <string name="revanced_hide_shorts_navigation_bar_summary_on">Thanh điều hướng đã ẩn.</string>
     <string name="revanced_hide_shorts_navigation_bar_summary_off">Thanh điều hướng được hiển thị.</string>
     <string name="revanced_shorts_navigation_bar_height_percentage_title">Chiều cao của khoảng trống</string>
@@ -1385,12 +1390,18 @@ Không còn lề trên và dưới trong trình phát."</string>
     <string name="revanced_disable_hdr_auto_brightness_title">Tắt độ sáng HDR tự động</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Độ sáng HDR tự động đã tắt.</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Độ sáng HDR tự động đã bật.</string>
-    <string name="revanced_disable_watch_panel_gestures_title">Tắt cử chỉ bên dưới trình phát</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">Cử chỉ vuốt xuống từ khu vực bên dưới trình phát để xem video ở chế độ toàn màn hình dọc đã tắt.</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">Cử chỉ vuốt xuống từ khu vực bên dưới trình phát để xem video ở chế độ toàn màn hình dọc được bật.</string>
     <string name="revanced_disable_swipe_to_switch_video_title">Vuốt để chuyển video</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_on">Vuốt lên/xuống sẽ không phát video tiếp theo hoặc trước đó.</string>
-    <string name="revanced_disable_swipe_to_switch_video_summary_off">Vuốt lên/xuống sẽ phát video tiếp theo hoặc trước đó.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_on">Vuốt lên/xuống trong chế độ toàn màn hình sẽ không phát video tiếp theo/trước đó.</string>
+    <string name="revanced_disable_swipe_to_switch_video_summary_off">Vuốt lên/xuống trong chế độ toàn màn hình sẽ phát video tiếp theo/trước đó.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">Tắt vuốt để chuyển sang chế độ toàn màn hình (bên dưới trình phát)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">Vuốt xuống bên dưới trình phát sẽ không chuyển sang chế độ toàn màn hình.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">Vuốt xuống bên dưới trình phát để chuyển sang chế độ toàn màn hình.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">Tắt vuốt để chuyển sang chế độ toàn màn hình (trong trình phát)</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">Vuốt xuống trong trình phát sẽ không chuyển sang chế độ toàn màn hình.</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">Vuốt xuống trong trình phát để chuyển sang chế độ toàn màn hình.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">Tắt vuốt để thoát chế độ toàn màn hình</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">Vuốt xuống trong chế độ toàn màn hình sẽ không thoát khỏi chế độ này.</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">Vuốt xuống trong chế độ toàn màn hình để thoát khỏi chế độ này.</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">Tự động</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">Video</string>
@@ -1400,9 +1411,6 @@ Không còn lề trên và dưới trong trình phát."</string>
     <string name="revanced_disable_hdr_video_title">Tắt video HDR</string>
     <string name="revanced_disable_hdr_video_summary_on">Video HDR đã tắt.</string>
     <string name="revanced_disable_hdr_video_summary_off">Video HDR đã bật.</string>
-    <string name="revanced_disable_default_playback_speed_live_title">Tắt tùy chọn tốc độ phát khi xem trực tiếp</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">Tốc độ phát mặc định bị tắt khi xem sự kiện trực tiếp và buổi công chiếu.</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">Tốc độ phát mặc định được bật khi xem sự kiện trực tiếp và buổi công chiếu.</string>
     <string name="revanced_enable_custom_playback_speed_title">Tốc độ phát tuỳ chỉnh</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">Đang áp dụng các giá trị tốc độ phát video tuỳ chỉnh.</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">Đang áp dụng các giá trị tốc độ phát video mặc định.</string>
@@ -1427,10 +1435,11 @@ Không còn lề trên và dưới trong trình phát."</string>
     <string name="revanced_restore_old_video_quality_menu_summary_on">Mục chất lượng video kiểu cũ được hiển thị.</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">Mục chất lượng video kiểu cũ không được hiển thị.</string>
     <string name="revanced_disable_default_playback_speed_music_title">Tắt tùy chọn tốc độ phát khi phát nhạc</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"Tốc độ phát mặc định đã bị vô hiệu hoá khi phát nhạc.
-
-Hạn chế: Cài đặt này có thể không áp dụng cho các video không bao gồm biểu ngữ \"Nghe trên YouTube Music\"."</string>
+    <string name="revanced_disable_default_playback_speed_music_on">Tốc độ phát mặc định đã tắt khi phát nhạc.</string>
     <string name="revanced_disable_default_playback_speed_music_off">Tốc độ phát mặc định được kích hoạt khi phát nhạc.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">Dựa vào danh mục</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">Tốc độ phát mặc định đã tắt nếu video thuộc danh mục Âm nhạc.</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">Tốc độ phát mặc định đã tắt đối với các video chơi game trên Youtube Music.</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">Tốc độ phát mặc định cho video ngắn</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">Tốc độ phát mặc định đã đặt đang được áp dụng khi xem Shorts.</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">Tốc độ phát mặc định đã đặt không áp dụng cho Shorts.</string>
@@ -1722,7 +1731,7 @@ Nhấp vào đây để xem các bước phát hành khóa API."</string>
     <string name="revanced_default_app_settings_title">Mở theo mặc định</string>
     <string name="revanced_default_app_settings_summary">Để mở liên kết YouTube trong RVX, hãy bật \'Mở các đường liên kết được hỗ trợ\' và thêm các đường liên kết được hỗ trợ.</string>
     <string name="gms_core_settings_title">GmsCore</string>
-    <string name="gms_core_settings_summary">Chuyển hướng tới cài đặt GmsCore và bật Cloud Messaging để nhận thông báo đẩy.</string>
+    <string name="gms_core_settings_summary">Chuyển hướng tới cài đặt MicroG và bật Cloud Messaging để nhận thông báo đẩy.</string>
     <string name="gms_core_toast_not_installed_message">GmsCore chưa được cài đặt. Hãy cài đặt nó đi nào.</string>
     <string name="gms_core_dialog_title">Hành động cần thiết</string>
     <string name="gms_core_dialog_not_whitelisted_not_allowed_in_background_message">"Hiện GmsCore không có quyền chạy nền.
@@ -1741,9 +1750,9 @@ Nhấn vào Tiếp tục và cho phép thay đổi lựa chọn tối ưu hoá p
     <string name="revanced_sanitize_sharing_links_summary">Loại bỏ các tham số truy vấn theo dõi khỏi URL khi chia sẻ liên kết.</string>
     <string name="revanced_disable_quic_protocol_title">Vô hiệu hoá giao thức QUIC</string>
     <string name="revanced_disable_quic_protocol_summary">"Vô hiệu hoá giao thức QUIC của CronetEngine để giảm độ trễ khi phát video."</string>
-    <string name="revanced_change_share_sheet_title">Thay đổi giao diện chia sẻ</string>
-    <string name="revanced_change_share_sheet_summary_on">Sử dụng giao diện chia sẻ của hệ thống.</string>
-    <string name="revanced_change_share_sheet_summary_off">Sử dụng giao diện chia sẻ của ứng dụng.</string>
+    <string name="revanced_change_share_sheet_title">Thay đổi bảng chia sẻ</string>
+    <string name="revanced_change_share_sheet_summary_on">Đang sử dụng bảng chia sẻ của hệ thống Android.</string>
+    <string name="revanced_change_share_sheet_summary_off">Đang sử dụng bảng chia sẻ trong ứng dụng Youtube.</string>
     <string name="revanced_enable_opus_codec_title">Codec OPUS</string>
     <string name="revanced_enable_opus_codec_summary">Kích hoạt codec OPUS nếu phản hồi của trình phát bao gồm codec OPUS.</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Import / Export settings -->
@@ -1776,24 +1785,45 @@ Nhấn vào Tiếp tục và cho phép thay đổi lựa chọn tối ưu hoá p
     <string name="revanced_spoof_streaming_data_summary_off">"Luồng dữ liệu trực tuyến chưa được giả mạo. Khi phát video có thể gặp sự cố đứng hình."</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">Tắt cài đặt này có thể gây ra sự cố phát video.</string>
     <string name="revanced_spoof_streaming_data_type_title">Ứng dụng khách mặc định</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">Music iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">TV iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(Yêu cầu Đăng nhập)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(Yêu cầu PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(Yêu cầu Đăng nhập)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">Hạn chế</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• Chưa tìm thấy.</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• Phim hoặc video trả phí có thể không phát được.</string>
     <string name="revanced_spoof_streaming_data_side_effects_android">"• Mục Bản âm thanh bị thiếu.
 • Âm lượng ổn định không khả dụng.
-• Tắt buộc bản âm thanh tự động không khả dụng."</string>
-    <string name="revanced_spoof_streaming_data_android_only_title">Chỉ sử dụng ứng dụng khách Android</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_on">Ứng dụng khách Android được sử dụng để nạp luồng dữ liệu trực tuyến.</string>
-    <string name="revanced_spoof_streaming_data_android_only_summary_off">Ứng dụng khách Android và iOS được sử dụng để nạp luồng dữ liệu trực tuyến.</string>
+• Tắt bắt buộc Bản âm thanh tự động không khả dụng.
+• Video dành cho trẻ em có thể không phát được khi bạn đã đăng xuất hoặc bật chế độ ẩn danh."</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• Có thể xẩy ra sự cố phát (Yêu cầu PoToken).</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• Phim hoặc video trả phí có thể không phát được.
+• Video dành cho trẻ em có thể không phát được khi bạn đã đăng xuất hoặc bật chế độ ẩn danh."</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">Bắt buộc iOS sử dụng AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">Codec video bị ép buộc thành AVC (H.264).</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">Codec video được xác định tự động.</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"Bật tính năng này giúp cải thiện thời lượng sử dụng pin và khắc phục sự cố phát video.
+
+Hạn chế:
+• AVC có độ phân giải tối đa là 1080p.
+• Codec âm thanh OPUS không khả dụng.
+• Dùng nhiều dữ liệu di động hơn với VP9 hoặc AV1."</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Hiển thị trong Thống kê chi tiết</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Ứng dụng khách sử dụng để nạp luồng dữ liệu trực tuyến được hiển thị trong Thống kê chi tiết.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Ứng dụng khách sử dụng để nạp luồng dữ liệu trực tuyến đã ẩn trong Thống kê chi tiết.</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">PoToken/VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">PoToken</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">Được cung cấp bởi BotGuard trên trình duyệt đáng tin cậy.</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">VisitorData</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">Được cung cấp bởi BotGuard trên trình duyệt đáng tin cậy.</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">Giới thiệu về PoToken/VisitorData</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"Một số ứng dụng khách yêu cầu PoToken và VisitorData để nhận được phản hồi dữ liệu trực tuyến hợp lệ.
+
+Nếu bạn đang cố sử dụng iOS làm ứng dụng khách mặc định, thì có thể bạn sẽ cần những giá trị này.
+
+Nhấp vào đây để biết thêm chi tiết."</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">Nhật ký xem</string>
     <string name="revanced_preference_screen_watch_history_summary">Thay đổi cài đặt liên quan đến nhật ký xem.</string>
diff --git a/patches/src/main/resources/youtube/translations/zh-rCN/strings.xml b/patches/src/main/resources/youtube/translations/zh-rCN/strings.xml
index 81d1e8256..f0b70cc38 100644
--- a/patches/src/main/resources/youtube/translations/zh-rCN/strings.xml
+++ b/patches/src/main/resources/youtube/translations/zh-rCN/strings.xml
@@ -871,11 +871,6 @@
     <string name="revanced_enable_compact_controls_overlay_title">启用紧凑的播放器布局叠加层</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">紧凑的播放器布局已启用</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">紧凑的播放器布局已禁用</string>
-    <string name="revanced_force_fullscreen_title">强制全屏</string>
-    <string name="revanced_force_fullscreen_summary">"在以下情况下，视频将切换为全屏：
-
-• 开始播放视频时
-• 点击评论中的时间戳时"</string>
     <string name="revanced_keep_landscape_mode_title">保持横屏模式</string>
     <string name="revanced_keep_landscape_mode_summary">在全屏状态下关闭和打开屏幕时，保持横屏模式</string>
     <string name="revanced_keep_landscape_mode_timeout_title">保持横屏模式超时</string>
@@ -1276,9 +1271,6 @@
     <string name="revanced_disable_hdr_video_title">HDR 视频</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR 视频已禁用</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR 视频已启用</string>
-    <string name="revanced_disable_default_playback_speed_live_title">禁用直播默认播放速度</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">直播默认播放速度已禁用</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">直播默认播放速度已启用</string>
     <string name="revanced_enable_custom_playback_speed_title">启用自定义播放速度</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">自定义播放速度已启用</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">自定义播放速度已禁用</string>
@@ -1303,9 +1295,6 @@
     <string name="revanced_restore_old_video_quality_menu_summary_on">显示旧的视频画质菜单</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">不显示旧的视频画质菜单</string>
     <string name="revanced_disable_default_playback_speed_music_title">禁用音乐播放速度</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"音乐默认播放速度已禁用
-
-限制：此设置可能不适用于不包含“监听YouTube Music”广告的视频"</string>
     <string name="revanced_disable_default_playback_speed_music_off">音乐默认播放速度已启用</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">启用 Shorts 默认播放速度</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">默认播放速度适用于 Shorts</string>
@@ -1647,13 +1636,11 @@
     <string name="revanced_spoof_streaming_data_summary_off">"流媒体数据未伪装，视频可能无法正常播放"</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">关闭此选项可能会导致视频不能正常播放</string>
     <string name="revanced_spoof_streaming_data_type_title">默认客户端</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">伪装副作用</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">显示统计信息</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">用于获取流媒体数据的客户端已在统计信息中显示</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">用于获取流媒体数据的客户端已在统计信息中隐藏</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">观看历史</string>
     <string name="revanced_preference_screen_watch_history_summary">更改与观看历史记录相关的设置</string>
diff --git a/patches/src/main/resources/youtube/translations/zh-rTW/strings.xml b/patches/src/main/resources/youtube/translations/zh-rTW/strings.xml
index f733605a0..6d101351e 100644
--- a/patches/src/main/resources/youtube/translations/zh-rTW/strings.xml
+++ b/patches/src/main/resources/youtube/translations/zh-rTW/strings.xml
@@ -290,6 +290,7 @@
     <string name="revanced_preference_screen_general_title">一般設定</string>
     <string name="revanced_change_start_page_title">更改起始頁</string>
     <string name="revanced_change_start_page_entry_browse">瀏覽頻道</string>
+    <string name="revanced_change_start_page_entry_courses">課程/學習</string>
     <string name="revanced_change_start_page_entry_default">預設</string>
     <string name="revanced_change_start_page_entry_explore">探索</string>
     <string name="revanced_change_start_page_entry_gaming">遊戲</string>
@@ -299,12 +300,14 @@
     <string name="revanced_change_start_page_entry_live">直播</string>
     <string name="revanced_change_start_page_entry_movies">電影</string>
     <string name="revanced_change_start_page_entry_music">音樂</string>
+    <string name="revanced_change_start_page_entry_notifications">通知</string>
     <string name="revanced_change_start_page_entry_search">搜尋</string>
     <string name="revanced_change_start_page_entry_shorts">短片</string>
     <string name="revanced_change_start_page_entry_sports">運動</string>
     <string name="revanced_change_start_page_entry_subscriptions">訂閱</string>
     <string name="revanced_change_start_page_entry_trending">熱門</string>
     <string name="revanced_change_start_page_entry_watch_later">稍後觀看</string>
+    <string name="revanced_change_start_page_entry_your_clips">你的剪輯</string>
     <string name="revanced_change_start_page_type_title">變更起始頁類型</string>
     <string name="revanced_change_start_page_type_summary_on">"起始頁總是改變。
 
@@ -319,7 +322,7 @@
     <string name="revanced_disable_splash_animation_title">停用啟動動畫</string>
     <string name="revanced_disable_splash_animation_summary_on">啟動動畫已停用</string>
     <string name="revanced_disable_splash_animation_summary_off">啟動動畫已啟用</string>
-    <string name="revanced_disable_translucent_status_bar_title">禁用半透明狀態列</string>
+    <string name="revanced_disable_translucent_status_bar_title">停用半透明狀態列</string>
     <string name="revanced_disable_translucent_status_bar_summary_on">狀態列不透明。</string>
     <string name="revanced_disable_translucent_status_bar_summary_off">狀態列是不透明或半透明的。</string>
     <string name="revanced_enable_gradient_loading_screen_title">啟用漸變載入畫面</string>
@@ -494,12 +497,9 @@
 此外，廣告將不再在 Shorts 中被封鎖。
 
 若此設定未生效，請嘗試切換至無痕模式。"</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_title">停用淺色半透明條</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_on">淺色模式導覽列不透明。</string>
-    <string name="revanced_disable_translucent_navigation_bar_light_summary_off">淺色模式導覽列不透明或半透明。</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_title">停用深色半透明欄</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_on">深色模式導覽列不透明。</string>
-    <string name="revanced_disable_translucent_navigation_bar_dark_summary_off">深色模式導覽列不透明或半透明。</string>
+    <string name="revanced_enable_translucent_navigation_bar_title">啟用半透明導覽列</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_on">導覽列是半透明的。</string>
+    <string name="revanced_enable_translucent_navigation_bar_summary_off">導覽列不透明。</string>
     <string name="revanced_hide_navigation_bar_title">隱藏導覽列</string>
     <string name="revanced_hide_navigation_bar_summary_on">導覽列已隱藏。</string>
     <string name="revanced_hide_navigation_bar_summary_off">導覽列已顯示。</string>
@@ -678,8 +678,8 @@
     <string name="revanced_hide_suggested_actions_summary_on">操作建議已隱藏</string>
     <string name="revanced_hide_suggested_actions_summary_off">操作建議已顯示</string>
     <string name="revanced_hide_timed_reactions_title">隱藏時間跳轉</string>
-    <string name="revanced_hide_timed_reactions_summary_on">（評論）時間跳轉已隱藏</string>
-    <string name="revanced_hide_timed_reactions_summary_off">（評論）時間跳轉已顯示</string>
+    <string name="revanced_hide_timed_reactions_summary_on">定時留言已隱藏。</string>
+    <string name="revanced_hide_timed_reactions_summary_off">定時反應已顯示。</string>
     <string name="revanced_hide_suggested_video_end_screen_title">隱藏推薦影片結束界面</string>
     <string name="revanced_hide_suggested_video_end_screen_summary_on">"關閉自動播放時，建議的影片結束畫面會隱藏。
 
@@ -859,6 +859,16 @@
     <string name="revanced_disable_engagement_panel_title">停用互動面板</string>
     <string name="revanced_disable_engagement_panel_summary_on">停用互動面板</string>
     <string name="revanced_disable_engagement_panel_summary_off">啟用互動面板</string>
+    <string name="revanced_enter_fullscreen_title">影片開始時進入全螢幕模式</string>
+    <string name="revanced_enter_fullscreen_summary_on">"\"影片開始時進入全螢幕模式。
+
+限制：如果播放器最小化、處於畫中畫模式或處於後台，則不起作用。"</string>
+    <string name="revanced_enter_fullscreen_summary_off">影片開始時請勿進入全螢幕模式。</string>
+    <string name="revanced_exit_fullscreen_title">影片結束時退出全螢幕模式</string>
+    <string name="revanced_exit_fullscreen_entry_1">已停用</string>
+    <string name="revanced_exit_fullscreen_entry_2">縱向</string>
+    <string name="revanced_exit_fullscreen_entry_3">橫向</string>
+    <string name="revanced_exit_fullscreen_entry_4">縱向和橫向</string>
     <string name="revanced_show_video_title_section_title">顯示影片標題部份</string>
     <string name="revanced_show_video_title_section_summary">"在全螢幕模式下顯示影片標題部分
 
@@ -914,11 +924,6 @@
     <string name="revanced_enable_compact_controls_overlay_title">啟用緊湊的播放器佈局疊加層</string>
     <string name="revanced_enable_compact_controls_overlay_summary_on">精簡控制選單已啟用</string>
     <string name="revanced_enable_compact_controls_overlay_summary_off">緊湊的播放器佈局已停用</string>
-    <string name="revanced_force_fullscreen_title">強制全螢幕</string>
-    <string name="revanced_force_fullscreen_summary">"影片將在以下情況下切換到全螢幕模式：
-
-・當影片開始播放時。
-・當點擊評論中的時間戳記時。"</string>
     <string name="revanced_keep_landscape_mode_title">保持橫向模式</string>
     <string name="revanced_keep_landscape_mode_summary">在全螢幕模式下關閉和開啟螢幕時保持橫向模式。</string>
     <string name="revanced_keep_landscape_mode_timeout_title">保持橫向模式的超時時間</string>
@@ -1376,12 +1381,18 @@
     <string name="revanced_disable_hdr_auto_brightness_title">停用 HDR 影片自動亮度</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">HDR 影片自動亮度已停用</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">HDR 影片自動亮度已啟用</string>
-    <string name="revanced_disable_watch_panel_gestures_title">停用觀看面板手勢</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_on">透過滑動播放器底部區域切換到全螢幕功能已停用。</string>
-    <string name="revanced_disable_watch_panel_gestures_summary_off">透過滑動播放器底部區域切換到全螢幕功能已啟用。</string>
     <string name="revanced_disable_swipe_to_switch_video_title">停用滑動切換影片功能</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_on">向上/向下滑動將不會播放下一個/上一個影片。</string>
     <string name="revanced_disable_swipe_to_switch_video_summary_off">向上/向下滑動將播放下一個/上一個影片。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_title">停用滑動進入全螢幕模式（在播放器下方）。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_on">向下滑動播放器下方將不會進入全螢幕模式。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_below_the_player_summary_off">向下滑動播放器下方將進入全螢幕模式。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_title">停用滑動進入全螢幕模式（在播放器內）。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_on">在播放器內向上滑動將不會進入全螢幕模式。</string>
+    <string name="revanced_disable_swipe_to_enter_fullscreen_mode_in_the_player_summary_off">在播放器內向上滑動將進入全螢幕模式。</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_title">停用滑動退出全螢幕模式。</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_on">在全螢幕模式下向下滑動將不會退出全螢幕模式。</string>
+    <string name="revanced_disable_swipe_to_exit_fullscreen_mode_summary_off">在全螢幕模式下向下滑動將退出全螢幕模式。</string>
     <string name="revanced_swipe_lowest_value_auto_brightness_overlay_text">自動</string>
     <!-- PreferenceScreen: Video -->
     <string name="revanced_preference_screen_video_title">影片</string>
@@ -1391,9 +1402,6 @@
     <string name="revanced_disable_hdr_video_title">HDR 影片</string>
     <string name="revanced_disable_hdr_video_summary_on">HDR 影片已啟用</string>
     <string name="revanced_disable_hdr_video_summary_off">HDR 影片已停用</string>
-    <string name="revanced_disable_default_playback_speed_live_title">在直播中停用預設播放速度</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_on">直播預設播放速度已停用</string>
-    <string name="revanced_disable_default_playback_speed_live_summary_off">直播預設播放速度已啟用</string>
     <string name="revanced_enable_custom_playback_speed_title">啟用自定義播放速度</string>
     <string name="revanced_enable_custom_playback_speed_summary_on">自定義播放速度已啟用</string>
     <string name="revanced_enable_custom_playback_speed_summary_off">自定義播放速度已停用</string>
@@ -1418,15 +1426,16 @@
     <string name="revanced_restore_old_video_quality_menu_summary_on">顯示舊的影片畫質選單</string>
     <string name="revanced_restore_old_video_quality_menu_summary_off">不顯示舊的影片畫質選單</string>
     <string name="revanced_disable_default_playback_speed_music_title">停用音樂的播放速度</string>
-    <string name="revanced_disable_default_playback_speed_music_on">"音樂的預設播放速度被停用。
-
-限制：此設定可能不適用於不包含「在 YouTube 音樂上收聽」橫幅影片。"</string>
+    <string name="revanced_disable_default_playback_speed_music_on">音樂的預設播放速度被禁用。</string>
     <string name="revanced_disable_default_playback_speed_music_off">音樂的預設播放速度已啟用。</string>
+    <string name="revanced_disable_default_playback_speed_music_type_title">使用類別進行驗證</string>
+    <string name="revanced_disable_default_playback_speed_music_type_on">如果影片類別為音樂，則預設播放速度將被停用。</string>
+    <string name="revanced_disable_default_playback_speed_music_type_off">YouTube 音樂上可播放的影片的預設播放速度為停用。</string>
     <string name="revanced_enable_default_playback_speed_shorts_title">啟用短片預設播放速度</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_on">預設播放速度適用於短片</string>
     <string name="revanced_enable_default_playback_speed_shorts_summary_off">預設播放速度不適用於短片</string>
-    <string name="revanced_skipped_preloaded_buffer">跳過預加載緩衝</string>
-    <string name="revanced_skip_preloaded_buffer_title">跳過預加載緩衝</string>
+    <string name="revanced_skipped_preloaded_buffer">跳過預載入</string>
+    <string name="revanced_skip_preloaded_buffer_title">跳過預載入</string>
     <string name="revanced_skip_preloaded_buffer_summary">"跳過影片開頭的預先載入緩衝區以立即套用預設影片品質
 
  資訊:
@@ -1558,7 +1567,7 @@
     <string name="revanced_sb_skip_button_sponsor">跳過贊助內容</string>
     <string name="revanced_sb_skip_button_selfpromo">跳過自我宣傳</string>
     <string name="revanced_sb_skip_button_interaction">跳過交互提醒</string>
-    <string name="revanced_sb_skip_button_highlight">跳轉至突出顯示</string>
+    <string name="revanced_sb_skip_button_highlight">跳轉至重點部分</string>
     <string name="revanced_sb_skip_button_intro_beginning">跳過片頭</string>
     <string name="revanced_sb_skip_button_intro_middle">跳過中場</string>
     <string name="revanced_sb_skip_button_intro_end">跳過中場</string>
@@ -1566,7 +1575,7 @@
     <string name="revanced_sb_skip_button_preview_beginning">跳過預告</string>
     <string name="revanced_sb_skip_button_preview_middle">跳過預告</string>
     <string name="revanced_sb_skip_button_preview_end">跳過總結</string>
-    <string name="revanced_sb_skip_button_filler">跳過灌水片段</string>
+    <string name="revanced_sb_skip_button_filler">跳過閒聊</string>
     <string name="revanced_sb_skip_button_nomusic">跳過非音樂部分</string>
     <string name="revanced_sb_skip_button_unsubmitted">跳過未提交片段</string>
     <string name="revanced_sb_skipped_sponsor">跳過贊助內容</string>
@@ -1580,7 +1589,7 @@
     <string name="revanced_sb_skipped_preview_beginning">跳過預告</string>
     <string name="revanced_sb_skipped_preview_middle">跳過預告</string>
     <string name="revanced_sb_skipped_preview_end">跳過總結</string>
-    <string name="revanced_sb_skipped_filler">跳過灌水內容/笑話</string>
+    <string name="revanced_sb_skipped_filler">已跳過閒聊</string>
     <string name="revanced_sb_skipped_nomusic">跳過非音樂部份</string>
     <string name="revanced_sb_skipped_unsubmitted">跳過未提交的片段</string>
     <string name="revanced_sb_skipped_multiple_segments">跳過多個片段</string>
@@ -1615,9 +1624,9 @@
     <string name="revanced_sb_toast_on_connection_error_title">如果 API 無法使用，則顯示提示訊息</string>
     <string name="revanced_sb_toast_on_connection_error_summary_on">如果 SponsorBlock 無法使用，顯示提示訊息</string>
     <string name="revanced_sb_toast_on_connection_error_summary_off">如果 SponsorBlock 無法使用，不顯示提示訊息</string>
-    <string name="revanced_sb_general_skipcount">啟用跳過計數跟蹤</string>
+    <string name="revanced_sb_general_skipcount">啟用跳過計數追蹤</string>
     <string name="revanced_sb_general_skipcount_sum_on">允許 SponsorBlock 排行榜了解節省了多少時間每次跳過片段時都會向排行榜發送訊息</string>
-    <string name="revanced_sb_general_skipcount_sum_off">未啟用跳過計數跟蹤</string>
+    <string name="revanced_sb_general_skipcount_sum_off">不啟用跳過計數追蹤</string>
     <string name="revanced_sb_general_min_duration">最短片段持續時間</string>
     <string name="revanced_sb_general_min_duration_sum">小於此值（以秒為單位）的片段將不會顯示或跳過</string>
     <string name="revanced_sb_general_min_duration_invalid">持續時間無效。</string>
@@ -1771,21 +1780,42 @@
     <string name="revanced_spoof_streaming_data_summary_off">"串流資料未偽裝。 影片可能無法播放。"</string>
     <string name="revanced_spoof_streaming_data_user_dialog_message">關閉此設定可能會導致影片播放問題。</string>
     <string name="revanced_spoof_streaming_data_type_title">預設客戶端</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS 音樂</string>
-    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android 創作者</string>
-    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android 電視</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">"Android TV
+<small>(需要登入)</small>"</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios">"iOS
+<small>(需要 PoToken)</small>"</string>
+    <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">"iOS TV
+<small>(需要登入)</small>"</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">偽裝副作用</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios">• 尚未找到。</string>
-    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">• 電影或付費影片可能無法播放。</string>
-    <string name="revanced_spoof_streaming_data_side_effects_android">"• 音軌選單缺失。
-• 穩定音量不可用。
-• 停用強制自動音軌不可用。"</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android">"• 音軌選單遺失。
+• 無法獲得穩定的音量。
+• 停用強制自動音軌無法使用。
+• 登出或處於隱身模式時可能無法播放兒童影片。"</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios">• 可能有播放問題 (需要PoToken)。</string>
+    <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">"• 電影或付費影片可能無法播放。
+• 登出或處於隱身模式時可能無法播放兒童影片。"</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_title">強制 iOS AVC (H.264)</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_on">影片編解碼器強制為 AVC (H.264)。</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_summary_off">影片編解碼器是自動決定的。</string>
+    <string name="revanced_spoof_streaming_data_ios_force_avc_user_dialog_message">"啟用此功能可能會延長電池壽命並修復播放卡頓問題。
+
+AVC 的最大解析度為 1080p，Opus 音訊編解碼器不可用，影片播放將使用比 VP9 或 AV1 更多的網路資料。"</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">顯示統計資料</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">用於取得串流資料的用戶端顯示在統計資料中。</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">用於獲取串流資料的用戶端隱藏在統計資料中。</string>
+    <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Spoof streaming data, PreferenceCategory: PoToken / VisitorData -->
+    <string name="revanced_preference_category_po_token_visitor_data">Potoken / 訪客數據</string>
+    <string name="revanced_spoof_streaming_data_po_token_title">使用PoToken</string>
+    <string name="revanced_spoof_streaming_data_po_token_summary">PoToken 由 BotGuard 在受信任的瀏覽器中頒發。</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_title">使用訪客數據</string>
+    <string name="revanced_spoof_streaming_data_visitor_data_summary">由 BotGuard 在受信任的瀏覽器中發布的訪客數據。</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_title">關於PoToken / 訪客數據</string>
+    <string name="revanced_spoof_streaming_data_po_token_visitor_data_about_summary">"某些用戶端需要 PoToken 和 訪客數據才能取得有效的串流資料回應。
+
+如果您嘗試使用 iOS 作為預設用戶端，則可能需要這些值。
+
+點擊查看更多資訊。"</string>
     <!-- PreferenceScreen: Miscellaneous, PreferenceCategory: Miscellaneous, PreferenceScreen: Watch history -->
     <string name="revanced_preference_screen_watch_history_title">觀看歷史記錄</string>
     <string name="revanced_preference_screen_watch_history_summary">變更與觀看歷史記錄相關的設定。</string>