Merge branch 'develop' into fix/android-tv-fixes-and-mpv-upgrade

fix: Roadmap link in README (#1524 )
Co-authored-by: Gauvain <contact@uruk.dev> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2026-06-25 23:30:33 +01:00 · 2026-06-25 10:46:33 +02:00 · 2026-06-25 10:45:50 +02:00 · 2026-06-25 10:22:02 +02:00 · 2026-06-25 09:08:12 +02:00 · 2026-06-25 09:06:28 +02:00
100 changed files with 1719 additions and 1985 deletions
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Thanks to [@Alexk2309](https://github.com/Alexk2309) for the hard work building

 ## 🛣️ Roadmap

-Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) To see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
+Check out our [Roadmap](https://github.com/orgs/streamyfin/projects/3/views/1) to see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.

 ## 📥 Download Streamyfin

--- a/app/(auth)/(tabs)/(home)/_layout.tsx
+++ b/app/(auth)/(tabs)/(home)/_layout.tsx
@@ -73,6 +73,7 @@ export default function IndexLayout() {
          headerLeft: () => (
            <Pressable
              onPress={() => _router.back()}
+              className='pl-0.5'
              style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
            >
              <Feather name='chevron-left' size={28} color='white' />
@@ -157,6 +158,7 @@ export default function IndexLayout() {
          headerLeft: () => (
            <Pressable
              onPress={() => _router.back()}
+              className='pl-0.5'
              style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
            >
              <Feather name='chevron-left' size={28} color='white' />
--- a/app/(auth)/(tabs)/(home)/settings.tv.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tv.tsx
@@ -645,7 +645,7 @@ export default function SettingsTV() {
            formatValue={(v) => `${v.toFixed(1)}x`}
          />
          <TVSettingsStepper
-            label={t("home.settings.subtitles.mpv_subtitle_margin_y")}
+            label='Vertical Margin'
            value={settings.mpvSubtitleMarginY ?? 0}
            onDecrease={() => {
              const newValue = Math.max(
@@ -663,11 +663,11 @@ export default function SettingsTV() {
            }}
          />
          <TVSettingsOptionButton
-            label={t("home.settings.subtitles.mpv_subtitle_align_x")}
+            label='Horizontal Alignment'
            value={alignXLabel}
            onPress={() =>
              showOptions({
-                title: t("home.settings.subtitles.mpv_subtitle_align_x"),
+                title: "Horizontal Alignment",
                options: alignXOptions,
                onSelect: (value) =>
                  updateSettings({
@@ -677,11 +677,11 @@ export default function SettingsTV() {
            }
          />
          <TVSettingsOptionButton
-            label={t("home.settings.subtitles.mpv_subtitle_align_y")}
+            label='Vertical Alignment'
            value={alignYLabel}
            onPress={() =>
              showOptions({
-                title: t("home.settings.subtitles.mpv_subtitle_align_y"),
+                title: "Vertical Alignment",
                options: alignYOptions,
                onSelect: (value) =>
                  updateSettings({
--- a/app/(auth)/(tabs)/(home)/settings/appearance/hide-libraries/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/appearance/hide-libraries/page.tsx
@@ -2,9 +2,8 @@ import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
 import { useTranslation } from "react-i18next";
-import { ScrollView, View } from "react-native";
+import { ScrollView, Switch, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
 import { ListGroup } from "@/components/list/ListGroup";
@@ -51,12 +50,12 @@ export default function AppearanceHideLibrariesPage() {
    >
      <DisabledSetting
        disabled={pluginSettings?.hiddenLibraries?.locked === true}
-        className='px-4 pt-4'
+        className='px-4'
      >
        <ListGroup title={t("home.settings.other.hide_libraries")}>
          {data?.map((view) => (
            <ListItem key={view.Id} title={view.Name} onPress={() => {}}>
-              <SettingSwitch
+              <Switch
                value={settings.hiddenLibraries?.includes(view.Id!) || false}
                onValueChange={(value) => {
                  updateSettings({
@@ -72,7 +71,7 @@ export default function AppearanceHideLibrariesPage() {
          ))}
        </ListGroup>
        <Text className='px-4 text-xs text-neutral-500 mt-1'>
-          {t("home.settings.other.select_libraries_you_want_to_hide")}
+          {t("home.settings.other.select_liraries_you_want_to_hide")}
        </Text>
      </DisabledSetting>
    </ScrollView>
--- a/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
@@ -2,8 +2,7 @@ import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
 import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
 import { ListGroup } from "@/components/list/ListGroup";
@@ -47,7 +46,7 @@ export default function HideLibrariesPage() {
      <ListGroup>
        {data?.map((view) => (
          <ListItem key={view.Id} title={view.Name} onPress={() => {}}>
-            <SettingSwitch
+            <Switch
              value={settings.hiddenLibraries?.includes(view.Id!) || false}
              onValueChange={(value) => {
                updateSettings({
@@ -61,7 +60,7 @@ export default function HideLibrariesPage() {
        ))}
      </ListGroup>
      <Text className='px-4 text-xs text-neutral-500 mt-1'>
-        {t("home.settings.other.select_libraries_you_want_to_hide")}
+        {t("home.settings.other.select_liraries_you_want_to_hide")}
      </Text>
    </DisabledSetting>
  );
--- a/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
@@ -1,6 +1,4 @@
-import { Ionicons } from "@expo/vector-icons";
 import { File, Paths } from "expo-file-system";
-import { requireOptionalNativeModule } from "expo-modules-core";
 import { useNavigation } from "expo-router";
 import type * as SharingType from "expo-sharing";
 import { useCallback, useEffect, useId, useMemo, useState } from "react";
@@ -8,7 +6,6 @@ import { useTranslation } from "react-i18next";
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import Collapsible from "react-native-collapsible";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { toast } from "sonner-native";
 import { Text } from "@/components/common/Text";
 import { FilterButton } from "@/components/filters/FilterButton";
 import { Loader } from "@/components/Loader";
@@ -75,25 +72,6 @@ export default function Page() {
    }
  }, [filteredLogs, Sharing]);

-  const copyLog = useCallback(
-    async (log: NonNullable<typeof logs>[number]) => {
-      // Skip on builds that don't ship the expo-clipboard native module
-      // (probe returns null instead of throwing); same guard as Quick Connect.
-      if (!requireOptionalNativeModule("ExpoClipboard")) return;
-      const Clipboard = await import("expo-clipboard");
-      const text = [
-        `[${log.level}] ${new Date(log.timestamp).toLocaleString()}`,
-        log.message,
-        log.data ? JSON.stringify(log.data, null, 2) : null,
-      ]
-        .filter(Boolean)
-        .join("\n");
-      await Clipboard.setStringAsync(text);
-      toast.success(t("home.settings.logs.copied"));
-    },
-    [logs, t],
-  );
-
  useEffect(() => {
    if (Platform.isTV) return;

@@ -110,15 +88,8 @@ export default function Page() {
  }, [share, loading]);

  return (
-    <ScrollView
-      // Like the sibling settings pages, let iOS auto-inset the content below the
-      // transparent header (no manual header-height math). The filter bar is a
-      // sticky header so it stays pinned just under the header while logs scroll.
-      contentInsetAdjustmentBehavior='automatic'
-      stickyHeaderIndices={[0]}
-      contentContainerStyle={{ paddingBottom: insets.bottom }}
-    >
-      <View className='flex flex-row justify-end py-2 px-4 space-x-2 bg-black'>
+    <View className='flex-1'>
+      <View className='flex flex-row justify-end py-2 px-4 space-x-2'>
        <FilterButton
          id={orderFilterId}
          queryKey='log'
@@ -141,77 +112,67 @@ export default function Page() {
          multiple={true}
        />
      </View>
-      <View className='flex flex-col space-y-2 px-4'>
-        {filteredLogs?.map((log, index) => (
-          <View className='bg-neutral-900 rounded-xl p-3' key={index}>
-            <TouchableOpacity
-              disabled={!log.data}
-              onPress={() =>
-                setState((v) => ({
-                  ...v,
-                  [log.timestamp]: !v[log.timestamp],
-                }))
-              }
-            >
-              <View className='flex flex-row justify-between'>
-                <Text
-                  className={`mb-1
+      <ScrollView
+        className='pb-4 px-4'
+        contentContainerStyle={{ paddingBottom: insets.bottom }}
+      >
+        <View className='flex flex-col space-y-2'>
+          {filteredLogs?.map((log, index) => (
+            <View className='bg-neutral-900 rounded-xl p-3' key={index}>
+              <TouchableOpacity
+                disabled={!log.data}
+                onPress={() =>
+                  setState((v) => ({
+                    ...v,
+                    [log.timestamp]: !v[log.timestamp],
+                  }))
+                }
+              >
+                <View className='flex flex-row justify-between'>
+                  <Text
+                    className={`mb-1
                      ${log.level === "INFO" && "text-blue-500"}
                      ${log.level === "ERROR" && "text-red-500"}
                      ${log.level === "DEBUG" && "text-purple-500"}
                    `}
-                >
-                  {log.level}
-                </Text>
-
-                <Text className='text-xs'>
-                  {new Date(log.timestamp).toLocaleString()}
-                </Text>
-              </View>
-              <Text className='text-xs'>{log.message}</Text>
-              {/* Keep the whole collapsed row tappable: the hint lives inside
-                  the toggle so tapping it expands too. */}
-              {log.data && !state[log.timestamp] && (
-                <Text className='text-xs mt-0.5'>
-                  {t("home.settings.logs.click_for_more_info")}
-                </Text>
-              )}
-            </TouchableOpacity>
-
-            {log.data && (
-              <Collapsible collapsed={!state[log.timestamp]}>
-                <View className='mt-2 flex flex-col space-y-2'>
-                  <ScrollView
-                    className='rounded-xl'
-                    style={codeBlockStyle}
-                    nestedScrollEnabled
                  >
-                    {/* Only the raw payload is selectable (per request); the
-                        header/message stay tap-to-toggle. */}
-                    <Text selectable>{JSON.stringify(log.data, null, 2)}</Text>
-                  </ScrollView>
-                  {!Platform.isTV && (
-                    <TouchableOpacity
-                      onPress={() => copyLog(log)}
-                      className='flex flex-row items-center self-end px-2 py-1'
-                    >
-                      <Ionicons name='copy-outline' size={16} color='white' />
-                      <Text className='text-xs ml-1'>
-                        {t("home.settings.logs.copy")}
-                      </Text>
-                    </TouchableOpacity>
-                  )}
+                    {log.level}
+                  </Text>
+
+                  <Text className='text-xs'>
+                    {new Date(log.timestamp).toLocaleString()}
+                  </Text>
                </View>
-              </Collapsible>
-            )}
-          </View>
-        ))}
-        {filteredLogs?.length === 0 && (
-          <Text className='opacity-50'>
-            {t("home.settings.logs.no_logs_available")}
-          </Text>
-        )}
-      </View>
-    </ScrollView>
+                <Text selectable className='text-xs'>
+                  {log.message}
+                </Text>
+              </TouchableOpacity>
+
+              {log.data && (
+                <>
+                  {!state[log.timestamp] && (
+                    <Text className='text-xs mt-0.5'>
+                      {t("home.settings.logs.click_for_more_info")}
+                    </Text>
+                  )}
+                  <Collapsible collapsed={!state[log.timestamp]}>
+                    <View className='mt-2 flex flex-col space-y-2'>
+                      <ScrollView className='rounded-xl' style={codeBlockStyle}>
+                        <Text>{JSON.stringify(log.data, null, 2)}</Text>
+                      </ScrollView>
+                    </View>
+                  </Collapsible>
+                </>
+              )}
+            </View>
+          ))}
+          {filteredLogs?.length === 0 && (
+            <Text className='opacity-50'>
+              {t("home.settings.logs.no_logs_available")}
+            </Text>
+          )}
+        </View>
+      </ScrollView>
+    </View>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/music/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/music/page.tsx
@@ -3,9 +3,9 @@ import { useQuery } from "@tanstack/react-query";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, ScrollView, View } from "react-native";
+import { Switch } from "react-native-gesture-handler";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
@@ -136,7 +136,7 @@ export default function MusicSettingsPage() {
            title={t("home.settings.music.prefer_downloaded")}
            disabled={pluginSettings?.preferLocalAudio?.locked}
          >
-            <SettingSwitch
+            <Switch
              value={settings.preferLocalAudio}
              disabled={pluginSettings?.preferLocalAudio?.locked}
              onValueChange={(value) =>
@@ -159,7 +159,7 @@ export default function MusicSettingsPage() {
              title={t("home.settings.music.lookahead_enabled")}
              disabled={pluginSettings?.audioLookaheadEnabled?.locked}
            >
-              <SettingSwitch
+              <Switch
                value={settings.audioLookaheadEnabled}
                disabled={pluginSettings?.audioLookaheadEnabled?.locked}
                onValueChange={(value) =>
@@ -233,7 +233,7 @@ export default function MusicSettingsPage() {
                })}
              />
            </ListGroup>
-            <ListGroup className='mt-4'>
+            <ListGroup>
              <ListItem
                textColor='red'
                onPress={onDeleteDownloadedSongsClicked}
--- a/app/(auth)/(tabs)/(home)/settings/playback-controls/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/playback-controls/page.tsx
@@ -17,14 +17,13 @@ export default function PlaybackControlsPage() {
      contentContainerStyle={{
        paddingLeft: insets.left,
        paddingRight: insets.right,
-        paddingBottom: insets.bottom,
      }}
    >
      <View
        className='p-4 flex flex-col'
        style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
      >
-        <View>
+        <View className='mb-4'>
          <MediaProvider>
            <MediaToggles className='mb-4' />
            <GestureControls className='mb-4' />
--- a/app/(auth)/(tabs)/(home)/settings/plugins/jellyseerr/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/jellyseerr/page.tsx
@@ -1,8 +1,11 @@
-import { ScrollView, View } from "react-native";
+import { ScrollView } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import DisabledSetting from "@/components/settings/DisabledSetting";
 import { JellyseerrSettings } from "@/components/settings/Jellyseerr";
+import { useSettings } from "@/utils/atoms/settings";

 export default function JellyseerrPluginPage() {
+  const { pluginSettings } = useSettings();
  const insets = useSafeAreaInsets();

  return (
@@ -13,9 +16,12 @@ export default function JellyseerrPluginPage() {
        paddingRight: insets.right,
      }}
    >
-      <View className='p-4'>
+      <DisabledSetting
+        disabled={pluginSettings?.jellyseerrServerUrl?.locked === true}
+        className='p-4'
+      >
        <JellyseerrSettings />
-      </View>
+      </DisabledSetting>
    </ScrollView>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/plugins/kefinTweaks/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/kefinTweaks/page.tsx
@@ -1,8 +1,11 @@
-import { ScrollView, View } from "react-native";
+import { ScrollView } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import DisabledSetting from "@/components/settings/DisabledSetting";
 import { KefinTweaksSettings } from "@/components/settings/KefinTweaks";
+import { useSettings } from "@/utils/atoms/settings";

 export default function KefinTweaksPage() {
+  const { pluginSettings } = useSettings();
  const insets = useSafeAreaInsets();

  return (
@@ -13,9 +16,12 @@ export default function KefinTweaksPage() {
        paddingRight: insets.right,
      }}
    >
-      <View className='px-4 pt-4'>
+      <DisabledSetting
+        disabled={pluginSettings?.useKefinTweaks?.locked === true}
+        className='p-4'
+      >
        <KefinTweaksSettings />
-      </View>
+      </DisabledSetting>
    </ScrollView>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/plugins/marlin-search/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/marlin-search/page.tsx
@@ -1,35 +1,35 @@
 import { useNavigation } from "expo-router";
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
  Linking,
  ScrollView,
+  Switch,
  TextInput,
  TouchableOpacity,
  View,
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
+import DisabledSetting from "@/components/settings/DisabledSetting";
 import { useNetworkAwareQueryClient } from "@/hooks/useNetworkAwareQueryClient";
 import { useSettings } from "@/utils/atoms/settings";

 export default function MarlinSearchPage() {
  const navigation = useNavigation();
+
  const { t } = useTranslation();
+
  const insets = useSafeAreaInsets();
+
  const { settings, updateSettings, pluginSettings } = useSettings();
  const queryClient = useNetworkAwareQueryClient();

  const [value, setValue] = useState<string>(settings?.marlinServerUrl || "");

-  const searchEngineLocked = pluginSettings?.searchEngine?.locked === true;
-  const marlinUrlLocked = pluginSettings?.marlinServerUrl?.locked === true;
-  const hasStreamystats = !!pluginSettings?.streamyStatsServerUrl?.value;
-
  const onSave = (val: string) => {
    updateSettings({
      marlinServerUrl: !val.endsWith("/") ? val : val.slice(0, -1),
@@ -41,8 +41,15 @@ export default function MarlinSearchPage() {
    Linking.openURL("https://github.com/fredrikburmester/marlin-search");
  };

+  const disabled = useMemo(() => {
+    return (
+      pluginSettings?.searchEngine?.locked === true &&
+      pluginSettings?.marlinServerUrl?.locked === true
+    );
+  }, [pluginSettings]);
+
  useEffect(() => {
-    if (!marlinUrlLocked) {
+    if (!pluginSettings?.marlinServerUrl?.locked) {
      navigation.setOptions({
        headerRight: () => (
          <TouchableOpacity onPress={() => onSave(value)} className='px-2'>
@@ -53,7 +60,7 @@ export default function MarlinSearchPage() {
        ),
      });
    }
-  }, [navigation, value, marlinUrlLocked, t]);
+  }, [navigation, value, pluginSettings?.marlinServerUrl?.locked, t]);

  if (!settings) return null;

@@ -65,39 +72,52 @@ export default function MarlinSearchPage() {
        paddingRight: insets.right,
      }}
    >
-      <View className='px-4 pt-4'>
+      <DisabledSetting disabled={disabled} className='px-4'>
        <ListGroup>
-          {/* disabledByAdmin renders the "Disabled by admin" notice as the row's
-              subtitle (same pattern as the Streamystats settings) — no clipping. */}
-          <ListItem
-            title={t(
-              "home.settings.plugins.marlin_search.enable_marlin_search",
-            )}
-            disabledByAdmin={searchEngineLocked}
-            onPress={() => {
-              updateSettings({ searchEngine: "Jellyfin" });
-              queryClient.invalidateQueries({ queryKey: ["search"] });
-            }}
+          <DisabledSetting
+            disabled={
+              pluginSettings?.searchEngine?.locked === true ||
+              !!pluginSettings?.streamyStatsServerUrl?.value
+            }
+            showText={!pluginSettings?.marlinServerUrl?.locked}
          >
-            <SettingSwitch
-              value={settings.searchEngine === "Marlin"}
-              disabled={searchEngineLocked || hasStreamystats}
-              onValueChange={(val) => {
-                updateSettings({ searchEngine: val ? "Marlin" : "Jellyfin" });
+            <ListItem
+              title={t(
+                "home.settings.plugins.marlin_search.enable_marlin_search",
+              )}
+              onPress={() => {
+                updateSettings({ searchEngine: "Jellyfin" });
                queryClient.invalidateQueries({ queryKey: ["search"] });
              }}
-            />
-          </ListItem>
+            >
+              <Switch
+                value={settings.searchEngine === "Marlin"}
+                disabled={!!pluginSettings?.streamyStatsServerUrl?.value}
+                onValueChange={(value) => {
+                  updateSettings({
+                    searchEngine: value ? "Marlin" : "Jellyfin",
+                  });
+                  queryClient.invalidateQueries({ queryKey: ["search"] });
+                }}
+              />
+            </ListItem>
+          </DisabledSetting>
        </ListGroup>

-        <ListGroup className='mt-2'>
-          <ListItem
-            title={t("home.settings.plugins.marlin_search.url")}
-            disabledByAdmin={marlinUrlLocked}
+        <DisabledSetting
+          disabled={pluginSettings?.marlinServerUrl?.locked === true}
+          showText={!pluginSettings?.searchEngine?.locked}
+          className='mt-2 flex flex-col rounded-xl overflow-hidden pl-4 bg-neutral-900 px-4'
+        >
+          <View
+            className={"flex flex-row items-center bg-neutral-900 h-11 pr-4"}
          >
+            <Text className='mr-4'>
+              {t("home.settings.plugins.marlin_search.url")}
+            </Text>
            <TextInput
-              editable={!marlinUrlLocked && settings.searchEngine === "Marlin"}
-              className='text-white text-right flex-1'
+              editable={settings.searchEngine === "Marlin"}
+              className='text-white'
              placeholder={t(
                "home.settings.plugins.marlin_search.server_url_placeholder",
              )}
@@ -108,16 +128,15 @@ export default function MarlinSearchPage() {
              textContentType='URL'
              onChangeText={(text) => setValue(text)}
            />
-          </ListItem>
-        </ListGroup>
-
+          </View>
+        </DisabledSetting>
        <Text className='px-4 text-xs text-neutral-500 mt-1'>
          {t("home.settings.plugins.marlin_search.marlin_search_hint")}{" "}
          <Text className='text-blue-500' onPress={handleOpenLink}>
            {t("home.settings.plugins.marlin_search.read_more_about_marlin")}
          </Text>
        </Text>
-      </View>
+      </DisabledSetting>
    </ScrollView>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/plugins/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/page.tsx
@@ -1,21 +1,9 @@
-import { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
+import { Platform, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { toast } from "sonner-native";
-import { Text } from "@/components/common/Text";
 import { PluginSettings } from "@/components/settings/PluginSettings";
-import { useSettings } from "@/utils/atoms/settings";

 export default function PluginsPage() {
  const insets = useSafeAreaInsets();
-  const { t } = useTranslation();
-  const { refreshStreamyfinPluginSettings } = useSettings();
-
-  const handleRefreshFromServer = useCallback(async () => {
-    await refreshStreamyfinPluginSettings();
-    toast.success(t("home.settings.plugins.streamystats.toasts.refreshed"));
-  }, [refreshStreamyfinPluginSettings, t]);

  return (
    <ScrollView
@@ -30,17 +18,6 @@ export default function PluginsPage() {
        style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
      >
        <PluginSettings />
-
-        {/* Pulls the centralised Streamyfin plugin settings for every plugin,
-            so it lives on the plugins index rather than inside Streamystats. */}
-        <TouchableOpacity
-          onPress={handleRefreshFromServer}
-          className='py-3 rounded-xl bg-neutral-800'
-        >
-          <Text className='text-center text-blue-500'>
-            {t("home.settings.plugins.streamystats.refresh_from_server")}
-          </Text>
-        </TouchableOpacity>
      </View>
    </ScrollView>
  );
--- a/app/(auth)/(tabs)/(home)/settings/plugins/streamystats/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/streamystats/page.tsx
@@ -4,13 +4,13 @@ import { useTranslation } from "react-i18next";
 import {
  Linking,
  ScrollView,
+  Switch,
  TextInput,
  TouchableOpacity,
  View,
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
@@ -22,7 +22,12 @@ export default function StreamystatsPage() {
  const navigation = useNavigation();
  const insets = useSafeAreaInsets();

-  const { settings, updateSettings, pluginSettings } = useSettings();
+  const {
+    settings,
+    updateSettings,
+    pluginSettings,
+    refreshStreamyfinPluginSettings,
+  } = useSettings();
  const queryClient = useNetworkAwareQueryClient();

  // Local state for all editable fields
@@ -44,21 +49,7 @@ export default function StreamystatsPage() {
  );

  const isUrlLocked = pluginSettings?.streamyStatsServerUrl?.locked === true;
-  const searchLocked = pluginSettings?.searchEngine?.locked === true;
-  const movieRecsLocked =
-    pluginSettings?.streamyStatsMovieRecommendations?.locked === true;
-  const seriesRecsLocked =
-    pluginSettings?.streamyStatsSeriesRecommendations?.locked === true;
-  const promotedWatchlistsLocked =
-    pluginSettings?.streamyStatsPromotedWatchlists?.locked === true;
-  const hideWatchlistsTabLocked =
-    pluginSettings?.hideWatchlistsTab?.locked === true;
-  // The input renders the locked admin URL; enablement must follow the same
-  // effective value or every toggle stays disabled until local state syncs.
-  const effectiveUrl = isUrlLocked
-    ? (settings?.streamyStatsServerUrl ?? "")
-    : url;
-  const isStreamystatsEnabled = !!effectiveUrl;
+  const isStreamystatsEnabled = !!url;

  const onSave = useCallback(() => {
    const cleanUrl = url.endsWith("/") ? url.slice(0, -1) : url;
@@ -122,6 +113,17 @@ export default function StreamystatsPage() {
    Linking.openURL("https://github.com/fredrikburmester/streamystats");
  };

+  const handleRefreshFromServer = useCallback(async () => {
+    const newPluginSettings = await refreshStreamyfinPluginSettings();
+    // Update local state with new values
+    const newUrl = newPluginSettings?.streamyStatsServerUrl?.value || "";
+    setUrl(newUrl);
+    if (newUrl) {
+      setUseForSearch(true);
+    }
+    toast.success(t("home.settings.plugins.streamystats.toasts.refreshed"));
+  }, [refreshStreamyfinPluginSettings, t]);
+
  if (!settings) return null;

  return (
@@ -132,7 +134,7 @@ export default function StreamystatsPage() {
        paddingRight: insets.right,
      }}
    >
-      <View className='px-4 pt-4'>
+      <View className='px-4'>
        <ListGroup className='flex-1'>
          <ListItem
            title={t("home.settings.plugins.streamystats.url")}
@@ -144,7 +146,7 @@ export default function StreamystatsPage() {
              placeholder={t(
                "home.settings.plugins.streamystats.server_url_placeholder",
              )}
-              value={effectiveUrl}
+              value={url}
              keyboardType='url'
              returnKeyType='done'
              autoCapitalize='none'
@@ -169,18 +171,11 @@ export default function StreamystatsPage() {
        >
          <ListItem
            title={t("home.settings.plugins.streamystats.enable_search")}
-            disabledByAdmin={searchLocked}
+            disabledByAdmin={pluginSettings?.searchEngine?.locked === true}
          >
-            {/* Locked controls show the live admin value and can't be toggled —
-                local form state would let the switch flip while the write guard
-                drops the change. */}
-            <SettingSwitch
-              value={
-                searchLocked
-                  ? settings?.searchEngine === "Streamystats"
-                  : useForSearch
-              }
-              disabled={!isStreamystatsEnabled || searchLocked}
+            <Switch
+              value={useForSearch}
+              disabled={!isStreamystatsEnabled}
              onValueChange={setUseForSearch}
            />
          </ListItem>
@@ -188,62 +183,52 @@ export default function StreamystatsPage() {
            title={t(
              "home.settings.plugins.streamystats.enable_movie_recommendations",
            )}
-            disabledByAdmin={movieRecsLocked}
+            disabledByAdmin={
+              pluginSettings?.streamyStatsMovieRecommendations?.locked === true
+            }
          >
-            <SettingSwitch
-              value={
-                movieRecsLocked
-                  ? (settings?.streamyStatsMovieRecommendations ?? false)
-                  : movieRecs
-              }
+            <Switch
+              value={movieRecs}
              onValueChange={setMovieRecs}
-              disabled={!isStreamystatsEnabled || movieRecsLocked}
+              disabled={!isStreamystatsEnabled}
            />
          </ListItem>
          <ListItem
            title={t(
              "home.settings.plugins.streamystats.enable_series_recommendations",
            )}
-            disabledByAdmin={seriesRecsLocked}
+            disabledByAdmin={
+              pluginSettings?.streamyStatsSeriesRecommendations?.locked === true
+            }
          >
-            <SettingSwitch
-              value={
-                seriesRecsLocked
-                  ? (settings?.streamyStatsSeriesRecommendations ?? false)
-                  : seriesRecs
-              }
+            <Switch
+              value={seriesRecs}
              onValueChange={setSeriesRecs}
-              disabled={!isStreamystatsEnabled || seriesRecsLocked}
+              disabled={!isStreamystatsEnabled}
            />
          </ListItem>
          <ListItem
            title={t(
              "home.settings.plugins.streamystats.enable_promoted_watchlists",
            )}
-            disabledByAdmin={promotedWatchlistsLocked}
+            disabledByAdmin={
+              pluginSettings?.streamyStatsPromotedWatchlists?.locked === true
+            }
          >
-            <SettingSwitch
-              value={
-                promotedWatchlistsLocked
-                  ? (settings?.streamyStatsPromotedWatchlists ?? false)
-                  : promotedWatchlists
-              }
+            <Switch
+              value={promotedWatchlists}
              onValueChange={setPromotedWatchlists}
-              disabled={!isStreamystatsEnabled || promotedWatchlistsLocked}
+              disabled={!isStreamystatsEnabled}
            />
          </ListItem>
          <ListItem
            title={t("home.settings.plugins.streamystats.hide_watchlists_tab")}
-            disabledByAdmin={hideWatchlistsTabLocked}
+            disabledByAdmin={pluginSettings?.hideWatchlistsTab?.locked === true}
          >
-            <SettingSwitch
-              value={
-                hideWatchlistsTabLocked
-                  ? (settings?.hideWatchlistsTab ?? false)
-                  : hideWatchlistsTab
-              }
+            <Switch
+              value={hideWatchlistsTab}
              onValueChange={setHideWatchlistsTab}
-              disabled={!isStreamystatsEnabled || hideWatchlistsTabLocked}
+              disabled={!isStreamystatsEnabled}
            />
          </ListItem>
        </ListGroup>
@@ -251,6 +236,15 @@ export default function StreamystatsPage() {
          {t("home.settings.plugins.streamystats.home_sections_hint")}
        </Text>

+        <TouchableOpacity
+          onPress={handleRefreshFromServer}
+          className='mt-6 py-3 rounded-xl bg-neutral-800'
+        >
+          <Text className='text-center text-blue-500'>
+            {t("home.settings.plugins.streamystats.refresh_from_server")}
+          </Text>
+        </TouchableOpacity>
+
        {/* Disable button - only show if URL is not locked and Streamystats is enabled */}
        {!isUrlLocked && isStreamystatsEnabled && (
          <TouchableOpacity
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/collections/[collectionId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/collections/[collectionId].tsx
@@ -134,12 +134,6 @@ const page: React.FC = () => {
  useEffect(() => {
    navigation.setOptions({ title: collection?.Name || "" });
    setSortOrder([SortOrderOption.Ascending]);
-    // Collections open with a clean filter slate: the genre/year/tag atoms are
-    // global, so without this the previously viewed library's selection bleeds
-    // in (libraries now keep their own per-library memory).
-    setSelectedGenres([]);
-    setSelectedYears([]);
-    setSelectedTags([]);

    if (!collection) return;

@@ -332,7 +326,7 @@ const page: React.FC = () => {
        data={[
          {
            key: "reset",
-            component: <ResetFiltersButton libraryId={collectionId} />,
+            component: <ResetFiltersButton />,
          },
          {
            key: "genre",
--- a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
+++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
@@ -9,12 +9,12 @@ import {
  getItemsApi,
  getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
-import { FlashList, type FlashListRef } from "@shopify/flash-list";
+import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo, useRef } from "react";
+import React, { useCallback, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import {
  FlatList,
@@ -39,7 +39,6 @@ import { TVPosterCard } from "@/components/tv/TVPosterCard";
 import { useScaledTVPosterSizes } from "@/constants/TVPosterSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
-import { useFilterReset } from "@/hooks/useFilterReset";
 import { useOrientation } from "@/hooks/useOrientation";
 import { useRefreshLibraryOnFocus } from "@/hooks/useRefreshLibraryOnFocus";
 import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
@@ -51,9 +50,7 @@ import {
  FilterByPreferenceAtom,
  filterByAtom,
  genreFilterAtom,
-  genrePreferenceAtom,
  getFilterByPreference,
-  getMultiFilterPreference,
  getSortByPreference,
  getSortOrderPreference,
  SortByOption,
@@ -64,11 +61,9 @@ import {
  sortOrderAtom,
  sortOrderOptions,
  sortOrderPreferenceAtom,
-  tagPreferenceAtom,
  tagsFilterAtom,
  useFilterOptions,
  yearFilterAtom,
-  yearPreferenceAtom,
 } from "@/utils/atoms/filters";
 import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
@@ -107,9 +102,6 @@ const Page = () => {
  const [sortOrderPreference, setOrderByPreference] = useAtom(
    sortOrderPreferenceAtom,
  );
-  const [genrePreference, setGenrePreference] = useAtom(genrePreferenceAtom);
-  const [yearPreference, setYearPreference] = useAtom(yearPreferenceAtom);
-  const [tagPreference, setTagPreference] = useAtom(tagPreferenceAtom);

  const { orientation } = useOrientation();

@@ -191,13 +183,6 @@ const Page = () => {
      const fp = getFilterByPreference(libraryId, filterByPreference);
      _setFilterBy(fp ? [fp] : []);
    }
-
-    // Genres / years / tags: per-library saved preference (no URL params), so
-    // switching libraries restores each library's own selection instead of
-    // bleeding the previous one.
-    setSelectedGenres(getMultiFilterPreference(libraryId, genrePreference));
-    setSelectedYears(getMultiFilterPreference(libraryId, yearPreference));
-    setSelectedTags(getMultiFilterPreference(libraryId, tagPreference));
  }, [
    libraryId,
    sortOrderPreference,
@@ -206,12 +191,6 @@ const Page = () => {
    _setSortBy,
    filterByPreference,
    _setFilterBy,
-    genrePreference,
-    yearPreference,
-    tagPreference,
-    setSelectedGenres,
-    setSelectedYears,
-    setSelectedTags,
    searchParams.sortBy,
    searchParams.sortOrder,
    searchParams.filterBy,
@@ -256,32 +235,6 @@ const Page = () => {
    [libraryId, filterByPreference, setFilterByPreference, _setFilterBy],
  );

-  // Genres / years / tags: save the per-library memory then update the active
-  // atom (mirrors setSortBy; avoids a save-effect that would corrupt on switch).
-  const setGenres = useCallback(
-    (genres: string[]) => {
-      setGenrePreference({ ...genrePreference, [libraryId]: genres });
-      setSelectedGenres(genres);
-    },
-    [libraryId, genrePreference, setGenrePreference, setSelectedGenres],
-  );
-
-  const setYears = useCallback(
-    (years: string[]) => {
-      setYearPreference({ ...yearPreference, [libraryId]: years });
-      setSelectedYears(years);
-    },
-    [libraryId, yearPreference, setYearPreference, setSelectedYears],
-  );
-
-  const setTags = useCallback(
-    (tags: string[]) => {
-      setTagPreference({ ...tagPreference, [libraryId]: tags });
-      setSelectedTags(tags);
-    },
-    [libraryId, tagPreference, setTagPreference, setSelectedTags],
-  );
-
  const nrOfCols = useMemo(() => {
    if (Platform.isTV) {
      // TV uses flexWrap, so nrOfCols is just for mobile
@@ -423,29 +376,6 @@ const Page = () => {
    );
  }, [data]);

-  const flashListRef = useRef<FlashListRef<BaseItemDto>>(null);
-
-  // Jump the grid to the top when the filters/sort change (incl. reset).
-  const filterSignature = `${selectedGenres}|${selectedYears}|${selectedTags}|${sortBy[0]}|${sortOrder[0]}|${filterBy}`;
-  const pendingScrollTopRef = useRef(false);
-
-  // Instant feedback: pin to the top the moment the filters change, without
-  // waiting for the new fetch — and flag a re-pin for once it settles.
-  useEffect(() => {
-    flashListRef.current?.scrollToOffset({ offset: 0, animated: false });
-    pendingScrollTopRef.current = true;
-  }, [filterSignature]);
-
-  // Safety net: FlashList can restore the previous offset as the filtered list
-  // grows, so re-pin once the fetch settles. Pagination keeps the same
-  // signature, so it never re-pins.
-  useEffect(() => {
-    if (pendingScrollTopRef.current && !isFetching) {
-      pendingScrollTopRef.current = false;
-      flashListRef.current?.scrollToOffset({ offset: 0, animated: false });
-    }
-  }, [isFetching, flatData]);
-
  const renderItem = useCallback(
    ({ item, index }: { item: BaseItemDto; index: number }) => (
      <TouchableItemRouter
@@ -576,7 +506,7 @@ const Page = () => {
        data={[
          {
            key: "reset",
-            component: <ResetFiltersButton libraryId={libraryId} />,
+            component: <ResetFiltersButton />,
          },
          {
            key: "genre",
@@ -595,7 +525,7 @@ const Page = () => {
                  });
                  return response.data.Genres || [];
                }}
-                set={setGenres}
+                set={setSelectedGenres}
                values={selectedGenres}
                title={t("library.filters.genres")}
                renderItemLabel={(item) => item.toString()}
@@ -622,7 +552,7 @@ const Page = () => {
                  });
                  return response.data.Years || [];
                }}
-                set={setYears}
+                set={setSelectedYears}
                values={selectedYears}
                title={t("library.filters.years")}
                renderItemLabel={(item) => item.toString()}
@@ -647,7 +577,7 @@ const Page = () => {
                  });
                  return response.data.Tags || [];
                }}
-                set={setTags}
+                set={setSelectedTags}
                values={selectedTags}
                title={t("library.filters.tags")}
                renderItemLabel={(item) => item.toString()}
@@ -727,11 +657,11 @@ const Page = () => {
      api,
      user?.Id,
      selectedGenres,
-      setGenres,
+      setSelectedGenres,
      selectedYears,
-      setYears,
+      setSelectedYears,
      selectedTags,
-      setTags,
+      setSelectedTags,
      sortBy,
      setSortBy,
      sortOrder,
@@ -743,9 +673,19 @@ const Page = () => {
    ],
  );

-  // Filter bar reset + visibility, shared with the mobile ResetFiltersButton so
-  // sort/order can't be forgotten on one path (it used to be reset on neither).
-  const { hasActiveFilters, resetAllFilters } = useFilterReset(libraryId);
+  // TV Filter bar header
+  const hasActiveFilters =
+    selectedGenres.length > 0 ||
+    selectedYears.length > 0 ||
+    selectedTags.length > 0 ||
+    filterBy.length > 0;
+
+  const resetAllFilters = useCallback(() => {
+    setSelectedGenres([]);
+    setSelectedYears([]);
+    setSelectedTags([]);
+    _setFilterBy([]);
+  }, [setSelectedGenres, setSelectedYears, setSelectedTags, _setFilterBy]);

  // TV Filter options - with "All" option for clearable filters
  const tvGenreFilterOptions = useMemo(
@@ -839,15 +779,15 @@ const Page = () => {
      options: tvGenreFilterOptions,
      onSelect: (value: string) => {
        if (value === "__all__") {
-          setGenres([]);
+          setSelectedGenres([]);
        } else if (selectedGenres.includes(value)) {
-          setGenres(selectedGenres.filter((g) => g !== value));
+          setSelectedGenres(selectedGenres.filter((g) => g !== value));
        } else {
-          setGenres([...selectedGenres, value]);
+          setSelectedGenres([...selectedGenres, value]);
        }
      },
    });
-  }, [showOptions, t, tvGenreFilterOptions, selectedGenres, setGenres]);
+  }, [showOptions, t, tvGenreFilterOptions, selectedGenres, setSelectedGenres]);

  const handleShowYearFilter = useCallback(() => {
    showOptions({
@@ -855,15 +795,15 @@ const Page = () => {
      options: tvYearFilterOptions,
      onSelect: (value: string) => {
        if (value === "__all__") {
-          setYears([]);
+          setSelectedYears([]);
        } else if (selectedYears.includes(value)) {
-          setYears(selectedYears.filter((y) => y !== value));
+          setSelectedYears(selectedYears.filter((y) => y !== value));
        } else {
-          setYears([...selectedYears, value]);
+          setSelectedYears([...selectedYears, value]);
        }
      },
    });
-  }, [showOptions, t, tvYearFilterOptions, selectedYears, setYears]);
+  }, [showOptions, t, tvYearFilterOptions, selectedYears, setSelectedYears]);

  const handleShowTagFilter = useCallback(() => {
    showOptions({
@@ -871,15 +811,15 @@ const Page = () => {
      options: tvTagFilterOptions,
      onSelect: (value: string) => {
        if (value === "__all__") {
-          setTags([]);
+          setSelectedTags([]);
        } else if (selectedTags.includes(value)) {
-          setTags(selectedTags.filter((tag) => tag !== value));
+          setSelectedTags(selectedTags.filter((tag) => tag !== value));
        } else {
-          setTags([...selectedTags, value]);
+          setSelectedTags([...selectedTags, value]);
        }
      },
    });
-  }, [showOptions, t, tvTagFilterOptions, selectedTags, setTags]);
+  }, [showOptions, t, tvTagFilterOptions, selectedTags, setSelectedTags]);

  const handleShowSortByFilter = useCallback(() => {
    showOptions({
@@ -928,7 +868,6 @@ const Page = () => {
  if (!Platform.isTV) {
    return (
      <FlashList
-        ref={flashListRef}
        key={orientation}
        ListEmptyComponent={
          <View className='flex flex-col items-center justify-center h-full'>
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/artists.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/artists.tsx
@@ -89,7 +89,7 @@ export default function ArtistsScreen() {
    return (
      <View className='flex-1 justify-center items-center bg-black px-6'>
        <Text className='text-neutral-500 text-center'>
-          {t("music.missing_library_id")}
+          Missing music library id.
        </Text>
      </View>
    );
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/playlists.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/playlists.tsx
@@ -122,7 +122,7 @@ export default function PlaylistsScreen() {
    return (
      <View className='flex-1 justify-center items-center bg-black px-6'>
        <Text className='text-neutral-500 text-center'>
-          {t("music.missing_library_id")}
+          Missing music library id.
        </Text>
      </View>
    );
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/suggestions.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/suggestions.tsx
@@ -226,7 +226,7 @@ export default function SuggestionsScreen() {
    return (
      <View className='flex-1 justify-center items-center bg-black px-6'>
        <Text className='text-neutral-500 text-center'>
-          {t("music.missing_library_id")}
+          Missing music library id.
        </Text>
      </View>
    );
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -3,16 +3,24 @@ import {
  type NativeBottomTabNavigationEventMap,
  type NativeBottomTabNavigationOptions,
 } from "@bottom-tabs/react-navigation";
-import { withLayoutContext } from "expo-router";
+import { Stack, useSegments, withLayoutContext } from "expo-router";
 import type {
  ParamListBase,
  TabNavigationState,
 } from "expo-router/react-navigation";
+import { useCallback, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
+import type { TVNavBarTab } from "@/components/tv/TVNavBar";
+import { TVNavBar } from "@/components/tv/TVNavBar";
 import { Colors } from "@/constants/Colors";
-import { useTVHomeBackHandler } from "@/hooks/useTVBackHandler";
+import useRouter from "@/hooks/useAppRouter";
+import {
+  isTabRoute,
+  useTVHomeBackHandler,
+  useTVTabRootBackHandler,
+} from "@/hooks/useTVBackHandler";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";

@@ -33,13 +41,108 @@ export const NativeTabs = withLayoutContext<
  NativeBottomTabNavigationEventMap
 >(Navigator);

+const IS_ANDROID_TV = Platform.isTV && Platform.OS === "android";
+
+function TVTabLayout() {
+  const { settings } = useSettings();
+  const { t } = useTranslation();
+  const segments = useSegments();
+  const router = useRouter();
+
+  const currentTab = segments.find(isTabRoute);
+  const lastSegment = segments[segments.length - 1] ?? "";
+  const atTabRoot = isTabRoute(lastSegment) || lastSegment === "index";
+
+  const tabs: TVNavBarTab[] = useMemo(
+    () =>
+      [
+        { key: "(home)", label: t("tabs.home") },
+        { key: "(search)", label: t("tabs.search") },
+        { key: "(favorites)", label: t("tabs.favorites") },
+        !settings?.streamyStatsServerUrl || settings?.hideWatchlistsTab
+          ? null
+          : { key: "(watchlists)", label: t("watchlists.title") },
+        { key: "(libraries)", label: t("tabs.library") },
+        !settings?.showCustomMenuLinks
+          ? null
+          : { key: "(custom-links)", label: t("tabs.custom_links") },
+        { key: "(settings)", label: t("tabs.settings") },
+      ].filter((tab): tab is TVNavBarTab => tab !== null),
+    [
+      settings?.streamyStatsServerUrl,
+      settings?.hideWatchlistsTab,
+      settings?.showCustomMenuLinks,
+      t,
+    ],
+  );
+
+  const activeTabKey = currentTab ?? "(home)";
+
+  const visibleKeys = useMemo(
+    () => new Set(tabs.map((tab) => tab.key)),
+    [tabs],
+  );
+
+  const handleTabChange = useCallback(
+    (key: string) => {
+      if (key === currentTab) return;
+
+      if (key === "(home)") eventBus.emit("scrollToTop");
+      if (key === "(search)") eventBus.emit("searchTabPressed");
+
+      router.replace(`/(auth)/(tabs)/${key}`);
+    },
+    [currentTab, router],
+  );
+
+  const navigateHome = useCallback(() => {
+    router.replace("/(auth)/(tabs)/(home)");
+  }, [router]);
+  useTVTabRootBackHandler(navigateHome, atTabRoot, currentTab);
+
+  // If current tab is no longer visible (setting changed), navigate to home
+  useEffect(() => {
+    if (!visibleKeys.has(activeTabKey) && activeTabKey !== "(home)") {
+      router.replace("/(auth)/(tabs)/(home)");
+    }
+  }, [visibleKeys, activeTabKey, router]);
+
+  return (
+    <View style={{ flex: 1 }}>
+      <SystemBars hidden={false} style='light' />
+      <Stack
+        screenOptions={{ headerShown: false, animation: "none" }}
+        initialRouteName='(home)'
+      >
+        <Stack.Screen name='index' redirect />
+      </Stack>
+      <TVNavBar
+        tabs={tabs}
+        activeTabKey={activeTabKey}
+        onTabChange={handleTabChange}
+        style={{
+          position: "absolute",
+          top: 0,
+          left: 0,
+          right: 0,
+          zIndex: 1000,
+        }}
+      />
+    </View>
+  );
+}
+
 export default function TabLayout() {
  const { settings } = useSettings();
  const { t } = useTranslation();

-  // Handle TV back button - prevent app exit when at root
+  // Must be called before any conditional return (rules of hooks)
  useTVHomeBackHandler();

+  if (IS_ANDROID_TV) {
+    return <TVTabLayout />;
+  }
+
  return (
    <View style={{ flex: 1 }}>
      <SystemBars hidden={false} style='light' />
--- a/app/(auth)/now-playing.tsx
+++ b/app/(auth)/now-playing.tsx
@@ -14,7 +14,6 @@ import React, {
  useRef,
  useState,
 } from "react";
-import { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
  Dimensions,
@@ -73,7 +72,6 @@ const ARTWORK_SIZE = SCREEN_WIDTH - 80;
 type ViewMode = "player" | "queue";

 export default function NowPlayingScreen() {
-  const { t } = useTranslation();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const router = useRouter();
@@ -232,9 +230,7 @@ export default function NowPlayingScreen() {
            paddingBottom: Platform.OS === "android" ? insets.bottom : 0,
          }}
        >
-          <Text className='text-neutral-500'>
-            {t("music.no_track_playing")}
-          </Text>
+          <Text className='text-neutral-500'>No track playing</Text>
        </View>
      </BottomSheetModalProvider>
    );
@@ -271,7 +267,7 @@ export default function NowPlayingScreen() {
                    : "text-neutral-500"
                }
              >
-                {t("music.now_playing")}
+                Now Playing
              </Text>
            </TouchableOpacity>
            <TouchableOpacity
@@ -722,7 +718,6 @@ const QueueView: React.FC<QueueViewProps> = ({
  onRemoveFromQueue,
  onReorderQueue,
 }) => {
-  const { t } = useTranslation();
  const renderQueueItem = useCallback(
    ({ item, drag, isActive, getIndex }: RenderItemParams<BaseItemDto>) => {
      const index = getIndex() ?? 0;
@@ -836,15 +831,13 @@ const QueueView: React.FC<QueueViewProps> = ({
      ListHeaderComponent={
        <View className='px-4 py-2'>
          <Text className='text-neutral-400 text-xs uppercase tracking-wider'>
-            {history.length > 0
-              ? t("music.playing_from_queue")
-              : t("music.up_next")}
+            {history.length > 0 ? "Playing from queue" : "Up next"}
          </Text>
        </View>
      }
      ListEmptyComponent={
        <View className='flex-1 items-center justify-center py-20'>
-          <Text className='text-neutral-500'>{t("music.queue_empty")}</Text>
+          <Text className='text-neutral-500'>Queue is empty</Text>
        </View>
      }
    />
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -456,10 +456,23 @@ export default function DirectPlayerPage() {
    });
    reportPlaybackStopped();
    setIsPlaybackStopped(true);
-    videoRef.current?.pause();
+    // Synchronously destroy the mpv instance + decoder + surface buffers
+    // BEFORE the screen unmounts. Otherwise the next screen (or the next
+    // episode's player) mounts while the old 4K decoder is still alive,
+    // causing OOM on low-RAM devices. Native stop() is idempotent so the
+    // later React unmount cleanup is still safe.
+    videoRef.current?.destroy().catch(() => {});
+    // Pre-libmpv-1.0 used `stop()`:
+    // videoRef.current?.stop();
    revalidateProgressCache();
    // Resume inactivity timer when leaving player (TV only)
    resumeInactivityTimer();
+    // Release the keep-awake wakelock acquired during playback so it
+    // doesn't follow us back to the home screen and block the TV
+    // screensaver. activateKeepAwakeAsync() is tag-scoped to this module
+    // and only released on the "paused" event; without this, navigating
+    // away mid-play leaves FLAG_KEEP_SCREEN_ON set on the window.
+    deactivateKeepAwake();
  }, [videoRef, reportPlaybackStopped, progress, resumeInactivityTimer]);

  useEffect(() => {
@@ -1105,6 +1118,15 @@ export default function DirectPlayerPage() {
        nextItem.UserData?.PlaybackPositionTicks?.toString() ?? "",
    }).toString();

+    // Destroy the current mpv instance BEFORE navigating so the old 4K
+    // decoder + surface buffers are freed before the new player screen
+    // mounts. Without this, Expo Router briefly holds two simultaneous
+    // mpv instances during the transition (~768 MB of surface buffers
+    // for two 4K HDR10+ decoders) and OOM-kills the app on low-RAM
+    // devices. Native stop() is idempotent so the subsequent React
+    // unmount cleanup is still safe.
+    videoRef.current?.destroy().catch(() => {});
+
    router.replace(`player/direct-player?${queryParams}` as any);
  }, [
    nextItem,
@@ -1115,6 +1137,7 @@ export default function DirectPlayerPage() {
    bitrateValue,
    router,
    isPlaybackStopped,
+    videoRef,
  ]);

  // Apply subtitle settings when video loads
@@ -1267,7 +1290,7 @@ export default function DirectPlayerPage() {
                  console.error("Video Error:", e.nativeEvent);
                  Alert.alert(
                    t("player.error"),
-                    t("player.an_error_occurred_while_playing_the_video"),
+                    t("player.an_error_occured_while_playing_the_video"),
                  );
                  writeToLog("ERROR", "Video Error", e.nativeEvent);
                }}
--- a/app/(auth)/tv-subtitle-modal.tsx
+++ b/app/(auth)/tv-subtitle-modal.tsx
@@ -192,7 +192,6 @@ const SubtitleResultCard = React.forwardRef<
 >(({ result, hasTVPreferredFocus, isDownloading, onPress }, ref) => {
  const { focused, handleFocus, handleBlur, animatedStyle } =
    useTVFocusAnimation({ scaleAmount: 1.03 });
-  const { t } = useTranslation();

  return (
    <Pressable
@@ -329,7 +328,7 @@ const SubtitleResultCard = React.forwardRef<
              ]}
            >
              <Text style={[styles.flagText, { fontSize: scaleSize(10) }]}>
-                {t("player.hash_match")}
+                Hash Match
              </Text>
            </View>
          )}
--- a/app/+not-found.tsx
+++ b/app/+not-found.tsx
@@ -1,20 +1,17 @@
 import { Link, Stack } from "expo-router";
-import { useTranslation } from "react-i18next";
 import { StyleSheet } from "react-native";

 import { ThemedText } from "@/components/ThemedText";
 import { ThemedView } from "@/components/ThemedView";

 export default function NotFoundScreen() {
-  const { t } = useTranslation();
-
  return (
    <>
-      <Stack.Screen options={{ title: t("home.oops") }} />
+      <Stack.Screen options={{ title: "Oops!" }} />
      <ThemedView style={styles.container}>
-        <ThemedText type='title'>{t("not_found.title")}</ThemedText>
+        <ThemedText type='title'>This screen doesn't exist.</ThemedText>
        <Link href={"/home"} style={styles.link}>
-          <ThemedText type='link'>{t("not_found.go_home")}</ThemedText>
+          <ThemedText type='link'>Go to home screen!</ThemedText>
        </Link>
      </ThemedView>
    </>
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -7,10 +7,10 @@ import { onlineManager, QueryClient } from "@tanstack/react-query";
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
 import * as BackgroundTask from "expo-background-task";
 import * as Device from "expo-device";
+import { Image } from "expo-image";
 import { DarkTheme, ThemeProvider } from "expo-router/react-navigation";
 import { Platform } from "react-native";
 import { GlobalModal } from "@/components/GlobalModal";
-import { PendingAccountSaveModal } from "@/components/PendingAccountSaveModal";
 import { enableTVMenuKeyInterception } from "@/hooks/useTVBackHandler";
 import i18n from "@/i18n";
 import { DownloadProvider } from "@/providers/DownloadProvider";
@@ -85,8 +85,7 @@ configureReanimatedLogger({
 if (!Platform.isTV) {
  Notifications.setNotificationHandler({
    handleNotification: async () => ({
-      shouldShowBanner: true,
-      shouldShowList: true,
+      shouldShowAlert: true,
      shouldPlaySound: true,
      shouldSetBadge: false,
    }),
@@ -102,6 +101,22 @@ SplashScreen.setOptions({
  fade: true,
 });

+// Cap expo-image's in-memory cache. Default is unbounded (maxMemoryCost=0),
+// which on a 2GB Android TV box leads to ~200MB of decoded backdrops/posters
+// pinned in RAM after browsing. Caps are intentionally tighter on TV (which
+// has less RAM and runs alongside libmpv/MediaCodec) than on mobile.
+// Cost is measured in bytes of decoded bitmap (ARGB8888 = 4 bytes/pixel).
+try {
+  Image.configureCache({
+    maxMemoryCost: Platform.isTV
+      ? 8 * 1024 * 1024 // ~8 MB on TV
+      : 128 * 1024 * 1024, // ~128 MB on mobile
+    maxDiskSize: 200 * 1024 * 1024, // 200 MB disk cache on all platforms
+  });
+} catch {
+  // configureCache is a no-op on some platforms/versions; safe to ignore.
+}
+
 function useNotificationObserver() {
  const router = useRouter();

@@ -335,12 +350,9 @@ function Layout() {
      notificationListener.current =
        Notifications?.addNotificationReceivedListener(
          (notification: Notification) => {
-            // Log only the title — serializing the whole notification touches
-            // the deprecated dataString getter (deprecation warning) and dumps
-            // noisy payloads into the console.
            console.log(
-              "Notification received while app running:",
-              notification.request.content.title,
+              "Notification received while app running",
+              notification,
            );
          },
        );
@@ -535,7 +547,6 @@ function Layout() {
                                  closeButton
                                />
                                {!Platform.isTV && <GlobalModal />}
-                                {!Platform.isTV && <PendingAccountSaveModal />}
                              </ThemeProvider>
                            </IntroSheetProvider>
                          </BottomSheetModalProvider>
--- a/bun.lock
+++ b/bun.lock
@@ -31,7 +31,6 @@
        "expo-brightness": "~56.0.5",
        "expo-build-properties": "~56.0.18",
        "expo-camera": "~56.0.8",
-        "expo-clipboard": "~56.0.4",
        "expo-constants": "~56.0.18",
        "expo-crypto": "~56.0.4",
        "expo-dev-client": "~56.0.20",
@@ -947,8 +946,6 @@

    "expo-camera": ["expo-camera@56.0.8", "", { "dependencies": { "barcode-detector": "^3.0.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-UDOpUUMisFRmCv1XQV1MJCKGAH2CsIC1Rs6P9Bbc6JLVmbxEKAd5dK68y6cScOdWURxVfJ0PRcjYnSuc8ayyIQ=="],

-    "expo-clipboard": ["expo-clipboard@56.0.4", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-qb4DYlkiowHYHaUYVT2FN9nk/nI1xShXOUYsI7J9dVpQCOHcGFjCBPX1VAvEW4Ye4/Aagd6IuhOVAq/+scBOiA=="],
-
    "expo-constants": ["expo-constants@56.0.18", "", { "dependencies": { "@expo/env": "~2.3.0" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-8AMtbDGl/WVPnWlmbpGmvcdnNCy9E4PFnwdVwj600vljkMDPSxcAcjw8GVXEPk3PpZ+ngTqsrkltWyj0UKYAxw=="],

    "expo-crypto": ["expo-crypto@56.0.4", "", { "peerDependencies": { "expo": "*" } }, "sha512-fRNEhoXRXgAWBpe3/hq5X+KXTit3OZqdiAGts1YvNEUHQb+H5591mpPac0Yw+sZg9pXcrjRnzo5AxvZaENpc7g=="],
--- a/components/BitRateSheet.tsx
+++ b/components/BitRateSheet.tsx
@@ -1,5 +1,4 @@
-import type { BottomSheetModal } from "@gorhom/bottom-sheet";
-import { useMemo, useRef, useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import { Text } from "./common/Text";
@@ -62,7 +61,6 @@ export const BitrateSheet: React.FC<Props> = ({
  const isTv = Platform.isTV;
  const { t } = useTranslation();
  const [open, setOpen] = useState(false);
-  const sheetModalRef = useRef<BottomSheetModal | null>(null);

  const sorted = useMemo(() => {
    if (inverted)
@@ -94,10 +92,7 @@ export const BitrateSheet: React.FC<Props> = ({
        </Text>
        <TouchableOpacity
          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'
-          onPress={() => {
-            setOpen(true);
-            sheetModalRef.current?.present();
-          }}
+          onPress={() => setOpen(true)}
        >
          <Text numberOfLines={1}>
            {BITRATES.find((b) => b.value === selected?.value)?.key}
@@ -108,7 +103,6 @@ export const BitrateSheet: React.FC<Props> = ({
      <FilterSheet
        open={open}
        setOpen={setOpen}
-        modalRef={sheetModalRef}
        title={t("item_card.quality")}
        data={sorted}
        values={selected ? [selected] : []}
--- a/components/MediaSourceSheet.tsx
+++ b/components/MediaSourceSheet.tsx
@@ -1,9 +1,8 @@
-import type { BottomSheetModal } from "@gorhom/bottom-sheet";
 import type {
  BaseItemDto,
  MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { useCallback, useMemo, useRef, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import { Text } from "./common/Text";
@@ -24,7 +23,6 @@ export const MediaSourceSheet: React.FC<Props> = ({
  const isTv = Platform.isTV;
  const { t } = useTranslation();
  const [open, setOpen] = useState(false);
-  const sheetModalRef = useRef<BottomSheetModal | null>(null);

  const getDisplayName = useCallback((source: MediaSourceInfo) => {
    const videoStream = source.MediaStreams?.find((x) => x.Type === "Video");
@@ -46,10 +44,7 @@ export const MediaSourceSheet: React.FC<Props> = ({
        <Text className='opacity-50 mb-1 text-xs'>{t("item_card.video")}</Text>
        <TouchableOpacity
          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center'
-          onPress={() => {
-            setOpen(true);
-            sheetModalRef.current?.present();
-          }}
+          onPress={() => setOpen(true)}
        >
          <Text numberOfLines={1}>{selectedName}</Text>
        </TouchableOpacity>
@@ -58,7 +53,6 @@ export const MediaSourceSheet: React.FC<Props> = ({
      <FilterSheet
        open={open}
        setOpen={setOpen}
-        modalRef={sheetModalRef}
        title={t("item_card.video")}
        data={item.MediaSources || []}
        values={selected ? [selected] : []}
--- a/components/PendingAccountSaveModal.tsx
+++ b/components/PendingAccountSaveModal.tsx
@@ -1,45 +0,0 @@
-import { useAtom, useAtomValue } from "jotai";
-import type React from "react";
-import { useEffect } from "react";
-import { Platform } from "react-native";
-import { SaveAccountModal } from "@/components/SaveAccountModal";
-import {
-  pendingAccountSaveAtom,
-  useJellyfin,
-  userAtom,
-} from "@/providers/JellyfinProvider";
-
-/**
- * Post-login save-account prompt. Login flows (password or Quick Connect)
- * only flag the intent via pendingAccountSaveAtom; the protection picker
- * shows here, AFTER the session is authorized — the login screen itself
- * unmounts as soon as the user is set, so it can't host the modal.
- */
-export const PendingAccountSaveModal: React.FC = () => {
-  const [pending, setPending] = useAtom(pendingAccountSaveAtom);
-  const user = useAtomValue(userAtom);
-  const { saveCurrentAccount } = useJellyfin();
-
-  // A logout before answering drops the intent — it must not resurface on
-  // the next (possibly different) login.
-  useEffect(() => {
-    if (!user && pending) setPending(null);
-  }, [user, pending, setPending]);
-
-  if (Platform.isTV) return null;
-
-  return (
-    <SaveAccountModal
-      visible={!!pending && !!user}
-      username={user?.Name ?? ""}
-      onClose={() => setPending(null)}
-      onSave={(securityType, pinCode) => {
-        const serverName = pending?.serverName;
-        setPending(null);
-        saveCurrentAccount({ securityType, pinCode, serverName }).catch(
-          (error) => console.warn("Failed to save account:", error),
-        );
-      }}
-    />
-  );
-};
--- a/components/PlatformDropdown.tsx
+++ b/components/PlatformDropdown.tsx
@@ -1,7 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
 import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, StyleSheet, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
@@ -210,7 +209,6 @@ const PlatformDropdownComponent = ({
  expoUIConfig,
  bottomSheetConfig,
 }: PlatformDropdownProps) => {
-  const { t } = useTranslation();
  const { showModal, hideModal, isVisible } = useGlobalModal();

  // Handle controlled open state for Android
@@ -382,7 +380,7 @@ const PlatformDropdownComponent = ({

  return (
    <TouchableOpacity onPress={handlePress} activeOpacity={0.7}>
-      {trigger || <Text className='text-white'>{t("common.open_menu")}</Text>}
+      {trigger || <Text className='text-white'>Open Menu</Text>}
    </TouchableOpacity>
  );
 };
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -502,8 +502,8 @@ export const PlayButton: React.FC<Props> = ({
  return (
    <TouchableOpacity
      disabled={!item}
-      accessibilityLabel={t("accessibility.play_button")}
-      accessibilityHint={t("accessibility.play_hint")}
+      accessibilityLabel='Play button'
+      accessibilityHint='Tap to play the media'
      onPress={onPress}
      className={"relative flex-1"}
    >
--- a/components/PlayButton.tv.tsx
+++ b/components/PlayButton.tv.tsx
@@ -2,7 +2,6 @@ import { Ionicons } from "@expo/vector-icons";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import { useAtom } from "jotai";
 import { useCallback, useEffect } from "react";
-import { useTranslation } from "react-i18next";
 import { TouchableOpacity, View } from "react-native";
 import Animated, {
  Easing,
@@ -37,7 +36,6 @@ export const PlayButton: React.FC<Props> = ({
  colors,
  ...props
 }: Props) => {
-  const { t } = useTranslation();
  const [globalColorAtom] = useAtom(itemThemeColorAtom);

  // Use colors prop if provided, otherwise fallback to global atom
@@ -170,8 +168,8 @@ export const PlayButton: React.FC<Props> = ({

  return (
    <TouchableOpacity
-      accessibilityLabel={t("accessibility.play_button")}
-      accessibilityHint={t("accessibility.play_hint")}
+      accessibilityLabel='Play button'
+      accessibilityHint='Tap to play the media'
      onPress={onPress}
      className={"relative"}
      {...props}
--- a/components/PlayInRemoteSession.tsx
+++ b/components/PlayInRemoteSession.tsx
@@ -6,7 +6,6 @@ import {
 import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
 import { useAtomValue } from "jotai";
 import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
 import {
  FlatList,
  Modal,
@@ -32,7 +31,6 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
  const [modalVisible, setModalVisible] = useState(false);
  const api = useAtomValue(apiAtom);
  const { sessions, isLoading } = useAllSessions({} as useSessionsProps);
-  const { t } = useTranslation();
  const handlePlayInSession = async (sessionId: string) => {
    if (!api || !item.Id) return;

@@ -67,9 +65,7 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
        <View style={styles.centeredView}>
          <View style={styles.modalView}>
            <View style={styles.modalHeader}>
-              <Text style={styles.modalTitle}>
-                {t("home.sessions.select_session")}
-              </Text>
+              <Text style={styles.modalTitle}>Select Session</Text>
              <TouchableOpacity onPress={() => setModalVisible(false)}>
                <Ionicons name='close' size={24} color='white' />
              </TouchableOpacity>
@@ -82,7 +78,7 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
                </View>
              ) : !sessions || sessions.length === 0 ? (
                <Text style={styles.noSessionsText}>
-                  {t("home.sessions.no_active_sessions")}
+                  No active sessions found
                </Text>
              ) : (
                <FlatList
@@ -102,7 +98,7 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
                        </Text>
                        {session.NowPlayingItem && (
                          <Text style={styles.nowPlaying} numberOfLines={1}>
-                            {t("home.sessions.now_playing")}{" "}
+                            Now playing:{" "}
                            {session.NowPlayingItem.SeriesName
                              ? `${session.NowPlayingItem.SeriesName} :`
                              : ""}
--- a/components/TrackSheet.tsx
+++ b/components/TrackSheet.tsx
@@ -1,6 +1,5 @@
-import type { BottomSheetModal } from "@gorhom/bottom-sheet";
 import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
-import { useMemo, useRef, useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import { Text } from "./common/Text";
@@ -50,7 +49,6 @@ export const TrackSheet: React.FC<Props> = ({
    return streams;
  }, [streams, streamType, noneOption]);
  const [open, setOpen] = useState(false);
-  const sheetModalRef = useRef<BottomSheetModal | null>(null);

  if (isTv || (streams && streams.length === 0)) return null;

@@ -60,10 +58,7 @@ export const TrackSheet: React.FC<Props> = ({
        <Text className='opacity-50 mb-1 text-xs'>{title}</Text>
        <TouchableOpacity
          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'
-          onPress={() => {
-            setOpen(true);
-            sheetModalRef.current?.present();
-          }}
+          onPress={() => setOpen(true)}
        >
          <Text numberOfLines={1}>
            {selected === -1 && streamType === "Subtitle"
@@ -75,7 +70,6 @@ export const TrackSheet: React.FC<Props> = ({
      <FilterSheet
        open={open}
        setOpen={setOpen}
-        modalRef={sheetModalRef}
        title={title}
        data={addNoneToSubtitles || []}
        values={
--- a/components/common/HeaderBackButton.tsx
+++ b/components/common/HeaderBackButton.tsx
@@ -1,6 +1,6 @@
-import { Feather } from "@expo/vector-icons";
+import { Ionicons } from "@expo/vector-icons";
 import { BlurView, type BlurViewProps } from "expo-blur";
-import { Keyboard, Platform } from "react-native";
+import { Platform } from "react-native";
 import { Pressable, type PressableProps } from "react-native-gesture-handler";
 import useRouter from "@/hooks/useAppRouter";

@@ -16,37 +16,30 @@ export const HeaderBackButton: React.FC<Props> = ({
 }) => {
  const router = useRouter();

-  // Dismiss the keyboard before navigating — otherwise it lingers over the
-  // previous screen (e.g. leaving the Jellyseerr login while typing).
-  const handleBack = () => {
-    Keyboard.dismiss();
-    router.back();
-  };
-
  if (Platform.OS === "ios") {
    return (
      <Pressable
-        onPress={handleBack}
+        onPress={() => router.back()}
        className='flex items-center justify-center w-9 h-9'
        {...pressableProps}
      >
-        <Feather name='chevron-left' size={28} color='white' />
+        <Ionicons name='arrow-back' size={24} color='white' />
      </Pressable>
    );
  }

  if (background === "transparent" && Platform.OS !== "android")
    return (
-      <Pressable onPress={handleBack} {...pressableProps}>
+      <Pressable onPress={() => router.back()} {...pressableProps}>
        <BlurView
          {...props}
          intensity={100}
          className='overflow-hidden rounded-full p-2'
        >
-          <Feather
+          <Ionicons
            className='drop-shadow-2xl'
-            name='chevron-left'
-            size={28}
+            name='arrow-back'
+            size={24}
            color='white'
          />
        </BlurView>
@@ -55,17 +48,14 @@ export const HeaderBackButton: React.FC<Props> = ({

  return (
    <Pressable
-      onPress={handleBack}
-      // Match the Settings page back button: chevron flush to the edge with a
-      // 16px gap before the title (the old `p-2` pushed both arrow and title
-      // too far right). drop-shadow keeps it readable over images.
-      style={{ marginRight: 16 }}
+      onPress={() => router.back()}
+      className=' rounded-full p-2'
      {...pressableProps}
    >
-      <Feather
+      <Ionicons
        className='drop-shadow-2xl'
-        name='chevron-left'
-        size={28}
+        name='arrow-back'
+        size={24}
        color='white'
      />
    </Pressable>
--- a/components/common/SettingSwitch.tsx
+++ b/components/common/SettingSwitch.tsx
@@ -1,40 +0,0 @@
-import type React from "react";
-import { Platform, Switch, type SwitchProps, View } from "react-native";
-
-/**
- * Settings toggle. Android's native Switch lays out ~40px tall / ~56px wide and
- * inflates list rows (iOS renders it ~31px). A plain `transform: scale` is
- * visual-only and does NOT shrink the layout box, so we pin the Switch inside a
- * FIXED-SIZE box (overflow hidden) and center it:
- *  - the fixed height caps the row height (compact, uniform rows),
- *  - the fixed width + centering keep the switch in the exact same spot in the
- *    on/off states (a non-fixed wrapper let its width fluctuate between states,
- *    which shifted the switch sideways on toggle).
- * iOS renders the switch untouched.
- *
- * Tunables: BOX_H drives the row height; SCALE shrinks the visual to fit the
- * box; keep BOX_W >= scaled visual width to avoid clipping the switch sideways.
- */
-const BOX_W = 40;
-const BOX_H = 30;
-const SCALE = 0.9;
-
-export const SettingSwitch: React.FC<SwitchProps> = (props) => {
-  if (Platform.OS !== "android") return <Switch {...props} />;
-  return (
-    <View
-      style={{
-        width: BOX_W,
-        height: BOX_H,
-        alignItems: "center",
-        justifyContent: "center",
-        overflow: "hidden",
-      }}
-    >
-      <Switch
-        {...props}
-        style={[props.style, { transform: [{ scale: SCALE }] }]}
-      />
-    </View>
-  );
-};
--- a/components/downloads/DownloadCard.tsx
+++ b/components/downloads/DownloadCard.tsx
@@ -1,7 +1,7 @@
 import { Ionicons } from "@expo/vector-icons";
 import { Image } from "expo-image";
+import { t } from "i18next";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
  TouchableOpacity,
@@ -35,7 +35,6 @@ interface DownloadCardProps extends TouchableOpacityProps {
 }

 export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
-  const { t } = useTranslation();
  const { cancelDownload } = useDownload();
  const router = useRouter();
  const queryClient = useNetworkAwareQueryClient();
@@ -174,9 +173,7 @@ export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {

            {isTranscoding && (
              <View className='bg-purple-600/20 px-2 py-0.5 rounded-md mt-1 self-start'>
-                <Text className='text-xs text-purple-400'>
-                  {t("home.downloads.transcoding")}
-                </Text>
+                <Text className='text-xs text-purple-400'>Transcoding</Text>
              </View>
            )}

--- a/components/downloads/SeriesCard.tsx
+++ b/components/downloads/SeriesCard.tsx
@@ -16,12 +16,9 @@ export const SeriesCard: React.FC<{ items: BaseItemDto[] }> = ({ items }) => {
  const { showActionSheetWithOptions } = useActionSheet();
  const router = useRouter();

-  // Keyed on SeriesId so recycled FlashList cells re-read the correct poster
-  // instead of freezing the first-rendered series' image (empty deps bug).
  const base64Image = useMemo(() => {
-    const seriesId = items[0]?.SeriesId;
-    return seriesId ? storage.getString(seriesId) : undefined;
-  }, [items[0]?.SeriesId]);
+    return storage.getString(items[0].SeriesId!);
+  }, []);

  const deleteSeries = useCallback(
    async () =>
--- a/components/filters/FilterButton.tsx
+++ b/components/filters/FilterButton.tsx
@@ -1,7 +1,6 @@
 import { FontAwesome, Ionicons } from "@expo/vector-icons";
-import type { BottomSheetModal } from "@gorhom/bottom-sheet";
 import { useQuery } from "@tanstack/react-query";
-import { useRef, useState } from "react";
+import { useState } from "react";
 import { TouchableOpacity, View, type ViewProps } from "react-native";
 import { Text } from "@/components/common/Text";
 import { FilterSheet } from "./FilterSheet";
@@ -35,9 +34,8 @@ export const FilterButton = <T,>({
  ...props
 }: FilterButtonProps<T>) => {
  const [open, setOpen] = useState(false);
-  const sheetModalRef = useRef<BottomSheetModal | null>(null);

-  const { data: filters, isLoading } = useQuery<T[]>({
+  const { data: filters } = useQuery<T[]>({
    queryKey: ["filters", title, queryKey, id],
    queryFn,
    staleTime: 0,
@@ -46,15 +44,9 @@ export const FilterButton = <T,>({

  return (
    <>
-      {/* present() must be called here, inside the press handler: calling it
-          from an effect after a state update silently no-ops on the new
-          architecture and the sheet never appears. Opening immediately also
-          replaces the old data-loaded gate that left the button silently
-          dead while options were still loading (the sheet shows a loader). */}
      <TouchableOpacity
        onPress={() => {
-          setOpen(true);
-          sheetModalRef.current?.present();
+          filters?.length && setOpen(true);
        }}
      >
        <View
@@ -97,8 +89,6 @@ export const FilterButton = <T,>({
        title={title}
        open={open}
        setOpen={setOpen}
-        modalRef={sheetModalRef}
-        loading={isLoading}
        data={filters}
        values={values}
        set={set}
--- a/components/filters/FilterSheet.tsx
+++ b/components/filters/FilterSheet.tsx
@@ -7,14 +7,7 @@ import {
 } from "@gorhom/bottom-sheet";
 import { isEqual } from "lodash";
 import type React from "react";
-import {
-  useCallback,
-  useDeferredValue,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
  StyleSheet,
@@ -26,21 +19,11 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { Button } from "../Button";
 import { Input } from "../common/Input";
-import { Loader } from "../Loader";

 interface Props<T> extends ViewProps {
  open: boolean;
  setOpen: (open: boolean) => void;
-  /**
-   * Modal ref the opener must use to present() the sheet from inside its
-   * press handler. On the new architecture with Reanimated 4, present()
-   * called from an effect after a state update silently no-ops — the sheet
-   * mounts nothing. Presenting straight from the gesture handler works.
-   */
-  modalRef: React.RefObject<BottomSheetModal | null>;
  data?: T[] | null;
-  /** True while the options are loading — shows a loader inside the sheet. */
-  loading?: boolean;
  values: T[];
  set: (value: T[]) => void;
  title: string;
@@ -83,18 +66,16 @@ const LIMIT = 100;
 export const FilterSheet = <T,>({
  values,
  data: _data,
-  loading = false,
  open,
  set,
  setOpen,
-  modalRef,
  title,
  searchFilter,
  renderItemLabel,
  disableSearch = false,
  multiple = false,
 }: Props<T>) => {
-  const bottomSheetModalRef = modalRef;
+  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
  const snapPoints = useMemo(() => ["85%"], []);
  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
@@ -103,24 +84,19 @@ export const FilterSheet = <T,>({
  const [offset, setOffset] = useState<number>(0);

  const [search, setSearch] = useState<string>("");
-  // Filtering and re-rendering the option list on every keystroke blocks the
-  // JS thread on large lists (2000+ tags); the controlled input then snaps the
-  // native text back to a stale value (lost/reappearing letters). Deferring the
-  // value keeps the keystroke render cheap and runs the list update after.
-  const deferredSearch = useDeferredValue(search);

  const [showSearch, setShowSearch] = useState<boolean>(false);

  const filteredData = useMemo(() => {
-    if (!deferredSearch) return _data;
+    if (!search) return _data;
    const results = [];
    for (let i = 0; i < (_data?.length || 0); i++) {
-      if (_data && searchFilter?.(_data[i], deferredSearch)) {
+      if (_data && searchFilter?.(_data[i], search)) {
        results.push(_data[i]);
      }
    }
    return results.slice(0, 100);
-  }, [deferredSearch, _data, searchFilter]);
+  }, [search, _data, searchFilter]);

  useEffect(() => {
    if (!data || data.length === 0 || disableSearch) return;
@@ -151,28 +127,21 @@ export const FilterSheet = <T,>({
    setData(newData);
  }, [offset, _data]);

-  // Opening is imperative (see the modalRef prop); this effect only closes.
-  // It also never calls dismiss() on a modal that was never presented.
-  const wasPresentedRef = useRef(false);
  useEffect(() => {
-    if (!open && wasPresentedRef.current) {
-      bottomSheetModalRef.current?.dismiss();
-    }
+    if (open) bottomSheetModalRef.current?.present();
+    else bottomSheetModalRef.current?.dismiss();
  }, [open]);

  const handleSheetChanges = useCallback((index: number) => {
-    if (index >= 0) {
-      wasPresentedRef.current = true;
-    } else if (index === -1) {
-      wasPresentedRef.current = false;
+    if (index === -1) {
      setOpen(false);
    }
  }, []);

  const renderData = useMemo(() => {
-    if (deferredSearch.length > 0 && showSearch) return filteredData;
+    if (search.length > 0 && showSearch) return filteredData;
    return data;
-  }, [deferredSearch, showSearch, filteredData, data]);
+  }, [search, filteredData, data]);

  const renderBackdrop = useCallback(
    (props: BottomSheetBackdropProps) => (
@@ -185,54 +154,6 @@ export const FilterSheet = <T,>({
    [],
  );

-  // Memoized so typing in the search input (urgent render with an unchanged
-  // deferred value) doesn't rebuild up to 100 row elements per keystroke.
-  const renderedRows = useMemo(
-    () =>
-      renderData?.map((item, index) => (
-        <View key={index}>
-          <TouchableOpacity
-            onPress={() => {
-              // Match the deep-equality rule used to render the selected
-              // state below — option objects are recreated across renders,
-              // so reference checks would re-add an already selected item.
-              const isSelected = values.some((value) => isEqual(value, item));
-              if (multiple) {
-                if (!isSelected) set(values.concat(item));
-                else set(values.filter((value) => !isEqual(value, item)));
-
-                setTimeout(() => {
-                  setOpen(false);
-                }, 250);
-              } else {
-                if (!isSelected) {
-                  set([item]);
-                  setTimeout(() => {
-                    setOpen(false);
-                  }, 250);
-                }
-              }
-            }}
-            className=' bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between'
-          >
-            <Text className='flex shrink'>{renderItemLabel(item)}</Text>
-            {values.some((i) => isEqual(i, item)) ? (
-              <Ionicons name='radio-button-on' size={24} color='white' />
-            ) : (
-              <Ionicons name='radio-button-off' size={24} color='white' />
-            )}
-          </TouchableOpacity>
-          <View
-            style={{
-              height: StyleSheet.hairlineWidth,
-            }}
-            className='h-1 divide-neutral-700 '
-          />
-        </View>
-      )),
-    [renderData, values, multiple, set, setOpen, renderItemLabel],
-  );
-
  return (
    <BottomSheetModal
      ref={bottomSheetModalRef}
@@ -261,15 +182,9 @@ export const FilterSheet = <T,>({
          }}
        >
          <Text className='font-bold text-2xl'>{title}</Text>
-          {loading ? (
-            <View className='my-8 flex items-center justify-center'>
-              <Loader />
-            </View>
-          ) : (
-            <Text className='mb-2 text-neutral-500'>
-              {t("search.x_items", { count: _data?.length })}
-            </Text>
-          )}
+          <Text className='mb-2 text-neutral-500'>
+            {t("search.x_items", { count: _data?.length })}
+          </Text>
          {showSearch && (
            <Input
              placeholder={t("search.search")}
@@ -288,7 +203,43 @@ export const FilterSheet = <T,>({
            }}
            className='mb-4 flex flex-col rounded-xl overflow-hidden'
          >
-            {renderedRows}
+            {renderData?.map((item, index) => (
+              <View key={index}>
+                <TouchableOpacity
+                  onPress={() => {
+                    if (multiple) {
+                      if (!values.includes(item)) set(values.concat(item));
+                      else set(values.filter((v) => v !== item));
+
+                      setTimeout(() => {
+                        setOpen(false);
+                      }, 250);
+                    } else {
+                      if (!values.includes(item)) {
+                        set([item]);
+                        setTimeout(() => {
+                          setOpen(false);
+                        }, 250);
+                      }
+                    }
+                  }}
+                  className=' bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between'
+                >
+                  <Text className='flex shrink'>{renderItemLabel(item)}</Text>
+                  {values.some((i) => isEqual(i, item)) ? (
+                    <Ionicons name='radio-button-on' size={24} color='white' />
+                  ) : (
+                    <Ionicons name='radio-button-off' size={24} color='white' />
+                  )}
+                </TouchableOpacity>
+                <View
+                  style={{
+                    height: StyleSheet.hairlineWidth,
+                  }}
+                  className='h-1 divide-neutral-700 '
+                />
+              </View>
+            ))}
          </View>
          {data.length < (_data?.length || 0) && (
            <Button
--- a/components/filters/ResetFiltersButton.tsx
+++ b/components/filters/ResetFiltersButton.tsx
@@ -1,24 +1,38 @@
 import { Ionicons } from "@expo/vector-icons";
+import { useAtom } from "jotai";
 import { TouchableOpacity, type TouchableOpacityProps } from "react-native";
-import { useFilterReset } from "@/hooks/useFilterReset";
+import {
+  filterByAtom,
+  genreFilterAtom,
+  tagsFilterAtom,
+  yearFilterAtom,
+} from "@/utils/atoms/filters";

-interface Props extends TouchableOpacityProps {
-  libraryId: string;
-}
+interface Props extends TouchableOpacityProps {}

-export const ResetFiltersButton: React.FC<Props> = ({
-  libraryId,
-  ...props
-}) => {
-  const { hasActiveFilters, resetAllFilters } = useFilterReset(libraryId);
+export const ResetFiltersButton: React.FC<Props> = ({ ...props }) => {
+  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
+  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
+  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
+  const [selectedFilters, setSelectedFilters] = useAtom(filterByAtom);

-  if (!hasActiveFilters) {
+  if (
+    selectedGenres.length === 0 &&
+    selectedTags.length === 0 &&
+    selectedYears.length === 0 &&
+    selectedFilters.length === 0
+  ) {
    return null;
  }

  return (
    <TouchableOpacity
-      onPress={resetAllFilters}
+      onPress={() => {
+        setSelectedGenres([]);
+        setSelectedTags([]);
+        setSelectedYears([]);
+        setSelectedFilters([]);
+      }}
      className='bg-purple-600 rounded-full w-[30px] h-[30px] flex items-center justify-center mr-1'
      {...props}
    >
--- a/components/home/Home.tv.tsx
+++ b/components/home/Home.tv.tsx
@@ -140,9 +140,11 @@ export const Home = () => {
    let isCancelled = false;

    const performCrossfade = async () => {
-      // Prefetch the image before starting the crossfade
+      // Prefetch to disk only - the full-size 1920x1080 backdrop (~8MB
+      // decoded ARGB) is too large to pin in the memory cache on every
+      // focus change. Disk cache is fast enough for a 500ms crossfade.
      try {
-        await Image.prefetch(backdropUrl);
+        await Image.prefetch(backdropUrl, "disk");
      } catch {
        // Continue even if prefetch fails
      }
--- a/components/home/InfiniteScrollingCollectionList.tv.tsx
+++ b/components/home/InfiniteScrollingCollectionList.tv.tsx
@@ -326,9 +326,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
          showsHorizontalScrollIndicator={false}
          onEndReached={handleEndReached}
          onEndReachedThreshold={0.5}
-          initialNumToRender={5}
-          maxToRenderPerBatch={3}
-          windowSize={5}
+          initialNumToRender={4}
+          maxToRenderPerBatch={2}
+          windowSize={3}
          removeClippedSubviews={false}
          maintainVisibleContentPosition={{ minIndexForVisible: 0 }}
          style={{ overflow: "visible" }}
--- a/components/home/TVHeroCarousel.tsx
+++ b/components/home/TVHeroCarousel.tsx
@@ -256,8 +256,11 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
    let isCancelled = false;

    const performCrossfade = async () => {
+      // Disk-only prefetch: backdrops are ~8MB decoded ARGB; keeping them
+      // out of the memory cache avoids bloat when the user cycles through
+      // hero items quickly.
      try {
-        await Image.prefetch(backdropUrl);
+        await Image.prefetch(backdropUrl, "disk");
      } catch {
        // Continue even if prefetch fails
      }
@@ -379,7 +382,7 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
  if (items.length === 0) return null;

  // Extra top padding for tvOS to clear the menu bar
-  const tvosTopPadding = Platform.OS === "ios" ? scaleSize(145) : 0;
+  const tvosTopPadding = scaleSize(145);
  const heroHeight = SCREEN_HEIGHT * sizes.padding.heroHeight;

  return (
--- a/components/list/ListGroup.tsx
+++ b/components/list/ListGroup.tsx
@@ -23,11 +23,9 @@ export const ListGroup: React.FC<PropsWithChildren<Props>> = ({

  return (
    <View {...props}>
-      {title ? (
-        <Text className='ml-4 mb-1 uppercase text-[#8E8D91] text-xs'>
-          {title}
-        </Text>
-      ) : null}
+      <Text className='ml-4 mb-1 uppercase text-[#8E8D91] text-xs'>
+        {title}
+      </Text>
      <View
        style={[]}
        className='flex flex-col rounded-xl overflow-hidden pl-0 bg-neutral-900'
--- a/components/list/ListItem.tsx
+++ b/components/list/ListItem.tsx
@@ -1,6 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import type { PropsWithChildren, ReactNode } from "react";
-import { Platform, TouchableOpacity, View, type ViewProps } from "react-native";
+import { TouchableOpacity, View, type ViewProps } from "react-native";
 import { Text } from "../common/Text";

 interface Props extends ViewProps {
@@ -34,17 +34,12 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
 }) => {
  const effectiveSubtitle = disabledByAdmin ? "Disabled by admin" : subtitle;
  const isDisabled = disabled || disabledByAdmin;
-  // Keep the row floor uniform; Android trims padding slightly (its native
-  // controls sit taller). Switch height is capped via SettingSwitch so toggle
-  // rows match non-toggle rows.
-  const rowSizing =
-    Platform.OS === "android" ? "min-h-[42px] py-1.5" : "min-h-[42px] py-2";
  if (onPress)
    return (
      <TouchableOpacity
        disabled={isDisabled}
        onPress={onPress}
-        className={`flex flex-row items-center justify-between bg-neutral-900 ${rowSizing} pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
+        className={`flex flex-row items-center justify-between bg-neutral-900 min-h-[42px] py-2 pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
        {...(viewProps as any)}
      >
        <ListItemContent
@@ -63,7 +58,7 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
    );
  return (
    <View
-      className={`flex flex-row items-center justify-between bg-neutral-900 ${rowSizing} pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
+      className={`flex flex-row items-center justify-between bg-neutral-900 min-h-[42px] py-2 pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
      {...viewProps}
    >
      <ListItemContent
--- a/components/livetv/TVGuideProgramCell.tsx
+++ b/components/livetv/TVGuideProgramCell.tsx
@@ -1,6 +1,5 @@
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import React from "react";
-import { useTranslation } from "react-i18next";
 import { Animated, Pressable, StyleSheet, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
@@ -23,7 +22,6 @@ export const TVGuideProgramCell: React.FC<TVGuideProgramCellProps> = ({
  disabled = false,
  refSetter,
 }) => {
-  const { t } = useTranslation();
  const typography = useScaledTVTypography();
  const { focused, handleFocus, handleBlur } = useTVFocusAnimation({
    scaleAmount: 1,
@@ -70,7 +68,7 @@ export const TVGuideProgramCell: React.FC<TVGuideProgramCellProps> = ({
            <Text
              style={[styles.liveBadgeText, { fontSize: typography.callout }]}
            >
-              {t("player.live")}
+              LIVE
            </Text>
          </View>
        )}
--- a/components/livetv/TVLiveTVPage.tsx
+++ b/components/livetv/TVLiveTVPage.tsx
@@ -235,7 +235,7 @@ export const TVLiveTVPage: React.FC = () => {
            marginBottom: 24,
          }}
        >
-          {t("live_tv.title")}
+          Live TV
        </Text>

        {/* Tab Bar */}
--- a/components/login/Login.tsx
+++ b/components/login/Login.tsx
@@ -3,7 +3,7 @@ import type { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { t } from "i18next";
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtomValue } from "jotai";
 import { useCallback, useEffect, useState } from "react";
 import {
  Alert,
@@ -20,16 +20,14 @@ import { Button } from "@/components/Button";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
 import JellyfinServerDiscovery from "@/components/JellyfinServerDiscovery";
-import { QuickConnectCodeModal } from "@/components/login/QuickConnectCodeModal";
 import { PreviousServersList } from "@/components/PreviousServersList";
+import { SaveAccountModal } from "@/components/SaveAccountModal";
 import { Colors } from "@/constants/Colors";
-import {
-  apiAtom,
-  pendingAccountSaveAtom,
-  useJellyfin,
-  userAtom,
-} from "@/providers/JellyfinProvider";
-import type { SavedServer } from "@/utils/secureCredentials";
+import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
+import type {
+  AccountSecurityType,
+  SavedServer,
+} from "@/utils/secureCredentials";

 const CredentialsSchema = z.object({
  username: z.string().min(1, t("login.username_required")),
@@ -39,17 +37,14 @@ export const Login: React.FC = () => {
  const api = useAtomValue(apiAtom);
  const navigation = useNavigation();
  const params = useLocalSearchParams();
-  const user = useAtomValue(userAtom);
  const {
    setServer,
    login,
    removeServer,
    initiateQuickConnect,
-    stopQuickConnectPolling,
    loginWithSavedCredential,
    loginWithPassword,
  } = useJellyfin();
-  const setPendingAccountSave = useSetAtom(pendingAccountSaveAtom);

  const {
    apiUrl: _apiUrl,
@@ -69,43 +64,13 @@ export const Login: React.FC = () => {
    password: _password || "",
  });

-  // Quick Connect code shown in the in-app sheet while polling for authorization
-  const [quickConnectCode, setQuickConnectCode] = useState<string | null>(null);
-
-  // Close the code sheet as soon as the session is authorized — the native
-  // Alert used before had no programmatic dismiss and stayed open after login.
-  // A Quick Connect login with "save account" on flags the post-login save:
-  // the protection picker shows globally once the session exists (this screen
-  // unmounts on login, so it can't host the modal).
-  useEffect(() => {
-    if (user) {
-      if (quickConnectCode && saveAccount) {
-        setPendingAccountSave({ serverName });
-      }
-      setQuickConnectCode(null);
-    }
-  }, [user]);
-
-  // Stop Quick Connect polling when leaving the login page (parity with TVLogin)
-  useEffect(() => {
-    return () => {
-      stopQuickConnectPolling();
-    };
-  }, [stopQuickConnectPolling]);
-
-  // Going back to server selection keeps this component mounted (same screen,
-  // different state), so the unmount cleanup above doesn't run. Without this a
-  // code authorized after leaving would silently log the user in later.
-  useEffect(() => {
-    if (!api?.basePath) {
-      stopQuickConnectPolling();
-      setQuickConnectCode(null);
-    }
-  }, [api?.basePath, stopQuickConnectPolling]);
-
-  // Save account state — only the intent lives here; the protection picker is
-  // the global PendingAccountSaveModal, shown after the login succeeds.
+  // Save account state
  const [saveAccount, setSaveAccount] = useState(false);
+  const [showSaveModal, setShowSaveModal] = useState(false);
+  const [pendingLogin, setPendingLogin] = useState<{
+    username: string;
+    password: string;
+  } | null>(null);

  // Handle URL params for server connection
  useEffect(() => {
@@ -152,34 +117,55 @@ export const Login: React.FC = () => {
    const result = CredentialsSchema.safeParse(credentials);
    if (!result.success) return;

-    const ok = await performLogin(credentials.username, credentials.password);
-    // The protection picker shows AFTER a successful login (global modal) —
-    // never for a failed one.
-    if (ok && saveAccount) {
-      setPendingAccountSave({ serverName });
+    if (saveAccount) {
+      setPendingLogin({
+        username: credentials.username,
+        password: credentials.password,
+      });
+      setShowSaveModal(true);
+    } else {
+      await performLogin(credentials.username, credentials.password);
    }
  };

  const performLogin = async (
    username: string,
    password: string,
-  ): Promise<boolean> => {
+    options?: {
+      saveAccount?: boolean;
+      securityType?: AccountSecurityType;
+      pinCode?: string;
+    },
+  ) => {
    setLoading(true);
    try {
-      await login(username, password, serverName);
-      return true;
+      await login(username, password, serverName, options);
    } catch (error) {
      if (error instanceof Error) {
        Alert.alert(t("login.connection_failed"), error.message);
      } else {
        Alert.alert(
          t("login.connection_failed"),
-          t("login.an_unexpected_error_occurred"),
+          t("login.an_unexpected_error_occured"),
        );
      }
-      return false;
    } finally {
      setLoading(false);
+      setPendingLogin(null);
+    }
+  };
+
+  const handleSaveAccountConfirm = async (
+    securityType: AccountSecurityType,
+    pinCode?: string,
+  ) => {
+    setShowSaveModal(false);
+    if (pendingLogin) {
+      await performLogin(pendingLogin.username, pendingLogin.password, {
+        saveAccount: true,
+        securityType,
+        pinCode,
+      });
    }
  };

@@ -273,7 +259,15 @@ export const Login: React.FC = () => {
    try {
      const code = await initiateQuickConnect();
      if (code) {
-        setQuickConnectCode(code);
+        Alert.alert(
+          t("login.quick_connect"),
+          t("login.enter_code_to_login", { code: code }),
+          [
+            {
+              text: t("login.got_it"),
+            },
+          ],
+        );
      }
    } catch (_error) {
      Alert.alert(
@@ -408,7 +402,7 @@ export const Login: React.FC = () => {
                {t("server.enter_url_to_jellyfin_server")}
              </Text>
              <Input
-                aria-label={t("server.server_url")}
+                aria-label='Server URL'
                placeholder={t("server.server_url_placeholder")}
                onChangeText={setServerURL}
                value={serverURL}
@@ -450,11 +444,14 @@ export const Login: React.FC = () => {
        )}
      </KeyboardAvoidingView>

-      {/* Dismissing only hides the code — polling continues so the login still
-          completes if the code is authorized from another device afterwards. */}
-      <QuickConnectCodeModal
-        code={quickConnectCode}
-        onClose={() => setQuickConnectCode(null)}
+      <SaveAccountModal
+        visible={showSaveModal}
+        onClose={() => {
+          setShowSaveModal(false);
+          setPendingLogin(null);
+        }}
+        onSave={handleSaveAccountConfirm}
+        username={pendingLogin?.username || credentials.username}
      />
    </SafeAreaView>
  );
--- a/components/login/QuickConnectCodeModal.tsx
+++ b/components/login/QuickConnectCodeModal.tsx
@@ -1,137 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import {
-  BottomSheetBackdrop,
-  type BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import { requireOptionalNativeModule } from "expo-modules-core";
-import type React from "react";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { toast } from "sonner-native";
-import { Button } from "../Button";
-import { Text } from "../common/Text";
-
-interface Props {
-  /** The Quick Connect code to display, or null when hidden. */
-  code: string | null;
-  onClose: () => void;
-}
-
-/**
- * Shows the Quick Connect code while the app polls for authorization.
- * In-app sheet instead of a native Alert so it can dismiss itself once the
- * session is authorized — a native alert has no programmatic dismiss and
- * lingers over the app after login completes.
- */
-export const QuickConnectCodeModal: React.FC<Props> = ({ code, onClose }) => {
-  const { t } = useTranslation();
-  const insets = useSafeAreaInsets();
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-  const snapPoints = useMemo(() => ["50%"], []);
-  const isPresentedRef = useRef(false);
-
-  // Keep the last code around so the dismiss animation doesn't flash empty
-  // when the parent clears the code to close the sheet.
-  const lastCodeRef = useRef<string | null>(null);
-  if (code) lastCodeRef.current = code;
-
-  useEffect(() => {
-    if (code) {
-      bottomSheetModalRef.current?.present();
-    } else if (isPresentedRef.current) {
-      bottomSheetModalRef.current?.dismiss();
-      isPresentedRef.current = false;
-    }
-  }, [code]);
-
-  const handleSheetChanges = useCallback(
-    (index: number) => {
-      if (index >= 0) {
-        isPresentedRef.current = true;
-      } else if (index === -1 && isPresentedRef.current) {
-        isPresentedRef.current = false;
-        onClose();
-      }
-    },
-    [onClose],
-  );
-
-  const renderBackdrop = useCallback(
-    (props: BottomSheetBackdropProps) => (
-      <BottomSheetBackdrop
-        {...props}
-        disappearsOnIndex={-1}
-        appearsOnIndex={0}
-      />
-    ),
-    [],
-  );
-
-  const copyCode = useCallback(async () => {
-    const value = code ?? lastCodeRef.current;
-    if (!value) return;
-    // Builds that don't ship the expo-clipboard native module yet: probe with
-    // requireOptionalNativeModule (returns null instead of throwing/logging)
-    // and skip — importing the JS wrapper there would error out.
-    if (!requireOptionalNativeModule("ExpoClipboard")) return;
-    const Clipboard = await import("expo-clipboard");
-    await Clipboard.setStringAsync(value);
-    toast.success(t("login.code_copied"));
-  }, [code, t]);
-
-  return (
-    <BottomSheetModal
-      ref={bottomSheetModalRef}
-      snapPoints={snapPoints}
-      onChange={handleSheetChanges}
-      handleIndicatorStyle={{ backgroundColor: "white" }}
-      backgroundStyle={{ backgroundColor: "#171717" }}
-      backdropComponent={renderBackdrop}
-    >
-      <BottomSheetView
-        style={{
-          flex: 1,
-          paddingLeft: Math.max(16, insets.left),
-          paddingRight: Math.max(16, insets.right),
-          paddingBottom: Math.max(16, insets.bottom),
-        }}
-      >
-        <View className='flex-1'>
-          <Text className='font-bold text-2xl text-neutral-100'>
-            {t("login.quick_connect")}
-          </Text>
-          <TouchableOpacity
-            className='mt-6 p-6 border border-neutral-800 rounded-xl bg-neutral-900 flex flex-row items-center justify-center'
-            onPress={copyCode}
-          >
-            <Text
-              className='text-center font-bold text-5xl text-neutral-100'
-              style={{ letterSpacing: 10 }}
-            >
-              {code ?? lastCodeRef.current}
-            </Text>
-            <Ionicons
-              name='copy-outline'
-              size={22}
-              color='white'
-              style={{ opacity: 0.4, marginLeft: 16 }}
-            />
-          </TouchableOpacity>
-          <Text className='mt-2 text-neutral-500 text-center text-xs'>
-            {t("login.tap_code_to_copy")}
-          </Text>
-          <Text className='mt-3 mb-5 text-neutral-400 text-center px-4'>
-            {t("login.quick_connect_instructions")}
-          </Text>
-          <Button className='mt-auto' color='purple' onPress={onClose}>
-            {t("login.got_it")}
-          </Button>
-        </View>
-      </BottomSheetView>
-    </BottomSheetModal>
-  );
-};
--- a/components/login/TVLogin.tsx
+++ b/components/login/TVLogin.tsx
@@ -437,7 +437,7 @@ export const TVLogin: React.FC = () => {
      } else {
        Alert.alert(
          t("login.connection_failed"),
-          t("login.an_unexpected_error_occurred"),
+          t("login.an_unexpected_error_occured"),
        );
      }
    } finally {
@@ -499,7 +499,7 @@ export const TVLogin: React.FC = () => {
        const message =
          error instanceof Error
            ? error.message
-            : t("login.an_unexpected_error_occurred");
+            : t("login.an_unexpected_error_occured");
        Alert.alert(t("login.connection_failed"), message);
        goToQRScreen();
      } finally {
@@ -523,7 +523,7 @@ export const TVLogin: React.FC = () => {
        } else {
          Alert.alert(
            t("login.connection_failed"),
-            t("login.an_unexpected_error_occurred"),
+            t("login.an_unexpected_error_occured"),
          );
        }
      } finally {
@@ -768,7 +768,7 @@ export const TVLogin: React.FC = () => {
              const message =
                error instanceof Error
                  ? error.message
-                  : t("login.an_unexpected_error_occurred");
+                  : t("login.an_unexpected_error_occured");
              Alert.alert(t("login.connection_failed"), message);
              goToQRScreen();
            });
--- a/components/persons/TVActorPage.tsx
+++ b/components/persons/TVActorPage.tsx
@@ -156,9 +156,9 @@ export const TVActorPage: React.FC<TVActorPageProps> = ({ personId }) => {
    let isCancelled = false;

    const performCrossfade = async () => {
-      // Prefetch the image before starting the crossfade
+      // Disk-only prefetch to avoid pinning large backdrops in memory cache.
      try {
-        await Image.prefetch(backdropUrl);
+        await Image.prefetch(backdropUrl, "disk");
      } catch {
        // Continue even if prefetch fails
      }
--- a/components/search/TVSearchTabBadges.tsx
+++ b/components/search/TVSearchTabBadges.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import { useTranslation } from "react-i18next";
 import { Animated, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
@@ -89,8 +88,6 @@ export const TVSearchTabBadges: React.FC<TVSearchTabBadgesProps> = ({
  showDiscover,
  disabled = false,
 }) => {
-  const { t } = useTranslation();
-
  if (!showDiscover) {
    return null;
  }
@@ -104,13 +101,13 @@ export const TVSearchTabBadges: React.FC<TVSearchTabBadgesProps> = ({
      }}
    >
      <TVSearchTabBadge
-        label={t("search.library")}
+        label='Library'
        isSelected={searchType === "Library"}
        onPress={() => setSearchType("Library")}
        disabled={disabled}
      />
      <TVSearchTabBadge
-        label={t("search.discover")}
+        label='Discover'
        isSelected={searchType === "Discover"}
        onPress={() => setSearchType("Discover")}
        disabled={disabled}
--- a/components/settings/AppearanceSettings.tsx
+++ b/components/settings/AppearanceSettings.tsx
@@ -1,8 +1,7 @@
 import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Linking } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Linking, Switch } from "react-native";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 import useRouter from "@/hooks/useAppRouter";
 import { useSettings } from "@/utils/atoms/settings";
@@ -35,7 +34,7 @@ export const AppearanceSettings: React.FC = () => {
            )
          }
        >
-          <SettingSwitch
+          <Switch
            value={settings.showCustomMenuLinks}
            disabled={pluginSettings?.showCustomMenuLinks?.locked}
            onValueChange={(value) =>
@@ -46,23 +45,13 @@ export const AppearanceSettings: React.FC = () => {
        <ListItem
          title={t("home.settings.appearance.merge_next_up_continue_watching")}
        >
-          <SettingSwitch
+          <Switch
            value={settings.mergeNextUpAndContinueWatching}
            onValueChange={(value) =>
              updateSettings({ mergeNextUpAndContinueWatching: value })
            }
          />
        </ListItem>
-        <ListItem
-          title={t("home.settings.appearance.hide_remote_session_button")}
-        >
-          <SettingSwitch
-            value={settings.hideRemoteSessionButton}
-            onValueChange={(value) =>
-              updateSettings({ hideRemoteSessionButton: value })
-            }
-          />
-        </ListItem>
        <ListItem
          onPress={() =>
            router.push("/settings/appearance/hide-libraries/page")
@@ -70,6 +59,16 @@ export const AppearanceSettings: React.FC = () => {
          title={t("home.settings.other.hide_libraries")}
          showArrow
        />
+        <ListItem
+          title={t("home.settings.appearance.hide_remote_session_button")}
+        >
+          <Switch
+            value={settings.hideRemoteSessionButton}
+            onValueChange={(value) =>
+              updateSettings({ hideRemoteSessionButton: value })
+            }
+          />
+        </ListItem>
      </ListGroup>
    </DisabledSetting>
  );
--- a/components/settings/AudioToggles.tsx
+++ b/components/settings/AudioToggles.tsx
@@ -2,7 +2,7 @@ import { Ionicons } from "@expo/vector-icons";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View, type ViewProps } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch } from "react-native-gesture-handler";
 import { AudioTranscodeMode, useSettings } from "@/utils/atoms/settings";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
@@ -135,7 +135,7 @@ export const AudioToggles: React.FC<Props> = ({ ...props }) => {
          title={t("home.settings.audio.set_audio_track")}
          disabled={pluginSettings?.rememberAudioSelections?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.rememberAudioSelections}
            disabled={pluginSettings?.rememberAudioSelections?.locked}
            onValueChange={(value) =>
--- a/components/settings/ChromecastSettings.tsx
+++ b/components/settings/ChromecastSettings.tsx
@@ -1,5 +1,4 @@
-import { View } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch, View } from "react-native";
 import { useSettings } from "@/utils/atoms/settings";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
@@ -10,7 +9,7 @@ export const ChromecastSettings: React.FC = ({ ...props }) => {
    <View {...props}>
      <ListGroup title={"Chromecast"}>
        <ListItem title={"Enable H265 for Chromecast"}>
-          <SettingSwitch
+          <Switch
            value={settings.enableH265ForChromecast}
            onValueChange={(enableH265ForChromecast) =>
              updateSettings({ enableH265ForChromecast })
--- a/components/settings/GestureControls.tsx
+++ b/components/settings/GestureControls.tsx
@@ -2,7 +2,7 @@ import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import type { ViewProps } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch } from "react-native";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 import { useSettings } from "@/utils/atoms/settings";
 import { ListGroup } from "../list/ListGroup";
@@ -39,7 +39,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
          )}
          disabled={pluginSettings?.enableHorizontalSwipeSkip?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.enableHorizontalSwipeSkip}
            disabled={pluginSettings?.enableHorizontalSwipeSkip?.locked}
            onValueChange={(enableHorizontalSwipeSkip) =>
@@ -55,7 +55,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
          )}
          disabled={pluginSettings?.enableLeftSideBrightnessSwipe?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.enableLeftSideBrightnessSwipe}
            disabled={pluginSettings?.enableLeftSideBrightnessSwipe?.locked}
            onValueChange={(enableLeftSideBrightnessSwipe) =>
@@ -71,7 +71,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
          )}
          disabled={pluginSettings?.enableRightSideVolumeSwipe?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.enableRightSideVolumeSwipe}
            disabled={pluginSettings?.enableRightSideVolumeSwipe?.locked}
            onValueChange={(enableRightSideVolumeSwipe) =>
@@ -87,7 +87,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
          )}
          disabled={pluginSettings?.hideVolumeSlider?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.hideVolumeSlider}
            disabled={pluginSettings?.hideVolumeSlider?.locked}
            onValueChange={(hideVolumeSlider) =>
@@ -103,7 +103,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
          )}
          disabled={pluginSettings?.hideBrightnessSlider?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.hideBrightnessSlider}
            disabled={pluginSettings?.hideBrightnessSlider?.locked}
            onValueChange={(hideBrightnessSlider) =>
--- a/components/settings/Jellyseerr.tsx
+++ b/components/settings/Jellyseerr.tsx
@@ -20,10 +20,7 @@ export const JellyseerrSettings = () => {
  const { t } = useTranslation();

  const [user] = useAtom(userAtom);
-  const { settings, updateSettings, pluginSettings } = useSettings();
-  // Only the server URL is admin-lockable — the password stays editable so
-  // the user can still sign in to the admin-pinned Jellyseerr server.
-  const urlLocked = pluginSettings?.jellyseerrServerUrl?.locked === true;
+  const { settings, updateSettings } = useSettings();

  const [jellyseerrPassword, setJellyseerrPassword] = useState<
    string | undefined
@@ -118,41 +115,30 @@ export const JellyseerrSettings = () => {
          </>
        ) : (
          <View className='flex flex-col rounded-xl overflow-hidden p-4 bg-neutral-900'>
-            <View style={{ opacity: urlLocked ? 0.5 : 1 }}>
-              <Text className='font-bold mb-1'>
-                {t("home.settings.plugins.jellyseerr.server_url")}
+            <Text className='font-bold mb-1'>
+              {t("home.settings.plugins.jellyseerr.server_url")}
+            </Text>
+            <View className='flex flex-col shrink mb-2'>
+              <Text className='text-xs text-gray-600'>
+                {t("home.settings.plugins.jellyseerr.server_url_hint")}
              </Text>
-              <View className='flex flex-col shrink mb-2'>
-                <Text className='text-xs text-gray-600'>
-                  {t("home.settings.plugins.jellyseerr.server_url_hint")}
-                </Text>
-              </View>
-              <Input
-                className='border border-neutral-800 mb-2'
-                placeholder={t(
-                  "home.settings.plugins.jellyseerr.server_url_placeholder",
-                )}
-                value={
-                  urlLocked
-                    ? settings?.jellyseerrServerUrl
-                    : (jellyseerrServerUrl ?? settings?.jellyseerrServerUrl)
-                }
-                defaultValue={
-                  settings?.jellyseerrServerUrl ?? jellyseerrServerUrl
-                }
-                keyboardType='url'
-                returnKeyType='done'
-                autoCapitalize='none'
-                textContentType='URL'
-                onChangeText={setjellyseerrServerUrl}
-                editable={!urlLocked && !loginToJellyseerrMutation.isPending}
-              />
-              {urlLocked && (
-                <Text className='text-xs text-red-600 mb-2'>
-                  Disabled by admin
-                </Text>
-              )}
            </View>
+            <Input
+              className='border border-neutral-800 mb-2'
+              placeholder={t(
+                "home.settings.plugins.jellyseerr.server_url_placeholder",
+              )}
+              value={jellyseerrServerUrl ?? settings?.jellyseerrServerUrl}
+              defaultValue={
+                settings?.jellyseerrServerUrl ?? jellyseerrServerUrl
+              }
+              keyboardType='url'
+              returnKeyType='done'
+              autoCapitalize='none'
+              textContentType='URL'
+              onChangeText={setjellyseerrServerUrl}
+              editable={!loginToJellyseerrMutation.isPending}
+            />
            <View>
              <Text className='font-bold mb-2'>
                {t("home.settings.plugins.jellyseerr.password")}
--- a/components/settings/KefinTweaks.tsx
+++ b/components/settings/KefinTweaks.tsx
@@ -1,28 +1,33 @@
 import { useTranslation } from "react-i18next";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch, Text, View } from "react-native";
 import { useSettings } from "@/utils/atoms/settings";
-import { ListGroup } from "../list/ListGroup";
-import { ListItem } from "../list/ListItem";

 export const KefinTweaksSettings = () => {
-  const { settings, updateSettings, pluginSettings } = useSettings();
+  const { settings, updateSettings } = useSettings();
  const { t } = useTranslation();

  const isEnabled = settings?.useKefinTweaks ?? false;
-  const locked = pluginSettings?.useKefinTweaks?.locked === true;

  return (
-    <ListGroup>
-      <ListItem
-        title={t("home.settings.plugins.kefinTweaks.watchlist_enabler")}
-        disabledByAdmin={locked}
-      >
-        <SettingSwitch
-          value={isEnabled}
-          disabled={locked}
-          onValueChange={(value) => updateSettings({ useKefinTweaks: value })}
-        />
-      </ListItem>
-    </ListGroup>
+    <View className=''>
+      <View className='flex flex-col rounded-xl overflow-hidden p-4 bg-neutral-900'>
+        <Text className='text-xs text-red-600 mb-2'>
+          {t("home.settings.plugins.kefinTweaks.watchlist_enabler")}
+        </Text>
+
+        <View className='flex flex-row items-center justify-between mt-2'>
+          <Text className='text-white'>
+            {isEnabled ? t("Watchlist On") : t("Watchlist Off")}
+          </Text>
+
+          <Switch
+            value={isEnabled}
+            onValueChange={(value) => updateSettings({ useKefinTweaks: value })}
+            trackColor={{ false: "#555", true: "purple" }}
+            thumbColor={isEnabled ? "#fff" : "#ccc"}
+          />
+        </View>
+      </View>
+    </View>
  );
 };
--- a/components/settings/LocalNetworkSettings.tsx
+++ b/components/settings/LocalNetworkSettings.tsx
@@ -2,9 +2,8 @@ import { Ionicons } from "@expo/vector-icons";
 import type React from "react";
 import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { TouchableOpacity, View } from "react-native";
+import { Switch, TouchableOpacity, View } from "react-native";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { useWifiSSID } from "@/hooks/useWifiSSID";
 import { useServerUrl } from "@/providers/ServerUrlProvider";
 import { storage } from "@/utils/mmkv";
@@ -148,10 +147,7 @@ export function LocalNetworkSettings(): React.ReactElement | null {
          title={t("home.settings.network.auto_switch_enabled")}
          subtitle={t("home.settings.network.auto_switch_description")}
        >
-          <SettingSwitch
-            value={config.enabled}
-            onValueChange={handleToggleEnabled}
-          />
+          <Switch value={config.enabled} onValueChange={handleToggleEnabled} />
        </ListItem>
      </ListGroup>

--- a/components/settings/MpvSubtitleSettings.tsx
+++ b/components/settings/MpvSubtitleSettings.tsx
@@ -1,8 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { Platform, View, type ViewProps } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Platform, Switch, View, type ViewProps } from "react-native";
 import { Stepper } from "@/components/inputs/Stepper";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
@@ -19,21 +17,20 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
  const isTv = Platform.isTV;
  const media = useMedia();
  const { settings, updateSettings } = media;
-  const { t } = useTranslation();

  const alignXOptions: AlignX[] = ["left", "center", "right"];
  const alignYOptions: AlignY[] = ["top", "center", "bottom"];

  const alignXLabels: Record<AlignX, string> = {
-    left: t("home.settings.subtitles.align.left"),
-    center: t("home.settings.subtitles.align.center"),
-    right: t("home.settings.subtitles.align.right"),
+    left: "Left",
+    center: "Center",
+    right: "Right",
  };

  const alignYLabels: Record<AlignY, string> = {
-    top: t("home.settings.subtitles.align.top"),
-    center: t("home.settings.subtitles.align.center"),
-    bottom: t("home.settings.subtitles.align.bottom"),
+    top: "Top",
+    center: "Center",
+    bottom: "Bottom",
  };

  const alignXOptionGroups = useMemo(() => {
@@ -63,18 +60,16 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
  return (
    <View {...props}>
      <ListGroup
-        title={t("home.settings.subtitles.mpv_settings_title")}
+        title='MPV Subtitle Settings'
        description={
          <Text className='text-[#8E8D91] text-xs'>
-            {t("home.settings.subtitles.mpv_settings_description")}
+            Advanced subtitle customization for MPV player
          </Text>
        }
      >
        {!isTv && (
          <>
-            <ListItem
-              title={t("home.settings.subtitles.mpv_subtitle_margin_y")}
-            >
+            <ListItem title='Vertical Margin'>
              <Stepper
                value={settings.mpvSubtitleMarginY ?? 0}
                step={5}
@@ -86,7 +81,7 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
              />
            </ListItem>

-            <ListItem title={t("home.settings.subtitles.mpv_subtitle_align_x")}>
+            <ListItem title='Horizontal Alignment'>
              <PlatformDropdown
                groups={alignXOptionGroups}
                trigger={
@@ -101,11 +96,11 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
                    />
                  </View>
                }
-                title={t("home.settings.subtitles.mpv_subtitle_align_x")}
+                title='Horizontal Alignment'
              />
            </ListItem>

-            <ListItem title={t("home.settings.subtitles.mpv_subtitle_align_y")}>
+            <ListItem title='Vertical Alignment'>
              <PlatformDropdown
                groups={alignYOptionGroups}
                trigger={
@@ -120,14 +115,14 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
                    />
                  </View>
                }
-                title={t("home.settings.subtitles.mpv_subtitle_align_y")}
+                title='Vertical Alignment'
              />
            </ListItem>
          </>
        )}

-        <ListItem title={t("home.settings.subtitles.opaque_background")}>
-          <SettingSwitch
+        <ListItem title='Opaque Background'>
+          <Switch
            value={settings.mpvSubtitleBackgroundEnabled ?? false}
            onValueChange={(value) =>
              updateSettings({ mpvSubtitleBackgroundEnabled: value })
@@ -136,7 +131,7 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
        </ListItem>

        {settings.mpvSubtitleBackgroundEnabled && (
-          <ListItem title={t("home.settings.subtitles.background_opacity")}>
+          <ListItem title='Background Opacity'>
            <Stepper
              value={settings.mpvSubtitleBackgroundOpacity ?? 75}
              step={5}
--- a/components/settings/OtherSettings.tsx
+++ b/components/settings/OtherSettings.tsx
@@ -3,9 +3,8 @@ import { TFunction } from "i18next";
 import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Linking, View } from "react-native";
+import { Linking, Switch, View } from "react-native";
 import { BITRATES } from "@/components/BitrateSelector";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { PlatformDropdown } from "@/components/PlatformDropdown";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 import useRouter from "@/hooks/useAppRouter";
@@ -133,7 +132,7 @@ export const OtherSettings: React.FC = () => {
          title={t("home.settings.other.safe_area_in_controls")}
          disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.safeAreaInControlsEnabled}
            disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
            onValueChange={(value) =>
@@ -151,7 +150,7 @@ export const OtherSettings: React.FC = () => {
            )
          }
        >
-          <SettingSwitch
+          <Switch
            value={settings.showCustomMenuLinks}
            disabled={pluginSettings?.showCustomMenuLinks?.locked}
            onValueChange={(value) =>
@@ -189,7 +188,7 @@ export const OtherSettings: React.FC = () => {
          title={t("home.settings.other.disable_haptic_feedback")}
          disabled={pluginSettings?.disableHapticFeedback?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.disableHapticFeedback}
            disabled={pluginSettings?.disableHapticFeedback?.locked}
            onValueChange={(disableHapticFeedback) =>
--- a/components/settings/PlaybackControlsSettings.tsx
+++ b/components/settings/PlaybackControlsSettings.tsx
@@ -3,9 +3,8 @@ import { TFunction } from "i18next";
 import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { View } from "react-native";
+import { Switch, View } from "react-native";
 import { BITRATES } from "@/components/BitrateSelector";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { PlatformDropdown } from "@/components/PlatformDropdown";
 import { PLAYBACK_SPEEDS } from "@/components/PlaybackSpeedSelector";
 import DisabledSetting from "@/components/settings/DisabledSetting";
@@ -116,7 +115,7 @@ export const PlaybackControlsSettings: React.FC = () => {

  return (
    <DisabledSetting disabled={disabled}>
-      <ListGroup title={t("home.settings.other.other_title")} className='mb-4'>
+      <ListGroup title={t("home.settings.other.other_title")} className=''>
        <ListItem
          title={t("home.settings.other.video_orientation")}
          disabled={pluginSettings?.defaultVideoOrientation?.locked}
@@ -147,7 +146,7 @@ export const PlaybackControlsSettings: React.FC = () => {
          title={t("home.settings.other.safe_area_in_controls")}
          disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.safeAreaInControlsEnabled}
            disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
            onValueChange={(value) =>
@@ -206,7 +205,7 @@ export const PlaybackControlsSettings: React.FC = () => {
          title={t("home.settings.other.disable_haptic_feedback")}
          disabled={pluginSettings?.disableHapticFeedback?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.disableHapticFeedback}
            disabled={pluginSettings?.disableHapticFeedback?.locked}
            onValueChange={(disableHapticFeedback) =>
@@ -219,7 +218,7 @@ export const PlaybackControlsSettings: React.FC = () => {
          title={t("home.settings.other.auto_play_next_episode")}
          disabled={pluginSettings?.autoPlayNextEpisode?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.autoPlayNextEpisode}
            disabled={pluginSettings?.autoPlayNextEpisode?.locked}
            onValueChange={(autoPlayNextEpisode) =>
--- a/components/settings/PluginSettings.tsx
+++ b/components/settings/PluginSettings.tsx
@@ -20,12 +20,7 @@ export const PluginSettings = () => {
    >
      <ListItem
        onPress={() => router.push("/settings/plugins/jellyseerr/page")}
-        title='Jellyseerr'
-        showArrow
-      />
-      <ListItem
-        onPress={() => router.push("/settings/plugins/streamystats/page")}
-        title='Streamystats'
+        title={"Jellyseerr"}
        showArrow
      />
      <ListItem
@@ -33,6 +28,11 @@ export const PluginSettings = () => {
        title='Marlin Search'
        showArrow
      />
+      <ListItem
+        onPress={() => router.push("/settings/plugins/streamystats/page")}
+        title='Streamystats'
+        showArrow
+      />
      <ListItem
        onPress={() => router.push("/settings/plugins/kefinTweaks/page")}
        title='KefinTweaks'
--- a/components/settings/QuickConnect.tsx
+++ b/components/settings/QuickConnect.tsx
@@ -1,4 +1,3 @@
-import { Feather } from "@expo/vector-icons";
 import {
  BottomSheetBackdrop,
  type BottomSheetBackdropProps,
@@ -6,13 +5,11 @@ import {
  BottomSheetView,
 } from "@gorhom/bottom-sheet";
 import { getQuickConnectApi } from "@jellyfin/sdk/lib/utils/api";
-import { requireOptionalNativeModule } from "expo-modules-core";
 import { useAtom } from "jotai";
 import type React from "react";
 import { useCallback, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Platform, View, type ViewProps } from "react-native";
-import { Pressable } from "react-native-gesture-handler";
 import { useHaptic } from "@/hooks/useHaptic";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { Button } from "../Button";
@@ -61,7 +58,7 @@ export const QuickConnect: React.FC<Props> = ({ ...props }) => {
          successHapticFeedback();
          Alert.alert(
            t("home.settings.quick_connect.success"),
-            t("home.settings.quick_connect.quick_connect_authorized"),
+            t("home.settings.quick_connect.quick_connect_autorized"),
          );
          setQuickConnectCode(undefined);
          bottomSheetModalRef?.current?.close();
@@ -82,15 +79,6 @@ export const QuickConnect: React.FC<Props> = ({ ...props }) => {
    }
  }, [api, user, quickConnectCode]);

-  const pasteCode = useCallback(async () => {
-    // Builds without the expo-clipboard native module: probe first (no-op).
-    if (!requireOptionalNativeModule("ExpoClipboard")) return;
-    const Clipboard = await import("expo-clipboard");
-    const text = await Clipboard.getStringAsync();
-    const digits = (text || "").replace(/\D/g, "").slice(0, 6);
-    if (digits) setQuickConnectCode(digits);
-  }, []);
-
  if (isTv) return null;

  return (
@@ -142,15 +130,6 @@ export const QuickConnect: React.FC<Props> = ({ ...props }) => {
                  style={{ paddingHorizontal: 16 }}
                  autoFocus
                />
-                <Pressable
-                  onPress={pasteCode}
-                  className='flex-row items-center justify-center self-center'
-                >
-                  <Feather name='clipboard' size={15} color='#a3a3a3' />
-                  <Text className='text-neutral-400 ml-2'>
-                    {t("home.settings.quick_connect.paste_code")}
-                  </Text>
-                </Pressable>
              </View>
            </View>
            <Button
--- a/components/settings/StorageSettings.tsx
+++ b/components/settings/StorageSettings.tsx
@@ -1,6 +1,6 @@
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
-import { Alert, Platform, View } from "react-native";
+import { Platform, View } from "react-native";
 import { toast } from "sonner-native";
 import { Text } from "@/components/common/Text";
 import { Colors } from "@/constants/Colors";
@@ -12,7 +12,6 @@ import { ListItem } from "../list/ListItem";
 export const StorageSettings = () => {
  const { deleteAllFiles, appSizeUsage } = useDownload();
  const { t } = useTranslation();
-  const queryClient = useQueryClient();
  const successHapticFeedback = useHaptic("success");
  const errorHapticFeedback = useHaptic("error");

@@ -28,38 +27,16 @@ export const StorageSettings = () => {
        used: (app.total - app.remaining) / app.total,
      };
    },
-    // Keep the bar moving while a download is writing to disk.
-    refetchInterval: 10 * 1000,
  });

-  const onDeleteClicked = () => {
-    Alert.alert(
-      t("home.settings.storage.delete_all_downloaded_files_confirm"),
-      t("home.settings.storage.delete_all_downloaded_files_confirm_desc"),
-      [
-        {
-          text: t("common.cancel"),
-          style: "cancel",
-        },
-        {
-          text: t("common.ok"),
-          style: "destructive",
-          onPress: async () => {
-            try {
-              await deleteAllFiles();
-              successHapticFeedback();
-            } catch (_e) {
-              errorHapticFeedback();
-              toast.error(t("home.settings.toasts.error_deleting_files"));
-            } finally {
-              // Reflect the freed space immediately instead of waiting for
-              // the next poll.
-              queryClient.invalidateQueries({ queryKey: ["appSize"] });
-            }
-          },
-        },
-      ],
-    );
+  const onDeleteClicked = async () => {
+    try {
+      await deleteAllFiles();
+      successHapticFeedback();
+    } catch (_e) {
+      errorHapticFeedback();
+      toast.error(t("home.settings.toasts.error_deleting_files"));
+    }
  };

  const calculatePercentage = (value: number, total: number) => {
@@ -125,7 +102,7 @@ export const StorageSettings = () => {
        </View>
      </View>
      {!Platform.isTV && (
-        <ListGroup className={Platform.OS === "android" ? "mt-4" : undefined}>
+        <ListGroup>
          <ListItem
            textColor='red'
            onPress={onDeleteClicked}
--- a/components/settings/SubtitleToggles.tsx
+++ b/components/settings/SubtitleToggles.tsx
@@ -3,8 +3,8 @@ import { SubtitlePlaybackMode } from "@jellyfin/sdk/lib/generated-client";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View, type ViewProps } from "react-native";
+import { Switch } from "react-native-gesture-handler";
 import { Input } from "@/components/common/Input";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Stepper } from "@/components/inputs/Stepper";
 import { useSettings } from "@/utils/atoms/settings";
 import { Text } from "../common/Text";
@@ -98,7 +98,6 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
  return (
    <View {...props}>
      <ListGroup
-        className='mb-4'
        title={t("home.settings.subtitles.subtitle_title")}
        description={
          <Text className='text-[#8E8D91] text-xs'>
@@ -153,7 +152,7 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
          title={t("home.settings.subtitles.set_subtitle_track")}
          disabled={pluginSettings?.rememberSubtitleSelections?.locked}
        >
-          <SettingSwitch
+          <Switch
            value={settings.rememberSubtitleSelections}
            disabled={pluginSettings?.rememberSubtitleSelections?.locked}
            onValueChange={(value) =>
--- a/components/tv/TVNavBar.tsx
+++ b/components/tv/TVNavBar.tsx
@@ -0,0 +1,155 @@
+import React from "react";
+import {
+  Animated,
+  Pressable,
+  ScrollView,
+  StyleProp,
+  View,
+  ViewStyle,
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Text } from "@/components/common/Text";
+import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
+import { TVPadding } from "@/constants/TVSizes";
+import { useScaledTVTypography } from "@/constants/TVTypography";
+import { scaleSize } from "@/utils/scaleSize";
+
+export interface TVNavBarTab {
+  key: string;
+  label: string;
+}
+
+export interface TVNavBarProps {
+  tabs: TVNavBarTab[];
+  activeTabKey: string;
+  onTabChange: (key: string) => void;
+  style?: StyleProp<ViewStyle>;
+}
+
+const TVNavBarTabItem: React.FC<{
+  label: string;
+  isActive: boolean;
+  onSelect: () => void;
+  onLayout: (e: {
+    nativeEvent: { layout: { x: number; width: number } };
+  }) => void;
+  hasTVPreferredFocus: boolean;
+}> = ({ label, isActive, onSelect, onLayout, hasTVPreferredFocus }) => {
+  const typography = useScaledTVTypography();
+  const { focused, handleFocus, handleBlur, animatedStyle } =
+    useTVFocusAnimation({
+      scaleAmount: 1.05,
+      duration: 120,
+    });
+
+  const bg = focused
+    ? "rgba(255, 255, 255, 0.95)"
+    : isActive
+      ? "rgba(255, 255, 255, 0.15)"
+      : "transparent";
+
+  const textColor = focused
+    ? "#000"
+    : isActive
+      ? "#fff"
+      : "rgba(255, 255, 255, 0.7)";
+
+  return (
+    <Pressable
+      onPress={onSelect}
+      onFocus={handleFocus}
+      onBlur={handleBlur}
+      hasTVPreferredFocus={hasTVPreferredFocus}
+      onLayout={onLayout}
+    >
+      <Animated.View
+        style={[
+          animatedStyle,
+          {
+            backgroundColor: bg,
+            borderRadius: scaleSize(24),
+            borderWidth: isActive && !focused ? 1 : 0,
+            borderColor: "rgba(255, 255, 255, 0.3)",
+            paddingHorizontal: scaleSize(28),
+            paddingVertical: scaleSize(14),
+          },
+        ]}
+      >
+        <Text
+          style={{
+            fontSize: typography.heading,
+            color: textColor,
+            fontWeight: isActive || focused ? "600" : "400",
+          }}
+        >
+          {label}
+        </Text>
+      </Animated.View>
+    </Pressable>
+  );
+};
+
+export const TVNavBar: React.FC<TVNavBarProps> = ({
+  tabs,
+  activeTabKey,
+  onTabChange,
+  style,
+}) => {
+  const scrollRef = React.useRef<ScrollView>(null);
+  const tabLayouts = React.useRef<Record<string, { x: number; width: number }>>(
+    {},
+  );
+  const insets = useSafeAreaInsets();
+
+  const handleTabLayout = React.useCallback(
+    (key: string) =>
+      (e: { nativeEvent: { layout: { x: number; width: number } } }) => {
+        tabLayouts.current[key] = e.nativeEvent.layout;
+      },
+    [],
+  );
+
+  const handleTabChange = React.useCallback(
+    (key: string) => {
+      onTabChange(key);
+
+      const layout = tabLayouts.current[key];
+      if (layout && scrollRef.current) {
+        scrollRef.current.scrollTo({
+          x: Math.max(0, layout.x - TVPadding.horizontal / 2),
+          animated: true,
+        });
+      }
+    },
+    [onTabChange],
+  );
+
+  if (tabs.length === 0) return null;
+
+  return (
+    <View style={[{ paddingTop: insets.top + 16, paddingBottom: 8 }, style]}>
+      <ScrollView
+        ref={scrollRef}
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        keyboardShouldPersistTaps='handled'
+        contentContainerStyle={{
+          flexGrow: 1,
+          justifyContent: "center",
+          gap: scaleSize(12),
+        }}
+      >
+        {tabs.map((tab) => (
+          <TVNavBarTabItem
+            key={tab.key}
+            label={tab.label}
+            isActive={tab.key === activeTabKey}
+            onSelect={() => handleTabChange(tab.key)}
+            onLayout={handleTabLayout(tab.key)}
+            hasTVPreferredFocus={tab.key === activeTabKey}
+          />
+        ))}
+      </ScrollView>
+    </View>
+  );
+};
--- a/components/tv/TVPosterCard.tsx
+++ b/components/tv/TVPosterCard.tsx
@@ -3,7 +3,6 @@ import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { Image } from "expo-image";
 import { useAtomValue } from "jotai";
 import React, { useMemo, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
 import {
  Animated,
  Easing,
@@ -107,7 +106,6 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
  scaleAmount = 1.05,
  imageUrlGetter,
 }) => {
-  const { t } = useTranslation();
  const api = useAtomValue(apiAtom);
  const posterSizes = useScaledTVPosterSizes();
  const typography = useScaledTVTypography();
@@ -373,7 +371,7 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
          fontWeight: "700",
        }}
      >
-        {t("music.now_playing")}
+        Now Playing
      </Text>
    </View>
  ) : null;
@@ -450,8 +448,8 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
        <Image
          placeholder={{ blurhash }}
          key={item.Id}
-          id={item.Id}
          source={{ uri: imageUrl }}
+          recyclingKey={item.Id}
          cachePolicy='memory-disk'
          contentFit='cover'
          style={{
--- a/components/tv/TVSubtitleResultCard.tsx
+++ b/components/tv/TVSubtitleResultCard.tsx
@@ -1,6 +1,5 @@
 import { Ionicons } from "@expo/vector-icons";
 import React from "react";
-import { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
  Animated,
@@ -29,7 +28,6 @@ export const TVSubtitleResultCard = React.forwardRef<
  const styles = createStyles(typography);
  const { focused, handleFocus, handleBlur, animatedStyle } =
    useTVFocusAnimation({ scaleAmount: 1.03 });
-  const { t } = useTranslation();

  return (
    <Pressable
@@ -154,7 +152,7 @@ export const TVSubtitleResultCard = React.forwardRef<
                },
              ]}
            >
-              <Text style={styles.flagText}>{t("player.hash_match")}</Text>
+              <Text style={styles.flagText}>Hash Match</Text>
            </View>
          )}
          {result.hearingImpaired && (
--- a/components/tv/index.ts
+++ b/components/tv/index.ts
@@ -35,6 +35,8 @@ export type { TVLanguageCardProps } from "./TVLanguageCard";
 export { TVLanguageCard } from "./TVLanguageCard";
 export type { TVMetadataBadgesProps } from "./TVMetadataBadges";
 export { TVMetadataBadges } from "./TVMetadataBadges";
+export type { TVNavBarProps, TVNavBarTab } from "./TVNavBar";
+export { TVNavBar } from "./TVNavBar";
 export type { TVNextEpisodeCountdownProps } from "./TVNextEpisodeCountdown";
 export { TVNextEpisodeCountdown } from "./TVNextEpisodeCountdown";
 export type { TVOptionButtonProps } from "./TVOptionButton";
--- a/components/video-player/controls/BottomControls.tsx
+++ b/components/video-player/controls/BottomControls.tsx
@@ -183,7 +183,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
          <SkipButton
            showButton={showSkipButton}
            onPress={skipIntro}
-            buttonText={t("player.skip_intro")}
+            buttonText='Skip Intro'
          />
          {/* Smart Skip Credits behavior:
              - Show "Skip Credits" if there's content after credits OR no next episode
@@ -193,7 +193,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
              showSkipCreditButton && (hasContentAfterCredits || !nextItem)
            }
            onPress={skipCredit}
-            buttonText={t("player.skip_credits")}
+            buttonText='Skip Credits'
          />
          {settings.autoPlayNextEpisode !== false &&
            (settings.maxAutoPlayEpisodeCount.value === -1 ||
--- a/components/video-player/controls/ContinueWatchingOverlay.tsx
+++ b/components/video-player/controls/ContinueWatchingOverlay.tsx
@@ -27,7 +27,7 @@ const ContinueWatchingOverlay: React.FC<ContinueWatchingOverlayProps> = ({
      }
    >
      <Text className='text-2xl font-bold text-white py-4 '>
-        {t("player.still_watching")}
+        Are you still watching ?
      </Text>
      <Button
        onPress={() => {
--- a/components/video-player/controls/HeaderControls.tsx
+++ b/components/video-player/controls/HeaderControls.tsx
@@ -4,7 +4,6 @@ import type {
  MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client";
 import { type FC, useCallback, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import useRouter from "@/hooks/useAppRouter";
 import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
@@ -58,7 +57,6 @@ export const HeaderControls: FC<HeaderControlsProps> = ({
  showTechnicalInfo = false,
  onToggleTechnicalInfo,
 }) => {
-  const { t } = useTranslation();
  const router = useRouter();
  const insets = useControlsSafeAreaInsets();
  const lightHapticFeedback = useHaptic("light");
@@ -129,8 +127,8 @@ export const HeaderControls: FC<HeaderControlsProps> = ({
            onPress={toggleOrientation}
            disabled={isTogglingOrientation}
            className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
-            accessibilityLabel={t("accessibility.toggle_orientation")}
-            accessibilityHint={t("accessibility.toggle_orientation_hint")}
+            accessibilityLabel='Toggle screen orientation'
+            accessibilityHint='Toggles the screen orientation between portrait and landscape'
          >
            <MaterialIcons
              name='screen-rotation'
--- a/components/video-player/controls/TechnicalInfoOverlay.tsx
+++ b/components/video-player/controls/TechnicalInfoOverlay.tsx
@@ -7,7 +7,6 @@ import {
  useMemo,
  useState,
 } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, StyleSheet, Text, View } from "react-native";
 import Animated, {
  Easing,
@@ -185,7 +184,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
    currentAudioIndex,
  }) => {
    const typography = useScaledTVTypography();
-    const { t } = useTranslation();
    const insets = useSafeAreaInsets();
    const safeInsets = useControlsSafeAreaInsets();
    const [info, setInfo] = useState<TechnicalInfo | null>(null);
@@ -314,13 +312,13 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {info?.videoCodec && (
            <Text style={textStyle}>
-              {t("player.technical_info.video")} {formatCodec(info.videoCodec)}
+              Video: {formatCodec(info.videoCodec)}
              {info.fps ? ` @ ${formatFps(info.fps)} fps` : ""}
            </Text>
          )}
          {info?.audioCodec && (
            <Text style={textStyle}>
-              {t("player.technical_info.audio")} {formatCodec(info.audioCodec)}
+              Audio: {formatCodec(info.audioCodec)}
              {streamInfo?.audioChannels
                ? ` ${formatAudioChannels(streamInfo.audioChannels)}`
                : ""}
@@ -328,13 +326,12 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {streamInfo?.subtitleCodec && (
            <Text style={textStyle}>
-              {t("player.technical_info.subtitle")}{" "}
-              {formatCodec(streamInfo.subtitleCodec)}
+              Subtitle: {formatCodec(streamInfo.subtitleCodec)}
            </Text>
          )}
          {(info?.videoBitrate || info?.audioBitrate) && (
            <Text style={textStyle}>
-              {t("player.technical_info.bitrate")}{" "}
+              Bitrate:{" "}
              {info.videoBitrate
                ? formatBitrate(info.videoBitrate)
                : info.audioBitrate
@@ -344,27 +341,33 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {info?.cacheSeconds !== undefined && (
            <Text style={textStyle}>
-              {t("player.technical_info.buffer_seconds", {
-                seconds: info.cacheSeconds.toFixed(1),
-              })}
+              Buffer: {info.cacheSeconds.toFixed(1)}s
+              {info?.demuxerMaxBytes !== undefined
+                ? ` (cap ${info.demuxerMaxBytes}MB` +
+                  `${info.demuxerMaxBackBytes !== undefined ? ` / ${info.demuxerMaxBackBytes}MB back` : ""}` +
+                  `${info?.cacheSecsLimit !== undefined && info.cacheSecsLimit < 3600 ? ` · ${info.cacheSecsLimit.toFixed(0)}s` : ""}` +
+                  ")"
+                : ""}
            </Text>
          )}
          {info?.voDriver && (
            <Text style={textStyle}>
-              {t("player.technical_info.vo")} {info.voDriver}
+              VO: {info.voDriver}
              {info.hwdec ? ` / ${info.hwdec}` : ""}
            </Text>
          )}
+          {info?.estimatedVfFps !== undefined && (
+            <Text style={textStyle}>
+              Output FPS: {info.estimatedVfFps.toFixed(2)}
+              {info?.fps ? ` (container ${formatFps(info.fps)})` : ""}
+            </Text>
+          )}
          {info?.droppedFrames !== undefined && info.droppedFrames > 0 && (
            <Text style={[textStyle, styles.warningText]}>
-              {t("player.technical_info.dropped_frames", {
-                count: info.droppedFrames,
-              })}
+              Dropped: {info.droppedFrames} frames
            </Text>
          )}
-          {!info && !playMethod && (
-            <Text style={textStyle}>{t("player.technical_info.loading")}</Text>
-          )}
+          {!info && !playMethod && <Text style={textStyle}>Loading...</Text>}
        </View>
      </Animated.View>
    );
--- a/components/video-player/controls/VideoScalingModeSelector.tsx
+++ b/components/video-player/controls/VideoScalingModeSelector.tsx
@@ -1,6 +1,5 @@
 import { Ionicons } from "@expo/vector-icons";
 import React, { useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import {
  type OptionGroup,
@@ -55,7 +54,6 @@ export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({
  onRatioChange,
  disabled = false,
 }) => {
-  const { t } = useTranslation();
  const lightHapticFeedback = useHaptic("light");

  const handleRatioSelect = (ratio: AspectRatio) => {
@@ -68,10 +66,7 @@ export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({
      {
        options: ASPECT_RATIO_OPTIONS.map((option) => ({
          type: "radio" as const,
-          label:
-            option.id === "default"
-              ? t("player.aspect_ratio_original")
-              : option.label,
+          label: option.label,
          value: option.id,
          selected: option.id === currentRatio,
          onPress: () => handleRatioSelect(option.id),
@@ -99,7 +94,7 @@ export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({

  return (
    <PlatformDropdown
-      title={t("player.aspect_ratio")}
+      title='Aspect Ratio'
      groups={optionGroups}
      trigger={trigger}
      bottomSheetConfig={{
--- a/components/video-player/controls/dropdown/DropdownView.tsx
+++ b/components/video-player/controls/dropdown/DropdownView.tsx
@@ -1,7 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useCallback, useMemo, useRef } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { BITRATES } from "@/components/BitrateSelector";
 import {
@@ -48,7 +47,6 @@ const DropdownView = ({
  const { settings, updateSettings } = useSettings();
  const router = useRouter();
  const isOffline = useOfflineMode();
-  const { t } = useTranslation();

  const { subtitleIndex, audioIndex, bitrateValue, playbackPosition } =
    useLocalSearchParams<{
@@ -103,7 +101,7 @@ const DropdownView = ({
    // Quality Section
    if (!isOffline) {
      groups.push({
-        title: t("player.menu.quality"),
+        title: "Quality",
        options:
          BITRATES?.map((bitrate) => ({
            type: "radio" as const,
@@ -118,7 +116,7 @@ const DropdownView = ({
    // Subtitle Section
    if (subtitleTracks && subtitleTracks.length > 0) {
      groups.push({
-        title: t("player.menu.subtitles"),
+        title: "Subtitles",
        options: subtitleTracks.map((sub) => ({
          type: "radio" as const,
          label: sub.name,
@@ -130,7 +128,7 @@ const DropdownView = ({

      // Subtitle Scale Section
      groups.push({
-        title: t("player.menu.subtitle_scale"),
+        title: "Subtitle Scale",
        options: SUBTITLE_SCALE_PRESETS.map((preset) => ({
          type: "radio" as const,
          label: preset.label,
@@ -144,7 +142,7 @@ const DropdownView = ({
    // Audio Section
    if (audioTracks && audioTracks.length > 0) {
      groups.push({
-        title: t("player.menu.audio"),
+        title: "Audio",
        options: audioTracks.map((track) => ({
          type: "radio" as const,
          label: track.name,
@@ -158,7 +156,7 @@ const DropdownView = ({
    // Speed Section
    if (setPlaybackSpeed) {
      groups.push({
-        title: t("player.menu.speed"),
+        title: "Speed",
        options: PLAYBACK_SPEEDS.map((speed) => ({
          type: "radio" as const,
          label: speed.label,
@@ -176,8 +174,8 @@ const DropdownView = ({
          {
            type: "action" as const,
            label: showTechnicalInfo
-              ? t("player.menu.hide_technical_info")
-              : t("player.menu.show_technical_info"),
+              ? "Hide Technical Info"
+              : "Show Technical Info",
            onPress: onToggleTechnicalInfo,
          },
        ],
@@ -187,7 +185,6 @@ const DropdownView = ({
    return groups;
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [
-    t,
    isOffline,
    bitrateValue,
    changeBitrate,
@@ -220,7 +217,7 @@ const DropdownView = ({

  return (
    <PlatformDropdown
-      title={t("player.menu.playback_options")}
+      title='Playback Options'
      groups={optionGroups}
      trigger={trigger}
      expoUIConfig={{}}
--- a/components/video-player/controls/hooks/useRemoteControl.ts
+++ b/components/video-player/controls/hooks/useRemoteControl.ts
@@ -3,7 +3,6 @@ import { Alert } from "react-native";
 import { type SharedValue, useSharedValue } from "react-native-reanimated";
 import { useTVBackPress } from "@/hooks/useTVBackPress";
 import { useTVEventHandler } from "@/hooks/useTVEventHandler";
-import i18n from "@/i18n";

 interface UseRemoteControlProps {
  showControls: boolean;
@@ -125,23 +124,17 @@ export function useRemoteControl({

      // Controls are hidden, so confirm before leaving playback.
      Alert.alert(
-        i18n.t("player.stopPlayback"),
+        "Stop Playback",
        videoTitleRef.current
-          ? i18n.t("player.stopPlayingTitle", {
-              title: videoTitleRef.current,
-            })
-          : i18n.t("player.stopPlayingConfirm"),
+          ? `Stop playing "${videoTitleRef.current}"?`
+          : "Are you sure you want to stop playback?",
        [
          {
-            text: i18n.t("common.cancel"),
+            text: "Cancel",
            style: "cancel",
            onPress: () => onCancelExitRef.current?.(),
          },
-          {
-            text: i18n.t("common.stop"),
-            style: "destructive",
-            onPress: onBackRef.current,
-          },
+          { text: "Stop", style: "destructive", onPress: onBackRef.current },
        ],
      );
      return true;
--- a/hooks/useAppRouter.ts
+++ b/hooks/useAppRouter.ts
@@ -1,19 +1,13 @@
-// Imported from expo-router's bundled copy, NOT "@react-navigation/*": as of
-// SDK 56 expo-router's Metro check rejects direct @react-navigation imports.
 import { useRouter } from "expo-router";
-import { NavigationContext } from "expo-router/react-navigation";
-import { useCallback, useContext, useMemo } from "react";
+import { useCallback, useMemo } from "react";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";

 /**
 * Drop-in replacement for expo-router's useRouter that automatically
- * preserves offline state across navigation and guards against duplicate
- * screens from rapid taps.
+ * preserves offline state across navigation.
 *
 * - For object-form navigation, automatically adds offline=true when in offline context
 * - For string URLs, passes through unchanged (caller handles offline param)
- * - push() is a no-op while the source screen is not focused, so taps fired
- *   before the pushed screen has rendered (slow devices) can't stack duplicates
 *
 * @example
 * import useRouter from "@/hooks/useAppRouter";
@@ -25,18 +19,8 @@ export function useAppRouter() {
  const router = useRouter();
  const isOffline = useOfflineMode();

-  // Optional: undefined when used outside a navigator (root layout, providers).
-  // When present it reflects the focus state of the screen this hook lives in.
-  const navigation = useContext(NavigationContext);
-
  const push = useCallback(
    (href: Parameters<typeof router.push>[0]) => {
-      // Rapid-push guard: a push blurs the source screen synchronously in the
-      // navigation state (only the native render is slow). Any further push from
-      // this screen — duplicate or not — is dropped until focus returns, so taps
-      // fired before the pushed screen renders can't stack screens.
-      // No navigation context => nothing to guard (deep-link pushes from root).
-      if (navigation?.isFocused?.() === false) return;
      if (typeof href === "string") {
        router.push(href as any);
      } else {
@@ -52,7 +36,7 @@ export function useAppRouter() {
        } as any);
      }
    },
-    [router, isOffline, navigation],
+    [router, isOffline],
  );

  const replace = useCallback(
--- a/hooks/useFilterReset.ts
+++ b/hooks/useFilterReset.ts
@@ -1,108 +0,0 @@
-import { useAtom } from "jotai";
-import { useCallback } from "react";
-import {
-  FilterByPreferenceAtom,
-  filterByAtom,
-  genreFilterAtom,
-  genrePreferenceAtom,
-  SortByOption,
-  SortOrderOption,
-  sortByAtom,
-  sortByPreferenceAtom,
-  sortOrderAtom,
-  sortOrderPreferenceAtom,
-  tagPreferenceAtom,
-  tagsFilterAtom,
-  yearFilterAtom,
-  yearPreferenceAtom,
-} from "@/utils/atoms/filters";
-
-/**
- * Single source of truth for the library filter bar's "reset" action and its
- * visibility. The mobile ResetFiltersButton and the TV filter header both use
- * this so they can't drift — sort/order used to be reset on neither path, so
- * the reset (X) never reflected a changed sort.
- *
- * A reset clears the session filters AND the per-library in-memory preferences
- * (sort, order, filterBy, genres, years, tags); otherwise the saved preference
- * resurfaces when the library's mount effect re-applies it on the next entry.
- */
-export const useFilterReset = (libraryId: string) => {
-  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
-  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
-  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
-  const [filterBy, setFilterBy] = useAtom(filterByAtom);
-  const [sortBy, setSortBy] = useAtom(sortByAtom);
-  const [sortOrder, setSortOrder] = useAtom(sortOrderAtom);
-  const [, setSortByPreference] = useAtom(sortByPreferenceAtom);
-  const [, setSortOrderPreference] = useAtom(sortOrderPreferenceAtom);
-  const [, setFilterByPreference] = useAtom(FilterByPreferenceAtom);
-  const [, setGenrePreference] = useAtom(genrePreferenceAtom);
-  const [, setYearPreference] = useAtom(yearPreferenceAtom);
-  const [, setTagPreference] = useAtom(tagPreferenceAtom);
-
-  // SortName / Ascending is the baseline a library opens with (mount-effect
-  // fallback), so any other value counts as an active, resettable sort.
-  const hasActiveFilters =
-    selectedGenres.length > 0 ||
-    selectedYears.length > 0 ||
-    selectedTags.length > 0 ||
-    filterBy.length > 0 ||
-    sortBy[0] !== SortByOption.SortName ||
-    sortOrder[0] !== SortOrderOption.Ascending;
-
-  const resetAllFilters = useCallback(() => {
-    setSelectedGenres([]);
-    setSelectedYears([]);
-    setSelectedTags([]);
-    setFilterBy([]);
-    setSortBy([SortByOption.SortName]);
-    setSortOrder([SortOrderOption.Ascending]);
-    setSortByPreference((prev) => {
-      const next = { ...prev };
-      delete next[libraryId];
-      return next;
-    });
-    setSortOrderPreference((prev) => {
-      const next = { ...prev };
-      delete next[libraryId];
-      return next;
-    });
-    setFilterByPreference((prev) => {
-      const next = { ...prev };
-      delete next[libraryId];
-      return next;
-    });
-    setGenrePreference((prev) => {
-      const next = { ...prev };
-      delete next[libraryId];
-      return next;
-    });
-    setYearPreference((prev) => {
-      const next = { ...prev };
-      delete next[libraryId];
-      return next;
-    });
-    setTagPreference((prev) => {
-      const next = { ...prev };
-      delete next[libraryId];
-      return next;
-    });
-  }, [
-    libraryId,
-    setSelectedGenres,
-    setSelectedYears,
-    setSelectedTags,
-    setFilterBy,
-    setSortBy,
-    setSortOrder,
-    setSortByPreference,
-    setSortOrderPreference,
-    setFilterByPreference,
-    setGenrePreference,
-    setYearPreference,
-    setTagPreference,
-  ]);
-
-  return { hasActiveFilters, resetAllFilters };
-};
--- a/hooks/useJellyseerr.ts
+++ b/hooks/useJellyseerr.ts
@@ -143,7 +143,7 @@ export class JellyseerrApi {
        if (inRange(status, 200, 299)) {
          if (data.version < "2.0.0") {
            const error = t(
-              "jellyseerr.toasts.jellyseerr_does_not_meet_requirements",
+              "jellyseerr.toasts.jellyseer_does_not_meet_requirements",
            );
            toast.error(error);
            throw Error(error);
--- a/hooks/useTVBackHandler.ts
+++ b/hooks/useTVBackHandler.ts
@@ -4,41 +4,42 @@ import { Platform } from "react-native";
 import {
  disableTVMenuKeyInterception,
  enableTVMenuKeyInterception,
+  useTVBackPress,
 } from "./useTVBackPress";

 export { enableTVMenuKeyInterception } from "./useTVBackPress";

+/** All tab route names used in the bottom tab navigator. */
+export const TAB_ROUTES = [
+  "(home)",
+  "(search)",
+  "(favorites)",
+  "(libraries)",
+  "(watchlists)",
+  "(custom-links)",
+  "(settings)",
+] as const;
+
+export type TabRoute = (typeof TAB_ROUTES)[number];
+
+/** Check if a segment string is a tab route. */
+export function isTabRoute(s: string): s is TabRoute {
+  return (TAB_ROUTES as readonly string[]).includes(s);
+}
+
 /**
 * Check if we're at the root of a tab
 */
 function isAtTabRoot(segments: string[]): boolean {
  const lastSegment = segments[segments.length - 1];
-  const tabNames = [
-    "(home)",
-    "(search)",
-    "(favorites)",
-    "(libraries)",
-    "(watchlists)",
-    "(settings)",
-    "(custom-links)",
-  ];
-  return tabNames.includes(lastSegment) || lastSegment === "index";
+  return isTabRoute(lastSegment) || lastSegment === "index";
 }

 /**
 * Get the current tab name from segments
 */
-function getCurrentTab(segments: string[]): string | undefined {
-  return segments.find(
-    (s) =>
-      s === "(home)" ||
-      s === "(search)" ||
-      s === "(favorites)" ||
-      s === "(libraries)" ||
-      s === "(watchlists)" ||
-      s === "(settings)" ||
-      s === "(custom-links)",
-  );
+function getCurrentTab(segments: string[]): TabRoute | undefined {
+  return segments.find(isTabRoute);
 }

 /**
@@ -49,7 +50,6 @@ function getCurrentTab(segments: string[]): string | undefined {
 export function useTVHomeBackHandler() {
  const segments = useSegments();

-  // Get current state
  const currentTab = getCurrentTab(segments);
  const atTabRoot = isAtTabRoot(segments);
  const isOnHomeRoot = atTabRoot && currentTab === "(home)";
@@ -65,3 +65,24 @@ export function useTVHomeBackHandler() {
    enableTVMenuKeyInterception();
  }, [isOnHomeRoot]);
 }
+
+/**
+ * Handles back press at a non-Home tab root on Android TV by navigating to Home.
+ *
+ * Without NativeTabs, the Stack navigator used for the Android TV nav bar has no
+ * built-in tab-level back handling — pressing back at a tab root would pop the
+ * Stack entirely and exit the tab navigator. This hook intercepts that and routes
+ * to Home instead.
+ */
+export function useTVTabRootBackHandler(
+  onNavigateHome: () => void,
+  isAtTabRoot: boolean,
+  currentTab: string | undefined,
+) {
+  useTVBackPress(() => {
+    if (!Platform.isTV || Platform.OS !== "android") return false;
+    if (!isAtTabRoot || currentTab === "(home)") return false;
+    onNavigateHome();
+    return true;
+  }, [isAtTabRoot, currentTab, onNavigateHome]);
+}
--- a/modules/mpv-player/android/build.gradle
+++ b/modules/mpv-player/android/build.gradle
@@ -53,5 +53,5 @@ android {

 dependencies {
  // libmpv from Maven Central
-  implementation 'dev.jdtech.mpv:libmpv:0.5.1'
+  implementation 'dev.jdtech.mpv:libmpv:1.0.0'
 }
--- a/modules/mpv-player/android/src/main/assets/subfont.ttf
+++ b/modules/mpv-player/android/src/main/assets/subfont.ttf
--- a/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLayerRenderer.kt
+++ b/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLayerRenderer.kt
@@ -3,14 +3,14 @@ package expo.modules.mpvplayer
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
-import android.content.res.AssetManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.system.Os
 import android.util.Log
 import android.view.Surface
 import java.io.File
-import java.io.FileOutputStream
+import java.util.Locale

 /**
 * MPV renderer that wraps libmpv for video playback.
@@ -76,8 +76,15 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    
    private var surface: Surface? = null
    private var isRunning = false
-    private var isStopping = false
-    
+
+    // This renderer's own mpv handle. Per-instance (not singleton) — each
+    // player screen gets a fresh mpv handle and drops the reference on stop.
+    // We intentionally do NOT call a destroy() equivalent: libmpv 1.0's
+    // nativeDestroy has an internal use-after-free we can't fix from Kotlin,
+    // so we mirror Findroid and let the JVM GC + native finalization path
+    // reclaim resources. Only one player is alive at a time in this app.
+    private var mpv: MPVLib? = null
+
    // Cached state
    private var cachedPosition: Double = 0.0
    private var cachedDuration: Double = 0.0
@@ -137,106 +144,108 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {

    fun start(voDriver: String = "gpu-next") {
        if (isRunning) return
-        
+
        try {
-            MPVLib.create(context)
-            MPVLib.addObserver(this)
-            
-            /**
-             * Create mpv config directory and copy font files to ensure SubRip subtitles load properly on Android.
-             *
-             * Technical Background:
-             * ====================
-             * On Android, mpv requires access to a font file to render text-based subtitles, particularly SubRip (.srt)
-             * format subtitles. Without an available font in the config directory, mpv will fail to display subtitles
-             * even when subtitle tracks are properly detected and loaded.
-             *
-             * Why This Is Necessary:
-             * =====================
-             * 1. Android's font system is isolated from native libraries like mpv. While Android has system fonts,
-             *    mpv cannot access them directly due to sandboxing and library isolation.
-             *
-             * 2. SubRip subtitles require a font to render text overlay on video. When no font is available in the
-             *    configured directory, mpv either:
-             *    - Fails silently (subtitles don't appear)
-             *    - Falls back to a default font that may not support the required character set
-             *    - Crashes or produces rendering errors
-             *
-             * 3. By placing a font file (font.ttf) in mpv's config directory and setting that directory via
-             *    MPVLib.setOptionString("config-dir", ...), we ensure mpv has a known, accessible font source.
-             *
-             * Reference:
-             * =========
-             * This workaround is documented in the mpv-android project:
-             * https://github.com/mpv-android/mpv-android/issues/96
-             *
-             * The issue discusses that without a font in the config directory, SubRip subtitles fail to load
-             * properly on Android, and the solution is to copy a font file to a known location that mpv can access.
-             */
-            // Create mpv config directory and copy font files
+            // Per-instance handle — see class-level comment. Each player gets
+            // its own mpv; we drop the reference in stop().
+            val mpv = MPVLib.create(context)
+            this.mpv = mpv
+            mpv.addObserver(this)
+
+            // Resolved once — TV gets the memory-pressure customizations
+            // (SCUDO_OPTIONS, hwdec/profile, demuxer-seekable-cache, larger
+            // audio-buffer) that would be counterproductive on higher-RAM
+            // mobile devices. Demuxer cache sizes are NOT included here —
+            // those come from user settings via load().
+            val isTV = isTvDevice()
+
+            // mpv config directory — used by the config-dir option below and
+            // as XDG_CONFIG_HOME for fontconfig.
            val mpvDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "mpv")
-            //Log.i(TAG, "mpv config dir: $mpvDir")
            if (!mpvDir.exists()) mpvDir.mkdirs()
-            // This needs to be named `subfont.ttf` else it won't work
-            arrayOf("subfont.ttf").forEach { fileName ->
-                val file = File(mpvDir, fileName)
-                if (file.exists()) return@forEach
-                context.assets
-                    .open(fileName, AssetManager.ACCESS_STREAMING)
-                    .copyTo(FileOutputStream(file))
+
+            // Point fontconfig (new in libmpv 1.0) at writable app dirs so it
+            // persists its font index across runs instead of re-walking
+            // /system/fonts on every subtitle/seek event. Each rebuild costs
+            // ~1-2 s and ~10-30 MB of scudo:primary memory that scudo then
+            // holds onto. Without this we see "No usable fontconfig
+            // configuration file found, using fallback" on every re-init.
+            try {
+                val cacheDir = context.cacheDir.absolutePath
+                val configDir = (context.getExternalFilesDir(null) ?: context.filesDir).absolutePath
+                Os.setenv("XDG_CACHE_HOME", cacheDir, true)
+                Os.setenv("XDG_CONFIG_HOME", configDir, true)
+                Os.setenv("HOME", configDir, true)
+            } catch (e: Exception) {
+                Log.w(TAG, "Could not set XDG/HOME env for fontconfig: ${e.message}")
            }
-            MPVLib.setOptionString("config", "yes")
-            MPVLib.setOptionString("config-dir", mpvDir.path)
+
+            mpv?.setOptionString("config", "yes")
+            mpv?.setOptionString("config-dir", mpvDir.path)
            
            // Configure mpv options before initialization (based on Findroid)
            this.voDriver = voDriver
-            MPVLib.setOptionString("vo", voDriver)
-            MPVLib.setOptionString("gpu-context", "android")
-            MPVLib.setOptionString("opengl-es", "yes")
+            mpv?.setOptionString("vo", voDriver)
+            mpv?.setOptionString("gpu-context", "android")
+            mpv?.setOptionString("opengl-es", "yes")
            
-            // Hardware decode path:
-            //  - Real TV hardware: zero-copy `mediacodec` (fastest on low-power devices).
+            // Hardware decoder codecs (shared)
+            mpv?.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+
+            // Pause on initial cache fill (shared default). The actual
+            // cache mode, cache-secs, and demuxer cache sizes come from
+            // user preferences and are applied per-load in load().
+            mpv?.setOptionString("cache-pause-initial", "yes")
+
+            // Hardware decode path + TV-only memory options. Demuxer cache
+            // sizes and cache-secs are NOT set here — they come from user
+            // preferences via load().
+            //  - Emulator: software decode. Its MediaCodec can't bind an
+            //    output surface (surface 0x0); HEVC then fails cleanly and
+            //    mpv auto-falls-back to software, but H.264 "opens"
+            //    deceptively and wedges the core with no fallback (black
+            //    video, then any command — seek/pause — deadlocks the UI
+            //    thread → ANR). hwdec=no makes every codec render via the
+            //    gpu-next VO. Real devices unaffected.
+            //  - Real TV hardware: zero-copy `mediacodec` (fastest on
+            //    low-power devices) + fast profile.
            //  - Real phone: `mediacodec-copy` (broadest compatibility).
-            //  - Emulator: software decode. Its MediaCodec can't bind an output surface
-            //    (surface 0x0); HEVC then fails cleanly and mpv auto-falls-back to software,
-            //    but H.264 "opens" deceptively and wedges the core with no fallback (black
-            //    video, then any command — seek/pause — deadlocks the UI thread → ANR).
-            //    hwdec=no makes every codec render via the gpu-next VO. Real devices unaffected.
            when {
-                isEmulator() -> MPVLib.setOptionString("hwdec", "no")
-                isTvDevice() -> {
-                    MPVLib.setOptionString("hwdec", "mediacodec")
-                    MPVLib.setOptionString("profile", "fast")
+                isEmulator() -> mpv?.setOptionString("hwdec", "no")
+                isTV -> {
+                    mpv?.setOptionString("hwdec", "mediacodec")
+                    mpv?.setOptionString("profile", "fast")
+                    // Don't retain already-played content for backward
+                    // seeking over a network source — Jellyfin can re-fetch
+                    // on demand. Saves up to ~30 MiB on long seeks and
+                    // reduces swap pressure.
+                    mpv?.setOptionString("demuxer-seekable-cache", "no")
+                    // Larger audio buffer to absorb page-fault stalls
+                    // (default ~0.2s). Cheap insurance against the audio
+                    // underruns that happen when the kernel is swap-thrashing.
+                    mpv?.setOptionString("audio-buffer", "0.5")
                }
-                else -> MPVLib.setOptionString("hwdec", "mediacodec-copy")
+                else -> mpv?.setOptionString("hwdec", "mediacodec-copy")
            }
-            MPVLib.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
-            
-            // Cache settings for better network streaming
-            MPVLib.setOptionString("cache", "yes")
-            MPVLib.setOptionString("cache-pause-initial", "yes")
-            MPVLib.setOptionString("demuxer-max-bytes", "150MiB")
-            MPVLib.setOptionString("demuxer-max-back-bytes", "75MiB")
-            MPVLib.setOptionString("demuxer-readahead-secs", "20")
            
            // Seeking optimization - faster seeking at the cost of less precision
            // Use keyframe seeking by default (much faster for network streams)
-            MPVLib.setOptionString("hr-seek", "no")
+            mpv?.setOptionString("hr-seek", "no")
            // Drop frames during seeking for faster response
-            MPVLib.setOptionString("hr-seek-framedrop", "yes")
+            mpv?.setOptionString("hr-seek-framedrop", "yes")
            
            // Subtitle settings
-            MPVLib.setOptionString("sub-scale-with-window", "no")
-            MPVLib.setOptionString("sub-use-margins", "no")
-            MPVLib.setOptionString("subs-match-os-language", "yes")
-            MPVLib.setOptionString("subs-fallback", "yes")
+            mpv?.setOptionString("sub-scale-with-window", "no")
+            mpv?.setOptionString("sub-use-margins", "no")
+            mpv?.setOptionString("subs-match-os-language", "yes")
+            mpv?.setOptionString("subs-fallback", "yes")
            
            // Important: Start with force-window=no, will be set to yes when surface is attached
-            MPVLib.setOptionString("force-window", "no")
-            MPVLib.setOptionString("keep-open", "always")
-            
-            MPVLib.initialize()
-            
+            mpv?.setOptionString("force-window", "no")
+            mpv?.setOptionString("keep-open", "always")
+
+            mpv.initialize()
+
            // Observe properties
            observeProperties()
            
@@ -249,21 +258,68 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    }
    
    fun stop() {
-        if (isStopping) return
        if (!isRunning) return
-        
-        isStopping = true
        isRunning = false
-        
-        try {
-            MPVLib.removeObserver(this)
-            MPVLib.detachSurface()
-            MPVLib.destroy()
-        } catch (e: Exception) {
-            Log.e(TAG, "Error stopping MPV: ${e.message}")
-        }
-        
-        isStopping = false
+
+        val m = mpv
+        mpv = null
+
+        // Clear cached media state on the main thread so the next player
+        // screen doesn't observe stale position/duration values during the
+        // (async) teardown below.
+        currentUrl = null
+        currentHeaders = null
+        pendingExternalSubtitles = emptyList()
+        initialSubtitleId = null
+        initialAudioId = null
+        cachedPosition = 0.0
+        cachedDuration = 0.0
+        cachedCacheSeconds = 0.0
+
+        if (m == null) return
+
+        // Teardown runs on a background daemon thread. mpv's "stop" command
+        // flushes the demuxer queue and releases the MediaCodec hardware
+        // decoder — synchronous JNI work that can block for hundreds of ms
+        // on TV hardware. Running it on the main thread produced a visible
+        // delay/stutter between pressing "exit" and the confirm alert
+        // appearing. The local `m` keeps the MPVLib instance alive for the
+        // lifetime of this thread even though we've already nulled `mpv`.
+        Thread {
+            // Drop force-window BEFORE issuing stop. With keep-open=always +
+            // force-window=yes, mpv tears down the decoder at stop time but
+            // tries to keep the VO alive — which fires an internal
+            // video-reconfig. On libmpv 1.0's gpu-next/android backend that
+            // reconfig path crashes with "Missing surface pointer" because we
+            // detach the Surface below before mpv's worker reaches the
+            // reconfig step (command() is async). Setting force-window=no
+            // first makes mpv tear VO down cleanly instead of attempting a
+            // doomed re-init, eliminating the fatal VO error and the
+            // "playback won't restart" aftermath.
+            try {
+                m.setOptionString("force-window", "no")
+            } catch (e: Exception) {
+                Log.e(TAG, "Error clearing force-window: ${e.message}")
+            }
+            try {
+                // Stop playback — flushes demuxer queue and signals MediaCodec
+                // to release its hardware decoders. This is the bulk of what
+                // we can reclaim without calling destroy().
+                m.command(arrayOf("stop"))
+            } catch (e: Exception) {
+                Log.e(TAG, "Error stopping mpv playback: ${e.message}")
+            }
+            try {
+                m.removeObserver(this)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error removing mpv observer: ${e.message}")
+            }
+            try {
+                m.detachSurface()
+            } catch (e: Exception) {
+                Log.e(TAG, "Error detaching mpv surface: ${e.message}")
+            }
+        }.also { it.isDaemon = true }.start()
    }
    
    /**
@@ -278,10 +334,10 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        this.surface = surface
        Log.i(TAG, "[PiP] attachSurface — isRunning=$isRunning, vo=$voDriver, surface=${surface.hashCode()}")
        if (isRunning) {
-            MPVLib.attachSurface(surface)
-            MPVLib.setOptionString("force-window", "yes")
+            mpv?.attachSurface(surface)
+            mpv?.setOptionString("force-window", "yes")
            // Read back vo to confirm it's still active
-            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
+            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
            Log.i(TAG, "[PiP] attachSurface — attached, activeVo=$activeVo")
        }
    }
@@ -301,8 +357,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        this.surface = null
        Log.i(TAG, "[PiP] detachSurface — isRunning=$isRunning, vo=$voDriver")
        if (isRunning) {
-            MPVLib.detachSurface()
-            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
+            mpv?.detachSurface()
+            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
            Log.i(TAG, "[PiP] detachSurface — detached, activeVo=$activeVo (should still be $voDriver)")
        }
    }
@@ -313,7 +369,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     */
    fun updateSurfaceSize(width: Int, height: Int) {
        if (isRunning) {
-            MPVLib.setPropertyString("android-surface-size", "${width}x$height")
+            mpv?.setPropertyString("android-surface-size", "${width}x$height")
            Log.i(TAG, "[PiP] updateSurfaceSize — ${width}x${height}")
        } else {
            Log.w(TAG, "[PiP] updateSurfaceSize — called but renderer not running")
@@ -329,9 +385,9 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        if (!isRunning) return
        val pos = cachedPosition
        Log.i(TAG, "[PiP] forceRedraw — stepping frame then seeking to $pos")
-        MPVLib.command(arrayOf("frame-step"))
+        mpv?.command(arrayOf("frame-step"))
        if (pos > 0) {
-            MPVLib.command(arrayOf("seek", pos.toString(), "absolute"))
+            mpv?.command(arrayOf("seek", pos.toString(), "absolute"))
        }
    }
    
@@ -341,29 +397,43 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        startPosition: Double? = null,
        externalSubtitles: List<String>? = null,
        initialSubtitleId: Int? = null,
-        initialAudioId: Int? = null
+        initialAudioId: Int? = null,
+        cacheEnabled: String? = null,
+        cacheSeconds: Int? = null,
+        demuxerMaxBytes: Int? = null,
+        demuxerMaxBackBytes: Int? = null
    ) {
        currentUrl = url
        currentHeaders = headers
        pendingExternalSubtitles = externalSubtitles ?: emptyList()
        this.initialSubtitleId = initialSubtitleId
        this.initialAudioId = initialAudioId
-        
+
        _isLoading = true
        isReadyToSeek = false
        mainHandler.post { delegate?.onLoadingChanged(true) }
-        
+
        // Stop previous playback
-        MPVLib.command(arrayOf("stop"))
-        
+        mpv?.command(arrayOf("stop"))
+
        // Set HTTP headers if provided
        updateHttpHeaders(headers)
+
+        // Apply cache/buffer settings from user preferences (mirrors iOS).
+        // These override the conservative defaults applied in start() so the
+        // TV/mobile settings screen actually takes effect on Android.
+        cacheEnabled?.let { mpv?.setOptionString("cache", it) }
+        cacheSeconds?.let { mpv?.setOptionString("cache-secs", it.toString()) }
+        demuxerMaxBytes?.let { mpv?.setOptionString("demuxer-max-bytes", "${it}MiB") }
+        demuxerMaxBackBytes?.let { mpv?.setOptionString("demuxer-max-back-bytes", "${it}MiB") }
        
-        // Set start position
+        // Set start position. mpv's time parser requires '.' as the decimal
+        // separator; use Locale.US so devices with other default locales
+        // (e.g. ',' as decimal separator) don't break resume-from-position.
        if (startPosition != null && startPosition > 0) {
-            MPVLib.setPropertyString("start", String.format("%.2f", startPosition))
+            mpv?.setPropertyString("start", String.format(Locale.US, "%.2f", startPosition))
        } else {
-            MPVLib.setPropertyString("start", "0")
+            mpv?.setPropertyString("start", "0")
        }
        
        // Set initial audio track if specified
@@ -383,7 +453,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        }
        
        // Load the file
-        MPVLib.command(arrayOf("loadfile", url, "replace"))
+        mpv?.command(arrayOf("loadfile", url, "replace"))
    }
    
    fun reloadCurrentItem() {
@@ -399,29 +469,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        }
        
        val headerString = headers.entries.joinToString("\r\n") { "${it.key}: ${it.value}" }
-        MPVLib.setPropertyString("http-header-fields", headerString)
+        mpv?.setPropertyString("http-header-fields", headerString)
    }
    
    private fun observeProperties() {
-        MPVLib.observeProperty("duration", MPV_FORMAT_DOUBLE)
-        MPVLib.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
-        MPVLib.observeProperty("pause", MPV_FORMAT_FLAG)
-        MPVLib.observeProperty("track-list/count", MPV_FORMAT_INT64)
-        MPVLib.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
-        MPVLib.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
+        mpv?.observeProperty("duration", MPV_FORMAT_DOUBLE)
+        mpv?.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
+        mpv?.observeProperty("pause", MPV_FORMAT_FLAG)
+        mpv?.observeProperty("track-list/count", MPV_FORMAT_INT64)
+        mpv?.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
+        mpv?.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
        // Video dimensions for PiP aspect ratio
-        MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64)
-        MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64)
+        mpv?.observeProperty("video-params/w", MPV_FORMAT_INT64)
+        mpv?.observeProperty("video-params/h", MPV_FORMAT_INT64)
    }
-    
+
    // MARK: - Playback Controls
    
    fun play() {
-        MPVLib.setPropertyBoolean("pause", false)
+        mpv?.setPropertyBoolean("pause", false)
    }
    
    fun pause() {
-        MPVLib.setPropertyBoolean("pause", true)
+        mpv?.setPropertyBoolean("pause", true)
    }
    
    fun togglePause() {
@@ -431,22 +501,22 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    fun seekTo(seconds: Double) {
        val clamped = maxOf(0.0, seconds)
        cachedPosition = clamped
-        MPVLib.command(arrayOf("seek", clamped.toString(), "absolute"))
+        mpv?.command(arrayOf("seek", clamped.toString(), "absolute"))
    }
    
    fun seekBy(seconds: Double) {
        val newPosition = maxOf(0.0, cachedPosition + seconds)
        cachedPosition = newPosition
-        MPVLib.command(arrayOf("seek", seconds.toString(), "relative"))
+        mpv?.command(arrayOf("seek", seconds.toString(), "relative"))
    }
    
    fun setSpeed(speed: Double) {
        _playbackSpeed = speed
-        MPVLib.setPropertyDouble("speed", speed)
+        mpv?.setPropertyDouble("speed", speed)
    }
    
    fun getSpeed(): Double {
-        return MPVLib.getPropertyDouble("speed") ?: _playbackSpeed
+        return mpv?.getPropertyDouble("speed") ?: _playbackSpeed
    }
    
    // MARK: - Subtitle Controls
@@ -454,19 +524,19 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    fun getSubtitleTracks(): List<Map<String, Any>> {
        val tracks = mutableListOf<Map<String, Any>>()
        
-        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
+        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
        
        for (i in 0 until trackCount) {
-            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
            if (trackType != "sub") continue
            
-            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
            val track = mutableMapOf<String, Any>("id" to trackId)
            
-            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
            
-            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
            track["selected"] = selected
            
            tracks.add(track)
@@ -478,61 +548,61 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    fun setSubtitleTrack(trackId: Int) {
        Log.i(TAG, "setSubtitleTrack: setting sid to $trackId")
        if (trackId < 0) {
-            MPVLib.setPropertyString("sid", "no")
+            mpv?.setPropertyString("sid", "no")
        } else {
-            MPVLib.setPropertyInt("sid", trackId)
+            mpv?.setPropertyInt("sid", trackId)
        }
    }
    
    fun disableSubtitles() {
-        MPVLib.setPropertyString("sid", "no")
+        mpv?.setPropertyString("sid", "no")
    }
    
    fun getCurrentSubtitleTrack(): Int {
-        return MPVLib.getPropertyInt("sid") ?: 0
+        return mpv?.getPropertyInt("sid") ?: 0
    }
    
    fun addSubtitleFile(url: String, select: Boolean = true) {
        val flag = if (select) "select" else "cached"
-        MPVLib.command(arrayOf("sub-add", url, flag))
+        mpv?.command(arrayOf("sub-add", url, flag))
    }
    
    // MARK: - Subtitle Positioning
    
    fun setSubtitlePosition(position: Int) {
-        MPVLib.setPropertyInt("sub-pos", position)
+        mpv?.setPropertyInt("sub-pos", position)
    }
    
    fun setSubtitleScale(scale: Double) {
-        MPVLib.setPropertyDouble("sub-scale", scale)
+        mpv?.setPropertyDouble("sub-scale", scale)
    }
    
    fun setSubtitleMarginY(margin: Int) {
-        MPVLib.setPropertyInt("sub-margin-y", margin)
+        mpv?.setPropertyInt("sub-margin-y", margin)
    }
    
    fun setSubtitleAlignX(alignment: String) {
-        MPVLib.setPropertyString("sub-align-x", alignment)
+        mpv?.setPropertyString("sub-align-x", alignment)
    }
    
    fun setSubtitleAlignY(alignment: String) {
-        MPVLib.setPropertyString("sub-align-y", alignment)
+        mpv?.setPropertyString("sub-align-y", alignment)
    }
    
    fun setSubtitleFontSize(size: Int) {
-        MPVLib.setPropertyInt("sub-font-size", size)
+        mpv?.setPropertyInt("sub-font-size", size)
    }

    fun setSubtitleBorderStyle(style: String) {
-        MPVLib.setPropertyString("sub-border-style", style)
+        mpv?.setPropertyString("sub-border-style", style)
    }

    fun setSubtitleBackgroundColor(color: String) {
-        MPVLib.setPropertyString("sub-back-color", color)
+        mpv?.setPropertyString("sub-back-color", color)
    }

    fun setSubtitleAssOverride(mode: String) {
-        MPVLib.setPropertyString("sub-ass-override", mode)
+        mpv?.setPropertyString("sub-ass-override", mode)
    }

    // MARK: - Audio Track Controls
@@ -540,25 +610,25 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    fun getAudioTracks(): List<Map<String, Any>> {
        val tracks = mutableListOf<Map<String, Any>>()
        
-        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
+        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
        
        for (i in 0 until trackCount) {
-            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
            if (trackType != "audio") continue
            
-            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
            val track = mutableMapOf<String, Any>("id" to trackId)
            
-            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
-            MPVLib.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
+            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            mpv?.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
            
-            val channels = MPVLib.getPropertyInt("track-list/$i/audio-channels")
+            val channels = mpv?.getPropertyInt("track-list/$i/audio-channels")
            if (channels != null && channels > 0) {
                track["channels"] = channels
            }
            
-            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
            track["selected"] = selected
            
            tracks.add(track)
@@ -569,11 +639,11 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    
    fun setAudioTrack(trackId: Int) {
        Log.i(TAG, "setAudioTrack: setting aid to $trackId")
-        MPVLib.setPropertyInt("aid", trackId)
+        mpv?.setPropertyInt("aid", trackId)
    }
    
    fun getCurrentAudioTrack(): Int {
-        return MPVLib.getPropertyInt("aid") ?: 0
+        return mpv?.getPropertyInt("aid") ?: 0
    }

    // MARK: - Video Scaling
@@ -582,7 +652,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        // panscan: 0.0 = fit (letterbox), 1.0 = fill (crop)
        val panscanValue = if (zoomed) 1.0 else 0.0
        Log.i(TAG, "setZoomedToFill: setting panscan to $panscanValue")
-        MPVLib.setPropertyDouble("panscan", panscanValue)
+        mpv?.setPropertyDouble("panscan", panscanValue)
    }

    // MARK: - Technical Info
@@ -591,58 +661,79 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        val info = mutableMapOf<String, Any>()

        // Video dimensions
-        MPVLib.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
            info["videoWidth"] = it
        }
-        MPVLib.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
            info["videoHeight"] = it
        }

        // Video codec
-        MPVLib.getPropertyString("video-format")?.let {
+        mpv?.getPropertyString("video-format")?.let {
            info["videoCodec"] = it
        }

        // Audio codec
-        MPVLib.getPropertyString("audio-codec-name")?.let {
+        mpv?.getPropertyString("audio-codec-name")?.let {
            info["audioCodec"] = it
        }

        // FPS (container fps)
-        MPVLib.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
            info["fps"] = it
        }

        // Video bitrate (bits per second)
-        MPVLib.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
            info["videoBitrate"] = it
        }

        // Audio bitrate (bits per second)
-        MPVLib.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
            info["audioBitrate"] = it
        }

        // Demuxer cache duration (seconds of video buffered)
-        MPVLib.getPropertyDouble("demuxer-cache-duration")?.let {
+        mpv?.getPropertyDouble("demuxer-cache-duration")?.let {
            info["cacheSeconds"] = it
        }

+        // Configured cache limits — read back from mpv to confirm user
+        // settings actually took effect. mpv stores byte sizes as int64
+        // (bytes); convert to MiB for display.
+        mpv?.getPropertyInt("demuxer-max-bytes")?.let { bytes ->
+            info["demuxerMaxBytes"] = bytes / (1024 * 1024)
+        }
+        mpv?.getPropertyInt("demuxer-max-back-bytes")?.let { bytes ->
+            info["demuxerMaxBackBytes"] = bytes / (1024 * 1024)
+        }
+        mpv?.getPropertyDouble("cache-secs")?.let { secs ->
+            info["cacheSecsLimit"] = secs
+        }
+
        // Dropped frames
-        MPVLib.getPropertyInt("frame-drop-count")?.let {
+        mpv?.getPropertyInt("frame-drop-count")?.let {
            info["droppedFrames"] = it
        }

        // Active video output driver (read from MPV to confirm what's actually applied)
-        MPVLib.getPropertyString("vo")?.let {
+        mpv?.getPropertyString("vo")?.let {
            info["voDriver"] = it
        }

-        // Active hardware decoder
-        MPVLib.getPropertyString("hwdec-active")?.let {
+        // Active hardware decoder.
+        // hwdec-current yields e.g. "mediacodec",
+        // "mediacodec-copy", "auto-copy" or empty when SW decoding.
+        mpv?.getPropertyString("hwdec-current")?.let {
            info["hwdec"] = it
        }

+        // Estimated video output fps (renderer-side, after filtering).
+        // Useful for diagnosing display/pipeline drops vs container fps.
+        mpv?.getPropertyDouble("estimated-vf-fps")?.takeIf { it > 0 }?.let {
+            info["estimatedVfFps"] = it
+        }
+
        return info
    }

@@ -735,7 +826,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
                    pendingExternalSubtitles.forEachIndexed { index, subUrl ->
                        android.util.Log.d("MPVRenderer", "Adding external subtitle [$index]: $subUrl")
                        // "auto" flag = add without auto-selecting (order preserved, MPVLib.command is sync)
-                        MPVLib.command(arrayOf("sub-add", subUrl, "auto"))
+                        mpv?.command(arrayOf("sub-add", subUrl, "auto"))
                    }
                    pendingExternalSubtitles = emptyList()
                }
--- a/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLib.kt
+++ b/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLib.kt
@@ -1,20 +1,29 @@
 package expo.modules.mpvplayer

 import android.content.Context
-import android.util.Log
-import android.view.Surface
 import dev.jdtech.mpv.MPVLib as LibMPV

 /**
- * Wrapper around the dev.jdtech.mpv.MPVLib class.
- * This provides a consistent interface for the rest of the app.
+ * Per-instance wrapper around the dev.jdtech.mpv.MPVLib class.
+ *
+ * libmpv 1.0 exposes an instance-based API: each `LibMPV.create(ctx)` returns
+ * a fresh, independent handle. Each player creates its own MPVLib instance
+ * (Findroid pattern) and on teardown we simply drop the reference. We do NOT
+ * call `LibMPV.destroy()` — its native implementation has an internal
+ * use-after-free on libmpv 1.0 that we cannot fix from Kotlin. Letting the
+ * GC reach the JVM-level finalizer (or never reaching it, since the native
+ * handle lives in process-global state until exit) is strictly safer than
+ * crashing.
+ *
+ * Trade-off: mpv's native footprint (decoder + demuxer cache) for one player
+ * stays allocated until the next player's allocation displaces it in scudo's
+ * arena. On a TV app where the player is the dominant memory consumer and
+ * only one player is alive at a time, this is acceptable.
 */
-object MPVLib {
-    private const val TAG = "MPVLib"
-    
-    private var initialized = false
-    
-    // Event observer interface
+class MPVLib private constructor(private val instance: LibMPV) {
+
+    // Event observer interface — mirrors dev.jdtech.mpv.MPVLib.EventObserver
+    // so MPVLayerRenderer implements a stable, wrapper-owned signature.
    interface EventObserver {
        fun eventProperty(property: String)
        fun eventProperty(property: String, value: Long)
@@ -23,198 +32,144 @@ object MPVLib {
        fun eventProperty(property: String, value: Double)
        fun event(eventId: Int)
    }
-    
+
    private val observers = mutableListOf<EventObserver>()
-    
-    // Library event observer that forwards to our observers
+
+    // Library event observer that forwards LibMPV callbacks to our observers.
    private val libObserver = object : LibMPV.EventObserver {
-        override fun eventProperty(property: String) {
+        override fun eventProperty(property: String) =
+            dispatch { it.eventProperty(property) }
+
+        override fun eventProperty(property: String, value: Long) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun eventProperty(property: String, value: Boolean) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun eventProperty(property: String, value: String) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun eventProperty(property: String, value: Double) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun event(eventId: Int) =
+            dispatch { it.event(eventId) }
+
+        private inline fun dispatch(block: (EventObserver) -> Unit) {
            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: Long) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: Boolean) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: String) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: Double) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun event(eventId: Int) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.event(eventId)
-                }
+                observers.forEach(block)
            }
        }
    }
-    
+
    fun addObserver(observer: EventObserver) {
-        synchronized(observers) {
-            observers.add(observer)
-        }
+        synchronized(observers) { observers.add(observer) }
    }
-    
+
    fun removeObserver(observer: EventObserver) {
-        synchronized(observers) {
-            observers.remove(observer)
-        }
+        synchronized(observers) { observers.remove(observer) }
    }
-    
-    // MPV Event IDs
-    const val MPV_EVENT_NONE = 0
-    const val MPV_EVENT_SHUTDOWN = 1
-    const val MPV_EVENT_LOG_MESSAGE = 2
-    const val MPV_EVENT_GET_PROPERTY_REPLY = 3
-    const val MPV_EVENT_SET_PROPERTY_REPLY = 4
-    const val MPV_EVENT_COMMAND_REPLY = 5
-    const val MPV_EVENT_START_FILE = 6
-    const val MPV_EVENT_END_FILE = 7
-    const val MPV_EVENT_FILE_LOADED = 8
-    const val MPV_EVENT_IDLE = 11
-    const val MPV_EVENT_TICK = 14
-    const val MPV_EVENT_CLIENT_MESSAGE = 16
-    const val MPV_EVENT_VIDEO_RECONFIG = 17
-    const val MPV_EVENT_AUDIO_RECONFIG = 18
-    const val MPV_EVENT_SEEK = 20
-    const val MPV_EVENT_PLAYBACK_RESTART = 21
-    const val MPV_EVENT_PROPERTY_CHANGE = 22
-    const val MPV_EVENT_QUEUE_OVERFLOW = 24
-    
-    // End file reason
-    const val MPV_END_FILE_REASON_EOF = 0
-    const val MPV_END_FILE_REASON_STOP = 2
-    const val MPV_END_FILE_REASON_QUIT = 3
-    const val MPV_END_FILE_REASON_ERROR = 4
-    const val MPV_END_FILE_REASON_REDIRECT = 5
-    
-    /**
-     * Create and initialize the MPV library
-     */
-    fun create(context: Context, configDir: String? = null) {
-        if (initialized) return
-        
-        try {
-            LibMPV.create(context)
-            LibMPV.addObserver(libObserver)
-            initialized = true
-            Log.i(TAG, "libmpv created successfully")
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to create libmpv: ${e.message}")
-            throw e
-        }
-    }
-    
+
    fun initialize() {
-        LibMPV.init()
+        instance.init()
    }
-    
-    fun destroy() {
-        if (!initialized) return
-        try {
-            LibMPV.removeObserver(libObserver)
-            LibMPV.destroy()
-        } catch (e: Exception) {
-            Log.e(TAG, "Error destroying mpv: ${e.message}")
-        }
-        initialized = false
+
+    fun attachSurface(surface: android.view.Surface) {
+        instance.attachSurface(surface)
    }
-    
-    fun isInitialized(): Boolean = initialized
-    
-    fun attachSurface(surface: Surface) {
-        LibMPV.attachSurface(surface)
-    }
-    
+
    fun detachSurface() {
-        LibMPV.detachSurface()
+        instance.detachSurface()
    }
-    
-    fun command(cmd: Array<String?>) {
-        LibMPV.command(cmd)
+
+    fun command(cmd: Array<String>) {
+        instance.command(cmd)
    }
-    
+
    fun setOptionString(name: String, value: String): Int {
-        return LibMPV.setOptionString(name, value)
+        return instance.setOptionString(name, value)
    }
-    
-    fun getPropertyInt(name: String): Int? {
-        return try {
-            LibMPV.getPropertyInt(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
-    fun getPropertyDouble(name: String): Double? {
-        return try {
-            LibMPV.getPropertyDouble(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
-    fun getPropertyBoolean(name: String): Boolean? {
-        return try {
-            LibMPV.getPropertyBoolean(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
-    fun getPropertyString(name: String): String? {
-        return try {
-            LibMPV.getPropertyString(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
+
+    fun getPropertyInt(name: String): Int? = try {
+        instance.getPropertyInt(name)
+    } catch (e: Exception) { null }
+
+    fun getPropertyDouble(name: String): Double? = try {
+        instance.getPropertyDouble(name)
+    } catch (e: Exception) { null }
+
+    fun getPropertyBoolean(name: String): Boolean? = try {
+        instance.getPropertyBoolean(name)
+    } catch (e: Exception) { null }
+
+    fun getPropertyString(name: String): String? = try {
+        instance.getPropertyString(name)
+    } catch (e: Exception) { null }
+
    fun setPropertyInt(name: String, value: Int) {
-        LibMPV.setPropertyInt(name, value)
+        instance.setPropertyInt(name, value)
    }
-    
+
    fun setPropertyDouble(name: String, value: Double) {
-        LibMPV.setPropertyDouble(name, value)
+        instance.setPropertyDouble(name, value)
    }
-    
+
    fun setPropertyBoolean(name: String, value: Boolean) {
-        LibMPV.setPropertyBoolean(name, value)
+        instance.setPropertyBoolean(name, value)
    }
-    
+
    fun setPropertyString(name: String, value: String) {
-        LibMPV.setPropertyString(name, value)
+        instance.setPropertyString(name, value)
    }
-    
+
    fun observeProperty(name: String, format: Int) {
-        LibMPV.observeProperty(name, format)
+        instance.observeProperty(name, format)
+    }
+
+    companion object {
+        /**
+         * Create a fresh mpv handle. Each call returns an independent instance —
+         * do not share across players. Attach exactly one [EventObserver] per
+         * player via [addObserver].
+         */
+        fun create(context: Context): MPVLib {
+            val lib = LibMPV.create(context)
+                ?: throw IllegalStateException("LibMPV.create returned null")
+            val wrapper = MPVLib(lib)
+            // The libObserver is attached for the lifetime of this MPVLib
+            // instance and forwards every LibMPV callback to our observers
+            // list. Player-specific observers are added/removed via
+            // addObserver/removeObserver.
+            lib.addObserver(wrapper.libObserver)
+            return wrapper
+        }
+
+        // MPV Event IDs (kept here so observers can reference them without
+        // holding a reference to an instance).
+        const val MPV_EVENT_NONE = 0
+        const val MPV_EVENT_SHUTDOWN = 1
+        const val MPV_EVENT_LOG_MESSAGE = 2
+        const val MPV_EVENT_GET_PROPERTY_REPLY = 3
+        const val MPV_EVENT_SET_PROPERTY_REPLY = 4
+        const val MPV_EVENT_COMMAND_REPLY = 5
+        const val MPV_EVENT_START_FILE = 6
+        const val MPV_EVENT_END_FILE = 7
+        const val MPV_EVENT_FILE_LOADED = 8
+        const val MPV_EVENT_IDLE = 11
+        const val MPV_EVENT_TICK = 14
+        const val MPV_EVENT_CLIENT_MESSAGE = 16
+        const val MPV_EVENT_VIDEO_RECONFIG = 17
+        const val MPV_EVENT_AUDIO_RECONFIG = 18
+        const val MPV_EVENT_SEEK = 20
+        const val MPV_EVENT_PLAYBACK_RESTART = 21
+        const val MPV_EVENT_PROPERTY_CHANGE = 22
+        const val MPV_EVENT_QUEUE_OVERFLOW = 24
+
+        // End file reason
+        const val MPV_END_FILE_REASON_EOF = 0
+        const val MPV_END_FILE_REASON_STOP = 2
+        const val MPV_END_FILE_REASON_QUIT = 3
+        const val MPV_END_FILE_REASON_ERROR = 4
+        const val MPV_END_FILE_REASON_REDIRECT = 5
    }
 }
--- a/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt
+++ b/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt
@@ -28,7 +28,11 @@ class MpvPlayerModule : Module() {
                if (source == null) return@Prop
                
                val urlString = source["url"] as? String ?: return@Prop
-                
+
+                // Parse cache config if provided (mirrors iOS)
+                @Suppress("UNCHECKED_CAST")
+                val cacheConfig = source["cacheConfig"] as? Map<String, Any?>
+
                @Suppress("UNCHECKED_CAST")
                val config = VideoLoadConfig(
                    url = urlString,
@@ -38,7 +42,11 @@ class MpvPlayerModule : Module() {
                    autoplay = (source["autoplay"] as? Boolean) ?: true,
                    initialSubtitleId = (source["initialSubtitleId"] as? Number)?.toInt(),
                    initialAudioId = (source["initialAudioId"] as? Number)?.toInt(),
-                    voDriver = source["voDriver"] as? String
+                    voDriver = source["voDriver"] as? String,
+                    cacheEnabled = cacheConfig?.get("enabled") as? String,
+                    cacheSeconds = (cacheConfig?.get("cacheSeconds") as? Number)?.toInt(),
+                    demuxerMaxBytes = (cacheConfig?.get("maxBytes") as? Number)?.toInt(),
+                    demuxerMaxBackBytes = (cacheConfig?.get("maxBackBytes") as? Number)?.toInt()
                )
                
                view.loadVideo(config)
@@ -60,6 +68,15 @@ class MpvPlayerModule : Module() {
                view.pause()
            }

+            // Stop playback and release the MediaCodec decoder + demuxer.
+            // Does not synchronously tear down the native mpv handle (see
+            // MPVLib / MpvPlayerView.destroy docs). Call before navigating
+            // away from the player screen to avoid OOM during screen
+            // transitions on low-RAM devices.
+            AsyncFunction("destroy") { view: MpvPlayerView ->
+                view.destroy()
+            }
+
            // Async function to seek to position
            AsyncFunction("seekTo") { view: MpvPlayerView, position: Double ->
                view.seekTo(position)
--- a/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt
+++ b/modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt
@@ -26,7 +26,11 @@ data class VideoLoadConfig(
    val autoplay: Boolean = true,
    val initialSubtitleId: Int? = null,
    val initialAudioId: Int? = null,
-    val voDriver: String? = null
+    val voDriver: String? = null,
+    val cacheEnabled: String? = null,
+    val cacheSeconds: Int? = null,
+    val demuxerMaxBytes: Int? = null,
+    val demuxerMaxBackBytes: Int? = null
 )

 /**
@@ -60,6 +64,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
    private var pendingConfig: VideoLoadConfig? = null
    private var rendererStarted: Boolean = false
    private var pendingSurface: Surface? = null
+    private var activeSurface: Surface? = null
    private var surfaceTexture: SurfaceTexture? = null

    // PiP state tracking
@@ -131,6 +136,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
            rendererStarted = true

            pendingSurface?.let { surface ->
+                activeSurface = surface
                renderer?.attachSurface(surface)
                pendingSurface = null
            }
@@ -149,6 +155,11 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
        surfaceReady = true

        if (rendererStarted) {
+            // Release the previous wrapper Surface before losing the only
+            // reference to it. cleanup() only runs on detach, so without this
+            // repeated PiP/background/resize cycles leak native surface objects.
+            activeSurface?.release()
+            activeSurface = surface
            renderer?.attachSurface(surface)
        } else {
            pendingSurface = surface
@@ -207,7 +218,11 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
            startPosition = config.startPosition,
            externalSubtitles = config.externalSubtitles,
            initialSubtitleId = config.initialSubtitleId,
-            initialAudioId = config.initialAudioId
+            initialAudioId = config.initialAudioId,
+            cacheEnabled = config.cacheEnabled,
+            cacheSeconds = config.cacheSeconds,
+            demuxerMaxBytes = config.demuxerMaxBytes,
+            demuxerMaxBackBytes = config.demuxerMaxBackBytes
        )

        if (config.autoplay) {
@@ -236,6 +251,51 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
        pipController?.setPlaybackRate(0.0)
    }

+    /**
+     * Stop playback and release decoder resources.
+     *
+     * Delegates to [MPVLayerRenderer.stop], which issues mpv's "stop" command
+     * on a background thread (flushing the demuxer and releasing the
+     * MediaCodec hardware decoder) and drops the per-instance mpv handle.
+     *
+     * NOTE: this does NOT call `LibMPV.destroy()`. libmpv 1.0's
+     * nativeDestroy has an internal use-after-free on the JNI global ref
+     * path, so the native mpv handle is intentionally left for the JVM GC
+     * / native finalizer rather than torn down synchronously. See
+     * [MPVLib] class doc for the full rationale.
+     *
+     * Call this BEFORE navigating away from the player screen so the
+     * decoder is reclaimed before the next screen (or the next episode's
+     * player) mounts. Otherwise Expo Router renders the new screen first
+     * and you briefly have two mpv instances + two 4K decoders alive —
+     * instant OOM on a 2 GB device.
+     */
+    fun destroy() {
+        renderer?.stop()
+
+        // Reset view-level state so a subsequent loadVideo() on the SAME view
+        // instance re-creates the mpv handle and re-attaches the still-live
+        // TextureView surface. Without this, rendererStarted stays true and
+        // ensureRendererStarted() early-returns, so renderer.start() is never
+        // called again — but stop() already nulled the renderer's mpv handle.
+        // The next loadVideo() then runs loadVideoInternal() -> renderer.load()
+        // against mpv == null, where every mpv?.command() (including the
+        // "stop" and load commands) silently no-ops, leaving a black frame.
+        //
+        // This path is hit by direct-player.tsx's goToNextItem()/stop(),
+        // which call destroy() immediately before router.replace() to the
+        // same route — Expo Router reuses the same MpvPlayerView instance,
+        // so the next source load happens on this view without a remount.
+        rendererStarted = false
+        currentUrl = null
+        // Move the active surface back to pending so ensureRendererStarted()
+        // re-attaches it to the freshly created mpv instance on next load.
+        // The Surface itself is still valid — onSurfaceTextureDestroyed has
+        // not fired because the TextureView is not being unmounted.
+        activeSurface?.let { pendingSurface = it }
+        activeSurface = null
+    }
+
    fun seekTo(position: Double) {
        renderer?.seekTo(position)
    }
@@ -479,13 +539,32 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context

    // MARK: - Cleanup

+    /**
+     * Proactively tear down the player. Called from onDetachedFromWindow so
+     * the app releases mpv + decoder buffers when the View detaches from the
+     * window. The JS-facing destroy() is intentionally thinner (just
+     * renderer.stop()) — see this thread for why the full teardown was kept
+     * off the JS path.
+     */
    fun cleanup() {
        isWaitingForPiPTransition = false
        pipHandler.removeCallbacksAndMessages(null)
        pipController?.stopPictureInPicture()
        renderer?.stop()
-        surfaceTexture = null
+        renderer?.delegate = null
+
+        // Release the Surface that wraps the SurfaceTexture. These Surface
+        // objects are created in onSurfaceTextureAvailable and were never
+        // released; each playback session previously leaked one. The
+        // SurfaceTexture itself is owned by TextureView and released by it
+        // via onSurfaceTextureDestroyed, so we leave it alone.
+        pendingSurface?.release()
+        pendingSurface = null
+        activeSurface?.release()
+        activeSurface = null
        surfaceReady = false
+        currentUrl = null
+        rendererStarted = false
    }

    override fun onDetachedFromWindow() {
--- a/modules/mpv-player/ios/MPVLayerRenderer.swift
+++ b/modules/mpv-player/ios/MPVLayerRenderer.swift
@@ -1020,12 +1020,44 @@ final class MPVLayerRenderer {
            info["cacheSeconds"] = cacheSeconds
        }

+        // Configured cache limits — read back from mpv to confirm user
+        // settings actually took effect. mpv stores byte sizes as int64
+        // (bytes); convert to MiB for display.
+        var demuxerMaxBytes: Int64 = 0
+        if getProperty(handle: handle, name: "demuxer-max-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBytes) >= 0 {
+            info["demuxerMaxBytes"] = Int(demuxerMaxBytes / (1024 * 1024))
+        }
+        var demuxerMaxBackBytes: Int64 = 0
+        if getProperty(handle: handle, name: "demuxer-max-back-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBackBytes) >= 0 {
+            info["demuxerMaxBackBytes"] = Int(demuxerMaxBackBytes / (1024 * 1024))
+        }
+        var cacheSecsLimit: Double = 0
+        if getProperty(handle: handle, name: "cache-secs", format: MPV_FORMAT_DOUBLE, value: &cacheSecsLimit) >= 0 {
+            info["cacheSecsLimit"] = cacheSecsLimit
+        }
+
        // Dropped frames
        var droppedFrames: Int64 = 0
        if getProperty(handle: handle, name: "frame-drop-count", format: MPV_FORMAT_INT64, value: &droppedFrames) >= 0 {
            info["droppedFrames"] = Int(droppedFrames)
        }

+        // Active video output driver
+        if let voDriver = getStringProperty(handle: handle, name: "vo") {
+            info["voDriver"] = voDriver
+        }
+
+        // Active hardware decoder
+        if let hwdec = getStringProperty(handle: handle, name: "hwdec-current") {
+            info["hwdec"] = hwdec
+        }
+
+        // Estimated video output fps (post-filter)
+        var estimatedVfFps: Double = 0
+        if getProperty(handle: handle, name: "estimated-vf-fps", format: MPV_FORMAT_DOUBLE, value: &estimatedVfFps) >= 0 && estimatedVfFps > 0 {
+            info["estimatedVfFps"] = estimatedVfFps
+        }
+
        return info
    }
 }
--- a/modules/mpv-player/ios/MpvPlayerModule.swift
+++ b/modules/mpv-player/ios/MpvPlayerModule.swift
@@ -74,7 +74,13 @@ public class MpvPlayerModule: Module {
      AsyncFunction("pause") { (view: MpvPlayerView) in
        view.pause()
      }
-      
+
+      // Synchronously destroy mpv instance + decoder before navigating
+      // away from the player screen (cross-platform; matches Android).
+      AsyncFunction("destroy") { (view: MpvPlayerView) in
+        view.destroy()
+      }
+
      // Async function to seek to position
      AsyncFunction("seekTo") { (view: MpvPlayerView, position: Double) in
        view.seekTo(position: position)
--- a/modules/mpv-player/ios/MpvPlayerView.swift
+++ b/modules/mpv-player/ios/MpvPlayerView.swift
@@ -289,6 +289,49 @@ class MpvPlayerView: ExpoView {
 		pipController?.updatePlaybackState()
 	}

+	/**
+	 * Synchronously stop and destroy the mpv instance + decoder so memory is
+	 * freed before the next screen mounts. Safe to call multiple times — the
+	 * underlying renderer.stop() guards against re-entry.
+	 *
+	 * Cross-platform counterpart of MpvPlayerView.destroy() on Android.
+	 */
+	func destroy() {
+		renderer?.stop()
+
+		// Reset view state and re-create the mpv handle so a subsequent
+		// loadVideo() on the SAME view instance can actually load.
+		// Without this, stop() leaves renderer.mpv == nil, and the next
+		// loadVideo(config:) calls renderer.load() which early-returns
+		// at `guard let handle = self.mpv else { return }` — but only
+		// after flipping isLoading = true and dispatching the loading
+		// delegate callback, so the JS layer is stuck in a perpetual
+		// "loading" state with no actual playback.
+		//
+		// This path is hit by direct-player.tsx's goToNextItem()/stop(),
+		// which call destroy() immediately before router.replace() to
+		// the same route — Expo Router reuses the same MpvPlayerView
+		// instance, so the next `source` prop update arrives on this
+		// view without a remount. setupView() is otherwise the only
+		// place start() is called, so without re-starting here the
+		// renderer stays dead until the whole view is unmounted and
+		// recreated.
+		//
+		// start() is idempotent (`guard !isRunning else { return }`)
+		// and stop() has already nulled mpv synchronously before
+		// dispatching the async mpv_terminate_destroy, so creating a
+		// fresh handle here is safe even while the old handle's
+		// teardown is still in flight on a background queue (libmpv
+		// handles are independent).
+		currentURL = nil
+		intendedPlayState = false
+		do {
+			try renderer?.start()
+		} catch {
+			onError(["error": "Failed to restart renderer after destroy: \(error.localizedDescription)"])
+		}
+	}
+
 	func seekTo(position: Double) {
 		// Update cached position and Now Playing immediately for smooth Control Center feedback
 		cachedPosition = position
--- a/modules/mpv-player/src/MpvPlayer.types.ts
+++ b/modules/mpv-player/src/MpvPlayer.types.ts
@@ -89,6 +89,14 @@ export type MpvPlayerViewProps = {
 export interface MpvPlayerViewRef {
  play: () => Promise<void>;
  pause: () => Promise<void>;
+  /**
+   * Synchronously destroy the mpv instance + decoder + surface buffers.
+   * Call before navigating away from the player screen so memory is
+   * freed before the next screen mounts. Safe to call multiple times.
+   */
+  destroy: () => Promise<void>;
+  // Pre-libmpv-1.0 alias (kept for source-history reference):
+  // stop: () => Promise<void>;
  seekTo: (position: number) => Promise<void>;
  seekBy: (offset: number) => Promise<void>;
  setSpeed: (speed: number) => Promise<void>;
@@ -154,9 +162,17 @@ export type TechnicalInfo = {
  videoBitrate?: number;
  audioBitrate?: number;
  cacheSeconds?: number;
+  /** Configured demuxer forward cache cap (MiB), read back from mpv */
+  demuxerMaxBytes?: number;
+  /** Configured demuxer backward cache cap (MiB), read back from mpv */
+  demuxerMaxBackBytes?: number;
+  /** Configured cache-secs floor, read back from mpv */
+  cacheSecsLimit?: number;
  droppedFrames?: number;
  /** Active video output driver (read from MPV at runtime) */
  voDriver?: string;
  /** Active hardware decoder (read from MPV at runtime) */
  hwdec?: string;
+  /** Estimated video output fps (mpv "estimated-vf-fps") */
+  estimatedVfFps?: number;
 };
--- a/modules/mpv-player/src/MpvPlayerView.tsx
+++ b/modules/mpv-player/src/MpvPlayerView.tsx
@@ -20,6 +20,9 @@ export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
      pause: async () => {
        await nativeRef.current?.pause();
      },
+      destroy: async () => {
+        await nativeRef.current?.destroy();
+      },
      seekTo: async (position: number) => {
        await nativeRef.current?.seekTo(position);
      },
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
    "expo-brightness": "~56.0.5",
    "expo-build-properties": "~56.0.18",
    "expo-camera": "~56.0.8",
-    "expo-clipboard": "~56.0.4",
    "expo-constants": "~56.0.18",
    "expo-crypto": "~56.0.4",
    "expo-dev-client": "~56.0.20",
--- a/plugins/withGradleProperties.js
+++ b/plugins/withGradleProperties.js
@@ -27,6 +27,9 @@ module.exports = function withCustomPlugin(config) {
  // https://github.com/expo/expo/issues/32558
  config = setGradlePropertiesValue(config, "android.enableJetifier", "true");

+  // NDK version required by libmpv 1.0.0
+  config = setGradlePropertiesValue(config, "ndkVersion", "29.0.14206865");
+
  // Increase memory
  config = setGradlePropertiesValue(
    config,
--- a/providers/Downloads/fileOperations.ts
+++ b/providers/Downloads/fileOperations.ts
@@ -96,24 +96,5 @@ export function getDownloadedItemSize(id: string): number {
 */
 export function calculateTotalDownloadedSize(): number {
  const items = getAllDownloadedItems();
-  return items.reduce((sum, item) => {
-    // Trickplay bytes count too — getDownloadedItemSize models per-item size
-    // as video + trickplay, the total must match.
-    const trickplaySize = item.trickPlayData?.size ?? 0;
-    // Read the live file size on disk so the total reflects actual usage and
-    // self-heals items whose stored videoFileSize is 0 (old schema, or
-    // `fileInfo.size` was undefined at download time). Fall back to the stored
-    // value if the file can't be stat'd.
-    if (item.videoFilePath) {
-      try {
-        const file = new File(filePathToUri(item.videoFilePath));
-        if (file.exists) {
-          return sum + (file.size ?? item.videoFileSize ?? 0) + trickplaySize;
-        }
-      } catch (error) {
-        console.warn("Failed to stat downloaded file for size:", error);
-      }
-    }
-    return sum + (item.videoFileSize ?? 0) + trickplaySize;
-  }, 0);
+  return items.reduce((sum, item) => sum + (item.videoFileSize || 0), 0);
 }
--- a/providers/Downloads/hooks/useDownloadOperations.ts
+++ b/providers/Downloads/hooks/useDownloadOperations.ts
@@ -289,24 +289,7 @@ export function useDownloadOperations({
  );

  const appSizeUsage = useCallback(async () => {
-    let totalSize = calculateTotalDownloadedSize();
-
-    // Also count in-progress downloads (they write straight to their final
-    // path) so the growing file shows up as app usage instead of drifting
-    // into the generic device share until completion.
-    for (const process of processes) {
-      try {
-        const file = new File(
-          Paths.document,
-          `${generateFilename(process.item)}.mp4`,
-        );
-        if (file.exists) {
-          totalSize += file.size ?? 0;
-        }
-      } catch {
-        // File not created yet — ignore.
-      }
-    }
+    const totalSize = calculateTotalDownloadedSize();

    try {
      const [freeDiskStorage, totalDiskCapacity] = await Promise.all([
@@ -327,7 +310,7 @@ export function useDownloadOperations({
        appSize: totalSize,
      };
    }
-  }, [processes]);
+  }, []);

  return {
    startBackgroundDownload,
--- a/providers/JellyfinProvider.tsx
+++ b/providers/JellyfinProvider.tsx
@@ -15,7 +15,6 @@ import {
  useContext,
  useEffect,
  useMemo,
-  useRef,
  useState,
 } from "react";
 import { useTranslation } from "react-i18next";
@@ -92,12 +91,6 @@ export const apiAtom = atom<Api | null>(initialApi);
 export const userAtom = atom<UserDto | null>(initialUser);
 export const wsAtom = atom<WebSocket | null>(null);
 export const cacheVersionAtom = atom<number>(0);
-// Set by a login flow that wants the account saved: the protection picker
-// shows AFTER the session is authorized (the login screen unmounts on
-// success, so the modal lives at the root — see PendingAccountSaveModal).
-export const pendingAccountSaveAtom = atom<{ serverName?: string } | null>(
-  null,
-);

 interface LoginOptions {
  saveAccount?: boolean;
@@ -115,11 +108,6 @@ interface JellyfinContextValue {
    serverName?: string,
    options?: LoginOptions,
  ) => Promise<void>;
-  saveCurrentAccount: (options?: {
-    securityType?: AccountSecurityType;
-    pinCode?: string;
-    serverName?: string;
-  }) => Promise<void>;
  logout: () => Promise<void>;
  initiateQuickConnect: () => Promise<string | undefined>;
  stopQuickConnectPolling: () => void;
@@ -177,46 +165,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
  const { clearAllJellyseerData, setJellyseerrUser } = useJellyseerr();
  const queryClient = useQueryClient();

-  // --- Session-expiry handling ----------------------------------------------
-  // When the server revokes the token (e.g. the device/session is deleted), a
-  // 401 can surface from any authenticated request. Without central handling
-  // the dead token stays in storage, so every reload re-fires authed calls →
-  // 401 spam + uncaught rejections, and the app lingers in a half-authenticated
-  // state. A single response interceptor on the authenticated api clears the
-  // session on the first 401 so the app drops cleanly to the login screen.
-  const sessionExpiredRef = useRef(false);
-
-  const handleSessionExpired = useCallback(() => {
-    if (sessionExpiredRef.current) return; // run once per session
-    sessionExpiredRef.current = true;
-    storage.remove("token");
-    storage.remove("user");
-    setUser(null);
-    setApi(null);
-    queryClient.clear();
-    storage.remove("REACT_QUERY_OFFLINE_CACHE");
-    // Saved credentials are kept so the user can quick-login again.
-  }, [setUser, setApi, queryClient]);
-
-  useEffect(() => {
-    // Only guard an authenticated session. A pre-auth api (login screen) keeps
-    // its own handling — a wrong-password 401 is not a session expiry.
-    if (!api?.accessToken) return;
-    sessionExpiredRef.current = false; // re-arm for this fresh session
-    const interceptorId = api.axiosInstance.interceptors.response.use(
-      (response) => response,
-      (error) => {
-        if (error?.response?.status === 401) {
-          handleSessionExpired();
-        }
-        return Promise.reject(error);
-      },
-    );
-    return () => {
-      api.axiosInstance.interceptors.response.eject(interceptorId);
-    };
-  }, [api, handleSessionExpired]);
-
  const headers = useMemo(() => {
    if (!deviceId) return {};
    return {
@@ -359,37 +307,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    },
  });

-  // Persist the CURRENT session to secure storage — used by the post-login
-  // save-account modal (the protection picker shows AFTER a successful
-  // login, for both the password and Quick Connect flows).
-  const saveCurrentAccount = useCallback(
-    async (options?: {
-      securityType?: AccountSecurityType;
-      pinCode?: string;
-      serverName?: string;
-    }) => {
-      const token = storage.getString("token");
-      if (!api?.basePath || !user?.Id || !user.Name || !token) return;
-      const securityType = options?.securityType || "none";
-      let pinHash: string | undefined;
-      if (securityType === "pin" && options?.pinCode) {
-        pinHash = await hashPIN(options.pinCode);
-      }
-      await saveAccountCredential({
-        serverUrl: api.basePath,
-        serverName: options?.serverName || "",
-        token,
-        userId: user.Id,
-        username: user.Name,
-        savedAt: Date.now(),
-        securityType,
-        pinHash,
-        primaryImageTag: user.PrimaryImageTag ?? undefined,
-      });
-    },
-    [api?.basePath, user],
-  );
-
  const loginMutation = useMutation({
    mutationFn: async ({
      username,
@@ -469,7 +386,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
            default:
              throw new Error(
                t(
-                  "login.an_unexpected_error_occurred_did_you_enter_the_correct_url",
+                  "login.an_unexpected_error_occured_did_you_enter_the_correct_url",
                ),
              );
          }
@@ -592,9 +509,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
      }
    },
    onError: (error) => {
-      // Expected, handled case (e.g. revoked token → "Session Expired", or
-      // server unreachable): the UI surfaces the message, so warn, don't error.
-      console.warn("Quick login failed:", error);
+      console.error("Quick login failed:", error);
    },
  });

@@ -705,62 +620,54 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
            setUser(storedUser);
          }

-          // Validate the token and refresh user data in the background. Do NOT
-          // await this: the Jellyfin SDK axios instance has no timeout, so when
-          // offline this call hangs for the full OS TCP timeout (75-120s) and
-          // blocks splash dismissal. The cached storedUser (set above) is enough
-          // to render; on success we just refresh it.
-          getUserApi(apiInstance)
-            .getCurrentUser()
-            .then(async (response) => {
-              setUser(response.data);
+          // Dismiss splash screen with cached data immediately,
+          // fetch fresh user data in the background
+          setInitialLoaded(true);

-              // Migrate current session to secure storage if not already saved
-              if (storedUser?.Id && storedUser?.Name) {
-                const existingCredential = await getAccountCredential(
-                  serverUrl,
-                  storedUser.Id,
-                );
-                if (!existingCredential) {
-                  await saveAccountCredential({
-                    serverUrl,
-                    serverName: "",
-                    token,
-                    userId: storedUser.Id,
-                    username: storedUser.Name,
-                    savedAt: Date.now(),
-                    securityType: "none",
-                    primaryImageTag: response.data.PrimaryImageTag ?? undefined,
-                  });
-                } else if (
-                  response.data.PrimaryImageTag !==
-                  existingCredential.primaryImageTag
-                ) {
-                  // Update image tag if it has changed
-                  addAccountToServer(serverUrl, existingCredential.serverName, {
-                    userId: existingCredential.userId,
-                    username: existingCredential.username,
-                    securityType: existingCredential.securityType,
-                    savedAt: existingCredential.savedAt,
-                    primaryImageTag: response.data.PrimaryImageTag ?? undefined,
-                  });
-                }
-              }
-            })
-            .catch((e) => {
-              // Expected, handled case (offline, or a token the server rejects —
-              // the UI prompts re-login): warn, don't error. Log only
-              // status/message — never the raw error (axios errors carry the
-              // request config incl. the Authorization header / token).
-              console.warn(
-                "Background user validation failed:",
-                e?.response?.status ?? e?.message ?? "unknown error",
+          try {
+            const response = await getUserApi(apiInstance).getCurrentUser();
+            setUser(response.data);
+
+            // Migrate current session to secure storage if not already saved
+            if (storedUser?.Id && storedUser?.Name) {
+              const existingCredential = await getAccountCredential(
+                serverUrl,
+                storedUser.Id,
              );
-            });
+              if (!existingCredential) {
+                await saveAccountCredential({
+                  serverUrl,
+                  serverName: "",
+                  token,
+                  userId: storedUser.Id,
+                  username: storedUser.Name,
+                  savedAt: Date.now(),
+                  securityType: "none",
+                  primaryImageTag: response.data.PrimaryImageTag ?? undefined,
+                });
+              } else if (
+                response.data.PrimaryImageTag !==
+                existingCredential.primaryImageTag
+              ) {
+                // Update image tag if it has changed
+                addAccountToServer(serverUrl, existingCredential.serverName, {
+                  userId: existingCredential.userId,
+                  username: existingCredential.username,
+                  securityType: existingCredential.securityType,
+                  savedAt: existingCredential.savedAt,
+                  primaryImageTag: response.data.PrimaryImageTag ?? undefined,
+                });
+              }
+            }
+          } catch (e) {
+            // Background fetch failed — app already rendered with cached data
+            console.warn("Background user fetch failed, using cached data:", e);
+          }
+        } else {
+          setInitialLoaded(true);
        }
      } catch (e) {
        console.error(e);
-      } finally {
        setInitialLoaded(true);
      }
    };
@@ -774,7 +681,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    removeServer: () => removeServerMutation.mutateAsync(),
    login: (username, password, serverName, options) =>
      loginMutation.mutateAsync({ username, password, serverName, options }),
-    saveCurrentAccount,
    logout: () => logoutMutation.mutateAsync(),
    initiateQuickConnect,
    stopQuickConnectPolling,
--- a/translations/en.json
+++ b/translations/en.json
@@ -12,21 +12,18 @@
    "login_button": "Log in",
    "quick_connect": "Quick Connect",
    "enter_code_to_login": "Enter code {{code}} to log in",
-    "quick_connect_instructions": "Enter this code on a signed-in device — you'll be logged in automatically.",
-    "tap_code_to_copy": "Tap the code to copy it",
-    "code_copied": "Code copied",
    "failed_to_initiate_quick_connect": "Failed to initiate Quick Connect",
    "got_it": "Got it",
    "connection_failed": "Connection failed",
    "could_not_connect_to_server": "Could not connect to the server. Please check the URL and your network connection.",
-    "an_unexpected_error_occurred": "An unexpected error occurred",
+    "an_unexpected_error_occured": "An unexpected error occurred",
    "change_server": "Change server",
    "invalid_username_or_password": "Invalid username or password",
    "user_does_not_have_permission_to_log_in": "User does not have permission to log in",
    "server_is_taking_too_long_to_respond_try_again_later": "Server is taking too long to respond, try again later",
    "server_received_too_many_requests_try_again_later": "Server received too many requests, try again later.",
    "there_is_a_server_error": "There is a server error",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
    "too_old_server_text": "Unsupported Jellyfin server discovered",
    "too_old_server_description": "Please update Jellyfin to the latest version"
  },
@@ -36,7 +33,6 @@
    "connect_button": "Connect",
    "previous_servers": "Previous servers",
    "clear_button": "Clear all",
-    "server_url": "Server URL",
    "swipe_to_remove": "Swipe to remove",
    "search_for_local_servers": "Search for local servers",
    "searching": "Searching...",
@@ -192,11 +188,10 @@
        "authorize_button": "Authorize Quick Connect",
        "enter_the_quick_connect_code": "Enter the Quick Connect code...",
        "success": "Success",
-        "quick_connect_authorized": "Quick Connect authorized",
+        "quick_connect_autorized": "Quick Connect authorized",
        "error": "Error",
        "invalid_code": "Invalid code",
-        "authorize": "Authorize",
-        "paste_code": "Paste code"
+        "authorize": "Authorize"
      },
      "media_controls": {
        "media_controls_title": "Media controls",
@@ -275,10 +270,6 @@
        "mpv_subtitle_margin_y": "Vertical margin",
        "mpv_subtitle_align_x": "Horizontal align",
        "mpv_subtitle_align_y": "Vertical align",
-        "mpv_settings_title": "MPV Subtitle Settings",
-        "mpv_settings_description": "Advanced subtitle customization for MPV player",
-        "opaque_background": "Opaque Background",
-        "background_opacity": "Background Opacity",
        "align": {
          "left": "Left",
          "center": "Center",
@@ -307,7 +298,7 @@
        "show_custom_menu_links": "Show custom menu links",
        "show_large_home_carousel": "Show large home carousel (beta)",
        "hide_libraries": "Hide libraries",
-        "select_libraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
+        "select_liraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
        "disable_haptic_feedback": "Disable haptic feedback",
        "default_quality": "Default quality",
        "default_playback_speed": "Default playback speed",
@@ -393,8 +384,6 @@
        "device_usage": "Device {{availableSpace}}%",
        "size_used": "{{used}} of {{total}} used",
        "delete_all_downloaded_files": "Delete all downloaded files",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
        "music_cache_title": "Music cache",
        "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
        "clear_music_cache": "Clear music cache",
@@ -419,9 +408,7 @@
        "click_for_more_info": "Click for more info",
        "level": "Level",
        "no_logs_available": "No logs available",
-        "delete_all_logs": "Delete all logs",
-        "copy": "Copy",
-        "copied": "Copied to clipboard"
+        "delete_all_logs": "Delete all logs"
      },
      "languages": {
        "title": "Languages",
@@ -448,13 +435,10 @@
    },
    "sessions": {
      "title": "Sessions",
-      "no_active_sessions": "No active sessions",
-      "select_session": "Select Session",
-      "now_playing": "Now playing:"
+      "no_active_sessions": "No active sessions"
    },
    "downloads": {
      "downloads_title": "Downloads",
-      "transcoding": "Transcoding",
      "series": "Series",
      "movies": "Movies",
      "other_media": "Other media",
@@ -511,8 +495,6 @@
    "none": "None",
    "track": "Track",
    "cancel": "Cancel",
-    "stop": "Stop",
-    "open_menu": "Open Menu",
    "delete": "Delete",
    "ok": "OK",
    "remove": "Remove",
@@ -614,34 +596,10 @@
  },
  "player": {
    "live": "LIVE",
-    "menu": {
-      "quality": "Quality",
-      "subtitles": "Subtitles",
-      "subtitle_scale": "Subtitle Scale",
-      "audio": "Audio",
-      "speed": "Speed",
-      "playback_options": "Playback Options",
-      "show_technical_info": "Show Technical Info",
-      "hide_technical_info": "Hide Technical Info"
-    },
-    "technical_info": {
-      "video": "Video:",
-      "audio": "Audio:",
-      "subtitle": "Subtitle:",
-      "bitrate": "Bitrate:",
-      "buffer_seconds": "Buffer: {{seconds}}s",
-      "vo": "VO:",
-      "dropped_frames": "Dropped: {{count}} frames",
-      "loading": "Loading..."
-    },
    "mpv_player_title": "MPV player",
-    "aspect_ratio": "Aspect Ratio",
-    "aspect_ratio_original": "Original",
-    "hash_match": "Hash Match",
-    "still_watching": "Are you still watching?",
    "error": "Error",
    "failed_to_get_stream_url": "Failed to get the stream URL",
-    "an_error_occurred_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
+    "an_error_occured_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
    "client_error": "Client error",
    "could_not_create_stream_for_chromecast": "Could not create a stream for Chromecast",
    "message_from_server": "Message from server: {{message}}",
@@ -739,7 +697,6 @@
    "no_data_available": "No data available"
  },
  "live_tv": {
-    "title": "Live TV",
    "next": "Next",
    "previous": "Previous",
    "coming_soon": "Coming soon",
@@ -811,7 +768,7 @@
    "request_selected": "Request selected",
    "n_selected": "{{count}} selected",
    "toasts": {
-      "jellyseerr_does_not_meet_requirements": "Seerr server does not meet minimum version requirements! Please update to at least 2.0.0",
+      "jellyseer_does_not_meet_requirements": "Seerr server does not meet minimum version requirements! Please update to at least 2.0.0",
      "jellyseerr_test_failed": "Seerr test failed. Please try again.",
      "failed_to_test_jellyseerr_server_url": "Failed to test Seerr server url",
      "issue_submitted": "Issue submitted!",
@@ -824,16 +781,6 @@
      "failed_to_decline_request": "Failed to decline request"
    }
  },
-  "accessibility": {
-    "play_button": "Play button",
-    "play_hint": "Tap to play the media",
-    "toggle_orientation": "Toggle screen orientation",
-    "toggle_orientation_hint": "Toggles the screen orientation between portrait and landscape"
-  },
-  "not_found": {
-    "title": "This screen doesn't exist.",
-    "go_home": "Go to home screen!"
-  },
  "tabs": {
    "home": "Home",
    "search": "Search",
@@ -844,12 +791,6 @@
  },
  "music": {
    "title": "Music",
-    "no_track_playing": "No track playing",
-    "queue_empty": "Queue is empty",
-    "playing_from_queue": "Playing from queue",
-    "up_next": "Up next",
-    "now_playing": "Now Playing",
-    "missing_library_id": "Missing music library id.",
    "tabs": {
      "suggestions": "Suggestions",
      "albums": "Albums",
--- a/utils/atoms/filters.ts
+++ b/utils/atoms/filters.ts
@@ -1,5 +1,6 @@
 import { atom } from "jotai";
-import { useMemo } from "react";
+import { atomWithStorage } from "jotai/utils";
+import { storage } from "../mmkv";
 import { useSettings } from "./settings";

 export enum SortByOption {
@@ -58,36 +59,32 @@ export const sortOptions: {

 export const useFilterOptions = () => {
  const { settings } = useSettings();
-  // Memoized so the array identity stays stable across renders. A fresh array
-  // each render cascades into ListHeaderComponent re-creation and, under heavy
-  // re-rendering (active downloads), trips React's max-update-depth guard.
-  // We only show the watchlist option if someone has ticked that setting.
-  return useMemo(
-    () =>
-      settings?.useKefinTweaks
-        ? [
-            {
-              key: FilterByOption.IsFavoriteOrLiked,
-              value: "Is Favorite Or Liked",
-            },
-            { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
-            { key: FilterByOption.IsPlayed, value: "Is Played" },
-            { key: FilterByOption.IsFavorite, value: "Is Favorite" },
-            { key: FilterByOption.IsResumable, value: "Is Resumable" },
-            { key: FilterByOption.Likes, value: "Watchlist" },
-          ]
-        : [
-            {
-              key: FilterByOption.IsFavoriteOrLiked,
-              value: "Is Favorite Or Liked",
-            },
-            { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
-            { key: FilterByOption.IsPlayed, value: "Is Played" },
-            { key: FilterByOption.IsFavorite, value: "Is Favorite" },
-            { key: FilterByOption.IsResumable, value: "Is Resumable" },
-          ],
-    [settings?.useKefinTweaks],
-  );
+  // We want to only show the watchlist option if someone has ticked that setting.
+  const filterOptions = settings?.useKefinTweaks
+    ? [
+        {
+          key: FilterByOption.IsFavoriteOrLiked,
+          value: "Is Favorite Or Liked",
+        },
+        { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
+        { key: FilterByOption.IsPlayed, value: "Is Played" },
+        { key: FilterByOption.IsFavorite, value: "Is Favorite" },
+        { key: FilterByOption.IsResumable, value: "Is Resumable" },
+        { key: FilterByOption.Likes, value: "Watchlist" },
+      ]
+    : [
+        {
+          key: FilterByOption.IsFavoriteOrLiked,
+          value: "Is Favorite Or Liked",
+        },
+        { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
+        { key: FilterByOption.IsPlayed, value: "Is Played" },
+        { key: FilterByOption.IsFavorite, value: "Is Favorite" },
+        { key: FilterByOption.IsResumable, value: "Is Resumable" },
+      ];
+  console.log("filterOptions");
+  console.log(filterOptions);
+  return filterOptions;
 };

 export const sortOrderOptions: {
@@ -123,28 +120,57 @@ const defaultSortPreference: SortPreference = {};
 const defaultSortOrderPreference: SortOrderPreference = {};
 const defaultFilterPreference: FilterPreference = {};

-// Per-library filter memory is intentionally in-memory (NOT atomWithStorage):
-// each library keeps its own filters for the session, and everything resets
-// when the app is fully closed.
-export const sortByPreferenceAtom = atom<SortPreference>(defaultSortPreference);
+export const sortByPreferenceAtom = atomWithStorage<SortPreference>(
+  "sortByPreference",
+  defaultSortPreference,
+  {
+    getItem: (key) => {
+      const value = storage.getString(key);
+      return value ? JSON.parse(value) : null;
+    },
+    setItem: (key, value) => {
+      storage.set(key, JSON.stringify(value));
+    },
+    removeItem: (key) => {
+      storage.remove(key);
+    },
+  },
+);

-export const FilterByPreferenceAtom = atom<FilterPreference>(
+export const FilterByPreferenceAtom = atomWithStorage<FilterPreference>(
+  "filterByPreference",
  defaultFilterPreference,
+  {
+    getItem: (key) => {
+      const value = storage.getString(key);
+      return value ? JSON.parse(value) : null;
+    },
+    setItem: (key, value) => {
+      storage.set(key, JSON.stringify(value));
+    },
+    removeItem: (key) => {
+      storage.remove(key);
+    },
+  },
 );

-export const sortOrderPreferenceAtom = atom<SortOrderPreference>(
+export const sortOrderPreferenceAtom = atomWithStorage<SortOrderPreference>(
+  "sortOrderPreference",
  defaultSortOrderPreference,
+  {
+    getItem: (key) => {
+      const value = storage.getString(key);
+      return value ? JSON.parse(value) : null;
+    },
+    setItem: (key, value) => {
+      storage.set(key, JSON.stringify(value));
+    },
+    removeItem: (key) => {
+      storage.remove(key);
+    },
+  },
 );

-// Genres / years / tags are multi-select, so each library remembers an array.
-export interface MultiFilterPreference {
-  [libraryId: string]: string[];
-}
-
-export const genrePreferenceAtom = atom<MultiFilterPreference>({});
-export const yearPreferenceAtom = atom<MultiFilterPreference>({});
-export const tagPreferenceAtom = atom<MultiFilterPreference>({});
-
 export const getSortByPreference = (
  libraryId: string,
  preferences: SortPreference,
@@ -165,8 +191,3 @@ export const getFilterByPreference = (
 ) => {
  return preferences?.[libraryId] || null;
 };
-
-export const getMultiFilterPreference = (
-  libraryId: string,
-  preferences: MultiFilterPreference,
-) => preferences?.[libraryId] ?? [];
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -9,6 +9,7 @@ import {
 import { t } from "i18next";
 import { atom, useAtom, useAtomValue } from "jotai";
 import { useCallback, useEffect, useMemo } from "react";
+import { Platform } from "react-native";
 import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom } from "@/providers/JellyfinProvider";
@@ -361,11 +362,16 @@ export const defaultValues: Settings = {
  mpvSubtitleFontSize: undefined,
  mpvSubtitleBackgroundEnabled: false,
  mpvSubtitleBackgroundOpacity: 75,
-  // MPV buffer/cache defaults
+  // MPV buffer/cache defaults.
+  // Android TV gets tighter caps — combined with libmpv 1.0's larger
+  // baseline (fontconfig + libxml2 + libplacebo HDR path + scudo
+  // retention) the larger mobile budget pushes 2 GB Android TV boxes
+  // into swap death during 4K HDR playback. Apple TV has more RAM and
+  // keeps the full budget. Users can override via the settings screen.
  mpvCacheEnabled: "auto",
  mpvCacheSeconds: 10,
-  mpvDemuxerMaxBytes: 150, // MB
-  mpvDemuxerMaxBackBytes: 50, // MB
+  mpvDemuxerMaxBytes: Platform.isTV && Platform.OS === "android" ? 75 : 150, // MB
+  mpvDemuxerMaxBackBytes: Platform.isTV && Platform.OS === "android" ? 30 : 50, // MB
  // MPV video output driver defaults (Android only)
  mpvVoDriver: "gpu-next",
  // Gesture controls
@@ -443,6 +449,11 @@ export const pluginSettingsAtom = atom<PluginLockableSettings | undefined>(
 const hasMeaningfulSettingValue = (value: unknown) =>
  value !== undefined && value !== null && value !== "";

+const getEffectiveSettingValue = <K extends keyof Settings>(
+  settings: Partial<Settings> | null | undefined,
+  settingsKey: K,
+) => settings?.[settingsKey] ?? defaultValues[settingsKey];
+
 export const useSettings = () => {
  const api = useAtomValue(apiAtom);
  const [_settings, setSettings] = useAtom(settingsAtom);
@@ -499,17 +510,7 @@ export const useSettings = () => {
    if (!_settings) {
      return;
    }
-    // Admin-locked settings are enforced at write time too: a control that
-    // isn't disabled in the UI must not persist a value the admin pinned.
-    // The read memo already overrides locked keys, but without this guard the
-    // write would silently land in user storage and resurface once unlocked.
-    const sanitizedUpdate = Object.fromEntries(
-      Object.entries(update).filter(
-        ([key]) => pluginSettings?.[key as keyof Settings]?.locked !== true,
-      ),
-    ) as Partial<Settings>;
-
-    const hasChanges = Object.entries(sanitizedUpdate).some(
+    const hasChanges = Object.entries(update).some(
      ([key, value]) => _settings[key as keyof Settings] !== value,
    );

@@ -518,7 +519,7 @@ export const useSettings = () => {
      const newSettings = {
        ...defaultValues,
        ..._settings,
-        ...sanitizedUpdate,
+        ...update,
      } as Settings;
      setSettings(newSettings);
      saveSettings(newSettings);
@@ -541,24 +542,13 @@ export const useSettings = () => {
        // Normalize object-typed settings from plugin (plain primitive → { key, value })
        value = normalizePluginValue(settingsKey, value);

-        // When unlocked, keep the user's value only if they explicitly diverged
-        // from the app default. Otherwise the plugin value is the admin's
-        // default and must win over the hardcoded app default — e.g. a toggle
-        // that was always locked then unlocked should reflect the plugin
-        // default, not the app's `false`. Object-typed settings compare by
-        // reference, so their behaviour is unchanged.
-        const userValue = _settings?.[settingsKey];
-        const userDiverged =
-          hasMeaningfulSettingValue(userValue) &&
-          userValue !== defaultValues[settingsKey];
+        const effectiveValue = getEffectiveSettingValue(_settings, settingsKey);

        (acc as any)[settingsKey] = locked
          ? value
-          : userDiverged
-            ? userValue
-            : hasMeaningfulSettingValue(value)
-              ? value
-              : defaultValues[settingsKey];
+          : hasMeaningfulSettingValue(effectiveValue)
+            ? effectiveValue
+            : value;
      }
      return acc;
    }, {});
Author	SHA1	Message	Date
Gauvain	d0f4f15525	Merge branch 'develop' into fix/android-tv-fixes-and-mpv-upgrade	2026-06-25 10:46:33 +02:00
bbijsterbosch	47c5d61f28	fix: Roadmap link in README (#1524 ) Co-authored-by: Gauvain <contact@uruk.dev> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>	2026-06-25 10:45:50 +02:00
lance chant	a7f1443b90	Merge branch 'develop' into fix/android-tv-fixes-and-mpv-upgrade	2026-06-25 10:22:02 +02:00
lance chant	517bc7bbb5	feat: android tv menu (#1709 ) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>	2026-06-25 09:08:12 +02:00
Lance Chant	b1d53eca11	Merge branch 'fix/android-tv-fixes-and-mpv-upgrade' of https://github.com/streamyfin/streamyfin into fix/android-tv-fixes-and-mpv-upgrade	2026-06-25 09:06:28 +02:00
Lance Chant	b2eb7f1120	addressing coderabbit comments Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>	2026-06-25 09:06:06 +02:00
lance chant	9f99590fd9	Update app/_layout.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>	2026-06-24 15:01:32 +02:00
Lance Chant	3b926e0061	fix: fixing some performance issues and mpv upgrade Updated libmpv to use 1.0.0 Fixed some performance issues with the upgrade Fixed a few settings that weren't getting applied Forced a higher ndk version as requirment from libmpv Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>	2026-06-24 14:42:48 +02:00