Merge branch 'develop' into fix/series-next-up-cross-series

fix(series): filter Next Up items by SeriesId client-side
Some Jellyfin server versions ignore the seriesId query parameter on /Shows/NextUp and return the global next-up list, causing the series detail page to show episodes from unrelated series (matching the home tab's Next Up row). Defensively filter the response by SeriesId on the client and hide the section entirely when there are no matching items, instead of rendering an empty 'No items to display' block.
2026-06-29 17:20:30 +01:00 · 2026-06-07 13:57:49 +10:00 · 2026-06-06 00:18:06 +10:00
151 changed files with 5842 additions and 4360 deletions
--- a/.claude/learned-facts/use-network-aware-query-client-limitations.md
+++ b/.claude/learned-facts/use-network-aware-query-client-limitations.md
@@ -6,6 +6,4 @@

 ## Detail

-**Updated 2026-06-29**: This limitation no longer applies. The hook was rewritten to use a `Proxy` (not `Object.create`). It overrides only `invalidateQueries` (network-aware) / `forceInvalidateQueries`, and binds every other method to the real `queryClient` target (`value.bind(target)`). So private-field methods like `getQueriesData`, `setQueryData`, and `removeQueries` work correctly through it now — no need to fall back to a separate `useQueryClient`. (Confirmed when adding `queryClient.removeQueries` to `clearAllJellyseerData` in `hooks/useJellyseerr.ts`.)
-
-Historical (pre-2026-06): the hook used `Object.create(queryClient)`, which broke methods relying on JavaScript private fields; back then only `invalidateQueries` was safe.
+The `useNetworkAwareQueryClient` hook uses `Object.create(queryClient)` which breaks QueryClient methods that use JavaScript private fields (like `getQueriesData`, `setQueriesData`, `setQueryData`). Only use it when you ONLY need `invalidateQueries`. For cache manipulation, use standard `useQueryClient` from `@tanstack/react-query`.
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,28 +1 @@
-# Normalise line endings to LF for everyone. Files are stored as LF in git and
-# checked out as LF on every OS, so Windows clones stop producing CRLF churn
-# (no more "LF will be replaced by CRLF" warnings) regardless of core.autocrlf.
-* text=auto eol=lf
-
-# Windows-only scripts must stay CRLF
-*.bat text eol=crlf
-*.cmd text eol=crlf
-
-# Binary assets — never touched / never normalised
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.webp binary
-*.ico binary
-*.icns binary
-*.ttf binary
-*.otf binary
-*.woff binary
-*.woff2 binary
-*.mp3 binary
-*.mp4 binary
-*.mov binary
-*.pdf binary
-*.keystore binary
-*.jks binary
-*.p12 binary
+.modules/vlc-player/Frameworks/*.xcframework filter=lfs diff=lfs merge=lfs -text
--- a/.github/ISSUE_TEMPLATE/issue_report.yml
+++ b/.github/ISSUE_TEMPLATE/issue_report.yml
@@ -75,13 +75,10 @@ body:
    id: version
    attributes:
      label: Streamyfin Version
-      description: What version of Streamyfin are you running? On a TestFlight or development build, choose "TestFlight/Development build" and include the exact version string shown in the app's Settings.
+      description: What version of Streamyfin are you using?
      options:
        - 0.54.1
        - 0.51.0
-        - 0.47.1
-        - 0.30.2
-        - 0.28.0
        - Older
        - TestFlight/Development build
    validations:
--- a/.github/actions/refresh-pr-comment/action.yml
+++ b/.github/actions/refresh-pr-comment/action.yml
@@ -1,21 +0,0 @@
-name: Refresh PR build comment
-description: >-
-  Nudge artifact-comment.yml (via workflow_dispatch) so the PR build-status
-  comment reflects live per-platform progress as each build job finishes.
-
-runs:
-  using: composite
-  steps:
-    # workflow_dispatch fires even when triggered by the GITHUB_TOKEN, and
-    # artifact-comment's concurrency group collapses simultaneous nudges, so
-    # this can't spam the comment. Skipped on forks (their read-only token
-    # cannot dispatch). github.token is used because composite actions cannot
-    # read the secrets context.
-    - if: always() && github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-      continue-on-error: true
-      shell: bash
-      env:
-        GH_TOKEN: ${{ github.token }}
-        HEAD_REF: ${{ github.head_ref }}
-        REPO: ${{ github.repository }}
-      run: gh workflow run artifact-comment.yml --ref "$HEAD_REF" -R "$REPO"
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -30,17 +30,9 @@
      "customType": "regex",
      "managerFilePatterns": ["/\\.ya?ml$/"],
      "matchStrings": [
-        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)(?: versioning=(?<versioning>\\S+))?\\s+[A-Za-z0-9._-]+:\\s*[\"']?(?<currentValue>[^\"'\\s]+)"
+        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)(?: versioning=(?<versioning>\\S+))?\\s+xcode-version:\\s*[\"']?(?<currentValue>[^\"'\\s]+)"
      ],
      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}loose{{/if}}"
-    },
-    {
-      "customType": "regex",
-      "description": "Track the Bun version pinned in eas.json build profiles (strict JSON can't hold inline annotations)",
-      "managerFilePatterns": ["/(^|/)eas\\.json$/"],
-      "matchStrings": ["\"bun\"\\s*:\\s*\"(?<currentValue>[^\"]+)\""],
-      "datasourceTemplate": "npm",
-      "depNameTemplate": "bun"
    }
  ],
  "customDatasources": {
@@ -52,42 +44,22 @@
      ]
    }
  },
-  "vulnerabilityAlerts": {
-    "enabled": true,
-    "addLabels": ["security", "vulnerability"],
-    "assigneesFromCodeOwners": true,
-    "commitMessageSuffix": " [SECURITY]"
-  },
-  "packageRules": [
-    {
-      "description": "Expo SDK coherence: expo, react, react-native and Expo-managed modules are pinned by the Expo SDK and must move together (via `expo install --fix`), so do not raise individual update PRs — group them and require manual approval from the Dependency Dashboard",
-      "matchPackageNames": [
-        "expo",
-        "react",
-        "react-dom",
-        "react-native",
-        "react-native-web",
-        "expo-*",
-        "@expo/*"
-      ],
-      "groupName": "Expo SDK",
-      "dependencyDashboardApproval": true
+  "lockFileMaintenance": {
+    "vulnerabilityAlerts": {
+      "enabled": true,
+      "addLabels": ["security", "vulnerability"],
+      "assigneesFromCodeOwners": true,
+      "commitMessageSuffix": " [SECURITY]"
    },
-    {
-      "description": "Group minor and patch GitHub Action updates into a single PR",
-      "matchManagers": ["github-actions"],
-      "groupName": "CI dependencies",
-      "groupSlug": "ci-deps",
-      "matchUpdateTypes": ["minor", "patch", "digest", "pin"],
-      "automerge": true
-    },
-    {
-      "description": "androidx and other Google-hosted Maven packages resolve from Google's Maven repository (not Maven Central)",
-      "matchDatasources": ["maven"],
-      "registryUrls": [
-        "https://dl.google.com/dl/android/maven2/",
-        "https://repo.maven.apache.org/maven2/"
-      ]
-    }
-  ]
+    "packageRules": [
+      {
+        "description": "Group minor and patch GitHub Action updates into a single PR",
+        "matchManagers": ["github-actions"],
+        "groupName": "CI dependencies",
+        "groupSlug": "ci-deps",
+        "matchUpdateTypes": ["minor", "patch", "digest", "pin"],
+        "automerge": true
+      }
+    ]
+  }
 }
--- a/.github/workflows/artifact-comment.yml
+++ b/.github/workflows/artifact-comment.yml
@@ -18,7 +18,7 @@ jobs:
  comment-artifacts:
    if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request')
    name: 📦 Post Build Artifacts
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-latest
    permissions:
      contents: read
      pull-requests: write
@@ -144,7 +144,7 @@ jobs:
              )
              .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));

-            console.log(`Found ${buildRuns.length} build workflow runs for this commit`);
+            console.log(`Found ${buildRuns.length} non-cancelled build workflow runs for this commit`);

            // Log current status of each build for debugging
            buildRuns.forEach(run => {
@@ -184,35 +184,21 @@ jobs:
            const latestAndroidRun = findBestRun('Android APK Build');
            const latestIOSRun = findBestRun('iOS IPA Build');

-            // Map our build targets to their job display names. Exact name is
-            // tried first so a signed target never collides with its
-            // "(Unsigned)" sibling (whose name contains the signed name).
-            const jobMappings = {
-              'Android Phone': ['🤖 Build Android APK (Phone)'],
-              'Android TV': ['🤖 Build Android APK (TV)'],
-              'iOS': ['🍎 Build iOS IPA (Phone)'],
-              'iOS Unsigned': ['🍎 Build iOS IPA (Phone - Unsigned)'],
-              'tvOS': ['🍎 Build tvOS IPA'],
-              'tvOS Unsigned': ['🍎 Build tvOS IPA (Unsigned)']
-            };
-
-            // Prefer an exact name match over a substring match so
-            // '...(Phone)' doesn't swallow '...(Phone - Unsigned)'.
-            const findJobForTarget = (jobs, jobNames) =>
-              jobs.find(j => jobNames.some(name => j.name === name)) ||
-              jobs.find(j => jobNames.some(name => j.name.includes(name)));
-
-            // Format a millisecond duration as "Xm Ys".
-            const fmtDuration = (ms) => {
-              const min = Math.floor(ms / 60000);
-              const sec = Math.floor((ms % 60000) / 1000);
-              return `${min}m ${sec}s`;
-            };
-
            // For the consolidated workflow, get individual job statuses
            if (latestAppsRun) {
              console.log(`Getting individual job statuses for run ${latestAppsRun.id} (status: ${latestAppsRun.status}, conclusion: ${latestAppsRun.conclusion || 'none'})`);
              
+              // Map job names to our build targets. Declared outside the try so
+              // the catch fallback can reuse the same keys.
+              const jobMappings = {
+                'Android Phone': ['🤖 Build Android APK (Phone)', 'build-android-phone'],
+                'Android TV': ['🤖 Build Android APK (TV)', 'build-android-tv'],
+                'iOS': ['🍎 Build iOS IPA (Phone)', 'build-ios-phone'],
+                'iOS Unsigned': ['🍎 Build iOS IPA (Phone - Unsigned)', 'build-ios-phone-unsigned'],
+                'tvOS': ['🍎 Build tvOS IPA', 'build-ios-tv'],
+                'tvOS Unsigned': ['🍎 Build tvOS IPA (Unsigned)', 'build-ios-tv-unsigned']
+              };
+
              try {
                // Get all jobs for this workflow run
                const { data: jobs } = await github.rest.actions.listJobsForWorkflowRun({
@@ -243,8 +229,10 @@ jobs:
                
                // Create individual status for each job
                for (const [platform, jobNames] of Object.entries(jobMappings)) {
-                  const job = findJobForTarget(jobs.jobs, jobNames);
-
+                  const job = jobs.jobs.find(j => 
+                    jobNames.some(name => j.name.includes(name) || j.name === name)
+                  );
+                  
                  if (job) {
                    buildStatuses[platform] = {
                      name: job.name,
@@ -370,43 +358,6 @@ jobs:
              console.log(`- Artifact: ${artifact.name} (from run ${artifact.workflow_run.id})`);
            });

-            // Pull per-job durations from the latest successful develop build so
-            // in-progress / queued targets can show a realistic ETA instead of
-            // an open-ended spinner. Best-effort: any failure just drops the ETA.
-            let referenceDurations = {};
-            try {
-              const { data: devRuns } = await github.rest.actions.listWorkflowRuns({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                workflow_id: 'build-apps.yml',
-                branch: 'develop',
-                status: 'success',
-                per_page: 1
-              });
-
-              if (devRuns.workflow_runs.length > 0) {
-                const refRun = devRuns.workflow_runs[0];
-                const { data: refJobs } = await github.rest.actions.listJobsForWorkflowRun({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  run_id: refRun.id
-                });
-
-                for (const [platform, jobNames] of Object.entries(jobMappings)) {
-                  const job = findJobForTarget(refJobs.jobs, jobNames);
-                  if (job && job.conclusion === 'success' && job.started_at && job.completed_at) {
-                    referenceDurations[platform] = new Date(job.completed_at) - new Date(job.started_at);
-                  }
-                }
-                console.log(`Reference durations from develop run ${refRun.id}:`,
-                  Object.fromEntries(Object.entries(referenceDurations).map(([k, v]) => [k, fmtDuration(v)])));
-              } else {
-                console.log('No successful develop build found for ETA reference');
-              }
-            } catch (error) {
-              console.log('Failed to fetch develop reference durations:', error.message);
-            }
-
            // Build comment body with progressive status for individual builds
            let commentBody = `## 🔧 Build Status for PR #${pr.number}\n\n`;
            commentBody += `🔗 **Commit**: [\`${targetCommitSha.substring(0, 7)}\`](https://github.com/${context.repo.owner}/${context.repo.repo}/commit/${targetCommitSha})\n\n`;            // Progressive build status and downloads table
@@ -418,9 +369,9 @@ jobs:
            const buildTargets = [
              { name: 'Android Phone', platform: '🤖', device: '📱 Phone', statusKey: 'Android Phone', artifactPattern: /android.*phone/i },
              { name: 'Android TV', platform: '🤖', device: '📺 TV', statusKey: 'Android TV', artifactPattern: /android.*tv/i },
-              { name: 'iOS', platform: '🍎', device: '📱 Phone', statusKey: 'iOS', artifactPattern: /^(?!.*unsigned).*ios.*phone.*ipa/i },
+              { name: 'iOS', platform: '🍎', device: '📱 Phone', statusKey: 'iOS', artifactPattern: /ios.*phone.*ipa(?!.*unsigned)/i },
              { name: 'iOS Unsigned', platform: '🍎', device: '📱 Phone Unsigned', statusKey: 'iOS Unsigned', artifactPattern: /ios.*phone.*unsigned/i },
-              { name: 'tvOS', platform: '🍎', device: '📺 TV', statusKey: 'tvOS', artifactPattern: /^(?!.*unsigned).*ios.*tv.*ipa/i },
+              { name: 'tvOS', platform: '🍎', device: '📺 TV', statusKey: 'tvOS', artifactPattern: /ios.*tv.*ipa(?!.*unsigned)/i },
              { name: 'tvOS Unsigned', platform: '🍎', device: '📺 TV Unsigned', statusKey: 'tvOS Unsigned', artifactPattern: /ios.*tv.*unsigned/i }
            ];

@@ -436,12 +387,11 @@ jobs:
              let status = '⏳ Pending';
              let downloadLink = '*Waiting for build...*';

-              // Signed tvOS stays disabled until EAS has tvOS provisioning
-              // profiles (app + TopShelf targets); non-interactive builds can't
-              // create them. Unsigned tvOS builds, so it flows through normally.
-              if (target.name === 'tvOS') {
+              // tvOS builds are temporarily disabled until feat/tv-interface
+              // is merged - show them as disabled instead of stuck pending.
+              if (target.name === 'tvOS' || target.name === 'tvOS Unsigned') {
                status = '💤 Disabled';
-                downloadLink = '*Disabled — signed tvOS needs EAS provisioning profiles*';
+                downloadLink = '*Disabled until feat/tv-interface is merged*';
              } else if (matchingStatus) {
                if (matchingStatus.conclusion === 'success' && matchingArtifact) {
                  status = '✅ Complete';
@@ -456,9 +406,11 @@ jobs:
                  let durationInfo = '';
                  if (matchingStatus.started_at && matchingStatus.completed_at) {
                    const durationMs = new Date(matchingStatus.completed_at) - new Date(matchingStatus.started_at);
-                    durationInfo = ` - ${fmtDuration(durationMs)}`;
+                    const durationMin = Math.floor(durationMs / 60000);
+                    const durationSec = Math.floor((durationMs % 60000) / 1000);
+                    durationInfo = ` - ${durationMin}m ${durationSec}s`;
                  }
-
+                  
                  downloadLink = `[📥 Download ${fileType}](${directLink}) ${sizeInfo}${durationInfo}`;
                } else if (matchingStatus.conclusion === 'failure') {
                  status = `❌ [Failed](${matchingStatus.url})`;
@@ -468,16 +420,10 @@ jobs:
                  downloadLink = '*Build cancelled*';
                } else if (matchingStatus.status === 'in_progress') {
                  status = `🔄 [Building...](${matchingStatus.url})`;
-                  const ref = referenceDurations[target.statusKey];
-                  downloadLink = ref
-                    ? `*Building… ~${fmtDuration(ref)} (avg on develop)*`
-                    : '*Build in progress...*';
+                  downloadLink = '*Build in progress...*';
                } else if (matchingStatus.status === 'queued') {
                  status = `⏳ [Queued](${matchingStatus.url})`;
-                  const ref = referenceDurations[target.statusKey];
-                  downloadLink = ref
-                    ? `*Waiting to start… ~${fmtDuration(ref)} once running (avg on develop)*`
-                    : '*Waiting to start...*';
+                  downloadLink = '*Waiting to start...*';
                } else if (matchingStatus.status === 'completed' && !matchingStatus.conclusion) {
                  // Workflow completed but conclusion not yet available (rare edge case)
                  status = `🔄 [Finishing...](${matchingStatus.url})`;
@@ -498,22 +444,7 @@ jobs:

            commentBody += `\n`;

-            // Static rundown of the build optimisations + what each artifact
-            // installs on. Always shown (even mid-build) so testers know what
-            // to expect before downloads are ready.
-            commentBody += `<details>\n`;
-            commentBody += `<summary>📦 Build details &amp; device compatibility</summary>\n\n`;
-            commentBody += `These CI builds are trimmed for size and speed. What that means for installing them:\n\n`;
-            commentBody += `| Artifact | Architectures | Installs on |\n`;
-            commentBody += `|---|---|---|\n`;
-            commentBody += `| 🤖 Android Phone APK | \`arm64-v8a\` | Every 64-bit Android phone (all since ~2017). **Not** an x86_64 emulator or a 32-bit device. |\n`;
-            commentBody += `| 📺 Android TV APK | \`arm64-v8a\` + \`armeabi-v7a\` | Modern boxes **and** older / cheap 32-bit Android TV sticks. No x86_64. |\n`;
-            commentBody += `| 🍎 iOS / tvOS IPA | \`arm64\` | iPhone / Apple TV (all current devices). |\n\n`;
-            commentBody += `**Why no x86_64?** That slice only runs on Android emulators / Chromebooks, never a real phone or TV box — dropping it shrinks the APK and speeds up the build. Local \`bun run android\` is unaffected (it still builds x86_64 from \`app.json\`).\n\n`;
-            commentBody += `**Runners:** Android on \`ubuntu-26.04\`; iOS / tvOS on Apple Silicon (\`macos-26\`). The size/speed win comes from the ABI trim above, not the runner.\n`;
-            commentBody += `</details>\n\n`;
-
-            // Installation instructions only matter once something is downloadable.
+            // Show installation instructions if we have any artifacts
            if (allArtifacts.length > 0) {
              commentBody += `### 🔧 Installation Instructions\n\n`;
              commentBody += `- **Android APK**: Download and install directly on your device (enable "Install from unknown sources")\n`;
--- a/.github/workflows/build-apps.yml
+++ b/.github/workflows/build-apps.yml
@@ -11,23 +11,13 @@ on:
  push:
    branches: [develop, master]

-# Exposed to `expo prebuild` (app.config.js → extra.build) so Settings can show the
-# branch + commit + Actions run a CI build was made from. EAS cloud builds use
-# EAS_BUILD_* instead. The run number maps a sideloaded build back to its Actions
-# run (artifacts + logs) without needing Expo access.
-env:
-  EXPO_PUBLIC_GIT_BRANCH: ${{ github.head_ref || github.ref_name }}
-  EXPO_PUBLIC_GIT_COMMIT: ${{ github.sha }}
-  EXPO_PUBLIC_GIT_RUN_NUMBER: ${{ github.run_number }}
-
 jobs:
  build-android-phone:
    if: (!contains(github.event.head_commit.message, '[skip ci]'))
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    name: 🤖 Build Android APK (Phone)
    permissions:
      contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment

    steps:
      - name: 🗑️ Free Disk Space
@@ -38,12 +28,12 @@ jobs:
          android: false
          dotnet: true
          haskell: true
-          large-packages: false
+          large-packages: true
          docker-images: true
          swap-storage: false

      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -53,58 +43,45 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-${{ runner.arch }}-bun-develop
+            ${{ runner.os }}-bun-develop

      - name: 📦 Install dependencies and reload submodules
        run: |
          bun install --frozen-lockfile
          bun run submodule-reload

-      - name: ☕ Set up JDK 17
-        # ubuntu-26.04 defaults to JDK 25, which breaks the RN/AGP native build
-        # (Kotlin falls back to JVM_23, the foojay toolchain + CMake configure
-        # fail). Pin Temurin 17 for a deterministic Android build.
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
-        with:
-          distribution: temurin
-          java-version: "17"
-
      - name: 💾 Cache Gradle global
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: |
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches
            ~/.gradle/wrapper
-          key: ${{ runner.os }}-${{ runner.arch }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-gradle-
+            ${{ runner.os }}-gradle-

      - name: 🛠️ Generate project files
        run: bun run prebuild

      - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: android/.gradle
-          key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop
+          key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-android-gradle-develop

      - name: 🚀 Build APK
        env:
          EXPO_TV: 0
-          # CI artifact ships arm64 only (phones; emulators/Chromebooks not a
-          # sideload target). Overrides app.json buildArchs for this build only,
-          # so local `bun run android` (x86_64 emulator) is unaffected.
-          ORG_GRADLE_PROJECT_reactNativeArchitectures: arm64-v8a
        run: bun run build:android:local

      - name: 📅 Set date tag
@@ -118,16 +95,12 @@ jobs:
            android/app/build/outputs/apk/release/*.apk
          retention-days: 7

-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
  build-android-tv:
    if: (!contains(github.event.head_commit.message, '[skip ci]'))
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    name: 🤖 Build Android APK (TV)
    permissions:
      contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment

    steps:
      - name: 🗑️ Free Disk Space
@@ -138,12 +111,12 @@ jobs:
          android: false
          dotnet: true
          haskell: true
-          large-packages: false
+          large-packages: true
          docker-images: true
          swap-storage: false

      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -153,57 +126,45 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-${{ runner.arch }}-bun-develop
+            ${{ runner.os }}-bun-develop

      - name: 📦 Install dependencies and reload submodules
        run: |
          bun install --frozen-lockfile
          bun run submodule-reload

-      - name: ☕ Set up JDK 17
-        # ubuntu-26.04 defaults to JDK 25, which breaks the RN/AGP native build
-        # (Kotlin falls back to JVM_23, the foojay toolchain + CMake configure
-        # fail). Pin Temurin 17 for a deterministic Android build.
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
-        with:
-          distribution: temurin
-          java-version: "17"
-
      - name: 💾 Cache Gradle global
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: |
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches
            ~/.gradle/wrapper
-          key: ${{ runner.os }}-${{ runner.arch }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-gradle-
+            ${{ runner.os }}-gradle-

      - name: 🛠️ Generate project files
        run: bun run prebuild:tv

      - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: android/.gradle
-          key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop
+          key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-android-gradle-develop

      - name: 🚀 Build APK
        env:
          EXPO_TV: 1
-          # TV artifact keeps armeabi-v7a too: many older/cheap Android TV boxes
-          # and sticks are still 32-bit ARM. Drops only x86_64. CI build only.
-          ORG_GRADLE_PROJECT_reactNativeArchitectures: arm64-v8a,armeabi-v7a
        run: bun run build:android:local

      - name: 📅 Set date tag
@@ -217,20 +178,16 @@ jobs:
            android/app/build/outputs/apk/release/*.apk
          retention-days: 7

-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
  build-ios-phone:
    if: (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'))
    runs-on: macos-26
    name: 🍎 Build iOS IPA (Phone)
    permissions:
      contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment

    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -240,16 +197,15 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache

      - name: 📦 Install dependencies and reload submodules
        run: |
@@ -263,10 +219,10 @@ jobs:
        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
        with:
          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.5"
+          xcode-version: "26.4"

      - name: 🏗️ Setup EAS
-        uses: expo/expo-github-action@eab7a230208c952974db8c3245cfd78402c7b385 # main
+        uses: expo/expo-github-action@b184ff86a3c926240f1b6db41764c83a01c02eef # main
        with:
          eas-version: latest
          token: ${{ secrets.EXPO_TOKEN }}
@@ -275,9 +231,7 @@ jobs:
      - name: 🚀 Build iOS app
        env:
          EXPO_TV: 0
-        # `ci` profile (extends production, autoIncrement off): keeps CI builds out of
-        # the production version tier and stops them inflating the store build counter.
-        run: eas build -p ios --local --non-interactive --profile ci
+        run: eas build -p ios --local --non-interactive

      - name: 📅 Set date tag
        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
@@ -289,20 +243,16 @@ jobs:
          path: build-*.ipa
          retention-days: 7

-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
  build-ios-phone-unsigned:
    if: (!contains(github.event.head_commit.message, '[skip ci]'))
    runs-on: macos-26
    name: 🍎 Build iOS IPA (Phone - Unsigned)
    permissions:
      contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment

    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -312,16 +262,15 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache

      - name: 📦 Install dependencies and reload submodules
        run: |
@@ -335,7 +284,7 @@ jobs:
        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
        with:
          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.5"
+          xcode-version: "26.4"

      - name: 🚀 Build iOS app
        env:
@@ -352,24 +301,18 @@ jobs:
          path: build/*.ipa
          retention-days: 7

-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
  build-ios-tv:
-    # Disabled: EAS has no provisioning profiles / distribution cert for the tvOS
-    # targets (app + StreamyfinTopShelf extension), so non-interactive signed
-    # builds fail. Set up tvOS credentials in EAS (`eas credentials`), then remove
-    # the `false &&` prefix below. Unsigned tvOS builds run (see job below).
+    # Temporarily disabled until feat/tv-interface is merged (TV UI not ready).
+    # Re-enable by removing the `false &&` prefix below.
    if: false && (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'))
    runs-on: macos-26
    name: 🍎 Build tvOS IPA
    permissions:
      contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment

    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -379,16 +322,15 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache

      - name: 📦 Install dependencies and reload submodules
        run: |
@@ -402,10 +344,10 @@ jobs:
        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
        with:
          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.5"
+          xcode-version: "26.4"

      - name: 🏗️ Setup EAS
-        uses: expo/expo-github-action@eab7a230208c952974db8c3245cfd78402c7b385 # main
+        uses: expo/expo-github-action@b184ff86a3c926240f1b6db41764c83a01c02eef # main
        with:
          eas-version: latest
          token: ${{ secrets.EXPO_TOKEN }}
@@ -414,7 +356,7 @@ jobs:
      - name: 🚀 Build iOS app
        env:
          EXPO_TV: 1
-        run: eas build -p ios --local --non-interactive --profile ci_tv
+        run: eas build -p ios --local --non-interactive

      - name: 📅 Set date tag
        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
@@ -435,11 +377,10 @@ jobs:
    name: 🍎 Build tvOS IPA (Unsigned)
    permissions:
      contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment

    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -449,16 +390,15 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache

      - name: 📦 Install dependencies and reload submodules
        run: |
@@ -472,7 +412,7 @@ jobs:
        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
        with:
          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.5"
+          xcode-version: "26.4"

      - name: 🚀 Build iOS app
        env:
@@ -488,6 +428,3 @@ jobs:
          name: streamyfin-ios-tv-unsigned-ipa-${{ env.DATE_TAG }}
          path: build/*.ipa
          retention-days: 7
-
-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
--- a/.github/workflows/check-lockfile.yml
+++ b/.github/workflows/check-lockfile.yml
@@ -13,13 +13,13 @@ concurrency:
 jobs:
  check-lockfile:
    name: 🔍 Check bun.lock and package.json consistency
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    permissions:
      contents: read

    steps:
      - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          show-progress: false
@@ -29,17 +29,14 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: |
            ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}

      - name: 🛡️ Verify lockfile consistency
        run: |
--- a/.github/workflows/ci-codeql.yml
+++ b/.github/workflows/ci-codeql.yml
@@ -8,14 +8,11 @@ on:
  schedule:
    - cron: '24 2 * * *'

-concurrency:
-  group: codeql-${{ github.ref }}
-  cancel-in-progress: true

 jobs:
  analyze:
    name: 🔎 Analyze with CodeQL
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    permissions:
      contents: read
      security-events: write
@@ -27,16 +24,16 @@ jobs:

    steps:
      - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: 🏁 Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
        with:
          languages: ${{ matrix.language }}
          queries: +security-extended,security-and-quality

      - name: 🛠️ Autobuild
-        uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0

      - name: 🧪 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
--- a/.github/workflows/conflict.yml
+++ b/.github/workflows/conflict.yml
@@ -10,14 +10,14 @@ on:
 jobs:
  label:
    name: 🏷️ Labeling Merge Conflicts
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    if: ${{ github.repository == 'streamyfin/streamyfin' }}
    permissions:
      contents: read
      pull-requests: write
    steps:
      - name: 🚩 Apply merge conflict label
-        uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
+        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
        with:
          dirtyLabel: '⚔️ merge-conflict'
          commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -1,51 +1,51 @@
-name: 🌐 Translation Sync
-
-on:
-  push:
-    branches: [develop]
-    paths:
-      - "translations/**"
-      - "crowdin.yml"
-      - "i18n.ts"
-      - ".github/workflows/crowdin.yml"
-  # Run weekly to pull new translations
-  schedule:
-    - cron: "0 2 * * 1" # Every Monday at 2 AM UTC
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  sync-translations:
-    runs-on: ubuntu-26.04
-
-    steps:
-      - name: 📥 Checkout Repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          fetch-depth: 0
-
-      - name: 🌐 Sync Translations with Crowdin
-        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2.16.3
-        with:
-          upload_sources: true
-          upload_translations: true
-          download_translations: true
-          localization_branch_name: I10n_crowdin_translations
-          create_pull_request: true
-          pull_request_title: "feat: New Crowdin Translations"
-          pull_request_body: "New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)"
-          pull_request_base_branch_name: "develop"
-          pull_request_labels: "🌐 translation"
-          # Quality control options
-          skip_untranslated_strings: false
-          skip_untranslated_files: false
-          export_only_approved: false
-          # Commit customization
-          commit_message: "feat(i18n): update translations from Crowdin"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+name: 🌐 Translation Sync
+
+on:
+  push:
+    branches: [develop]
+    paths:
+      - "translations/**"
+      - "crowdin.yml"
+      - "i18n.ts"
+      - ".github/workflows/crowdin.yml"
+  # Run weekly to pull new translations
+  schedule:
+    - cron: "0 2 * * 1" # Every Monday at 2 AM UTC
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  sync-translations:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 📥 Checkout Repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+
+      - name: 🌐 Sync Translations with Crowdin
+        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
+        with:
+          upload_sources: true
+          upload_translations: true
+          download_translations: true
+          localization_branch_name: I10n_crowdin_translations
+          create_pull_request: true
+          pull_request_title: "feat: New Crowdin Translations"
+          pull_request_body: "New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)"
+          pull_request_base_branch_name: "develop"
+          pull_request_labels: "🌐 translation"
+          # Quality control options
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
+          export_only_approved: false
+          # Commit customization
+          commit_message: "feat(i18n): update translations from Crowdin"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/detect-duplicate.yml
+++ b/.github/workflows/detect-duplicate.yml
@@ -15,19 +15,18 @@ jobs:
  detect:
    name: 🔍 Find similar issues
    if: github.actor != 'github-actions[bot]'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    permissions:
      issues: write
      contents: read
    steps:
      - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 🔍 Detect duplicate issues
        run: bun scripts/detect-duplicate-issue.mjs
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -15,7 +15,7 @@ jobs:
  validate_pr_title:
    name: "📝 Validate PR Title"
    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    permissions:
      pull-requests: write
      contents: read
@@ -46,12 +46,12 @@ jobs:

  dependency-review:
    name: 🔍 Vulnerable Dependencies
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    permissions:
      contents: read
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -65,10 +65,11 @@ jobs:

  expo-doctor:
    name: 🚑 Expo Doctor Check
-    runs-on: ubuntu-26.04
+    if: false
+    runs-on: ubuntu-24.04
    steps:
      - name: 🛒 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          submodules: recursive
@@ -77,21 +78,17 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 📦 Install dependencies (bun)
        run: bun install --frozen-lockfile

      - name: 🚑 Run Expo Doctor
-        # Re-enabled but non-blocking: surfaces doctor warnings in the logs
-        # without failing the gate (some checks are known-noisy for this setup).
-        continue-on-error: true
        run: bun expo-doctor

  code_quality:
    name: "🔍 Lint & Test (${{ matrix.command }})"
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    strategy:
      fail-fast: false
      matrix:
@@ -100,11 +97,10 @@ jobs:
          - "check"
          - "format"
          - "typecheck"
-          - "i18n:check"

    steps:
      - name: "📥 Checkout PR code"
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          submodules: recursive
@@ -113,14 +109,12 @@ jobs:
      - name: "🟢 Setup Node.js"
        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
-          # renovate: datasource=node-version depName=node versioning=node
-          node-version: "24.18.0"
+          node-version: '24.x'

      - name: "🍞 Setup Bun"
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: "📦 Install dependencies"
        run: bun install --frozen-lockfile
--- a/.github/workflows/notification.yml
+++ b/.github/workflows/notification.yml
@@ -12,7 +12,7 @@ on:

 jobs:
  notify:
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    if: github.event_name == 'pull_request'
    steps:
      - name: 🛎️ Notify Discord
@@ -29,7 +29,7 @@ jobs:
            🔗 ${{ github.event.pull_request.html_url }}

  notify-on-failure:
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure'
    steps:
      - name: 🚨 Notify Discord on Failure
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,9 +22,8 @@ on:
 jobs:
  approve:
    name: 🔐 Approve release
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    environment: production
-    permissions: {}
    steps:
      - name: ✅ Release approved
        run: echo "Release approved for ${{ github.sha }}"
@@ -32,7 +31,7 @@ jobs:
  build:
    name: 🚀 ${{ matrix.name }}
    needs: approve
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    permissions:
      contents: read
    strategy:
@@ -64,7 +63,7 @@ jobs:

    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          fetch-depth: 0
          submodules: recursive
@@ -73,16 +72,15 @@ jobs:
      - name: 🍞 Setup Bun
        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache

      - name: 📦 Install dependencies and reload submodules
        run: |
@@ -90,7 +88,7 @@ jobs:
          bun run submodule-reload

      - name: 🏗️ Setup EAS
-        uses: expo/expo-github-action@eab7a230208c952974db8c3245cfd78402c7b385 # main
+        uses: expo/expo-github-action@b184ff86a3c926240f1b6db41764c83a01c02eef # main
        with:
          eas-version: latest
          token: ${{ secrets.EXPO_TOKEN }}
@@ -178,13 +176,13 @@ jobs:
    name: 📦 Draft GitHub Release
    needs: build
    if: ${{ !cancelled() }}
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
    permissions:
      contents: write
      actions: read # required for `gh run download` to list/fetch this run's artifacts
    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          fetch-depth: 0
          show-progress: false
--- a/.github/workflows/trivy-scan.yml
+++ b/.github/workflows/trivy-scan.yml
@@ -1,50 +0,0 @@
-name: 🛡️ Trivy Security Scan
-
-# Filesystem scan (Streamyfin ships no container image): finds vulnerable dependencies,
-# leaked secrets and misconfigurations, and reports them to GitHub code scanning.
-# Runs post-merge + weekly (not on PRs — dependency-review already gates PRs, and SARIF
-# upload needs a write token that fork PRs don't get).
-on:
-  push:
-    branches: [develop, master]
-  schedule:
-    - cron: "50 7 * * 5" # Weekly, Friday 07:50 UTC
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: trivy-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  trivy:
-    name: 🔎 Filesystem scan
-    runs-on: ubuntu-26.04
-    permissions:
-      contents: read
-      security-events: write # upload SARIF to code scanning
-    steps:
-      - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-
-      # Trivy's own action caches the vulnerability DB + binary internally
-      # (cache-trivy-* / trivy-binary-* entries), so no manual ~/.cache/trivy
-      # step is needed — it only duplicated the cache.
-      - name: 🔎 Run Trivy filesystem scan
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
-        with:
-          scan-type: fs
-          scan-ref: .
-          scanners: vuln,secret,misconfig
-          ignore-unfixed: true
-          severity: CRITICAL,HIGH
-          format: sarif
-          output: trivy-results.sarif
-
-      - name: 📤 Upload results to code scanning
-        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
-        with:
-          sarif_file: trivy-results.sarif
-          category: trivy-fs
--- a/.github/workflows/update-issue-form.yml
+++ b/.github/workflows/update-issue-form.yml
@@ -1,103 +1,67 @@
-name: 🐛 Update Issue Form Versions
+name: 🐛 Update Bug Report Template

 on:
  release:
-    # Only full releases populate the dropdown (no drafts/prereleases).
-    types: [released]
-  schedule:
-    - cron: "0 3 * * 1" # Weekly safety net (Mondays 03:00 UTC) in case a release event was missed
-  workflow_dispatch:
+    types: [published]  # Run on every published release on any branch

-# Fixed group so a release event and the weekly cron can't race on the same
-# ci/update-issue-form branch — runs queue instead of force-pushing over each other.
 concurrency:
-  group: update-issue-form
-  cancel-in-progress: false
-
-permissions:
-  contents: read
+   group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
+   cancel-in-progress: true

 jobs:
-  update-issue-form:
-    name: 🔢 Populate version dropdown
-    runs-on: ubuntu-26.04
+  update-bug-report:
    permissions:
      contents: write
      pull-requests: write
+      issues: write
+    runs-on: ubuntu-24.04
+
    steps:
      - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: "🟢 Setup Node.js"
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
-          # On `release` events GITHUB_SHA is the tagged commit — without this the
-          # script would regenerate the form from the tag's (stale) copy and the bot
-          # PR would revert any form edits made on develop since that release.
-          ref: develop
+          node-version: '24.x'
+          cache: 'npm'

-      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+      - name: 🔍 Extract minor version from app.json
+        id: minor
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # main
        with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          result-encoding: string
+          script: |
+            const fs = require('fs-extra');
+            const semver = require('semver');
+            const content = fs.readJsonSync('./app.json');
+            const version = content.expo.version;
+            const minorVersion = semver.minor(version);
+            return minorVersion.toString();

-      - name: 🔢 Populate version dropdown from GitHub releases
-        id: populate
-        run: bun scripts/update-issue-form.mjs
-        env:
-          GH_TOKEN: ${{ github.token }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
+      - name: 📝 Update bug report version
+        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
+        with:
+          semver: '^0.${{ steps.minor.outputs.result }}.0'
+          dry_run: no-push

-      - name: 📬 Create pull request
-        id: cpr
+      - name: ⚙️ Update bug report node version dropdown
+        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
+        with:
+          dropdown: _node_version
+          package: node
+          semver: '>=24.0.0'
+          dry_run: no-push
+
+      - name: 📬 Commit and create pull request
        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
        with:
-          add-paths: .github/ISSUE_TEMPLATE/issue_report.yml
-          branch: ci/update-issue-form
+          add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
+          branch: ci-update-bug-report
          base: develop
          delete-branch: true
          labels: ⚙️ ci, 🤖 github-actions
-          commit-message: "chore: update issue form version dropdown"
-          title: "chore: update issue form version dropdown"
-          # Follows .github/pull_request_template.md so the bot PR isn't flagged by PR validation.
+          title: 'chore(): Update bug report template to match release version'
          body: |
-            # 📦 Pull Request
-
-            ## 📝 Description
-
-            Automated update of the **Streamyfin Version** dropdown in `.github/ISSUE_TEMPLATE/issue_report.yml`, populated from the latest published GitHub releases by `scripts/update-issue-form.mjs`.
-
-            **Version dropdown now lists:** ${{ steps.populate.outputs.versions }}
-
-            Triggered by `${{ github.event_name }}`${{ github.event.release.tag_name && format(' — release {0}', github.event.release.tag_name) || '' }} · [run ${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
-
-            ## 🏷️ Ticket / Issue
-
-            N/A — automated maintenance.
-
-            ### 🖼️ Screenshots / GIFs (if UI)
-
-            N/A — issue-template metadata only, no app UI.
-
-            ## ✅ Checklist
-
-            - [x] I’ve read the [contribution guidelines](CONTRIBUTING.md)
-            - [x] Verified that changes behave as expected for all platforms
-            - [x] Code passes lint/formatting and type checks (`tsc`/`biome`)
-            - [x] No secrets, hardcoded credentials, or private config files are included
-            - [x] I've declared if AI was used to assist with this PR (by uncommenting the line at the bottom, or not)
-
-            ## 🔍 Testing Instructions
-
-            N/A — generated by CI from published releases; review the dropdown diff in `issue_report.yml`.
-
-      - name: 🔀 Enable auto-merge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        env:
-          GH_TOKEN: ${{ github.token }}
-        # Known limitation: PRs created with GITHUB_TOKEN don't trigger CI workflows
-        # (GitHub anti-recursion), so the required checks stay "Expected" until a
-        # maintainer kicks them (close/reopen the PR, or push an empty commit).
-        # Auto-merge is still worth enabling: once checks run and reviews land,
-        # the PR merges itself.
-        run: |
-          gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" \
-            || echo "::warning::Could not enable auto-merge — enable 'Allow auto-merge' in repo settings (and branch protection); merge the PR manually for now."
+            Automated update to `.github/ISSUE_TEMPLATE/bug_report.yml`
+            Triggered by workflow run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Dependencies and Package Managers
 node_modules/
+bun.lock
 bun.lockb
 package-lock.json

@@ -20,8 +21,10 @@ web-build/
 # Gradle caches (top-level + per-module native projects)
 **/.gradle/

-# Native module build outputs (any module)
-modules/*/android/build/
+# Module-specific Builds
+modules/mpv-player/android/build
+modules/player/android
+modules/hls-downloader/android/build

 # Generated Applications
 Streamyfin.app
@@ -66,6 +69,10 @@ certs/

 # Version and Backup Files
 /version-backup-*
+/modules/sf-player/android/build
+/modules/music-controls/android/build
+modules/background-downloader/android/build/*
+/modules/mpv-player/android/build

 # ios:unsigned-build Artifacts
 build/
--- a/GLOBAL_MODAL_GUIDE.md
+++ b/GLOBAL_MODAL_GUIDE.md
@@ -143,6 +143,14 @@ interface ModalOptions {
 }
 ```

+## Examples
+
+See `components/ExampleGlobalModalUsage.tsx` for comprehensive examples including:
+- Simple content modal
+- Modal with custom snap points
+- Complex component in modal
+- Success/error modals triggered from functions
+
 ## Default Styling

 The modal uses these default styles (can be overridden via options):
--- 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/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.
+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.

 ## 📥 Download Streamyfin

--- a/app.config.js
+++ b/app.config.js
@@ -1,47 +1,3 @@
-const { execFileSync } = require("node:child_process");
-
-// Build metadata, injected into `extra.build` and read at runtime via
-// expo-constants (see utils/version.ts). Sources in priority order:
-// EAS cloud build → GitHub Actions → explicit EXPO_PUBLIC_* → local git → null.
-const git = (args) => {
-  try {
-    return execFileSync("git", args, { stdio: ["ignore", "pipe", "ignore"] })
-      .toString()
-      .trim();
-  } catch {
-    return null;
-  }
-};
-
-const buildMeta = {
-  commit:
-    (
-      process.env.EAS_BUILD_GIT_COMMIT_HASH ||
-      process.env.GITHUB_SHA ||
-      process.env.EXPO_PUBLIC_GIT_COMMIT ||
-      git(["rev-parse", "HEAD"]) ||
-      ""
-    ).slice(0, 7) || null,
-  branch:
-    process.env.EAS_BUILD_GIT_BRANCH ||
-    process.env.GITHUB_HEAD_REF ||
-    process.env.GITHUB_REF_NAME ||
-    process.env.EXPO_PUBLIC_GIT_BRANCH ||
-    git(["rev-parse", "--abbrev-ref", "HEAD"]) ||
-    null,
-  profile:
-    process.env.EAS_BUILD_PROFILE ||
-    process.env.EXPO_PUBLIC_BUILD_PROFILE ||
-    null,
-  // GitHub Actions run number (#2098) — lets anyone map a sideloaded CI build back
-  // to its Actions run (artifacts + logs) without Expo access. Null outside CI.
-  runNumber:
-    process.env.GITHUB_RUN_NUMBER ||
-    process.env.EXPO_PUBLIC_GIT_RUN_NUMBER ||
-    null,
-  builtAt: new Date().toISOString(),
-};
-
 module.exports = ({ config }) => {
  if (process.env.EXPO_TV !== "1") {
    config.plugins.push("expo-background-task");
@@ -66,8 +22,6 @@ module.exports = ({ config }) => {
    androidConfig.googleServicesFile = process.env.GOOGLE_SERVICES_JSON;
  }

-  config.extra = { ...config.extra, build: buildMeta };
-
  return {
    ...(Object.keys(androidConfig).length > 0 && { android: androidConfig }),
    ...config,
--- a/app.json
+++ b/app.json
@@ -107,9 +107,6 @@
      ],
      "expo-localization",
      "expo-asset",
-      "expo-audio",
-      "expo-image",
-      "expo-sharing",
      [
        "react-native-edge-to-edge",
        {
--- a/app/(auth)/(tabs)/(favorites)/see-all.tsx
+++ b/app/(auth)/(tabs)/(favorites)/see-all.tsx
@@ -161,7 +161,9 @@ export default function FavoritesSeeAllScreen() {
      />
      {!itemType ? (
        <View className='flex-1 items-center justify-center px-6'>
-          <Text className='text-neutral-500'>{t("favorites.noData")}</Text>
+          <Text className='text-neutral-500'>
+            {t("favorites.noData", { defaultValue: "No items found." })}
+          </Text>
        </View>
      ) : isLoading ? (
        <View className='justify-center items-center h-full'>
@@ -192,7 +194,7 @@ export default function FavoritesSeeAllScreen() {
          ListEmptyComponent={
            <View className='flex flex-col items-center justify-center h-full py-12'>
              <Text className='font-bold text-xl text-neutral-500'>
-                {t("home.no_items")}
+                {t("home.no_items", { defaultValue: "No items" })}
              </Text>
            </View>
          }
--- a/app/(auth)/(tabs)/(home)/downloads/index.tsx
+++ b/app/(auth)/(tabs)/(home)/downloads/index.tsx
@@ -137,12 +137,12 @@ export default function DownloadsPage() {
    deleteFileByType("Episode")
      .then(() =>
        toast.success(
-          t("home.downloads.toasts.deleted_all_series_successfully"),
+          t("home.downloads.toasts.deleted_all_tvseries_successfully"),
        ),
      )
      .catch((reason) => {
        writeToLog("ERROR", reason);
-        toast.error(t("home.downloads.toasts.failed_to_delete_all_series"));
+        toast.error(t("home.downloads.toasts.failed_to_delete_all_tvseries"));
      });
  const deleteOtherMedia = () =>
    Promise.all(
@@ -207,7 +207,7 @@ export default function DownloadsPage() {
            <View className='mb-4'>
              <View className='flex flex-row items-center justify-between mb-2 px-4'>
                <Text className='text-lg font-bold'>
-                  {t("home.downloads.series")}
+                  {t("home.downloads.tvseries")}
                </Text>
                <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
                  <Text className='text-xs font-bold'>
@@ -288,7 +288,7 @@ export default function DownloadsPage() {
              {t("home.downloads.delete_all_movies_button")}
            </Button>
            <Button color='purple' onPress={deleteShows}>
-              {t("home.downloads.delete_all_series_button")}
+              {t("home.downloads.delete_all_tvseries_button")}
            </Button>
            {otherMedia.length > 0 && (
              <Button color='purple' onPress={deleteOtherMedia}>
--- a/app/(auth)/(tabs)/(home)/settings.tv.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tv.tsx
@@ -1,13 +1,12 @@
 import { SubtitlePlaybackMode } from "@jellyfin/sdk/lib/generated-client";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useQueryClient } from "@tanstack/react-query";
 import { Directory, Paths } from "expo-file-system";
 import { Image } from "expo-image";
 import { useAtom } from "jotai";
-import { useCallback, useMemo, useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, 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 { TVPasswordEntryModal } from "@/components/login/TVPasswordEntryModal";
 import { TVPINEntryModal } from "@/components/login/TVPINEntryModal";
@@ -22,7 +21,6 @@ import {
  TVSettingsToggle,
 } from "@/components/tv";
 import { useScaledTVTypography } from "@/constants/TVTypography";
-import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import { useTVUserSwitchModal } from "@/hooks/useTVUserSwitchModal";
 import { APP_LANGUAGES } from "@/i18n";
@@ -52,7 +50,7 @@ import { clearTopShelfCacheSafely } from "@/utils/topshelf/cache";
 export default function SettingsTV() {
  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
-  const { settings, updateSettings, pluginSettings } = useSettings();
+  const { settings, updateSettings } = useSettings();
  const { logout, loginWithSavedCredential, loginWithPassword } = useJellyfin();
  const [user] = useAtom(userAtom);
  const [api] = useAtom(apiAtom);
@@ -61,51 +59,6 @@ export default function SettingsTV() {
  const { showUserSwitchModal } = useTVUserSwitchModal();
  const typography = useScaledTVTypography();
  const queryClient = useQueryClient();
-  const { jellyseerrApi, setJellyseerrUser, clearAllJellyseerData } =
-    useJellyseerr();
-
-  // Jellyseerr connection state
-  const [jellyseerrServerUrl, setJellyseerrServerUrl] = useState(
-    settings.jellyseerrServerUrl || "",
-  );
-  const [jellyseerrPassword, setJellyseerrPassword] = useState("");
-
-  const isJellyseerrLocked =
-    pluginSettings?.jellyseerrServerUrl?.locked === true;
-  const isJellyseerrConnected = !!jellyseerrApi;
-
-  const handleJellyseerrUrlBlur = useCallback(() => {
-    const url = jellyseerrServerUrl.trim();
-    updateSettings({ jellyseerrServerUrl: url || undefined });
-  }, [jellyseerrServerUrl, updateSettings]);
-
-  const jellyseerrLoginMutation = useMutation({
-    mutationFn: async () => {
-      const url = jellyseerrServerUrl.trim();
-      if (!url) throw new Error("Missing server url");
-      if (!user?.Name) throw new Error("Missing user info");
-      const tempApi = new JellyseerrApi(url);
-      const testResult = await tempApi.test();
-      if (!testResult.isValid) throw new Error("Invalid server url");
-      return tempApi.login(user.Name, jellyseerrPassword);
-    },
-    onSuccess: (loggedInUser) => {
-      setJellyseerrUser(loggedInUser);
-      updateSettings({ jellyseerrServerUrl: jellyseerrServerUrl.trim() });
-    },
-    onError: () => {
-      toast.error(t("jellyseerr.failed_to_login"));
-    },
-    onSettled: () => {
-      setJellyseerrPassword("");
-    },
-  });
-
-  const handleDisconnectJellyseerr = useCallback(() => {
-    clearAllJellyseerData();
-    setJellyseerrServerUrl("");
-    setJellyseerrPassword("");
-  }, [clearAllJellyseerData]);

  // Local state for OpenSubtitles API key (only commit on blur)
  const [openSubtitlesApiKey, setOpenSubtitlesApiKey] = useState(
@@ -226,15 +179,18 @@ export default function SettingsTV() {
  // Handle clearing all cache in the entire app
  const handleClearCache = async () => {
    Alert.alert(
-      t("home.settings.storage.clear_all_cache_confirm"),
-      t("home.settings.storage.clear_all_cache_confirm_desc"),
+      t("home.settings.storage.clear_all_cache_confirm", "Clear All Cache?"),
+      t(
+        "home.settings.storage.clear_all_cache_confirm_desc",
+        "Are you sure you want to clear all cached data? This will clear all cached images, music files, subtitles, and query caches. Your settings and login session will be kept.",
+      ),
      [
        {
-          text: t("common.cancel"),
+          text: t("common.cancel", "Cancel"),
          style: "cancel",
        },
        {
-          text: t("common.ok"),
+          text: t("common.ok", "OK"),
          onPress: async () => {
            try {
              // 1. Clear React Query Cache (memory & MMKV)
@@ -287,8 +243,11 @@ export default function SettingsTV() {
            } catch (error) {
              console.error("Failed to clear cache:", error);
              Alert.alert(
-                t("home.settings.toasts.error_deleting_files"),
-                t("home.settings.storage.clear_all_cache_error_desc"),
+                t("home.settings.toasts.error_deleting_files", "Error"),
+                t(
+                  "home.settings.storage.clear_all_cache_error_desc",
+                  "An error occurred while clearing the cache.",
+                ),
              );
            }
          },
@@ -924,72 +883,6 @@ export default function SettingsTV() {
            onToggle={(value) => updateSettings({ tvThemeMusicEnabled: value })}
          />

-          {/* seerr Section */}
-          <TVSectionHeader title='seerr' />
-          <Text
-            style={{
-              color: "#9CA3AF",
-              fontSize: typography.callout - 2,
-              marginBottom: 16,
-              marginLeft: 8,
-            }}
-          >
-            {t("home.settings.plugins.jellyseerr.server_url_hint")}
-          </Text>
-          <TVSettingsTextInput
-            label={t("home.settings.plugins.jellyseerr.server_url")}
-            value={jellyseerrServerUrl}
-            placeholder={t(
-              "home.settings.plugins.jellyseerr.server_url_placeholder",
-            )}
-            onChangeText={setJellyseerrServerUrl}
-            onBlur={handleJellyseerrUrlBlur}
-            disabled={isJellyseerrLocked || jellyseerrLoginMutation.isPending}
-          />
-          {!isJellyseerrConnected && !isJellyseerrLocked && (
-            <>
-              <TVSettingsTextInput
-                label={t("home.settings.plugins.jellyseerr.password")}
-                value={jellyseerrPassword}
-                placeholder={t(
-                  "home.settings.plugins.jellyseerr.password_placeholder",
-                  { username: user?.Name },
-                )}
-                onChangeText={setJellyseerrPassword}
-                secureTextEntry
-                disabled={jellyseerrLoginMutation.isPending}
-              />
-              <TVSettingsOptionButton
-                label={
-                  jellyseerrLoginMutation.isPending
-                    ? t("common.connecting")
-                    : t("common.connect")
-                }
-                value=''
-                onPress={() => jellyseerrLoginMutation.mutate()}
-                disabled={jellyseerrLoginMutation.isPending}
-              />
-            </>
-          )}
-          <TVSettingsRow
-            label={
-              isJellyseerrConnected
-                ? t("common.connected")
-                : t("common.not_connected")
-            }
-            value=''
-            showChevron={false}
-          />
-          {isJellyseerrConnected && !isJellyseerrLocked && (
-            <TVSettingsOptionButton
-              label={t(
-                "home.settings.plugins.jellyseerr.reset_jellyseerr_config_button",
-              )}
-              value=''
-              onPress={handleDisconnectJellyseerr}
-            />
-          )}
-
          {/* Storage Section */}
          <TVSectionHeader title={t("home.settings.storage.storage_title")} />
          <TVSettingsOptionButton
--- a/app/(auth)/(tabs)/(search)/index.tsx
+++ b/app/(auth)/(tabs)/(search)/index.tsx
@@ -7,12 +7,7 @@ import { useAsyncDebouncer } from "@tanstack/react-pacer";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
 import { Image } from "expo-image";
-import {
-  useIsFocused,
-  useLocalSearchParams,
-  useNavigation,
-  useSegments,
-} from "expo-router";
+import { useLocalSearchParams, useNavigation, useSegments } from "expo-router";
 import { useAtom } from "jotai";
 import { orderBy, uniqBy } from "lodash";
 import {
@@ -25,13 +20,7 @@ import {
  useState,
 } from "react";
 import { useTranslation } from "react-i18next";
-import {
-  Alert,
-  Platform,
-  ScrollView,
-  TouchableOpacity,
-  View,
-} from "react-native";
+import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
 import { Text } from "@/components/common/Text";
@@ -52,10 +41,7 @@ import { SearchItemWrapper } from "@/components/search/SearchItemWrapper";
 import { SearchTabButtons } from "@/components/search/SearchTabButtons";
 import { TVSearchPage } from "@/components/search/TVSearchPage";
 import useRouter from "@/hooks/useAppRouter";
-import {
-  useJellyseerr,
-  validateJellyseerrSession,
-} from "@/hooks/useJellyseerr";
+import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
@@ -120,40 +106,8 @@ export default function SearchPage() {

  const [api] = useAtom(apiAtom);

-  const isFocused = useIsFocused();
  const { settings } = useSettings();
  const { jellyseerrApi } = useJellyseerr();
-
-  // Prompt the user to connect when a Jellyseerr server is configured but no
-  // session exists yet (only once per focus, and only while the tab is focused).
-  const jellyseerrAlertedRef = useRef(false);
-  useEffect(() => {
-    if (!isFocused || !settings?.jellyseerrServerUrl || jellyseerrApi) return;
-    if (jellyseerrAlertedRef.current) return;
-    jellyseerrAlertedRef.current = true;
-    Alert.alert(
-      t("jellyseerr.connect_to_jellyseerr"),
-      t("jellyseerr.connect_in_settings"),
-    );
-  }, [isFocused, settings?.jellyseerrServerUrl, jellyseerrApi, t]);
-
-  // Validate the Jellyseerr session when switching to Discover; warn if expired.
-  useEffect(() => {
-    if (
-      searchType !== "Discover" ||
-      !jellyseerrApi ||
-      !settings?.jellyseerrServerUrl
-    )
-      return;
-    validateJellyseerrSession(settings.jellyseerrServerUrl).then((status) => {
-      if (status.valid) return;
-      Alert.alert(
-        t("jellyseerr.session_expired"),
-        t("jellyseerr.session_expired_connect_again"),
-      );
-    });
-  }, [searchType, jellyseerrApi, settings?.jellyseerrServerUrl, t]);
-
  const [jellyseerrOrderBy, setJellyseerrOrderBy] =
    useState<JellyseerrSearchSort>(
      JellyseerrSearchSort[
@@ -351,8 +305,6 @@ export default function SearchPage() {
        },
        hideWhenScrolling: false,
        autoFocus: false,
-        // Android: color of the user-typed text (was dark and unreadable on the dark header)
-        textColor: "#fff",
        // Android: placeholder and icon color
        hintTextColor: "#fff",
        headerIconColor: "#fff",
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -3,24 +3,16 @@ import {
  type NativeBottomTabNavigationEventMap,
  type NativeBottomTabNavigationOptions,
 } from "@bottom-tabs/react-navigation";
-import { Stack, useSegments, withLayoutContext } from "expo-router";
+import { 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 useRouter from "@/hooks/useAppRouter";
-import {
-  isTabRoute,
-  useTVHomeBackHandler,
-  useTVTabRootBackHandler,
-} from "@/hooks/useTVBackHandler";
+import { useTVHomeBackHandler } from "@/hooks/useTVBackHandler";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";

@@ -41,108 +33,13 @@ 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();

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

-  if (IS_ANDROID_TV) {
-    return <TVTabLayout />;
-  }
-
  return (
    <View style={{ flex: 1 }}>
      <SystemBars hidden={false} style='light' />
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -456,23 +456,10 @@ export default function DirectPlayerPage() {
    });
    reportPlaybackStopped();
    setIsPlaybackStopped(true);
-    // 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();
+    videoRef.current?.pause();
    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(() => {
@@ -1118,15 +1105,6 @@ 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,
@@ -1137,7 +1115,6 @@ export default function DirectPlayerPage() {
    bitrateValue,
    router,
    isPlaybackStopped,
-    videoRef,
  ]);

  // Apply subtitle settings when video loads
--- a/app/(auth)/tv-option-modal.tsx
+++ b/app/(auth)/tv-option-modal.tsx
@@ -11,10 +11,7 @@ import {
 } from "react-native";
 import { Text } from "@/components/common/Text";
 import { TVOptionCard } from "@/components/tv";
-import {
-  useScaledTVTypography,
-  useTVRelativeScale,
-} from "@/constants/TVTypography";
+import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useTVBackPress } from "@/hooks/useTVBackPress";
 import { tvOptionModalAtom } from "@/utils/atoms/tvOptionModal";
@@ -25,7 +22,6 @@ export default function TVOptionModal() {
  const router = useRouter();
  const modalState = useAtomValue(tvOptionModalAtom);
  const typography = useScaledTVTypography();
-  const relativeScale = useTVRelativeScale();

  const [isReady, setIsReady] = useState(false);
  const firstCardRef = useRef<View>(null);
@@ -101,15 +97,8 @@ export default function TVOptionModal() {
  }

  const { title, options } = modalState;
-  // Honor the caller-provided card size (e.g. wider cards for long root-folder
-  // paths) and grow it in step with the user's text-scale setting so larger
-  // fonts don't get clipped.
-  const scaledCardWidth = scaleSize(
-    (modalState.cardWidth ?? 160) * relativeScale,
-  );
-  const scaledCardHeight = scaleSize(
-    (modalState.cardHeight ?? 75) * relativeScale,
-  );
+  const scaledCardWidth = scaleSize(160);
+  const scaledCardHeight = scaleSize(75);

  return (
    <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>
--- a/app/(auth)/tv-request-modal.tsx
+++ b/app/(auth)/tv-request-modal.tsx
@@ -15,12 +15,11 @@ import {
 import { Text } from "@/components/common/Text";
 import { TVRequestOptionRow } from "@/components/jellyseerr/tv/TVRequestOptionRow";
 import { TVToggleOptionRow } from "@/components/jellyseerr/tv/TVToggleOptionRow";
-import { TVButton } from "@/components/tv";
+import { TVButton, TVOptionSelector } from "@/components/tv";
 import type { TVOptionItem } from "@/components/tv/TVOptionSelector";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import { tvRequestModalAtom } from "@/utils/atoms/tvRequestModal";
 import type {
  QualityProfile,
@@ -36,7 +35,6 @@ export default function TVRequestModalPage() {
  const modalState = useAtomValue(tvRequestModalAtom);
  const { t } = useTranslation();
  const { jellyseerrApi, jellyseerrUser, requestMedia } = useJellyseerr();
-  const { showOptions } = useTVOptionModal();

  const [isReady, setIsReady] = useState(false);
  const [requestOverrides, setRequestOverrides] = useState<MediaRequestBody>({
@@ -45,6 +43,10 @@ export default function TVRequestModalPage() {
    userId: jellyseerrUser?.id,
  });

+  const [activeSelector, setActiveSelector] = useState<
+    "profile" | "folder" | "user" | null
+  >(null);
+
  const overlayOpacity = useRef(new Animated.Value(0)).current;
  const sheetTranslateY = useRef(new Animated.Value(200)).current;

@@ -240,14 +242,17 @@ export default function TVRequestModalPage() {
  // Handlers
  const handleProfileChange = useCallback((profileId: number) => {
    setRequestOverrides((prev) => ({ ...prev, profileId }));
+    setActiveSelector(null);
  }, []);

  const handleFolderChange = useCallback((rootFolder: string) => {
    setRequestOverrides((prev) => ({ ...prev, rootFolder }));
+    setActiveSelector(null);
  }, []);

  const handleUserChange = useCallback((userId: number) => {
    setRequestOverrides((prev) => ({ ...prev, userId }));
+    setActiveSelector(null);
  }, []);

  const handleTagToggle = useCallback(
@@ -348,37 +353,18 @@ export default function TVRequestModalPage() {
                  <TVRequestOptionRow
                    label={t("jellyseerr.quality_profile")}
                    value={selectedProfileName}
-                    onPress={() =>
-                      showOptions({
-                        title: t("jellyseerr.quality_profile"),
-                        options: qualityProfileOptions,
-                        onSelect: handleProfileChange,
-                      })
-                    }
+                    onPress={() => setActiveSelector("profile")}
                    hasTVPreferredFocus
                  />
                  <TVRequestOptionRow
                    label={t("jellyseerr.root_folder")}
                    value={selectedFolderName}
-                    onPress={() =>
-                      showOptions({
-                        title: t("jellyseerr.root_folder"),
-                        options: rootFolderOptions,
-                        onSelect: handleFolderChange,
-                        cardWidth: 280,
-                      })
-                    }
+                    onPress={() => setActiveSelector("folder")}
                  />
                  <TVRequestOptionRow
                    label={t("jellyseerr.request_as")}
                    value={selectedUserName}
-                    onPress={() =>
-                      showOptions({
-                        title: t("jellyseerr.request_as"),
-                        options: userOptions,
-                        onSelect: handleUserChange,
-                      })
-                    }
+                    onPress={() => setActiveSelector("user")}
                  />

                  {tagItems.length > 0 && (
@@ -423,6 +409,33 @@ export default function TVRequestModalPage() {
          </TVFocusGuideView>
        </BlurView>
      </Animated.View>
+
+      {/* Sub-selectors */}
+      <TVOptionSelector
+        visible={activeSelector === "profile"}
+        title={t("jellyseerr.quality_profile")}
+        options={qualityProfileOptions}
+        onSelect={handleProfileChange}
+        onClose={() => setActiveSelector(null)}
+        cancelLabel={t("jellyseerr.cancel")}
+      />
+      <TVOptionSelector
+        visible={activeSelector === "folder"}
+        title={t("jellyseerr.root_folder")}
+        options={rootFolderOptions}
+        onSelect={handleFolderChange}
+        onClose={() => setActiveSelector(null)}
+        cancelLabel={t("jellyseerr.cancel")}
+        cardWidth={280}
+      />
+      <TVOptionSelector
+        visible={activeSelector === "user"}
+        title={t("jellyseerr.request_as")}
+        options={userOptions}
+        onSelect={handleUserChange}
+        onClose={() => setActiveSelector(null)}
+        cancelLabel={t("jellyseerr.cancel")}
+      />
    </Animated.View>
  );
 }
--- a/app/(auth)/tv-season-select-modal.tsx
+++ b/app/(auth)/tv-season-select-modal.tsx
@@ -26,7 +26,6 @@ import {
  MediaType,
 } from "@/utils/jellyseerr/server/constants/media";
 import type { MediaRequestBody } from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
-import { scaleSize } from "@/utils/scaleSize";
 import { store } from "@/utils/store";

 interface TVSeasonToggleCardProps {
@@ -50,7 +49,6 @@ const TVSeasonToggleCard: React.FC<TVSeasonToggleCardProps> = ({
  hasTVPreferredFocus,
 }) => {
  const { t } = useTranslation();
-  const typography = useScaledTVTypography();
  const { focused, handleFocus, handleBlur, animatedStyle } =
    useTVFocusAnimation({ scaleAmount: 1.08 });

@@ -121,10 +119,7 @@ const TVSeasonToggleCard: React.FC<TVSeasonToggleCardProps> = ({
          <Text
            style={[
              styles.seasonTitle,
-              {
-                fontSize: typography.callout,
-                color: focused ? "#000000" : "#FFFFFF",
-              },
+              { color: focused ? "#000000" : "#FFFFFF" },
            ]}
            numberOfLines={1}
          >
@@ -137,7 +132,6 @@ const TVSeasonToggleCard: React.FC<TVSeasonToggleCardProps> = ({
              style={[
                styles.episodeCount,
                {
-                  fontSize: typography.callout - 4,
                  color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.6)",
                },
              ]}
@@ -257,15 +251,14 @@ export default function TVSeasonSelectModalPage() {
    };

    if (modalState.hasAdvancedRequestPermission) {
-      // Replace this sheet with the advanced request modal so it takes our
-      // place in the stack instead of stacking on top (which breaks focus).
+      // Close this modal and open the advanced request modal
+      router.back();
      showRequestModal({
        requestBody: body,
        title: modalState.title,
        id: modalState.mediaId,
        mediaType: MediaType.TV,
        onRequested: modalState.onRequested,
-        replace: true,
      });
      return;
    }
@@ -408,7 +401,7 @@ const styles = StyleSheet.create({
    gap: 16,
  },
  seasonCard: {
-    width: scaleSize(220),
+    width: 160,
    paddingVertical: 16,
    paddingHorizontal: 16,
    borderRadius: 12,
@@ -422,10 +415,7 @@ const styles = StyleSheet.create({
    marginBottom: 8,
  },
  seasonInfo: {
-    // Note: no `flex: 1` here — the card is an auto-height column, so flex:1
-    // (flexBasis: 0) would collapse this box and hide the text. Let it size to
-    // its content instead.
-    alignSelf: "stretch",
+    flex: 1,
  },
  seasonTitle: {
    fontWeight: "600",
@@ -436,7 +426,9 @@ const styles = StyleSheet.create({
    alignItems: "center",
    justifyContent: "space-between",
  },
-  episodeCount: {},
+  episodeCount: {
+    fontSize: 14,
+  },
  statusBadge: {
    width: 22,
    height: 22,
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -7,7 +7,6 @@ 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";
@@ -101,22 +100,6 @@ 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();

--- a/augmentations/index.ts
+++ b/augmentations/index.ts
@@ -1,3 +1,4 @@
 export * from "./api";
 export * from "./mmkv";
 export * from "./number";
+export * from "./string";
--- a/augmentations/number.ts
+++ b/augmentations/number.ts
@@ -3,6 +3,7 @@ declare global {
    bytesToReadable(decimals?: number): string;
    secondsToMilliseconds(): number;
    minutesToMilliseconds(): number;
+    hoursToMilliseconds(): number;
  }
 }

@@ -27,4 +28,8 @@ Number.prototype.minutesToMilliseconds = function () {
  return this.valueOf() * (60).secondsToMilliseconds();
 };

+Number.prototype.hoursToMilliseconds = function () {
+  return this.valueOf() * (60).minutesToMilliseconds();
+};
+
 export {};
--- a/augmentations/string.ts
+++ b/augmentations/string.ts
@@ -0,0 +1,14 @@
+declare global {
+  interface String {
+    toTitle(): string;
+  }
+}
+
+String.prototype.toTitle = function () {
+  return this.replaceAll("_", " ").replace(
+    /\w\S*/g,
+    (text) => text.charAt(0).toUpperCase() + text.substring(1).toLowerCase(),
+  );
+};
+
+export {};
--- a/bun.lock
+++ b/bun.lock
--- a/components/ContextMenu.tv.ts
+++ b/components/ContextMenu.tv.ts
--- a/components/ExampleGlobalModalUsage.tsx
+++ b/components/ExampleGlobalModalUsage.tsx
@@ -0,0 +1,203 @@
+/**
+ * Example Usage of Global Modal
+ *
+ * This file demonstrates how to use the global modal system from anywhere in your app.
+ * You can delete this file after understanding how it works.
+ */
+
+import { Ionicons } from "@expo/vector-icons";
+import { TouchableOpacity, View } from "react-native";
+import { Text } from "@/components/common/Text";
+import { useGlobalModal } from "@/providers/GlobalModalProvider";
+
+/**
+ * Example 1: Simple Content Modal
+ */
+export const SimpleModalExample = () => {
+  const { showModal } = useGlobalModal();
+
+  const handleOpenModal = () => {
+    showModal(
+      <View className='p-6'>
+        <Text className='text-2xl font-bold mb-4 text-white'>Simple Modal</Text>
+        <Text className='text-white mb-4'>
+          This is a simple modal with just some text content.
+        </Text>
+        <Text className='text-neutral-400'>
+          Swipe down or tap outside to close.
+        </Text>
+      </View>,
+    );
+  };
+
+  return (
+    <TouchableOpacity
+      onPress={handleOpenModal}
+      className='bg-purple-600 px-4 py-2 rounded-lg'
+    >
+      <Text className='text-white font-semibold'>Open Simple Modal</Text>
+    </TouchableOpacity>
+  );
+};
+
+/**
+ * Example 2: Modal with Custom Snap Points
+ */
+export const CustomSnapPointsExample = () => {
+  const { showModal } = useGlobalModal();
+
+  const handleOpenModal = () => {
+    showModal(
+      <View className='p-6' style={{ minHeight: 400 }}>
+        <Text className='text-2xl font-bold mb-4 text-white'>
+          Custom Snap Points
+        </Text>
+        <Text className='text-white mb-4'>
+          This modal has custom snap points (25%, 50%, 90%).
+        </Text>
+        <View className='bg-neutral-800 p-4 rounded-lg'>
+          <Text className='text-white'>
+            Try dragging the modal to different heights!
+          </Text>
+        </View>
+      </View>,
+      {
+        snapPoints: ["25%", "50%", "90%"],
+        enableDynamicSizing: false,
+      },
+    );
+  };
+
+  return (
+    <TouchableOpacity
+      onPress={handleOpenModal}
+      className='bg-blue-600 px-4 py-2 rounded-lg'
+    >
+      <Text className='text-white font-semibold'>Custom Snap Points</Text>
+    </TouchableOpacity>
+  );
+};
+
+/**
+ * Example 3: Complex Component in Modal
+ */
+const SettingsModalContent = () => {
+  const { hideModal } = useGlobalModal();
+
+  const settings = [
+    {
+      id: 1,
+      title: "Notifications",
+      icon: "notifications-outline" as const,
+      enabled: true,
+    },
+    { id: 2, title: "Dark Mode", icon: "moon-outline" as const, enabled: true },
+    {
+      id: 3,
+      title: "Auto-play",
+      icon: "play-outline" as const,
+      enabled: false,
+    },
+  ];
+
+  return (
+    <View className='p-6'>
+      <Text className='text-2xl font-bold mb-6 text-white'>Settings</Text>
+
+      {settings.map((setting, index) => (
+        <View
+          key={setting.id}
+          className={`flex-row items-center justify-between py-4 ${
+            index !== settings.length - 1 ? "border-b border-neutral-700" : ""
+          }`}
+        >
+          <View className='flex-row items-center gap-3'>
+            <Ionicons name={setting.icon} size={24} color='white' />
+            <Text className='text-white text-lg'>{setting.title}</Text>
+          </View>
+          <View
+            className={`w-12 h-7 rounded-full ${
+              setting.enabled ? "bg-purple-600" : "bg-neutral-600"
+            }`}
+          >
+            <View
+              className={`w-5 h-5 rounded-full bg-white shadow-md transform ${
+                setting.enabled ? "translate-x-6" : "translate-x-1"
+              }`}
+              style={{ marginTop: 4 }}
+            />
+          </View>
+        </View>
+      ))}
+
+      <TouchableOpacity
+        onPress={hideModal}
+        className='bg-purple-600 px-4 py-3 rounded-lg mt-6'
+      >
+        <Text className='text-white font-semibold text-center'>Close</Text>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+export const ComplexModalExample = () => {
+  const { showModal } = useGlobalModal();
+
+  const handleOpenModal = () => {
+    showModal(<SettingsModalContent />);
+  };
+
+  return (
+    <TouchableOpacity
+      onPress={handleOpenModal}
+      className='bg-green-600 px-4 py-2 rounded-lg'
+    >
+      <Text className='text-white font-semibold'>Complex Component</Text>
+    </TouchableOpacity>
+  );
+};
+
+/**
+ * Example 4: Modal Triggered from Function (e.g., API response)
+ */
+export const useShowSuccessModal = () => {
+  const { showModal } = useGlobalModal();
+
+  return (message: string) => {
+    showModal(
+      <View className='p-6 items-center'>
+        <View className='bg-green-500 rounded-full p-4 mb-4'>
+          <Ionicons name='checkmark' size={48} color='white' />
+        </View>
+        <Text className='text-2xl font-bold mb-2 text-white'>Success!</Text>
+        <Text className='text-white text-center'>{message}</Text>
+      </View>,
+    );
+  };
+};
+
+/**
+ * Main Demo Component
+ */
+export const GlobalModalDemo = () => {
+  const showSuccess = useShowSuccessModal();
+
+  return (
+    <View className='p-6 gap-4'>
+      <Text className='text-2xl font-bold mb-4 text-white'>
+        Global Modal Examples
+      </Text>
+
+      <SimpleModalExample />
+      <CustomSnapPointsExample />
+      <ComplexModalExample />
+
+      <TouchableOpacity
+        onPress={() => showSuccess("Operation completed successfully!")}
+        className='bg-orange-600 px-4 py-2 rounded-lg'
+      >
+        <Text className='text-white font-semibold'>Show Success Modal</Text>
+      </TouchableOpacity>
+    </View>
+  );
+};
--- a/components/SaveAccountModal.tsx
+++ b/components/SaveAccountModal.tsx
@@ -69,23 +69,17 @@ export const SaveAccountModal: React.FC<SaveAccountModalProps> = ({
    [isAndroid],
  );

-  const isPresentedRef = useRef(false);
-
  useEffect(() => {
    if (visible) {
      bottomSheetModalRef.current?.present();
-    } else if (isPresentedRef.current) {
+    } else {
      bottomSheetModalRef.current?.dismiss();
-      isPresentedRef.current = false;
    }
  }, [visible]);

  const handleSheetChanges = useCallback(
    (index: number) => {
-      if (index >= 0) {
-        isPresentedRef.current = true;
-      } else if (index === -1 && isPresentedRef.current) {
-        isPresentedRef.current = false;
+      if (index === -1) {
        resetState();
        onClose();
      }
--- a/components/TrackSheet.tsx
+++ b/components/TrackSheet.tsx
@@ -26,7 +26,7 @@ export const TrackSheet: React.FC<Props> = ({

  const streams = useMemo(
    () => source?.MediaStreams?.filter((x) => x.Type === streamType),
-    [source, streamType],
+    [source],
  );

  const selectedSteam = useMemo(
@@ -63,7 +63,7 @@ export const TrackSheet: React.FC<Props> = ({
          <Text numberOfLines={1}>
            {selected === -1 && streamType === "Subtitle"
              ? t("common.none")
-              : selectedSteam?.DisplayTitle || t("common.select")}
+              : selectedSteam?.DisplayTitle || t("common.select", "Select")}
          </Text>
        </TouchableOpacity>
      </View>
--- a/components/common/LargePoster.tsx
+++ b/components/common/LargePoster.tsx
@@ -0,0 +1,20 @@
+import { Image } from "expo-image";
+import { View } from "react-native";
+
+export const LargePoster: React.FC<{ url?: string | null }> = ({ url }) => {
+  if (!url)
+    return (
+      <View className='p-4 rounded-xl overflow-hidden '>
+        <View className='w-full aspect-video rounded-xl overflow-hidden border border-neutral-800' />
+      </View>
+    );
+
+  return (
+    <View className='p-4 rounded-xl overflow-hidden '>
+      <Image
+        source={{ uri: url }}
+        className='w-full aspect-video rounded-xl overflow-hidden border border-neutral-800'
+      />
+    </View>
+  );
+};
--- a/components/common/VerticalSkeleton.tsx
+++ b/components/common/VerticalSkeleton.tsx
@@ -0,0 +1,28 @@
+import { View, type ViewProps } from "react-native";
+
+interface Props extends ViewProps {
+  index: number;
+}
+
+export const VerticalSkeleton: React.FC<Props> = ({ index, ...props }) => {
+  return (
+    <View
+      key={index}
+      style={{
+        width: "32%",
+      }}
+      className='flex flex-col'
+      {...props}
+    >
+      <View
+        style={{
+          aspectRatio: "10/15",
+        }}
+        className='w-full bg-neutral-800 mb-2 rounded-lg'
+      />
+      <View className='h-2 bg-neutral-800 rounded-full mb-1' />
+      <View className='h-2 bg-neutral-800 rounded-full mb-1' />
+      <View className='h-2 bg-neutral-800 rounded-full mb-2 w-1/2' />
+    </View>
+  );
+};
--- a/components/home/Home.tv.tsx
+++ b/components/home/Home.tv.tsx
@@ -140,11 +140,9 @@ export const Home = () => {
    let isCancelled = false;

    const performCrossfade = async () => {
-      // 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.
+      // Prefetch the image before starting the crossfade
      try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
      } 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={4}
-          maxToRenderPerBatch={2}
-          windowSize={3}
+          initialNumToRender={5}
+          maxToRenderPerBatch={3}
+          windowSize={5}
          removeClippedSubviews={false}
          maintainVisibleContentPosition={{ minIndexForVisible: 0 }}
          style={{ overflow: "visible" }}
--- a/components/home/TVHeroCarousel.tsx
+++ b/components/home/TVHeroCarousel.tsx
@@ -256,11 +256,8 @@ 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, "disk");
+        await Image.prefetch(backdropUrl);
      } catch {
        // Continue even if prefetch fails
      }
@@ -382,7 +379,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 = scaleSize(145);
+  const tvosTopPadding = Platform.OS === "ios" ? scaleSize(145) : 0;
  const heroHeight = SCREEN_HEIGHT * sizes.padding.heroHeight;

  return (
--- a/components/jellyseerr/discover/TVDiscoverSlide.tsx
+++ b/components/jellyseerr/discover/TVDiscoverSlide.tsx
@@ -7,7 +7,6 @@ import { useTranslation } from "react-i18next";
 import { Animated, FlatList, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import {
@@ -167,7 +166,6 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
  isFirstSlide = false,
 }) => {
  const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
  const { t } = useTranslation();
  const { jellyseerrApi, isJellyseerrMovieOrTvResult } = useJellyseerr();

@@ -240,7 +238,7 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
          fontWeight: "bold",
          color: "#FFFFFF",
          marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
        }}
      >
        {slideTitle}
@@ -251,7 +249,7 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
        keyExtractor={(item) => item.id.toString()}
        showsHorizontalScrollIndicator={false}
        contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
          paddingVertical: SCALE_PADDING,
          gap: 20,
        }}
--- a/components/library/LibraryItemCard.tsx
+++ b/components/library/LibraryItemCard.tsx
@@ -51,7 +51,7 @@ export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
        api,
        item: library,
      }),
-    [api, library],
+    [library],
  );

  const itemType = useMemo(() => {
--- a/components/login/TVPasswordEntryModal.tsx
+++ b/components/login/TVPasswordEntryModal.tsx
@@ -280,7 +280,7 @@ export const TVPasswordEntryModal: React.FC<TVPasswordEntryModalProps> = ({
              <View style={styles.buttonContainer}>
                <TVSubmitButton
                  onPress={handleSubmit}
-                  label={t("login.login_button")}
+                  label={t("login.login")}
                  loading={isLoading}
                  disabled={!password}
                />
--- a/components/navigation/TabBarIcon.tsx
+++ b/components/navigation/TabBarIcon.tsx
@@ -0,0 +1,12 @@
+// You can explore the built-in icon families and icons on the web at https://icons.expo.fyi/
+
+import type { IconProps } from "@expo/vector-icons/build/createIconSet";
+import Ionicons from "@expo/vector-icons/Ionicons";
+import type { ComponentProps } from "react";
+
+export function TabBarIcon({
+  style,
+  ...rest
+}: IconProps<ComponentProps<typeof Ionicons>["name"]>) {
+  return <Ionicons size={26} style={[{ marginBottom: -3 }, style]} {...rest} />;
+}
--- 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 () => {
-      // Disk-only prefetch to avoid pinning large backdrops in memory cache.
+      // Prefetch the image before starting the crossfade
      try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
      } catch {
        // Continue even if prefetch fails
      }
--- a/components/posters/EpisodePoster.tsx
+++ b/components/posters/EpisodePoster.tsx
@@ -0,0 +1,63 @@
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { Image } from "expo-image";
+import { useAtom } from "jotai";
+import { useMemo, useState } from "react";
+import { View } from "react-native";
+import { WatchedIndicator } from "@/components/WatchedIndicator";
+import { apiAtom } from "@/providers/JellyfinProvider";
+
+type MoviePosterProps = {
+  item: BaseItemDto;
+  showProgress?: boolean;
+};
+
+export const EpisodePoster: React.FC<MoviePosterProps> = ({
+  item,
+  showProgress = false,
+}) => {
+  const [api] = useAtom(apiAtom);
+
+  const url = useMemo(() => {
+    if (item.Type === "Episode") {
+      return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
+    }
+  }, [item]);
+
+  const [progress, _setProgress] = useState(
+    item.UserData?.PlayedPercentage || 0,
+  );
+
+  const blurhash = useMemo(() => {
+    const key = item.ImageTags?.Primary as string;
+    return item.ImageBlurHashes?.Primary?.[key];
+  }, [item]);
+
+  return (
+    <View className='relative rounded-lg overflow-hidden border border-neutral-900'>
+      <Image
+        placeholder={{
+          blurhash,
+        }}
+        key={item.Id}
+        id={item.Id}
+        source={
+          url
+            ? {
+                uri: url,
+              }
+            : null
+        }
+        cachePolicy={"memory-disk"}
+        contentFit='cover'
+        style={{
+          aspectRatio: "10/15",
+          width: "100%",
+        }}
+      />
+      <WatchedIndicator item={item} />
+      {showProgress && progress > 0 && (
+        <View className='h-1 bg-red-600 w-full' />
+      )}
+    </View>
+  );
+};
--- a/components/posters/ParentPoster.tsx
+++ b/components/posters/ParentPoster.tsx
@@ -0,0 +1,48 @@
+import { Image } from "expo-image";
+import { useAtom } from "jotai";
+import { useMemo } from "react";
+import { View } from "react-native";
+import { apiAtom } from "@/providers/JellyfinProvider";
+
+type PosterProps = {
+  id?: string;
+  showProgress?: boolean;
+};
+
+const ParentPoster: React.FC<PosterProps> = ({ id }) => {
+  const [api] = useAtom(apiAtom);
+
+  const url = useMemo(
+    () => `${api?.basePath}/Items/${id}/Images/Primary`,
+    [id],
+  );
+
+  if (!url || !id)
+    return (
+      <View
+        className='border border-neutral-900'
+        style={{
+          aspectRatio: "10/15",
+        }}
+      />
+    );
+
+  return (
+    <View className='rounded-lg overflow-hidden border border-neutral-900'>
+      <Image
+        key={id}
+        id={id}
+        source={{
+          uri: url,
+        }}
+        cachePolicy={"memory-disk"}
+        contentFit='cover'
+        style={{
+          aspectRatio: "10/15",
+        }}
+      />
+    </View>
+  );
+};
+
+export default ParentPoster;
--- a/components/search/TVJellyseerrSearchResults.tsx
+++ b/components/search/TVJellyseerrSearchResults.tsx
@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
 import { Animated, FlatList, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { MediaStatus } from "@/utils/jellyseerr/server/constants/media";
@@ -234,7 +233,6 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
  onItemPress,
 }) => {
  const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
  if (!items || items.length === 0) return null;

  return (
@@ -245,7 +243,7 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
          fontWeight: "bold",
          color: "#FFFFFF",
          marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
        }}
      >
        {title}
@@ -256,7 +254,7 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
        keyExtractor={(item) => item.id.toString()}
        showsHorizontalScrollIndicator={false}
        contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
          paddingVertical: SCALE_PADDING,
          gap: 20,
        }}
@@ -287,7 +285,6 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
  onItemPress,
 }) => {
  const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
  if (!items || items.length === 0) return null;

  return (
@@ -298,7 +295,7 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
          fontWeight: "bold",
          color: "#FFFFFF",
          marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
        }}
      >
        {title}
@@ -309,7 +306,7 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
        keyExtractor={(item) => item.id.toString()}
        showsHorizontalScrollIndicator={false}
        contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
          paddingVertical: SCALE_PADDING,
          gap: 20,
        }}
@@ -340,7 +337,6 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
  onItemPress,
 }) => {
  const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
  if (!items || items.length === 0) return null;

  return (
@@ -351,7 +347,7 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
          fontWeight: "bold",
          color: "#FFFFFF",
          marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
        }}
      >
        {title}
@@ -362,7 +358,7 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
        keyExtractor={(item) => item.id.toString()}
        showsHorizontalScrollIndicator={false}
        contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
          paddingVertical: SCALE_PADDING,
          gap: 20,
        }}
--- a/components/search/TVSearchPage.tsx
+++ b/components/search/TVSearchPage.tsx
@@ -2,7 +2,7 @@ import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useAtom } from "jotai";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Platform, ScrollView, TextInput, View } from "react-native";
+import { ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { TVDiscover } from "@/components/jellyseerr/discover/TVDiscover";
@@ -22,6 +22,7 @@ import { TVJellyseerrSearchResults } from "./TVJellyseerrSearchResults";
 import { TVSearchSection } from "./TVSearchSection";
 import { TVSearchTabBadges } from "./TVSearchTabBadges";

+const HORIZONTAL_PADDING = 60;
 const TOP_PADDING = 100;
 // Height of the native search bar itself. The tvOS grid keyboard presents as
 // its own overlay when the field is focused, so we only reserve the bar height
@@ -162,7 +163,6 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
  discoverSliders,
 }) => {
  const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
  const [api] = useAtom(apiAtom);
@@ -231,48 +231,26 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
          paddingTop: insets.top + TOP_PADDING,
        }}
      >
-        {/* Search bar: native tvOS SwiftUI `.searchable` on Apple TV, standard
-            TextInput fallback on Android TV (the native module is Apple-only). */}
-        {Platform.OS === "ios" ? (
-          <View
-            style={{
-              marginBottom: 24,
-              height: SEARCH_AREA_HEIGHT,
-            }}
-          >
-            {/* No horizontal margin here: the native tvOS search bar centers
-                itself and renders a trailing "Hold to Dictate" hint. */}
-            <TvSearchView
-              style={{ width: "100%", height: "100%" }}
-              placeholder={t("search.search")}
-              onChangeText={(e) => setSearch(e.nativeEvent.text)}
-            />
-          </View>
-        ) : (
-          <View
-            style={{
-              marginHorizontal: sizes.padding.horizontal,
-              marginBottom: 24,
-            }}
-          >
-            <TextInput
-              style={{
-                height: 56,
-                width: "100%",
-                backgroundColor: "#262626",
-                borderRadius: 12,
-                paddingHorizontal: 20,
-                fontSize: 28,
-                color: "#fff",
-              }}
-              placeholder={t("search.search")}
-              placeholderTextColor='rgba(255,255,255,0.4)'
-              onChangeText={setSearch}
-              defaultValue=''
-              autoFocus={false}
-            />
-          </View>
-        )}
+        {/* Native tvOS search field (SwiftUI `.searchable`, our `tv-search`
+            module). It renders the native search bar + grid keyboard and
+            forwards typed text into the existing query pipeline via setSearch;
+            our own results grid renders below. */}
+        {/* No horizontal margin here: the native tvOS search bar centers itself
+            and renders a trailing "Hold to Dictate in <Language>" hint. Extra
+            margins squeeze the bar's width and clip that trailing hint, so let
+            the native view span the full width and own its own insets. */}
+        <View
+          style={{
+            marginBottom: 24,
+            height: SEARCH_AREA_HEIGHT,
+          }}
+        >
+          <TvSearchView
+            style={{ width: "100%", height: "100%" }}
+            placeholder={t("search.search")}
+            onChangeText={(e) => setSearch(e.nativeEvent.text)}
+          />
+        </View>
      </View>

      <ScrollView
@@ -280,15 +258,12 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
        showsVerticalScrollIndicator={false}
        keyboardDismissMode='on-drag'
        contentContainerStyle={{
-          // Top padding so the focus-scale/shadow on the first row (filter
-          // badges) isn't clipped against the ScrollView's top edge.
-          paddingTop: 16,
          paddingBottom: insets.bottom + 60,
        }}
      >
        {/* Search Type Tab Badges */}
        {showDiscover && (
-          <View style={{ marginHorizontal: sizes.padding.horizontal }}>
+          <View style={{ marginHorizontal: HORIZONTAL_PADDING }}>
            <TVSearchTabBadges
              searchType={searchType}
              setSearchType={setSearchType}
--- a/components/series/NextUp.tsx
+++ b/components/series/NextUp.tsx
@@ -3,6 +3,7 @@ import { FlashList } from "@shopify/flash-list";
 import { useQuery } from "@tanstack/react-query";
 import { useAtom } from "jotai";
 import type React from "react";
+import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { View } from "react-native";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
@@ -33,13 +34,16 @@ export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
    staleTime: 0,
  });

-  if (!items?.length)
-    return (
-      <View className='px-4'>
-        <Text className='text-lg font-bold mb-2'>{t("item_card.next_up")}</Text>
-        <Text className='opacity-50'>{t("item_card.no_items_to_display")}</Text>
-      </View>
-    );
+  // Defensive client-side filter: some Jellyfin server versions ignore the
+  // `seriesId` query param on /Shows/NextUp and return next-up items across all
+  // series (the same content as the home tab's Next Up row). Filter to ensure
+  // we only ever show episodes belonging to this series.
+  const filteredItems = useMemo(
+    () => items?.filter((item) => item.SeriesId === seriesId) ?? [],
+    [items, seriesId],
+  );
+
+  if (!filteredItems.length) return null;

  return (
    <View>
@@ -50,7 +54,7 @@ export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
        contentContainerStyle={{ paddingLeft: 16 }}
        horizontal
        showsHorizontalScrollIndicator={false}
-        data={items}
+        data={filteredItems}
        renderItem={({ item, index }) => (
          <TouchableItemRouter
            item={item}
--- a/components/settings/Dashboard.tsx
+++ b/components/settings/Dashboard.tsx
@@ -0,0 +1,29 @@
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import useRouter from "@/hooks/useAppRouter";
+import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
+import { useSettings } from "@/utils/atoms/settings";
+import { ListGroup } from "../list/ListGroup";
+import { ListItem } from "../list/ListItem";
+
+export const Dashboard = () => {
+  const { settings } = useSettings();
+  const { sessions = [] } = useSessions({} as useSessionsProps);
+  const router = useRouter();
+
+  const { t } = useTranslation();
+
+  if (!settings) return null;
+  return (
+    <View>
+      <ListGroup title={t("home.settings.dashboard.title")} className='mt-4'>
+        <ListItem
+          className={sessions.length !== 0 ? "bg-purple-900" : ""}
+          onPress={() => router.push("/settings/dashboard/sessions")}
+          title={t("home.settings.dashboard.sessions_title")}
+          showArrow
+        />
+      </ListGroup>
+    </View>
+  );
+};
--- a/components/settings/DownloadSettings.tsx
+++ b/components/settings/DownloadSettings.tsx
@@ -0,0 +1,3 @@
+export default function DownloadSettings() {
+  return null;
+}
--- a/components/settings/DownloadSettings.tv.tsx
+++ b/components/settings/DownloadSettings.tv.tsx
@@ -0,0 +1,3 @@
+export default function DownloadSettings() {
+  return null;
+}
--- a/components/settings/Jellyseerr.tsx
+++ b/components/settings/Jellyseerr.tsx
@@ -115,6 +115,9 @@ export const JellyseerrSettings = () => {
          </>
        ) : (
          <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.jellyseerr.jellyseerr_warning")}
+            </Text>
            <Text className='font-bold mb-1'>
              {t("home.settings.plugins.jellyseerr.server_url")}
            </Text>
--- a/components/settings/UserInfo.tsx
+++ b/components/settings/UserInfo.tsx
@@ -1,8 +1,8 @@
+import * as Application from "expo-application";
 import { useAtom } from "jotai";
 import { useTranslation } from "react-i18next";
 import { View, type ViewProps } from "react-native";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getVersionInfo } from "@/utils/version";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";

@@ -13,9 +13,10 @@ export const UserInfo: React.FC<Props> = ({ ...props }) => {
  const [user] = useAtom(userAtom);
  const { t } = useTranslation();

-  // Graduated build identifier — see utils/version.ts:
-  // dev → "0.54.1 · branch · commit", develop/CI → "0.54.1 · commit · #run", production → "0.54.1".
-  const { display: version } = getVersionInfo();
+  const version =
+    Application?.nativeApplicationVersion ||
+    Application?.nativeBuildVersion ||
+    "N/A";

  return (
    <View {...props}>
--- a/components/tv/TVNavBar.tsx
+++ b/components/tv/TVNavBar.tsx
@@ -1,155 +0,0 @@
-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
@@ -448,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/index.ts
+++ b/components/tv/index.ts
@@ -35,8 +35,6 @@ 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/TechnicalInfoOverlay.tsx
+++ b/components/video-player/controls/TechnicalInfoOverlay.tsx
@@ -342,12 +342,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          {info?.cacheSeconds !== undefined && (
            <Text style={textStyle}>
              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 && (
@@ -356,12 +350,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
              {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]}>
              Dropped: {info.droppedFrames} frames
--- a/constants/Languages.ts
+++ b/constants/Languages.ts
@@ -0,0 +1,39 @@
+import type { DefaultLanguageOption } from "@/utils/atoms/settings";
+
+export const LANGUAGES: DefaultLanguageOption[] = [
+  { label: "English", value: "eng" },
+  { label: "Spanish", value: "spa" },
+  { label: "Chinese (Mandarin)", value: "cmn" },
+  { label: "Hindi", value: "hin" },
+  { label: "Arabic", value: "ara" },
+  { label: "French", value: "fra" },
+  { label: "Russian", value: "rus" },
+  { label: "Portuguese", value: "por" },
+  { label: "Japanese", value: "jpn" },
+  { label: "German", value: "deu" },
+  { label: "Italian", value: "ita" },
+  { label: "Korean", value: "kor" },
+  { label: "Turkish", value: "tur" },
+  { label: "Dutch", value: "nld" },
+  { label: "Polish", value: "pol" },
+  { label: "Vietnamese", value: "vie" },
+  { label: "Thai", value: "tha" },
+  { label: "Indonesian", value: "ind" },
+  { label: "Greek", value: "ell" },
+  { label: "Swedish", value: "swe" },
+  { label: "Danish", value: "dan" },
+  { label: "Norwegian", value: "nor" },
+  { label: "Finnish", value: "fin" },
+  { label: "Czech", value: "ces" },
+  { label: "Hungarian", value: "hun" },
+  { label: "Romanian", value: "ron" },
+  { label: "Ukrainian", value: "ukr" },
+  { label: "Hebrew", value: "heb" },
+  { label: "Bengali", value: "ben" },
+  { label: "Punjabi", value: "pan" },
+  { label: "Tagalog", value: "tgl" },
+  { label: "Swahili", value: "swa" },
+  { label: "Malay", value: "msa" },
+  { label: "Persian", value: "fas" },
+  { label: "Urdu", value: "urd" },
+];
--- a/constants/TVTypography.ts
+++ b/constants/TVTypography.ts
@@ -55,20 +55,6 @@ export type ScaledTVTypography = {
  callout: number;
 };

-/**
- * Returns the user's text-scale factor relative to the Default scale (1.0 at
- * Default, >1 for Large/ExtraLarge, <1 for Small). Use it to scale containers
- * (e.g. option-card width/height) in step with the scaled font so larger text
- * settings don't overflow fixed boxes.
- */
-export const useTVRelativeScale = (): number => {
-  const { settings } = useSettings();
-  const scale =
-    scaleMultipliers[settings.tvTypographyScale] ??
-    scaleMultipliers[TVTypographyScale.Default];
-  return scale / scaleMultipliers[TVTypographyScale.Default];
-};
-
 /**
 * Hook that returns scaled TV typography values based on user settings.
 * Use this instead of the static TVTypography constant for dynamic scaling.
--- a/eas.json
+++ b/eas.json
@@ -52,7 +52,7 @@
      }
    },
    "production": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
      "environment": "production",
      "autoIncrement": true,
      "android": {
@@ -64,7 +64,7 @@
      }
    },
    "production-apk": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
      "environment": "production",
      "autoIncrement": true,
      "android": {
@@ -74,7 +74,7 @@
      }
    },
    "production-apk-tv": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
      "environment": "production",
      "autoIncrement": true,
      "android": {
@@ -87,7 +87,7 @@
      }
    },
    "production_tv": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
      "environment": "production",
      "autoIncrement": true,
      "env": {
@@ -97,14 +97,6 @@
        "credentialsSource": "local",
        "config": "ios-production.yml"
      }
-    },
-    "ci": {
-      "extends": "production",
-      "autoIncrement": false
-    },
-    "ci_tv": {
-      "extends": "production_tv",
-      "autoIncrement": false
    }
  },
  "submit": {
--- a/hooks/useControlsVisibility.ts
+++ b/hooks/useControlsVisibility.ts
@@ -0,0 +1,37 @@
+import { useCallback, useEffect, useRef } from "react";
+import { useSharedValue } from "react-native-reanimated";
+
+export const useControlsVisibility = (timeout = 3000) => {
+  const opacity = useSharedValue(1);
+
+  const hideControlsTimerRef = useRef<ReturnType<typeof setTimeout> | null>(
+    null,
+  );
+
+  const showControls = useCallback(() => {
+    opacity.value = 1;
+    if (hideControlsTimerRef.current) {
+      clearTimeout(hideControlsTimerRef.current);
+    }
+    hideControlsTimerRef.current = setTimeout(() => {
+      opacity.value = 0;
+    }, timeout);
+  }, [timeout]);
+
+  const hideControls = useCallback(() => {
+    opacity.value = 0;
+    if (hideControlsTimerRef.current) {
+      clearTimeout(hideControlsTimerRef.current);
+    }
+  }, []);
+
+  useEffect(() => {
+    return () => {
+      if (hideControlsTimerRef.current) {
+        clearTimeout(hideControlsTimerRef.current);
+      }
+    };
+  }, []);
+
+  return { opacity, showControls, hideControls };
+};
--- a/hooks/useDownloadedFileOpener.ts
+++ b/hooks/useDownloadedFileOpener.ts
@@ -0,0 +1,35 @@
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import { useCallback } from "react";
+import useRouter from "@/hooks/useAppRouter";
+import { usePlaySettings } from "@/providers/PlaySettingsProvider";
+import { writeToLog } from "@/utils/log";
+
+export const useDownloadedFileOpener = () => {
+  const router = useRouter();
+  const { setPlayUrl, setOfflineSettings } = usePlaySettings();
+
+  const openFile = useCallback(
+    async (item: BaseItemDto) => {
+      if (!item.Id) {
+        writeToLog("ERROR", "Attempted to open a file without an ID.");
+        console.error("Attempted to open a file without an ID.");
+        return;
+      }
+      const queryParams = new URLSearchParams({
+        itemId: item.Id,
+        offline: "true",
+        playbackPosition:
+          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+      });
+      try {
+        router.push(`/player/direct-player?${queryParams.toString()}`);
+      } catch (error) {
+        writeToLog("ERROR", "Error opening file", error);
+        console.error("Error opening file:", error);
+      }
+    },
+    [setOfflineSettings, setPlayUrl, router],
+  );
+
+  return { openFile };
+};
--- a/hooks/useImageColors.ts
+++ b/hooks/useImageColors.ts
@@ -0,0 +1,120 @@
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import { useAtom, useAtomValue } from "jotai";
+import { useEffect, useMemo } from "react";
+import { Platform } from "react-native";
+import type * as ImageColorsType from "react-native-image-colors";
+import { apiAtom } from "@/providers/JellyfinProvider";
+
+// Conditionally import react-native-image-colors only on non-TV platforms
+const ImageColors = Platform.isTV
+  ? null
+  : (require("react-native-image-colors") as typeof ImageColorsType);
+
+import {
+  adjustToNearBlack,
+  calculateTextColor,
+  isCloseToBlack,
+  itemThemeColorAtom,
+} from "@/utils/atoms/primaryColor";
+import { getItemImage } from "@/utils/getItemImage";
+import { storage } from "@/utils/mmkv";
+
+/**
+ * Custom hook to extract and manage image colors for a given item.
+ *
+ * @param item - The BaseItemDto object representing the item.
+ * @param disabled - A boolean flag to disable color extraction.
+ *
+ */
+export const useImageColors = ({
+  item,
+  url,
+  disabled,
+}: {
+  item?: BaseItemDto | null;
+  url?: string | null;
+  disabled?: boolean;
+}) => {
+  const api = useAtomValue(apiAtom);
+  const [, setPrimaryColor] = useAtom(itemThemeColorAtom);
+
+  const isTv = Platform.isTV;
+
+  const source = useMemo(() => {
+    if (!api) return;
+    if (url) return { uri: url };
+    if (item)
+      return getItemImage({
+        item,
+        api,
+        variant: "Primary",
+        quality: 80,
+        width: 300,
+      });
+    return null;
+  }, [api, item, url]);
+
+  useEffect(() => {
+    if (isTv) return;
+    if (disabled) return;
+    if (source?.uri) {
+      const _primary = storage.getString(`${source.uri}-primary`);
+      const _text = storage.getString(`${source.uri}-text`);
+
+      if (_primary && _text) {
+        setPrimaryColor({
+          primary: _primary,
+          text: _text,
+        });
+        return;
+      }
+
+      // Extract colors from the image
+      if (!ImageColors?.getColors) return;
+
+      ImageColors.getColors(source.uri, {
+        fallback: "#fff",
+        cache: false,
+      })
+        .then((colors: ImageColorsType.ImageColorsResult) => {
+          let primary = "#fff";
+          let text = "#000";
+          let backup = "#fff";
+
+          // Select the appropriate color based on the platform
+          if (colors.platform === "android") {
+            primary = colors.dominant;
+            backup = colors.vibrant;
+          } else if (colors.platform === "ios") {
+            primary = colors.detail;
+            backup = colors.primary;
+          }
+
+          // Adjust the primary color if it's too close to black
+          if (primary && isCloseToBlack(primary)) {
+            if (backup && !isCloseToBlack(backup)) primary = backup;
+            primary = adjustToNearBlack(primary);
+          }
+
+          // Calculate the text color based on the primary color
+          if (primary) text = calculateTextColor(primary);
+
+          setPrimaryColor({
+            primary,
+            text,
+          });
+
+          // Cache the colors in storage
+          if (source.uri && primary) {
+            storage.set(`${source.uri}-primary`, primary);
+            storage.set(`${source.uri}-text`, text);
+          }
+        })
+        .catch((error: any) => {
+          console.error("Error getting colors", error);
+        });
+    }
+  }, [isTv, source?.uri, setPrimaryColor, disabled]);
+
+  if (isTv) return;
+};
--- a/hooks/useJellyseerr.ts
+++ b/hooks/useJellyseerr.ts
@@ -70,35 +70,6 @@ export const clearJellyseerrStorageData = () => {
  storage.remove(JELLYSEERR_COOKIES);
 };

-export type JellyseerrSessionStatus =
-  | { valid: true }
-  | { valid: false; reason: "no_session" | "expired" };
-
-/**
- * Checks whether the persisted Jellyseerr session (user + cookies) is still
- * valid by hitting the server status endpoint. Clears local session data if the
- * request fails (expired/revoked cookie).
- */
-export async function validateJellyseerrSession(
-  serverUrl: string,
-): Promise<JellyseerrSessionStatus> {
-  const user = storage.get<JellyseerrUser>(JELLYSEERR_USER);
-  const cookies = storage.get<string[]>(JELLYSEERR_COOKIES);
-
-  if (!user || !cookies) {
-    return { valid: false, reason: "no_session" };
-  }
-
-  try {
-    const api = new JellyseerrApi(serverUrl);
-    await api.axios.get(Endpoints.API_V1 + Endpoints.STATUS);
-    return { valid: true };
-  } catch {
-    clearJellyseerrStorageData();
-    return { valid: false, reason: "expired" };
-  }
-}
-
 export enum Endpoints {
  STATUS = "/status",
  API_V1 = "/api/v1",
@@ -479,8 +450,7 @@ export const useJellyseerr = () => {
    clearJellyseerrStorageData();
    setJellyseerrUser(undefined);
    updateSettings({ jellyseerrServerUrl: undefined });
-    queryClient.removeQueries({ queryKey: ["search", "jellyseerr"] });
-  }, [queryClient]);
+  }, []);

  const requestMedia = useCallback(
    (title: string, request: MediaRequestBody, onSuccess?: () => void) => {
--- a/hooks/useTVBackHandler.ts
+++ b/hooks/useTVBackHandler.ts
@@ -4,42 +4,41 @@ 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];
-  return isTabRoute(lastSegment) || lastSegment === "index";
+  const tabNames = [
+    "(home)",
+    "(search)",
+    "(favorites)",
+    "(libraries)",
+    "(watchlists)",
+    "(settings)",
+    "(custom-links)",
+  ];
+  return tabNames.includes(lastSegment) || lastSegment === "index";
 }

 /**
 * Get the current tab name from segments
 */
-function getCurrentTab(segments: string[]): TabRoute | undefined {
-  return segments.find(isTabRoute);
+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)",
+  );
 }

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

+  // Get current state
  const currentTab = getCurrentTab(segments);
  const atTabRoot = isAtTabRoot(segments);
  const isOnHomeRoot = atTabRoot && currentTab === "(home)";
@@ -65,24 +65,3 @@ 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/hooks/useTVRequestModal.ts
+++ b/hooks/useTVRequestModal.ts
@@ -11,12 +11,6 @@ interface ShowRequestModalParams {
  id: number;
  mediaType: MediaType;
  onRequested: () => void;
-  /**
-   * Replace the current route instead of pushing. Use when opening the request
-   * modal from another modal (e.g. the season selector) so the new sheet takes
-   * its place rather than stacking on top of it (which breaks TV focus).
-   */
-  replace?: boolean;
 }

 export const useTVRequestModal = () => {
@@ -31,11 +25,7 @@ export const useTVRequestModal = () => {
        mediaType: params.mediaType,
        onRequested: params.onRequested,
      });
-      if (params.replace) {
-        router.replace("/(auth)/tv-request-modal");
-      } else {
-        router.push("/(auth)/tv-request-modal");
-      }
+      router.push("/(auth)/tv-request-modal");
    },
    [router],
  );
--- a/hooks/useWifiSSID.ts
+++ b/hooks/useWifiSSID.ts
@@ -53,6 +53,7 @@ export function useWifiSSID(): UseWifiSSIDReturn {
  const fetchSSID = useCallback(async () => {
    if (Platform.isTV) return;
    const result = await getSSID();
+    console.log("[WiFi Debug] Native module SSID:", result);
    setSSID(result);
  }, []);

--- a/modules/background-downloader/android/src/main/AndroidManifest.xml
+++ b/modules/background-downloader/android/src/main/AndroidManifest.xml
@@ -2,8 +2,7 @@
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-
+  
  <application>
    <service
      android:name=".DownloadService"
--- a/modules/background-downloader/android/src/main/java/expo/modules/backgrounddownloader/DownloadService.kt
+++ b/modules/background-downloader/android/src/main/java/expo/modules/backgrounddownloader/DownloadService.kt
@@ -9,7 +9,6 @@ import android.content.pm.ServiceInfo
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
-import android.os.PowerManager
 import android.os.SystemClock
 import android.util.Log
 import androidx.core.app.NotificationCompat
@@ -28,7 +27,6 @@ class DownloadService : Service() {
  private var currentDownloadTitle = "Preparing download..."
  private var currentProgress = 0
  private var isForegroundStarted = false
-  private var wakeLock: PowerManager.WakeLock? = null

  inner class DownloadServiceBinder : Binder() {
    fun getService(): DownloadService = this@DownloadService
@@ -38,12 +36,6 @@ class DownloadService : Service() {
    super.onCreate()
    Log.d(TAG, "DownloadService created")
    createNotificationChannel()
-
-    val pm = getSystemService(PowerManager::class.java)
-    wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Streamyfin::DownloadWakeLock")
-    wakeLock?.acquire()
-
-    Log.d(TAG, "Wake lock acquired")
  }

  override fun onBind(intent: Intent?): IBinder {
@@ -101,8 +93,6 @@ class DownloadService : Service() {
  }
  
  override fun onDestroy() {
-    wakeLock?.let { if (it.isHeld) it.release() }
-    Log.d(TAG, "Wake lock released")
    Log.d(TAG, "DownloadService destroyed")
    super.onDestroy()
  }
--- 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:1.0.0'
+  implementation 'dev.jdtech.mpv:libmpv:0.5.1'
 }
--- 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,13 @@ package expo.modules.mpvplayer
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
-import android.os.Build
+import android.content.res.AssetManager
 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.util.Locale
+import java.io.FileOutputStream

 /**
 * MPV renderer that wraps libmpv for video playback.
@@ -36,30 +35,6 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        return uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
    }

-    /**
-     * True only on the Android emulator. Its goldfish/ranchu MediaCodec can't bind a
-     * decode output surface (decode opens with surface 0x0): HEVC then fails cleanly and
-     * mpv auto-falls-back to software, but H.264 "opens" deceptively and wedges the core
-     * (no fallback) — black video, then any command (seek/pause) deadlocks the UI thread
-     * → ANR. We force software decoding here.
-     *
-     * Only QEMU/SDK-exclusive signals are checked so a real device can never match — a
-     * false positive would needlessly drop shipping hardware to software decoding. The
-     * emulator reports ro.hardware=goldfish|ranchu, an sdk_* product, or a generic/
-     * emulator build fingerprint, none of which appear on real devices.
-     */
-    private fun isEmulator(): Boolean {
-        val hardware = Build.HARDWARE.lowercase()
-        if (hardware == "goldfish" || hardware == "ranchu") return true
-
-        val product = Build.PRODUCT
-        if (product == "sdk" || product.startsWith("sdk_")) return true
-
-        val fingerprint = Build.FINGERPRINT
-        return fingerprint.startsWith("generic") ||
-            fingerprint.contains("emulator", ignoreCase = true)
-    }
-
    interface Delegate {
        fun onPositionChanged(position: Double, duration: Double, cacheSeconds: Double)
        fun onPauseChanged(isPaused: Boolean)
@@ -76,15 +51,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    
    private var surface: Surface? = null
    private var isRunning = 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
-
+    private var isStopping = false
+    
    // Cached state
    private var cachedPosition: Double = 0.0
    private var cachedDuration: Double = 0.0
@@ -144,108 +112,100 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {

    fun start(voDriver: String = "gpu-next") {
        if (isRunning) return
-
+        
        try {
-            // 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.
+            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
            val mpvDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "mpv")
+            //Log.i(TAG, "mpv config dir: $mpvDir")
            if (!mpvDir.exists()) mpvDir.mkdirs()
-
-            // 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}")
+            // 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))
            }
-
-            mpv?.setOptionString("config", "yes")
-            mpv?.setOptionString("config-dir", mpvDir.path)
+            MPVLib.setOptionString("config", "yes")
+            MPVLib.setOptionString("config-dir", mpvDir.path)
            
            // Configure mpv options before initialization (based on Findroid)
            this.voDriver = voDriver
-            mpv?.setOptionString("vo", voDriver)
-            mpv?.setOptionString("gpu-context", "android")
-            mpv?.setOptionString("opengl-es", "yes")
+            MPVLib.setOptionString("vo", voDriver)
+            MPVLib.setOptionString("gpu-context", "android")
+            MPVLib.setOptionString("opengl-es", "yes")
            
-            // 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).
-            when {
-                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 -> mpv?.setOptionString("hwdec", "mediacodec-copy")
+            // Hardware video decoding
+            // TV: zero-copy (mediacodec) for better performance on low-power devices
+            // Mobile: copy mode (mediacodec-copy) for better compatibility
+            val isTV = isTvDevice()
+            if (isTV) {
+                MPVLib.setOptionString("hwdec", "mediacodec")
+                MPVLib.setOptionString("profile", "fast")
+            } else {
+                MPVLib.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)
-            mpv?.setOptionString("hr-seek", "no")
+            MPVLib.setOptionString("hr-seek", "no")
            // Drop frames during seeking for faster response
-            mpv?.setOptionString("hr-seek-framedrop", "yes")
+            MPVLib.setOptionString("hr-seek-framedrop", "yes")
            
            // Subtitle settings
-            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")
+            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")
            
            // Important: Start with force-window=no, will be set to yes when surface is attached
-            mpv?.setOptionString("force-window", "no")
-            mpv?.setOptionString("keep-open", "always")
-
-            mpv.initialize()
-
+            MPVLib.setOptionString("force-window", "no")
+            MPVLib.setOptionString("keep-open", "always")
+            
+            MPVLib.initialize()
+            
            // Observe properties
            observeProperties()
            
@@ -258,68 +218,21 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    }
    
    fun stop() {
+        if (isStopping) return
        if (!isRunning) return
+        
+        isStopping = true
        isRunning = 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()
+        
+        try {
+            MPVLib.removeObserver(this)
+            MPVLib.detachSurface()
+            MPVLib.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error stopping MPV: ${e.message}")
+        }
+        
+        isStopping = false
    }
    
    /**
@@ -334,10 +247,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) {
-            mpv?.attachSurface(surface)
-            mpv?.setOptionString("force-window", "yes")
+            MPVLib.attachSurface(surface)
+            MPVLib.setOptionString("force-window", "yes")
            // Read back vo to confirm it's still active
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
            Log.i(TAG, "[PiP] attachSurface — attached, activeVo=$activeVo")
        }
    }
@@ -357,8 +270,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        this.surface = null
        Log.i(TAG, "[PiP] detachSurface — isRunning=$isRunning, vo=$voDriver")
        if (isRunning) {
-            mpv?.detachSurface()
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            MPVLib.detachSurface()
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
            Log.i(TAG, "[PiP] detachSurface — detached, activeVo=$activeVo (should still be $voDriver)")
        }
    }
@@ -369,7 +282,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     */
    fun updateSurfaceSize(width: Int, height: Int) {
        if (isRunning) {
-            mpv?.setPropertyString("android-surface-size", "${width}x$height")
+            MPVLib.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")
@@ -385,9 +298,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")
-        mpv?.command(arrayOf("frame-step"))
+        MPVLib.command(arrayOf("frame-step"))
        if (pos > 0) {
-            mpv?.command(arrayOf("seek", pos.toString(), "absolute"))
+            MPVLib.command(arrayOf("seek", pos.toString(), "absolute"))
        }
    }
    
@@ -397,43 +310,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        startPosition: Double? = null,
        externalSubtitles: List<String>? = null,
        initialSubtitleId: Int? = null,
-        initialAudioId: Int? = null,
-        cacheEnabled: String? = null,
-        cacheSeconds: Int? = null,
-        demuxerMaxBytes: Int? = null,
-        demuxerMaxBackBytes: Int? = null
+        initialAudioId: 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
-        mpv?.command(arrayOf("stop"))
-
+        MPVLib.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. 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.
+        // Set start position
        if (startPosition != null && startPosition > 0) {
-            mpv?.setPropertyString("start", String.format(Locale.US, "%.2f", startPosition))
+            MPVLib.setPropertyString("start", String.format("%.2f", startPosition))
        } else {
-            mpv?.setPropertyString("start", "0")
+            MPVLib.setPropertyString("start", "0")
        }
        
        // Set initial audio track if specified
@@ -453,7 +352,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        }
        
        // Load the file
-        mpv?.command(arrayOf("loadfile", url, "replace"))
+        MPVLib.command(arrayOf("loadfile", url, "replace"))
    }
    
    fun reloadCurrentItem() {
@@ -469,29 +368,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
        }
        
        val headerString = headers.entries.joinToString("\r\n") { "${it.key}: ${it.value}" }
-        mpv?.setPropertyString("http-header-fields", headerString)
+        MPVLib.setPropertyString("http-header-fields", headerString)
    }
    
    private fun observeProperties() {
-        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)
+        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)
        // Video dimensions for PiP aspect ratio
-        mpv?.observeProperty("video-params/w", MPV_FORMAT_INT64)
-        mpv?.observeProperty("video-params/h", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64)
    }
-
+    
    // MARK: - Playback Controls
    
    fun play() {
-        mpv?.setPropertyBoolean("pause", false)
+        MPVLib.setPropertyBoolean("pause", false)
    }
    
    fun pause() {
-        mpv?.setPropertyBoolean("pause", true)
+        MPVLib.setPropertyBoolean("pause", true)
    }
    
    fun togglePause() {
@@ -501,22 +400,22 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    fun seekTo(seconds: Double) {
        val clamped = maxOf(0.0, seconds)
        cachedPosition = clamped
-        mpv?.command(arrayOf("seek", clamped.toString(), "absolute"))
+        MPVLib.command(arrayOf("seek", clamped.toString(), "absolute"))
    }
    
    fun seekBy(seconds: Double) {
        val newPosition = maxOf(0.0, cachedPosition + seconds)
        cachedPosition = newPosition
-        mpv?.command(arrayOf("seek", seconds.toString(), "relative"))
+        MPVLib.command(arrayOf("seek", seconds.toString(), "relative"))
    }
    
    fun setSpeed(speed: Double) {
        _playbackSpeed = speed
-        mpv?.setPropertyDouble("speed", speed)
+        MPVLib.setPropertyDouble("speed", speed)
    }
    
    fun getSpeed(): Double {
-        return mpv?.getPropertyDouble("speed") ?: _playbackSpeed
+        return MPVLib.getPropertyDouble("speed") ?: _playbackSpeed
    }
    
    // MARK: - Subtitle Controls
@@ -524,19 +423,19 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    fun getSubtitleTracks(): List<Map<String, Any>> {
        val tracks = mutableListOf<Map<String, Any>>()
        
-        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
+        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
        
        for (i in 0 until trackCount) {
-            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
            if (trackType != "sub") continue
            
-            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
            val track = mutableMapOf<String, Any>("id" to trackId)
            
-            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
            
-            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
            track["selected"] = selected
            
            tracks.add(track)
@@ -548,61 +447,61 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
    fun setSubtitleTrack(trackId: Int) {
        Log.i(TAG, "setSubtitleTrack: setting sid to $trackId")
        if (trackId < 0) {
-            mpv?.setPropertyString("sid", "no")
+            MPVLib.setPropertyString("sid", "no")
        } else {
-            mpv?.setPropertyInt("sid", trackId)
+            MPVLib.setPropertyInt("sid", trackId)
        }
    }
    
    fun disableSubtitles() {
-        mpv?.setPropertyString("sid", "no")
+        MPVLib.setPropertyString("sid", "no")
    }
    
    fun getCurrentSubtitleTrack(): Int {
-        return mpv?.getPropertyInt("sid") ?: 0
+        return MPVLib.getPropertyInt("sid") ?: 0
    }
    
    fun addSubtitleFile(url: String, select: Boolean = true) {
        val flag = if (select) "select" else "cached"
-        mpv?.command(arrayOf("sub-add", url, flag))
+        MPVLib.command(arrayOf("sub-add", url, flag))
    }
    
    // MARK: - Subtitle Positioning
    
    fun setSubtitlePosition(position: Int) {
-        mpv?.setPropertyInt("sub-pos", position)
+        MPVLib.setPropertyInt("sub-pos", position)
    }
    
    fun setSubtitleScale(scale: Double) {
-        mpv?.setPropertyDouble("sub-scale", scale)
+        MPVLib.setPropertyDouble("sub-scale", scale)
    }
    
    fun setSubtitleMarginY(margin: Int) {
-        mpv?.setPropertyInt("sub-margin-y", margin)
+        MPVLib.setPropertyInt("sub-margin-y", margin)
    }
    
    fun setSubtitleAlignX(alignment: String) {
-        mpv?.setPropertyString("sub-align-x", alignment)
+        MPVLib.setPropertyString("sub-align-x", alignment)
    }
    
    fun setSubtitleAlignY(alignment: String) {
-        mpv?.setPropertyString("sub-align-y", alignment)
+        MPVLib.setPropertyString("sub-align-y", alignment)
    }
    
    fun setSubtitleFontSize(size: Int) {
-        mpv?.setPropertyInt("sub-font-size", size)
+        MPVLib.setPropertyInt("sub-font-size", size)
    }

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

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

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

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

    // MARK: - Video Scaling
@@ -652,7 +551,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")
-        mpv?.setPropertyDouble("panscan", panscanValue)
+        MPVLib.setPropertyDouble("panscan", panscanValue)
    }

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

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

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

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

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

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

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

        // Demuxer cache duration (seconds of video buffered)
-        mpv?.getPropertyDouble("demuxer-cache-duration")?.let {
+        MPVLib.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
-        mpv?.getPropertyInt("frame-drop-count")?.let {
+        MPVLib.getPropertyInt("frame-drop-count")?.let {
            info["droppedFrames"] = it
        }

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

-        // Active hardware decoder.
-        // hwdec-current yields e.g. "mediacodec",
-        // "mediacodec-copy", "auto-copy" or empty when SW decoding.
-        mpv?.getPropertyString("hwdec-current")?.let {
+        // Active hardware decoder
+        MPVLib.getPropertyString("hwdec-active")?.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
    }

@@ -826,7 +704,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)
-                        mpv?.command(arrayOf("sub-add", subUrl, "auto"))
+                        MPVLib.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,29 +1,20 @@
 package expo.modules.mpvplayer

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

 /**
- * 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.
+ * Wrapper around the dev.jdtech.mpv.MPVLib class.
+ * This provides a consistent interface for the rest of the app.
 */
-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.
+object MPVLib {
+    private const val TAG = "MPVLib"
+    
+    private var initialized = false
+    
+    // Event observer interface
    interface EventObserver {
        fun eventProperty(property: String)
        fun eventProperty(property: String, value: Long)
@@ -32,144 +23,198 @@ class MPVLib private constructor(private val instance: LibMPV) {
        fun eventProperty(property: String, value: Double)
        fun event(eventId: Int)
    }
-
+    
    private val observers = mutableListOf<EventObserver>()
-
-    // Library event observer that forwards LibMPV callbacks to our observers.
+    
+    // Library event observer that forwards to our observers
    private val libObserver = object : LibMPV.EventObserver {
-        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) {
+        override fun eventProperty(property: String) {
            synchronized(observers) {
-                observers.forEach(block)
+                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)
+                }
            }
        }
    }
-
+    
    fun addObserver(observer: EventObserver) {
-        synchronized(observers) { observers.add(observer) }
-    }
-
-    fun removeObserver(observer: EventObserver) {
-        synchronized(observers) { observers.remove(observer) }
-    }
-
-    fun initialize() {
-        instance.init()
-    }
-
-    fun attachSurface(surface: android.view.Surface) {
-        instance.attachSurface(surface)
-    }
-
-    fun detachSurface() {
-        instance.detachSurface()
-    }
-
-    fun command(cmd: Array<String>) {
-        instance.command(cmd)
-    }
-
-    fun setOptionString(name: String, value: String): Int {
-        return instance.setOptionString(name, value)
-    }
-
-    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) {
-        instance.setPropertyInt(name, value)
-    }
-
-    fun setPropertyDouble(name: String, value: Double) {
-        instance.setPropertyDouble(name, value)
-    }
-
-    fun setPropertyBoolean(name: String, value: Boolean) {
-        instance.setPropertyBoolean(name, value)
-    }
-
-    fun setPropertyString(name: String, value: String) {
-        instance.setPropertyString(name, value)
-    }
-
-    fun observeProperty(name: String, format: Int) {
-        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
+        synchronized(observers) {
+            observers.add(observer)
        }
-
-        // 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
+    }
+    
+    fun removeObserver(observer: EventObserver) {
+        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()
+    }
+    
+    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 isInitialized(): Boolean = initialized
+    
+    fun attachSurface(surface: Surface) {
+        LibMPV.attachSurface(surface)
+    }
+    
+    fun detachSurface() {
+        LibMPV.detachSurface()
+    }
+    
+    fun command(cmd: Array<String?>) {
+        LibMPV.command(cmd)
+    }
+    
+    fun setOptionString(name: String, value: String): Int {
+        return LibMPV.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 setPropertyInt(name: String, value: Int) {
+        LibMPV.setPropertyInt(name, value)
+    }
+    
+    fun setPropertyDouble(name: String, value: Double) {
+        LibMPV.setPropertyDouble(name, value)
+    }
+    
+    fun setPropertyBoolean(name: String, value: Boolean) {
+        LibMPV.setPropertyBoolean(name, value)
+    }
+    
+    fun setPropertyString(name: String, value: String) {
+        LibMPV.setPropertyString(name, value)
+    }
+    
+    fun observeProperty(name: String, format: Int) {
+        LibMPV.observeProperty(name, format)
    }
 }
--- 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,11 +28,7 @@ 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,
@@ -42,11 +38,7 @@ 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,
-                    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()
+                    voDriver = source["voDriver"] as? String
                )
                
                view.loadVideo(config)
@@ -68,15 +60,6 @@ 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,11 +26,7 @@ data class VideoLoadConfig(
    val autoplay: Boolean = true,
    val initialSubtitleId: Int? = null,
    val initialAudioId: Int? = null,
-    val voDriver: String? = null,
-    val cacheEnabled: String? = null,
-    val cacheSeconds: Int? = null,
-    val demuxerMaxBytes: Int? = null,
-    val demuxerMaxBackBytes: Int? = null
+    val voDriver: String? = null
 )

 /**
@@ -64,7 +60,6 @@ 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
@@ -136,7 +131,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
            rendererStarted = true

            pendingSurface?.let { surface ->
-                activeSurface = surface
                renderer?.attachSurface(surface)
                pendingSurface = null
            }
@@ -155,11 +149,6 @@ 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
@@ -218,11 +207,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
            startPosition = config.startPosition,
            externalSubtitles = config.externalSubtitles,
            initialSubtitleId = config.initialSubtitleId,
-            initialAudioId = config.initialAudioId,
-            cacheEnabled = config.cacheEnabled,
-            cacheSeconds = config.cacheSeconds,
-            demuxerMaxBytes = config.demuxerMaxBytes,
-            demuxerMaxBackBytes = config.demuxerMaxBackBytes
+            initialAudioId = config.initialAudioId
        )

        if (config.autoplay) {
@@ -251,51 +236,6 @@ 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)
    }
@@ -539,32 +479,13 @@ 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()
-        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
+        surfaceTexture = 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,44 +1020,12 @@ 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,13 +74,7 @@ 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,49 +289,6 @@ 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,14 +89,6 @@ 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>;
@@ -162,17 +154,9 @@ 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,9 +20,6 @@ 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/modules/tv-recommendations/android/src/main/AndroidManifest.xml
+++ b/modules/tv-recommendations/android/src/main/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
  <application>
-    <receiver android:name=".TvRecommendationsReceiver" android:exported="true">
+    <receiver
+      android:name=".TvRecommendationsReceiver"
+      android:exported="true">
      <intent-filter>
        <action android:name="android.media.tv.action.INITIALIZE_PROGRAMS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" />
      </intent-filter>
    </receiver>
  </application>
--- a/modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsPublisher.kt
+++ b/modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsPublisher.kt
@@ -16,13 +16,12 @@ import androidx.tvprovider.media.tv.PreviewProgram
 import androidx.tvprovider.media.tv.TvContractCompat
 import org.json.JSONArray
 import org.json.JSONObject
-import java.security.MessageDigest

 internal object TvRecommendationsPublisher {
  private const val TAG = "TvRecommendations"
  private const val PREFS_NAME = "StreamyfinTvRecommendations"
  private const val KEY_PAYLOAD = "payload"
-  private const val KEY_CHANNEL_ID_PREFIX = "channelId_"
+  private const val KEY_CHANNEL_ID = "channelId"
  private const val KEY_PROGRAM_IDS = "programIds"
  private const val DEFAULT_CHANNEL_NAME = "Continue and Next Up"

@@ -62,61 +61,31 @@ internal object TvRecommendationsPublisher {

  fun clear(context: Context): Boolean {
    val prefs = preferences(context)
+    val channelId = prefs.getLong(KEY_CHANNEL_ID, -1L)
+    val programIds = prefs.getString(KEY_PROGRAM_IDS, null)?.let(::JSONObject)
    val contentResolver = context.contentResolver

-    // KEY_PROGRAM_IDS is now { channelId: "{ providerId: programId }" }
-    val allProgramIds = prefs.getString(KEY_PROGRAM_IDS, null)?.let(::JSONObject)
-    if (allProgramIds != null) {
+    if (programIds != null) {
      var deletedPrograms = 0
-      val channelKeys = allProgramIds.keys()
-      while (channelKeys.hasNext()) {
-        val channelIdStr = channelKeys.next()
-        val programIdsJson = allProgramIds.optString(channelIdStr)
-        if (programIdsJson.isBlank()) continue
-
-        try {
-          val programIds = JSONObject(programIdsJson)
-          val keys = programIds.keys()
-          while (keys.hasNext()) {
-            val providerId = keys.next()
-            val programId = programIds.optLong(providerId, -1L)
-            if (programId > 0L) {
-              deletePreviewProgram(contentResolver, programId)
-              deletedPrograms += 1
-            }
-          }
-        } catch (e: Exception) {
-          Log.w(TAG, "clear(): failed to parse programIds for channel $channelIdStr", e)
+      val keys = programIds.keys()
+      while (keys.hasNext()) {
+        val key = keys.next()
+        val programId = programIds.optLong(key, -1L)
+        if (programId > 0L) {
+          contentResolver.delete(
+            TvContractCompat.buildPreviewProgramUri(programId),
+            null,
+            null
+          )
+          deletedPrograms += 1
        }
-
-        // Notify the channel
-        val channelId = channelIdStr.toLongOrNull() ?: -1L
-        if (channelId > 0L) {
-          try {
-            contentResolver.notifyChange(TvContractCompat.buildChannelUri(channelId), null)
-          } catch (e: SecurityException) {
-            Log.w(TAG, "clear(): lost provider permission, cannot notify channel $channelId", e)
-          }
-        }
-
-        // Remove per-channel pref
-        prefs.edit().remove("programIds_$channelIdStr").apply()
      }
      Log.d(TAG, "clear(): deleted $deletedPrograms preview program(s)")
    }

-    // Also handle legacy format (flat { providerId: programId }) for migration
-    val legacyProgramIds = prefs.getString("legacy_" + KEY_PROGRAM_IDS, null)?.let(::JSONObject)
-    if (legacyProgramIds != null) {
-      val keys = legacyProgramIds.keys()
-      while (keys.hasNext()) {
-        val key = keys.next()
-        val programId = legacyProgramIds.optLong(key, -1L)
-        if (programId > 0L) {
-          deletePreviewProgram(contentResolver, programId)
-        }
-      }
-      prefs.edit().remove("legacy_" + KEY_PROGRAM_IDS).apply()
+    if (channelId > 0L) {
+      contentResolver.notifyChange(TvContractCompat.buildChannelUri(channelId), null)
+      Log.d(TAG, "clear(): notified channel $channelId")
    }

    prefs.edit()
@@ -127,274 +96,128 @@ internal object TvRecommendationsPublisher {
    return true
  }

-  /**
-   * Delete a single preview program from the TvProvider.
-   * Called by clear(), synchronize() (stale programs), and TvRecommendationsReceiver (user removed).
-   */
-  fun deletePreviewProgram(context: Context, programId: Long) {
-    try {
-      context.contentResolver.delete(
-        TvContractCompat.buildPreviewProgramUri(programId),
-        null,
-        null
-      )
-      Log.d(TAG, "deletePreviewProgram(): deleted programId=$programId")
-
-      // Also remove from stored programIds prefs
-      removeProgramFromPrefs(context, programId)
-    } catch (e: SecurityException) {
-      Log.w(TAG, "deletePreviewProgram(): lost provider permission for programId=$programId", e)
-    }
-  }
-
-  private fun deletePreviewProgram(contentResolver: android.content.ContentResolver, programId: Long) {
-    try {
-      contentResolver.delete(
-        TvContractCompat.buildPreviewProgramUri(programId),
-        null,
-        null
-      )
-    } catch (e: SecurityException) {
-      Log.w(TAG, "deletePreviewProgram(): lost provider permission for programId=$programId", e)
-    }
-  }
-
-  private fun removeProgramFromPrefs(context: Context, programId: Long) {
-    val prefs = preferences(context)
-    val programIdsJson = prefs.getString(KEY_PROGRAM_IDS, null) ?: return
-    try {
-      val channelMap = JSONObject(programIdsJson)
-      val channelKeys = channelMap.keys()
-      while (channelKeys.hasNext()) {
-        val channelId = channelKeys.next()
-        val inner = channelMap.optJSONObject(channelId) ?: continue
-        val providerKeys = inner.keys()
-        while (providerKeys.hasNext()) {
-          val providerId = providerKeys.next()
-          if (inner.optLong(providerId, -1L) == programId) {
-            inner.remove(providerId)
-            if (inner.length() == 0) {
-              channelMap.remove(channelId)
-            }
-            break
-          }
-        }
-      }
-      prefs.edit().putString(KEY_PROGRAM_IDS, channelMap.toString()).apply()
-    } catch (e: Exception) {
-      Log.w(TAG, "removeProgramFromPrefs(): failed to update prefs for programId=$programId", e)
-    }
-  }
-
  private fun synchronize(context: Context, payload: JSONObject): Boolean {
    val sections = payload.optJSONArray("sections") ?: JSONArray()
-    if (sections.length() == 0) {
-      Log.w(TAG, "synchronize(): no sections in payload")
-      return false
-    }
-
-    val prefs = preferences(context)
-    val allNextProgramIds = JSONObject()
-    var totalActive = 0
-    var totalDeleted = 0
-
-    for (sectionIndex in 0 until sections.length()) {
-      val section = sections.optJSONObject(sectionIndex) ?: continue
-      val sectionTitle = section.optString("title")?.takeIf { it.isNotBlank() } ?: DEFAULT_CHANNEL_NAME
-      val items = section.optJSONArray("items") ?: JSONArray()
-
-      Log.d(
-        TAG,
-        "synchronize(): section \"$sectionTitle\" ($sectionIndex/${sections.length()}) with ${items.length()} item(s)"
-      )
-
-      val channelId = getOrCreateChannel(context, sectionTitle)
-      if (channelId <= 0L) {
-        Log.w(TAG, "synchronize(): failed to get or create channel for \"$sectionTitle\"")
-        continue
-      }
-
-      // Per Android docs: check channel.isBrowsable() and request if needed.
-      if (!isChannelBrowsable(context, channelId)) {
-        Log.d(TAG, "synchronize(): channel $channelId not browsable, requesting browsable")
-        TvContractCompat.requestChannelBrowsable(context, channelId)
-      }
-
-      val prefKey = "programIds_$channelId"
-      val previousProgramIds = prefs.getString(prefKey, null)
-        ?.let(::JSONObject)
-        ?: JSONObject()
-      val nextProgramIds = JSONObject()
-      val activeProviderIds = mutableSetOf<String>()
-
-      for (index in 0 until items.length()) {
-        val item = items.optJSONObject(index) ?: continue
-        val providerId = item.optString("id")
-        if (providerId.isBlank()) continue
-
-        val programId = upsertPreviewProgram(
-          context = context,
-          channelId = channelId,
-          item = item,
-          previousProgramId = previousProgramIds.optLong(providerId, -1L),
-          weight = index
-        )
-
-        if (programId > 0L) {
-          activeProviderIds += providerId
-          nextProgramIds.put(providerId, programId)
-          Log.d(TAG, "synchronize(): upserted program for item=$providerId programId=$programId")
-        }
-      }
-
-      var deletedPrograms = 0
-      val previousKeys = previousProgramIds.keys()
-      while (previousKeys.hasNext()) {
-        val providerId = previousKeys.next()
-        if (activeProviderIds.contains(providerId)) continue
-
-        val programId = previousProgramIds.optLong(providerId, -1L)
-        if (programId > 0L) {
-          deletePreviewProgram(context, programId)
-          deletedPrograms += 1
-          Log.d(TAG, "synchronize(): deleted stale programId=$programId for item=$providerId")
-        }
-      }
-
-      allNextProgramIds.put(channelId.toString(), nextProgramIds.toString())
-      prefs.edit().putString(prefKey, nextProgramIds.toString()).apply()
-      totalActive += activeProviderIds.size
-      totalDeleted += deletedPrograms
-
-      logProviderState(context, channelId)
-    }
-
-    // Store all channel program IDs for clear() to use
-    prefs.edit().putString(KEY_PROGRAM_IDS, allNextProgramIds.toString()).apply()
+    val firstSection = if (sections.length() > 0) sections.optJSONObject(0) else null
+    val sectionTitle = firstSection?.optString("title")?.takeIf { it.isNotBlank() } ?: DEFAULT_CHANNEL_NAME
+    val items = firstSection?.optJSONArray("items") ?: JSONArray()

    Log.d(
      TAG,
-      "synchronize(): completed across ${sections.length()} section(s), $totalActive active program(s), deleted $totalDeleted stale program(s)"
+      "synchronize(): using section \"$sectionTitle\" with ${items.length()} item(s)"
+    )
+
+    val channelId = getOrCreateChannel(context, sectionTitle)
+    if (channelId <= 0L) {
+      Log.w(TAG, "synchronize(): failed to get or create preview channel")
+      return false
+    }
+
+    Log.d(TAG, "synchronize(): publishing into channelId=$channelId")
+
+    val previousProgramIds = preferences(context)
+      .getString(KEY_PROGRAM_IDS, null)
+      ?.let(::JSONObject)
+      ?: JSONObject()
+    val nextProgramIds = JSONObject()
+    val activeProviderIds = mutableSetOf<String>()
+
+    for (index in 0 until items.length()) {
+      val item = items.optJSONObject(index) ?: continue
+      val providerId = item.optString("id")
+      if (providerId.isBlank()) continue
+
+      val programId = upsertPreviewProgram(
+        context = context,
+        channelId = channelId,
+        item = item,
+        previousProgramId = previousProgramIds.optLong(providerId, -1L),
+        weight = index
+      )
+
+      if (programId > 0L) {
+        activeProviderIds += providerId
+        nextProgramIds.put(providerId, programId)
+        Log.d(TAG, "synchronize(): upserted program for item=$providerId programId=$programId")
+      }
+    }
+
+    var deletedPrograms = 0
+    val previousKeys = previousProgramIds.keys()
+    while (previousKeys.hasNext()) {
+      val providerId = previousKeys.next()
+      if (activeProviderIds.contains(providerId)) continue
+
+      val programId = previousProgramIds.optLong(providerId, -1L)
+      if (programId > 0L) {
+        context.contentResolver.delete(
+          TvContractCompat.buildPreviewProgramUri(programId),
+          null,
+          null
+        )
+        deletedPrograms += 1
+        Log.d(TAG, "synchronize(): deleted stale programId=$programId for item=$providerId")
+      }
+    }
+
+    preferences(context)
+      .edit()
+      .putLong(KEY_CHANNEL_ID, channelId)
+      .putString(KEY_PROGRAM_IDS, nextProgramIds.toString())
+      .apply()
+
+    logProviderState(context, channelId)
+
+    Log.d(
+      TAG,
+      "synchronize(): completed with ${activeProviderIds.size} active program(s), deleted $deletedPrograms stale program(s)"
    )

    return true
  }

-  /**
-   * Query provider to check if a channel is browsable.
-   * Per Android docs: "check channel.isBrowsable() before updating programs."
-   */
-  private fun isChannelBrowsable(context: Context, channelId: Long): Boolean {
-    return try {
-      context.contentResolver.query(
-        TvContractCompat.buildChannelUri(channelId),
-        null,
-        null,
-        null,
-        null
-      )?.use { cursor ->
-        if (cursor.moveToFirst()) {
-          val browsableIndex = cursor.getColumnIndex(TvContractCompat.Channels.COLUMN_BROWSABLE)
-          if (browsableIndex >= 0) cursor.getInt(browsableIndex) == 1 else true
-        } else {
-          false
-        }
-      } ?: false
-    } catch (e: SecurityException) {
-      Log.w(TAG, "isChannelBrowsable(): lost provider permission for channelId=$channelId", e)
-      true // Assume browsable if we can't check, to avoid blocking updates
-    }
-  }
-
-  /**
-   * Query provider to verify a channel actually exists.
-   * Prevents the channel-delete-recreate bug: if update() returns 0 rows
-   * we must first check whether the channel was deleted by the system
-   * or if the update simply failed for another reason.
-   */
-  private fun channelExistsInProvider(context: Context, channelId: Long): Boolean {
-    return try {
-      context.contentResolver.query(
-        TvContractCompat.buildChannelUri(channelId),
-        null,
-        null,
-        null,
-        null
-      )?.use { cursor ->
-        cursor.moveToFirst()
-      } ?: false
-    } catch (e: SecurityException) {
-      Log.w(TAG, "channelExistsInProvider(): lost provider permission for channelId=$channelId", e)
-      false
-    }
-  }
-
  private fun getOrCreateChannel(context: Context, displayName: String): Long {
    val prefs = preferences(context)
-    val channelKey = getChannelKey(displayName)
-    val existingChannelId = prefs.getLong(channelKey, -1L)
+    val existingChannelId = prefs.getLong(KEY_CHANNEL_ID, -1L)
    val contentResolver = context.contentResolver

    if (existingChannelId > 0L) {
-      // Query provider first to verify channel actually exists (prevents recreate bug)
-      val exists = channelExistsInProvider(context, existingChannelId)
+      val updated = Channel.Builder()
+        .setType(TvContractCompat.Channels.TYPE_PREVIEW)
+        .setDisplayName(displayName)
+        .setAppLinkIntentUri(buildIntentUri(context, "streamyfin://"))
+        .build()

-      if (exists) {
-        // Channel exists — update it in place, never recreate
-        val updated = Channel.Builder()
-          .setType(TvContractCompat.Channels.TYPE_PREVIEW)
-          .setDisplayName(displayName)
-          .setAppLinkIntentUri(buildIntentUri(context, "streamyfin://"))
-          .build()
+      val updatedRows = contentResolver.update(
+        TvContractCompat.buildChannelUri(existingChannelId),
+        updated.toContentValues(),
+        null,
+        null
+      )

-        try {
-          val updatedRows = contentResolver.update(
-            TvContractCompat.buildChannelUri(existingChannelId),
-            updated.toContentValues(),
-            null,
-            null
-          )
-
-          if (updatedRows > 0) {
-            TvContractCompat.requestChannelBrowsable(context, existingChannelId)
-            storeChannelLogo(context, existingChannelId)
-            Log.d(TAG, "getOrCreateChannel(): updated existing channelId=$existingChannelId and requested browsable")
-            return existingChannelId
-          }
-
-          // Update returned 0 rows but channel exists — log and return existing ID, don't recreate
-          Log.e(TAG, "getOrCreateChannel(): update returned 0 for existing channelId=$existingChannelId but channel exists — not recreating")
-          return existingChannelId
-        } catch (e: SecurityException) {
-          Log.w(TAG, "getOrCreateChannel(): lost provider permission updating channelId=$existingChannelId", e)
-          return existingChannelId
-        }
+      if (updatedRows > 0) {
+        TvContractCompat.requestChannelBrowsable(context, existingChannelId)
+        storeChannelLogo(context, existingChannelId)
+        Log.d(TAG, "getOrCreateChannel(): updated existing channelId=$existingChannelId and requested browsable")
+        return existingChannelId
      }

-      // Channel truly doesn't exist in provider — recreate
-      Log.w(TAG, "getOrCreateChannel(): channelId=$existingChannelId not in provider, recreating")
-      prefs.edit().remove(channelKey).apply()
+      Log.w(TAG, "getOrCreateChannel(): stored channelId=$existingChannelId was stale, recreating")
+      prefs.edit().remove(KEY_CHANNEL_ID).apply()
    }

-    // Create a new channel
    val channel = Channel.Builder()
      .setType(TvContractCompat.Channels.TYPE_PREVIEW)
      .setDisplayName(displayName)
      .setAppLinkIntentUri(buildIntentUri(context, "streamyfin://"))
      .build()

-    val channelUri = try {
-      contentResolver.insert(
-        TvContractCompat.Channels.CONTENT_URI,
-        channel.toContentValues()
-      )
-    } catch (e: SecurityException) {
-      Log.e(TAG, "getOrCreateChannel(): lost provider permission, cannot create channel", e)
-      null
-    } ?: return -1L
+    val channelUri = contentResolver.insert(
+      TvContractCompat.Channels.CONTENT_URI,
+      channel.toContentValues()
+    ) ?: return -1L

    val channelId = ContentUris.parseId(channelUri)
-    prefs.edit().putLong(channelKey, channelId).apply()
    TvContractCompat.requestChannelBrowsable(context, channelId)
    storeChannelLogo(context, channelId)
    Log.d(TAG, "getOrCreateChannel(): created new channelId=$channelId displayName=\"$displayName\"")
@@ -402,10 +225,6 @@ internal object TvRecommendationsPublisher {
    return channelId
  }

-  private fun getChannelKey(displayName: String): String {
-    return KEY_CHANNEL_ID_PREFIX + displayName.hashCode()
-  }
-
  private fun upsertPreviewProgram(
    context: Context,
    channelId: Long,
@@ -430,67 +249,42 @@ internal object TvRecommendationsPublisher {
      builder.setDescription(it)
    }

-    // Per Android docs: use unique URIs for all images to avoid stale cache
    imageUrl.takeIf { it.isNotBlank() }?.let {
-      val uniqueImageUrl = appendCacheBuster(it)
-      val imageUri = Uri.parse(uniqueImageUrl)
+      val imageUri = Uri.parse(it)
      builder.setPosterArtUri(imageUri)
      builder.setThumbnailUri(imageUri)
    }

+
    val contentValues = builder.build().toContentValues()
    val contentResolver = context.contentResolver

    if (previousProgramId > 0L) {
-      try {
-        val updatedRows = contentResolver.update(
-          TvContractCompat.buildPreviewProgramUri(previousProgramId),
-          contentValues,
-          null,
-          null
-        )
+      val updatedRows = contentResolver.update(
+        TvContractCompat.buildPreviewProgramUri(previousProgramId),
+        contentValues,
+        null,
+        null
+      )

-        if (updatedRows > 0) {
-          Log.d(TAG, "upsertPreviewProgram(): updated existing programId=$previousProgramId")
-          return previousProgramId
-        }
-
-        Log.w(TAG, "upsertPreviewProgram(): existing programId=$previousProgramId was stale, inserting new row")
-      } catch (e: SecurityException) {
-        Log.w(TAG, "upsertPreviewProgram(): lost provider permission for programId=$previousProgramId", e)
+      if (updatedRows > 0) {
+        Log.d(TAG, "upsertPreviewProgram(): updated existing programId=$previousProgramId")
+        return previousProgramId
      }
+
+      Log.w(TAG, "upsertPreviewProgram(): existing programId=$previousProgramId was stale, inserting new row")
    }

-    val insertedUri = try {
-      contentResolver.insert(
-        TvContractCompat.PreviewPrograms.CONTENT_URI,
-        contentValues
-      )
-    } catch (e: SecurityException) {
-      Log.w(TAG, "upsertPreviewProgram(): lost provider permission, cannot insert program", e)
-      null
-    } ?: return -1L
+    val insertedUri = contentResolver.insert(
+      TvContractCompat.PreviewPrograms.CONTENT_URI,
+      contentValues
+    ) ?: return -1L

    val programId = ContentUris.parseId(insertedUri)
    Log.d(TAG, "upsertPreviewProgram(): inserted new programId=$programId")
    return programId
  }

-  /**
-   * Append a stable cache key derived from the image URL.
-   * The Jellyfin image URLs already include a `tag=` query param (etag)
-   * that changes whenever the image content changes, so a deterministic
-   * hash of the URL is sufficient — the param only changes when the URL
-   * (and therefore the image) actually changes, avoiding unnecessary
-   * re-downloads on every sync.
-   */
-  private fun appendCacheBuster(imageUrl: String): String {
-    val digest = MessageDigest.getInstance("MD5").digest(imageUrl.toByteArray())
-    val hash = digest.joinToString("") { "%02x".format(it) }.substring(0, 16)
-    val separator = if (imageUrl.contains("?")) "&" else "?"
-    return "$imageUrl${separator}_v=$hash"
-  }
-
  private fun buildIntentUri(context: Context, deepLink: String): Uri {
    val intent = Intent(Intent.ACTION_VIEW).apply {
      data = Uri.parse(deepLink)
@@ -512,17 +306,13 @@ internal object TvRecommendationsPublisher {

  private fun storeChannelLogo(context: Context, channelId: Long) {
    val bitmap = applicationIconBitmap(context) ?: return
-    try {
-      val outputStream = context.contentResolver.openOutputStream(
-        TvContractCompat.buildChannelLogoUri(channelId)
-      ) ?: return
+    val outputStream = context.contentResolver.openOutputStream(
+      TvContractCompat.buildChannelLogoUri(channelId)
+    ) ?: return

-      outputStream.use { stream ->
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
-        stream.flush()
-      }
-    } catch (e: SecurityException) {
-      Log.w(TAG, "storeChannelLogo(): lost provider permission for channelId=$channelId", e)
+    outputStream.use { stream ->
+      bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
+      stream.flush()
    }
  }

@@ -551,14 +341,9 @@ internal object TvRecommendationsPublisher {
    return bitmap
  }

-  fun getChannelId(context: Context, displayName: String = DEFAULT_CHANNEL_NAME): Long {
-    return preferences(context).getLong(getChannelKey(displayName), -1L)
-  }
-
  private fun preferences(context: Context): SharedPreferences {
    return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
  }
-
  private fun logProviderState(context: Context, channelId: Long) {
    val contentResolver = context.contentResolver

@@ -587,10 +372,8 @@ internal object TvRecommendationsPublisher {
          Log.w(TAG, "logProviderState(): channelId=$channelId exists=false")
        }
      } ?: Log.w(TAG, "logProviderState(): channel query returned null for channelId=$channelId")
-} catch (error: SecurityException) {
-  Log.w(TAG, "logProviderState(): lost provider permission for channelId=$channelId", error)
-} catch (error: Exception) {
-  Log.w(TAG, "logProviderState(): failed to query channelId=$channelId", error)
-}
+    } catch (error: Exception) {
+      Log.w(TAG, "logProviderState(): failed to query channelId=$channelId", error)
+    }
  }
 }
--- a/modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsReceiver.kt
+++ b/modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsReceiver.kt
@@ -3,24 +3,16 @@ package expo.modules.tvrecommendations
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.ContentUris
 import android.util.Log
 import androidx.tvprovider.media.tv.TvContractCompat

 class TvRecommendationsReceiver : BroadcastReceiver() {
  override fun onReceive(context: Context, intent: Intent) {
-    when (intent.action) {
-      TvContractCompat.ACTION_INITIALIZE_PROGRAMS -> {
-        Log.d("TvRecommendations", "Handling INITIALIZE_PROGRAMS broadcast")
-        TvRecommendationsPublisher.refreshFromCache(context)
-      }
-      "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" -> {
-        val programId = intent.data?.let { ContentUris.parseId(it) } ?: -1L
-        if (programId > 0L) {
-          Log.d("TvRecommendations", "Handling PREVIEW_PROGRAM_BROWSABLE_DISABLED for programId=$programId")
-          TvRecommendationsPublisher.deletePreviewProgram(context, programId)
-        }
-      }
+    if (intent.action != TvContractCompat.ACTION_INITIALIZE_PROGRAMS) {
+      return
    }
+
+    Log.d("TvRecommendations", "Handling INITIALIZE_PROGRAMS broadcast")
+    TvRecommendationsPublisher.refreshFromCache(context)
  }
 }
--- a/modules/tv-search/src/TvSearchView.tsx
+++ b/modules/tv-search/src/TvSearchView.tsx
@@ -1,19 +1,12 @@
 import { requireNativeView } from "expo";
 import * as React from "react";
 import type { View } from "react-native";
-import { Platform } from "react-native";

 import type { TvSearchViewProps } from "./TvSearchView.types";

-// The native TvSearchModule is Apple-only (tvOS SwiftUI `.searchable`).
-// On Android the component is never rendered, but we must avoid calling
-// `requireNativeView` at module-scope because it would crash on import.
 const NativeView: React.ComponentType<
  TvSearchViewProps & React.RefAttributes<View>
-> =
-  Platform.OS === "ios"
-    ? requireNativeView("TvSearchModule")
-    : ((() => null) as any);
+> = requireNativeView("TvSearchModule");

 /**
 * Forwards its ref to the underlying native view so it can be used as a
--- a/modules/wifi-ssid/index.ts
+++ b/modules/wifi-ssid/index.ts
@@ -15,6 +15,7 @@ const WifiSsidModule =
 */
 export async function getSSID(): Promise<string | null> {
  if (!WifiSsidModule) {
+    console.log("[WifiSsid] Module not available on this platform");
    return null;
  }

--- a/package.json
+++ b/package.json
@@ -22,58 +22,56 @@
    "lint": "biome check --write --unsafe --max-diagnostics 1000",
    "format": "biome format --write .",
    "doctor": "expo-doctor",
-    "i18n:check": "bun scripts/check-i18n-keys.mjs",
-    "i18n:fix-unused": "bun scripts/check-i18n-keys.mjs --fix-unused",
-    "test": "bun run typecheck && bun run lint && bun run format && bun run i18n:check && bun run doctor",
+    "test": "bun run typecheck && bun run lint && bun run format && bun run doctor",
    "postinstall": "patch-package"
  },
  "dependencies": {
    "@bottom-tabs/react-navigation": "1.2.0",
    "@douglowder/expo-av-route-picker-view": "^0.0.5",
-    "@expo/metro-runtime": "~56.0.15",
+    "@expo/metro-runtime": "~56.0.13",
    "@expo/react-native-action-sheet": "^4.1.1",
-    "@expo/ui": "~56.0.17",
+    "@expo/ui": "~56.0.14",
    "@expo/vector-icons": "^15.0.3",
    "@gorhom/bottom-sheet": "5.2.14",
    "@jellyfin/sdk": "^0.13.0",
    "@react-native-community/netinfo": "^12.0.0",
    "@react-navigation/material-top-tabs": "7.4.28",
    "@react-navigation/native": "^7.2.5",
-    "@shopify/flash-list": "2.0.3",
+    "@shopify/flash-list": "2.0.2",
    "@tanstack/query-sync-storage-persister": "^5.100.14",
    "@tanstack/react-pacer": "^0.19.1",
    "@tanstack/react-query": "5.100.14",
    "@tanstack/react-query-persist-client": "^5.100.14",
    "axios": "^1.7.9",
-    "expo": "~56.0.11",
+    "expo": "~56.0.6",
    "expo-application": "~56.0.3",
-    "expo-asset": "~56.0.17",
-    "expo-audio": "~56.0.12",
-    "expo-background-task": "~56.0.18",
+    "expo-asset": "~56.0.15",
+    "expo-audio": "~56.0.11",
+    "expo-background-task": "~56.0.15",
    "expo-blur": "~56.0.3",
    "expo-brightness": "~56.0.5",
-    "expo-build-properties": "~56.0.18",
-    "expo-camera": "~56.0.8",
-    "expo-constants": "~56.0.18",
+    "expo-build-properties": "~56.0.15",
+    "expo-camera": "~56.0.7",
+    "expo-constants": "~56.0.16",
    "expo-crypto": "~56.0.4",
-    "expo-dev-client": "~56.0.20",
+    "expo-dev-client": "~56.0.16",
    "expo-device": "~56.0.4",
-    "expo-font": "~56.0.6",
+    "expo-font": "~56.0.5",
    "expo-haptics": "~56.0.3",
-    "expo-image": "~56.0.11",
+    "expo-image": "~56.0.9",
    "expo-linear-gradient": "~56.0.4",
-    "expo-linking": "~56.0.14",
+    "expo-linking": "~56.0.12",
    "expo-localization": "~56.0.6",
-    "expo-location": "~56.0.17",
-    "expo-notifications": "~56.0.17",
-    "expo-router": "~56.2.10",
+    "expo-location": "~56.0.14",
+    "expo-notifications": "~56.0.14",
+    "expo-router": "~56.2.7",
    "expo-screen-orientation": "~56.0.5",
    "expo-secure-store": "~56.0.4",
-    "expo-sharing": "~56.0.17",
+    "expo-sharing": "~56.0.14",
    "expo-splash-screen": "~56.0.10",
    "expo-status-bar": "~56.0.4",
    "expo-system-ui": "~56.0.5",
-    "expo-task-manager": "~56.0.18",
+    "expo-task-manager": "~56.0.15",
    "expo-web-browser": "~56.0.5",
    "i18next": "^26.3.0",
    "jotai": "2.20.0",
@@ -128,15 +126,14 @@
    "@react-native-tvos/config-tv": "0.1.6",
    "@types/jest": "29.5.14",
    "@types/lodash": "4.17.24",
-    "@types/node": "^18.19.130",
    "@types/react": "~19.2.10",
    "@types/react-test-renderer": "19.1.0",
    "cross-env": "10.1.0",
-    "expo-doctor": "1.19.9",
+    "expo-doctor": "1.19.7",
    "husky": "9.1.7",
-    "lint-staged": "17.0.8",
+    "lint-staged": "17.0.5",
    "react-test-renderer": "19.2.3",
-    "typescript": "6.0.3"
+    "typescript": "5.9.3"
  },
  "expo": {
    "doctor": {
@@ -144,7 +141,6 @@
        "exclude": [
          "react-native-google-cast",
          "react-native-udp",
-          "react-native-track-player",
          "@jellyfin/sdk"
        ],
        "listUnknownPackages": false
--- a/plugins/withGradleProperties.js
+++ b/plugins/withGradleProperties.js
@@ -27,9 +27,6 @@ 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/hooks/useDownloadEventHandlers.ts
+++ b/providers/Downloads/hooks/useDownloadEventHandlers.ts
@@ -142,12 +142,31 @@ export function useDownloadEventHandlers({
        } else {
          // Transcoding - estimate from bitrate
          const process = processes.find((p) => p.id === processId);
-          if (process?.maxBitrate.value && process.item.RunTimeTicks) {
-            const { estimateDownloadSize } = require("@/utils/download");
-            estimatedTotalBytes = estimateDownloadSize(
-              process.maxBitrate.value,
-              process.item.RunTimeTicks,
-            );
+          console.log(
+            `[DPL] Transcoding detected, looking for process ${processId}, found:`,
+            process ? "yes" : "no",
+          );
+          if (process) {
+            console.log(`[DPL] Process bitrate:`, {
+              key: process.maxBitrate.key,
+              value: process.maxBitrate.value,
+              runTimeTicks: process.item.RunTimeTicks,
+            });
+            if (process.maxBitrate.value && process.item.RunTimeTicks) {
+              const { estimateDownloadSize } = require("@/utils/download");
+              estimatedTotalBytes = estimateDownloadSize(
+                process.maxBitrate.value,
+                process.item.RunTimeTicks,
+              );
+              console.log(
+                `[DPL] Calculated estimatedTotalBytes:`,
+                estimatedTotalBytes,
+              );
+            } else {
+              console.log(
+                `[DPL] Cannot estimate size - bitrate.value or RunTimeTicks missing`,
+              );
+            }
          }
        }

--- a/providers/JellyfinProvider.tsx
+++ b/providers/JellyfinProvider.tsx
@@ -40,7 +40,6 @@ import {
 } from "@/utils/secureCredentials";
 import { store } from "@/utils/store";
 import { clearTVDiscoverySafely } from "@/utils/tvDiscovery/sync";
-import { APP_VERSION } from "@/utils/version";

 interface Server {
  address: string;
@@ -54,7 +53,7 @@ const initialApi = (() => {
      const id = getOrSetDeviceId();
      const deviceName = getDeviceNameSync();
      const jellyfinInstance = new Jellyfin({
-        clientInfo: { name: "Streamyfin", version: APP_VERSION },
+        clientInfo: { name: "Streamyfin", version: "0.54.1" },
        deviceInfo: {
          name: deviceName,
          id,
@@ -136,7 +135,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
      const id = getOrSetDeviceId();
      const deviceName = getDeviceNameSync();
      return new Jellyfin({
-        clientInfo: { name: "Streamyfin", version: APP_VERSION },
+        clientInfo: { name: "Streamyfin", version: "0.54.1" },
        deviceInfo: {
          name: deviceName,
          id,
@@ -170,7 +169,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    return {
      authorization: `MediaBrowser Client="Streamyfin", Device=${
        Platform.OS === "android" ? "Android" : "iOS"
-      }, DeviceId="${deviceId}", Version="${APP_VERSION}"`,
+      }, DeviceId="${deviceId}", Version="0.54.1"`,
    };
  }, [deviceId]);

--- a/providers/WebSocketProvider.tsx
+++ b/providers/WebSocketProvider.tsx
@@ -1,5 +1,4 @@
 import { getSessionApi } from "@jellyfin/sdk/lib/utils/api";
-import { router } from "expo-router";
 import { useAtomValue } from "jotai";
 import {
  createContext,
@@ -12,6 +11,7 @@ import {
  useState,
 } from "react";
 import { AppState, type AppStateStatus } from "react-native";
+import useRouter from "@/hooks/useAppRouter";
 import { useNetworkAwareQueryClient } from "@/hooks/useNetworkAwareQueryClient";
 import { apiAtom, getOrSetDeviceId } from "@/providers/JellyfinProvider";
 import { useNetworkStatus } from "@/providers/NetworkStatusProvider";
@@ -28,20 +28,6 @@ const LIBRARY_CHANGE_QUERY_KEYS = [
  ["episodes"],
 ] as const;

-// Query keys that depend on per-user playback state (resume position, played
-// status, favorites) and should be refreshed when the server reports a
-// `UserDataChanged`. Scoped to the progression-based sections so finishing an
-// episode does not pointlessly refetch "recently added" or suggestions.
-const USER_DATA_CHANGE_QUERY_KEYS = [
-  ["home", "continueAndNextUp"],
-  ["home", "resumeItems"],
-  ["home", "nextUp-all"],
-  ["home", "heroItems"],
-  ["resumeItems"],
-  ["nextUp-all"],
-  ["nextUp"],
-] as const;
-
 interface WebSocketMessage {
  MessageType: string;
  Data: any;
@@ -52,30 +38,10 @@ interface WebSocketProviderProps {
  children: ReactNode;
 }

-/**
- * Handler invoked for every message of a given `MessageType`. Receives the
- * message `Data` payload and the full message.
- */
-type WebSocketMessageHandler = (data: any, message: WebSocketMessage) => void;
-
 interface WebSocketContextType {
  ws: WebSocket | null;
  isConnected: boolean;
-  /**
-   * @deprecated Prefer `subscribe`. `lastMessage` only keeps the most recent
-   * message, so bursts arriving in the same tick are coalesced and lost. Kept
-   * for `useWebsockets` (GeneralCommand handling) until it is migrated.
-   */
  lastMessage: WebSocketMessage | null;
-  /**
-   * Subscribe to a given message type. The handler is called synchronously for
-   * every matching message (no coalescing, unlike `lastMessage`). Returns an
-   * unsubscribe function to call on cleanup.
-   */
-  subscribe: (
-    messageType: string,
-    handler: WebSocketMessageHandler,
-  ) => () => void;
  sendMessage: (message: any) => void;
  clearLastMessage: () => void;
 }
@@ -88,6 +54,7 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
  const [ws, setWs] = useState<WebSocket | null>(null);
  const [isConnected, setIsConnected] = useState(false);
  const [lastMessage, setLastMessage] = useState<WebSocketMessage | null>(null);
+  const router = useRouter();
  const queryClient = useNetworkAwareQueryClient();
  const deviceId = useMemo(() => {
    return getOrSetDeviceId();
@@ -96,76 +63,8 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
  const libraryChangeDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(
    null,
  );
-  const userDataChangeDebounceRef = useRef<ReturnType<
-    typeof setTimeout
-  > | null>(null);
-  // Handle for the onerror backoff timer. Tracked so a reconnect triggered by
-  // another path (foreground, network reconnect, effect re-run) can cancel a
-  // pending one — an untracked timer would later open a second socket.
-  const reconnectTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(
-    null,
-  );
-
-  // Pub/sub registry: messageType -> set of handlers. Stored in a ref so
-  // subscribing/dispatching never triggers a re-render.
-  const listenersRef = useRef<Map<string, Set<WebSocketMessageHandler>>>(
-    new Map(),
-  );
-
-  const subscribe = useCallback(
-    (messageType: string, handler: WebSocketMessageHandler) => {
-      const listeners = listenersRef.current;
-      let handlers = listeners.get(messageType);
-      if (!handlers) {
-        handlers = new Set();
-        listeners.set(messageType, handlers);
-      }
-      handlers.add(handler);
-      return () => {
-        handlers?.delete(handler);
-        // Only drop the map entry if it still points at THIS set. After an
-        // unsubscribe + re-subscribe for the same type, a stale second call to
-        // this cleanup would otherwise delete the new subscribers' set and
-        // silently stop delivering their messages.
-        if (
-          handlers &&
-          handlers.size === 0 &&
-          listeners.get(messageType) === handlers
-        ) {
-          listeners.delete(messageType);
-        }
-      };
-    },
-    [],
-  );
-
-  const dispatchMessage = useCallback((message: WebSocketMessage) => {
-    const handlers = listenersRef.current.get(message.MessageType);
-    if (!handlers || handlers.size === 0) return;
-    // Copy to tolerate handlers that unsubscribe during dispatch.
-    for (const handler of [...handlers]) {
-      // Isolate each handler so one throwing subscriber can't abort the rest
-      // (and isn't misreported as a parse failure by the outer onmessage catch).
-      try {
-        handler(message.Data, message);
-      } catch (error) {
-        console.error(
-          `Error handling WebSocket message type "${message.MessageType}":`,
-          error,
-        );
-      }
-    }
-  }, []);

  const connectWebSocket = useCallback(() => {
-    // Cancel any reconnect queued by a previous onerror before opening a new
-    // socket, so we never end up with two live sockets — each would double the
-    // message fan-out and double-invalidate queries.
-    if (reconnectTimeoutRef.current) {
-      clearTimeout(reconnectTimeoutRef.current);
-      reconnectTimeoutRef.current = null;
-    }
-
    if (!deviceId || !api?.accessToken || !isNetworkConnected) {
      return;
    }
@@ -186,10 +85,6 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
    newWebSocket.onopen = () => {
      setIsConnected(true);
      reconnectAttemptsRef.current = 0;
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-        reconnectTimeoutRef.current = null;
-      }
      keepAliveInterval = setInterval(() => {
        if (newWebSocket.readyState === WebSocket.OPEN) {
          newWebSocket.send(JSON.stringify({ MessageType: "KeepAlive" }));
@@ -201,15 +96,9 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
      // Don't log errors - this is expected when offline or server unreachable
      setIsConnected(false);

-      // Replace any still-pending reconnect so only one is ever queued; the
-      // previously untracked handle could leak and open a second socket.
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-      }
      if (reconnectAttemptsRef.current < maxReconnectAttempts) {
        reconnectAttemptsRef.current++;
-        reconnectTimeoutRef.current = setTimeout(() => {
-          reconnectTimeoutRef.current = null;
+        setTimeout(() => {
          connectWebSocket();
        }, reconnectDelay);
      }
@@ -224,10 +113,7 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
    newWebSocket.onmessage = (e) => {
      try {
        const message = JSON.parse(e.data);
-        // Legacy single-slot state, still consumed by useWebsockets.
-        setLastMessage(message);
-        // Pub/sub: deliver to every subscriber without coalescing.
-        dispatchMessage(message);
+        setLastMessage(message); // Store the last message in context
      } catch (error) {
        console.error("Error parsing WebSocket message:", error);
      }
@@ -238,13 +124,9 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
      if (keepAliveInterval) {
        clearInterval(keepAliveInterval);
      }
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-        reconnectTimeoutRef.current = null;
-      }
      newWebSocket.close();
    };
-  }, [api, deviceId, isNetworkConnected, dispatchMessage]);
+  }, [api, deviceId, isNetworkConnected]);

  const handleLibraryChanged = useCallback(
    (data: any) => {
@@ -275,80 +157,47 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
    [queryClient],
  );

-  const handleUserDataChanged = useCallback(
-    (data: any) => {
-      // Jellyfin sends UserDataChanged when playback position, played status
-      // or favorites change (e.g. finishing an episode). Only the
-      // progression-based home sections care about it.
-      if (!((data?.UserDataList?.length ?? 0) > 0)) {
-        return;
-      }
-
-      // Finishing an item can emit several UserDataChanged messages, so
-      // debounce to invalidate the affected sections only once.
-      if (userDataChangeDebounceRef.current) {
-        clearTimeout(userDataChangeDebounceRef.current);
-      }
-      userDataChangeDebounceRef.current = setTimeout(() => {
-        for (const queryKey of USER_DATA_CHANGE_QUERY_KEYS) {
-          queryClient.invalidateQueries({ queryKey: [...queryKey] });
-        }
-      }, 800);
-    },
-    [queryClient],
-  );
-
-  // Refresh library-dependent queries when the server reports a change.
-  useEffect(
-    () => subscribe("LibraryChanged", handleLibraryChanged),
-    [subscribe, handleLibraryChanged],
-  );
-
-  // Refresh "Continue Watching" / "Next Up" when playback state changes.
-  useEffect(
-    () => subscribe("UserDataChanged", handleUserDataChanged),
-    [subscribe, handleUserDataChanged],
-  );
+  useEffect(() => {
+    if (!lastMessage) {
+      return;
+    }
+    if (lastMessage.MessageType === "Play") {
+      handlePlayCommand(lastMessage.Data);
+    } else if (lastMessage.MessageType === "LibraryChanged") {
+      handleLibraryChanged(lastMessage.Data);
+    }
+  }, [lastMessage, router, handleLibraryChanged]);

  useEffect(() => {
    return () => {
      if (libraryChangeDebounceRef.current) {
        clearTimeout(libraryChangeDebounceRef.current);
      }
-      if (userDataChangeDebounceRef.current) {
-        clearTimeout(userDataChangeDebounceRef.current);
-      }
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-      }
    };
  }, []);

-  const handlePlayCommand = useCallback((data: any) => {
-    if (!data?.ItemIds?.length) {
-      return;
-    }
+  const handlePlayCommand = useCallback(
+    (data: any) => {
+      if (!data?.ItemIds?.length) {
+        return;
+      }

-    const itemId = data.ItemIds[0];
+      const itemId = data.ItemIds[0];

-    router.push({
-      pathname: "/(auth)/player/direct-player",
-      params: {
-        itemId: itemId,
-        playCommand: data.PlayCommand || "PlayNow",
-        audioIndex: data.AudioStreamIndex?.toString(),
-        subtitleIndex: data.SubtitleStreamIndex?.toString(),
-        mediaSourceId: data.MediaSourceId || "",
-        bitrateValue: "",
-        offline: "false",
-      },
-    });
-  }, []);
-
-  // Server-initiated "Play me this item" remote command.
-  useEffect(
-    () => subscribe("Play", handlePlayCommand),
-    [subscribe, handlePlayCommand],
+      router.push({
+        pathname: "/(auth)/player/direct-player",
+        params: {
+          itemId: itemId,
+          playCommand: data.PlayCommand || "PlayNow",
+          audioIndex: data.AudioStreamIndex?.toString(),
+          subtitleIndex: data.SubtitleStreamIndex?.toString(),
+          mediaSourceId: data.MediaSourceId || "",
+          bitrateValue: "",
+          offline: "false",
+        },
+      });
+    },
+    [router],
  );

  useEffect(() => {
@@ -418,14 +267,7 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
  }, []);
  return (
    <WebSocketContext.Provider
-      value={{
-        ws,
-        isConnected,
-        lastMessage,
-        subscribe,
-        sendMessage,
-        clearLastMessage,
-      }}
+      value={{ ws, isConnected, lastMessage, sendMessage, clearLastMessage }}
    >
      {children}
    </WebSocketContext.Provider>
--- a/scripts/check-i18n-keys.mjs
+++ b/scripts/check-i18n-keys.mjs
@@ -1,273 +0,0 @@
-#!/usr/bin/env bun
-/**
- * i18n key checker for Streamyfin.
- *
- * Detects:
- *   - MISSING keys: a static `t("a.b.c")` / `i18nKey="a.b.c"` referenced in the code
- *     that does not exist in the source locale (translations/en.json). These are bugs —
- *     the app renders the raw key. Always fails CI.
- *   - UNUSED (dead) keys: a key in the source locale that is referenced nowhere in the
- *     code, neither statically nor via a detected dynamic prefix (`t(`a.b.${x}`)`).
- *     These are dead weight that also clutter every locale on Crowdin.
- *
- * Dynamic usage is handled conservatively:
- *   - `t(`prefix.${x}`)`  -> every key starting with `prefix.` is considered used.
- *   - `t(`${x}`)`         -> fully dynamic, reported for manual review, never used to
- *                            whitelist keys (in Streamyfin these are user-defined section
- *                            titles, not translation keys).
- *   - Edge cases the static scan cannot see can be allow-listed in the config file.
- *
- * Usage:
- *   bun scripts/check-i18n-keys.mjs                # report + exit 1 on missing OR unused
- *   bun scripts/check-i18n-keys.mjs --unused=warn  # exit 1 only on missing; unused = warning
- *   bun scripts/check-i18n-keys.mjs --unused=off   # ignore unused entirely
- *   bun scripts/check-i18n-keys.mjs --json         # machine-readable output
- *   bun scripts/check-i18n-keys.mjs --fix-unused   # remove dead keys from en.json (Crowdin syncs the rest)
- */
-
-import {
-  existsSync,
-  readdirSync,
-  readFileSync,
-  statSync,
-  writeFileSync,
-} from "node:fs";
-import { extname, join, relative } from "node:path";
-
-const ROOT = process.cwd();
-const args = process.argv.slice(2);
-const flag = (name, def) => {
-  const a = args.find((x) => x === `--${name}` || x.startsWith(`--${name}=`));
-  if (!a) return def;
-  const [, v] = a.split("=");
-  return v === undefined ? true : v;
-};
-const UNUSED_MODE = String(flag("unused", "error")); // error | warn | off
-const JSON_OUT = !!flag("json", false);
-const FIX_UNUSED = !!flag("fix-unused", false);
-
-// ---- config ----
-const CONFIG_PATH = join(ROOT, "scripts", "i18n-keys.config.json");
-const DEFAULT_CONFIG = {
-  localesDir: "translations",
-  sourceLocale: "en",
-  // Scan the whole repo by default so keys referenced outside the obvious dirs
-  // (e.g. packages/, key constants in utils/atoms) are not wrongly flagged as dead.
-  srcDirs: ["."],
-  srcExtensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"],
-  excludeDirs: [
-    "node_modules",
-    "ios",
-    "android",
-    ".expo",
-    ".git",
-    "dist",
-    "build",
-    "translations",
-    "scripts",
-  ],
-  // Keys (or glob-ish prefixes ending with .* or *) known to be used dynamically / externally.
-  ignoreUnused: [],
-};
-const config = existsSync(CONFIG_PATH)
-  ? { ...DEFAULT_CONFIG, ...JSON.parse(readFileSync(CONFIG_PATH, "utf8")) }
-  : DEFAULT_CONFIG;
-
-// ---- helpers ----
-const flatten = (obj, prefix = "", out = {}) => {
-  for (const [k, v] of Object.entries(obj)) {
-    const key = prefix ? `${prefix}.${k}` : k;
-    if (v && typeof v === "object" && !Array.isArray(v)) flatten(v, key, out);
-    else out[key] = v;
-  }
-  return out;
-};
-
-const globMatch = (key, pattern) => {
-  if (pattern.endsWith(".*"))
-    return key === pattern.slice(0, -2) || key.startsWith(pattern.slice(0, -1));
-  if (pattern.endsWith("*")) return key.startsWith(pattern.slice(0, -1));
-  return key === pattern;
-};
-
-const walk = (dir, files = []) => {
-  let entries;
-  try {
-    entries = readdirSync(dir);
-  } catch {
-    return files;
-  }
-  for (const name of entries) {
-    const full = join(dir, name);
-    let st;
-    try {
-      st = statSync(full);
-    } catch {
-      continue;
-    }
-    if (st.isDirectory()) {
-      if (config.excludeDirs.includes(name)) continue;
-      walk(full, files);
-    } else if (config.srcExtensions.includes(extname(name))) {
-      files.push(full);
-    }
-  }
-  return files;
-};
-
-// ---- load source keys ----
-const sourcePath = join(ROOT, config.localesDir, `${config.sourceLocale}.json`);
-const sourceKeys = Object.keys(
-  flatten(JSON.parse(readFileSync(sourcePath, "utf8"))),
-);
-const sourceKeySet = new Set(sourceKeys);
-
-// ---- scan code ----
-const STATIC_RE = /\bt\(\s*(['"])((?:\\.|(?!\1).)+?)\1/g; // t("a.b") / t('a.b')
-const TPL_STATIC_RE = /\bt\(\s*`([^`$]+)`/g; // t(`a.b`) no interpolation
-const TPL_DYN_RE = /\bt\(\s*`([^`$]*)\$\{/g; // t(`a.b.${x}`) -> prefix "a.b."
-const I18NKEY_RE = /\bi18nKey\s*=\s*(?:\{\s*)?(['"])((?:\\.|(?!\1).)+?)\1/g; // <Trans i18nKey="a.b">
-const KEY_SHAPE = /^[A-Za-z0-9_]+(\.[A-Za-z0-9_]+)+$/; // dotted key, e.g. home.x.y
-
-const usedStatic = new Set(); // keys passed to t(...) / i18nKey — used for MISSING detection
-const dynamicPrefixes = new Set();
-const fullyDynamic = []; // { file, line }
-let codeBlob = ""; // all (comment-stripped) source text — searched for delimited key literals
-
-// Strip comments so keys mentioned in comments (e.g. `// t("old.key")`) are not counted as
-// usage. Block comments and JSX {/* */} are blanked (preserving newlines for line numbers);
-// line comments are only stripped when `//` follows start/whitespace/punctuation, which keeps
-// `://` inside string URLs intact.
-const stripComments = (src) =>
-  src
-    .replace(/\/\*[\s\S]*?\*\//g, (m) => m.replace(/[^\n]/g, " "))
-    .replace(/(^|[\s;{}()[\],=>])\/\/[^\n]*/g, (_m, p) => p);
-
-const files = config.srcDirs.flatMap((d) =>
-  walk(join(ROOT, d === "." ? "" : d) || ROOT),
-);
-for (const file of files) {
-  const text = readFileSync(file, "utf8");
-  const clean = stripComments(text);
-  codeBlob += `\n${clean}`;
-  for (const m of clean.matchAll(STATIC_RE)) usedStatic.add(m[2]);
-  for (const m of clean.matchAll(TPL_STATIC_RE)) usedStatic.add(m[1]);
-  for (const m of clean.matchAll(I18NKEY_RE)) usedStatic.add(m[2]);
-  for (const m of clean.matchAll(TPL_DYN_RE)) {
-    const prefix = m[1];
-    if (prefix?.includes(".")) dynamicPrefixes.add(prefix);
-    else {
-      const idx = clean.slice(0, m.index).split("\n").length;
-      fullyDynamic.push({ file: relative(ROOT, file), line: idx });
-    }
-  }
-}
-
-const prefixList = [...dynamicPrefixes];
-// A key counts as used if its EXACT delimited literal ("k" / 'k' / `k`) appears anywhere in
-// the code (covers t("k"), <Trans i18nKey>, and keys stored as bare string constants in
-// arrays/config then resolved via t(variable)), or it is reached via a dynamic prefix, or
-// explicitly allow-listed. Delimited search avoids substring false-matches (e.g. a.b vs a.b_c).
-const literalUsed = (key) =>
-  codeBlob.includes(`"${key}"`) ||
-  codeBlob.includes(`'${key}'`) ||
-  codeBlob.includes(`\`${key}\``);
-const isUsed = (key) =>
-  literalUsed(key) ||
-  prefixList.some((p) => key.startsWith(p)) ||
-  config.ignoreUnused.some((g) => globMatch(key, g));
-
-// ---- compute ----
-const unused = sourceKeys.filter((k) => !isUsed(k)).sort();
-// Static references are always validated, even under a dynamic prefix: a dynamic prefix only
-// affects the UNUSED calculation, never MISSING.
-const missing = [...usedStatic]
-  .filter((k) => KEY_SHAPE.test(k) && !sourceKeySet.has(k))
-  .sort();
-// Known limitation: only keys seen in a static t("…") / i18nKey="…" / t(`…`) call are
-// validated for MISSING. A key stored as a bare string constant and resolved via t(variable)
-// counts as USED (via literalUsed → not flagged unused) but its existence in en.json is not
-// checked here — static analysis can't resolve which key a runtime variable holds. Streamyfin
-// keys are static literals in practice; revisit if dynamic key constants become common.
-
-// ---- optional fix: strip dead keys from the source locale (en.json) ----
-const removeKey = (obj, parts) => {
-  const [head, ...rest] = parts;
-  if (!(head in obj)) return;
-  if (rest.length === 0) {
-    delete obj[head];
-    return;
-  }
-  removeKey(obj[head], rest);
-  if (
-    obj[head] &&
-    typeof obj[head] === "object" &&
-    Object.keys(obj[head]).length === 0
-  )
-    delete obj[head];
-};
-if (FIX_UNUSED && unused.length) {
-  // Only edit the SOURCE locale (en.json). Crowdin owns the target locales and removes
-  // the keys from them automatically on the next sync once they disappear from the source.
-  const data = JSON.parse(readFileSync(sourcePath, "utf8"));
-  for (const key of unused) removeKey(data, key.split("."));
-  writeFileSync(sourcePath, `${JSON.stringify(data, null, 2)}\n`);
-  console.log(
-    `🧹 Removed ${unused.length} dead key(s) from ${config.sourceLocale}.json (Crowdin will sync the other locales).`,
-  );
-}
-
-// ---- report ----
-if (JSON_OUT) {
-  console.log(
-    JSON.stringify(
-      {
-        sourceKeys: sourceKeys.length,
-        missing,
-        unused,
-        dynamicPrefixes: prefixList,
-        fullyDynamic,
-      },
-      null,
-      2,
-    ),
-  );
-} else {
-  console.log(
-    `🔑 i18n key check — source: ${relative(ROOT, sourcePath)} (${sourceKeys.length} keys), scanned ${files.length} files`,
-  );
-  if (prefixList.length)
-    console.log(
-      `   dynamic prefixes treated as used: ${prefixList.map((p) => `${p}*`).join(", ")}`,
-    );
-  if (fullyDynamic.length)
-    console.log(
-      `   ⚠️  ${fullyDynamic.length} fully-dynamic t(\`\${…}\`) call(s) (not key-based, manual review): ${fullyDynamic.map((d) => `${d.file}:${d.line}`).join(", ")}`,
-    );
-
-  if (missing.length) {
-    console.log(
-      `\n❌ MISSING keys (used in code, absent from ${config.sourceLocale}.json) — ${missing.length}:`,
-    );
-    for (const k of missing) console.log(`   - ${k}`);
-  } else console.log("\n✅ No missing keys.");
-
-  if (UNUSED_MODE !== "off") {
-    if (unused.length) {
-      console.log(
-        `\n${UNUSED_MODE === "error" ? "❌" : "⚠️ "} UNUSED keys (in ${config.sourceLocale}.json, referenced nowhere) — ${unused.length}:`,
-      );
-      for (const k of unused) console.log(`   - ${k}`);
-      console.log(
-        `\n   → remove with: bun scripts/check-i18n-keys.mjs --fix-unused`,
-      );
-      console.log(
-        `   → or allow-list a dynamic key in scripts/i18n-keys.config.json ("ignoreUnused").`,
-      );
-    } else console.log("\n✅ No unused keys.");
-  }
-}
-
-const fail =
-  missing.length > 0 || (UNUSED_MODE === "error" && unused.length > 0);
-process.exit(fail ? 1 : 0);
--- a/scripts/i18n-keys.config.json
+++ b/scripts/i18n-keys.config.json
@@ -1,46 +0,0 @@
-{
-  "localesDir": "translations",
-  "sourceLocale": "en",
-  "srcDirs": [
-    "app",
-    "components",
-    "hooks",
-    "providers",
-    "utils",
-    "modules",
-    "packages",
-    "constants"
-  ],
-  "srcExtensions": [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"],
-  "excludeDirs": [
-    "node_modules",
-    "ios",
-    "android",
-    ".expo",
-    ".git",
-    "dist",
-    "build",
-    "translations"
-  ],
-  "_ignoreUnusedNote": "Keys present in en.json but referenced by no t() call — allow-listed so the unused-key cleanup keeps them. Two kinds: (1) ORPHANS of features that already exist but render hardcoded strings or use other keys — watchlists.* (add/remove, handled by WatchlistSheet via hooks), pin.* (confirm step of the existing PIN setup flow), player.* (in-player subtitle search, swipe-down hint, stop-playback confirm); these should be wired to the live UI or removed in a follow-up i18n pass, not assumed to be future work. (2) GENUINELY PLANNED, tracked by issues: home.settings.other.show_large_home_carousel (#1702 media-bar), home.settings.logs.delete_all_logs (#1703 iOS logs fix), home.suggested_episodes (#1704).",
-  "ignoreUnused": [
-    "watchlists.add_to_watchlist",
-    "watchlists.remove_from_watchlist",
-    "watchlists.create_one_first",
-    "watchlists.no_compatible_watchlists",
-    "pin.confirm_pin",
-    "pin.pins_dont_match",
-    "player.search_subtitles",
-    "player.subtitle_search",
-    "player.subtitle_download_hint",
-    "player.subtitle_tracks",
-    "player.using_jellyfin_server",
-    "player.swipe_down_settings",
-    "player.stopPlayback",
-    "player.stopPlayingTitle",
-    "player.stopPlayingConfirm",
-    "home.settings.other.show_large_home_carousel",
-    "home.settings.logs.delete_all_logs",
-    "home.suggested_episodes"
-  ]
-}
--- a/scripts/ios/build-ios.ts
+++ b/scripts/ios/build-ios.ts
@@ -302,7 +302,7 @@ function parseArgs(argv: string[]): BuildOptions {
        if (!configArg) {
          throw new Error("--configuration requires an argument");
        }
-        options.configuration = configArg as "Debug" | "Release";
+        options.configuration = (configArg as "Debug" | "Release") || "Debug";
        break;
      }
      case "--device":
@@ -997,6 +997,10 @@ async function waitForSimulatorBoot(
      }
    } catch {
      // Simulator not found or not booted yet, continue polling
+      if (pollIntervalMs > 1000) {
+        // Only log if we've been waiting a while to avoid spam
+        // console.warn("Simulator polling failed, retrying...");
+      }
    }

    // Wait before next poll
--- a/Show More
+++ b/Show More