feat: skip intro

Added skip intro logic Updated control button to take an icon or text Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>
2026-05-29 18:18:26 +01:00 · 2026-01-27 09:01:32 +02:00
288 changed files with 7457 additions and 18620 deletions
--- a/.claude/agents/tv-validator.md
+++ b/.claude/agents/tv-validator.md
@@ -1,103 +0,0 @@
---
-name: tv-validator
-description: Use this agent to review TV platform code for correct patterns and conventions. Use proactively after writing or modifying TV components. Validates focus handling, modal patterns, typography, list components, and other TV-specific requirements.
-tools: Read, Glob, Grep
-model: haiku
-color: blue
---
-
-You are a TV platform code reviewer for Streamyfin, a React Native app with Apple TV and Android TV support. Review code for correct TV patterns and flag violations.
-
-## Critical Rules to Check
-
-### 1. No .tv.tsx File Suffix
-The `.tv.tsx` suffix does NOT work in this project. Metro bundler doesn't resolve it.
-
-**Violation**: Creating files like `MyComponent.tv.tsx` expecting auto-resolution
-**Correct**: Use `Platform.isTV` conditional rendering in the main file:
-```typescript
-if (Platform.isTV) {
-  return <TVMyComponent />;
-}
-return <MyComponent />;
-```
-
-### 2. No FlashList on TV
-FlashList has focus issues on TV. Use FlatList instead.
-
-**Violation**: `<FlashList` in TV code paths
-**Correct**:
-```typescript
-{Platform.isTV ? (
-  <FlatList removeClippedSubviews={false} ... />
-) : (
-  <FlashList ... />
-)}
-```
-
-### 3. Modal Pattern
-Never use overlay/absolute-positioned modals on TV. They break back button handling.
-
-**Violation**: `position: "absolute"` or `Modal` component for TV overlays
-**Correct**: Use navigation-based pattern:
- Create Jotai atom for state
- Hook that sets atom and calls `router.push()`
- Page in `app/(auth)/` that reads atom
- `Stack.Screen` with `presentation: "transparentModal"`
-
-### 4. Typography
-All TV text must use `TVTypography` component.
-
-**Violation**: Raw `<Text>` in TV components
-**Correct**: `<TVTypography variant="title">...</TVTypography>`
-
-### 5. No Purple Accent Colors
-TV uses white for focus states, not purple.
-
-**Violation**: Purple/violet colors in TV focused states
-**Correct**: White (`#fff`, `white`) for focused states with `expo-blur` for backgrounds
-
-### 6. Focus Handling
- Only ONE element should have `hasTVPreferredFocus={true}`
- Focusable items need `disabled={isModalOpen}` when overlays are visible
- Use `onFocus`/`onBlur` with scale animations
- Add padding for scale animations (focus scale clips without it)
-
-### 7. List Configuration
-TV lists need:
- `removeClippedSubviews={false}`
- `overflow: "visible"` on containers
- Sufficient padding for focus scale animations
-
-### 8. Horizontal Padding
-Use `TV_HORIZONTAL_PADDING` constant (60), not old `TV_SCALE_PADDING` (20).
-
-### 9. Focus Guide Navigation
-For non-adjacent sections, use `TVFocusGuideView` with `destinations` prop.
-Use `useState` for refs (not `useRef`) to trigger re-renders.
-
-## Review Process
-
-1. Read the file(s) to review
-2. Check each rule above
-3. Report violations with:
-   - Line number
-   - What's wrong
-   - How to fix it
-4. If no violations, confirm the code follows TV patterns
-
-## Output Format
-
-```
-## TV Validation Results
-
-### ✓ Passes
- [List of rules that pass]
-
-### ✗ Violations
- **[Rule Name]** (line X): [Description]
-  Fix: [How to correct it]
-
-### Recommendations
- [Optional suggestions for improvement]
-```
--- a/.claude/commands/reflect.md
+++ b/.claude/commands/reflect.md
@@ -12,59 +12,26 @@ Analyze the current conversation to extract useful facts that should be remember

 ## Instructions

-1. Read the Learned Facts Index section in `CLAUDE.md` and scan existing files in `.claude/learned-facts/` to understand what's already recorded
+1. Read the existing facts file at `.claude/learned-facts.md`
 2. Review this conversation for learnings worth preserving
 3. For each new fact:
-   - Create a new file in `.claude/learned-facts/[kebab-case-name].md` using the template below
-   - Append a new entry to the appropriate category in the **Learned Facts Index** section of `CLAUDE.md`
+   - Write it concisely (1-2 sentences max)
+   - Include context for why it matters
+   - Add today's date
 4. Skip facts that duplicate existing entries
-5. If a new category is needed, add it to the index in `CLAUDE.md`
+5. Append new facts to `.claude/learned-facts.md`

-## Fact File Template
+## Fact Format

-Create each file at `.claude/learned-facts/[kebab-case-name].md`:
-
-```markdown
-# [Title]
-
-**Date**: YYYY-MM-DD
-**Category**: navigation | tv | native-modules | state-management | ui
-**Key files**: `relevant/paths.ts`
-
-## Detail
-
-[Full description of the fact, including context for why it matters]
+Use this format for each fact:
+```
+- **[Brief Topic]**: [Concise description of the fact] _(YYYY-MM-DD)_
 ```

-## Index Entry Format
+## Example Facts

-Append to the appropriate category in the Learned Facts Index section of `CLAUDE.md`:
+- **State management**: Use Jotai atoms for global state, NOT React Context - atoms are in `utils/atoms/` _(2025-01-09)_
+- **Package manager**: Always use `bun`, never npm or yarn - the project is configured for bun only _(2025-01-09)_
+- **TV platform**: Check `Platform.isTV` for TV-specific code paths, not just OS checks _(2025-01-09)_

-```
- `kebab-case-name` | Brief one-line summary of the fact
-```
-
-Categories: Navigation, UI/Headers, State/Data, Native Modules, TV Platform
-
-## Example
-
-File `.claude/learned-facts/state-management-pattern.md`:
-```markdown
-# State Management Pattern
-
-**Date**: 2025-01-09
-**Category**: state-management
-**Key files**: `utils/atoms/`
-
-## Detail
-
-Use Jotai atoms for global state, NOT React Context. Atoms are defined in `utils/atoms/`.
-```
-
-Index entry in `CLAUDE.md`:
-```
-State/Data:
- `state-management-pattern` | Use Jotai atoms for global state, not React Context
-```
-
-After updating, summarize what facts you added (or note if nothing new was learned this session).
+After updating the file, summarize what facts you added (or note if nothing new was learned this session).
--- a/.claude/learned-facts.md
+++ b/.claude/learned-facts.md
@@ -1,11 +1,8 @@
-# Learned Facts (DEPRECATED)
+# Learned Facts

-> **DEPRECATED**: This file has been replaced by individual fact files in `.claude/learned-facts/`.
-> The compressed index is now inline in `CLAUDE.md` under "Learned Facts Index".
-> New facts should be added as individual files using the `/reflect` command.
-> This file is kept for reference only and is no longer auto-imported.
+This file contains facts about the codebase learned from past sessions. These are things Claude got wrong or needed clarification on, stored here to prevent the same mistakes in future sessions.

-This file previously contained facts about the codebase learned from past sessions.
+This file is auto-imported into CLAUDE.md and loaded at the start of each session.

 ## Facts

@@ -43,6 +40,4 @@ This file previously contained facts about the codebase learned from past sessio

 - **Native SwiftUI view sizing**: When creating Expo native modules with SwiftUI views, the view needs explicit dimensions. Use a `width` prop passed from React Native, set an explicit `.frame(width:height:)` in SwiftUI, and override `intrinsicContentSize` in the ExpoView wrapper to report the correct size to React Native's layout system. Using `.aspectRatio(contentMode: .fit)` alone causes inconsistent sizing. _(2026-01-25)_

- **Streamystats components location**: Streamystats TV components are at `components/home/StreamystatsRecommendations.tv.tsx` and `components/home/StreamystatsPromotedWatchlists.tv.tsx`. The watchlist detail page (which shows items in a grid) is at `app/(auth)/(tabs)/(watchlists)/[watchlistId].tsx`. _(2026-01-25)_
-
- **Platform-specific file suffix (.tv.tsx) does NOT work**: The `.tv.tsx` file suffix does NOT work for either pages or components in this project. Metro bundler doesn't resolve platform-specific suffixes. Instead, use `Platform.isTV` conditional rendering within a single file. For pages: check `Platform.isTV` at the top and return the TV component early. For components: create separate `MyComponent.tsx` and `TVMyComponent.tsx` files and use `Platform.isTV` to choose which to render. _(2026-01-26)_
+- **Streamystats components location**: Streamystats TV components are at `components/home/StreamystatsRecommendations.tv.tsx` and `components/home/StreamystatsPromotedWatchlists.tv.tsx`. The watchlist detail page (which shows items in a grid) is at `app/(auth)/(tabs)/(watchlists)/[watchlistId].tsx`. _(2026-01-25)_
--- a/.claude/learned-facts/header-button-locations.md
+++ b/.claude/learned-facts/header-button-locations.md
@@ -1,9 +0,0 @@
-# Header Button Locations
-
-**Date**: 2026-01-10
-**Category**: ui
-**Key files**: `app/(auth)/(tabs)/(home)/_layout.tsx`, `components/common/HeaderBackButton.tsx`, `components/Chromecast.tsx`, `components/RoundButton.tsx`, `components/home/Home.tsx`, `app/(auth)/(tabs)/(home)/downloads/index.tsx`
-
-## Detail
-
-Header buttons are defined in multiple places: `app/(auth)/(tabs)/(home)/_layout.tsx` (SettingsButton, SessionsButton, back buttons), `components/common/HeaderBackButton.tsx` (reusable), `components/Chromecast.tsx`, `components/RoundButton.tsx`, and dynamically via `navigation.setOptions()` in `components/home/Home.tsx` and `app/(auth)/(tabs)/(home)/downloads/index.tsx`.
--- a/.claude/learned-facts/intro-modal-trigger-location.md
+++ b/.claude/learned-facts/intro-modal-trigger-location.md
@@ -1,9 +0,0 @@
-# Intro Modal Trigger Location
-
-**Date**: 2025-01-09
-**Category**: navigation
-**Key files**: `components/home/Home.tsx`, `app/(auth)/(tabs)/_layout.tsx`
-
-## Detail
-
-The intro modal trigger logic should be in the `Home.tsx` component, not in the tabs `_layout.tsx`. Triggering modals from tab layout can interfere with native bottom tabs navigation.
--- a/.claude/learned-facts/introsheet-rendering-location.md
+++ b/.claude/learned-facts/introsheet-rendering-location.md
@@ -1,9 +0,0 @@
-# IntroSheet Rendering Location
-
-**Date**: 2025-01-09
-**Category**: navigation
-**Key files**: `providers/IntroSheetProvider`, `components/IntroSheet`
-
-## Detail
-
-The `IntroSheet` component is rendered inside `IntroSheetProvider` which wraps the entire navigation stack. Any hooks in IntroSheet that interact with navigation state can affect the native bottom tabs.
--- a/.claude/learned-facts/macos-header-buttons-fix.md
+++ b/.claude/learned-facts/macos-header-buttons-fix.md
@@ -1,9 +0,0 @@
-# macOS Header Buttons Fix
-
-**Date**: 2026-01-10
-**Category**: ui
-**Key files**: `components/common/HeaderBackButton.tsx`, `app/(auth)/(tabs)/(home)/_layout.tsx`
-
-## Detail
-
-Header buttons (`headerRight`/`headerLeft`) don't respond to touches on macOS Catalyst builds when using standard React Native `TouchableOpacity`. Fix by using `Pressable` from `react-native-gesture-handler` instead. The library is already installed and `GestureHandlerRootView` wraps the app.
--- a/.claude/learned-facts/mark-as-played-flow.md
+++ b/.claude/learned-facts/mark-as-played-flow.md
@@ -1,9 +0,0 @@
-# Mark as Played Flow
-
-**Date**: 2026-01-10
-**Category**: state-management
-**Key files**: `components/PlayedStatus.tsx`, `hooks/useMarkAsPlayed.ts`
-
-## Detail
-
-The "mark as played" button uses `PlayedStatus` component → `useMarkAsPlayed` hook → `usePlaybackManager.markItemPlayed()`. The hook does optimistic updates via `setQueriesData` before calling the API. Located in `components/PlayedStatus.tsx` and `hooks/useMarkAsPlayed.ts`.
--- a/.claude/learned-facts/mpv-avfoundation-composite-osd-ordering.md
+++ b/.claude/learned-facts/mpv-avfoundation-composite-osd-ordering.md
@@ -1,9 +0,0 @@
-# MPV avfoundation-composite-osd Ordering
-
-**Date**: 2026-01-22
-**Category**: native-modules
-**Key files**: `modules/mpv-player/ios/MPVLayerRenderer.swift`
-
-## Detail
-
-On tvOS, the `avfoundation-composite-osd` option MUST be set immediately after `vo=avfoundation`, before any `hwdec` options. Skipping or reordering this causes the app to freeze when exiting the player. Set to "no" on tvOS (prevents gray tint), "yes" on iOS (for PiP subtitle support).
--- a/.claude/learned-facts/mpv-tvos-player-exit-freeze.md
+++ b/.claude/learned-facts/mpv-tvos-player-exit-freeze.md
@@ -1,9 +0,0 @@
-# MPV tvOS Player Exit Freeze
-
-**Date**: 2026-01-22
-**Category**: native-modules
-**Key files**: `modules/mpv-player/ios/MPVLayerRenderer.swift`
-
-## Detail
-
-On tvOS, `mpv_terminate_destroy` can deadlock if called while blocking the main thread (e.g., via `queue.sync`). The fix is to run `mpv_terminate_destroy` on `DispatchQueue.global()` asynchronously, allowing it to access main thread for AVFoundation/GPU cleanup. Send `quit` command and drain events first.
--- a/.claude/learned-facts/native-bottom-tabs-userouter-conflict.md
+++ b/.claude/learned-facts/native-bottom-tabs-userouter-conflict.md
@@ -1,9 +0,0 @@
-# Native Bottom Tabs + useRouter Conflict
-
-**Date**: 2025-01-09
-**Category**: navigation
-**Key files**: `providers/`, `app/_layout.tsx`
-
-## Detail
-
-When using `@bottom-tabs/react-navigation` with Expo Router, avoid using the `useRouter()` hook in components rendered at the provider level (outside the tab navigator). The hook subscribes to navigation state changes and can cause unexpected tab switches. Use the static `router` import from `expo-router` instead.
--- a/.claude/learned-facts/native-swiftui-view-sizing.md
+++ b/.claude/learned-facts/native-swiftui-view-sizing.md
@@ -1,9 +0,0 @@
-# Native SwiftUI View Sizing
-
-**Date**: 2026-01-25
-**Category**: native-modules
-**Key files**: `modules/`
-
-## Detail
-
-When creating Expo native modules with SwiftUI views, the view needs explicit dimensions. Use a `width` prop passed from React Native, set an explicit `.frame(width:height:)` in SwiftUI, and override `intrinsicContentSize` in the ExpoView wrapper to report the correct size to React Native's layout system. Using `.aspectRatio(contentMode: .fit)` alone causes inconsistent sizing.
--- a/.claude/learned-facts/platform-specific-file-suffix-does-not-work.md
+++ b/.claude/learned-facts/platform-specific-file-suffix-does-not-work.md
@@ -1,9 +0,0 @@
-# Platform-Specific File Suffix (.tv.tsx) Does NOT Work
-
-**Date**: 2026-01-26
-**Category**: tv
-**Key files**: `app/`, `components/`
-
-## Detail
-
-The `.tv.tsx` file suffix does NOT work for either pages or components in this project. Metro bundler doesn't resolve platform-specific suffixes. Instead, use `Platform.isTV` conditional rendering within a single file. For pages: check `Platform.isTV` at the top and return the TV component early. For components: create separate `MyComponent.tsx` and `TVMyComponent.tsx` files and use `Platform.isTV` to choose which to render.
--- a/.claude/learned-facts/stack-screen-header-configuration.md
+++ b/.claude/learned-facts/stack-screen-header-configuration.md
@@ -1,9 +0,0 @@
-# Stack Screen Header Configuration
-
-**Date**: 2026-01-10
-**Category**: ui
-**Key files**: `app/(auth)/(tabs)/(home)/_layout.tsx`
-
-## Detail
-
-Sub-pages under `(home)` need explicit `Stack.Screen` entries in `app/(auth)/(tabs)/(home)/_layout.tsx` with `headerTransparent: Platform.OS === "ios"`, `headerBlurEffect: "none"`, and a back button. Without this, pages show with wrong header styling.
--- a/.claude/learned-facts/streamystats-components-location.md
+++ b/.claude/learned-facts/streamystats-components-location.md
@@ -1,9 +0,0 @@
-# Streamystats Components Location
-
-**Date**: 2026-01-25
-**Category**: tv
-**Key files**: `components/home/StreamystatsRecommendations.tv.tsx`, `components/home/StreamystatsPromotedWatchlists.tv.tsx`, `app/(auth)/(tabs)/(watchlists)/[watchlistId].tsx`
-
-## Detail
-
-Streamystats TV components are at `components/home/StreamystatsRecommendations.tv.tsx` and `components/home/StreamystatsPromotedWatchlists.tv.tsx`. The watchlist detail page (which shows items in a grid) is at `app/(auth)/(tabs)/(watchlists)/[watchlistId].tsx`.
--- a/.claude/learned-facts/tab-folder-naming.md
+++ b/.claude/learned-facts/tab-folder-naming.md
@@ -1,9 +0,0 @@
-# Tab Folder Naming
-
-**Date**: 2025-01-09
-**Category**: navigation
-**Key files**: `app/(auth)/(tabs)/`
-
-## Detail
-
-The tab folders use underscore prefix naming like `(_home)` instead of just `(home)` based on the project's file structure conventions.
--- a/.claude/learned-facts/thread-safe-state-for-stop-flags.md
+++ b/.claude/learned-facts/thread-safe-state-for-stop-flags.md
@@ -1,9 +0,0 @@
-# Thread-Safe State for Stop Flags
-
-**Date**: 2026-01-22
-**Category**: native-modules
-**Key files**: `modules/mpv-player/ios/MPVLayerRenderer.swift`
-
-## Detail
-
-When using flags like `isStopping` that control loop termination across threads, the setter must be synchronous (`stateQueue.sync`) not async, otherwise the value may not be visible to other threads in time.
--- a/.claude/learned-facts/tv-grid-layout-pattern.md
+++ b/.claude/learned-facts/tv-grid-layout-pattern.md
@@ -1,9 +0,0 @@
-# TV Grid Layout Pattern
-
-**Date**: 2026-01-25
-**Category**: tv
-**Key files**: `components/tv/`
-
-## Detail
-
-For TV grids, use ScrollView with flexWrap instead of FlatList/FlashList with numColumns. FlatList's numColumns divides width evenly among columns which causes inconsistent item sizing. Use `flexDirection: "row"`, `flexWrap: "wrap"`, `justifyContent: "center"`, and `gap` for spacing.
--- a/.claude/learned-facts/tv-horizontal-padding-standard.md
+++ b/.claude/learned-facts/tv-horizontal-padding-standard.md
@@ -1,9 +0,0 @@
-# TV Horizontal Padding Standard
-
-**Date**: 2026-01-25
-**Category**: tv
-**Key files**: `components/tv/`, `app/(auth)/(tabs)/`
-
-## Detail
-
-TV pages should use `TV_HORIZONTAL_PADDING = 60` to match other TV pages like Home, Search, etc. The old `TV_SCALE_PADDING = 20` was too small.
--- a/.claude/learned-facts/tv-modals-must-use-navigation-pattern.md
+++ b/.claude/learned-facts/tv-modals-must-use-navigation-pattern.md
@@ -1,9 +0,0 @@
-# TV Modals Must Use Navigation Pattern
-
-**Date**: 2026-01-24
-**Category**: tv
-**Key files**: `hooks/useTVOptionModal.ts`, `app/(auth)/tv-option-modal.tsx`
-
-## Detail
-
-On TV, never use overlay/absolute-positioned modals (like `TVOptionSelector` at the page level). They don't handle the back button correctly. Always use the navigation-based modal pattern: Jotai atom + hook that calls `router.push()` + page in `app/(auth)/`. Use the existing `useTVOptionModal` hook and `tv-option-modal.tsx` page for option selection. `TVOptionSelector` is only appropriate as a sub-selector *within* a navigation-based modal page.
--- a/.claude/learned-facts/use-network-aware-query-client-limitations.md
+++ b/.claude/learned-facts/use-network-aware-query-client-limitations.md
@@ -1,9 +0,0 @@
-# useNetworkAwareQueryClient Limitations
-
-**Date**: 2026-01-10
-**Category**: state-management
-**Key files**: `hooks/useNetworkAwareQueryClient.ts`
-
-## Detail
-
-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/.github/renovate.json
+++ b/.github/renovate.json
@@ -25,25 +25,6 @@
  "osvVulnerabilityAlerts": true,
  "configMigration": true,
  "separateMinorPatch": true,
-  "customManagers": [
-    {
-      "customType": "regex",
-      "managerFilePatterns": ["/\\.ya?ml$/"],
-      "matchStrings": [
-        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)(?: versioning=(?<versioning>\\S+))?\\s+xcode-version:\\s*[\"']?(?<currentValue>[^\"'\\s]+)"
-      ],
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}loose{{/if}}"
-    }
-  ],
-  "customDatasources": {
-    "xcode": {
-      "defaultRegistryUrlTemplate": "https://xcodereleases.com/data.json",
-      "format": "json",
-      "transformTemplates": [
-        "{ \"releases\": [$[version.release.release=true].{\"version\": version.number}] }"
-      ]
-    }
-  },
  "lockFileMaintenance": {
    "vulnerabilityAlerts": {
      "enabled": true,
--- a/.github/workflows/artifact-comment.yml
+++ b/.github/workflows/artifact-comment.yml
@@ -26,7 +26,7 @@ jobs:

    steps:
      - name: 🔍 Get PR and Artifacts
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
        with:
          script: |
            // Check if we're running from a fork (more precise detection)
@@ -188,17 +188,6 @@ jobs:
            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({
@@ -227,6 +216,13 @@ jobs:
                  return; // Exit early
                }
                
+                // Map job names to our build targets
+                const jobMappings = {
+                  'Android Phone': ['🤖 Build Android APK (Phone)', 'build-android-phone'],
+                  'Android TV': ['🤖 Build Android APK (TV)', 'build-android-tv'],  
+                  'iOS Phone': ['🍎 Build iOS IPA (Phone)', 'build-ios-phone']
+                };
+                
                // Create individual status for each job
                for (const [platform, jobNames] of Object.entries(jobMappings)) {
                  const job = jobs.jobs.find(j => 
@@ -240,9 +236,7 @@ jobs:
                      conclusion: job.conclusion,
                      url: job.html_url,
                      runId: latestAppsRun.id,
-                      created_at: job.started_at || latestAppsRun.created_at,
-                      started_at: job.started_at,
-                      completed_at: job.completed_at
+                      created_at: job.started_at || latestAppsRun.created_at
                    };
                    console.log(`Mapped ${platform} to job: ${job.name} (${job.status}/${job.conclusion || 'none'})`);
                  } else {
@@ -253,30 +247,22 @@ jobs:
                      conclusion: latestAppsRun.conclusion,
                      url: latestAppsRun.html_url,
                      runId: latestAppsRun.id,
-                      created_at: latestAppsRun.created_at,
-                      started_at: latestAppsRun.run_started_at,
-                      completed_at: latestAppsRun.updated_at
+                      created_at: latestAppsRun.created_at
                    };
                  }
                }
                
              } catch (error) {
                console.log(`Failed to get jobs for run ${latestAppsRun.id}:`, error.message);
-                // Fallback to workflow-level status for every build target.
-                // Keys must match jobMappings / buildTargets statusKey values.
-                const fallbackStatus = {
+                // Fallback to workflow-level status
+                buildStatuses['Android Phone'] = buildStatuses['Android TV'] = buildStatuses['iOS Phone'] = {
                  name: latestAppsRun.name,
                  status: latestAppsRun.status,
                  conclusion: latestAppsRun.conclusion,
                  url: latestAppsRun.html_url,
                  runId: latestAppsRun.id,
-                  created_at: latestAppsRun.created_at,
-                  started_at: latestAppsRun.run_started_at,
-                  completed_at: latestAppsRun.updated_at
+                  created_at: latestAppsRun.created_at
                };
-                for (const platform of Object.keys(jobMappings)) {
-                  buildStatuses[platform] = fallbackStatus;
-                }
              }
              
              // Collect artifacts if any job has completed successfully
@@ -367,12 +353,10 @@ jobs:

            // Process each expected build target individually
            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: /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: /ios.*tv.*ipa(?!.*unsigned)/i },
-              { name: 'tvOS Unsigned', platform: '🍎', device: '📺 TV Unsigned', statusKey: 'tvOS Unsigned', artifactPattern: /ios.*tv.*unsigned/i }
+              { name: 'Android Phone', platform: '🤖', device: '📱', statusKey: 'Android Phone', artifactPattern: /android.*phone/i },
+              { name: 'Android TV', platform: '🤖', device: '📺', statusKey: 'Android TV', artifactPattern: /android.*tv/i },
+              { name: 'iOS Phone', platform: '🍎', device: '📱', statusKey: 'iOS Phone', artifactPattern: /ios.*phone/i },
+              { name: 'iOS TV', platform: '🍎', device: '📺', statusKey: 'iOS TV', artifactPattern: /ios.*tv/i }
            ];

            for (const target of buildTargets) {
@@ -387,31 +371,16 @@ jobs:
              let status = '⏳ Pending';
              let downloadLink = '*Waiting for build...*';

-              // 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') {
+              // Special case for iOS TV - show as disabled
+              if (target.name === 'iOS TV') {
                status = '💤 Disabled';
-                downloadLink = '*Disabled until feat/tv-interface is merged*';
+                downloadLink = '*Disabled for now*';
              } else if (matchingStatus) {
                if (matchingStatus.conclusion === 'success' && matchingArtifact) {
                  status = '✅ Complete';
                  const directLink = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${matchingArtifact.workflow_run.id}/artifacts/${matchingArtifact.id}`;
                  const fileType = target.name.includes('Android') ? 'APK' : 'IPA';
-                  
-                  // Format file size
-                  const sizeInMB = (matchingArtifact.size_in_bytes / (1024 * 1024)).toFixed(1);
-                  const sizeInfo = `(${sizeInMB} MB)`;
-                  
-                  // Calculate build duration
-                  let durationInfo = '';
-                  if (matchingStatus.started_at && matchingStatus.completed_at) {
-                    const durationMs = new Date(matchingStatus.completed_at) - new Date(matchingStatus.started_at);
-                    const durationMin = Math.floor(durationMs / 60000);
-                    const durationSec = Math.floor((durationMs % 60000) / 1000);
-                    durationInfo = ` - ${durationMin}m ${durationSec}s`;
-                  }
-                  
-                  downloadLink = `[📥 Download ${fileType}](${directLink}) ${sizeInfo}${durationInfo}`;
+                  downloadLink = `[📥 Download ${fileType}](${directLink})`;
                } else if (matchingStatus.conclusion === 'failure') {
                  status = `❌ [Failed](${matchingStatus.url})`;
                  downloadLink = '*Build failed*';
@@ -439,7 +408,7 @@ jobs:
                }
              }

-              commentBody += `| ${target.platform} ${target.name} | ${target.device} | ${status} | ${downloadLink} |\n`;
+              commentBody += `| ${target.platform} ${target.name.split(' ')[0]} | ${target.device} ${target.name.split(' ')[1]} | ${status} | ${downloadLink} |\n`;
            }

            commentBody += `\n`;
--- a/.github/workflows/build-apps.yml
+++ b/.github/workflows/build-apps.yml
@@ -33,7 +33,7 @@ jobs:
          swap-storage: false

      - name: 📥 Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -41,12 +41,12 @@ jobs:
          show-progress: false

      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
        with:
          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.bun/install/cache
          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
@@ -60,7 +60,7 @@ jobs:
          bun run submodule-reload

      - name: 💾 Cache Gradle global
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: |
            ~/.gradle/caches
@@ -73,7 +73,7 @@ jobs:
        run: bun run prebuild

      - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: android/.gradle
          key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
@@ -88,7 +88,7 @@ jobs:
        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV

      - name: 📤 Upload APK artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: streamyfin-android-phone-apk-${{ env.DATE_TAG }}
          path: |
@@ -116,7 +116,7 @@ jobs:
          swap-storage: false

      - name: 📥 Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -124,12 +124,12 @@ jobs:
          show-progress: false

      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
        with:
          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.bun/install/cache
          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
@@ -143,7 +143,7 @@ jobs:
          bun run submodule-reload

      - name: 💾 Cache Gradle global
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: |
            ~/.gradle/caches
@@ -156,7 +156,7 @@ jobs:
        run: bun run prebuild:tv

      - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: android/.gradle
          key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
@@ -171,7 +171,7 @@ jobs:
        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV

      - name: 📤 Upload APK artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: streamyfin-android-tv-apk-${{ env.DATE_TAG }}
          path: |
@@ -187,7 +187,7 @@ jobs:

    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -195,12 +195,12 @@ jobs:
          show-progress: false

      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
        with:
          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.bun/install/cache
          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
@@ -216,13 +216,12 @@ jobs:
        run: bun run prebuild

      - name: 🔧 Setup Xcode
-        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
+        uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1
        with:
-          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.4"
+          xcode-version: "26.2"

      - name: 🏗️ Setup EAS
-        uses: expo/expo-github-action@b184ff86a3c926240f1b6db41764c83a01c02eef # main
+        uses: expo/expo-github-action@main
        with:
          eas-version: latest
          token: ${{ secrets.EXPO_TOKEN }}
@@ -237,7 +236,7 @@ jobs:
        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV

      - name: 📤 Upload IPA artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: streamyfin-ios-phone-ipa-${{ env.DATE_TAG }}
          path: build-*.ipa
@@ -252,7 +251,7 @@ jobs:

    steps:
      - name: 📥 Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0
@@ -260,12 +259,12 @@ jobs:
          show-progress: false

      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
        with:
          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.bun/install/cache
          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
@@ -281,10 +280,9 @@ jobs:
        run: bun run prebuild

      - name: 🔧 Setup Xcode
-        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
+        uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1
        with:
-          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.4"
+          xcode-version: "26.2"

      - name: 🚀 Build iOS app
        env:
@@ -295,136 +293,73 @@ jobs:
        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV

      - name: 📤 Upload IPA artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: streamyfin-ios-phone-unsigned-ipa-${{ env.DATE_TAG }}
          path: build/*.ipa
          retention-days: 7

-  build-ios-tv:
-    # 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
-
-    steps:
-      - name: 📥 Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          fetch-depth: 0
-          submodules: recursive
-          show-progress: false
-
-      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
-        with:
-          bun-version: latest
-
-      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-bun-cache
-
-      - name: 📦 Install dependencies and reload submodules
-        run: |
-          bun install --frozen-lockfile
-          bun run submodule-reload
-
-      - name: 🛠️ Generate project files
-        run: bun run prebuild:tv
-
-      - name: 🔧 Setup Xcode
-        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
-        with:
-          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.4"
-
-      - name: 🏗️ Setup EAS
-        uses: expo/expo-github-action@b184ff86a3c926240f1b6db41764c83a01c02eef # main
-        with:
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-          eas-cache: true
-
-      - name: 🚀 Build iOS app
-        env:
-          EXPO_TV: 1
-        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
-
-      - name: 📤 Upload IPA artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: streamyfin-ios-tv-ipa-${{ env.DATE_TAG }}
-          path: build-*.ipa
-          retention-days: 7
-
-  build-ios-tv-unsigned:
-    # Unsigned tvOS build is enabled (compiles without Apple credentials).
-    # The signed tvOS job above stays disabled until tvOS provisioning
-    # profiles are set up in EAS (app + TopShelf targets).
-    if: (!contains(github.event.head_commit.message, '[skip ci]'))
-    runs-on: macos-26
-    name: 🍎 Build tvOS IPA (Unsigned)
-    permissions:
-      contents: read
-
-    steps:
-      - name: 📥 Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          fetch-depth: 0
-          submodules: recursive
-          show-progress: false
-
-      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
-        with:
-          bun-version: latest
-
-      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-bun-cache
-
-      - name: 📦 Install dependencies and reload submodules
-        run: |
-          bun install --frozen-lockfile
-          bun run submodule-reload
-
-      - name: 🛠️ Generate project files
-        run: bun run prebuild:tv
-
-      - name: 🔧 Setup Xcode
-        uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1
-        with:
-          # renovate: datasource=custom.xcode depName=xcode versioning=loose
-          xcode-version: "26.4"
-
-      - name: 🚀 Build iOS app
-        env:
-          EXPO_TV: 1
-        run: bun run ios:unsigned-build:tv ${{ github.event_name == 'pull_request' && '-- --verbose' || '' }}
-
-      - name: 📅 Set date tag
-        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
-
-      - name: 📤 Upload IPA artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: streamyfin-ios-tv-unsigned-ipa-${{ env.DATE_TAG }}
-          path: build/*.ipa
-          retention-days: 7
+  # Disabled for now - uncomment when ready to build iOS TV
+  # build-ios-tv:
+  #   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 (TV)
+  #   permissions:
+  #     contents: read
+  #
+  #   steps:
+  #     - name: 📥 Checkout code
+  #       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+  #       with:
+  #         ref: ${{ github.event.pull_request.head.sha || github.sha }}
+  #         fetch-depth: 0
+  #         submodules: recursive
+  #         show-progress: false
+  #
+  #     - name: 🍞 Setup Bun
+  #       uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
+  #       with:
+  #         bun-version: latest
+  #
+  #     - name: 💾 Cache Bun dependencies
+  #       uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+  #       with:
+  #         path: ~/.bun/install/cache
+  #         key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-bun-cache
+  #
+  #     - name: 📦 Install dependencies and reload submodules
+  #       run: |
+  #         bun install --frozen-lockfile
+  #         bun run submodule-reload
+  #
+  #     - name: 🛠️ Generate project files
+  #       run: bun run prebuild:tv
+  #
+  #     - name: 🔧 Setup Xcode
+  #       uses: maxim-lobanov/setup-xcode@v1
+  #       with:
+  #         xcode-version: '26.0.1'
+  #
+  #     - name: 🏗️ Setup EAS
+  #       uses: expo/expo-github-action@main
+  #       with:
+  #         eas-version: latest
+  #         token: ${{ secrets.EXPO_TOKEN }}
+  #         eas-cache: true
+  #
+  #     - name: 🚀 Build iOS app
+  #       env:
+  #         EXPO_TV: 1
+  #       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
+  #
+  #     - name: 📤 Upload IPA artifact
+  #       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+  #       with:
+  #         name: streamyfin-ios-tv-ipa-${{ env.DATE_TAG }}
+  #         path: build-*.ipa
+  #         retention-days: 7
--- a/.github/workflows/check-lockfile.yml
+++ b/.github/workflows/check-lockfile.yml
@@ -19,7 +19,7 @@ jobs:

    steps:
      - name: 📥 Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          show-progress: false
@@ -27,12 +27,12 @@ jobs:
          fetch-depth: 0

      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
        with:
          bun-version: latest

      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: |
            ~/.bun/install/cache
--- a/.github/workflows/ci-codeql.yml
+++ b/.github/workflows/ci-codeql.yml
@@ -24,16 +24,16 @@ jobs:

    steps:
      - name: 📥 Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

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

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

      - name: 🧪 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -23,12 +23,12 @@ jobs:

    steps:
      - name: 📥 Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          fetch-depth: 0

      - name: 🌐 Sync Translations with Crowdin
-        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
+        uses: crowdin/github-action@60debf382ee245b21794321190ad0501db89d8c1 # v2.13.0
        with:
          upload_sources: true
          upload_translations: true
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -25,7 +25,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      - uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4
+      - uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2.9.4
        if: always() && (steps.lint_pr_title.outputs.error_message != null)
        with:
          header: pr-title-lint-error
@@ -39,7 +39,7 @@ jobs:
            ```

      - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4
+        uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2.9.4
        with:
          header: pr-title-lint-error
          delete: true
@@ -51,13 +51,13 @@ jobs:
      contents: read
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0

      - name: Dependency Review
-        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
        with:
          fail-on-severity: high
          base-ref: ${{ github.event.pull_request.base.sha || 'develop' }}
@@ -69,14 +69,14 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: 🛒 Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          submodules: recursive
          fetch-depth: 0

      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
        with:
          bun-version: latest

@@ -100,19 +100,19 @@ jobs:

    steps:
      - name: "📥 Checkout PR code"
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          submodules: recursive
          fetch-depth: 0

      - name: "🟢 Setup Node.js"
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
        with:
          node-version: '24.x'

      - name: "🍞 Setup Bun"
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
        with:
          bun-version: latest

--- a/.github/workflows/update-issue-form.yml
+++ b/.github/workflows/update-issue-form.yml
@@ -18,17 +18,17 @@ jobs:

    steps:
      - name: 📥 Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

      - name: "🟢 Setup Node.js"
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
        with:
          node-version: '24.x'
          cache: 'npm'

      - name: 🔍 Extract minor version from app.json
        id: minor
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # main
+        uses: actions/github-script@main
        with:
          result-encoding: string
          script: |
@@ -54,7 +54,7 @@ jobs:
          dry_run: no-push

      - name: 📬 Commit and create pull request
-        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
        with:
          add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
          branch: ci-update-bug-report
--- a/.gitignore
+++ b/.gitignore
@@ -61,8 +61,6 @@ expo-env.d.ts
 pc-api-7079014811501811218-719-3b9f15aeccf8.json
 credentials.json
 streamyfin-4fec1-firebase-adminsdk.json
-/profiles/
-certs/

 # Version and Backup Files
 /version-backup-*
@@ -73,4 +71,4 @@ modules/background-downloader/android/build/*

 # ios:unsigned-build Artifacts
 build/
-.claude/
+.claude/settings.local.json
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,39 +1,9 @@
 # CLAUDE.md

+@.claude/learned-facts.md
+
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.

-## Learned Facts Index
-
-IMPORTANT: When encountering issues related to these topics, or when implementing new features that touch these areas, prefer retrieval-led reasoning -- read the relevant fact file in `.claude/learned-facts/` before relying on assumptions.
-
-Navigation:
- `native-bottom-tabs-userouter-conflict` | useRouter() at provider level causes tab switches; use static router import
- `introsheet-rendering-location` | IntroSheet in IntroSheetProvider affects native bottom tabs via nav state hooks
- `intro-modal-trigger-location` | Trigger in Home.tsx, not tabs _layout.tsx
- `tab-folder-naming` | Use underscore prefix: (_home) not (home)
-
-UI/Headers:
- `macos-header-buttons-fix` | macOS Catalyst: use RNGH Pressable, not RN TouchableOpacity
- `header-button-locations` | Defined in _layout.tsx, HeaderBackButton, Chromecast, RoundButton, etc.
- `stack-screen-header-configuration` | Sub-pages need explicit Stack.Screen with headerTransparent + back button
-
-State/Data:
- `use-network-aware-query-client-limitations` | Object.create breaks private fields; only for invalidateQueries
- `mark-as-played-flow` | PlayedStatus→useMarkAsPlayed→playbackManager with optimistic updates
-
-Native Modules:
- `mpv-tvos-player-exit-freeze` | mpv_terminate_destroy deadlocks main thread; use DispatchQueue.global()
- `mpv-avfoundation-composite-osd-ordering` | MUST follow vo=avfoundation, before hwdec options
- `thread-safe-state-for-stop-flags` | Stop flags need synchronous setter (stateQueue.sync not async)
- `native-swiftui-view-sizing` | Need explicit frame + intrinsicContentSize override in ExpoView
-
-TV Platform:
- `tv-modals-must-use-navigation-pattern` | Use atom+router.push(), never overlay/absolute modals
- `tv-grid-layout-pattern` | ScrollView+flexWrap, not FlatList numColumns
- `tv-horizontal-padding-standard` | TV_HORIZONTAL_PADDING=60, not old TV_SCALE_PADDING=20
- `streamystats-components-location` | components/home/Streamystats*.tv.tsx, watchlists/[watchlistId].tsx
- `platform-specific-file-suffix-does-not-work` | .tv.tsx doesn't work; use Platform.isTV conditional rendering
-
 ## Project Overview

 Streamyfin is a cross-platform Jellyfin video streaming client built with Expo (React Native). It supports mobile (iOS/Android) and TV platforms, with features including offline downloads, Chromecast support, and Jellyseerr integration.
@@ -95,7 +65,6 @@ bun run ios:install-metal-toolchain  # Fix "missing Metal Toolchain" build error
 **State Management**:
 - Global state uses Jotai atoms in `utils/atoms/`
 - `settingsAtom` in `utils/atoms/settings.ts` for app settings
-  - **IMPORTANT**: When adding a setting to the settings atom, ensure it's toggleable in the settings view (either TV or mobile, depending on the feature scope)
 - `apiAtom` and `userAtom` in `providers/JellyfinProvider.tsx` for auth state
 - Server state uses React Query with `@tanstack/react-query`

@@ -159,7 +128,6 @@ import { apiAtom } from "@/providers/JellyfinProvider";
 - Handle both mobile and TV navigation patterns
 - Use existing atoms, hooks, and utilities before creating new ones
 - Use Conventional Commits: `feat(scope):`, `fix(scope):`, `chore(scope):`
- **Translations**: When adding a translation key to a Text component, ensure the key exists in both `translations/en.json` and `translations/sv.json`. Before adding new keys, check if an existing key already covers the use case.

 ## Platform Considerations

@@ -170,13 +138,13 @@ import { apiAtom } from "@/providers/JellyfinProvider";
 - **TV Typography**: Use `TVTypography` from `@/components/tv/TVTypography` for all text on TV. It provides consistent font sizes optimized for TV viewing distance.
 - **TV Button Sizing**: Ensure buttons placed next to each other have the same size for visual consistency.
 - **TV Focus Scale Padding**: Add sufficient padding around focusable items in tables/rows/columns/lists. The focus scale animation (typically 1.05x) will clip against parent containers without proper padding. Use `overflow: "visible"` on containers and add padding to prevent clipping.
- **TV Modals**: Never use React Native's `Modal` component or overlay/absolute-positioned modals for full-screen modals on TV. Use the navigation-based modal pattern instead. **See [docs/tv-modal-guide.md](docs/tv-modal-guide.md) for detailed documentation.**
+- **TV Modals**: Never use overlay/absolute-positioned modals on TV as they don't handle the back button correctly. Instead, use the navigation-based modal pattern: create a Jotai atom for state, a hook that sets the atom and calls `router.push()`, and a page file in `app/(auth)/` that reads the atom and clears it on unmount. You must also add a `Stack.Screen` entry in `app/_layout.tsx` with `presentation: "transparentModal"` and `animation: "fade"` for the modal to render correctly as an overlay. See `useTVRequestModal` + `tv-request-modal.tsx` for reference.

 ### TV Component Rendering Pattern

-**IMPORTANT**: The `.tv.tsx` file suffix does NOT work in this project - neither for pages nor components. Metro bundler doesn't resolve platform-specific suffixes. Always use `Platform.isTV` conditional rendering instead.
+**IMPORTANT**: The `.tv.tsx` file suffix only works for **pages** in the `app/` directory (resolved by Expo Router). It does NOT work for components - Metro bundler doesn't resolve platform-specific suffixes for component imports.

-**Pattern for TV-specific pages and components**:
+**Pattern for TV-specific components**:
 ```typescript
 // In page file (e.g., app/login.tsx)
 import { Platform } from "react-native";
@@ -196,11 +164,99 @@ export default LoginPage;
 - Create separate component files for mobile and TV (e.g., `MyComponent.tsx` and `TVMyComponent.tsx`)
 - Use `Platform.isTV` to conditionally render the appropriate component
 - TV components typically use `TVInput`, `TVServerCard`, and other TV-prefixed components with focus handling
- **Never use `.tv.tsx` file suffix** - it will not be resolved correctly

-### TV Option Selectors and Focus Management
+### TV Option Selector Pattern (Dropdowns/Multi-select)

-For dropdown/select components, bottom sheets, and overlay focus management on TV, see [docs/tv-modal-guide.md](docs/tv-modal-guide.md).
+For dropdown/select components on TV, use a **bottom sheet with horizontal scrolling**. This pattern is ideal for TV because:
+- Horizontal scrolling is natural for TV remotes (left/right D-pad)
+- Bottom sheet takes minimal screen space
+- Focus-based navigation works reliably
+
+**Key implementation details:**
+
+1. **Use absolute positioning instead of Modal** - React Native's `Modal` breaks the TV focus chain. Use an absolutely positioned `View` overlay instead:
+```typescript
+<View style={{
+  position: "absolute",
+  top: 0, left: 0, right: 0, bottom: 0,
+  backgroundColor: "rgba(0, 0, 0, 0.5)",
+  justifyContent: "flex-end",
+  zIndex: 1000,
+}}>
+  <BlurView intensity={80} tint="dark" style={{ borderTopLeftRadius: 24, borderTopRightRadius: 24 }}>
+    {/* Content */}
+  </BlurView>
+</View>
+```
+
+2. **Horizontal ScrollView with focusable cards**:
+```typescript
+<ScrollView
+  horizontal
+  showsHorizontalScrollIndicator={false}
+  style={{ overflow: "visible" }}
+  contentContainerStyle={{ paddingHorizontal: 48, paddingVertical: 10, gap: 12 }}
+>
+  {options.map((option, index) => (
+    <TVOptionCard
+      key={index}
+      hasTVPreferredFocus={index === selectedIndex}
+      onPress={() => { onSelect(option.value); onClose(); }}
+      // ...
+    />
+  ))}
+</ScrollView>
+```
+
+3. **Focus handling on cards** - Use `Pressable` with `onFocus`/`onBlur` and `hasTVPreferredFocus`:
+```typescript
+<Pressable
+  onPress={onPress}
+  onFocus={() => { setFocused(true); animateTo(1.05); }}
+  onBlur={() => { setFocused(false); animateTo(1); }}
+  hasTVPreferredFocus={hasTVPreferredFocus}
+>
+  <Animated.View style={{ transform: [{ scale }], backgroundColor: focused ? "#fff" : "rgba(255,255,255,0.08)" }}>
+    <Text style={{ color: focused ? "#000" : "#fff" }}>{label}</Text>
+  </Animated.View>
+</Pressable>
+```
+
+4. **Add padding for scale animations** - When items scale on focus, add enough padding (`overflow: "visible"` + `paddingVertical`) so scaled items don't clip.
+
+**Reference implementation**: See `TVOptionSelector` and `TVOptionCard` in `components/ItemContent.tv.tsx`
+
+### TV Focus Management for Overlays/Modals
+
+**CRITICAL**: When displaying overlays (bottom sheets, modals, dialogs) on TV, you must explicitly disable focus on all background elements. Without this, the TV focus engine will rapidly switch between overlay and background elements, causing a focus loop that freezes navigation.
+
+**Solution**: Add a `disabled` prop to every focusable component and pass `disabled={isModalOpen}` when an overlay is visible:
+
+```typescript
+// 1. Track modal state
+const [openModal, setOpenModal] = useState<ModalType | null>(null);
+const isModalOpen = openModal !== null;
+
+// 2. Each focusable component accepts disabled prop
+const TVFocusableButton: React.FC<{
+  onPress: () => void;
+  disabled?: boolean;
+}> = ({ onPress, disabled }) => (
+  <Pressable
+    onPress={onPress}
+    disabled={disabled}
+    focusable={!disabled}
+    hasTVPreferredFocus={isFirst && !disabled}
+  >
+    {/* content */}
+  </Pressable>
+);
+
+// 3. Pass disabled to all background components when modal is open
+<TVFocusableButton onPress={handlePress} disabled={isModalOpen} />
+```
+
+**Reference implementation**: See `settings.tv.tsx` for complete example with `TVSettingsOptionButton`, `TVSettingsToggle`, `TVSettingsStepper`, etc.

 ### TV Focus Flickering Between Zones (Lists with Headers)

--- a/README.md
+++ b/README.md
@@ -126,10 +126,6 @@ For the TV version suffix the npm commands with `:tv`.
 `npm run prebuild:tv`  
 `npm run ios:tv or npm run android:tv`

-TV platform integration notes:
-
- [TV Discovery](./docs/tv-discovery.md)
-
 ## 👋 Get in Touch with Us

 Need assistance or have any questions?
--- a/app.config.js
+++ b/app.config.js
@@ -6,14 +6,6 @@ module.exports = ({ config }) => {
      "react-native-google-cast",
      { useDefaultExpandedMediaControls: true },
    ]);
-
-    config.plugins.push([
-      "expo-camera",
-      {
-        cameraPermission:
-          "Allow Streamyfin to access the camera to scan QR codes for TV login.",
-      },
-    ]);
  }

  // Only override googleServicesFile if env var is set
--- a/app.json
+++ b/app.json
@@ -2,11 +2,13 @@
  "expo": {
    "name": "Streamyfin",
    "slug": "streamyfin",
-    "version": "0.54.0",
+    "version": "0.52.0",
    "orientation": "default",
    "icon": "./assets/images/icon.png",
    "scheme": "streamyfin",
    "userInterfaceStyle": "dark",
+    "jsEngine": "hermes",
+    "newArchEnabled": true,
    "assetBundlePatterns": ["**/*"],
    "ios": {
      "requireFullScreen": true,
@@ -36,7 +38,8 @@
      "appleTeamId": "MWD5K362T8"
    },
    "android": {
-      "versionCode": 93,
+      "jsEngine": "hermes",
+      "versionCode": 92,
      "adaptiveIcon": {
        "foregroundImage": "./assets/images/icon-android-plain.png",
        "monochromeImage": "./assets/images/icon-android-themed.png",
@@ -73,21 +76,19 @@
      "expo-router",
      "expo-font",
      "./plugins/withExcludeMedia3Dash.js",
-      "./plugins/withTVUserManagement.js",
      [
        "expo-build-properties",
        {
          "ios": {
-            "deploymentTarget": "16.4",
-            "useFrameworks": "static",
-            "forceStaticLinking": ["ExpoUI", "GlassEffectView", "GlassPoster"]
+            "deploymentTarget": "15.6",
+            "useFrameworks": "static"
          },
          "android": {
-            "buildArchs": ["arm64-v8a", "x86_64", "armeabi-v7a"],
+            "buildArchs": ["arm64-v8a", "x86_64"],
            "compileSdkVersion": 36,
            "targetSdkVersion": 35,
            "buildToolsVersion": "35.0.0",
-            "kotlinVersion": "2.1.20",
+            "kotlinVersion": "2.0.21",
            "minSdkVersion": 26,
            "usesCleartextTraffic": true,
            "packagingOptions": {
@@ -134,12 +135,10 @@
      "expo-web-browser",
      ["./plugins/with-runtime-framework-headers.js"],
      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
-      ["./plugins/withAndroidAlertColors.js"],
      ["./plugins/withAndroidManifest.js"],
      ["./plugins/withTrustLocalCerts.js"],
      ["./plugins/withGradleProperties.js"],
      ["./plugins/withTVOSAppIcon.js"],
-      ["./plugins/withTVOSTopShelf.js"],
      ["./plugins/withTVXcodeEnv.js"],
      [
        "./plugins/withGitPod.js",
--- a/app/(auth)/(tabs)/(home)/_layout.tsx
+++ b/app/(auth)/(tabs)/(home)/_layout.tsx
@@ -96,25 +96,6 @@ export default function IndexLayout() {
          ),
        }}
      />
-      <Stack.Screen
-        name='companion-login'
-        options={{
-          title: t("companion_login.title"),
-          headerShown: !Platform.isTV,
-          headerBlurEffect: "none",
-          headerTransparent: Platform.OS === "ios",
-          headerShadowVisible: false,
-          headerLeft: () => (
-            <Pressable
-              onPress={() => _router.back()}
-              className='pl-0.5'
-              style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
-            >
-              <Feather name='chevron-left' size={28} color='white' />
-            </Pressable>
-          ),
-        }}
-      />
      <Stack.Screen
        name='settings/playback-controls/page'
        options={{
--- a/app/(auth)/(tabs)/(home)/companion-login.tsx
+++ b/app/(auth)/(tabs)/(home)/companion-login.tsx
@@ -1,7 +0,0 @@
-import { Platform } from "react-native";
-import { CompanionLoginScreen } from "@/components/companion/CompanionLoginScreen";
-
-export default function CompanionLoginPage() {
-  if (Platform.isTV) return null;
-  return <CompanionLoginScreen />;
-}
--- a/app/(auth)/(tabs)/(home)/settings.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tsx
@@ -59,18 +59,6 @@ function SettingsMobile() {

        <QuickConnect className='mb-4' />

-        <TouchableOpacity
-          className='mb-4 p-4 rounded-xl bg-neutral-900 border border-neutral-800'
-          onPress={() => router.push("/(auth)/(tabs)/(home)/companion-login")}
-        >
-          <Text className='text-white font-bold text-base mb-1'>
-            {t("pairing.pair_with_phone_title")}
-          </Text>
-          <Text className='text-neutral-400 text-sm'>
-            {t("pairing.pair_with_phone_description")}
-          </Text>
-        </TouchableOpacity>
-
        <View className='mb-4'>
          <AppLanguageSelector />
        </View>
--- a/app/(auth)/(tabs)/(home)/settings.tv.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tv.tsx
@@ -1,15 +1,10 @@
 import { SubtitlePlaybackMode } from "@jellyfin/sdk/lib/generated-client";
-import { useQueryClient } from "@tanstack/react-query";
-import { Directory, Paths } from "expo-file-system";
-import { Image } from "expo-image";
 import { useAtom } from "jotai";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Alert, ScrollView, 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 { TVPasswordEntryModal } from "@/components/login/TVPasswordEntryModal";
-import { TVPINEntryModal } from "@/components/login/TVPINEntryModal";
 import type { TVOptionItem } from "@/components/tv";
 import {
  TVLogoutButton,
@@ -22,240 +17,28 @@ import {
 } from "@/components/tv";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
-import { useTVUserSwitchModal } from "@/hooks/useTVUserSwitchModal";
-import { APP_LANGUAGES } from "@/i18n";
-import { clearCache as clearAudioCache } from "@/providers/AudioStorage";
-import {
-  apiAtom,
-  cacheVersionAtom,
-  useJellyfin,
-  userAtom,
-} from "@/providers/JellyfinProvider";
+import { apiAtom, useJellyfin, userAtom } from "@/providers/JellyfinProvider";
 import {
  AudioTranscodeMode,
-  InactivityTimeout,
-  type MpvCacheMode,
-  type MpvVoDriver,
  TVTypographyScale,
  useSettings,
 } from "@/utils/atoms/settings";
-import { storage } from "@/utils/mmkv";
-import {
-  getPreviousServers,
-  type SavedServer,
-  type SavedServerAccount,
-} from "@/utils/secureCredentials";
-import { clearTopShelfCacheSafely } from "@/utils/topshelf/cache";

 export default function SettingsTV() {
  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
  const { settings, updateSettings } = useSettings();
-  const { logout, loginWithSavedCredential, loginWithPassword } = useJellyfin();
+  const { logout } = useJellyfin();
  const [user] = useAtom(userAtom);
  const [api] = useAtom(apiAtom);
-  const [, setCacheVersion] = useAtom(cacheVersionAtom);
  const { showOptions } = useTVOptionModal();
-  const { showUserSwitchModal } = useTVUserSwitchModal();
  const typography = useScaledTVTypography();
-  const queryClient = useQueryClient();

  // Local state for OpenSubtitles API key (only commit on blur)
  const [openSubtitlesApiKey, setOpenSubtitlesApiKey] = useState(
    settings.openSubtitlesApiKey || "",
  );

-  // PIN/Password modal state for user switching
-  const [pinModalVisible, setPinModalVisible] = useState(false);
-  const [passwordModalVisible, setPasswordModalVisible] = useState(false);
-  const [selectedServer, setSelectedServer] = useState<SavedServer | null>(
-    null,
-  );
-  const [selectedAccount, setSelectedAccount] =
-    useState<SavedServerAccount | null>(null);
-
-  // Track if any modal is open to disable background focus
-  const isAnyModalOpen = pinModalVisible || passwordModalVisible;
-
-  // Get current server and other accounts
-  const currentServer = useMemo(() => {
-    if (!api?.basePath) return null;
-    const servers = getPreviousServers();
-    return servers.find((s) => s.address === api.basePath) || null;
-  }, [api?.basePath]);
-
-  const otherAccounts = useMemo(() => {
-    if (!currentServer || !user?.Id) return [];
-    return currentServer.accounts.filter(
-      (account) => account.userId !== user.Id,
-    );
-  }, [currentServer, user?.Id]);
-
-  const hasOtherAccounts = otherAccounts.length > 0;
-
-  // Handle account selection from modal
-  const handleAccountSelect = async (account: SavedServerAccount) => {
-    if (!currentServer) return;
-
-    if (account.securityType === "none") {
-      // Direct login with saved credential
-      try {
-        await loginWithSavedCredential(currentServer.address, account.userId);
-      } catch (error) {
-        const errorMessage =
-          error instanceof Error ? error.message : t("server.session_expired");
-        const isSessionExpired = errorMessage.includes(
-          t("server.session_expired"),
-        );
-        Alert.alert(
-          isSessionExpired
-            ? t("server.session_expired")
-            : t("login.connection_failed"),
-          isSessionExpired ? t("server.please_login_again") : errorMessage,
-        );
-      }
-    } else if (account.securityType === "pin") {
-      // Show PIN modal
-      setSelectedServer(currentServer);
-      setSelectedAccount(account);
-      setPinModalVisible(true);
-    } else if (account.securityType === "password") {
-      // Show password modal
-      setSelectedServer(currentServer);
-      setSelectedAccount(account);
-      setPasswordModalVisible(true);
-    }
-  };
-
-  // Handle successful PIN entry
-  const handlePinSuccess = async () => {
-    setPinModalVisible(false);
-    if (selectedServer && selectedAccount) {
-      try {
-        await loginWithSavedCredential(
-          selectedServer.address,
-          selectedAccount.userId,
-        );
-      } catch (error) {
-        const errorMessage =
-          error instanceof Error ? error.message : t("server.session_expired");
-        const isSessionExpired = errorMessage.includes(
-          t("server.session_expired"),
-        );
-        Alert.alert(
-          isSessionExpired
-            ? t("server.session_expired")
-            : t("login.connection_failed"),
-          isSessionExpired ? t("server.please_login_again") : errorMessage,
-        );
-      }
-    }
-    setSelectedServer(null);
-    setSelectedAccount(null);
-  };
-
-  // Handle password submission
-  const handlePasswordSubmit = async (password: string) => {
-    if (selectedServer && selectedAccount) {
-      await loginWithPassword(
-        selectedServer.address,
-        selectedAccount.username,
-        password,
-      );
-    }
-    setPasswordModalVisible(false);
-    setSelectedServer(null);
-    setSelectedAccount(null);
-  };
-
-  // Handle switch user button press
-  const handleSwitchUser = () => {
-    if (!currentServer || !user?.Id) return;
-    showUserSwitchModal(currentServer, user.Id, {
-      onAccountSelect: handleAccountSelect,
-    });
-  };
-
-  // Handle clearing all cache in the entire app
-  const handleClearCache = async () => {
-    Alert.alert(
-      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", "Cancel"),
-          style: "cancel",
-        },
-        {
-          text: t("common.ok", "OK"),
-          onPress: async () => {
-            try {
-              // 1. Clear React Query Cache (memory & MMKV)
-              storage.remove("REACT_QUERY_OFFLINE_CACHE");
-              await queryClient.resetQueries();
-
-              // 2. Clear expo-image cache (memory & disk)
-              await Image.clearDiskCache();
-              Image.clearMemoryCache();
-
-              // 3. Clear AudioStorage (music) cache
-              await clearAudioCache();
-
-              // 4. Clear TopShelf cache
-              clearTopShelfCacheSafely();
-
-              // 5. Clear Subtitle Cache
-              storage.remove("downloadedSubtitles.json");
-              const subtitlesDir = new Directory(
-                Paths.cache,
-                "streamyfin-subtitles",
-              );
-              if (subtitlesDir.exists) {
-                await subtitlesDir.delete();
-              }
-
-              // 6. Clear MMKV caches like extracted image colors and other non-essential storage keys
-              const keysToKeep = [
-                "settings",
-                "serverUrl",
-                "token",
-                "user",
-                "deviceId",
-                "previousServers",
-                "hasAskedForNotificationPermission",
-                "hasShownIntro",
-                "multiAccountMigrated",
-                "selectedTVServer",
-                "downloads.v2.json",
-              ];
-              const allKeys = storage.getAllKeys();
-              for (const key of allKeys) {
-                if (!keysToKeep.includes(key)) {
-                  storage.remove(key);
-                }
-              }
-
-              // 7. Increment cache version to force remount of components
-              setCacheVersion((v) => v + 1);
-            } catch (error) {
-              console.error("Failed to clear cache:", error);
-              Alert.alert(
-                t("home.settings.toasts.error_deleting_files", "Error"),
-                t(
-                  "home.settings.storage.clear_all_cache_error_desc",
-                  "An error occurred while clearing the cache.",
-                ),
-              );
-            }
-          },
-        },
-      ],
-    );
-  };
-
  const currentAudioTranscode =
    settings.audioTranscodeMode || AudioTranscodeMode.Auto;
  const currentSubtitleMode =
@@ -264,9 +47,6 @@ export default function SettingsTV() {
  const currentAlignY = settings.mpvSubtitleAlignY ?? "bottom";
  const currentTypographyScale =
    settings.tvTypographyScale || TVTypographyScale.Default;
-  const currentCacheMode = settings.mpvCacheEnabled ?? "auto";
-  const currentVoDriver = settings.mpvVoDriver ?? "gpu-next";
-  const currentLanguage = settings.preferedLanguage;

  // Audio transcoding options
  const audioTranscodeModeOptions: TVOptionItem<AudioTranscodeMode>[] = useMemo(
@@ -358,65 +138,26 @@ export default function SettingsTV() {
    [currentAlignY],
  );

-  // Cache mode options
-  const cacheModeOptions: TVOptionItem<MpvCacheMode>[] = useMemo(
-    () => [
-      {
-        label: t("home.settings.buffer.cache_auto"),
-        value: "auto",
-        selected: currentCacheMode === "auto",
-      },
-      {
-        label: t("home.settings.buffer.cache_yes"),
-        value: "yes",
-        selected: currentCacheMode === "yes",
-      },
-      {
-        label: t("home.settings.buffer.cache_no"),
-        value: "no",
-        selected: currentCacheMode === "no",
-      },
-    ],
-    [t, currentCacheMode],
-  );
-
-  // VO driver options
-  const voDriverOptions: TVOptionItem<MpvVoDriver>[] = useMemo(
-    () => [
-      {
-        label: t("home.settings.vo_driver.gpu_next"),
-        value: "gpu-next",
-        selected: currentVoDriver === "gpu-next",
-      },
-      {
-        label: t("home.settings.vo_driver.gpu"),
-        value: "gpu",
-        selected: currentVoDriver === "gpu",
-      },
-    ],
-    [t, currentVoDriver],
-  );
-
  // Typography scale options
  const typographyScaleOptions: TVOptionItem<TVTypographyScale>[] = useMemo(
    () => [
      {
-        label: t("home.settings.appearance.display_size_small"),
+        label: t("home.settings.appearance.text_size_small"),
        value: TVTypographyScale.Small,
        selected: currentTypographyScale === TVTypographyScale.Small,
      },
      {
-        label: t("home.settings.appearance.display_size_default"),
+        label: t("home.settings.appearance.text_size_default"),
        value: TVTypographyScale.Default,
        selected: currentTypographyScale === TVTypographyScale.Default,
      },
      {
-        label: t("home.settings.appearance.display_size_large"),
+        label: t("home.settings.appearance.text_size_large"),
        value: TVTypographyScale.Large,
        selected: currentTypographyScale === TVTypographyScale.Large,
      },
      {
-        label: t("home.settings.appearance.display_size_extra_large"),
+        label: t("home.settings.appearance.text_size_extra_large"),
        value: TVTypographyScale.ExtraLarge,
        selected: currentTypographyScale === TVTypographyScale.ExtraLarge,
      },
@@ -424,74 +165,6 @@ export default function SettingsTV() {
    [t, currentTypographyScale],
  );

-  // Language options
-  const languageOptions: TVOptionItem<string | undefined>[] = useMemo(
-    () => [
-      {
-        label: t("home.settings.languages.system"),
-        value: undefined,
-        selected: !currentLanguage,
-      },
-      ...APP_LANGUAGES.map((lang) => ({
-        label: lang.label,
-        value: lang.value,
-        selected: currentLanguage === lang.value,
-      })),
-    ],
-    [t, currentLanguage],
-  );
-
-  // Inactivity timeout options (TV security feature)
-  const currentInactivityTimeout =
-    settings.inactivityTimeout ?? InactivityTimeout.Disabled;
-
-  const inactivityTimeoutOptions: TVOptionItem<InactivityTimeout>[] = useMemo(
-    () => [
-      {
-        label: t("home.settings.security.inactivity_timeout.disabled"),
-        value: InactivityTimeout.Disabled,
-        selected: currentInactivityTimeout === InactivityTimeout.Disabled,
-      },
-      {
-        label: t("home.settings.security.inactivity_timeout.1_minute"),
-        value: InactivityTimeout.OneMinute,
-        selected: currentInactivityTimeout === InactivityTimeout.OneMinute,
-      },
-      {
-        label: t("home.settings.security.inactivity_timeout.5_minutes"),
-        value: InactivityTimeout.FiveMinutes,
-        selected: currentInactivityTimeout === InactivityTimeout.FiveMinutes,
-      },
-      {
-        label: t("home.settings.security.inactivity_timeout.15_minutes"),
-        value: InactivityTimeout.FifteenMinutes,
-        selected: currentInactivityTimeout === InactivityTimeout.FifteenMinutes,
-      },
-      {
-        label: t("home.settings.security.inactivity_timeout.30_minutes"),
-        value: InactivityTimeout.ThirtyMinutes,
-        selected: currentInactivityTimeout === InactivityTimeout.ThirtyMinutes,
-      },
-      {
-        label: t("home.settings.security.inactivity_timeout.1_hour"),
-        value: InactivityTimeout.OneHour,
-        selected: currentInactivityTimeout === InactivityTimeout.OneHour,
-      },
-      {
-        label: t("home.settings.security.inactivity_timeout.4_hours"),
-        value: InactivityTimeout.FourHours,
-        selected: currentInactivityTimeout === InactivityTimeout.FourHours,
-      },
-      {
-        label: t("home.settings.security.inactivity_timeout.24_hours"),
-        value: InactivityTimeout.TwentyFourHours,
-        selected:
-          currentInactivityTimeout === InactivityTimeout.TwentyFourHours,
-      },
-    ],
-    [t, currentInactivityTimeout],
-  );
-
  // Get display labels for option buttons
  const audioTranscodeLabel = useMemo(() => {
    const option = audioTranscodeModeOptions.find((o) => o.selected);
@@ -515,32 +188,9 @@ export default function SettingsTV() {

  const typographyScaleLabel = useMemo(() => {
    const option = typographyScaleOptions.find((o) => o.selected);
-    return option?.label || t("home.settings.appearance.display_size_default");
+    return option?.label || t("home.settings.appearance.text_size_default");
  }, [typographyScaleOptions, t]);

-  const cacheModeLabel = useMemo(() => {
-    const option = cacheModeOptions.find((o) => o.selected);
-    return option?.label || t("home.settings.buffer.cache_auto");
-  }, [cacheModeOptions, t]);
-
-  const voDriverLabel = useMemo(() => {
-    const option = voDriverOptions.find((o) => o.selected);
-    return option?.label || t("home.settings.vo_driver.gpu_next");
-  }, [voDriverOptions, t]);
-
-  const languageLabel = useMemo(() => {
-    if (!currentLanguage) return t("home.settings.languages.system");
-    const option = APP_LANGUAGES.find((l) => l.value === currentLanguage);
-    return option?.label || t("home.settings.languages.system");
-  }, [currentLanguage, t]);
-
-  const inactivityTimeoutLabel = useMemo(() => {
-    const option = inactivityTimeoutOptions.find((o) => o.selected);
-    return (
-      option?.label || t("home.settings.security.inactivity_timeout.disabled")
-    );
-  }, [inactivityTimeoutOptions, t]);
-
  return (
    <View style={{ flex: 1, backgroundColor: "#000000" }}>
      <View style={{ flex: 1 }}>
@@ -565,31 +215,6 @@ export default function SettingsTV() {
            {t("home.settings.settings_title")}
          </Text>

-          {/* Account Section */}
-          <TVSectionHeader title={t("home.settings.switch_user.account")} />
-          <TVSettingsOptionButton
-            label={t("home.settings.switch_user.switch_user")}
-            value={user?.Name || "-"}
-            onPress={handleSwitchUser}
-            disabled={!hasOtherAccounts || isAnyModalOpen}
-            isFirst
-          />
-
-          {/* Security Section */}
-          <TVSectionHeader title={t("home.settings.security.title")} />
-          <TVSettingsOptionButton
-            label={t("home.settings.security.inactivity_timeout.title")}
-            value={inactivityTimeoutLabel}
-            onPress={() =>
-              showOptions({
-                title: t("home.settings.security.inactivity_timeout.title"),
-                options: inactivityTimeoutOptions,
-                onSelect: (value) =>
-                  updateSettings({ inactivityTimeout: value }),
-              })
-            }
-          />
-
          {/* Audio Section */}
          <TVSectionHeader title={t("home.settings.audio.audio_title")} />
          <TVSettingsOptionButton
@@ -603,6 +228,7 @@ export default function SettingsTV() {
                  updateSettings({ audioTranscodeMode: value }),
              })
            }
+            isFirst
          />

          {/* Subtitles Section */}
@@ -629,10 +255,26 @@ export default function SettingsTV() {
          />
          <TVSettingsStepper
            label={t("home.settings.subtitles.subtitle_size")}
+            value={settings.subtitleSize / 100}
+            onDecrease={() => {
+              const newValue = Math.max(0.3, settings.subtitleSize / 100 - 0.1);
+              updateSettings({ subtitleSize: Math.round(newValue * 100) });
+            }}
+            onIncrease={() => {
+              const newValue = Math.min(1.5, settings.subtitleSize / 100 + 0.1);
+              updateSettings({ subtitleSize: Math.round(newValue * 100) });
+            }}
+            formatValue={(v) => `${v.toFixed(1)}x`}
+          />
+
+          {/* MPV Subtitles Section */}
+          <TVSectionHeader title='MPV Subtitle Settings' />
+          <TVSettingsStepper
+            label='Subtitle Scale'
            value={settings.mpvSubtitleScale ?? 1.0}
            onDecrease={() => {
              const newValue = Math.max(
-                0.1,
+                0.5,
                (settings.mpvSubtitleScale ?? 1.0) - 0.1,
              );
              updateSettings({
@@ -641,7 +283,7 @@ export default function SettingsTV() {
            }}
            onIncrease={() => {
              const newValue = Math.min(
-                3.0,
+                2.0,
                (settings.mpvSubtitleScale ?? 1.0) + 0.1,
              );
              updateSettings({
@@ -740,117 +382,20 @@ export default function SettingsTV() {
              "Get your free API key at opensubtitles.com/en/consumers"}
          </Text>

-          {/* Buffer Settings Section */}
-          <TVSectionHeader title={t("home.settings.buffer.title")} />
-          <TVSettingsOptionButton
-            label={t("home.settings.buffer.cache_mode")}
-            value={cacheModeLabel}
-            onPress={() =>
-              showOptions({
-                title: t("home.settings.buffer.cache_mode"),
-                options: cacheModeOptions,
-                onSelect: (value) => updateSettings({ mpvCacheEnabled: value }),
-              })
-            }
-          />
-
-          {/* Video Output Section */}
-          <TVSectionHeader title={t("home.settings.vo_driver.title")} />
-          <TVSettingsOptionButton
-            label={t("home.settings.vo_driver.vo_mode")}
-            value={voDriverLabel}
-            onPress={() =>
-              showOptions({
-                title: t("home.settings.vo_driver.vo_mode"),
-                options: voDriverOptions,
-                onSelect: (value) => updateSettings({ mpvVoDriver: value }),
-              })
-            }
-          />
-          <TVSettingsStepper
-            label={t("home.settings.buffer.buffer_duration")}
-            value={settings.mpvCacheSeconds ?? 10}
-            onDecrease={() => {
-              const newValue = Math.max(
-                5,
-                (settings.mpvCacheSeconds ?? 10) - 5,
-              );
-              updateSettings({ mpvCacheSeconds: newValue });
-            }}
-            onIncrease={() => {
-              const newValue = Math.min(
-                120,
-                (settings.mpvCacheSeconds ?? 10) + 5,
-              );
-              updateSettings({ mpvCacheSeconds: newValue });
-            }}
-            formatValue={(v) => `${v}s`}
-          />
-          <TVSettingsStepper
-            label={t("home.settings.buffer.max_cache_size")}
-            value={settings.mpvDemuxerMaxBytes ?? 150}
-            onDecrease={() => {
-              const newValue = Math.max(
-                50,
-                (settings.mpvDemuxerMaxBytes ?? 150) - 25,
-              );
-              updateSettings({ mpvDemuxerMaxBytes: newValue });
-            }}
-            onIncrease={() => {
-              const newValue = Math.min(
-                500,
-                (settings.mpvDemuxerMaxBytes ?? 150) + 25,
-              );
-              updateSettings({ mpvDemuxerMaxBytes: newValue });
-            }}
-            formatValue={(v) => `${v} MB`}
-          />
-          <TVSettingsStepper
-            label={t("home.settings.buffer.max_backward_cache")}
-            value={settings.mpvDemuxerMaxBackBytes ?? 50}
-            onDecrease={() => {
-              const newValue = Math.max(
-                25,
-                (settings.mpvDemuxerMaxBackBytes ?? 50) - 25,
-              );
-              updateSettings({ mpvDemuxerMaxBackBytes: newValue });
-            }}
-            onIncrease={() => {
-              const newValue = Math.min(
-                200,
-                (settings.mpvDemuxerMaxBackBytes ?? 50) + 25,
-              );
-              updateSettings({ mpvDemuxerMaxBackBytes: newValue });
-            }}
-            formatValue={(v) => `${v} MB`}
-          />
-
          {/* Appearance Section */}
          <TVSectionHeader title={t("home.settings.appearance.title")} />
          <TVSettingsOptionButton
-            label={t("home.settings.appearance.display_size")}
+            label={t("home.settings.appearance.text_size")}
            value={typographyScaleLabel}
            onPress={() =>
              showOptions({
-                title: t("home.settings.appearance.display_size"),
+                title: t("home.settings.appearance.text_size"),
                options: typographyScaleOptions,
                onSelect: (value) =>
                  updateSettings({ tvTypographyScale: value }),
              })
            }
          />
-          <TVSettingsOptionButton
-            label={t("home.settings.languages.app_language")}
-            value={languageLabel}
-            onPress={() =>
-              showOptions({
-                title: t("home.settings.languages.app_language"),
-                options: languageOptions,
-                onSelect: (value) =>
-                  updateSettings({ preferedLanguage: value }),
-              })
-            }
-          />
          <TVSettingsToggle
            label={t(
              "home.settings.appearance.merge_next_up_continue_watching",
@@ -877,20 +422,6 @@ export default function SettingsTV() {
              updateSettings({ showSeriesPosterOnEpisode: value })
            }
          />
-          <TVSettingsToggle
-            label={t("home.settings.appearance.theme_music")}
-            value={settings.tvThemeMusicEnabled}
-            onToggle={(value) => updateSettings({ tvThemeMusicEnabled: value })}
-          />
-
-          {/* Storage Section */}
-          <TVSectionHeader title={t("home.settings.storage.storage_title")} />
-          <TVSettingsOptionButton
-            label={t("home.settings.storage.clear_all_cache")}
-            value=''
-            onPress={handleClearCache}
-            isFirst
-          />

          {/* User Section */}
          <TVSectionHeader
@@ -913,37 +444,6 @@ export default function SettingsTV() {
          </View>
        </ScrollView>
      </View>
-
-      {/* PIN Entry Modal */}
-      <TVPINEntryModal
-        visible={pinModalVisible}
-        onClose={() => {
-          setPinModalVisible(false);
-          setSelectedAccount(null);
-          setSelectedServer(null);
-        }}
-        onSuccess={handlePinSuccess}
-        onForgotPIN={() => {
-          setPinModalVisible(false);
-          setSelectedAccount(null);
-          setSelectedServer(null);
-        }}
-        serverUrl={selectedServer?.address || ""}
-        userId={selectedAccount?.userId || ""}
-        username={selectedAccount?.username || ""}
-      />
-
-      {/* Password Entry Modal */}
-      <TVPasswordEntryModal
-        visible={passwordModalVisible}
-        onClose={() => {
-          setPasswordModalVisible(false);
-          setSelectedAccount(null);
-          setSelectedServer(null);
-        }}
-        onSubmit={handlePasswordSubmit}
-        username={selectedAccount?.username || ""}
-      />
    </View>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
@@ -61,10 +61,7 @@ export default function Page() {
    setLoading(true);
    try {
      logsFile.write(JSON.stringify(filteredLogs));
-      await Sharing.shareAsync(logsFile.uri, {
-        mimeType: "text/plain",
-        UTI: "public.plain-text",
-      });
+      await Sharing.shareAsync(logsFile.uri, { mimeType: "txt", UTI: "txt" });
    } catch (e: any) {
      writeErrorLog("Something went wrong attempting to export", e);
    } finally {
@@ -88,7 +85,12 @@ export default function Page() {
  }, [share, loading]);

  return (
-    <View className='flex-1'>
+    <View
+      className='flex-1'
+      style={{
+        paddingTop: insets.top + 48,
+      }}
+    >
      <View className='flex flex-row justify-end py-2 px-4 space-x-2'>
        <FilterButton
          id={orderFilterId}
@@ -112,10 +114,7 @@ export default function Page() {
          multiple={true}
        />
      </View>
-      <ScrollView
-        className='pb-4 px-4'
-        contentContainerStyle={{ paddingBottom: insets.bottom }}
-      >
+      <ScrollView className='pb-4 px-4'>
        <View className='flex flex-col space-y-2'>
          {filteredLogs?.map((log, index) => (
            <View className='bg-neutral-900 rounded-xl p-3' key={index}>
--- a/app/(auth)/(tabs)/(home)/settings/playback-controls/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/playback-controls/page.tsx
@@ -3,8 +3,6 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { GestureControls } from "@/components/settings/GestureControls";
 import { MediaProvider } from "@/components/settings/MediaContext";
 import { MediaToggles } from "@/components/settings/MediaToggles";
-import { MpvBufferSettings } from "@/components/settings/MpvBufferSettings";
-import { MpvVoSettings } from "@/components/settings/MpvVoSettings";
 import { PlaybackControlsSettings } from "@/components/settings/PlaybackControlsSettings";
 import { ChromecastSettings } from "../../../../../../components/settings/ChromecastSettings";

@@ -28,8 +26,6 @@ export default function PlaybackControlsPage() {
            <MediaToggles className='mb-4' />
            <GestureControls className='mb-4' />
            <PlaybackControlsSettings />
-            <MpvBufferSettings />
-            <MpvVoSettings />
          </MediaProvider>
        </View>
        {!Platform.isTV && <ChromecastSettings />}
--- a/app/(auth)/(tabs)/(home)/settings/plugins/jellyseerr/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/jellyseerr/page.tsx
@@ -18,7 +18,7 @@ export default function page() {
    >
      <DisabledSetting
        disabled={pluginSettings?.jellyseerrServerUrl?.locked === true}
-        className='p-4'
+        className='px-4'
      >
        <JellyseerrSettings />
      </DisabledSetting>
--- a/app/(auth)/(tabs)/(home)/settings/plugins/kefinTweaks/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/kefinTweaks/page.tsx
@@ -18,7 +18,7 @@ export default function page() {
    >
      <DisabledSetting
        disabled={pluginSettings?.useKefinTweaks?.locked === true}
-        className='p-4'
+        className='px-4'
      >
        <KefinTweaksSettings />
      </DisabledSetting>
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/collections/[collectionId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/collections/[collectionId].tsx
@@ -27,11 +27,16 @@ import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
 import { ItemCardText } from "@/components/ItemCardText";
 import { Loader } from "@/components/Loader";
 import { ItemPoster } from "@/components/posters/ItemPoster";
-import { TVFilterButton } from "@/components/tv";
-import { TVPosterCard } from "@/components/tv/TVPosterCard";
-import { useScaledTVPosterSizes } from "@/constants/TVPosterSizes";
+import MoviePoster, {
+  TV_POSTER_WIDTH,
+} from "@/components/posters/MoviePoster.tv";
+import SeriesPoster from "@/components/posters/SeriesPoster.tv";
+import {
+  TVFilterButton,
+  TVFocusablePoster,
+  TVItemCardText,
+} from "@/components/tv";
 import useRouter from "@/hooks/useAppRouter";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
@@ -55,13 +60,11 @@ const page: React.FC = () => {
  const searchParams = useLocalSearchParams();
  const { collectionId } = searchParams as { collectionId: string };

-  const posterSizes = useScaledTVPosterSizes();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const navigation = useNavigation();
  const router = useRouter();
  const { showOptions } = useTVOptionModal();
-  const { showItemActions } = useTVItemActionModal();
  const { width: screenWidth } = useWindowDimensions();
  const [orientation, _setOrientation] = useState(
    ScreenOrientation.Orientation.PORTRAIT_UP,
@@ -150,7 +153,7 @@ const page: React.FC = () => {
  // Calculate columns for TV grid
  const nrOfCols = useMemo(() => {
    if (Platform.isTV) {
-      const itemWidth = posterSizes.poster + TV_ITEM_GAP;
+      const itemWidth = TV_POSTER_WIDTH + TV_ITEM_GAP;
      return Math.max(
        1,
        Math.floor((screenWidth - TV_SCALE_PADDING * 2) / itemWidth),
@@ -186,7 +189,7 @@ const page: React.FC = () => {
        genres: selectedGenres,
        tags: selectedTags,
        years: selectedYears.map((year) => Number.parseInt(year, 10)),
-        includeItemTypes: ["Movie", "Series", "Season"],
+        includeItemTypes: ["Movie", "Series"],
      });

      return response.data || null;
@@ -288,19 +291,23 @@ const page: React.FC = () => {
          style={{
            marginRight: TV_ITEM_GAP,
            marginBottom: TV_ITEM_GAP,
+            width: TV_POSTER_WIDTH,
          }}
        >
-          <TVPosterCard
-            item={item}
-            orientation='vertical'
-            onPress={handlePress}
-            onLongPress={() => showItemActions(item)}
-            width={posterSizes.poster}
-          />
+          <TVFocusablePoster onPress={handlePress}>
+            {item.Type === "Movie" && <MoviePoster item={item} />}
+            {(item.Type === "Series" || item.Type === "Episode") && (
+              <SeriesPoster item={item} />
+            )}
+            {item.Type !== "Movie" &&
+              item.Type !== "Series" &&
+              item.Type !== "Episode" && <MoviePoster item={item} />}
+          </TVFocusablePoster>
+          <TVItemCardText item={item} />
        </View>
      );
    },
-    [router, showItemActions, posterSizes.poster],
+    [router],
  );

  const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/livetv/_layout.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/livetv/_layout.tsx
@@ -1,14 +1,13 @@
-import { Slot, Stack, withLayoutContext } from "expo-router";
 import {
  createMaterialTopTabNavigator,
  MaterialTopTabNavigationEventMap,
  MaterialTopTabNavigationOptions,
-} from "expo-router/js-top-tabs";
+} from "@react-navigation/material-top-tabs";
 import type {
  ParamListBase,
  TabNavigationState,
-} from "expo-router/react-navigation";
-import { Platform } from "react-native";
+} from "@react-navigation/native";
+import { Stack, withLayoutContext } from "expo-router";

 const { Navigator } = createMaterialTopTabNavigator();

@@ -20,17 +19,6 @@ export const Tab = withLayoutContext<
 >(Navigator);

 const Layout = () => {
-  // On TV, skip the Material Top Tab Navigator and render children directly
-  // The TV version handles its own tab navigation internally
-  if (Platform.isTV) {
-    return (
-      <>
-        <Stack.Screen options={{ headerShown: false }} />
-        <Slot />
-      </>
-    );
-  }
-
  return (
    <>
      <Stack.Screen options={{ title: "Live TV" }} />
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/livetv/programs.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/livetv/programs.tsx
@@ -2,21 +2,12 @@ import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
 import { useAtom } from "jotai";
 import { useTranslation } from "react-i18next";
-import { Platform, ScrollView, View } from "react-native";
+import { ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
-import { TVLiveTVPage } from "@/components/livetv/TVLiveTVPage";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";

 export default function page() {
-  if (Platform.isTV) {
-    return <TVLiveTVPage />;
-  }
-
-  return <MobileLiveTVPrograms />;
-}
-
-function MobileLiveTVPrograms() {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const insets = useSafeAreaInsets();
--- a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
+++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
@@ -11,7 +11,6 @@ import {
 } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useCallback, useEffect, useMemo } from "react";
@@ -34,13 +33,18 @@ import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
 import { ItemCardText } from "@/components/ItemCardText";
 import { Loader } from "@/components/Loader";
 import { ItemPoster } from "@/components/posters/ItemPoster";
-import { TVFilterButton, TVFocusablePoster } from "@/components/tv";
-import { TVPosterCard } from "@/components/tv/TVPosterCard";
-import { useScaledTVPosterSizes } from "@/constants/TVPosterSizes";
+import MoviePoster, {
+  TV_POSTER_WIDTH,
+} from "@/components/posters/MoviePoster.tv";
+import SeriesPoster from "@/components/posters/SeriesPoster.tv";
+import {
+  TVFilterButton,
+  TVFocusablePoster,
+  TVItemCardText,
+} from "@/components/tv";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useOrientation } from "@/hooks/useOrientation";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
@@ -66,12 +70,10 @@ import {
 } from "@/utils/atoms/filters";
 import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";

 const TV_ITEM_GAP = 20;
 const TV_HORIZONTAL_PADDING = 60;
 const _TV_SCALE_PADDING = 20;
-const TV_PLAYLIST_SQUARE_SIZE = 180;

 const Page = () => {
  const searchParams = useLocalSearchParams() as {
@@ -83,7 +85,6 @@ const Page = () => {
  const { libraryId } = searchParams;

  const typography = useScaledTVTypography();
-  const posterSizes = useScaledTVPosterSizes();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const { width: screenWidth } = useWindowDimensions();
@@ -107,7 +108,6 @@ const Page = () => {
  const { t } = useTranslation();
  const router = useRouter();
  const { showOptions } = useTVOptionModal();
-  const { showItemActions } = useTVItemActionModal();

  // TV Filter queries
  const { data: tvGenreOptions } = useQuery({
@@ -286,8 +286,6 @@ const Page = () => {
        itemType = "Video";
      } else if (library.CollectionType === "musicvideos") {
        itemType = "MusicVideo";
-      } else if (library.CollectionType === "playlists") {
-        itemType = "Playlist";
      }

      const response = await getItemsApi(api).getItems({
@@ -307,9 +305,6 @@ const Page = () => {
        tags: selectedTags,
        years: selectedYears.map((year) => Number.parseInt(year, 10)),
        includeItemTypes: itemType ? [itemType] : undefined,
-        ...(Platform.isTV && library.CollectionType === "playlists"
-          ? { mediaTypes: ["Video"] }
-          : {}),
      });

      return response.data || null;
@@ -406,82 +401,31 @@ const Page = () => {
  const renderTVItem = useCallback(
    (item: BaseItemDto) => {
      const handlePress = () => {
-        if (item.Type === "Playlist") {
-          router.push({
-            pathname: "/(auth)/(tabs)/(libraries)/[libraryId]",
-            params: { libraryId: item.Id! },
-          });
-          return;
-        }
        const navTarget = getItemNavigation(item, "(libraries)");
        router.push(navTarget as any);
      };

-      // Special rendering for Playlist items (square thumbnails)
-      if (item.Type === "Playlist") {
-        const playlistImageUrl = getPrimaryImageUrl({
-          api,
-          item,
-          width: TV_PLAYLIST_SQUARE_SIZE * 2,
-        });
-
-        return (
-          <View
-            key={item.Id}
-            style={{
-              width: TV_PLAYLIST_SQUARE_SIZE,
-              alignItems: "center",
-            }}
-          >
-            <TVFocusablePoster
-              onPress={handlePress}
-              onLongPress={() => showItemActions(item)}
-            >
-              <View
-                style={{
-                  width: TV_PLAYLIST_SQUARE_SIZE,
-                  aspectRatio: 1,
-                  borderRadius: 16,
-                  overflow: "hidden",
-                  backgroundColor: "#1a1a1a",
-                }}
-              >
-                <Image
-                  source={playlistImageUrl ? { uri: playlistImageUrl } : null}
-                  style={{ width: "100%", height: "100%" }}
-                  contentFit='cover'
-                  cachePolicy='memory-disk'
-                />
-              </View>
-            </TVFocusablePoster>
-            <View style={{ marginTop: 12, alignItems: "center" }}>
-              <Text
-                numberOfLines={1}
-                style={{
-                  fontSize: typography.callout,
-                  color: "#FFFFFF",
-                  textAlign: "center",
-                }}
-              >
-                {item.Name}
-              </Text>
-            </View>
-          </View>
-        );
-      }
-
      return (
-        <TVPosterCard
+        <View
          key={item.Id}
-          item={item}
-          orientation='vertical'
-          onPress={handlePress}
-          onLongPress={() => showItemActions(item)}
-          width={posterSizes.poster}
-        />
+          style={{
+            width: TV_POSTER_WIDTH,
+          }}
+        >
+          <TVFocusablePoster onPress={handlePress}>
+            {item.Type === "Movie" && <MoviePoster item={item} />}
+            {(item.Type === "Series" || item.Type === "Episode") && (
+              <SeriesPoster item={item} />
+            )}
+            {item.Type !== "Movie" &&
+              item.Type !== "Series" &&
+              item.Type !== "Episode" && <MoviePoster item={item} />}
+          </TVFocusablePoster>
+          <TVItemCardText item={item} />
+        </View>
      );
    },
-    [router, showItemActions, api, typography],
+    [router],
  );

  const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/_layout.tsx
@@ -1,13 +1,13 @@
-import { Stack, useLocalSearchParams, withLayoutContext } from "expo-router";
 import {
  createMaterialTopTabNavigator,
  MaterialTopTabNavigationEventMap,
  MaterialTopTabNavigationOptions,
-} from "expo-router/js-top-tabs";
+} from "@react-navigation/material-top-tabs";
 import type {
  ParamListBase,
  TabNavigationState,
-} from "expo-router/react-navigation";
+} from "@react-navigation/native";
+import { Stack, useLocalSearchParams, withLayoutContext } from "expo-router";
 import { useTranslation } from "react-i18next";

 const { Navigator } = createMaterialTopTabNavigator();
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/albums.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/albums.tsx
@@ -1,8 +1,8 @@
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useRoute } from "@react-navigation/native";
 import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { useLocalSearchParams } from "expo-router";
-import { useRoute } from "expo-router/react-navigation";
 import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/artists.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/artists.tsx
@@ -1,8 +1,8 @@
 import { getArtistsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useRoute } from "@react-navigation/native";
 import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { useLocalSearchParams } from "expo-router";
-import { useRoute } from "expo-router/react-navigation";
 import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/playlists.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/playlists.tsx
@@ -1,9 +1,9 @@
 import { Ionicons } from "@expo/vector-icons";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useNavigation, useRoute } from "@react-navigation/native";
 import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { useLocalSearchParams } from "expo-router";
-import { useNavigation, useRoute } from "expo-router/react-navigation";
 import { useAtom } from "jotai";
 import { useCallback, useLayoutEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/suggestions.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/suggestions.tsx
@@ -1,9 +1,9 @@
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useRoute } from "@react-navigation/native";
 import { FlashList } from "@shopify/flash-list";
 import { useQuery } from "@tanstack/react-query";
 import { useLocalSearchParams } from "expo-router";
-import { useRoute } from "expo-router/react-navigation";
 import { useAtom } from "jotai";
 import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
--- a/app/(auth)/(tabs)/(search)/index.tsx
+++ b/app/(auth)/(tabs)/(search)/index.tsx
@@ -42,7 +42,6 @@ import { SearchTabButtons } from "@/components/search/SearchTabButtons";
 import { TVSearchPage } from "@/components/search/TVSearchPage";
 import useRouter from "@/hooks/useAppRouter";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";
@@ -70,7 +69,6 @@ export default function search() {
  const params = useLocalSearchParams();
  const insets = useSafeAreaInsets();
  const router = useRouter();
-  const { showItemActions } = useTVItemActionModal();
  const segments = useSegments();
  const from = (segments as string[])[2] || "(search)";

@@ -305,9 +303,6 @@ export default function search() {
        },
        hideWhenScrolling: false,
        autoFocus: false,
-        // Android: placeholder and icon color
-        hintTextColor: "#fff",
-        headerIconColor: "#fff",
      },
    });
  }, [navigation]);
@@ -612,7 +607,6 @@ export default function search() {
        loading={loading}
        noResults={noResults}
        onItemPress={handleItemPress}
-        onItemLongPress={showItemActions}
        searchType={searchType}
        setSearchType={setSearchType}
        showDiscover={!!jellyseerrApi}
@@ -941,7 +935,7 @@ export default function search() {
              </Text>
            </View>
          ) : debouncedSearch.length === 0 ? (
-            <View className='mt-2 flex flex-col items-center space-y-2'>
+            <View className='mt-4 flex flex-col items-center space-y-2'>
              {exampleSearches.map((e) => (
                <TouchableOpacity
                  onPress={() => {
--- a/app/(auth)/(tabs)/(watchlists)/[watchlistId].tsx
+++ b/app/(auth)/(tabs)/(watchlists)/[watchlistId].tsx
@@ -24,12 +24,14 @@ import {
 } from "@/components/common/TouchableItemRouter";
 import { ItemCardText } from "@/components/ItemCardText";
 import { ItemPoster } from "@/components/posters/ItemPoster";
-import { TVPosterCard } from "@/components/tv/TVPosterCard";
-import { useScaledTVPosterSizes } from "@/constants/TVPosterSizes";
+import MoviePoster, {
+  TV_POSTER_WIDTH,
+} from "@/components/posters/MoviePoster.tv";
+import SeriesPoster from "@/components/posters/SeriesPoster.tv";
+import { TVFocusablePoster } from "@/components/tv/TVFocusablePoster";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useOrientation } from "@/hooks/useOrientation";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import {
  useDeleteWatchlist,
  useRemoveFromWatchlist,
@@ -44,12 +46,35 @@ import { userAtom } from "@/providers/JellyfinProvider";
 const TV_ITEM_GAP = 20;
 const TV_HORIZONTAL_PADDING = 60;

+type Typography = ReturnType<typeof useScaledTVTypography>;
+
+const TVItemCardText: React.FC<{
+  item: BaseItemDto;
+  typography: Typography;
+}> = ({ item, typography }) => (
+  <View style={{ marginTop: 12 }}>
+    <Text
+      numberOfLines={1}
+      style={{ fontSize: typography.callout, color: "#FFFFFF" }}
+    >
+      {item.Name}
+    </Text>
+    <Text
+      style={{
+        fontSize: typography.callout - 2,
+        color: "#9CA3AF",
+        marginTop: 2,
+      }}
+    >
+      {item.ProductionYear}
+    </Text>
+  </View>
+);
+
 export default function WatchlistDetailScreen() {
  const typography = useScaledTVTypography();
-  const posterSizes = useScaledTVPosterSizes();
  const { t } = useTranslation();
  const router = useRouter();
-  const { showItemActions } = useTVItemActionModal();
  const navigation = useNavigation();
  const insets = useSafeAreaInsets();
  const { watchlistId } = useLocalSearchParams<{ watchlistId: string }>();
@@ -178,18 +203,26 @@ export default function WatchlistDetailScreen() {
      };

      return (
-        <TVPosterCard
+        <View
          key={item.Id}
-          item={item}
-          orientation='vertical'
-          onPress={handlePress}
-          onLongPress={() => showItemActions(item)}
-          hasTVPreferredFocus={index === 0}
-          width={posterSizes.poster}
-        />
+          style={{
+            width: TV_POSTER_WIDTH,
+          }}
+        >
+          <TVFocusablePoster
+            onPress={handlePress}
+            hasTVPreferredFocus={index === 0}
+          >
+            {item.Type === "Movie" && <MoviePoster item={item} />}
+            {(item.Type === "Series" || item.Type === "Episode") && (
+              <SeriesPoster item={item} />
+            )}
+          </TVFocusablePoster>
+          <TVItemCardText item={item} typography={typography} />
+        </View>
      );
    },
-    [router, showItemActions, posterSizes.poster],
+    [router, typography],
  );

  const renderItem = useCallback(
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -3,16 +3,15 @@ import {
  type NativeBottomTabNavigationEventMap,
  type NativeBottomTabNavigationOptions,
 } from "@bottom-tabs/react-navigation";
-import { withLayoutContext } from "expo-router";
 import type {
  ParamListBase,
  TabNavigationState,
-} from "expo-router/react-navigation";
+} from "@react-navigation/native";
+import { withLayoutContext } from "expo-router";
 import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
 import { Colors } from "@/constants/Colors";
-import { useTVHomeBackHandler } from "@/hooks/useTVBackHandler";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";

@@ -37,9 +36,6 @@ export default function TabLayout() {
  const { settings } = useSettings();
  const { t } = useTranslation();

-  // Handle TV back button - prevent app exit when at root
-  useTVHomeBackHandler();
-
  return (
    <View style={{ flex: 1 }}>
      <SystemBars hidden={false} style='light' />
@@ -134,7 +130,7 @@ export default function TabLayout() {
            tabBarItemHidden: !Platform.isTV,
            tabBarIcon:
              Platform.OS === "android"
-                ? (_e) => require("@/assets/icons/gear.png") //Should maybe use other libraries to have it uniform
+                ? (_e) => require("@/assets/icons/list.png")
                : (_e) => ({ sfSymbol: "gearshape.fill" }),
          }}
        />
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -10,7 +10,6 @@ import {
  getPlaystateApi,
  getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
-import { File } from "expo-file-system";
 import { activateKeepAwakeAsync, deactivateKeepAwake } from "expo-keep-awake";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtomValue } from "jotai";
@@ -46,22 +45,20 @@ import {
 } from "@/modules";
 import { useDownload } from "@/providers/DownloadProvider";
 import { DownloadedItem } from "@/providers/Downloads/types";
-import { useInactivity } from "@/providers/InactivityProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+
 import { OfflineModeProvider } from "@/providers/OfflineModeProvider";

-import { getSubtitlesForItem } from "@/utils/atoms/downloadedSubtitles";
 import { useSettings } from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import {
  getMpvAudioId,
  getMpvSubtitleId,
 } from "@/utils/jellyfin/subtitleUtils";
 import { writeToLog } from "@/utils/log";
+import { generateDeviceProfile } from "@/utils/profiles/native";
 import { msToTicks, ticksToSeconds } from "@/utils/time";
-import { generateDeviceProfile } from "../../../utils/profiles/native";

 export default function page() {
  const videoRef = useRef<MpvPlayerViewRef>(null);
@@ -108,9 +105,6 @@ export default function page() {
  // when data updates, only when the provider initializes
  const downloadedFiles = downloadUtils.getDownloadedItems();

-  // Inactivity timer controls (TV only)
-  const { pauseInactivityTimer, resumeInactivityTimer } = useInactivity();
-
  const revalidateProgressCache = useInvalidatePlaybackProgressCache();

  const lightHapticFeedback = useHaptic("light");
@@ -155,13 +149,6 @@ export default function page() {
    : BITRATES[0].value;

  const [item, setItem] = useState<BaseItemDto | null>(null);
-  const initialSeekDoneRef = useRef(false);
-
-  const initialPlaybackTicksRef = useRef<number>(
-    playbackPositionFromUrl
-      ? Number.parseInt(playbackPositionFromUrl, 10)
-      : (item?.UserData?.PlaybackPositionTicks ?? 0),
-  );
  const [downloadedItem, setDownloadedItem] = useState<DownloadedItem | null>(
    null,
  );
@@ -222,25 +209,12 @@ export default function page() {
  );

  /** Gets the initial playback position from the URL. */
-  // const getInitialPlaybackTicks = useCallback((): number => {
-  //   if (playbackPositionFromUrl) {
-  //     return Number.parseInt(playbackPositionFromUrl, 10);
-  //   }
-  //   return item?.UserData?.PlaybackPositionTicks ?? 0;
-  // }, [playbackPositionFromUrl, item?.UserData?.PlaybackPositionTicks]);
-
-  useEffect(() => {
-    if (!tracksReady || !videoRef.current) return;
-    if (initialSeekDoneRef.current) return;
-
-    initialSeekDoneRef.current = true;
-
-    const ticks = initialPlaybackTicksRef.current;
-
-    if (ticks > 0) {
-      videoRef.current.seekTo(ticksToSeconds(ticks));
+  const getInitialPlaybackTicks = useCallback((): number => {
+    if (playbackPositionFromUrl) {
+      return Number.parseInt(playbackPositionFromUrl, 10);
    }
-  }, [tracksReady]);
+    return item?.UserData?.PlaybackPositionTicks ?? 0;
+  }, [playbackPositionFromUrl, item?.UserData?.PlaybackPositionTicks]);

  useEffect(() => {
    const fetchItemData = async () => {
@@ -254,12 +228,7 @@ export default function page() {
            setDownloadedItem(data);
          }
        } else {
-          // Guard against api being null (e.g., during logout)
-          if (!api) {
-            setItemStatus({ isLoading: false, isError: false });
-            return;
-          }
-          const res = await getUserLibraryApi(api).getItem({
+          const res = await getUserLibraryApi(api!).getItem({
            itemId,
            userId: user?.Id,
          });
@@ -293,7 +262,6 @@ export default function page() {
    mediaSource: MediaSourceInfo;
    sessionId: string;
    url: string;
-    requiredHttpHeaders?: Record<string, string>;
  }

  const [stream, setStream] = useState<Stream | null>(null);
@@ -356,7 +324,7 @@ export default function page() {
            deviceProfile: generateDeviceProfile(),
          });
          if (!res) return null;
-          const { mediaSource, sessionId, url, requiredHttpHeaders } = res;
+          const { mediaSource, sessionId, url } = res;

          if (!sessionId || !mediaSource || !url) {
            Alert.alert(
@@ -365,7 +333,7 @@ export default function page() {
            );
            return null;
          }
-          result = { mediaSource, sessionId, url, requiredHttpHeaders };
+          result = { mediaSource, sessionId, url };
        }
        setStream(result);
        setStreamStatus({ isLoading: false, isError: false });
@@ -452,9 +420,7 @@ export default function page() {
    setIsPlaybackStopped(true);
    videoRef.current?.pause();
    revalidateProgressCache();
-    // Resume inactivity timer when leaving player (TV only)
-    resumeInactivityTimer();
-  }, [videoRef, reportPlaybackStopped, progress, resumeInactivityTimer]);
+  }, [videoRef, reportPlaybackStopped, progress]);

  useEffect(() => {
    const beforeRemoveListener = navigation.addListener("beforeRemove", stop);
@@ -564,30 +530,10 @@ export default function page() {
    ],
  );

-  /** Prepare metadata for iOS native media controls (Control Center, Lock Screen) */
-  const nowPlayingMetadata = useMemo(() => {
-    if (!item || !api) return undefined;
-
-    const artworkUri = getPrimaryImageUrl({
-      api,
-      item,
-      quality: 90,
-      width: 500,
-    });
-
-    return {
-      title: item.Name || "",
-      artist:
-        item.Type === "Episode"
-          ? item.SeriesName || ""
-          : item.AlbumArtist || "",
-      albumTitle:
-        item.Type === "Episode" && item.SeasonName
-          ? item.SeasonName
-          : undefined,
-      artworkUri: artworkUri || undefined,
-    };
-  }, [item, api]);
+  /** Gets the initial playback position in seconds. */
+  const _startPosition = useMemo(() => {
+    return ticksToSeconds(getInitialPlaybackTicks());
+  }, [getInitialPlaybackTicks]);

  /** Build video source config for MPV */
  const videoSource = useMemo<MpvVideoSource | undefined>(() => {
@@ -641,15 +587,6 @@ export default function page() {
      autoplay: true,
      initialSubtitleId,
      initialAudioId,
-      // Pass cache/buffer settings from user preferences
-      cacheConfig: {
-        enabled: settings.mpvCacheEnabled,
-        cacheSeconds: settings.mpvCacheSeconds,
-        maxBytes: settings.mpvDemuxerMaxBytes,
-        maxBackBytes: settings.mpvDemuxerMaxBackBytes,
-      },
-      // Pass VO driver setting (Android only)
-      voDriver: settings.mpvVoDriver,
    };

    // Add external subtitles only for online playback
@@ -657,32 +594,17 @@ export default function page() {
      source.externalSubtitles = externalSubs;
    }

-    // Add headers for online streaming (not for local file:// URLs)
-    if (!offline) {
-      const headers: Record<string, string> = {};
-      const isRemoteStream =
-        mediaSource?.IsRemote && mediaSource?.Protocol === "Http";
-
-      // Add auth header only for Jellyfin API requests (not for external/remote streams)
-      if (api?.accessToken && !isRemoteStream) {
-        headers.Authorization = `MediaBrowser Token="${api.accessToken}"`;
-      }
-
-      // Add any required headers from the media source (e.g., for external/remote streams)
-      if (stream?.requiredHttpHeaders) {
-        Object.assign(headers, stream.requiredHttpHeaders);
-      }
-
-      if (Object.keys(headers).length > 0) {
-        source.headers = headers;
-      }
+    // Add auth headers only for online streaming (not for local file:// URLs)
+    if (!offline && api?.accessToken) {
+      source.headers = {
+        Authorization: `MediaBrowser Token="${api.accessToken}"`,
+      };
    }

    return source;
  }, [
    stream?.url,
    stream?.mediaSource,
-    stream?.requiredHttpHeaders,
    item?.UserData?.PlaybackPositionTicks,
    playbackPositionFromUrl,
    api?.basePath,
@@ -690,11 +612,6 @@ export default function page() {
    subtitleIndex,
    audioIndex,
    offline,
-    settings.mpvCacheEnabled,
-    settings.mpvCacheSeconds,
-    settings.mpvDemuxerMaxBytes,
-    settings.mpvDemuxerMaxBackBytes,
-    settings.mpvVoDriver,
  ]);

  const volumeUpCb = useCallback(async () => {
@@ -785,27 +702,23 @@ export default function page() {
        setIsPlaying(true);
        setIsBuffering(false);
        setHasPlaybackStarted(true);
-        // Pause inactivity timer during playback (TV only)
-        pauseInactivityTimer();
        if (item?.Id) {
          playbackManager.reportPlaybackProgress(
            currentPlayStateInfo() as PlaybackProgressInfo,
          );
        }
-        await activateKeepAwakeAsync();
+        if (!Platform.isTV) await activateKeepAwakeAsync();
        return;
      }

      if (isPaused) {
        setIsPlaying(false);
-        // Resume inactivity timer when paused (TV only)
-        resumeInactivityTimer();
        if (item?.Id) {
          playbackManager.reportPlaybackProgress(
            currentPlayStateInfo() as PlaybackProgressInfo,
          );
        }
-        await deactivateKeepAwake();
+        if (!Platform.isTV) await deactivateKeepAwake();
        return;
      }

@@ -813,13 +726,7 @@ export default function page() {
        setIsBuffering(isLoading);
      }
    },
-    [
-      playbackManager,
-      item?.Id,
-      progress,
-      pauseInactivityTimer,
-      resumeInactivityTimer,
-    ],
+    [playbackManager, item?.Id, progress],
  );

  /** PiP handler for MPV */
@@ -1067,7 +974,7 @@ export default function page() {

  // TV: Navigate to next item
  const goToNextItem = useCallback(() => {
-    if (!nextItem || !settings || isPlaybackStopped) return;
+    if (!nextItem || !settings) return;

    const {
      mediaSource: newMediaSource,
@@ -1100,7 +1007,6 @@ export default function page() {
    stream?.mediaSource,
    bitrateValue,
    router,
-    isPlaybackStopped,
  ]);

  // Apply subtitle settings when video loads
@@ -1122,27 +1028,14 @@ export default function page() {
      if (settings.mpvSubtitleAlignY !== undefined) {
        await videoRef.current?.setSubtitleAlignY?.(settings.mpvSubtitleAlignY);
      }
-      // Apply subtitle background (iOS only - doesn't work on tvOS due to composite OSD limitation)
-      // mpv uses #RRGGBBAA format (alpha last, same as CSS)
-      if (settings.mpvSubtitleBackgroundEnabled) {
-        const opacity = settings.mpvSubtitleBackgroundOpacity ?? 75;
-        const alphaHex = Math.round((opacity / 100) * 255)
-          .toString(16)
-          .padStart(2, "0")
-          .toUpperCase();
-        // Enable background-box mode (required for sub-back-color to work)
-        await videoRef.current?.setSubtitleBorderStyle?.("background-box");
-        await videoRef.current?.setSubtitleBackgroundColor?.(
-          `#000000${alphaHex}`,
+      if (settings.mpvSubtitleFontSize !== undefined) {
+        await videoRef.current?.setSubtitleFontSize?.(
+          settings.mpvSubtitleFontSize,
        );
-        // Force override ASS subtitle styles so background shows on styled subtitles
-        await videoRef.current?.setSubtitleAssOverride?.("force");
-      } else {
-        // Restore default outline-and-shadow style
-        await videoRef.current?.setSubtitleBorderStyle?.("outline-and-shadow");
-        await videoRef.current?.setSubtitleBackgroundColor?.("#00000000");
-        // Restore default ASS behavior (keep original styles)
-        await videoRef.current?.setSubtitleAssOverride?.("no");
+      }
+      // Apply subtitle size from general settings
+      if (settings.subtitleSize) {
+        await videoRef.current?.setSubtitleFontSize?.(settings.subtitleSize);
      }
    };

@@ -1163,28 +1056,6 @@ export default function page() {
    applyInitialPlaybackSpeed();
  }, [isVideoLoaded, initialPlaybackSpeed]);

-  // TV only: Pre-load locally downloaded subtitles when video loads
-  // This adds them to MPV's track list without auto-selecting them
-  useEffect(() => {
-    if (!Platform.isTV || !isVideoLoaded || !videoRef.current || !itemId)
-      return;
-
-    const preloadLocalSubtitles = async () => {
-      const localSubs = getSubtitlesForItem(itemId);
-      for (const sub of localSubs) {
-        // Verify file still exists (cache may have been cleared)
-        const subtitleFile = new File(sub.filePath);
-        if (!subtitleFile.exists) {
-          continue;
-        }
-        // Add subtitle file to MPV without selecting it (select: false)
-        await videoRef.current?.addSubtitleFile?.(sub.filePath, false);
-      }
-    };
-
-    preloadLocalSubtitles();
-  }, [isVideoLoaded, itemId]);
-
  // Show error UI first, before checking loading/missing‐data
  if (itemStatus.isError || streamStatus.isError) {
    return (
@@ -1244,7 +1115,6 @@ export default function page() {
                ref={videoRef}
                source={videoSource}
                style={{ width: "100%", height: "100%" }}
-                nowPlayingMetadata={nowPlayingMetadata}
                onProgress={onProgress}
                onPlaybackStateChange={onPlaybackStateChanged}
                onLoad={() => setIsVideoLoaded(true)}
@@ -1310,7 +1180,6 @@ export default function page() {
                  getTechnicalInfo={getTechnicalInfo}
                  playMethod={playMethod}
                  transcodeReasons={transcodeReasons}
-                  downloadedFiles={downloadedFiles}
                />
              ) : (
                <Controls
--- a/app/(auth)/tv-option-modal.tsx
+++ b/app/(auth)/tv-option-modal.tsx
@@ -1,6 +1,6 @@
 import { BlurView } from "expo-blur";
 import { useAtomValue } from "jotai";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import {
  Animated,
  Easing,
@@ -11,17 +11,13 @@ import {
 } from "react-native";
 import { Text } from "@/components/common/Text";
 import { TVOptionCard } from "@/components/tv";
-import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
-import { useTVBackPress } from "@/hooks/useTVBackPress";
 import { tvOptionModalAtom } from "@/utils/atoms/tvOptionModal";
-import { scaleSize } from "@/utils/scaleSize";
 import { store } from "@/utils/store";

 export default function TVOptionModal() {
  const router = useRouter();
  const modalState = useAtomValue(tvOptionModalAtom);
-  const typography = useScaledTVTypography();

  const [isReady, setIsReady] = useState(false);
  const firstCardRef = useRef<View>(null);
@@ -80,25 +76,12 @@ export default function TVOptionModal() {
    router.back();
  };

-  const handleClose = useCallback(() => {
-    store.set(tvOptionModalAtom, null);
-    router.back();
-  }, [router]);
-
-  // Intercept back/menu press to close the modal instead of the player
-  useTVBackPress(() => {
-    handleClose();
-    return true;
-  }, [handleClose]);
-
  // If no modal state, just go back (shouldn't happen in normal usage)
  if (!modalState) {
    return null;
  }

-  const { title, options } = modalState;
-  const scaledCardWidth = scaleSize(160);
-  const scaledCardHeight = scaleSize(75);
+  const { title, options, cardWidth = 160, cardHeight = 75 } = modalState;

  return (
    <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>
@@ -117,9 +100,7 @@ export default function TVOptionModal() {
            trapFocusRight
            style={styles.content}
          >
-            <Text style={[styles.title, { fontSize: typography.callout }]}>
-              {title}
-            </Text>
+            <Text style={styles.title}>{title}</Text>
            {isReady && (
              <ScrollView
                horizontal
@@ -138,8 +119,8 @@ export default function TVOptionModal() {
                    selected={option.selected}
                    hasTVPreferredFocus={index === initialSelectedIndex}
                    onPress={() => handleSelect(option.value)}
-                    width={scaledCardWidth}
-                    height={scaledCardHeight}
+                    width={cardWidth}
+                    height={cardHeight}
                  />
                ))}
              </ScrollView>
@@ -161,20 +142,21 @@ const styles = StyleSheet.create({
    width: "100%",
  },
  blurContainer: {
-    borderTopLeftRadius: scaleSize(24),
-    borderTopRightRadius: scaleSize(24),
+    borderTopLeftRadius: 24,
+    borderTopRightRadius: 24,
    overflow: "hidden",
  },
  content: {
-    paddingTop: scaleSize(24),
-    paddingBottom: scaleSize(50),
+    paddingTop: 24,
+    paddingBottom: 50,
    overflow: "visible",
  },
  title: {
+    fontSize: 18,
    fontWeight: "500",
    color: "rgba(255,255,255,0.6)",
-    marginBottom: scaleSize(16),
-    paddingHorizontal: scaleSize(48),
+    marginBottom: 16,
+    paddingHorizontal: 48,
    textTransform: "uppercase",
    letterSpacing: 1,
  },
@@ -182,8 +164,8 @@ const styles = StyleSheet.create({
    overflow: "visible",
  },
  scrollContent: {
-    paddingHorizontal: scaleSize(48),
-    paddingVertical: scaleSize(20),
-    gap: scaleSize(12),
+    paddingHorizontal: 48,
+    paddingVertical: 20,
+    gap: 12,
  },
 });
--- a/app/(auth)/tv-subtitle-modal.tsx
+++ b/app/(auth)/tv-subtitle-modal.tsx
@@ -22,17 +22,14 @@ import {
 import { Text } from "@/components/common/Text";
 import { TVTabButton, useTVFocusAnimation } from "@/components/tv";
 import type { Track } from "@/components/video-player/controls/types";
-import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import {
  type SubtitleSearchResult,
  useRemoteSubtitles,
 } from "@/hooks/useRemoteSubtitles";
-import { useTVBackPress } from "@/hooks/useTVBackPress";
 import { useSettings } from "@/utils/atoms/settings";
 import { tvSubtitleModalAtom } from "@/utils/atoms/tvSubtitleModal";
 import { COMMON_SUBTITLE_LANGUAGES } from "@/utils/opensubtitles/api";
-import { scaleSize } from "@/utils/scaleSize";
 import { store } from "@/utils/store";

 type TabType = "tracks" | "download" | "settings";
@@ -75,10 +72,10 @@ const TVTrackCard = React.forwardRef<
        <Text
          style={[
            styles.trackCardText,
-            { color: focused ? "#000" : "#fff", fontSize: scaleSize(16) },
+            { color: focused ? "#000" : "#fff" },
            (focused || selected) && { fontWeight: "600" },
          ]}
-          numberOfLines={3}
+          numberOfLines={2}
        >
          {label}
        </Text>
@@ -86,10 +83,7 @@ const TVTrackCard = React.forwardRef<
          <Text
            style={[
              styles.trackCardSublabel,
-              {
-                color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)",
-                fontSize: scaleSize(12),
-              },
+              { color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)" },
            ]}
            numberOfLines={1}
          >
@@ -100,7 +94,7 @@ const TVTrackCard = React.forwardRef<
          <View style={styles.checkmark}>
            <Ionicons
              name='checkmark'
-              size={scaleSize(16)}
+              size={16}
              color='rgba(255,255,255,0.8)'
            />
          </View>
@@ -148,7 +142,7 @@ const LanguageCard = React.forwardRef<
        <Text
          style={[
            styles.languageCardText,
-            { color: focused ? "#000" : "#fff", fontSize: scaleSize(15) },
+            { color: focused ? "#000" : "#fff" },
            (focused || selected) && { fontWeight: "600" },
          ]}
          numberOfLines={1}
@@ -158,10 +152,7 @@ const LanguageCard = React.forwardRef<
        <Text
          style={[
            styles.languageCardCode,
-            {
-              color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)",
-              fontSize: scaleSize(11),
-            },
+            { color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)" },
          ]}
        >
          {code.toUpperCase()}
@@ -170,7 +161,7 @@ const LanguageCard = React.forwardRef<
          <View style={styles.checkmark}>
            <Ionicons
              name='checkmark'
-              size={scaleSize(16)}
+              size={16}
              color='rgba(255,255,255,0.8)'
            />
          </View>
@@ -228,10 +219,7 @@ const SubtitleResultCard = React.forwardRef<
          <Text
            style={[
              styles.providerText,
-              {
-                color: focused ? "rgba(0,0,0,0.7)" : "rgba(255,255,255,0.7)",
-                fontSize: scaleSize(11),
-              },
+              { color: focused ? "rgba(0,0,0,0.7)" : "rgba(255,255,255,0.7)" },
            ]}
          >
            {result.providerName}
@@ -240,10 +228,7 @@ const SubtitleResultCard = React.forwardRef<

        {/* Name */}
        <Text
-          style={[
-            styles.resultName,
-            { color: focused ? "#000" : "#fff", fontSize: scaleSize(14) },
-          ]}
+          style={[styles.resultName, { color: focused ? "#000" : "#fff" }]}
          numberOfLines={2}
        >
          {result.name}
@@ -255,10 +240,7 @@ const SubtitleResultCard = React.forwardRef<
          <Text
            style={[
              styles.resultMetaText,
-              {
-                color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)",
-                fontSize: scaleSize(12),
-              },
+              { color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)" },
            ]}
          >
            {result.format?.toUpperCase()}
@@ -270,7 +252,7 @@ const SubtitleResultCard = React.forwardRef<
              <View style={styles.ratingContainer}>
                <Ionicons
                  name='star'
-                  size={scaleSize(12)}
+                  size={12}
                  color={focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)"}
                />
                <Text
@@ -280,7 +262,6 @@ const SubtitleResultCard = React.forwardRef<
                      color: focused
                        ? "rgba(0,0,0,0.6)"
                        : "rgba(255,255,255,0.5)",
-                      fontSize: scaleSize(12),
                    },
                  ]}
                >
@@ -294,7 +275,7 @@ const SubtitleResultCard = React.forwardRef<
            <View style={styles.downloadCountContainer}>
              <Ionicons
                name='download-outline'
-                size={scaleSize(12)}
+                size={12}
                color={focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.5)"}
              />
              <Text
@@ -304,7 +285,6 @@ const SubtitleResultCard = React.forwardRef<
                    color: focused
                      ? "rgba(0,0,0,0.6)"
                      : "rgba(255,255,255,0.5)",
-                    fontSize: scaleSize(12),
                  },
                ]}
              >
@@ -327,9 +307,7 @@ const SubtitleResultCard = React.forwardRef<
                },
              ]}
            >
-              <Text style={[styles.flagText, { fontSize: scaleSize(10) }]}>
-                Hash Match
-              </Text>
+              <Text style={styles.flagText}>Hash Match</Text>
            </View>
          )}
          {result.hearingImpaired && (
@@ -345,7 +323,7 @@ const SubtitleResultCard = React.forwardRef<
            >
              <Ionicons
                name='ear-outline'
-                size={scaleSize(12)}
+                size={12}
                color={focused ? "#000" : "#fff"}
              />
            </View>
@@ -361,9 +339,7 @@ const SubtitleResultCard = React.forwardRef<
                },
              ]}
            >
-              <Text style={[styles.flagText, { fontSize: scaleSize(10) }]}>
-                AI
-              </Text>
+              <Text style={styles.flagText}>AI</Text>
            </View>
          )}
        </View>
@@ -413,7 +389,7 @@ const TVStepperButton: React.FC<{
      >
        <Ionicons
          name={icon}
-          size={scaleSize(28)}
+          size={28}
          color={focused ? "#000" : disabled ? "rgba(255,255,255,0.4)" : "#fff"}
        />
      </Animated.View>
@@ -509,7 +485,7 @@ const TVAlignmentCard: React.FC<{
        <Text
          style={[
            styles.alignmentCardText,
-            { color: focused ? "#000" : "#fff", fontSize: scaleSize(15) },
+            { color: focused ? "#000" : "#fff" },
            (focused || selected) && { fontWeight: "600" },
          ]}
        >
@@ -519,7 +495,7 @@ const TVAlignmentCard: React.FC<{
          <View style={styles.alignmentCheckmark}>
            <Ionicons
              name='checkmark'
-              size={scaleSize(14)}
+              size={14}
              color='rgba(255,255,255,0.8)'
            />
          </View>
@@ -534,7 +510,6 @@ export default function TVSubtitleModal() {
  const { t } = useTranslation();
  const modalState = useAtomValue(tvSubtitleModalAtom);
  const { settings, updateSettings } = useSettings();
-  const typography = useScaledTVTypography();

  const [activeTab, setActiveTab] = useState<TabType>("tracks");
  const [selectedLanguage, setSelectedLanguage] = useState("eng");
@@ -629,12 +604,6 @@ export default function TVSubtitleModal() {
    router.back();
  }, [router]);

-  // Intercept back/menu press to close the modal instead of the player
-  useTVBackPress(() => {
-    handleClose();
-    return true;
-  }, [handleClose]);
-
  const handleLanguageSelect = useCallback(
    (code: string) => {
      setSelectedLanguage(code);
@@ -690,30 +659,8 @@ export default function TVSubtitleModal() {

          // Do NOT close modal - user can see and select the new track
        } else if (downloadResult.type === "local" && downloadResult.path) {
-          // Notify parent that a local subtitle was downloaded
          modalState?.onLocalSubtitleDownloaded?.(downloadResult.path);
-
-          // Check if component is still mounted after callback
-          if (!isMountedRef.current) return;
-
-          // Refresh tracks to include the newly downloaded subtitle
-          if (modalState?.refreshSubtitleTracks) {
-            const newTracks = await modalState.refreshSubtitleTracks();
-
-            // Check if component is still mounted after fetching tracks
-            if (!isMountedRef.current) return;
-
-            // Update atom with new tracks
-            store.set(tvSubtitleModalAtom, {
-              ...modalState,
-              subtitleTracks: newTracks,
-            });
-            // Switch to tracks tab to show the new subtitle
-            setActiveTab("tracks");
-          } else {
-            // No refreshSubtitleTracks available (e.g., from player), just close
-            handleClose();
-          }
+          handleClose(); // Only close for local downloads
        }
      } catch (error) {
        console.error("Failed to download subtitle:", error);
@@ -738,17 +685,13 @@ export default function TVSubtitleModal() {
      value: -1,
      selected: currentSubtitleIndex === -1,
      setTrack: () => modalState?.onDisableSubtitles?.(),
-      isLocal: false,
    };
    const options = subtitleTracks.map((track: Track) => ({
      label: track.name,
-      sublabel: track.isLocal
-        ? t("player.downloaded") || "Downloaded"
-        : (undefined as string | undefined),
+      sublabel: undefined as string | undefined,
      value: track.index,
      selected: track.index === currentSubtitleIndex,
      setTrack: track.setTrack,
-      isLocal: track.isLocal ?? false,
    }));
    return [noneOption, ...options];
  }, [subtitleTracks, currentSubtitleIndex, t, modalState]);
@@ -776,7 +719,7 @@ export default function TVSubtitleModal() {
          >
            {/* Header with tabs */}
            <View style={styles.header}>
-              <Text style={[styles.title, { fontSize: typography.heading }]}>
+              <Text style={styles.title}>
                {t("item_card.subtitles.label") || "Subtitles"}
              </Text>

@@ -833,9 +776,7 @@ export default function TVSubtitleModal() {
              <>
                {/* Language Selector */}
                <View style={styles.section}>
-                  <Text
-                    style={[styles.sectionTitle, { fontSize: scaleSize(14) }]}
-                  >
+                  <Text style={styles.sectionTitle}>
                    {t("player.language") || "Language"}
                  </Text>
                  <ScrollView
@@ -862,9 +803,7 @@ export default function TVSubtitleModal() {

                {/* Results Section */}
                <View style={styles.section}>
-                  <Text
-                    style={[styles.sectionTitle, { fontSize: scaleSize(14) }]}
-                  >
+                  <Text style={styles.sectionTitle}>
                    {t("player.results") || "Results"}
                    {searchResults && ` (${searchResults.length})`}
                  </Text>
@@ -881,17 +820,13 @@ export default function TVSubtitleModal() {
                    <View style={styles.errorContainer}>
                      <Ionicons
                        name='alert-circle-outline'
-                        size={scaleSize(32)}
+                        size={32}
                        color='rgba(255,100,100,0.8)'
                      />
-                      <Text
-                        style={[styles.errorText, { fontSize: scaleSize(16) }]}
-                      >
+                      <Text style={styles.errorText}>
                        {t("player.search_failed") || "Search failed"}
                      </Text>
-                      <Text
-                        style={[styles.errorHint, { fontSize: scaleSize(13) }]}
-                      >
+                      <Text style={styles.errorHint}>
                        {!hasOpenSubtitlesApiKey
                          ? t("player.no_subtitle_provider") ||
                            "No subtitle provider configured on server"
@@ -908,15 +843,10 @@ export default function TVSubtitleModal() {
                      <View style={styles.emptyContainer}>
                        <Ionicons
                          name='document-text-outline'
-                          size={scaleSize(32)}
+                          size={32}
                          color='rgba(255,255,255,0.4)'
                        />
-                        <Text
-                          style={[
-                            styles.emptyText,
-                            { fontSize: scaleSize(14) },
-                          ]}
-                        >
+                        <Text style={styles.emptyText}>
                          {t("player.no_subtitles_found") ||
                            "No subtitles found"}
                        </Text>
@@ -951,15 +881,10 @@ export default function TVSubtitleModal() {
                  <View style={styles.apiKeyHint}>
                    <Ionicons
                      name='information-circle-outline'
-                      size={scaleSize(16)}
+                      size={16}
                      color='rgba(255,255,255,0.4)'
                    />
-                    <Text
-                      style={[
-                        styles.apiKeyHintText,
-                        { fontSize: scaleSize(12) },
-                      ]}
-                    >
+                    <Text style={styles.apiKeyHintText}>
                      {t("player.add_opensubtitles_key_hint") ||
                        "Add OpenSubtitles API key in settings for client-side fallback"}
                    </Text>
@@ -980,8 +905,8 @@ export default function TVSubtitleModal() {
                  <View style={styles.settingRow}>
                    <TVStepperControl
                      value={settings.mpvSubtitleScale ?? 1.0}
-                      min={0.1}
-                      max={3.0}
+                      min={0.5}
+                      max={2.0}
                      step={0.1}
                      formatValue={(v) => `${v.toFixed(1)}x`}
                      onChange={(newValue) => {
@@ -991,12 +916,7 @@ export default function TVSubtitleModal() {
                      }}
                      hasTVPreferredFocus={true}
                    />
-                    <Text
-                      style={[
-                        styles.settingLabel,
-                        { fontSize: typography.callout },
-                      ]}
-                    >
+                    <Text style={styles.settingLabel}>
                      {t("home.settings.subtitles.mpv_subtitle_scale") ||
                        "Subtitle Scale"}
                    </Text>
@@ -1014,12 +934,7 @@ export default function TVSubtitleModal() {
                        updateSettings({ mpvSubtitleMarginY: newValue });
                      }}
                    />
-                    <Text
-                      style={[
-                        styles.settingLabel,
-                        { fontSize: typography.callout },
-                      ]}
-                    >
+                    <Text style={styles.settingLabel}>
                      {t("home.settings.subtitles.mpv_subtitle_margin_y") ||
                        "Vertical Margin"}
                    </Text>
@@ -1043,12 +958,7 @@ export default function TVSubtitleModal() {
                        />
                      ))}
                    </View>
-                    <Text
-                      style={[
-                        styles.settingLabel,
-                        { fontSize: typography.callout },
-                      ]}
-                    >
+                    <Text style={styles.settingLabel}>
                      {t("home.settings.subtitles.mpv_subtitle_align_x") ||
                        "Horizontal Align"}
                    </Text>
@@ -1072,12 +982,7 @@ export default function TVSubtitleModal() {
                        />
                      ))}
                    </View>
-                    <Text
-                      style={[
-                        styles.settingLabel,
-                        { fontSize: typography.callout },
-                      ]}
-                    >
+                    <Text style={styles.settingLabel}>
                      {t("home.settings.subtitles.mpv_subtitle_align_y") ||
                        "Vertical Align"}
                    </Text>
@@ -1102,201 +1007,218 @@ const styles = StyleSheet.create({
    maxHeight: "70%",
  },
  blurContainer: {
-    borderTopLeftRadius: scaleSize(24),
-    borderTopRightRadius: scaleSize(24),
+    borderTopLeftRadius: 24,
+    borderTopRightRadius: 24,
    overflow: "hidden",
  },
  content: {
-    paddingTop: scaleSize(24),
-    paddingBottom: scaleSize(48),
+    paddingTop: 24,
+    paddingBottom: 48,
  },
  header: {
-    paddingHorizontal: scaleSize(48),
-    marginBottom: scaleSize(20),
+    paddingHorizontal: 48,
+    marginBottom: 20,
  },
  title: {
+    fontSize: 24,
    fontWeight: "600",
    color: "#fff",
-    marginBottom: scaleSize(16),
+    marginBottom: 16,
  },
  tabRow: {
    flexDirection: "row",
-    gap: scaleSize(24),
+    gap: 24,
  },
  section: {
-    marginBottom: scaleSize(20),
+    marginBottom: 20,
  },
  sectionTitle: {
+    fontSize: 14,
    fontWeight: "500",
    color: "rgba(255,255,255,0.5)",
    textTransform: "uppercase",
    letterSpacing: 1,
-    marginBottom: scaleSize(12),
-    paddingHorizontal: scaleSize(48),
+    marginBottom: 12,
+    paddingHorizontal: 48,
  },
  tracksScroll: {
    overflow: "visible",
  },
  tracksScrollContent: {
-    paddingHorizontal: scaleSize(48),
-    paddingVertical: scaleSize(8),
-    gap: scaleSize(12),
+    paddingHorizontal: 48,
+    paddingVertical: 8,
+    gap: 12,
  },
  trackCard: {
-    width: scaleSize(180),
-    height: scaleSize(80),
-    borderRadius: scaleSize(14),
+    width: 180,
+    height: 80,
+    borderRadius: 14,
    justifyContent: "center",
    alignItems: "center",
-    paddingHorizontal: scaleSize(12),
+    paddingHorizontal: 12,
  },
  trackCardText: {
+    fontSize: 16,
    textAlign: "center",
  },
  trackCardSublabel: {
-    marginTop: scaleSize(2),
+    fontSize: 12,
+    marginTop: 2,
  },
  checkmark: {
    position: "absolute",
-    top: scaleSize(8),
-    right: scaleSize(8),
+    top: 8,
+    right: 8,
  },
  languageScroll: {
    overflow: "visible",
  },
  languageScrollContent: {
-    paddingHorizontal: scaleSize(48),
-    paddingVertical: scaleSize(8),
-    gap: scaleSize(10),
+    paddingHorizontal: 48,
+    paddingVertical: 8,
+    gap: 10,
  },
  languageCard: {
-    width: scaleSize(120),
-    height: scaleSize(60),
-    borderRadius: scaleSize(12),
+    width: 120,
+    height: 60,
+    borderRadius: 12,
    justifyContent: "center",
    alignItems: "center",
-    paddingHorizontal: scaleSize(12),
+    paddingHorizontal: 12,
  },
  languageCardText: {
+    fontSize: 15,
    fontWeight: "500",
  },
  languageCardCode: {
-    marginTop: scaleSize(2),
+    fontSize: 11,
+    marginTop: 2,
  },
  resultsScroll: {
    overflow: "visible",
  },
  resultsScrollContent: {
-    paddingHorizontal: scaleSize(48),
-    paddingVertical: scaleSize(8),
-    gap: scaleSize(12),
+    paddingHorizontal: 48,
+    paddingVertical: 8,
+    gap: 12,
  },
  resultCard: {
-    width: scaleSize(220),
-    height: scaleSize(130),
-    borderRadius: scaleSize(14),
-    padding: scaleSize(14),
+    width: 220,
+    height: 130,
+    borderRadius: 14,
+    padding: 14,
    borderWidth: 1,
    overflow: "hidden",
  },
  providerBadge: {
    alignSelf: "flex-start",
-    paddingHorizontal: scaleSize(8),
-    paddingVertical: scaleSize(3),
-    borderRadius: scaleSize(6),
-    marginBottom: scaleSize(8),
+    paddingHorizontal: 8,
+    paddingVertical: 3,
+    borderRadius: 6,
+    marginBottom: 8,
  },
  providerText: {
+    fontSize: 11,
    fontWeight: "600",
    textTransform: "uppercase",
    letterSpacing: 0.5,
  },
  resultName: {
+    fontSize: 14,
    fontWeight: "500",
-    marginBottom: scaleSize(8),
-    lineHeight: scaleSize(18),
+    marginBottom: 8,
+    lineHeight: 18,
  },
  resultMeta: {
    flexDirection: "row",
    alignItems: "center",
-    gap: scaleSize(12),
-    marginBottom: scaleSize(8),
+    gap: 12,
+    marginBottom: 8,
+  },
+  resultMetaText: {
+    fontSize: 12,
  },
-  resultMetaText: {},
  ratingContainer: {
    flexDirection: "row",
    alignItems: "center",
-    gap: scaleSize(3),
+    gap: 3,
  },
  downloadCountContainer: {
    flexDirection: "row",
    alignItems: "center",
-    gap: scaleSize(3),
+    gap: 3,
  },
  flagsContainer: {
    flexDirection: "row",
-    gap: scaleSize(6),
+    gap: 6,
    flexWrap: "wrap",
  },
  flag: {
-    paddingHorizontal: scaleSize(6),
-    paddingVertical: scaleSize(2),
-    borderRadius: scaleSize(4),
+    paddingHorizontal: 6,
+    paddingVertical: 2,
+    borderRadius: 4,
  },
  flagText: {
+    fontSize: 10,
    fontWeight: "600",
    color: "#fff",
  },
  downloadingOverlay: {
-    ...StyleSheet.absoluteFill,
+    ...StyleSheet.absoluteFillObject,
    backgroundColor: "rgba(0,0,0,0.5)",
-    borderRadius: scaleSize(14),
+    borderRadius: 14,
    justifyContent: "center",
    alignItems: "center",
  },
  loadingContainer: {
-    paddingVertical: scaleSize(20),
+    paddingVertical: 20,
    alignItems: "center",
  },
  errorContainer: {
-    paddingVertical: scaleSize(40),
-    paddingHorizontal: scaleSize(48),
+    paddingVertical: 40,
+    paddingHorizontal: 48,
    alignItems: "center",
  },
  errorText: {
    color: "rgba(255,100,100,0.9)",
-    marginTop: scaleSize(8),
+    marginTop: 8,
+    fontSize: 16,
    fontWeight: "500",
  },
  errorHint: {
    color: "rgba(255,255,255,0.5)",
-    marginTop: scaleSize(4),
+    marginTop: 4,
+    fontSize: 13,
    textAlign: "center",
  },
  emptyContainer: {
-    paddingVertical: scaleSize(40),
+    paddingVertical: 40,
    alignItems: "center",
  },
  emptyText: {
    color: "rgba(255,255,255,0.5)",
-    marginTop: scaleSize(8),
+    marginTop: 8,
+    fontSize: 14,
  },
  apiKeyHint: {
    flexDirection: "row",
    alignItems: "center",
-    gap: scaleSize(8),
-    paddingHorizontal: scaleSize(48),
-    paddingTop: scaleSize(8),
+    gap: 8,
+    paddingHorizontal: 48,
+    paddingTop: 8,
+  },
+  apiKeyHintText: {
+    color: "rgba(255,255,255,0.4)",
+    fontSize: 12,
  },
-  apiKeyHintText: {},
  // Settings tab styles
  settingsScroll: {
-    maxHeight: scaleSize(300),
+    maxHeight: 300,
  },
  settingsScrollContent: {
-    paddingHorizontal: scaleSize(48),
-    paddingVertical: scaleSize(8),
-    gap: scaleSize(24),
+    paddingHorizontal: 48,
+    paddingVertical: 8,
+    gap: 24,
  },
  settingRow: {
    flexDirection: "row",
@@ -1304,47 +1226,49 @@ const styles = StyleSheet.create({
    justifyContent: "space-between",
  },
  settingLabel: {
+    fontSize: 18,
    fontWeight: "500",
    color: "#fff",
  },
  sizeControlContainer: {
    flexDirection: "row",
    alignItems: "center",
-    gap: scaleSize(16),
+    gap: 16,
  },
  stepperButton: {
-    width: scaleSize(56),
-    height: scaleSize(56),
-    borderRadius: scaleSize(14),
+    width: 56,
+    height: 56,
+    borderRadius: 14,
    justifyContent: "center",
    alignItems: "center",
  },
  sizeValueContainer: {
-    width: scaleSize(80),
+    width: 80,
    alignItems: "center",
  },
  sizeValueText: {
+    fontSize: 24,
    fontWeight: "600",
    color: "#fff",
-    fontSize: scaleSize(24),
  },
  alignmentRow: {
    flexDirection: "row",
-    gap: scaleSize(10),
+    gap: 10,
  },
  alignmentCard: {
-    paddingHorizontal: scaleSize(20),
-    paddingVertical: scaleSize(14),
-    borderRadius: scaleSize(12),
-    minWidth: scaleSize(90),
+    paddingHorizontal: 20,
+    paddingVertical: 14,
+    borderRadius: 12,
+    minWidth: 90,
    alignItems: "center",
  },
  alignmentCardText: {
+    fontSize: 15,
    textTransform: "capitalize",
  },
  alignmentCheckmark: {
    position: "absolute",
-    top: scaleSize(6),
-    right: scaleSize(6),
+    top: 6,
+    right: 6,
  },
 });
--- a/app/(auth)/tv-user-switch-modal.tsx
+++ b/app/(auth)/tv-user-switch-modal.tsx
@@ -1,174 +0,0 @@
-import { BlurView } from "expo-blur";
-import { useAtomValue } from "jotai";
-import { useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  Animated,
-  Easing,
-  ScrollView,
-  StyleSheet,
-  TVFocusGuideView,
-  View,
-} from "react-native";
-import { Text } from "@/components/common/Text";
-import { TVUserCard } from "@/components/tv/TVUserCard";
-import useRouter from "@/hooks/useAppRouter";
-import { tvUserSwitchModalAtom } from "@/utils/atoms/tvUserSwitchModal";
-import type { SavedServerAccount } from "@/utils/secureCredentials";
-import { store } from "@/utils/store";
-
-export default function TVUserSwitchModalPage() {
-  const { t } = useTranslation();
-  const router = useRouter();
-  const modalState = useAtomValue(tvUserSwitchModalAtom);
-
-  const [isReady, setIsReady] = useState(false);
-  const firstCardRef = useRef<View>(null);
-
-  const overlayOpacity = useRef(new Animated.Value(0)).current;
-  const sheetTranslateY = useRef(new Animated.Value(200)).current;
-
-  // Animate in on mount and cleanup atom on unmount
-  useEffect(() => {
-    overlayOpacity.setValue(0);
-    sheetTranslateY.setValue(200);
-
-    Animated.parallel([
-      Animated.timing(overlayOpacity, {
-        toValue: 1,
-        duration: 250,
-        easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
-      }),
-      Animated.timing(sheetTranslateY, {
-        toValue: 0,
-        duration: 300,
-        easing: Easing.out(Easing.cubic),
-        useNativeDriver: true,
-      }),
-    ]).start();
-
-    // Delay focus setup to allow layout
-    const timer = setTimeout(() => setIsReady(true), 100);
-    return () => {
-      clearTimeout(timer);
-      // Clear the atom on unmount to prevent stale callbacks from being retained
-      store.set(tvUserSwitchModalAtom, null);
-    };
-  }, [overlayOpacity, sheetTranslateY]);
-
-  // Request focus on the first card when ready
-  useEffect(() => {
-    if (isReady && firstCardRef.current) {
-      const timer = setTimeout(() => {
-        (firstCardRef.current as any)?.requestTVFocus?.();
-      }, 50);
-      return () => clearTimeout(timer);
-    }
-  }, [isReady]);
-
-  const handleSelect = (account: SavedServerAccount) => {
-    modalState?.onAccountSelect(account);
-    store.set(tvUserSwitchModalAtom, null);
-    router.back();
-  };
-
-  // If no modal state, just return null
-  if (!modalState) {
-    return null;
-  }
-
-  return (
-    <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>
-      <Animated.View
-        style={[
-          styles.sheetContainer,
-          { transform: [{ translateY: sheetTranslateY }] },
-        ]}
-      >
-        <BlurView intensity={80} tint='dark' style={styles.blurContainer}>
-          <TVFocusGuideView
-            autoFocus
-            trapFocusUp
-            trapFocusDown
-            trapFocusLeft
-            trapFocusRight
-            style={styles.content}
-          >
-            <Text style={styles.title}>
-              {t("home.settings.switch_user.title")}
-            </Text>
-            <Text style={styles.subtitle}>{modalState.serverName}</Text>
-            {isReady && (
-              <ScrollView
-                horizontal
-                showsHorizontalScrollIndicator={false}
-                style={styles.scrollView}
-                contentContainerStyle={styles.scrollContent}
-              >
-                {modalState.accounts.map((account, index) => {
-                  const isCurrent = account.userId === modalState.currentUserId;
-                  return (
-                    <TVUserCard
-                      key={account.userId}
-                      ref={index === 0 ? firstCardRef : undefined}
-                      username={account.username}
-                      securityType={account.securityType}
-                      hasTVPreferredFocus={index === 0}
-                      isCurrent={isCurrent}
-                      onPress={() => handleSelect(account)}
-                    />
-                  );
-                })}
-              </ScrollView>
-            )}
-          </TVFocusGuideView>
-        </BlurView>
-      </Animated.View>
-    </Animated.View>
-  );
-}
-
-const styles = StyleSheet.create({
-  overlay: {
-    flex: 1,
-    backgroundColor: "rgba(0, 0, 0, 0.5)",
-    justifyContent: "flex-end",
-  },
-  sheetContainer: {
-    width: "100%",
-  },
-  blurContainer: {
-    borderTopLeftRadius: 24,
-    borderTopRightRadius: 24,
-    overflow: "hidden",
-  },
-  content: {
-    paddingTop: 24,
-    paddingBottom: 50,
-    overflow: "visible",
-  },
-  title: {
-    fontSize: 18,
-    fontWeight: "500",
-    color: "rgba(255,255,255,0.6)",
-    marginBottom: 4,
-    paddingHorizontal: 48,
-    textTransform: "uppercase",
-    letterSpacing: 1,
-  },
-  subtitle: {
-    fontSize: 14,
-    color: "rgba(255,255,255,0.4)",
-    marginBottom: 16,
-    paddingHorizontal: 48,
-  },
-  scrollView: {
-    overflow: "visible",
-  },
-  scrollContent: {
-    paddingHorizontal: 48,
-    paddingVertical: 20,
-    gap: 16,
-  },
-});
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -2,19 +2,18 @@ import "@/augmentations";
 import { ActionSheetProvider } from "@expo/react-native-action-sheet";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 import NetInfo from "@react-native-community/netinfo";
+import { DarkTheme, ThemeProvider } from "@react-navigation/native";
 import { createSyncStoragePersister } from "@tanstack/query-sync-storage-persister";
 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 { DarkTheme, ThemeProvider } from "expo-router/react-navigation";
 import { Platform } from "react-native";
 import { GlobalModal } from "@/components/GlobalModal";
-import { enableTVMenuKeyInterception } from "@/hooks/useTVBackHandler";
+
 import i18n from "@/i18n";
 import { DownloadProvider } from "@/providers/DownloadProvider";
 import { GlobalModalProvider } from "@/providers/GlobalModalProvider";
-import { InactivityProvider } from "@/providers/InactivityProvider";
 import { IntroSheetProvider } from "@/providers/IntroSheetProvider";
 import {
  apiAtom,
@@ -56,31 +55,15 @@ import * as TaskManager from "expo-task-manager";
 import { Provider as JotaiProvider, useAtom } from "jotai";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { I18nextProvider } from "react-i18next";
-import { Appearance, LogBox } from "react-native";
+import { Appearance } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
-
-// Suppress harmless tvOS warning from react-native-gesture-handler
-if (Platform.isTV) {
-  LogBox.ignoreLogs(["HoverGestureHandler is not supported on tvOS"]);
-}
-
 import useRouter from "@/hooks/useAppRouter";
 import { userAtom } from "@/providers/JellyfinProvider";
 import { store as jotaiStore, store } from "@/utils/store";
 import "react-native-reanimated";
-import {
-  configureReanimatedLogger,
-  ReanimatedLogLevel,
-} from "react-native-reanimated";
 import { Toaster } from "sonner-native";

-// Disable strict mode warnings for reading shared values during render
-configureReanimatedLogger({
-  level: ReanimatedLogLevel.warn,
-  strict: false,
-});
-
 if (!Platform.isTV) {
  Notifications.setNotificationHandler({
    handleNotification: async () => ({
@@ -250,11 +233,6 @@ function Layout() {
  const _segments = useSegments();
  const router = useRouter();

-  // Enable TV menu key interception so React Native handles it instead of tvOS
-  useEffect(() => {
-    enableTVMenuKeyInterception();
-  }, []);
-
  useEffect(() => {
    i18n.changeLanguage(
      settings?.preferedLanguage ?? getLocales()[0].languageCode ?? "en",
@@ -275,19 +253,22 @@ function Layout() {
          deviceId: getOrSetDeviceId(),
          userId: user.Id,
        })
+        .then((_) => console.log("Posted expo push token"))
        .catch((_) =>
          writeErrorLog("Failed to push expo push token to plugin"),
        );
-    }
+    } else console.log("No token available");
  }, [api, expoPushToken, user]);

  const registerNotifications = useCallback(async () => {
    if (Platform.OS === "android") {
+      console.log("Setting android notification channel 'default'");
      await Notifications?.setNotificationChannelAsync("default", {
        name: "default",
      });

      // Create dedicated channel for download notifications
+      console.log("Setting android notification channel 'downloads'");
      await Notifications?.setNotificationChannelAsync("downloads", {
        name: "Downloads",
        importance: Notifications.AndroidImportance.DEFAULT,
@@ -362,8 +343,8 @@ function Layout() {
                  url = `/(auth)/(tabs)/home/items/page?id=${itemId}`;
                  // summarized season notification for multiple episodes. Bring them to series season
                } else {
-                  const seriesId = data?.seriesId;
-                  const seasonIndex = data?.seasonIndex;
+                  const seriesId = data.seriesId;
+                  const seasonIndex = data.seasonIndex;
                  if (seasonIndex) {
                    url = `/(auth)/(tabs)/home/series/${seriesId}?seasonIndex=${seasonIndex}`;
                  } else {
@@ -402,145 +383,119 @@ function Layout() {
      }}
    >
      <JellyfinProvider>
-        <InactivityProvider>
-          <ServerUrlProvider>
-            <NetworkStatusProvider>
-              <PlaySettingsProvider>
-                <LogProvider>
-                  <WebSocketProvider>
-                    <DownloadProvider>
-                      <MusicPlayerProvider>
-                        <GlobalModalProvider>
-                          <BottomSheetModalProvider>
-                            <IntroSheetProvider>
-                              <ThemeProvider value={DarkTheme}>
-                                <SystemBars style='light' hidden={false} />
-                                <Stack initialRouteName='(auth)/(tabs)'>
-                                  <Stack.Screen
-                                    name='(auth)/(tabs)'
-                                    options={{
-                                      headerShown: false,
-                                      title: "",
-                                      header: () => null,
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='(auth)/player'
-                                    options={{
-                                      headerShown: false,
-                                      title: "",
-                                      header: () => null,
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='(auth)/now-playing'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "modal",
-                                      gestureEnabled: true,
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='login'
-                                    options={{
-                                      headerShown: true,
-                                      title: "",
-                                      headerTransparent: Platform.OS === "ios",
-                                    }}
-                                  />
-                                  <Stack.Screen name='+not-found' />
-                                  <Stack.Screen
-                                    name='(auth)/tv-option-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='(auth)/tv-subtitle-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='(auth)/tv-request-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='(auth)/tv-season-select-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='(auth)/tv-series-season-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='tv-account-action-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='tv-account-select-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                  <Stack.Screen
-                                    name='(auth)/tv-user-switch-modal'
-                                    options={{
-                                      headerShown: false,
-                                      presentation: "transparentModal",
-                                      animation: "fade",
-                                    }}
-                                  />
-                                </Stack>
-                                <Toaster
-                                  duration={4000}
-                                  toastOptions={{
-                                    style: {
-                                      backgroundColor: "#262626",
-                                      borderColor: "#363639",
-                                      borderWidth: 1,
-                                    },
-                                    titleStyle: {
-                                      color: "white",
-                                    },
+        <ServerUrlProvider>
+          <NetworkStatusProvider>
+            <PlaySettingsProvider>
+              <LogProvider>
+                <WebSocketProvider>
+                  <DownloadProvider>
+                    <MusicPlayerProvider>
+                      <GlobalModalProvider>
+                        <BottomSheetModalProvider>
+                          <IntroSheetProvider>
+                            <ThemeProvider value={DarkTheme}>
+                              <SystemBars style='light' hidden={false} />
+                              <Stack initialRouteName='(auth)/(tabs)'>
+                                <Stack.Screen
+                                  name='(auth)/(tabs)'
+                                  options={{
+                                    headerShown: false,
+                                    title: "",
+                                    header: () => null,
                                  }}
-                                  closeButton
                                />
-                                {!Platform.isTV && <GlobalModal />}
-                              </ThemeProvider>
-                            </IntroSheetProvider>
-                          </BottomSheetModalProvider>
-                        </GlobalModalProvider>
-                      </MusicPlayerProvider>
-                    </DownloadProvider>
-                  </WebSocketProvider>
-                </LogProvider>
-              </PlaySettingsProvider>
-            </NetworkStatusProvider>
-          </ServerUrlProvider>
-        </InactivityProvider>
+                                <Stack.Screen
+                                  name='(auth)/player'
+                                  options={{
+                                    headerShown: false,
+                                    title: "",
+                                    header: () => null,
+                                  }}
+                                />
+                                <Stack.Screen
+                                  name='(auth)/now-playing'
+                                  options={{
+                                    headerShown: false,
+                                    presentation: "modal",
+                                    gestureEnabled: true,
+                                  }}
+                                />
+                                <Stack.Screen
+                                  name='login'
+                                  options={{
+                                    headerShown: true,
+                                    title: "",
+                                    headerTransparent: Platform.OS === "ios",
+                                  }}
+                                />
+                                <Stack.Screen name='+not-found' />
+                                <Stack.Screen
+                                  name='(auth)/tv-option-modal'
+                                  options={{
+                                    headerShown: false,
+                                    presentation: "transparentModal",
+                                    animation: "fade",
+                                  }}
+                                />
+                                <Stack.Screen
+                                  name='(auth)/tv-subtitle-modal'
+                                  options={{
+                                    headerShown: false,
+                                    presentation: "transparentModal",
+                                    animation: "fade",
+                                  }}
+                                />
+                                <Stack.Screen
+                                  name='(auth)/tv-request-modal'
+                                  options={{
+                                    headerShown: false,
+                                    presentation: "transparentModal",
+                                    animation: "fade",
+                                  }}
+                                />
+                                <Stack.Screen
+                                  name='(auth)/tv-season-select-modal'
+                                  options={{
+                                    headerShown: false,
+                                    presentation: "transparentModal",
+                                    animation: "fade",
+                                  }}
+                                />
+                                <Stack.Screen
+                                  name='(auth)/tv-series-season-modal'
+                                  options={{
+                                    headerShown: false,
+                                    presentation: "transparentModal",
+                                    animation: "fade",
+                                  }}
+                                />
+                              </Stack>
+                              <Toaster
+                                duration={4000}
+                                toastOptions={{
+                                  style: {
+                                    backgroundColor: "#262626",
+                                    borderColor: "#363639",
+                                    borderWidth: 1,
+                                  },
+                                  titleStyle: {
+                                    color: "white",
+                                  },
+                                }}
+                                closeButton
+                              />
+                              {!Platform.isTV && <GlobalModal />}
+                            </ThemeProvider>
+                          </IntroSheetProvider>
+                        </BottomSheetModalProvider>
+                      </GlobalModalProvider>
+                    </MusicPlayerProvider>
+                  </DownloadProvider>
+                </WebSocketProvider>
+              </LogProvider>
+            </PlaySettingsProvider>
+          </NetworkStatusProvider>
+        </ServerUrlProvider>
      </JellyfinProvider>
    </PersistQueryClientProvider>
  );
--- a/app/topshelf/item.tsx
+++ b/app/topshelf/item.tsx
@@ -1,33 +0,0 @@
-import { useLocalSearchParams, useRootNavigationState } from "expo-router";
-import { useEffect } from "react";
-import { View } from "react-native";
-import useRouter from "@/hooks/useAppRouter";
-
-export default function TopShelfItemRedirect() {
-  const router = useRouter();
-  const rootNavigationState = useRootNavigationState();
-  const { id, type } = useLocalSearchParams<{
-    id?: string;
-    type?: string;
-  }>();
-
-  useEffect(() => {
-    if (!rootNavigationState?.key) {
-      return;
-    }
-
-    if (!id) {
-      router.replace("/(auth)/(tabs)/(home)");
-      return;
-    }
-
-    if (type === "Series") {
-      router.replace(`/(auth)/(tabs)/(home)/series/${id}`);
-      return;
-    }
-
-    router.replace(`/(auth)/(tabs)/(home)/items/page?id=${id}`);
-  }, [id, rootNavigationState?.key, router, type]);
-
-  return <View style={{ flex: 1, backgroundColor: "#000" }} />;
-}
--- a/app/topshelf/play.tsx
+++ b/app/topshelf/play.tsx
@@ -1,32 +0,0 @@
-import { useLocalSearchParams, useRootNavigationState } from "expo-router";
-import { useEffect } from "react";
-import { View } from "react-native";
-import useRouter from "@/hooks/useAppRouter";
-
-export default function TopShelfPlayRedirect() {
-  const router = useRouter();
-  const rootNavigationState = useRootNavigationState();
-  const { id } = useLocalSearchParams<{
-    id?: string;
-  }>();
-
-  useEffect(() => {
-    if (!rootNavigationState?.key) {
-      return;
-    }
-
-    if (!id) {
-      router.replace("/(auth)/(tabs)/(home)");
-      return;
-    }
-
-    const queryParams = new URLSearchParams({
-      itemId: id,
-      offline: "false",
-    });
-
-    router.replace(`/player/direct-player?${queryParams.toString()}`);
-  }, [id, rootNavigationState?.key, router]);
-
-  return <View style={{ flex: 1, backgroundColor: "#000" }} />;
-}
--- a/app/tv-account-action-modal.tsx
+++ b/app/tv-account-action-modal.tsx
@@ -1,251 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import { BlurView } from "expo-blur";
-import { useAtomValue } from "jotai";
-import { useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  Animated,
-  Easing,
-  Pressable,
-  ScrollView,
-  TVFocusGuideView,
-} from "react-native";
-import { Text } from "@/components/common/Text";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import useRouter from "@/hooks/useAppRouter";
-import { tvAccountActionModalAtom } from "@/utils/atoms/tvAccountActionModal";
-import { store } from "@/utils/store";
-
-// Action card component
-const TVAccountActionCard: React.FC<{
-  label: string;
-  icon: keyof typeof Ionicons.glyphMap;
-  variant?: "default" | "destructive";
-  hasTVPreferredFocus?: boolean;
-  onPress: () => void;
-}> = ({ label, icon, variant = "default", hasTVPreferredFocus, onPress }) => {
-  const [focused, setFocused] = useState(false);
-  const scale = useRef(new Animated.Value(1)).current;
-  const typography = useScaledTVTypography();
-
-  const animateTo = (v: number) =>
-    Animated.timing(scale, {
-      toValue: v,
-      duration: 150,
-      easing: Easing.out(Easing.quad),
-      useNativeDriver: true,
-    }).start();
-
-  const isDestructive = variant === "destructive";
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onFocus={() => {
-        setFocused(true);
-        animateTo(1.05);
-      }}
-      onBlur={() => {
-        setFocused(false);
-        animateTo(1);
-      }}
-      hasTVPreferredFocus={hasTVPreferredFocus}
-    >
-      <Animated.View
-        style={{
-          transform: [{ scale }],
-          flexDirection: "row",
-          height: 60,
-          backgroundColor: focused
-            ? isDestructive
-              ? "#ef4444"
-              : "#fff"
-            : isDestructive
-              ? "rgba(239, 68, 68, 0.2)"
-              : "rgba(255,255,255,0.08)",
-          borderRadius: 14,
-          justifyContent: "center",
-          alignItems: "center",
-          paddingHorizontal: 24,
-          gap: 12,
-        }}
-      >
-        <Ionicons
-          name={icon}
-          size={22}
-          color={
-            focused
-              ? isDestructive
-                ? "#fff"
-                : "#000"
-              : isDestructive
-                ? "#ef4444"
-                : "#fff"
-          }
-        />
-        <Text
-          style={{
-            fontSize: typography.callout,
-            color: focused
-              ? isDestructive
-                ? "#fff"
-                : "#000"
-              : isDestructive
-                ? "#ef4444"
-                : "#fff",
-            fontWeight: "600",
-          }}
-          numberOfLines={1}
-        >
-          {label}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-export default function TVAccountActionModalPage() {
-  const typography = useScaledTVTypography();
-  const router = useRouter();
-  const modalState = useAtomValue(tvAccountActionModalAtom);
-  const { t } = useTranslation();
-
-  const [isReady, setIsReady] = useState(false);
-  const overlayOpacity = useRef(new Animated.Value(0)).current;
-  const sheetTranslateY = useRef(new Animated.Value(200)).current;
-
-  // Animate in on mount
-  useEffect(() => {
-    overlayOpacity.setValue(0);
-    sheetTranslateY.setValue(200);
-
-    Animated.parallel([
-      Animated.timing(overlayOpacity, {
-        toValue: 1,
-        duration: 250,
-        easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
-      }),
-      Animated.timing(sheetTranslateY, {
-        toValue: 0,
-        duration: 300,
-        easing: Easing.out(Easing.cubic),
-        useNativeDriver: true,
-      }),
-    ]).start();
-
-    const timer = setTimeout(() => setIsReady(true), 100);
-    return () => {
-      clearTimeout(timer);
-      store.set(tvAccountActionModalAtom, null);
-    };
-  }, [overlayOpacity, sheetTranslateY]);
-
-  const handleLogin = () => {
-    modalState?.onLogin();
-    router.back();
-  };
-
-  const handleDelete = () => {
-    modalState?.onDelete();
-    router.back();
-  };
-
-  if (!modalState) {
-    return null;
-  }
-
-  return (
-    <Animated.View
-      style={{
-        flex: 1,
-        backgroundColor: "rgba(0, 0, 0, 0.5)",
-        justifyContent: "flex-end",
-        opacity: overlayOpacity,
-      }}
-    >
-      <Animated.View
-        style={{
-          width: "100%",
-          transform: [{ translateY: sheetTranslateY }],
-        }}
-      >
-        <BlurView
-          intensity={80}
-          tint='dark'
-          style={{
-            borderTopLeftRadius: 24,
-            borderTopRightRadius: 24,
-            overflow: "hidden",
-          }}
-        >
-          <TVFocusGuideView
-            autoFocus
-            trapFocusUp
-            trapFocusDown
-            trapFocusLeft
-            trapFocusRight
-            style={{
-              paddingTop: 24,
-              paddingBottom: 50,
-              overflow: "visible",
-            }}
-          >
-            {/* Account username as title */}
-            <Text
-              style={{
-                fontSize: typography.heading,
-                fontWeight: "600",
-                color: "#FFFFFF",
-                marginBottom: 4,
-                paddingHorizontal: 48,
-              }}
-            >
-              {modalState.account.username}
-            </Text>
-
-            {/* Server name as subtitle */}
-            <Text
-              style={{
-                fontSize: typography.callout,
-                fontWeight: "500",
-                color: "rgba(255,255,255,0.6)",
-                marginBottom: 16,
-                paddingHorizontal: 48,
-              }}
-            >
-              {modalState.server.name || modalState.server.address}
-            </Text>
-
-            {/* Horizontal options */}
-            {isReady && (
-              <ScrollView
-                horizontal
-                showsHorizontalScrollIndicator={false}
-                style={{ overflow: "visible" }}
-                contentContainerStyle={{
-                  paddingHorizontal: 48,
-                  paddingVertical: 10,
-                  gap: 12,
-                }}
-              >
-                <TVAccountActionCard
-                  label={t("common.login")}
-                  icon='log-in-outline'
-                  hasTVPreferredFocus
-                  onPress={handleLogin}
-                />
-                <TVAccountActionCard
-                  label={t("common.delete")}
-                  icon='trash-outline'
-                  variant='destructive'
-                  onPress={handleDelete}
-                />
-              </ScrollView>
-            )}
-          </TVFocusGuideView>
-        </BlurView>
-      </Animated.View>
-    </Animated.View>
-  );
-}
--- a/app/tv-account-select-modal.tsx
+++ b/app/tv-account-select-modal.tsx
@@ -1,256 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import { BlurView } from "expo-blur";
-import { useAtomValue } from "jotai";
-import { useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  Animated,
-  Easing,
-  Pressable,
-  ScrollView,
-  TVFocusGuideView,
-} from "react-native";
-import { Text } from "@/components/common/Text";
-import { TVUserCard } from "@/components/tv/TVUserCard";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import useRouter from "@/hooks/useAppRouter";
-import { tvAccountSelectModalAtom } from "@/utils/atoms/tvAccountSelectModal";
-import { store } from "@/utils/store";
-
-// Action button for bottom sheet
-const TVAccountSelectAction: React.FC<{
-  label: string;
-  icon: keyof typeof Ionicons.glyphMap;
-  variant?: "default" | "destructive";
-  onPress: () => void;
-}> = ({ label, icon, variant = "default", onPress }) => {
-  const [focused, setFocused] = useState(false);
-  const scale = useRef(new Animated.Value(1)).current;
-  const typography = useScaledTVTypography();
-
-  const animateTo = (v: number) =>
-    Animated.timing(scale, {
-      toValue: v,
-      duration: 150,
-      easing: Easing.out(Easing.quad),
-      useNativeDriver: true,
-    }).start();
-
-  const isDestructive = variant === "destructive";
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onFocus={() => {
-        setFocused(true);
-        animateTo(1.05);
-      }}
-      onBlur={() => {
-        setFocused(false);
-        animateTo(1);
-      }}
-    >
-      <Animated.View
-        style={{
-          transform: [{ scale }],
-          flexDirection: "row",
-          backgroundColor: focused
-            ? isDestructive
-              ? "#ef4444"
-              : "#fff"
-            : isDestructive
-              ? "rgba(239, 68, 68, 0.2)"
-              : "rgba(255,255,255,0.08)",
-          borderRadius: 14,
-          alignItems: "center",
-          paddingHorizontal: 16,
-          paddingVertical: 14,
-          minHeight: 72,
-          gap: 14,
-        }}
-      >
-        <Ionicons
-          name={icon}
-          size={22}
-          color={
-            focused
-              ? isDestructive
-                ? "#fff"
-                : "#000"
-              : isDestructive
-                ? "#ef4444"
-                : "#fff"
-          }
-        />
-        <Text
-          style={{
-            fontSize: typography.callout,
-            color: focused
-              ? isDestructive
-                ? "#fff"
-                : "#000"
-              : isDestructive
-                ? "#ef4444"
-                : "#fff",
-            fontWeight: "600",
-          }}
-          numberOfLines={1}
-        >
-          {label}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-export default function TVAccountSelectModalPage() {
-  const typography = useScaledTVTypography();
-  const router = useRouter();
-  const modalState = useAtomValue(tvAccountSelectModalAtom);
-  const { t } = useTranslation();
-
-  const [isReady, setIsReady] = useState(false);
-  const overlayOpacity = useRef(new Animated.Value(0)).current;
-  const sheetTranslateY = useRef(new Animated.Value(300)).current;
-
-  // Animate in on mount
-  useEffect(() => {
-    overlayOpacity.setValue(0);
-    sheetTranslateY.setValue(300);
-
-    Animated.parallel([
-      Animated.timing(overlayOpacity, {
-        toValue: 1,
-        duration: 250,
-        easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
-      }),
-      Animated.timing(sheetTranslateY, {
-        toValue: 0,
-        duration: 300,
-        easing: Easing.out(Easing.cubic),
-        useNativeDriver: true,
-      }),
-    ]).start();
-
-    const timer = setTimeout(() => setIsReady(true), 100);
-    return () => {
-      clearTimeout(timer);
-      store.set(tvAccountSelectModalAtom, null);
-    };
-  }, [overlayOpacity, sheetTranslateY]);
-
-  if (!modalState) {
-    return null;
-  }
-
-  return (
-    <Animated.View
-      style={{
-        flex: 1,
-        backgroundColor: "rgba(0, 0, 0, 0.5)",
-        justifyContent: "flex-end",
-        opacity: overlayOpacity,
-      }}
-    >
-      <Animated.View
-        style={{
-          width: "100%",
-          transform: [{ translateY: sheetTranslateY }],
-        }}
-      >
-        <BlurView
-          intensity={80}
-          tint='dark'
-          style={{
-            borderTopLeftRadius: 24,
-            borderTopRightRadius: 24,
-            overflow: "hidden",
-          }}
-        >
-          <TVFocusGuideView
-            autoFocus
-            trapFocusUp
-            trapFocusDown
-            trapFocusLeft
-            trapFocusRight
-            style={{
-              paddingTop: 24,
-              paddingBottom: 50,
-              overflow: "visible",
-            }}
-          >
-            {/* Title */}
-            <Text
-              style={{
-                fontSize: typography.heading,
-                fontWeight: "600",
-                color: "#FFFFFF",
-                marginBottom: 4,
-                paddingHorizontal: 48,
-              }}
-            >
-              {t("server.select_account")}
-            </Text>
-
-            {/* Server name as subtitle */}
-            <Text
-              style={{
-                fontSize: typography.callout,
-                fontWeight: "500",
-                color: "rgba(255,255,255,0.6)",
-                marginBottom: 16,
-                paddingHorizontal: 48,
-              }}
-            >
-              {modalState.server.name || modalState.server.address}
-            </Text>
-
-            {/* All options in single horizontal row */}
-            {isReady && (
-              <ScrollView
-                horizontal
-                showsHorizontalScrollIndicator={false}
-                style={{ overflow: "visible" }}
-                contentContainerStyle={{
-                  paddingHorizontal: 48,
-                  paddingVertical: 20,
-                  gap: 16,
-                }}
-              >
-                {modalState.server.accounts?.map((account, index) => (
-                  <TVUserCard
-                    key={account.userId}
-                    username={account.username}
-                    securityType={account.securityType}
-                    onPress={() => {
-                      modalState.onAccountAction(account);
-                    }}
-                    hasTVPreferredFocus={index === 0}
-                  />
-                ))}
-                <TVAccountSelectAction
-                  label={t("server.add_account")}
-                  icon='person-add-outline'
-                  onPress={() => {
-                    modalState.onAddAccount();
-                    router.back();
-                  }}
-                />
-                <TVAccountSelectAction
-                  label={t("server.remove_server")}
-                  icon='trash-outline'
-                  variant='destructive'
-                  onPress={() => {
-                    modalState.onDeleteServer();
-                    router.back();
-                  }}
-                />
-              </ScrollView>
-            )}
-          </TVFocusGuideView>
-        </BlurView>
-      </Animated.View>
-    </Animated.View>
-  );
-}
--- a/assets/icons/gear.png
+++ b/assets/icons/gear.png
--- a/augmentations/number.ts
+++ b/augmentations/number.ts
@@ -11,7 +11,7 @@ Number.prototype.bytesToReadable = function (decimals = 2) {
  const bytes = this.valueOf();
  if (bytes === 0) return "0 Bytes";

-  const k = 1000;
+  const k = 1024;
  const dm = decimals < 0 ? 0 : decimals;
  const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];

--- a/biome.json
+++ b/biome.json
@@ -8,8 +8,6 @@
      "!android",
      "!Streamyfin.app",
      "!utils/jellyseerr",
-      "!expo-env.d.ts",
-      "!modules/**/android/build",
      "!.expo",
      "!docs/jellyfin-openapi-stable.json"
    ]
--- a/bun-patches/react-native-ios-utilities@5.2.0.patch
+++ b/bun-patches/react-native-ios-utilities@5.2.0.patch
@@ -1,28 +0,0 @@
-diff --git a/ios/Sources/Extensions+Helpers/RCTView+Helpers.swift b/ios/Sources/Extensions+Helpers/RCTView+Helpers.swift
-index 09be306d5aa39337c5114c2ad6ba7513218e0751..24ff8ee2c36fef8632a7e012514fd04db9bf89fd 100644
--- a/ios/Sources/Extensions+Helpers/RCTView+Helpers.swift
-+++ b/ios/Sources/Extensions+Helpers/RCTView+Helpers.swift
-@@ -25,15 +25,14 @@ public extension RCTView {
-     return rootView.recursivelyFindSubview(whereType: targetType);
-   };
-   
-  var closestParentReactContentView: RCTRootContentView? {
-    let targetType = RCTRootContentView.self;
-  
-    if let match = self.recursivelyFindParentView(whereType: targetType) {
-      return match;
-    };
-    
-    guard let rootView = self.rootViewForCurrentWindow else { return nil };
-    return rootView.recursivelyFindSubview(whereType: targetType);
-+  // PATCH (streamyfin): RCTRootContentView is a legacy paper class that the prebuilt
-+  // new-architecture React (RN 0.85) does not export, so any reference to it fails to
-+  // link (Undefined symbols: _OBJC_CLASS_$_RCTRootContentView). The app runs the new
-+  // architecture, where this content-view lookup is unused; short-circuit to nil.
-+  // Return type widened to RCTView? so the caller's `.reactTouchHandlers` (an RCTView
-+  // extension) still resolves.
-+  var closestParentReactContentView: RCTView? {
-+    return nil;
-   };
-   
-   var reactTouchHandlers: [RCTTouchHandler]? {
--- a/bun-patches/react-native-udp@4.1.7.patch
+++ b/bun-patches/react-native-udp@4.1.7.patch
@@ -1,17 +0,0 @@
-diff --git a/node_modules/react-native-udp/.bun-tag-ea7df8754aa4db91 b/.bun-tag-ea7df8754aa4db91
-new file mode 100644
-index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-diff --git a/react-native-udp.podspec b/react-native-udp.podspec
-index 7450cc7d0862aadfb47d796929c801a3dc423a57..fa3e42c0152ef2d87536b8c2e484f64d525e35ec 100644
--- a/react-native-udp.podspec
-+++ b/react-native-udp.podspec
-@@ -9,7 +9,8 @@ Pod::Spec.new do |s|
-   s.homepage       = package_json["homepage"]
-   s.license        = package_json["license"]
-   s.author         = { package_json["author"] => package_json["author"] }
-  s.platform       = :ios, "7.0"
-+  s.ios.deployment_target = "7.0"
-+  s.tvos.deployment_target = "15.1"
-   s.source         = { :git => package_json["repository"]["url"], :tag => "v#{s.version}" }
-   s.source_files   = 'ios/**/*.{h,m}'
-   s.dependency 'React-Core'
--- a/bun.lock
+++ b/bun.lock
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -15,7 +15,6 @@ import {
  View,
 } from "react-native";
 import { useHaptic } from "@/hooks/useHaptic";
-import { scaleSize } from "@/utils/scaleSize";
 import { Loader } from "./Loader";

 const getColorClasses = (
@@ -133,29 +132,19 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
      <Animated.View
        style={{
          transform: [{ scale }],
-          shadowColor: "#ffffff",
+          shadowColor: color === "black" ? "#ffffff" : "#a855f7",
          shadowOffset: { width: 0, height: 0 },
          shadowOpacity: focused ? 0.5 : 0,
-          shadowRadius: focused ? scaleSize(10) : 0,
+          shadowRadius: focused ? 10 : 0,
          elevation: focused ? 12 : 0, // Android glow
        }}
      >
        <View
-          style={{
-            borderRadius: scaleSize(16),
-            paddingVertical: scaleSize(14),
-            alignItems: "center",
-            justifyContent: "center",
-          }}
-          className={`${colorClasses} ${className}`}
+          className={`rounded-2xl py-5 items-center justify-center 
+            ${colorClasses}
+            ${className}`}
        >
-          <Text
-            style={{
-              fontSize: scaleSize(20),
-              fontWeight: "bold",
-            }}
-            className={textColorClass}
-          >
+          <Text className={`${textColorClass} text-xl font-bold`}>
            {children}
          </Text>
        </View>
--- a/components/ContinueWatchingPoster.tv.tsx
+++ b/components/ContinueWatchingPoster.tv.tsx
@@ -0,0 +1,188 @@
+import { Ionicons } from "@expo/vector-icons";
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { Image } from "expo-image";
+import { useAtomValue } from "jotai";
+import type React from "react";
+import { useMemo } from "react";
+import { View } from "react-native";
+import {
+  GlassPosterView,
+  isGlassEffectAvailable,
+} from "@/modules/glass-poster";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { ProgressBar } from "./common/ProgressBar";
+import { WatchedIndicator } from "./WatchedIndicator";
+
+export const TV_LANDSCAPE_WIDTH = 400;
+
+type ContinueWatchingPosterProps = {
+  item: BaseItemDto;
+  useEpisodePoster?: boolean;
+  size?: "small" | "normal";
+  showPlayButton?: boolean;
+};
+
+const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
+  item,
+  useEpisodePoster = false,
+  // TV version uses fixed width, size prop kept for API compatibility
+  size: _size = "normal",
+  showPlayButton = false,
+}) => {
+  const api = useAtomValue(apiAtom);
+
+  const url = useMemo(() => {
+    if (!api) {
+      return;
+    }
+    if (item.Type === "Episode" && useEpisodePoster) {
+      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=700&quality=80`;
+    }
+    if (item.Type === "Episode") {
+      if (item.ParentBackdropItemId && item.ParentThumbImageTag) {
+        return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=700&quality=80&tag=${item.ParentThumbImageTag}`;
+      }
+      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=700&quality=80`;
+    }
+    if (item.Type === "Movie") {
+      if (item.ImageTags?.Thumb) {
+        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=700&quality=80&tag=${item.ImageTags?.Thumb}`;
+      }
+      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=700&quality=80`;
+    }
+    if (item.Type === "Program") {
+      if (item.ImageTags?.Thumb) {
+        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=700&quality=80&tag=${item.ImageTags?.Thumb}`;
+      }
+      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=700&quality=80`;
+    }
+
+    if (item.ImageTags?.Thumb) {
+      return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=700&quality=80&tag=${item.ImageTags?.Thumb}`;
+    }
+
+    return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=700&quality=80`;
+  }, [api, item, useEpisodePoster]);
+
+  const progress = useMemo(() => {
+    if (item.Type === "Program") {
+      if (!item.StartDate || !item.EndDate) {
+        return 0;
+      }
+      const startDate = new Date(item.StartDate);
+      const endDate = new Date(item.EndDate);
+      const now = new Date();
+      const total = endDate.getTime() - startDate.getTime();
+      if (total <= 0) {
+        return 0;
+      }
+      const elapsed = now.getTime() - startDate.getTime();
+      return (elapsed / total) * 100;
+    }
+    return item.UserData?.PlayedPercentage || 0;
+  }, [item]);
+
+  const isWatched = item.UserData?.Played === true;
+
+  // Use glass effect on tvOS 26+
+  const useGlass = isGlassEffectAvailable();
+
+  if (!url) {
+    return (
+      <View
+        style={{
+          width: TV_LANDSCAPE_WIDTH,
+          aspectRatio: 16 / 9,
+          borderRadius: 24,
+        }}
+      />
+    );
+  }
+
+  if (useGlass) {
+    return (
+      <View style={{ position: "relative" }}>
+        <GlassPosterView
+          imageUrl={url}
+          aspectRatio={16 / 9}
+          cornerRadius={24}
+          progress={progress}
+          showWatchedIndicator={isWatched}
+          isFocused={false}
+          width={TV_LANDSCAPE_WIDTH}
+          style={{ width: TV_LANDSCAPE_WIDTH }}
+        />
+        {showPlayButton && (
+          <View
+            style={{
+              position: "absolute",
+              top: 0,
+              left: 0,
+              right: 0,
+              bottom: 0,
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <Ionicons name='play-circle' size={56} color='white' />
+          </View>
+        )}
+      </View>
+    );
+  }
+
+  // Fallback for older tvOS versions
+  return (
+    <View
+      style={{
+        position: "relative",
+        width: TV_LANDSCAPE_WIDTH,
+        aspectRatio: 16 / 9,
+        borderRadius: 24,
+        overflow: "hidden",
+      }}
+    >
+      <View
+        style={{
+          width: "100%",
+          height: "100%",
+          alignItems: "center",
+          justifyContent: "center",
+        }}
+      >
+        <Image
+          key={item.Id}
+          id={item.Id}
+          source={{
+            uri: url,
+          }}
+          cachePolicy={"memory-disk"}
+          contentFit='cover'
+          style={{
+            width: "100%",
+            height: "100%",
+          }}
+        />
+        {showPlayButton && (
+          <View
+            style={{
+              position: "absolute",
+              top: 0,
+              left: 0,
+              right: 0,
+              bottom: 0,
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <Ionicons name='play-circle' size={56} color='white' />
+          </View>
+        )}
+      </View>
+      <WatchedIndicator item={item} />
+      <ProgressBar item={item} />
+    </View>
+  );
+};
+
+export default ContinueWatchingPoster;
--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -73,16 +73,12 @@ export const DownloadItems: React.FC<DownloadProps> = ({
    SelectedOptions | undefined
  >(undefined);

-  const playSettingsOptions = useMemo(
-    () => ({ applyLanguagePreferences: true }),
-    [],
-  );
  const {
    defaultAudioIndex,
    defaultBitrate,
    defaultMediaSource,
    defaultSubtitleIndex,
-  } = useDefaultPlaySettings(items[0], settings, playSettingsOptions);
+  } = useDefaultPlaySettings(items[0], settings);

  const userCanDownload = useMemo(
    () => user?.Policy?.EnableContentDownloading,
--- a/components/ItemContent.tsx
+++ b/components/ItemContent.tsx
@@ -75,20 +75,12 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({
  >(undefined);

  // Use itemWithSources for play settings since it has MediaSources data
-  const playSettingsOptions = useMemo(
-    () => ({ applyLanguagePreferences: true }),
-    [],
-  );
  const {
    defaultAudioIndex,
    defaultBitrate,
    defaultMediaSource,
    defaultSubtitleIndex,
-  } = useDefaultPlaySettings(
-    itemWithSources ?? item,
-    settings,
-    playSettingsOptions,
-  );
+  } = useDefaultPlaySettings(itemWithSources ?? item, settings);

  const logoUrl = useMemo(
    () => (item ? getLogoImageUrlById({ api, item }) : null),
--- a/components/ItemContent.tv.tsx
+++ b/components/ItemContent.tv.tsx
@@ -7,7 +7,6 @@ import type {
 import { getTvShowsApi, getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { BlurView } from "expo-blur";
-import { File } from "expo-file-system";
 import { Image } from "expo-image";
 import { useAtom } from "jotai";
 import React, {
@@ -18,14 +17,14 @@ import React, {
  useState,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { Alert, Dimensions, ScrollView, View } from "react-native";
+import { Dimensions, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
 import { ItemImage } from "@/components/common/ItemImage";
 import { Text } from "@/components/common/Text";
 import { getItemNavigation } from "@/components/common/TouchableItemRouter";
 import { GenreTags } from "@/components/GenreTags";
-import { TVEpisodeList } from "@/components/series/TVEpisodeList";
+import { TVEpisodeCard } from "@/components/series/TVEpisodeCard";
 import {
  TVBackdrop,
  TVButton,
@@ -34,7 +33,6 @@ import {
  TVFavoriteButton,
  TVMetadataBadges,
  TVOptionButton,
-  TVPlayedButton,
  TVProgressBar,
  TVRefreshButton,
  TVSeriesNavigation,
@@ -45,18 +43,15 @@ import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
 import { useImageColorsReturn } from "@/hooks/useImageColorsReturn";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import { useTVSubtitleModal } from "@/hooks/useTVSubtitleModal";
-import { useTVThemeMusic } from "@/hooks/useTVThemeMusic";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
-import { getSubtitlesForItem } from "@/utils/atoms/downloadedSubtitles";
 import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { getPrimaryImageUrlById } from "@/utils/jellyfin/image/getPrimaryImageUrlById";
-import { formatDuration, runtimeTicksToMinutes } from "@/utils/time";
+import { runtimeTicksToMinutes } from "@/utils/time";

 const { width: SCREEN_WIDTH, height: SCREEN_HEIGHT } = Dimensions.get("window");

@@ -83,15 +78,11 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
    const { settings } = useSettings();
    const insets = useSafeAreaInsets();
    const router = useRouter();
-    const { showItemActions } = useTVItemActionModal();
    const { t } = useTranslation();
    const queryClient = useQueryClient();

    const _itemColors = useImageColorsReturn({ item });

-    // Auto-play theme music (handles fade in/out and cleanup)
-    useTVThemeMusic(item?.Id);
-
    // State for first episode card ref (used for focus guide)
    const [_firstEpisodeRef, setFirstEpisodeRef] = useState<View | null>(null);

@@ -121,22 +112,12 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
      SelectedOptions | undefined
    >(undefined);

-    // Enable language preference application for TV
-    const playSettingsOptions = useMemo(
-      () => ({ applyLanguagePreferences: true }),
-      [],
-    );
-
    const {
      defaultAudioIndex,
      defaultBitrate,
      defaultMediaSource,
      defaultSubtitleIndex,
-    } = useDefaultPlaySettings(
-      itemWithSources ?? item,
-      settings,
-      playSettingsOptions,
-    );
+    } = useDefaultPlaySettings(itemWithSources ?? item, settings);

    const logoUrl = useMemo(
      () => (item ? getLogoImageUrlById({ api, item }) : null),
@@ -158,59 +139,21 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
      defaultMediaSource,
    ]);

-    const navigateToPlayer = useCallback(
-      (playbackPosition: string) => {
-        if (!item || !selectedOptions) return;
-
-        const queryParams = new URLSearchParams({
-          itemId: item.Id!,
-          audioIndex: selectedOptions.audioIndex?.toString() ?? "",
-          subtitleIndex: selectedOptions.subtitleIndex?.toString() ?? "",
-          mediaSourceId: selectedOptions.mediaSource?.Id ?? "",
-          bitrateValue: selectedOptions.bitrate?.value?.toString() ?? "",
-          playbackPosition,
-          offline: isOffline ? "true" : "false",
-        });
-
-        router.push(`/player/direct-player?${queryParams.toString()}`);
-      },
-      [item, selectedOptions, isOffline, router],
-    );
-
    const handlePlay = () => {
      if (!item || !selectedOptions) return;

-      const hasPlaybackProgress =
-        (item.UserData?.PlaybackPositionTicks ?? 0) > 0;
+      const queryParams = new URLSearchParams({
+        itemId: item.Id!,
+        audioIndex: selectedOptions.audioIndex?.toString() ?? "",
+        subtitleIndex: selectedOptions.subtitleIndex?.toString() ?? "",
+        mediaSourceId: selectedOptions.mediaSource?.Id ?? "",
+        bitrateValue: selectedOptions.bitrate?.value?.toString() ?? "",
+        playbackPosition:
+          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+        offline: isOffline ? "true" : "false",
+      });

-      if (hasPlaybackProgress) {
-        Alert.alert(
-          t("item_card.resume_playback"),
-          t("item_card.resume_playback_description"),
-          [
-            {
-              text: t("common.cancel"),
-              style: "cancel",
-            },
-            {
-              text: t("item_card.play_from_start"),
-              onPress: () => navigateToPlayer("0"),
-            },
-            {
-              text: t("item_card.continue_from", {
-                time: formatDuration(item.UserData?.PlaybackPositionTicks),
-              }),
-              onPress: () =>
-                navigateToPlayer(
-                  item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
-                ),
-              isPreferred: true,
-            },
-          ],
-        );
-      } else {
-        navigateToPlayer("0");
-      }
+      router.push(`/player/direct-player?${queryParams.toString()}`);
    };

    // TV Option Modal hook for quality, audio, media source selectors
@@ -224,6 +167,10 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
      null,
    );

+    // State for last option button ref (used for upward focus guide from cast)
+    const [_lastOptionButtonRef, setLastOptionButtonRef] =
+      useState<View | null>(null);
+
    // Get available audio tracks
    const audioTracks = useMemo(() => {
      const streams = selectedOptions?.mediaSource?.MediaStreams?.filter(
@@ -245,16 +192,9 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
      null,
    );

-    // State to trigger refresh of local subtitles list
-    const [localSubtitlesRefreshKey, setLocalSubtitlesRefreshKey] = useState(0);
-
-    // Starting index for local (client-downloaded) subtitles
-    const LOCAL_SUBTITLE_INDEX_START = -100;
-
    // Convert MediaStream[] to Track[] for the modal (with setTrack callbacks)
-    // Also includes locally downloaded subtitles from OpenSubtitles
    const subtitleTracksForModal = useMemo((): Track[] => {
-      const tracks: Track[] = subtitleStreams.map((stream) => ({
+      return subtitleStreams.map((stream) => ({
        name:
          stream.DisplayTitle ||
          `${stream.Language || "Unknown"} (${stream.Codec})`,
@@ -263,37 +203,7 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
          handleSubtitleChangeRef.current?.(stream.Index ?? -1);
        },
      }));
-
-      // Add locally downloaded subtitles (from OpenSubtitles)
-      if (item?.Id) {
-        const localSubs = getSubtitlesForItem(item.Id);
-        let localIdx = 0;
-        for (const localSub of localSubs) {
-          // Verify file still exists (cache may have been cleared)
-          const subtitleFile = new File(localSub.filePath);
-          if (!subtitleFile.exists) {
-            continue;
-          }
-
-          const localIndex = LOCAL_SUBTITLE_INDEX_START - localIdx;
-          tracks.push({
-            name: localSub.name,
-            index: localIndex,
-            isLocal: true,
-            localPath: localSub.filePath,
-            setTrack: () => {
-              // For ItemContent (outside player), just update the selected index
-              // The actual subtitle will be loaded when playback starts
-              handleSubtitleChangeRef.current?.(localIndex);
-            },
-          });
-          localIdx++;
-        }
-      }
-
-      return tracks;
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [subtitleStreams, item?.Id, localSubtitlesRefreshKey]);
+    }, [subtitleStreams]);

    // Get available media sources
    const mediaSources = useMemo(() => {
@@ -385,12 +295,6 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
      }
    }, [item?.Id, queryClient]);

-    // Handle local subtitle download - trigger refresh of subtitle tracks
-    const handleLocalSubtitleDownloaded = useCallback((_path: string) => {
-      // Increment the refresh key to trigger re-computation of subtitleTracksForModal
-      setLocalSubtitlesRefreshKey((prev) => prev + 1);
-    }, []);
-
    // Refresh subtitle tracks by fetching fresh item data from Jellyfin
    const refreshSubtitleTracks = useCallback(async (): Promise<Track[]> => {
      if (!api || !item?.Id) return [];
@@ -418,7 +322,7 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
          ) ?? [];

        // Convert to Track[] with setTrack callbacks
-        const tracks: Track[] = streams.map((stream) => ({
+        return streams.map((stream) => ({
          name:
            stream.DisplayTitle ||
            `${stream.Language || "Unknown"} (${stream.Codec})`,
@@ -427,30 +331,6 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
            handleSubtitleChangeRef.current?.(stream.Index ?? -1);
          },
        }));
-
-        // Add locally downloaded subtitles
-        if (item?.Id) {
-          const localSubs = getSubtitlesForItem(item.Id);
-          let localIdx = 0;
-          for (const localSub of localSubs) {
-            const subtitleFile = new File(localSub.filePath);
-            if (!subtitleFile.exists) continue;
-
-            const localIndex = LOCAL_SUBTITLE_INDEX_START - localIdx;
-            tracks.push({
-              name: localSub.name,
-              index: localIndex,
-              isLocal: true,
-              localPath: localSub.filePath,
-              setTrack: () => {
-                handleSubtitleChangeRef.current?.(localIndex);
-              },
-            });
-            localIdx++;
-          }
-        }
-
-        return tracks;
      } catch (error) {
        console.error("Failed to refresh subtitle tracks:", error);
        return [];
@@ -468,30 +348,13 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
    const selectedSubtitleLabel = useMemo(() => {
      if (selectedOptions?.subtitleIndex === -1)
        return t("item_card.subtitles.none");
-
-      // Check if it's a local subtitle (negative index starting at -100)
-      if (
-        selectedOptions?.subtitleIndex !== undefined &&
-        selectedOptions.subtitleIndex <= LOCAL_SUBTITLE_INDEX_START
-      ) {
-        const localTrack = subtitleTracksForModal.find(
-          (t) => t.index === selectedOptions.subtitleIndex,
-        );
-        return localTrack?.name || t("item_card.subtitles.label");
-      }
-
      const track = subtitleStreams.find(
        (t) => t.Index === selectedOptions?.subtitleIndex,
      );
      return (
        track?.DisplayTitle || track?.Language || t("item_card.subtitles.label")
      );
-    }, [
-      subtitleStreams,
-      subtitleTracksForModal,
-      selectedOptions?.subtitleIndex,
-      t,
-    ]);
+    }, [subtitleStreams, selectedOptions?.subtitleIndex, t]);

    const selectedMediaSourceLabel = useMemo(() => {
      const source = selectedOptions?.mediaSource;
@@ -562,6 +425,25 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
      return `${api.basePath}/Items/${item.SeriesId}/Images/Thumb?fillHeight=700&quality=80`;
    }, [api, item]);

+    // Determine which option button is the last one (for focus guide targeting)
+    const lastOptionButton = useMemo(() => {
+      const hasSubtitleOption =
+        subtitleStreams.length > 0 ||
+        selectedOptions?.subtitleIndex !== undefined;
+      const hasAudioOption = audioTracks.length > 0;
+      const hasMediaSourceOption = mediaSources.length > 1;
+
+      if (hasSubtitleOption) return "subtitle";
+      if (hasAudioOption) return "audio";
+      if (hasMediaSourceOption) return "mediaSource";
+      return "quality";
+    }, [
+      subtitleStreams.length,
+      selectedOptions?.subtitleIndex,
+      audioTracks.length,
+      mediaSources.length,
+    ]);
+
    // Navigation handlers
    const handleActorPress = useCallback(
      (personId: string) => {
@@ -587,7 +469,7 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
    const handleEpisodePress = useCallback(
      (episode: BaseItemDto) => {
        const navigation = getItemNavigation(episode, "(home)");
-        router.replace(navigation as any);
+        router.push(navigation as any);
      },
      [router],
    );
@@ -752,24 +634,27 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                  </Text>
                </TVButton>
                <TVFavoriteButton item={item} />
-                <TVPlayedButton item={item} />
                <TVRefreshButton itemId={item.Id} />
              </View>

              {/* Playback options */}
              <View
                style={{
-                  flexDirection: "row",
-                  alignItems: "center",
-                  gap: 12,
+                  flexDirection: "column",
+                  alignItems: "flex-start",
+                  gap: 10,
                  marginBottom: 24,
                }}
              >
                {/* Quality selector */}
                <TVOptionButton
+                  ref={
+                    lastOptionButton === "quality"
+                      ? setLastOptionButtonRef
+                      : undefined
+                  }
                  label={t("item_card.quality")}
                  value={selectedQualityLabel}
-                  maxWidth={200}
                  onPress={() =>
                    showOptions({
                      title: t("item_card.quality"),
@@ -782,9 +667,13 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                {/* Media source selector (only if multiple sources) */}
                {mediaSources.length > 1 && (
                  <TVOptionButton
+                    ref={
+                      lastOptionButton === "mediaSource"
+                        ? setLastOptionButtonRef
+                        : undefined
+                    }
                    label={t("item_card.video")}
                    value={selectedMediaSourceLabel}
-                    maxWidth={280}
                    onPress={() =>
                      showOptions({
                        title: t("item_card.video"),
@@ -798,9 +687,13 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                {/* Audio selector */}
                {audioTracks.length > 0 && (
                  <TVOptionButton
+                    ref={
+                      lastOptionButton === "audio"
+                        ? setLastOptionButtonRef
+                        : undefined
+                    }
                    label={t("item_card.audio")}
                    value={selectedAudioLabel}
-                    maxWidth={280}
                    onPress={() =>
                      showOptions({
                        title: t("item_card.audio"),
@@ -815,9 +708,13 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                {(subtitleStreams.length > 0 ||
                  selectedOptions?.subtitleIndex !== undefined) && (
                  <TVOptionButton
+                    ref={
+                      lastOptionButton === "subtitle"
+                        ? setLastOptionButtonRef
+                        : undefined
+                    }
                    label={t("item_card.subtitles.label")}
                    value={selectedSubtitleLabel}
-                    maxWidth={280}
                    onPress={() =>
                      showSubtitleModal({
                        item,
@@ -828,8 +725,6 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                        onDisableSubtitles: () => handleSubtitleChange(-1),
                        onServerSubtitleDownloaded:
                          handleServerSubtitleDownloaded,
-                        onLocalSubtitleDownloaded:
-                          handleLocalSubtitleDownloaded,
                        refreshSubtitleTracks,
                      })
                    }
@@ -911,14 +806,26 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                  {t("item_card.more_from_this_season")}
                </Text>

-                <TVEpisodeList
-                  episodes={seasonEpisodes}
-                  currentEpisodeId={item.Id}
-                  onEpisodePress={handleEpisodePress}
-                  onEpisodeLongPress={showItemActions}
-                  firstEpisodeRefSetter={setFirstEpisodeRef}
-                  horizontalPadding={insets.left + 80}
-                />
+                <ScrollView
+                  horizontal
+                  showsHorizontalScrollIndicator={false}
+                  style={{ marginHorizontal: -80, overflow: "visible" }}
+                  contentContainerStyle={{
+                    paddingHorizontal: 80,
+                    paddingVertical: 12,
+                    gap: 24,
+                  }}
+                >
+                  {seasonEpisodes.map((episode, index) => (
+                    <TVEpisodeCard
+                      key={episode.Id}
+                      episode={episode}
+                      onPress={() => handleEpisodePress(episode)}
+                      disabled={episode.Id === item.Id}
+                      refSetter={index === 0 ? setFirstEpisodeRef : undefined}
+                    />
+                  ))}
+                </ScrollView>
              </View>
            )}

@@ -938,7 +845,6 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                apiBasePath={api?.basePath}
                onActorPress={handleActorPress}
                firstActorRefSetter={setFirstActorCardRef}
-                horizontalPadding={insets.left + 80}
              />
            )}

--- a/components/PasswordEntryModal.tsx
+++ b/components/PasswordEntryModal.tsx
@@ -128,7 +128,7 @@ export const PasswordEntryModal: React.FC<PasswordEntryModalProps> = ({
          {/* Password Input */}
          <View className='p-4 border border-neutral-800 rounded-xl bg-neutral-900 mb-4'>
            <Text className='text-neutral-400 text-sm mb-2'>
-              {t("login.password_placeholder")}
+              {t("login.password")}
            </Text>
            <BottomSheetTextInput
              value={password}
@@ -136,7 +136,7 @@ export const PasswordEntryModal: React.FC<PasswordEntryModalProps> = ({
                setPassword(text);
                setError(null);
              }}
-              placeholder={t("login.password_placeholder")}
+              placeholder={t("login.password")}
              placeholderTextColor='#6B7280'
              secureTextEntry
              autoFocus
@@ -174,7 +174,7 @@ export const PasswordEntryModal: React.FC<PasswordEntryModalProps> = ({
              {isLoading ? (
                <ActivityIndicator size='small' color='white' />
              ) : (
-                t("common.login")
+                t("login.login")
              )}
            </Button>
          </View>
--- a/components/PlatformDropdown.tsx
+++ b/components/PlatformDropdown.tsx
@@ -1,21 +1,8 @@
-import {
-  Button,
-  Host,
-  Menu,
-  Picker,
-  Text as SwiftUIText,
-} from "@expo/ui/swift-ui";
-import { disabled, tag } from "@expo/ui/swift-ui/modifiers";
+import { Button, ContextMenu, Host, Picker } from "@expo/ui/swift-ui";
 import { Ionicons } from "@expo/vector-icons";
 import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
-import React, { useEffect, useState } from "react";
-import {
-  type LayoutChangeEvent,
-  Platform,
-  StyleSheet,
-  TouchableOpacity,
-  View,
-} from "react-native";
+import React, { useEffect } from "react";
+import { Platform, StyleSheet, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { useGlobalModal } from "@/providers/GlobalModalProvider";
@@ -214,24 +201,6 @@ const PlatformDropdownComponent = ({
 }: PlatformDropdownProps) => {
  const { showModal, hideModal, isVisible } = useGlobalModal();

-  // @expo/ui's <Host> (SDK 55) fills its available space by default, and
-  // `matchContents` doesn't help here: it reports the native Menu's size via
-  // setStyleSize and overrides any explicit size. Instead we measure the
-  // trigger's intrinsic size in plain RN (off-layout) and pin it on the Host.
-  const [triggerSize, setTriggerSize] = useState<{
-    width: number;
-    height: number;
-  } | null>(null);
-
-  const handleMeasureTrigger = (e: LayoutChangeEvent) => {
-    const { width, height } = e.nativeEvent.layout;
-    setTriggerSize((prev) =>
-      prev && prev.width === width && prev.height === height
-        ? prev
-        : { width, height },
-    );
-  };
-
  // Handle controlled open state for Android
  useEffect(() => {
    if (Platform.OS === "android" && controlledOpen === true) {
@@ -263,24 +232,10 @@ const PlatformDropdownComponent = ({

  if (Platform.OS === "ios") {
    return (
-      <View>
-        {/* Hidden measurer: lays the trigger out normally to capture its
-            intrinsic size, which we then pin onto the Host below. */}
-        <View style={StyleSheet.absoluteFill} pointerEvents='none' aria-hidden>
-          <View
-            style={{ alignSelf: "flex-start" }}
-            onLayout={handleMeasureTrigger}
-          >
-            {trigger}
-          </View>
-        </View>
-        <Host
-          style={[
-            triggerSize ?? { opacity: 0 },
-            expoUIConfig?.hostStyle as any,
-          ]}
-        >
-          <Menu label={trigger}>
+      <Host style={expoUIConfig?.hostStyle}>
+        <ContextMenu>
+          <ContextMenu.Trigger>{trigger}</ContextMenu.Trigger>
+          <ContextMenu.Items>
            {groups.flatMap((group, groupIndex) => {
              // Check if this group has radio options
              const radioOptions = group.options.filter(
@@ -299,37 +254,23 @@ const PlatformDropdownComponent = ({
              // Otherwise render as individual buttons
              if (radioOptions.length > 0) {
                if (group.title) {
-                  // Use Picker for grouped options.
-                  // Use the option index (a stable primitive) as the
-                  // tag/selection value and React key. Option `value`s can be
-                  // objects (e.g. bitrate / media source), which collapse to
-                  // "[object Object]" as a key and never match the Picker's
-                  // primitive selection.
-                  const selectedRadioIndex = radioOptions.findIndex(
-                    (opt) => opt.selected,
-                  );
+                  // Use Picker for grouped options
                  items.push(
                    <Picker
                      key={`picker-${groupIndex}`}
                      label={group.title}
-                      selection={
-                        selectedRadioIndex >= 0 ? selectedRadioIndex : undefined
-                      }
-                      onSelectionChange={(index) => {
-                        const selectedOption = radioOptions[index as number];
+                      options={radioOptions.map((opt) => opt.label)}
+                      variant='menu'
+                      selectedIndex={radioOptions.findIndex(
+                        (opt) => opt.selected,
+                      )}
+                      onOptionSelected={(event: any) => {
+                        const index = event.nativeEvent.index;
+                        const selectedOption = radioOptions[index];
                        selectedOption?.onPress();
                        onOptionSelect?.(selectedOption?.value);
                      }}
-                    >
-                      {radioOptions.map((opt, optionIndex) => (
-                        <SwiftUIText
-                          key={`radio-${groupIndex}-${optionIndex}`}
-                          modifiers={[tag(optionIndex)]}
-                        >
-                          {opt.label}
-                        </SwiftUIText>
-                      ))}
-                    </Picker>,
+                    />,
                  );
                } else {
                  // Render radio options as direct buttons
@@ -337,18 +278,17 @@ const PlatformDropdownComponent = ({
                    items.push(
                      <Button
                        key={`radio-${groupIndex}-${optionIndex}`}
-                        label={option.label}
                        systemImage={
                          option.selected ? "checkmark.circle.fill" : "circle"
                        }
-                        modifiers={
-                          option.disabled ? [disabled(true)] : undefined
-                        }
                        onPress={() => {
                          option.onPress();
                          onOptionSelect?.(option.value);
                        }}
-                      />,
+                        disabled={option.disabled}
+                      >
+                        {option.label}
+                      </Button>,
                    );
                  });
                }
@@ -359,16 +299,17 @@ const PlatformDropdownComponent = ({
                items.push(
                  <Button
                    key={`toggle-${groupIndex}-${optionIndex}`}
-                    label={option.label}
                    systemImage={
                      option.value ? "checkmark.circle.fill" : "circle"
                    }
-                    modifiers={option.disabled ? [disabled(true)] : undefined}
                    onPress={() => {
                      option.onToggle();
                      onOptionSelect?.(option.value);
                    }}
-                  />,
+                    disabled={option.disabled}
+                  >
+                    {option.label}
+                  </Button>,
                );
              });

@@ -377,20 +318,21 @@ const PlatformDropdownComponent = ({
                items.push(
                  <Button
                    key={`action-${groupIndex}-${optionIndex}`}
-                    label={option.label}
-                    modifiers={option.disabled ? [disabled(true)] : undefined}
                    onPress={() => {
                      option.onPress();
                    }}
-                  />,
+                    disabled={option.disabled}
+                  >
+                    {option.label}
+                  </Button>,
                );
              });

              return items;
            })}
-          </Menu>
-        </Host>
-      </View>
+          </ContextMenu.Items>
+        </ContextMenu>
+      </Host>
    );
  }

--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -35,9 +35,9 @@ import { useSettings } from "@/utils/atoms/settings";
 import { getParentBackdropImageUrl } from "@/utils/jellyfin/image/getParentBackdropImageUrl";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import { chromecast } from "@/utils/profiles/chromecast";
+import { chromecasth265 } from "@/utils/profiles/chromecasth265";
 import { runtimeTicksToMinutes } from "@/utils/time";
-import { chromecast } from "../utils/profiles/chromecast";
-import { chromecasth265 } from "../utils/profiles/chromecasth265";
 import { Button } from "./Button";
 import { Text } from "./common/Text";
 import type { SelectedOptions } from "./ItemContent";
--- a/components/PlayButton.tv.tsx
+++ b/components/PlayButton.tv.tsx
@@ -69,7 +69,6 @@ export const PlayButton: React.FC<Props> = ({
      subtitleIndex: selectedOptions.subtitleIndex?.toString() ?? "",
      mediaSourceId: selectedOptions.mediaSource?.Id ?? "",
      bitrateValue: selectedOptions.bitrate?.value?.toString() ?? "",
-      playbackPosition: item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
    });

    const queryString = queryParams.toString();
--- a/components/PreviousServersList.tsx
+++ b/components/PreviousServersList.tsx
@@ -73,19 +73,10 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
          setLoadingServer(server.address);
          try {
            await onQuickLogin(server.address, account.userId);
-          } catch (error) {
-            const errorMessage =
-              error instanceof Error
-                ? error.message
-                : t("server.session_expired");
-            const isSessionExpired = errorMessage.includes(
-              t("server.session_expired"),
-            );
+          } catch {
            Alert.alert(
-              isSessionExpired
-                ? t("server.session_expired")
-                : t("login.connection_failed"),
-              isSessionExpired ? t("server.please_login_again") : errorMessage,
+              t("server.session_expired"),
+              t("server.please_login_again"),
              [{ text: t("common.ok"), onPress: () => onServerSelect(server) }],
            );
          } finally {
@@ -131,17 +122,10 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
      setLoadingServer(selectedServer.address);
      try {
        await onQuickLogin(selectedServer.address, selectedAccount.userId);
-      } catch (error) {
-        const errorMessage =
-          error instanceof Error ? error.message : t("server.session_expired");
-        const isSessionExpired = errorMessage.includes(
-          t("server.session_expired"),
-        );
+      } catch {
        Alert.alert(
-          isSessionExpired
-            ? t("server.session_expired")
-            : t("login.connection_failed"),
-          isSessionExpired ? t("server.please_login_again") : errorMessage,
+          t("server.session_expired"),
+          t("server.please_login_again"),
          [
            {
              text: t("common.ok"),
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -2,11 +2,7 @@ import { useActionSheet } from "@expo/react-native-action-sheet";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useSegments } from "expo-router";
 import { type PropsWithChildren, useCallback } from "react";
-import {
-  Platform,
-  TouchableOpacity,
-  type TouchableOpacityProps,
-} from "react-native";
+import { TouchableOpacity, type TouchableOpacityProps } from "react-native";
 import useRouter from "@/hooks/useAppRouter";
 import { useFavorite } from "@/hooks/useFavorite";
 import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
@@ -125,12 +121,6 @@ export const getItemNavigation = (item: BaseItemDto, _from: string) => {
  }

  if (item.Type === "Playlist") {
-    if (Platform.isTV) {
-      return {
-        pathname: "/[libraryId]" as const,
-        params: { libraryId: item.Id! },
-      };
-    }
    return {
      pathname: "/music/playlist/[playlistId]" as const,
      params: { playlistId: item.Id! },
--- a/components/companion/CompanionLoginScreen.tsx
+++ b/components/companion/CompanionLoginScreen.tsx
@@ -1,532 +0,0 @@
-import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  KeyboardAvoidingView,
-  Linking,
-  Platform,
-  ScrollView,
-  TextInput,
-  TouchableOpacity,
-  View,
-} from "react-native";
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import useRouter from "@/hooks/useAppRouter";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { sendCredentialsToTV } from "@/utils/pairingService";
-
-type ScreenState =
-  | "scanning"
-  | "no-permission"
-  | "confirm"
-  | "form"
-  | "sending"
-  | "success"
-  | "error";
-
-interface ParsedPairingCode {
-  code: string;
-}
-
-type ExpoCameraModule = typeof import("expo-camera");
-
-const ExpoCamera: ExpoCameraModule | null = Platform.isTV
-  ? null
-  : require("expo-camera");
-
-export const CompanionLoginScreen: React.FC = () => {
-  const { t } = useTranslation();
-  const router = useRouter();
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const [screenState, setScreenState] = useState<ScreenState>(
-    Platform.isTV ? "form" : "scanning",
-  );
-  const [pairingCode, setPairingCode] = useState<string>("");
-  const [serverUrl, setServerUrl] = useState("");
-  const [username, setUsername] = useState("");
-  const [password, setPassword] = useState("");
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-
-  // Pre-fill server URL and username from current session
-  useEffect(() => {
-    if (api?.basePath) {
-      setServerUrl(api.basePath);
-    }
-
-    if (user?.Name) {
-      setUsername(user.Name);
-    }
-  }, [api?.basePath, user?.Name]);
-
-  // Request camera permission
-  useEffect(() => {
-    if (!ExpoCamera) return;
-
-    ExpoCamera.Camera.getCameraPermissionsAsync().then((response) => {
-      if (!response.granted) {
-        ExpoCamera.Camera.requestCameraPermissionsAsync().then((result) => {
-          if (!result.granted) {
-            setScreenState("no-permission");
-          }
-        });
-      }
-    });
-  }, []);
-
-  const validateAndParseQR = useCallback(
-    (data: string): ParsedPairingCode | null => {
-      try {
-        const parsed = JSON.parse(data);
-
-        if (
-          parsed.action === "streamyfin-pair" &&
-          typeof parsed.code === "string" &&
-          parsed.code.length > 0
-        ) {
-          return { code: parsed.code };
-        }
-
-        return null;
-      } catch {
-        return null;
-      }
-    },
-    [],
-  );
-
-  const handleBarCodeScanned = useCallback(
-    ({ data }: { data: string }) => {
-      if (screenState !== "scanning") return;
-
-      const parsed = validateAndParseQR(data);
-
-      if (!parsed) {
-        setErrorMessage(t("companion_login.error_invalid_qr"));
-        setScreenState("error");
-        return;
-      }
-
-      setPairingCode(parsed.code);
-
-      // If user is logged in, show confirmation screen (still needs password)
-      // Otherwise, go straight to the full form
-      if (user?.Name && api?.basePath) {
-        setScreenState("confirm");
-      } else {
-        setScreenState("form");
-      }
-    },
-    [screenState, validateAndParseQR, t, user?.Name, api?.basePath],
-  );
-
-  const handleSendCredentials = useCallback(async () => {
-    if (
-      !serverUrl.trim() ||
-      !username.trim() ||
-      !password.trim() ||
-      !pairingCode
-    ) {
-      return;
-    }
-
-    setScreenState("sending");
-
-    try {
-      await sendCredentialsToTV(
-        pairingCode,
-        serverUrl.trim(),
-        username.trim(),
-        password,
-      );
-
-      setScreenState("success");
-    } catch {
-      setErrorMessage(t("companion_login.error_generic"));
-      setScreenState("error");
-    }
-  }, [pairingCode, serverUrl, username, password, t]);
-
-  const handleScanAgain = useCallback(() => {
-    setPairingCode("");
-    setErrorMessage(null);
-    setPassword("");
-    setScreenState("scanning");
-  }, []);
-
-  const handleDone = useCallback(() => {
-    router.back();
-  }, [router]);
-
-  const handleUseDifferentUser = useCallback(() => {
-    setUsername("");
-    setPassword("");
-    setScreenState("form");
-  }, []);
-
-  const handleEnterCodeManually = useCallback(() => {
-    setScreenState("form");
-  }, []);
-
-  if (screenState === "no-permission") {
-    return (
-      <View className='flex-1 bg-black'>
-        <View className='flex-1 items-center justify-center p-8'>
-          <Text className='mb-3 text-center text-3xl font-bold text-white'>
-            {t("companion_login.error_permission_denied")}
-          </Text>
-
-          {Platform.OS === "ios" && (
-            <TouchableOpacity
-              onPress={() => Linking.openSettings()}
-              className='mt-4 rounded-lg bg-purple-600 px-6 py-3'
-            >
-              <Text className='text-base font-semibold text-white'>
-                {t("companion_login.open_settings")}
-              </Text>
-            </TouchableOpacity>
-          )}
-
-          <Button
-            onPress={handleDone}
-            color='white'
-            className='mt-4'
-            textClassName='flex-1 text-center'
-          >
-            {t("companion_login.done")}
-          </Button>
-        </View>
-      </View>
-    );
-  }
-
-  if (screenState === "success") {
-    return (
-      <View className='flex-1 bg-black'>
-        <View className='flex-1 items-center justify-center p-8'>
-          <Text className='mb-3 text-center text-3xl font-bold text-white'>
-            {t("companion_login.success_title")}
-          </Text>
-
-          <Text className='mb-8 text-center text-base text-gray-400'>
-            {t("companion_login.pairing_tv_connecting")}
-          </Text>
-
-          <Button
-            onPress={handleDone}
-            color='purple'
-            textClassName='flex-1 text-center'
-          >
-            {t("companion_login.done")}
-          </Button>
-        </View>
-      </View>
-    );
-  }
-
-  if (screenState === "error") {
-    return (
-      <View className='flex-1 bg-black'>
-        <View className='flex-1 items-center justify-center p-8'>
-          <Text className='mb-3 text-center text-3xl font-bold text-white'>
-            {t("companion_login.error_title")}
-          </Text>
-
-          <Text className='mb-8 text-center text-base text-gray-400'>
-            {errorMessage}
-          </Text>
-
-          <View className='mt-4 flex-row gap-3'>
-            <Button
-              onPress={handleScanAgain}
-              color='purple'
-              textClassName='flex-1 text-center'
-            >
-              {t("companion_login.scan_again")}
-            </Button>
-
-            <Button
-              onPress={handleDone}
-              color='white'
-              textClassName='flex-1 text-center'
-            >
-              {t("companion_login.done")}
-            </Button>
-          </View>
-        </View>
-      </View>
-    );
-  }
-
-  if (screenState === "sending") {
-    return (
-      <View className='flex-1 bg-black'>
-        <View className='flex-1 items-center justify-center p-8'>
-          <Text className='text-xl text-white'>
-            {t("companion_login.authorizing")}
-          </Text>
-        </View>
-      </View>
-    );
-  }
-
-  if (screenState === "confirm") {
-    return (
-      <KeyboardAvoidingView
-        className='flex-1 bg-black'
-        behavior={Platform.OS === "ios" ? "padding" : undefined}
-      >
-        <ScrollView
-          contentContainerStyle={{
-            flexGrow: 1,
-            justifyContent: "center",
-            padding: 24,
-          }}
-          keyboardShouldPersistTaps='handled'
-        >
-          <Text className='mb-2 text-center text-2xl font-bold text-white'>
-            {t("companion_login.login_as", { username })}
-          </Text>
-
-          <Text className='mb-8 text-center text-base text-gray-400'>
-            {t("companion_login.on_server", {
-              server: serverUrl.replace(/^https?:\/\//, ""),
-            })}
-          </Text>
-
-          <View className='mb-6 items-center'>
-            <Text className='mb-1 text-sm text-gray-400'>
-              {t("companion_login.pairing_code_label")}
-            </Text>
-
-            <Text className='mb-8 text-center text-4xl font-bold tracking-[6px] text-white'>
-              {pairingCode}
-            </Text>
-          </View>
-
-          <View className='mb-5'>
-            <Text className='mb-2 text-sm text-gray-400'>
-              {t("login.password_placeholder")}
-            </Text>
-
-            <TextInput
-              className='rounded-lg border border-neutral-700 bg-neutral-900 p-3 text-base text-white'
-              value={password}
-              onChangeText={setPassword}
-              placeholder={t("login.password_placeholder")}
-              placeholderTextColor='#6B7280'
-              autoCapitalize='none'
-              autoCorrect={false}
-              secureTextEntry
-              returnKeyType='done'
-              onSubmitEditing={handleSendCredentials}
-              autoFocus
-            />
-          </View>
-
-          <View className='mt-2'>
-            <Button
-              onPress={handleSendCredentials}
-              disabled={!password.trim()}
-              color='purple'
-              textClassName='flex-1 text-center'
-            >
-              {t("companion_login.authorize_button")}
-            </Button>
-          </View>
-
-          <View className='mt-6 items-center'>
-            <TouchableOpacity onPress={handleUseDifferentUser} className='py-2'>
-              <Text className='text-base text-gray-400 underline'>
-                {t("companion_login.use_different_user")}
-              </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity onPress={handleScanAgain} className='py-2'>
-              <Text className='text-sm text-gray-500 underline'>
-                {t("companion_login.scan_again")}
-              </Text>
-            </TouchableOpacity>
-          </View>
-        </ScrollView>
-      </KeyboardAvoidingView>
-    );
-  }
-
-  if (screenState === "form") {
-    return (
-      <KeyboardAvoidingView
-        className='flex-1 bg-black'
-        behavior={Platform.OS === "ios" ? "padding" : undefined}
-      >
-        <ScrollView
-          contentContainerStyle={{
-            flexGrow: 1,
-            justifyContent: "center",
-            padding: 14,
-          }}
-          keyboardShouldPersistTaps='handled'
-        >
-          <Text className='mb-2 text-2xl font-bold text-white'>
-            {t("companion_login.pairing_enter_credentials")}
-          </Text>
-
-          <View className='mb-5'>
-            <Text className='mb-2 text-sm text-gray-400'>
-              {t("companion_login.pairing_code_label")}
-            </Text>
-
-            <TextInput
-              className='rounded-lg border border-neutral-700 bg-neutral-900 p-3 text-center text-2xl font-bold tracking-[6px] text-white'
-              value={pairingCode}
-              onChangeText={setPairingCode}
-              placeholder={t("companion_login.pairing_code_label")}
-              placeholderTextColor='#6B7280'
-              autoCapitalize='characters'
-              autoCorrect={false}
-              returnKeyType='next'
-            />
-          </View>
-
-          <View className='mb-5'>
-            <Text className='mb-2 text-sm text-gray-400'>
-              {t("companion_login.server")}
-            </Text>
-
-            <TextInput
-              className='rounded-lg border border-neutral-700 bg-neutral-900 p-3 text-base text-white'
-              value={serverUrl}
-              onChangeText={setServerUrl}
-              placeholder={t("server.server_url_placeholder")}
-              placeholderTextColor='#6B7280'
-              autoCapitalize='none'
-              autoCorrect={false}
-              keyboardType='url'
-              returnKeyType='next'
-            />
-          </View>
-
-          <View className='mb-5'>
-            <Text className='mb-2 text-sm text-gray-400'>
-              {t("login.username_placeholder")}
-            </Text>
-
-            <TextInput
-              className='rounded-lg border border-neutral-700 bg-neutral-900 p-3 text-base text-white'
-              value={username}
-              onChangeText={setUsername}
-              placeholder={t("login.username_placeholder")}
-              placeholderTextColor='#6B7280'
-              autoCapitalize='none'
-              autoCorrect={false}
-              returnKeyType='next'
-            />
-          </View>
-
-          <View className='mb-5'>
-            <Text className='mb-2 text-sm text-gray-400'>
-              {t("login.password_placeholder")}
-            </Text>
-
-            <TextInput
-              className='rounded-lg border border-neutral-700 bg-neutral-900 p-3 text-base text-white'
-              value={password}
-              onChangeText={setPassword}
-              placeholder={t("login.password_placeholder")}
-              placeholderTextColor='#6B7280'
-              autoCapitalize='none'
-              autoCorrect={false}
-              secureTextEntry
-              returnKeyType='done'
-              onSubmitEditing={handleSendCredentials}
-            />
-          </View>
-
-          <View className='flex-row justify-center gap-3'>
-            <Button
-              onPress={handleScanAgain}
-              color='black'
-              className='w-40 border border-neutral-700 bg-neutral-800'
-              textClassName='flex-1 text-center'
-            >
-              {t("companion_login.scan_again")}
-            </Button>
-
-            <Button
-              onPress={handleSendCredentials}
-              disabled={
-                !serverUrl.trim() ||
-                !username.trim() ||
-                !password.trim() ||
-                !pairingCode.trim()
-              }
-              className='w-40'
-              color='purple'
-              textClassName='flex-1 text-center'
-            >
-              {t("companion_login.authorize_button")}
-            </Button>
-          </View>
-        </ScrollView>
-      </KeyboardAvoidingView>
-    );
-  }
-
-  const CameraView = ExpoCamera?.CameraView;
-
-  if (!CameraView) {
-    return (
-      <View className='flex-1 bg-black items-center justify-center p-8'>
-        <Button
-          onPress={handleEnterCodeManually}
-          color='purple'
-          textClassName='flex-1 text-center'
-        >
-          {t("companion_login.enter_code_manually")}
-        </Button>
-      </View>
-    );
-  }
-
-  return (
-    <View className='flex-1 bg-black items-center justify-center'>
-      {/* Camera full screen */}
-      <CameraView
-        style={{
-          position: "absolute",
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0,
-        }}
-        onBarcodeScanned={handleBarCodeScanned}
-        barcodeScannerSettings={{
-          barcodeTypes: ["qr"],
-        }}
-      />
-
-      {/* Dark overlay */}
-      <View className='absolute inset-0 bg-black/60' />
-
-      {/* Center scan area */}
-      <View className='items-center'>
-        <View className='h-[250px] w-[250px] rounded-2xl border-2 border-white/80' />
-
-        <Text className='mt-6 text-center text-base text-white'>
-          {t("companion_login.align_qr")}
-        </Text>
-
-        <TouchableOpacity
-          onPress={handleEnterCodeManually}
-          className='mt-4 px-5 py-2'
-        >
-          <Text className='text-sm text-gray-400 underline'>
-            {t("companion_login.enter_code_manually")}
-          </Text>
-        </TouchableOpacity>
-      </View>
-    </View>
-  );
-};
--- a/components/home/Favorites.tv.tsx
+++ b/components/home/Favorites.tv.tsx
@@ -178,6 +178,8 @@ export const Favorites = () => {
      contentContainerStyle={{
        paddingTop: insets.top + TOP_PADDING,
        paddingBottom: insets.bottom + 60,
+        paddingLeft: insets.left + HORIZONTAL_PADDING,
+        paddingRight: insets.right + HORIZONTAL_PADDING,
      }}
    >
      <View style={{ gap: SECTION_GAP }}>
--- a/components/home/Home.tv.tsx
+++ b/components/home/Home.tv.tsx
@@ -36,21 +36,14 @@ import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useNetworkStatus } from "@/hooks/useNetworkStatus";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
-import {
-  apiAtom,
-  cacheVersionAtom,
-  userAtom,
-} from "@/providers/JellyfinProvider";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
-import { scaleSize } from "@/utils/scaleSize";
-import { updateTVDiscovery } from "@/utils/tvDiscovery/sync";

-const HORIZONTAL_PADDING = scaleSize(60);
-const TOP_PADDING = scaleSize(100);
+const HORIZONTAL_PADDING = 60;
+const TOP_PADDING = 100;
 // Generous gap between sections for Apple TV+ aesthetic
-const SECTION_GAP = scaleSize(24);
+const SECTION_GAP = 24;

 type InfiniteScrollingCollectionListSection = {
  type: "InfiniteScrollingCollectionList";
@@ -59,6 +52,7 @@ type InfiniteScrollingCollectionListSection = {
  queryFn: QueryFunction<BaseItemDto[], any, number>;
  orientation?: "horizontal" | "vertical";
  pageSize?: number;
+  priority?: 1 | 2;
  parentId?: string;
 };

@@ -73,7 +67,6 @@ export const Home = () => {
  const { t } = useTranslation();
  const api = useAtomValue(apiAtom);
  const user = useAtomValue(userAtom);
-  const cacheVersion = useAtomValue(cacheVersionAtom);
  const insets = useSafeAreaInsets();
  const { settings } = useSettings();
  const scrollRef = useRef<ScrollView>(null);
@@ -84,7 +77,7 @@ export const Home = () => {
    retryCheck,
  } = useNetworkStatus();
  const _invalidateCache = useInvalidatePlaybackProgressCache();
-  const { showItemActions } = useTVItemActionModal();
+  const [loadedSections, setLoadedSections] = useState<Set<string>>(new Set());

  // Dynamic backdrop state with debounce
  const [focusedItem, setFocusedItem] = useState<BaseItemDto | null>(null);
@@ -257,25 +250,13 @@ export const Home = () => {
        deduped.push(item);
      }

-      return deduped.slice(0, 15);
+      return deduped.slice(0, 8);
    },
    enabled: !!api && !!user?.Id,
    staleTime: 60 * 1000,
    refetchInterval: 60 * 1000,
  });

-  useEffect(() => {
-    updateTVDiscovery({
-      api,
-      sections: [
-        {
-          title: t("home.continue_and_next_up"),
-          items: heroItems,
-        },
-      ],
-    });
-  }, [api, heroItems, t]);
-
  const userViews = useMemo(
    () => data?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)),
    [data, settings?.hiddenLibraries],
@@ -400,6 +381,7 @@ export const Home = () => {
            type: "InfiniteScrollingCollectionList",
            orientation: "horizontal",
            pageSize: 10,
+            priority: 1,
          },
        ]
      : [
@@ -419,6 +401,7 @@ export const Home = () => {
            type: "InfiniteScrollingCollectionList",
            orientation: "horizontal",
            pageSize: 10,
+            priority: 1,
          },
          {
            title: t("home.next_up"),
@@ -436,12 +419,13 @@ export const Home = () => {
            type: "InfiniteScrollingCollectionList",
            orientation: "horizontal",
            pageSize: 10,
+            priority: 1,
          },
        ];

    const ss: Section[] = [
      ...firstSections,
-      ...latestMediaViews,
+      ...latestMediaViews.map((s) => ({ ...s, priority: 2 as const })),
      ...(!settings?.streamyStatsMovieRecommendations
        ? [
            {
@@ -460,6 +444,7 @@ export const Home = () => {
              type: "InfiniteScrollingCollectionList" as const,
              orientation: "vertical" as const,
              pageSize: 10,
+              priority: 2 as const,
            },
          ]
        : []),
@@ -544,6 +529,7 @@ export const Home = () => {
        type: "InfiniteScrollingCollectionList",
        orientation: section?.orientation || "vertical",
        pageSize,
+        priority: index < 2 ? 1 : 2,
      });
    });
    return ss;
@@ -551,21 +537,23 @@ export const Home = () => {

  const sections = settings?.home?.sections ? customSections : defaultSections;

-  // Determine if hero should be shown (separate setting from backdrop)
-  // We need this early to calculate which sections will actually be rendered
-  const showHero = useMemo(() => {
-    return heroItems && heroItems.length > 0 && settings.showTVHeroCarousel;
-  }, [heroItems, settings.showTVHeroCarousel]);
+  const highPrioritySectionKeys = useMemo(() => {
+    return sections
+      .filter((s) => s.priority === 1)
+      .map((s) => s.queryKey.join("-"));
+  }, [sections]);

-  // Get sections that will actually be rendered (accounting for hero slicing)
-  // When hero is shown, skip the first sections since hero already displays that content
-  // - If mergeNextUpAndContinueWatching: skip 1 section (combined Continue & Next Up)
-  // - Otherwise: skip 2 sections (separate Continue Watching + Next Up)
-  const renderedSections = useMemo(() => {
-    if (!showHero) return sections;
-    const sectionsToSkip = settings.mergeNextUpAndContinueWatching ? 1 : 2;
-    return sections.slice(sectionsToSkip);
-  }, [sections, showHero, settings.mergeNextUpAndContinueWatching]);
+  const allHighPriorityLoaded = useMemo(() => {
+    return highPrioritySectionKeys.every((key) => loadedSections.has(key));
+  }, [highPrioritySectionKeys, loadedSections]);
+
+  const markSectionLoaded = useCallback(
+    (queryKey: (string | undefined | null)[]) => {
+      const key = queryKey.join("-");
+      setLoadedSections((prev) => new Set(prev).add(key));
+    },
+    [],
+  );

  if (!isConnected || serverConnected !== true) {
    let title = "";
@@ -673,8 +661,12 @@ export const Home = () => {
      </View>
    );

+  // Determine if hero should be shown (separate setting from backdrop)
+  const showHero =
+    heroItems && heroItems.length > 0 && settings.showTVHeroCarousel;
+
  return (
-    <View key={cacheVersion} style={{ flex: 1, backgroundColor: "#000000" }}>
+    <View style={{ flex: 1, backgroundColor: "#000000" }}>
      {/* Dynamic backdrop with crossfade - only shown when hero is disabled */}
      {!showHero && settings.showHomeBackdrop && (
        <View
@@ -745,29 +737,28 @@ export const Home = () => {
        }}
      >
        {/* Hero Carousel - Apple TV+ style featured content */}
-        {showHero && heroItems && (
-          <TVHeroCarousel
-            items={heroItems}
-            onItemFocus={handleItemFocus}
-            onItemLongPress={showItemActions}
-          />
+        {showHero && (
+          <TVHeroCarousel items={heroItems} onItemFocus={handleItemFocus} />
        )}

        <View
          style={{
            gap: SECTION_GAP,
+            paddingHorizontal: insets.left + HORIZONTAL_PADDING,
            paddingTop: showHero ? SECTION_GAP : 0,
          }}
        >
          {/* Skip first section (Continue Watching) when hero is shown since hero displays that content */}
-          {renderedSections.map((section, index) => {
+          {sections.slice(showHero ? 1 : 0).map((section, index) => {
            // Render Streamystats sections after Recently Added sections
            // For default sections: place after Recently Added, before Suggested Movies (if present)
            // For custom sections: place at the very end
            const hasSuggestedMovies =
              !settings?.streamyStatsMovieRecommendations &&
              !settings?.home?.sections;
-            const displayedSectionsLength = renderedSections.length;
+            // Adjust index calculation to account for sliced array when hero is shown
+            const displayedSectionsLength =
+              sections.length - (showHero ? 1 : 0);
            const streamystatsIndex =
              displayedSectionsLength - 1 - (hasSuggestedMovies ? 1 : 0);
            const hasStreamystatsContent =
@@ -783,6 +774,7 @@ export const Home = () => {
                        "home.settings.plugins.streamystats.recommended_movies",
                      )}
                      type='Movie'
+                      enabled={allHighPriorityLoaded}
                      onItemFocus={handleItemFocus}
                    />
                  )}
@@ -792,11 +784,13 @@ export const Home = () => {
                        "home.settings.plugins.streamystats.recommended_series",
                      )}
                      type='Series'
+                      enabled={allHighPriorityLoaded}
                      onItemFocus={handleItemFocus}
                    />
                  )}
                  {settings.streamyStatsPromotedWatchlists && (
                    <StreamystatsPromotedWatchlists
+                      enabled={allHighPriorityLoaded}
                      onItemFocus={handleItemFocus}
                    />
                  )}
@@ -804,6 +798,7 @@ export const Home = () => {
              ) : null;

            if (section.type === "InfiniteScrollingCollectionList") {
+              const isHighPriority = section.priority === 1;
              // First section only gets preferred focus if hero is not shown
              const isFirstSection = index === 0 && !showHero;
              return (
@@ -815,6 +810,12 @@ export const Home = () => {
                    orientation={section.orientation}
                    hideIfEmpty
                    pageSize={section.pageSize}
+                    enabled={isHighPriority || allHighPriorityLoaded}
+                    onLoaded={
+                      isHighPriority
+                        ? () => markSectionLoaded(section.queryKey)
+                        : undefined
+                    }
                    isFirstSection={isFirstSection}
                    onItemFocus={handleItemFocus}
                    parentId={section.parentId}
--- a/components/home/InfiniteScrollingCollectionList.tv.tsx
+++ b/components/home/InfiniteScrollingCollectionList.tv.tsx
@@ -6,7 +6,7 @@ import {
  useInfiniteQuery,
 } from "@tanstack/react-query";
 import { useSegments } from "expo-router";
-import { useCallback, useMemo, useRef } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
@@ -16,18 +16,21 @@ import {
 } from "react-native";
 import { Text } from "@/components/common/Text";
 import { getItemNavigation } from "@/components/common/TouchableItemRouter";
+import MoviePoster, {
+  TV_POSTER_WIDTH,
+} from "@/components/posters/MoviePoster.tv";
 import { TVFocusablePoster } from "@/components/tv/TVFocusablePoster";
-import { TVPosterCard } from "@/components/tv/TVPosterCard";
-import { useScaledTVPosterSizes } from "@/constants/TVPosterSizes";
-import { useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { SortByOption, SortOrderOption } from "@/utils/atoms/filters";
-import { scaleSize } from "@/utils/scaleSize";
+import ContinueWatchingPoster, {
+  TV_LANDSCAPE_WIDTH,
+} from "../ContinueWatchingPoster.tv";
+import SeriesPoster from "../posters/SeriesPoster.tv";

+const ITEM_GAP = 24;
 // Extra padding to accommodate scale animation (1.05x) and glow shadow
-const _SCALE_PADDING = scaleSize(20);
+const SCALE_PADDING = 20;

 interface Props extends ViewProps {
  title?: string | null;
@@ -39,13 +42,64 @@ interface Props extends ViewProps {
  pageSize?: number;
  onPressSeeAll?: () => void;
  enabled?: boolean;
+  onLoaded?: () => void;
  isFirstSection?: boolean;
  onItemFocus?: (item: BaseItemDto) => void;
  parentId?: string;
 }

 type Typography = ReturnType<typeof useScaledTVTypography>;
-type PosterSizes = ReturnType<typeof useScaledTVPosterSizes>;
+
+// TV-specific ItemCardText with larger fonts
+const TVItemCardText: React.FC<{
+  item: BaseItemDto;
+  typography: Typography;
+}> = ({ item, typography }) => {
+  return (
+    <View style={{ marginTop: 12, flexDirection: "column" }}>
+      {item.Type === "Episode" ? (
+        <>
+          <Text
+            numberOfLines={1}
+            style={{ fontSize: typography.callout, color: "#FFFFFF" }}
+          >
+            {item.Name}
+          </Text>
+          <Text
+            numberOfLines={1}
+            style={{
+              fontSize: typography.callout,
+              color: "#9CA3AF",
+              marginTop: 2,
+            }}
+          >
+            {`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`}
+            {" - "}
+            {item.SeriesName}
+          </Text>
+        </>
+      ) : (
+        <>
+          <Text
+            numberOfLines={1}
+            style={{ fontSize: typography.callout, color: "#FFFFFF" }}
+          >
+            {item.Name}
+          </Text>
+          <Text
+            style={{
+              fontSize: typography.callout,
+              color: "#9CA3AF",
+              marginTop: 2,
+            }}
+          >
+            {item.ProductionYear}
+          </Text>
+        </>
+      )}
+    </View>
+  );
+};

 // TV-specific "See All" card for end of lists
 const TVSeeAllCard: React.FC<{
@@ -55,19 +109,10 @@ const TVSeeAllCard: React.FC<{
  onFocus?: () => void;
  onBlur?: () => void;
  typography: Typography;
-  posterSizes: PosterSizes;
-}> = ({
-  onPress,
-  orientation,
-  disabled,
-  onFocus,
-  onBlur,
-  typography,
-  posterSizes,
-}) => {
+}> = ({ onPress, orientation, disabled, onFocus, onBlur, typography }) => {
  const { t } = useTranslation();
  const width =
-    orientation === "horizontal" ? posterSizes.episode : posterSizes.poster;
+    orientation === "horizontal" ? TV_LANDSCAPE_WIDTH : TV_POSTER_WIDTH;
  const aspectRatio = orientation === "horizontal" ? 16 / 9 : 10 / 15;

  return (
@@ -82,7 +127,7 @@ const TVSeeAllCard: React.FC<{
          style={{
            width,
            aspectRatio,
-            borderRadius: scaleSize(24),
+            borderRadius: 24,
            backgroundColor: "rgba(255, 255, 255, 0.08)",
            justifyContent: "center",
            alignItems: "center",
@@ -92,9 +137,9 @@ const TVSeeAllCard: React.FC<{
        >
          <Ionicons
            name='arrow-forward'
-            size={scaleSize(32)}
+            size={32}
            color='white'
-            style={{ marginBottom: scaleSize(8) }}
+            style={{ marginBottom: 8 }}
          />
          <Text
            style={{
@@ -120,49 +165,71 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
  hideIfEmpty = false,
  pageSize = 10,
  enabled = true,
+  onLoaded,
  isFirstSection = false,
  onItemFocus,
  parentId,
  ...props
 }) => {
  const typography = useScaledTVTypography();
-  const posterSizes = useScaledTVPosterSizes();
-  const sizes = useScaledTVSizes();
-  const ITEM_GAP = sizes.gaps.item;
  const effectivePageSize = Math.max(1, pageSize);
+  const hasCalledOnLoaded = useRef(false);
  const router = useRouter();
-  const { showItemActions } = useTVItemActionModal();
  const segments = useSegments();
  const from = (segments as string[])[2] || "(home)";

+  // Track focus within section for item focus/blur callbacks
  const flatListRef = useRef<FlatList<BaseItemDto>>(null);
+  const [_focusedCount, setFocusedCount] = useState(0);

-  // Pass through focus callbacks without tracking internal state
  const handleItemFocus = useCallback(
    (item: BaseItemDto) => {
+      setFocusedCount((c) => c + 1);
      onItemFocus?.(item);
    },
    [onItemFocus],
  );

-  const { data, isLoading, isFetchingNextPage, hasNextPage, fetchNextPage } =
-    useInfiniteQuery({
-      queryKey: queryKey,
-      queryFn: ({ pageParam = 0, ...context }) =>
-        queryFn({ ...context, queryKey, pageParam }),
-      getNextPageParam: (lastPage, allPages) => {
-        if (lastPage.length < effectivePageSize) {
-          return undefined;
-        }
-        return allPages.reduce((acc, page) => acc + page.length, 0);
-      },
-      initialPageParam: 0,
-      staleTime: 60 * 1000,
-      refetchInterval: 60 * 1000,
-      refetchOnWindowFocus: false,
-      refetchOnReconnect: true,
-      enabled,
-    });
+  const handleItemBlur = useCallback(() => {
+    setFocusedCount((c) => Math.max(0, c - 1));
+  }, []);
+
+  // Focus handler for See All card (doesn't need item parameter)
+  const handleSeeAllFocus = useCallback(() => {
+    setFocusedCount((c) => c + 1);
+  }, []);
+
+  const {
+    data,
+    isLoading,
+    isFetchingNextPage,
+    hasNextPage,
+    fetchNextPage,
+    isSuccess,
+  } = useInfiniteQuery({
+    queryKey: queryKey,
+    queryFn: ({ pageParam = 0, ...context }) =>
+      queryFn({ ...context, queryKey, pageParam }),
+    getNextPageParam: (lastPage, allPages) => {
+      if (lastPage.length < effectivePageSize) {
+        return undefined;
+      }
+      return allPages.reduce((acc, page) => acc + page.length, 0);
+    },
+    initialPageParam: 0,
+    staleTime: 60 * 1000,
+    refetchInterval: 60 * 1000,
+    refetchOnWindowFocus: false,
+    refetchOnReconnect: true,
+    enabled,
+  });
+
+  useEffect(() => {
+    if (isSuccess && !hasCalledOnLoaded.current && onLoaded) {
+      hasCalledOnLoaded.current = true;
+      onLoaded();
+    }
+  }, [isSuccess, onLoaded]);

  const { t } = useTranslation();

@@ -183,7 +250,7 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
  }, [data]);

  const itemWidth =
-    orientation === "horizontal" ? posterSizes.episode : posterSizes.poster;
+    orientation === "horizontal" ? TV_LANDSCAPE_WIDTH : TV_POSTER_WIDTH;

  const handleItemPress = useCallback(
    (item: BaseItemDto) => {
@@ -211,21 +278,79 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
    } as any);
  }, [router, parentId]);

+  const getItemLayout = useCallback(
+    (_data: ArrayLike<BaseItemDto> | null | undefined, index: number) => ({
+      length: itemWidth + ITEM_GAP,
+      offset: (itemWidth + ITEM_GAP) * index,
+      index,
+    }),
+    [itemWidth],
+  );
+
  const renderItem = useCallback(
    ({ item, index }: { item: BaseItemDto; index: number }) => {
      const isFirstItem = isFirstSection && index === 0;
+      const isHorizontal = orientation === "horizontal";
+
+      const renderPoster = () => {
+        if (item.Type === "Episode" && isHorizontal) {
+          return <ContinueWatchingPoster item={item} />;
+        }
+        if (item.Type === "Episode" && !isHorizontal) {
+          return <SeriesPoster item={item} />;
+        }
+        if (item.Type === "Movie" && isHorizontal) {
+          return <ContinueWatchingPoster item={item} />;
+        }
+        if (item.Type === "Movie" && !isHorizontal) {
+          return <MoviePoster item={item} />;
+        }
+        if (item.Type === "Series" && !isHorizontal) {
+          return <SeriesPoster item={item} />;
+        }
+        if (item.Type === "Series" && isHorizontal) {
+          return <ContinueWatchingPoster item={item} />;
+        }
+        if (item.Type === "Program") {
+          return <ContinueWatchingPoster item={item} />;
+        }
+        if (item.Type === "BoxSet" && !isHorizontal) {
+          return <MoviePoster item={item} />;
+        }
+        if (item.Type === "BoxSet" && isHorizontal) {
+          return <ContinueWatchingPoster item={item} />;
+        }
+        if (item.Type === "Playlist" && !isHorizontal) {
+          return <MoviePoster item={item} />;
+        }
+        if (item.Type === "Playlist" && isHorizontal) {
+          return <ContinueWatchingPoster item={item} />;
+        }
+        if (item.Type === "Video" && !isHorizontal) {
+          return <MoviePoster item={item} />;
+        }
+        if (item.Type === "Video" && isHorizontal) {
+          return <ContinueWatchingPoster item={item} />;
+        }
+        // Default fallback
+        return isHorizontal ? (
+          <ContinueWatchingPoster item={item} />
+        ) : (
+          <MoviePoster item={item} />
+        );
+      };

      return (
-        <View style={{ marginRight: ITEM_GAP }}>
-          <TVPosterCard
-            item={item}
-            orientation={orientation}
+        <View style={{ marginRight: ITEM_GAP, width: itemWidth }}>
+          <TVFocusablePoster
            onPress={() => handleItemPress(item)}
-            onLongPress={() => showItemActions(item)}
            hasTVPreferredFocus={isFirstItem}
            onFocus={() => handleItemFocus(item)}
-            width={itemWidth}
-          />
+            onBlur={handleItemBlur}
+          >
+            {renderPoster()}
+          </TVFocusablePoster>
+          <TVItemCardText item={item} typography={typography} />
        </View>
      );
    },
@@ -234,9 +359,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
      isFirstSection,
      itemWidth,
      handleItemPress,
-      showItemActions,
      handleItemFocus,
-      ITEM_GAP,
+      handleItemBlur,
+      typography,
    ],
  );

@@ -251,8 +376,8 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
          fontSize: typography.heading,
          fontWeight: "700",
          color: "#FFFFFF",
-          marginBottom: scaleSize(20),
-          marginLeft: sizes.padding.horizontal,
+          marginBottom: 20,
+          marginLeft: SCALE_PADDING,
          letterSpacing: 0.5,
        }}
      >
@@ -264,7 +389,7 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
          style={{
            color: "#737373",
            fontSize: typography.callout,
-            marginLeft: sizes.padding.horizontal,
+            marginLeft: SCALE_PADDING,
          }}
        >
          {t("home.no_items")}
@@ -276,9 +401,8 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
          style={{
            flexDirection: "row",
            gap: ITEM_GAP,
-            paddingLeft: sizes.padding.horizontal,
-            paddingRight: sizes.padding.horizontal,
-            paddingVertical: sizes.gaps.small,
+            paddingHorizontal: SCALE_PADDING,
+            paddingVertical: SCALE_PADDING,
          }}
        >
          {[1, 2, 3, 4, 5].map((i) => (
@@ -288,13 +412,12 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
                  backgroundColor: "#262626",
                  width: itemWidth,
                  aspectRatio: orientation === "horizontal" ? 16 / 9 : 10 / 15,
-                  borderRadius: scaleSize(24),
+                  borderRadius: 12,
+                  marginBottom: 8,
                }}
              />
              <View
                style={{
-                  marginTop: scaleSize(12),
-                  paddingHorizontal: scaleSize(4),
                  borderRadius: 6,
                  overflow: "hidden",
                  marginBottom: 4,
@@ -330,29 +453,18 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
          maxToRenderPerBatch={3}
          windowSize={5}
          removeClippedSubviews={false}
+          getItemLayout={getItemLayout}
          maintainVisibleContentPosition={{ minIndexForVisible: 0 }}
          style={{ overflow: "visible" }}
          contentContainerStyle={{
-            paddingVertical: sizes.gaps.small,
-            paddingLeft: sizes.padding.horizontal,
-            paddingRight: sizes.padding.horizontal,
+            paddingVertical: SCALE_PADDING,
+            paddingHorizontal: SCALE_PADDING,
          }}
-          // Below is a work around with the contentInset, same in TVHeroCarousel, if okay on apple remove
-          // ListHeaderComponent={
-          //   <View style={{ width: sizes.padding.horizontal }} />
-          // }
-          // contentInset={{
-          //   left: sizes.padding.horizontal,
-          //   right: sizes.padding.horizontal,
-          // }}
-          // contentOffset={{ x: -sizes.padding.horizontal, y: 0 }}
-          // contentContainerStyle={{ paddingVertical: SCALE_PADDING }}
          ListFooterComponent={
            <View
              style={{
                flexDirection: "row",
                alignItems: "center",
-                width: sizes.padding.horizontal,
              }}
            >
              {isFetchingNextPage && (
@@ -361,10 +473,7 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
                    marginLeft: itemWidth / 2,
                    marginRight: ITEM_GAP,
                    justifyContent: "center",
-                    height:
-                      orientation === "horizontal"
-                        ? scaleSize(191)
-                        : scaleSize(315),
+                    height: orientation === "horizontal" ? 191 : 315,
                  }}
                >
                  <ActivityIndicator size='small' color='white' />
@@ -375,8 +484,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
                  onPress={handleSeeAllPress}
                  orientation={orientation}
                  disabled={disabled}
+                  onFocus={handleSeeAllFocus}
+                  onBlur={handleItemBlur}
                  typography={typography}
-                  posterSizes={posterSizes}
                />
              )}
            </View>
--- a/components/home/StreamystatsPromotedWatchlists.tv.tsx
+++ b/components/home/StreamystatsPromotedWatchlists.tv.tsx
@@ -11,19 +11,47 @@ import { FlatList, View, type ViewProps } from "react-native";

 import { Text } from "@/components/common/Text";
 import { getItemNavigation } from "@/components/common/TouchableItemRouter";
-import { TVPosterCard } from "@/components/tv/TVPosterCard";
-import { useScaledTVPosterSizes } from "@/constants/TVPosterSizes";
-import { useScaledTVSizes } from "@/constants/TVSizes";
+import MoviePoster, {
+  TV_POSTER_WIDTH,
+} from "@/components/posters/MoviePoster.tv";
+import SeriesPoster from "@/components/posters/SeriesPoster.tv";
+import { TVFocusablePoster } from "@/components/tv/TVFocusablePoster";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
-import { scaleSize } from "@/utils/scaleSize";
 import { createStreamystatsApi } from "@/utils/streamystats/api";
 import type { StreamystatsWatchlist } from "@/utils/streamystats/types";

-const SCALE_PADDING = scaleSize(20);
+const ITEM_GAP = 16;
+const SCALE_PADDING = 20;
+
+type Typography = ReturnType<typeof useScaledTVTypography>;
+
+const TVItemCardText: React.FC<{
+  item: BaseItemDto;
+  typography: Typography;
+}> = ({ item, typography }) => {
+  return (
+    <View style={{ marginTop: 12, flexDirection: "column" }}>
+      <Text
+        numberOfLines={1}
+        style={{ fontSize: typography.callout, color: "#FFFFFF" }}
+      >
+        {item.Name}
+      </Text>
+      <Text
+        style={{
+          fontSize: typography.callout,
+          color: "#9CA3AF",
+          marginTop: 2,
+        }}
+      >
+        {item.ProductionYear}
+      </Text>
+    </View>
+  );
+};

 interface WatchlistSectionProps extends ViewProps {
  watchlist: StreamystatsWatchlist;
@@ -38,14 +66,10 @@ const WatchlistSection: React.FC<WatchlistSectionProps> = ({
  ...props
 }) => {
  const typography = useScaledTVTypography();
-  const posterSizes = useScaledTVPosterSizes();
-  const sizes = useScaledTVSizes();
-  const ITEM_GAP = sizes.gaps.item;
  const api = useAtomValue(apiAtom);
  const user = useAtomValue(userAtom);
  const { settings } = useSettings();
  const router = useRouter();
-  const { showItemActions } = useTVItemActionModal();
  const segments = useSegments();
  const from = (segments as string[])[2] || "(home)";

@@ -105,35 +129,30 @@ const WatchlistSection: React.FC<WatchlistSectionProps> = ({

  const getItemLayout = useCallback(
    (_data: ArrayLike<BaseItemDto> | null | undefined, index: number) => ({
-      length: posterSizes.poster + ITEM_GAP,
-      offset: (posterSizes.poster + ITEM_GAP) * index,
+      length: TV_POSTER_WIDTH + ITEM_GAP,
+      offset: (TV_POSTER_WIDTH + ITEM_GAP) * index,
      index,
    }),
-    [posterSizes.poster, ITEM_GAP],
+    [],
  );

  const renderItem = useCallback(
    ({ item }: { item: BaseItemDto }) => {
      return (
-        <View style={{ marginRight: ITEM_GAP }}>
-          <TVPosterCard
-            item={item}
-            orientation='vertical'
+        <View style={{ marginRight: ITEM_GAP, width: TV_POSTER_WIDTH }}>
+          <TVFocusablePoster
            onPress={() => handleItemPress(item)}
-            onLongPress={() => showItemActions(item)}
            onFocus={() => onItemFocus?.(item)}
-            width={posterSizes.poster}
-          />
+            hasTVPreferredFocus={false}
+          >
+            {item.Type === "Movie" && <MoviePoster item={item} />}
+            {item.Type === "Series" && <SeriesPoster item={item} />}
+          </TVFocusablePoster>
+          <TVItemCardText item={item} typography={typography} />
        </View>
      );
    },
-    [
-      ITEM_GAP,
-      posterSizes.poster,
-      handleItemPress,
-      showItemActions,
-      onItemFocus,
-    ],
+    [handleItemPress, onItemFocus, typography],
  );

  if (!isLoading && (!items || items.length === 0)) return null;
@@ -146,7 +165,7 @@ const WatchlistSection: React.FC<WatchlistSectionProps> = ({
          fontWeight: "700",
          color: "#FFFFFF",
          marginBottom: 20,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
          letterSpacing: 0.5,
        }}
      >
@@ -158,43 +177,21 @@ const WatchlistSection: React.FC<WatchlistSectionProps> = ({
          style={{
            flexDirection: "row",
            gap: ITEM_GAP,
-            paddingLeft: sizes.padding.horizontal,
-            paddingRight: sizes.padding.horizontal,
+            paddingHorizontal: SCALE_PADDING,
            paddingVertical: SCALE_PADDING,
          }}
        >
          {[1, 2, 3, 4, 5].map((i) => (
-            <View key={i} style={{ width: posterSizes.poster }}>
+            <View key={i} style={{ width: TV_POSTER_WIDTH }}>
              <View
                style={{
                  backgroundColor: "#262626",
-                  width: posterSizes.poster,
+                  width: TV_POSTER_WIDTH,
                  aspectRatio: 10 / 15,
-                  borderRadius: scaleSize(24),
+                  borderRadius: 12,
+                  marginBottom: 8,
                }}
              />
-              <View
-                style={{
-                  marginTop: scaleSize(12),
-                  paddingHorizontal: scaleSize(4),
-                  borderRadius: 6,
-                  overflow: "hidden",
-                  marginBottom: 4,
-                  alignSelf: "flex-start",
-                }}
-              >
-                <Text
-                  style={{
-                    color: "#262626",
-                    backgroundColor: "#262626",
-                    borderRadius: 6,
-                    fontSize: typography.callout,
-                  }}
-                  numberOfLines={1}
-                >
-                  Placeholder text here
-                </Text>
-              </View>
            </View>
          ))}
        </View>
@@ -211,13 +208,9 @@ const WatchlistSection: React.FC<WatchlistSectionProps> = ({
          removeClippedSubviews={false}
          getItemLayout={getItemLayout}
          style={{ overflow: "visible" }}
-          contentInset={{
-            left: sizes.padding.horizontal,
-            right: sizes.padding.horizontal,
-          }}
-          contentOffset={{ x: -sizes.padding.horizontal, y: 0 }}
          contentContainerStyle={{
            paddingVertical: SCALE_PADDING,
+            paddingHorizontal: SCALE_PADDING,
          }}
        />
      )}
@@ -233,13 +226,9 @@ interface StreamystatsPromotedWatchlistsProps extends ViewProps {
 export const StreamystatsPromotedWatchlists: React.FC<
  StreamystatsPromotedWatchlistsProps
 > = ({ enabled = true, onItemFocus, ...props }) => {
-  const posterSizes = useScaledTVPosterSizes();
-  const sizes = useScaledTVSizes();
-  const ITEM_GAP = sizes.gaps.item;
  const api = useAtomValue(apiAtom);
  const user = useAtomValue(userAtom);
  const { settings } = useSettings();
-  const typography = useScaledTVTypography();

  const streamyStatsEnabled = useMemo(() => {
    return Boolean(settings?.streamyStatsServerUrl);
@@ -310,55 +299,33 @@ export const StreamystatsPromotedWatchlists: React.FC<
      <View style={{ overflow: "visible" }} {...props}>
        <View
          style={{
-            height: scaleSize(16),
-            width: scaleSize(128),
+            height: 16,
+            width: 128,
            backgroundColor: "#262626",
-            borderRadius: scaleSize(4),
-            marginLeft: sizes.padding.horizontal,
-            marginBottom: scaleSize(20),
+            borderRadius: 4,
+            marginLeft: SCALE_PADDING,
+            marginBottom: 16,
          }}
        />
        <View
          style={{
            flexDirection: "row",
            gap: ITEM_GAP,
-            paddingLeft: sizes.padding.horizontal,
-            paddingRight: sizes.padding.horizontal,
+            paddingHorizontal: SCALE_PADDING,
            paddingVertical: SCALE_PADDING,
          }}
        >
          {[1, 2, 3, 4, 5].map((i) => (
-            <View key={i} style={{ width: posterSizes.poster }}>
+            <View key={i} style={{ width: TV_POSTER_WIDTH }}>
              <View
                style={{
                  backgroundColor: "#262626",
-                  width: posterSizes.poster,
+                  width: TV_POSTER_WIDTH,
                  aspectRatio: 10 / 15,
-                  borderRadius: scaleSize(24),
+                  borderRadius: 12,
+                  marginBottom: 8,
                }}
              />
-              <View
-                style={{
-                  marginTop: scaleSize(12),
-                  paddingHorizontal: scaleSize(4),
-                  borderRadius: 6,
-                  overflow: "hidden",
-                  marginBottom: 4,
-                  alignSelf: "flex-start",
-                }}
-              >
-                <Text
-                  style={{
-                    color: "#262626",
-                    backgroundColor: "#262626",
-                    borderRadius: 6,
-                    fontSize: typography.callout,
-                  }}
-                  numberOfLines={1}
-                >
-                  Placeholder text here
-                </Text>
-              </View>
            </View>
          ))}
        </View>
--- a/components/home/StreamystatsRecommendations.tv.tsx
+++ b/components/home/StreamystatsRecommendations.tv.tsx
@@ -11,17 +11,23 @@ import { FlatList, View, type ViewProps } from "react-native";

 import { Text } from "@/components/common/Text";
 import { getItemNavigation } from "@/components/common/TouchableItemRouter";
-import { TVPosterCard } from "@/components/tv/TVPosterCard";
-import { useScaledTVSizes } from "@/constants/TVSizes";
+import MoviePoster, {
+  TV_POSTER_WIDTH,
+} from "@/components/posters/MoviePoster.tv";
+import SeriesPoster from "@/components/posters/SeriesPoster.tv";
+import { TVFocusablePoster } from "@/components/tv/TVFocusablePoster";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
-import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
-import { scaleSize } from "@/utils/scaleSize";
 import { createStreamystatsApi } from "@/utils/streamystats/api";
 import type { StreamystatsRecommendationsIdsResponse } from "@/utils/streamystats/types";

+const ITEM_GAP = 16;
+const SCALE_PADDING = 20;
+
+type Typography = ReturnType<typeof useScaledTVTypography>;
+
 interface Props extends ViewProps {
  title: string;
  type: "Movie" | "Series";
@@ -30,6 +36,31 @@ interface Props extends ViewProps {
  onItemFocus?: (item: BaseItemDto) => void;
 }

+const TVItemCardText: React.FC<{
+  item: BaseItemDto;
+  typography: Typography;
+}> = ({ item, typography }) => {
+  return (
+    <View style={{ marginTop: 12, flexDirection: "column" }}>
+      <Text
+        numberOfLines={1}
+        style={{ fontSize: typography.callout, color: "#FFFFFF" }}
+      >
+        {item.Name}
+      </Text>
+      <Text
+        style={{
+          fontSize: typography.callout,
+          color: "#9CA3AF",
+          marginTop: 2,
+        }}
+      >
+        {item.ProductionYear}
+      </Text>
+    </View>
+  );
+};
+
 export const StreamystatsRecommendations: React.FC<Props> = ({
  title,
  type,
@@ -39,12 +70,10 @@ export const StreamystatsRecommendations: React.FC<Props> = ({
  ...props
 }) => {
  const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
  const api = useAtomValue(apiAtom);
  const user = useAtomValue(userAtom);
  const { settings } = useSettings();
  const router = useRouter();
-  const { showItemActions } = useTVItemActionModal();
  const segments = useSegments();
  const from = (segments as string[])[2] || "(home)";

@@ -161,29 +190,30 @@ export const StreamystatsRecommendations: React.FC<Props> = ({

  const getItemLayout = useCallback(
    (_data: ArrayLike<BaseItemDto> | null | undefined, index: number) => ({
-      length: sizes.posters.poster + sizes.gaps.item,
-      offset: (sizes.posters.poster + sizes.gaps.item) * index,
+      length: TV_POSTER_WIDTH + ITEM_GAP,
+      offset: (TV_POSTER_WIDTH + ITEM_GAP) * index,
      index,
    }),
-    [sizes],
+    [],
  );

  const renderItem = useCallback(
    ({ item }: { item: BaseItemDto }) => {
      return (
-        <View style={{ marginRight: sizes.gaps.item }}>
-          <TVPosterCard
-            item={item}
-            orientation='vertical'
+        <View style={{ marginRight: ITEM_GAP, width: TV_POSTER_WIDTH }}>
+          <TVFocusablePoster
            onPress={() => handleItemPress(item)}
-            onLongPress={() => showItemActions(item)}
            onFocus={() => onItemFocus?.(item)}
-            width={sizes.posters.poster}
-          />
+            hasTVPreferredFocus={false}
+          >
+            {item.Type === "Movie" && <MoviePoster item={item} />}
+            {item.Type === "Series" && <SeriesPoster item={item} />}
+          </TVFocusablePoster>
+          <TVItemCardText item={item} typography={typography} />
        </View>
      );
    },
-    [sizes, handleItemPress, showItemActions, onItemFocus],
+    [handleItemPress, onItemFocus, typography],
  );

  if (!streamyStatsEnabled) return null;
@@ -198,7 +228,7 @@ export const StreamystatsRecommendations: React.FC<Props> = ({
          fontWeight: "700",
          color: "#FFFFFF",
          marginBottom: 20,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
          letterSpacing: 0.5,
        }}
      >
@@ -209,44 +239,22 @@ export const StreamystatsRecommendations: React.FC<Props> = ({
        <View
          style={{
            flexDirection: "row",
-            gap: sizes.gaps.item,
-            paddingLeft: sizes.padding.horizontal,
-            paddingRight: sizes.padding.horizontal,
-            paddingVertical: sizes.padding.scale,
+            gap: ITEM_GAP,
+            paddingHorizontal: SCALE_PADDING,
+            paddingVertical: SCALE_PADDING,
          }}
        >
          {[1, 2, 3, 4, 5].map((i) => (
-            <View key={i} style={{ width: sizes.posters.poster }}>
+            <View key={i} style={{ width: TV_POSTER_WIDTH }}>
              <View
                style={{
                  backgroundColor: "#262626",
-                  width: sizes.posters.poster,
+                  width: TV_POSTER_WIDTH,
                  aspectRatio: 10 / 15,
-                  borderRadius: scaleSize(24),
+                  borderRadius: 12,
+                  marginBottom: 8,
                }}
              />
-              <View
-                style={{
-                  marginTop: scaleSize(12),
-                  paddingHorizontal: scaleSize(4),
-                  borderRadius: 6,
-                  overflow: "hidden",
-                  marginBottom: 4,
-                  alignSelf: "flex-start",
-                }}
-              >
-                <Text
-                  style={{
-                    color: "#262626",
-                    backgroundColor: "#262626",
-                    borderRadius: 6,
-                    fontSize: typography.callout,
-                  }}
-                  numberOfLines={1}
-                >
-                  Placeholder text here
-                </Text>
-              </View>
            </View>
          ))}
        </View>
@@ -263,13 +271,9 @@ export const StreamystatsRecommendations: React.FC<Props> = ({
          removeClippedSubviews={false}
          getItemLayout={getItemLayout}
          style={{ overflow: "visible" }}
-          contentInset={{
-            left: sizes.padding.horizontal,
-            right: sizes.padding.horizontal,
-          }}
-          contentOffset={{ x: -sizes.padding.horizontal, y: 0 }}
          contentContainerStyle={{
-            paddingVertical: sizes.padding.scale,
+            paddingVertical: SCALE_PADDING,
+            paddingHorizontal: SCALE_PADDING,
          }}
        />
      )}
--- a/components/home/TVHeroCarousel.tsx
+++ b/components/home/TVHeroCarousel.tsx
@@ -23,7 +23,6 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { ProgressBar } from "@/components/common/ProgressBar";
 import { Text } from "@/components/common/Text";
 import { getItemNavigation } from "@/components/common/TouchableItemRouter";
-import { type ScaledTVSizes, useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import {
@@ -33,28 +32,28 @@ import {
 import { apiAtom } from "@/providers/JellyfinProvider";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
-import { scaleSize } from "@/utils/scaleSize";
 import { runtimeTicksToMinutes } from "@/utils/time";

 const { width: SCREEN_WIDTH, height: SCREEN_HEIGHT } = Dimensions.get("window");
+const HERO_HEIGHT = SCREEN_HEIGHT * 0.62;
+const CARD_WIDTH = 280;
+const CARD_GAP = 24;
+const CARD_PADDING = 60;

 interface TVHeroCarouselProps {
  items: BaseItemDto[];
  onItemFocus?: (item: BaseItemDto) => void;
-  onItemLongPress?: (item: BaseItemDto) => void;
 }

 interface HeroCardProps {
  item: BaseItemDto;
  isFirst: boolean;
-  sizes: ScaledTVSizes;
  onFocus: (item: BaseItemDto) => void;
  onPress: (item: BaseItemDto) => void;
-  onLongPress?: (item: BaseItemDto) => void;
 }

 const HeroCard: React.FC<HeroCardProps> = React.memo(
-  ({ item, isFirst, sizes, onFocus, onPress, onLongPress }) => {
+  ({ item, isFirst, onFocus, onPress }) => {
    const api = useAtomValue(apiAtom);
    const [focused, setFocused] = useState(false);
    const scale = useRef(new Animated.Value(1)).current;
@@ -85,6 +84,8 @@ const HeroCard: React.FC<HeroCardProps> = React.memo(
      return null;
    }, [api, item]);

+    const progress = item.UserData?.PlayedPercentage || 0;
+
    const animateTo = useCallback(
      (value: number) =>
        Animated.timing(scale, {
@@ -98,9 +99,9 @@ const HeroCard: React.FC<HeroCardProps> = React.memo(

    const handleFocus = useCallback(() => {
      setFocused(true);
-      animateTo(sizes.animation.focusScale);
+      animateTo(1.1);
      onFocus(item);
-    }, [animateTo, onFocus, item, sizes.animation.focusScale]);
+    }, [animateTo, onFocus, item]);

    const handleBlur = useCallback(() => {
      setFocused(false);
@@ -111,31 +112,25 @@ const HeroCard: React.FC<HeroCardProps> = React.memo(
      onPress(item);
    }, [onPress, item]);

-    const handleLongPress = useCallback(() => {
-      onLongPress?.(item);
-    }, [onLongPress, item]);
-
    // Use glass poster for tvOS 26+
-    if (useGlass && posterUrl) {
-      const progress = item.UserData?.PlayedPercentage || 0;
+    if (useGlass) {
      return (
        <Pressable
          onPress={handlePress}
-          onLongPress={handleLongPress}
          onFocus={handleFocus}
          onBlur={handleBlur}
          hasTVPreferredFocus={isFirst}
-          style={{ marginRight: sizes.gaps.item }}
+          style={{ marginRight: CARD_GAP }}
        >
          <GlassPosterView
            imageUrl={posterUrl}
            aspectRatio={16 / 9}
-            cornerRadius={scaleSize(24)}
+            cornerRadius={16}
            progress={progress}
            showWatchedIndicator={false}
            isFocused={focused}
-            width={sizes.posters.episode}
-            style={{ width: sizes.posters.episode }}
+            width={CARD_WIDTH}
+            style={{ width: CARD_WIDTH }}
          />
        </Pressable>
      );
@@ -145,25 +140,22 @@ const HeroCard: React.FC<HeroCardProps> = React.memo(
    return (
      <Pressable
        onPress={handlePress}
-        onLongPress={handleLongPress}
        onFocus={handleFocus}
        onBlur={handleBlur}
        hasTVPreferredFocus={isFirst}
-        style={{ marginRight: sizes.gaps.item }}
+        style={{ marginRight: CARD_GAP }}
      >
        <Animated.View
          style={{
-            width: sizes.posters.episode,
+            width: CARD_WIDTH,
            aspectRatio: 16 / 9,
-            borderRadius: scaleSize(24),
+            borderRadius: 16,
            overflow: "hidden",
            transform: [{ scale }],
-            borderWidth: scaleSize(2),
-            borderColor: focused ? "#FFFFFF" : "transparent",
            shadowColor: "#FFFFFF",
            shadowOffset: { width: 0, height: 0 },
            shadowOpacity: focused ? 0.6 : 0,
-            shadowRadius: focused ? scaleSize(20) : 0,
+            shadowRadius: focused ? 20 : 0,
          }}
        >
          {posterUrl ? (
@@ -184,7 +176,7 @@ const HeroCard: React.FC<HeroCardProps> = React.memo(
            >
              <Ionicons
                name='film-outline'
-                size={scaleSize(48)}
+                size={48}
                color='rgba(255,255,255,0.3)'
              />
            </View>
@@ -202,10 +194,8 @@ const BACKDROP_DEBOUNCE_MS = 300;
 export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
  items,
  onItemFocus,
-  onItemLongPress,
 }) => {
  const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
  const api = useAtomValue(apiAtom);
  const insets = useSafeAreaInsets();
  const router = useRouter();
@@ -364,13 +354,11 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
      <HeroCard
        item={item}
        isFirst={index === 0}
-        sizes={sizes}
        onFocus={handleCardFocus}
        onPress={handleCardPress}
-        onLongPress={onItemLongPress}
      />
    ),
-    [handleCardFocus, handleCardPress, onItemLongPress, sizes],
+    [handleCardFocus, handleCardPress],
  );

  // Memoize keyExtractor
@@ -378,18 +366,8 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({

  if (items.length === 0) return null;

-  // Extra top padding for tvOS to clear the menu bar
-  const tvosTopPadding = Platform.OS === "ios" ? scaleSize(145) : 0;
-  const heroHeight = SCREEN_HEIGHT * sizes.padding.heroHeight;
-
  return (
-    <View
-      style={{
-        height: heroHeight + insets.top + tvosTopPadding,
-        width: "100%",
-        paddingTop: insets.top + tvosTopPadding,
-      }}
-    >
+    <View style={{ height: HERO_HEIGHT, width: "100%" }}>
      {/* Backdrop layers with crossfade */}
      <View
        style={{
@@ -474,17 +452,13 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
        />
      </View>

-      {/* Content overlay - text elements with padding */}
+      {/* Content overlay */}
      <View
        style={{
          position: "absolute",
-          left: sizes.padding.horizontal,
-          right: sizes.padding.horizontal,
-          bottom:
-            scaleSize(40) +
-            sizes.posters.episode * (9 / 16) +
-            sizes.gaps.small * 2 +
-            scaleSize(20),
+          left: insets.left + CARD_PADDING,
+          right: insets.right + CARD_PADDING,
+          bottom: 40,
        }}
      >
        {/* Logo or Title */}
@@ -492,9 +466,9 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
          <Image
            source={{ uri: logoUrl }}
            style={{
-              height: scaleSize(100),
+              height: 100,
              width: SCREEN_WIDTH * 0.35,
-              marginBottom: scaleSize(16),
+              marginBottom: 16,
            }}
            contentFit='contain'
            contentPosition='left'
@@ -505,7 +479,7 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
              fontSize: typography.display,
              fontWeight: "bold",
              color: "#FFFFFF",
-              marginBottom: scaleSize(12),
+              marginBottom: 12,
            }}
            numberOfLines={1}
          >
@@ -519,7 +493,7 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
            style={{
              fontSize: typography.body,
              color: "rgba(255,255,255,0.9)",
-              marginBottom: scaleSize(12),
+              marginBottom: 12,
            }}
            numberOfLines={1}
          >
@@ -533,7 +507,7 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
            style={{
              fontSize: typography.body,
              color: "rgba(255,255,255,0.8)",
-              marginBottom: scaleSize(16),
+              marginBottom: 16,
              maxWidth: SCREEN_WIDTH * 0.5,
              lineHeight: typography.body * 1.4,
            }}
@@ -548,7 +522,8 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
          style={{
            flexDirection: "row",
            alignItems: "center",
-            gap: scaleSize(16),
+            gap: 16,
+            marginBottom: 20,
          }}
        >
          {year && (
@@ -574,10 +549,10 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
          {activeItem?.OfficialRating && (
            <View
              style={{
-                paddingHorizontal: scaleSize(8),
-                paddingVertical: scaleSize(2),
-                borderRadius: scaleSize(4),
-                borderWidth: scaleSize(1),
+                paddingHorizontal: 8,
+                paddingVertical: 2,
+                borderRadius: 4,
+                borderWidth: 1,
                borderColor: "rgba(255,255,255,0.5)",
              }}
            >
@@ -596,15 +571,15 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
              style={{
                flexDirection: "row",
                alignItems: "center",
-                gap: scaleSize(6),
+                gap: 6,
              }}
            >
              <View
                style={{
-                  width: scaleSize(60),
-                  height: scaleSize(4),
+                  width: 60,
+                  height: 4,
                  backgroundColor: "rgba(255,255,255,0.3)",
-                  borderRadius: scaleSize(2),
+                  borderRadius: 2,
                  overflow: "hidden",
                }}
              >
@@ -628,38 +603,15 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
            </View>
          )}
        </View>
-      </View>

-      {/* Thumbnail carousel - edge-to-edge */}
-      <View
-        style={{
-          position: "absolute",
-          left: 0,
-          right: 0,
-          bottom: scaleSize(40),
-        }}
-      >
+        {/* Thumbnail carousel */}
        <FlatList
          horizontal
          data={heroItems}
          keyExtractor={keyExtractor}
          showsHorizontalScrollIndicator={false}
          style={{ overflow: "visible" }}
-          contentContainerStyle={{
-            paddingVertical: sizes.gaps.small,
-            paddingLeft: sizes.padding.horizontal,
-            paddingRight: sizes.padding.horizontal,
-          }}
-          // Below is a work around with the contentInset, same in infiniteScrollingCollectionList, if okay on apple remove
-          // ListHeaderComponent={
-          //   <View style={{ width: sizes.padding.horizontal }} />
-          // }
-          // contentInset={{
-          //   left: sizes.padding.horizontal,
-          //   right: sizes.padding.horizontal,
-          // }}
-          // contentOffset={{ x: -sizes.padding.horizontal, y: 0 }}
-          // contentContainerStyle={{ paddingVertical: sizes.gaps.small }}
+          contentContainerStyle={{ paddingVertical: 12 }}
          renderItem={renderHeroCard}
          removeClippedSubviews={false}
          initialNumToRender={8}
--- a/components/library/TVLibraries.tsx
+++ b/components/library/TVLibraries.tsx
@@ -103,8 +103,6 @@ const TVLibraryRow: React.FC<{
      return t("library.item_types.series");
    if (library.CollectionType === "boxsets")
      return t("library.item_types.boxsets");
-    if (library.CollectionType === "playlists")
-      return t("library.item_types.playlists");
    if (library.CollectionType === "music")
      return t("library.item_types.items");
    return t("library.item_types.items");
@@ -260,7 +258,8 @@ export const TVLibraries: React.FC = () => {
      userViews
        ?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!))
        .filter((l) => l.CollectionType !== "books")
-        .filter((l) => l.CollectionType !== "music") || [],
+        .filter((l) => l.CollectionType !== "music")
+        .filter((l) => l.CollectionType !== "playlists") || [],
    [userViews, settings?.hiddenLibraries],
  );

@@ -274,10 +273,6 @@ export const TVLibraries: React.FC = () => {
          if (library.CollectionType === "movies") itemType = "Movie";
          else if (library.CollectionType === "tvshows") itemType = "Series";
          else if (library.CollectionType === "boxsets") itemType = "BoxSet";
-          else if (library.CollectionType === "playlists")
-            itemType = "Playlist";
-
-          const isPlaylistsLib = library.CollectionType === "playlists";

          // Fetch count
          const countResponse = await getItemsApi(api!).getItems({
@@ -286,7 +281,6 @@ export const TVLibraries: React.FC = () => {
            recursive: true,
            limit: 0,
            includeItemTypes: itemType ? [itemType as any] : undefined,
-            ...(isPlaylistsLib ? { mediaTypes: ["Video"] } : {}),
          });

          // Fetch preview items with backdrops
@@ -298,7 +292,6 @@ export const TVLibraries: React.FC = () => {
            sortBy: ["Random"],
            includeItemTypes: itemType ? [itemType as any] : undefined,
            imageTypes: ["Backdrop"],
-            ...(isPlaylistsLib ? { mediaTypes: ["Video"] } : {}),
          });

          return {
@@ -316,10 +309,6 @@ export const TVLibraries: React.FC = () => {

  const handleLibraryPress = useCallback(
    (library: BaseItemDto) => {
-      if (library.CollectionType === "livetv") {
-        router.push("/(auth)/(tabs)/(libraries)/livetv/programs");
-        return;
-      }
      if (library.CollectionType === "music") {
        router.push({
          pathname: `/(auth)/(tabs)/(libraries)/music/[libraryId]/suggestions`,
--- a/components/livetv/TVChannelCard.tsx
+++ b/components/livetv/TVChannelCard.tsx
@@ -1,183 +0,0 @@
-import type { Api } from "@jellyfin/sdk";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import React from "react";
-import { Animated, Image, Pressable, StyleSheet, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-
-interface TVChannelCardProps {
-  channel: BaseItemDto;
-  api: Api | null;
-  onPress: () => void;
-  hasTVPreferredFocus?: boolean;
-  disabled?: boolean;
-}
-
-const CARD_WIDTH = 200;
-const CARD_HEIGHT = 160;
-
-export const TVChannelCard: React.FC<TVChannelCardProps> = ({
-  channel,
-  api,
-  onPress,
-  hasTVPreferredFocus = false,
-  disabled = false,
-}) => {
-  const typography = useScaledTVTypography();
-  const { focused, handleFocus, handleBlur, animatedStyle } =
-    useTVFocusAnimation({
-      scaleAmount: 1.05,
-      duration: 120,
-    });
-
-  const imageUrl = getPrimaryImageUrl({
-    api,
-    item: channel,
-    quality: 80,
-    width: 200,
-  });
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      hasTVPreferredFocus={hasTVPreferredFocus}
-      disabled={disabled}
-      focusable={!disabled}
-      style={styles.pressable}
-    >
-      <Animated.View
-        style={[
-          styles.container,
-          {
-            backgroundColor: focused ? "#FFFFFF" : "rgba(255, 255, 255, 0.08)",
-            borderColor: focused ? "#FFFFFF" : "rgba(255, 255, 255, 0.1)",
-          },
-          animatedStyle,
-          focused && styles.focusedShadow,
-        ]}
-      >
-        {/* Channel logo or number */}
-        <View style={styles.logoContainer}>
-          {imageUrl ? (
-            <Image
-              source={{ uri: imageUrl }}
-              style={styles.logo}
-              resizeMode='contain'
-            />
-          ) : (
-            <View
-              style={[
-                styles.numberFallback,
-                {
-                  backgroundColor: focused
-                    ? "#E5E5E5"
-                    : "rgba(255, 255, 255, 0.15)",
-                },
-              ]}
-            >
-              <Text
-                style={[
-                  styles.numberText,
-                  {
-                    fontSize: typography.title,
-                    color: focused ? "#000000" : "#FFFFFF",
-                  },
-                ]}
-              >
-                {channel.ChannelNumber || "?"}
-              </Text>
-            </View>
-          )}
-        </View>
-
-        {/* Channel name */}
-        <Text
-          numberOfLines={2}
-          style={[
-            styles.channelName,
-            {
-              fontSize: typography.callout,
-              color: focused ? "#000000" : "#FFFFFF",
-            },
-          ]}
-        >
-          {channel.Name}
-        </Text>
-
-        {/* Channel number (if name is shown) */}
-        {channel.ChannelNumber && (
-          <Text
-            numberOfLines={1}
-            style={[
-              styles.channelNumber,
-              {
-                fontSize: typography.callout,
-                color: focused
-                  ? "rgba(0, 0, 0, 0.6)"
-                  : "rgba(255, 255, 255, 0.5)",
-              },
-            ]}
-          >
-            Ch. {channel.ChannelNumber}
-          </Text>
-        )}
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-const styles = StyleSheet.create({
-  pressable: {
-    width: CARD_WIDTH,
-    height: CARD_HEIGHT,
-  },
-  container: {
-    flex: 1,
-    borderRadius: 12,
-    borderWidth: 1,
-    padding: 12,
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  focusedShadow: {
-    shadowColor: "#FFFFFF",
-    shadowOffset: { width: 0, height: 0 },
-    shadowOpacity: 0.4,
-    shadowRadius: 12,
-  },
-  logoContainer: {
-    width: 80,
-    height: 60,
-    marginBottom: 8,
-    justifyContent: "center",
-    alignItems: "center",
-  },
-  logo: {
-    width: "100%",
-    height: "100%",
-  },
-  numberFallback: {
-    width: 60,
-    height: 60,
-    borderRadius: 30,
-    justifyContent: "center",
-    alignItems: "center",
-  },
-  numberText: {
-    fontWeight: "bold",
-  },
-  channelName: {
-    fontWeight: "600",
-    textAlign: "center",
-    marginBottom: 4,
-  },
-  channelNumber: {
-    fontWeight: "400",
-  },
-});
-
-export { CARD_WIDTH, CARD_HEIGHT };
--- a/components/livetv/TVChannelsGrid.tsx
+++ b/components/livetv/TVChannelsGrid.tsx
@@ -1,136 +0,0 @@
-import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useAtomValue } from "jotai";
-import React, { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { ActivityIndicator, ScrollView, StyleSheet, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Text } from "@/components/common/Text";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import useRouter from "@/hooks/useAppRouter";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { TVChannelCard } from "./TVChannelCard";
-
-const HORIZONTAL_PADDING = 60;
-const GRID_GAP = 16;
-
-export const TVChannelsGrid: React.FC = () => {
-  const { t } = useTranslation();
-  const typography = useScaledTVTypography();
-  const insets = useSafeAreaInsets();
-  const router = useRouter();
-  const api = useAtomValue(apiAtom);
-  const user = useAtomValue(userAtom);
-
-  // Fetch all channels
-  const { data: channelsData, isLoading } = useQuery({
-    queryKey: ["livetv", "channels-grid", "all"],
-    queryFn: async () => {
-      if (!api || !user?.Id) return null;
-      const res = await getLiveTvApi(api).getLiveTvChannels({
-        enableFavoriteSorting: true,
-        userId: user.Id,
-        addCurrentProgram: false,
-        enableUserData: false,
-        enableImageTypes: ["Primary"],
-      });
-      return res.data;
-    },
-    enabled: !!api && !!user?.Id,
-    staleTime: 5 * 60 * 1000, // 5 minutes
-  });
-
-  const channels = channelsData?.Items ?? [];
-
-  const handleChannelPress = useCallback(
-    (channelId: string | undefined) => {
-      if (channelId) {
-        // Navigate directly to the player to start the channel
-        const queryParams = new URLSearchParams({
-          itemId: channelId,
-          audioIndex: "",
-          subtitleIndex: "",
-          mediaSourceId: "",
-          bitrateValue: "",
-        });
-        router.push(`/player/direct-player?${queryParams.toString()}`);
-      }
-    },
-    [router],
-  );
-
-  if (isLoading) {
-    return (
-      <View style={styles.loadingContainer}>
-        <ActivityIndicator size='large' color='#FFFFFF' />
-      </View>
-    );
-  }
-
-  if (channels.length === 0) {
-    return (
-      <View style={styles.emptyContainer}>
-        <Text style={[styles.emptyText, { fontSize: typography.body }]}>
-          {t("live_tv.no_channels")}
-        </Text>
-      </View>
-    );
-  }
-
-  return (
-    <ScrollView
-      style={styles.container}
-      contentContainerStyle={[
-        styles.contentContainer,
-        {
-          paddingLeft: insets.left + HORIZONTAL_PADDING,
-          paddingRight: insets.right + HORIZONTAL_PADDING,
-          paddingBottom: insets.bottom + 60,
-        },
-      ]}
-      showsVerticalScrollIndicator={false}
-    >
-      <View style={styles.grid}>
-        {channels.map((channel, index) => (
-          <TVChannelCard
-            key={channel.Id ?? index}
-            channel={channel}
-            api={api}
-            onPress={() => handleChannelPress(channel.Id)}
-            // No hasTVPreferredFocus - tab buttons handle initial focus
-          />
-        ))}
-      </View>
-    </ScrollView>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
-  contentContainer: {
-    paddingTop: 24,
-  },
-  grid: {
-    flexDirection: "row",
-    flexWrap: "wrap",
-    justifyContent: "flex-start",
-    gap: GRID_GAP,
-    overflow: "visible",
-    paddingVertical: 10, // Extra padding for focus scale animation
-  },
-  loadingContainer: {
-    flex: 1,
-    justifyContent: "center",
-    alignItems: "center",
-  },
-  emptyContainer: {
-    flex: 1,
-    justifyContent: "center",
-    alignItems: "center",
-  },
-  emptyText: {
-    color: "rgba(255, 255, 255, 0.6)",
-  },
-});
--- a/components/livetv/TVGuideChannelRow.tsx
+++ b/components/livetv/TVGuideChannelRow.tsx
@@ -1,146 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import React, { useMemo } from "react";
-import { StyleSheet, View } from "react-native";
-import { TVGuideProgramCell } from "./TVGuideProgramCell";
-
-interface TVGuideChannelRowProps {
-  programs: BaseItemDto[];
-  baseTime: Date;
-  pixelsPerHour: number;
-  minProgramWidth: number;
-  hoursToShow: number;
-  onProgramPress: (program: BaseItemDto) => void;
-  disabled?: boolean;
-  firstProgramRefSetter?: (ref: View | null) => void;
-}
-
-export const TVGuideChannelRow: React.FC<TVGuideChannelRowProps> = ({
-  programs,
-  baseTime,
-  pixelsPerHour,
-  minProgramWidth,
-  hoursToShow,
-  onProgramPress,
-  disabled = false,
-  firstProgramRefSetter,
-}) => {
-  const isCurrentlyAiring = (program: BaseItemDto): boolean => {
-    if (!program.StartDate || !program.EndDate) return false;
-    const now = new Date();
-    const start = new Date(program.StartDate);
-    const end = new Date(program.EndDate);
-    return now >= start && now <= end;
-  };
-
-  const getTimeOffset = (startDate: string): number => {
-    const start = new Date(startDate);
-    const diffMinutes = (start.getTime() - baseTime.getTime()) / 60000;
-    return Math.max(0, (diffMinutes / 60) * pixelsPerHour);
-  };
-
-  // Filter programs for this channel and within the time window
-  const filteredPrograms = useMemo(() => {
-    const endTime = new Date(baseTime.getTime() + hoursToShow * 60 * 60 * 1000);
-
-    return programs
-      .filter((p) => {
-        if (!p.StartDate || !p.EndDate) return false;
-        const start = new Date(p.StartDate);
-        const end = new Date(p.EndDate);
-        // Program overlaps with our time window
-        return end > baseTime && start < endTime;
-      })
-      .sort((a, b) => {
-        const dateA = new Date(a.StartDate || 0);
-        const dateB = new Date(b.StartDate || 0);
-        return dateA.getTime() - dateB.getTime();
-      });
-  }, [programs, baseTime, hoursToShow]);
-
-  // Calculate program cells with positions (absolute positioning)
-  const programCells = useMemo(() => {
-    return filteredPrograms.map((program) => {
-      if (!program.StartDate || !program.EndDate) {
-        return { program, width: minProgramWidth, left: 0 };
-      }
-
-      // Clamp the start time to baseTime if program started earlier
-      const programStart = new Date(program.StartDate);
-      const effectiveStart = programStart < baseTime ? baseTime : programStart;
-
-      // Clamp the end time to the window end
-      const windowEnd = new Date(
-        baseTime.getTime() + hoursToShow * 60 * 60 * 1000,
-      );
-      const programEnd = new Date(program.EndDate);
-      const effectiveEnd = programEnd > windowEnd ? windowEnd : programEnd;
-
-      const durationMinutes =
-        (effectiveEnd.getTime() - effectiveStart.getTime()) / 60000;
-      const width = Math.max(
-        (durationMinutes / 60) * pixelsPerHour - 4,
-        minProgramWidth,
-      ); // -4 for gap
-
-      const left = getTimeOffset(effectiveStart.toISOString());
-
-      return {
-        program,
-        width,
-        left,
-      };
-    });
-  }, [filteredPrograms, baseTime, pixelsPerHour, minProgramWidth, hoursToShow]);
-
-  const totalWidth = hoursToShow * pixelsPerHour;
-
-  return (
-    <View style={[styles.container, { width: totalWidth }]}>
-      {programCells.map(({ program, width, left }, index) => (
-        <View
-          key={program.Id || index}
-          style={[styles.programCellWrapper, { left, width }]}
-        >
-          <TVGuideProgramCell
-            program={program}
-            width={width}
-            isCurrentlyAiring={isCurrentlyAiring(program)}
-            onPress={() => onProgramPress(program)}
-            disabled={disabled}
-            refSetter={index === 0 ? firstProgramRefSetter : undefined}
-          />
-        </View>
-      ))}
-
-      {/* Empty state */}
-      {programCells.length === 0 && (
-        <View style={[styles.noPrograms, { width: totalWidth - 8 }]}>
-          {/* Empty row indicator */}
-        </View>
-      )}
-    </View>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    height: 80,
-    position: "relative",
-    borderBottomWidth: 1,
-    borderBottomColor: "rgba(255, 255, 255, 0.2)",
-    backgroundColor: "rgba(20, 20, 20, 1)",
-  },
-  programCellWrapper: {
-    position: "absolute",
-    top: 4,
-    bottom: 4,
-  },
-  noPrograms: {
-    position: "absolute",
-    left: 4,
-    top: 4,
-    bottom: 4,
-    backgroundColor: "rgba(255, 255, 255, 0.05)",
-    borderRadius: 8,
-  },
-});
--- a/components/livetv/TVGuidePageNavigation.tsx
+++ b/components/livetv/TVGuidePageNavigation.tsx
@@ -1,154 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { Animated, Pressable, StyleSheet, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-
-interface TVGuidePageNavigationProps {
-  currentPage: number;
-  totalPages: number;
-  onPrevious: () => void;
-  onNext: () => void;
-  disabled?: boolean;
-  prevButtonRefSetter?: (ref: View | null) => void;
-}
-
-interface NavButtonProps {
-  onPress: () => void;
-  icon: keyof typeof Ionicons.glyphMap;
-  label: string;
-  isDisabled: boolean;
-  disabled?: boolean;
-  refSetter?: (ref: View | null) => void;
-}
-
-const NavButton: React.FC<NavButtonProps> = ({
-  onPress,
-  icon,
-  label,
-  isDisabled,
-  disabled = false,
-  refSetter,
-}) => {
-  const typography = useScaledTVTypography();
-  const { focused, handleFocus, handleBlur, animatedStyle } =
-    useTVFocusAnimation({
-      scaleAmount: 1.05,
-      duration: 120,
-    });
-
-  const visuallyDisabled = isDisabled || disabled;
-
-  const handlePress = () => {
-    if (!visuallyDisabled) {
-      onPress();
-    }
-  };
-
-  return (
-    <Pressable
-      ref={refSetter}
-      onPress={handlePress}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      focusable={!disabled}
-    >
-      <Animated.View
-        style={[
-          styles.navButton,
-          animatedStyle,
-          {
-            backgroundColor: focused ? "#FFFFFF" : "rgba(255, 255, 255, 0.1)",
-            opacity: visuallyDisabled ? 0.3 : 1,
-          },
-        ]}
-      >
-        <Ionicons
-          name={icon}
-          size={20}
-          color={focused ? "#000000" : "#FFFFFF"}
-        />
-        <Text
-          style={[
-            styles.navButtonText,
-            {
-              fontSize: typography.callout,
-              color: focused ? "#000000" : "#FFFFFF",
-            },
-          ]}
-        >
-          {label}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-export const TVGuidePageNavigation: React.FC<TVGuidePageNavigationProps> = ({
-  currentPage,
-  totalPages,
-  onPrevious,
-  onNext,
-  disabled = false,
-  prevButtonRefSetter,
-}) => {
-  const { t } = useTranslation();
-  const typography = useScaledTVTypography();
-
-  return (
-    <View style={styles.container}>
-      <View style={styles.buttonsContainer}>
-        <NavButton
-          onPress={onPrevious}
-          icon='chevron-back'
-          label={t("live_tv.previous")}
-          isDisabled={currentPage <= 1}
-          disabled={disabled}
-          refSetter={prevButtonRefSetter}
-        />
-
-        <NavButton
-          onPress={onNext}
-          icon='chevron-forward'
-          label={t("live_tv.next")}
-          isDisabled={currentPage >= totalPages}
-          disabled={disabled}
-        />
-      </View>
-
-      <Text style={[styles.pageText, { fontSize: typography.callout }]}>
-        {t("live_tv.page_of", { current: currentPage, total: totalPages })}
-      </Text>
-    </View>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    paddingVertical: 16,
-  },
-  buttonsContainer: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 12,
-  },
-  navButton: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 8,
-    paddingHorizontal: 20,
-    paddingVertical: 12,
-    borderRadius: 8,
-  },
-  navButtonText: {
-    fontWeight: "600",
-  },
-  pageText: {
-    color: "rgba(255, 255, 255, 0.6)",
-  },
-});
--- a/components/livetv/TVGuideProgramCell.tsx
+++ b/components/livetv/TVGuideProgramCell.tsx
@@ -1,148 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import React from "react";
-import { Animated, Pressable, StyleSheet, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-
-interface TVGuideProgramCellProps {
-  program: BaseItemDto;
-  width: number;
-  isCurrentlyAiring: boolean;
-  onPress: () => void;
-  disabled?: boolean;
-  refSetter?: (ref: View | null) => void;
-}
-
-export const TVGuideProgramCell: React.FC<TVGuideProgramCellProps> = ({
-  program,
-  width,
-  isCurrentlyAiring,
-  onPress,
-  disabled = false,
-  refSetter,
-}) => {
-  const typography = useScaledTVTypography();
-  const { focused, handleFocus, handleBlur } = useTVFocusAnimation({
-    scaleAmount: 1,
-    duration: 120,
-  });
-
-  const formatTime = (date: string | null | undefined) => {
-    if (!date) return "";
-    const d = new Date(date);
-    return d.toLocaleTimeString([], {
-      hour: "2-digit",
-      minute: "2-digit",
-      hour12: false,
-    });
-  };
-
-  return (
-    <Pressable
-      ref={refSetter}
-      onPress={onPress}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      disabled={disabled}
-      focusable={!disabled}
-      style={{ width }}
-    >
-      <Animated.View
-        style={[
-          styles.container,
-          {
-            backgroundColor: focused
-              ? "#FFFFFF"
-              : isCurrentlyAiring
-                ? "rgba(255, 255, 255, 0.15)"
-                : "rgba(255, 255, 255, 0.08)",
-            borderColor: focused ? "#FFFFFF" : "rgba(255, 255, 255, 0.1)",
-          },
-          focused && styles.focusedShadow,
-        ]}
-      >
-        {/* LIVE badge */}
-        {isCurrentlyAiring && (
-          <View style={styles.liveBadge}>
-            <Text
-              style={[styles.liveBadgeText, { fontSize: typography.callout }]}
-            >
-              LIVE
-            </Text>
-          </View>
-        )}
-
-        {/* Program name */}
-        <Text
-          numberOfLines={2}
-          style={[
-            styles.programName,
-            {
-              fontSize: typography.callout,
-              color: focused ? "#000000" : "#FFFFFF",
-            },
-          ]}
-        >
-          {program.Name}
-        </Text>
-
-        {/* Time range */}
-        <Text
-          numberOfLines={1}
-          style={[
-            styles.timeText,
-            {
-              fontSize: typography.callout,
-              color: focused
-                ? "rgba(0, 0, 0, 0.6)"
-                : "rgba(255, 255, 255, 0.5)",
-            },
-          ]}
-        >
-          {formatTime(program.StartDate)} - {formatTime(program.EndDate)}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    height: 70,
-    borderRadius: 8,
-    borderWidth: 1,
-    paddingHorizontal: 12,
-    paddingVertical: 8,
-    justifyContent: "center",
-    overflow: "hidden",
-  },
-  focusedShadow: {
-    shadowColor: "#FFFFFF",
-    shadowOffset: { width: 0, height: 0 },
-    shadowOpacity: 0.4,
-    shadowRadius: 12,
-  },
-  liveBadge: {
-    position: "absolute",
-    top: 6,
-    right: 6,
-    backgroundColor: "#EF4444",
-    paddingHorizontal: 6,
-    paddingVertical: 2,
-    borderRadius: 4,
-    zIndex: 10,
-    elevation: 10,
-  },
-  liveBadgeText: {
-    color: "#FFFFFF",
-    fontWeight: "bold",
-  },
-  programName: {
-    fontWeight: "600",
-    marginBottom: 4,
-  },
-  timeText: {
-    fontWeight: "400",
-  },
-});
--- a/components/livetv/TVGuideTimeHeader.tsx
+++ b/components/livetv/TVGuideTimeHeader.tsx
@@ -1,64 +0,0 @@
-import { BlurView } from "expo-blur";
-import React from "react";
-import { StyleSheet, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-
-interface TVGuideTimeHeaderProps {
-  baseTime: Date;
-  hoursToShow: number;
-  pixelsPerHour: number;
-}
-
-export const TVGuideTimeHeader: React.FC<TVGuideTimeHeaderProps> = ({
-  baseTime,
-  hoursToShow,
-  pixelsPerHour,
-}) => {
-  const typography = useScaledTVTypography();
-
-  const hours: Date[] = [];
-  for (let i = 0; i < hoursToShow; i++) {
-    const hour = new Date(baseTime);
-    hour.setMinutes(0, 0, 0);
-    hour.setHours(baseTime.getHours() + i);
-    hours.push(hour);
-  }
-
-  const formatHour = (date: Date) => {
-    return date.toLocaleTimeString([], {
-      hour: "2-digit",
-      minute: "2-digit",
-      hour12: false,
-    });
-  };
-
-  return (
-    <BlurView intensity={40} tint='dark' style={styles.container}>
-      {hours.map((hour, index) => (
-        <View key={index} style={[styles.hourCell, { width: pixelsPerHour }]}>
-          <Text style={[styles.hourText, { fontSize: typography.callout }]}>
-            {formatHour(hour)}
-          </Text>
-        </View>
-      ))}
-    </BlurView>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    flexDirection: "row",
-    height: 44,
-  },
-  hourCell: {
-    justifyContent: "center",
-    paddingLeft: 12,
-    borderLeftWidth: 1,
-    borderLeftColor: "rgba(255, 255, 255, 0.1)",
-  },
-  hourText: {
-    color: "rgba(255, 255, 255, 0.6)",
-    fontWeight: "500",
-  },
-});
--- a/components/livetv/TVLiveTVGuide.tsx
+++ b/components/livetv/TVLiveTVGuide.tsx
@@ -1,433 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useAtomValue } from "jotai";
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { useTranslation } from "react-i18next";
-import {
-  ActivityIndicator,
-  NativeScrollEvent,
-  NativeSyntheticEvent,
-  ScrollView,
-  StyleSheet,
-  TVFocusGuideView,
-  View,
-} from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Text } from "@/components/common/Text";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import useRouter from "@/hooks/useAppRouter";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { TVGuideChannelRow } from "./TVGuideChannelRow";
-import { TVGuidePageNavigation } from "./TVGuidePageNavigation";
-import { TVGuideTimeHeader } from "./TVGuideTimeHeader";
-
-// Design constants
-const CHANNEL_COLUMN_WIDTH = 240;
-const PIXELS_PER_HOUR = 250;
-const ROW_HEIGHT = 80;
-const TIME_HEADER_HEIGHT = 44;
-const CHANNELS_PER_PAGE = 20;
-const MIN_PROGRAM_WIDTH = 80;
-const HORIZONTAL_PADDING = 60;
-
-// Channel label component
-const ChannelLabel: React.FC<{
-  channel: BaseItemDto;
-  typography: ReturnType<typeof useScaledTVTypography>;
-}> = ({ channel, typography }) => (
-  <View style={styles.channelLabel}>
-    <Text
-      numberOfLines={1}
-      style={[styles.channelNumber, { fontSize: typography.callout }]}
-    >
-      {channel.ChannelNumber}
-    </Text>
-    <Text
-      numberOfLines={1}
-      style={[styles.channelName, { fontSize: typography.callout }]}
-    >
-      {channel.Name}
-    </Text>
-  </View>
-);
-
-export const TVLiveTVGuide: React.FC = () => {
-  const { t } = useTranslation();
-  const typography = useScaledTVTypography();
-  const insets = useSafeAreaInsets();
-  const router = useRouter();
-  const api = useAtomValue(apiAtom);
-  const user = useAtomValue(userAtom);
-
-  const [currentPage, setCurrentPage] = useState(1);
-
-  // Scroll refs for synchronization
-  const channelListRef = useRef<ScrollView>(null);
-  const mainVerticalRef = useRef<ScrollView>(null);
-
-  // Focus guide refs for bidirectional navigation
-  const [firstProgramRef, setFirstProgramRef] = useState<View | null>(null);
-  const [prevButtonRef, setPrevButtonRef] = useState<View | null>(null);
-
-  // Base time - start of current hour, end time - end of day
-  const [{ baseTime, endOfDay, hoursToShow }] = useState(() => {
-    const now = new Date();
-    now.setMinutes(0, 0, 0);
-
-    const endOfDayTime = new Date(now);
-    endOfDayTime.setHours(23, 59, 59, 999);
-
-    const hoursUntilEndOfDay = Math.ceil(
-      (endOfDayTime.getTime() - now.getTime()) / (60 * 60 * 1000),
-    );
-
-    return {
-      baseTime: now,
-      endOfDay: endOfDayTime,
-      hoursToShow: Math.max(hoursUntilEndOfDay, 1), // At least 1 hour
-    };
-  });
-
-  // Current time indicator position (relative to program grid start)
-  const [currentTimeOffset, setCurrentTimeOffset] = useState(0);
-
-  // Update current time indicator every minute
-  useEffect(() => {
-    const updateCurrentTime = () => {
-      const now = new Date();
-      const diffMinutes = (now.getTime() - baseTime.getTime()) / 60000;
-      const offset = (diffMinutes / 60) * PIXELS_PER_HOUR;
-      setCurrentTimeOffset(offset);
-    };
-
-    updateCurrentTime();
-    const interval = setInterval(updateCurrentTime, 60000);
-    return () => clearInterval(interval);
-  }, [baseTime]);
-
-  // Sync vertical scroll between channel list and main grid
-  const handleVerticalScroll = useCallback(
-    (event: NativeSyntheticEvent<NativeScrollEvent>) => {
-      const offsetY = event.nativeEvent.contentOffset.y;
-      channelListRef.current?.scrollTo({ y: offsetY, animated: false });
-    },
-    [],
-  );
-
-  // Fetch channels
-  const { data: channelsData, isLoading: isLoadingChannels } = useQuery({
-    queryKey: ["livetv", "tv-guide", "channels"],
-    queryFn: async () => {
-      if (!api || !user?.Id) return null;
-      const res = await getLiveTvApi(api).getLiveTvChannels({
-        enableFavoriteSorting: true,
-        userId: user.Id,
-        addCurrentProgram: false,
-        enableUserData: false,
-        enableImageTypes: ["Primary"],
-      });
-      return res.data;
-    },
-    enabled: !!api && !!user?.Id,
-    staleTime: 5 * 60 * 1000, // 5 minutes
-  });
-
-  const totalChannels = channelsData?.TotalRecordCount ?? 0;
-  const totalPages = Math.ceil(totalChannels / CHANNELS_PER_PAGE);
-  const allChannels = channelsData?.Items ?? [];
-
-  // Get channels for current page
-  const paginatedChannels = useMemo(() => {
-    const startIndex = (currentPage - 1) * CHANNELS_PER_PAGE;
-    return allChannels.slice(startIndex, startIndex + CHANNELS_PER_PAGE);
-  }, [allChannels, currentPage]);
-
-  const channelIds = useMemo(
-    () => paginatedChannels.map((c) => c.Id).filter(Boolean) as string[],
-    [paginatedChannels],
-  );
-
-  // Fetch programs for visible channels
-  const { data: programsData, isLoading: isLoadingPrograms } = useQuery({
-    queryKey: [
-      "livetv",
-      "tv-guide",
-      "programs",
-      channelIds,
-      baseTime.toISOString(),
-      endOfDay.toISOString(),
-    ],
-    queryFn: async () => {
-      if (!api || channelIds.length === 0) return null;
-      const res = await getLiveTvApi(api).getPrograms({
-        getProgramsDto: {
-          MaxStartDate: endOfDay.toISOString(),
-          MinEndDate: baseTime.toISOString(),
-          ChannelIds: channelIds,
-          ImageTypeLimit: 1,
-          EnableImages: false,
-          SortBy: ["StartDate"],
-          EnableTotalRecordCount: false,
-          EnableUserData: false,
-        },
-      });
-      return res.data;
-    },
-    enabled: channelIds.length > 0,
-    staleTime: 2 * 60 * 1000, // 2 minutes
-  });
-
-  const programs = programsData?.Items ?? [];
-
-  // Group programs by channel
-  const programsByChannel = useMemo(() => {
-    const grouped: Record<string, BaseItemDto[]> = {};
-    for (const program of programs) {
-      const channelId = program.ChannelId;
-      if (channelId) {
-        if (!grouped[channelId]) {
-          grouped[channelId] = [];
-        }
-        grouped[channelId].push(program);
-      }
-    }
-    return grouped;
-  }, [programs]);
-
-  const handleProgramPress = useCallback(
-    (program: BaseItemDto) => {
-      // Navigate to play the program/channel
-      const queryParams = new URLSearchParams({
-        itemId: program.Id ?? "",
-        audioIndex: "",
-        subtitleIndex: "",
-        mediaSourceId: "",
-        bitrateValue: "",
-      });
-      router.push(`/player/direct-player?${queryParams.toString()}`);
-    },
-    [router],
-  );
-
-  const handlePreviousPage = useCallback(() => {
-    if (currentPage > 1) {
-      setCurrentPage((p) => p - 1);
-    }
-  }, [currentPage]);
-
-  const handleNextPage = useCallback(() => {
-    if (currentPage < totalPages) {
-      setCurrentPage((p) => p + 1);
-    }
-  }, [currentPage, totalPages]);
-
-  const isLoading = isLoadingChannels;
-  const totalWidth = hoursToShow * PIXELS_PER_HOUR;
-
-  if (isLoading) {
-    return (
-      <View style={styles.loadingContainer}>
-        <ActivityIndicator size='large' color='#FFFFFF' />
-      </View>
-    );
-  }
-
-  if (paginatedChannels.length === 0) {
-    return (
-      <View style={styles.emptyContainer}>
-        <Text style={[styles.emptyText, { fontSize: typography.body }]}>
-          {t("live_tv.no_programs")}
-        </Text>
-      </View>
-    );
-  }
-
-  return (
-    <View style={styles.container}>
-      {/* Page Navigation */}
-      {totalPages > 1 && (
-        <View style={{ paddingHorizontal: insets.left + HORIZONTAL_PADDING }}>
-          <TVGuidePageNavigation
-            currentPage={currentPage}
-            totalPages={totalPages}
-            onPrevious={handlePreviousPage}
-            onNext={handleNextPage}
-            prevButtonRefSetter={setPrevButtonRef}
-          />
-        </View>
-      )}
-
-      {/* Bidirectional focus guides */}
-      {firstProgramRef && (
-        <TVFocusGuideView
-          destinations={[firstProgramRef]}
-          style={{ height: 1, width: "100%" }}
-        />
-      )}
-      {prevButtonRef && (
-        <TVFocusGuideView
-          destinations={[prevButtonRef]}
-          style={{ height: 1, width: "100%" }}
-        />
-      )}
-
-      {/* Main grid container */}
-      <View style={styles.gridWrapper}>
-        {/* Fixed channel column */}
-        <View
-          style={[
-            styles.channelColumn,
-            {
-              width: CHANNEL_COLUMN_WIDTH,
-              marginLeft: insets.left + HORIZONTAL_PADDING,
-            },
-          ]}
-        >
-          {/* Spacer for time header */}
-          <View style={{ height: TIME_HEADER_HEIGHT }} />
-
-          {/* Channel labels - synced with main scroll */}
-          <ScrollView
-            ref={channelListRef}
-            scrollEnabled={false}
-            showsVerticalScrollIndicator={false}
-            contentContainerStyle={{ paddingBottom: insets.bottom + 60 }}
-          >
-            {paginatedChannels.map((channel, index) => (
-              <ChannelLabel
-                key={channel.Id ?? index}
-                channel={channel}
-                typography={typography}
-              />
-            ))}
-          </ScrollView>
-        </View>
-
-        {/* Scrollable programs area */}
-        <ScrollView
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          style={styles.horizontalScroll}
-          contentContainerStyle={{
-            paddingRight: insets.right + HORIZONTAL_PADDING,
-          }}
-        >
-          <View style={{ width: totalWidth, position: "relative" }}>
-            {/* Time header */}
-            <TVGuideTimeHeader
-              baseTime={baseTime}
-              hoursToShow={hoursToShow}
-              pixelsPerHour={PIXELS_PER_HOUR}
-            />
-
-            {/* Programs grid - vertical scroll */}
-            <ScrollView
-              ref={mainVerticalRef}
-              onScroll={handleVerticalScroll}
-              scrollEventThrottle={16}
-              showsVerticalScrollIndicator={false}
-              contentContainerStyle={{ paddingBottom: insets.bottom + 60 }}
-            >
-              {paginatedChannels.map((channel, index) => {
-                const channelPrograms = channel.Id
-                  ? (programsByChannel[channel.Id] ?? [])
-                  : [];
-                return (
-                  <TVGuideChannelRow
-                    key={channel.Id ?? index}
-                    programs={channelPrograms}
-                    baseTime={baseTime}
-                    pixelsPerHour={PIXELS_PER_HOUR}
-                    minProgramWidth={MIN_PROGRAM_WIDTH}
-                    hoursToShow={hoursToShow}
-                    onProgramPress={handleProgramPress}
-                    firstProgramRefSetter={
-                      index === 0 ? setFirstProgramRef : undefined
-                    }
-                  />
-                );
-              })}
-            </ScrollView>
-
-            {/* Current time indicator */}
-            {currentTimeOffset > 0 && currentTimeOffset < totalWidth && (
-              <View
-                style={[
-                  styles.currentTimeIndicator,
-                  {
-                    left: currentTimeOffset,
-                    top: 0,
-                    height:
-                      TIME_HEADER_HEIGHT +
-                      paginatedChannels.length * ROW_HEIGHT,
-                  },
-                ]}
-              />
-            )}
-          </View>
-        </ScrollView>
-      </View>
-    </View>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
-  loadingContainer: {
-    flex: 1,
-    justifyContent: "center",
-    alignItems: "center",
-  },
-  emptyContainer: {
-    flex: 1,
-    justifyContent: "center",
-    alignItems: "center",
-  },
-  emptyText: {
-    color: "rgba(255, 255, 255, 0.6)",
-  },
-  gridWrapper: {
-    flex: 1,
-    flexDirection: "row",
-  },
-  channelColumn: {
-    backgroundColor: "rgba(40, 40, 40, 1)",
-    borderRightWidth: 1,
-    borderRightColor: "rgba(255, 255, 255, 0.2)",
-  },
-  channelLabel: {
-    height: ROW_HEIGHT,
-    justifyContent: "center",
-    paddingHorizontal: 12,
-    borderBottomWidth: 1,
-    borderBottomColor: "rgba(255, 255, 255, 0.2)",
-  },
-  channelNumber: {
-    color: "rgba(255, 255, 255, 0.5)",
-    fontWeight: "400",
-    marginBottom: 2,
-  },
-  channelName: {
-    color: "#FFFFFF",
-    fontWeight: "600",
-  },
-  horizontalScroll: {
-    flex: 1,
-  },
-  currentTimeIndicator: {
-    position: "absolute",
-    width: 2,
-    backgroundColor: "#EF4444",
-    zIndex: 10,
-    pointerEvents: "none",
-  },
-});
--- a/components/livetv/TVLiveTVPage.tsx
+++ b/components/livetv/TVLiveTVPage.tsx
@@ -1,265 +0,0 @@
-import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
-import { useAtomValue } from "jotai";
-import React, { useCallback, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { ScrollView, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Text } from "@/components/common/Text";
-import { InfiniteScrollingCollectionList } from "@/components/home/InfiniteScrollingCollectionList.tv";
-import { TVChannelsGrid } from "@/components/livetv/TVChannelsGrid";
-import { TVLiveTVGuide } from "@/components/livetv/TVLiveTVGuide";
-import { TVLiveTVPlaceholder } from "@/components/livetv/TVLiveTVPlaceholder";
-import { TVTabButton } from "@/components/tv/TVTabButton";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-
-const HORIZONTAL_PADDING = 60;
-const TOP_PADDING = 100;
-const SECTION_GAP = 24;
-
-type TabId =
-  | "programs"
-  | "guide"
-  | "channels"
-  | "recordings"
-  | "schedule"
-  | "series";
-
-interface Tab {
-  id: TabId;
-  labelKey: string;
-}
-
-const TABS: Tab[] = [
-  { id: "programs", labelKey: "live_tv.tabs.programs" },
-  { id: "guide", labelKey: "live_tv.tabs.guide" },
-  { id: "channels", labelKey: "live_tv.tabs.channels" },
-  { id: "recordings", labelKey: "live_tv.tabs.recordings" },
-  { id: "schedule", labelKey: "live_tv.tabs.schedule" },
-  { id: "series", labelKey: "live_tv.tabs.series" },
-];
-
-export const TVLiveTVPage: React.FC = () => {
-  const { t } = useTranslation();
-  const typography = useScaledTVTypography();
-  const insets = useSafeAreaInsets();
-  const api = useAtomValue(apiAtom);
-  const user = useAtomValue(userAtom);
-
-  const [activeTab, setActiveTab] = useState<TabId>("programs");
-
-  // Section configurations for Programs tab
-  const sections = useMemo(() => {
-    if (!api || !user?.Id) return [];
-
-    return [
-      {
-        title: t("live_tv.on_now"),
-        queryKey: ["livetv", "tv", "onNow"],
-        queryFn: async ({ pageParam = 0 }: { pageParam?: number }) => {
-          const res = await getLiveTvApi(api).getRecommendedPrograms({
-            userId: user.Id,
-            isAiring: true,
-            limit: 24,
-            imageTypeLimit: 1,
-            enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-            enableTotalRecordCount: false,
-            fields: ["ChannelInfo", "PrimaryImageAspectRatio"],
-          });
-          const items = res.data.Items || [];
-          return items.slice(pageParam, pageParam + 10);
-        },
-      },
-      {
-        title: t("live_tv.shows"),
-        queryKey: ["livetv", "tv", "shows"],
-        queryFn: async ({ pageParam = 0 }: { pageParam?: number }) => {
-          const res = await getLiveTvApi(api).getLiveTvPrograms({
-            userId: user.Id,
-            hasAired: false,
-            limit: 24,
-            isMovie: false,
-            isSeries: true,
-            isSports: false,
-            isNews: false,
-            isKids: false,
-            enableTotalRecordCount: false,
-            fields: ["ChannelInfo", "PrimaryImageAspectRatio"],
-            enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-          });
-          const items = res.data.Items || [];
-          return items.slice(pageParam, pageParam + 10);
-        },
-      },
-      {
-        title: t("live_tv.movies"),
-        queryKey: ["livetv", "tv", "movies"],
-        queryFn: async ({ pageParam = 0 }: { pageParam?: number }) => {
-          const res = await getLiveTvApi(api).getLiveTvPrograms({
-            userId: user.Id,
-            hasAired: false,
-            limit: 24,
-            isMovie: true,
-            enableTotalRecordCount: false,
-            fields: ["ChannelInfo"],
-            enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-          });
-          const items = res.data.Items || [];
-          return items.slice(pageParam, pageParam + 10);
-        },
-      },
-      {
-        title: t("live_tv.sports"),
-        queryKey: ["livetv", "tv", "sports"],
-        queryFn: async ({ pageParam = 0 }: { pageParam?: number }) => {
-          const res = await getLiveTvApi(api).getLiveTvPrograms({
-            userId: user.Id,
-            hasAired: false,
-            limit: 24,
-            isSports: true,
-            enableTotalRecordCount: false,
-            fields: ["ChannelInfo"],
-            enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-          });
-          const items = res.data.Items || [];
-          return items.slice(pageParam, pageParam + 10);
-        },
-      },
-      {
-        title: t("live_tv.for_kids"),
-        queryKey: ["livetv", "tv", "kids"],
-        queryFn: async ({ pageParam = 0 }: { pageParam?: number }) => {
-          const res = await getLiveTvApi(api).getLiveTvPrograms({
-            userId: user.Id,
-            hasAired: false,
-            limit: 24,
-            isKids: true,
-            enableTotalRecordCount: false,
-            fields: ["ChannelInfo"],
-            enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-          });
-          const items = res.data.Items || [];
-          return items.slice(pageParam, pageParam + 10);
-        },
-      },
-      {
-        title: t("live_tv.news"),
-        queryKey: ["livetv", "tv", "news"],
-        queryFn: async ({ pageParam = 0 }: { pageParam?: number }) => {
-          const res = await getLiveTvApi(api).getLiveTvPrograms({
-            userId: user.Id,
-            hasAired: false,
-            limit: 24,
-            isNews: true,
-            enableTotalRecordCount: false,
-            fields: ["ChannelInfo"],
-            enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-          });
-          const items = res.data.Items || [];
-          return items.slice(pageParam, pageParam + 10);
-        },
-      },
-    ];
-  }, [api, user?.Id, t]);
-
-  const handleTabSelect = useCallback((tabId: TabId) => {
-    setActiveTab(tabId);
-  }, []);
-
-  const renderProgramsContent = () => (
-    <ScrollView
-      nestedScrollEnabled
-      showsVerticalScrollIndicator={false}
-      contentContainerStyle={{
-        paddingTop: 24,
-        paddingBottom: insets.bottom + 60,
-      }}
-    >
-      <View
-        style={{
-          gap: SECTION_GAP,
-          paddingHorizontal: insets.left + HORIZONTAL_PADDING,
-        }}
-      >
-        {sections.map((section) => (
-          <InfiniteScrollingCollectionList
-            key={section.queryKey.join("-")}
-            title={section.title}
-            queryKey={section.queryKey}
-            queryFn={section.queryFn}
-            orientation='horizontal'
-            hideIfEmpty
-            pageSize={10}
-            enabled={true}
-            isFirstSection={false}
-          />
-        ))}
-      </View>
-    </ScrollView>
-  );
-
-  const renderTabContent = () => {
-    if (activeTab === "programs") {
-      return renderProgramsContent();
-    }
-
-    if (activeTab === "guide") {
-      return <TVLiveTVGuide />;
-    }
-
-    if (activeTab === "channels") {
-      return <TVChannelsGrid />;
-    }
-
-    // Placeholder for other tabs
-    const tab = TABS.find((t) => t.id === activeTab);
-    return <TVLiveTVPlaceholder tabName={t(tab?.labelKey || "")} />;
-  };
-
-  return (
-    <View style={{ flex: 1, backgroundColor: "#000000" }}>
-      {/* Header with Title and Tabs */}
-      <View
-        style={{
-          paddingTop: insets.top + TOP_PADDING,
-          paddingHorizontal: insets.left + HORIZONTAL_PADDING,
-          paddingBottom: 24,
-        }}
-      >
-        {/* Title */}
-        <Text
-          style={{
-            fontSize: typography.display,
-            fontWeight: "bold",
-            color: "#FFFFFF",
-            marginBottom: 24,
-          }}
-        >
-          Live TV
-        </Text>
-
-        {/* Tab Bar */}
-        <View
-          style={{
-            flexDirection: "row",
-            gap: 8,
-          }}
-        >
-          {TABS.map((tab) => (
-            <TVTabButton
-              key={tab.id}
-              label={t(tab.labelKey)}
-              active={activeTab === tab.id}
-              onSelect={() => handleTabSelect(tab.id)}
-              hasTVPreferredFocus={activeTab === tab.id}
-              switchOnFocus={true}
-            />
-          ))}
-        </View>
-      </View>
-
-      {/* Tab Content */}
-      <View style={{ flex: 1 }}>{renderTabContent()}</View>
-    </View>
-  );
-};
--- a/components/livetv/TVLiveTVPlaceholder.tsx
+++ b/components/livetv/TVLiveTVPlaceholder.tsx
@@ -1,46 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-
-interface TVLiveTVPlaceholderProps {
-  tabName: string;
-}
-
-export const TVLiveTVPlaceholder: React.FC<TVLiveTVPlaceholderProps> = ({
-  tabName,
-}) => {
-  const { t } = useTranslation();
-  const typography = useScaledTVTypography();
-
-  return (
-    <View
-      style={{
-        flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
-        paddingHorizontal: 60,
-      }}
-    >
-      <Text
-        style={{
-          fontSize: typography.title,
-          fontWeight: "700",
-          color: "#FFFFFF",
-          marginBottom: 12,
-        }}
-      >
-        {tabName}
-      </Text>
-      <Text
-        style={{
-          fontSize: typography.body,
-          color: "rgba(255, 255, 255, 0.6)",
-        }}
-      >
-        {t("live_tv.coming_soon")}
-      </Text>
-    </View>
-  );
-};
--- a/components/login/Login.tsx
+++ b/components/login/Login.tsx
@@ -72,24 +72,22 @@ export const Login: React.FC = () => {
    password: string;
  } | null>(null);

-  // Handle URL params for server connection
  useEffect(() => {
    (async () => {
      if (_apiUrl) {
        await setServer({
          address: _apiUrl,
        });
+
+        setTimeout(() => {
+          if (_username && _password) {
+            setCredentials({ username: _username, password: _password });
+            login(_username, _password);
+          }
+        }, 0);
      }
    })();
-  }, [_apiUrl]);
-
-  // Handle auto-login when api is ready and credentials are provided via URL params
-  useEffect(() => {
-    if (api?.basePath && _apiUrl && _username && _password) {
-      setCredentials({ username: _username, password: _password });
-      login(_username, _password);
-    }
-  }, [api?.basePath, _apiUrl, _username, _password]);
+  }, [_apiUrl, _username, _password]);

  useEffect(() => {
    navigation.setOptions({
@@ -382,16 +380,18 @@ export const Login: React.FC = () => {
                </View>
              </View>
            </View>
+
+            <View className='absolute bottom-0 left-0 w-full px-4 mb-2' />
          </View>
        ) : (
-          <View className='flex flex-col flex-1 w-full'>
-            <View className='flex flex-col gap-y-2 px-4 w-full'>
+          <View className='flex flex-col flex-1 items-center justify-center w-full'>
+            <View className='flex flex-col gap-y-2 px-4 w-full -mt-36'>
              <Image
                style={{
                  width: 100,
                  height: 100,
+                  marginLeft: -23,
                  marginBottom: -20,
-                  alignSelf: "center",
                }}
                source={require("@/assets/images/icon-ios-plain.png")}
              />
@@ -429,8 +429,6 @@ export const Login: React.FC = () => {
                  await handleConnect(server.address);
                }}
              />
-            </View>
-            <View className='px-4 pb-2'>
              <PreviousServersList
                onServerSelect={async (s) => {
                  await handleConnect(s.address);
--- a/components/login/TVAccountCard.tsx
+++ b/components/login/TVAccountCard.tsx
@@ -3,7 +3,7 @@ import React, { useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Animated, Easing, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
-import { scaleSize } from "@/utils/scaleSize";
+import { Colors } from "@/constants/Colors";
 import type { SavedServerAccount } from "@/utils/secureCredentials";

 interface TVAccountCardProps {
@@ -85,7 +85,7 @@ export const TVAccountCard: React.FC<TVAccountCardProps> = ({
        style={[
          {
            transform: [{ scale }],
-            shadowColor: "#fff",
+            shadowColor: "#a855f7",
            shadowOffset: { width: 0, height: 0 },
            shadowRadius: 16,
            elevation: 8,
@@ -98,9 +98,9 @@ export const TVAccountCard: React.FC<TVAccountCardProps> = ({
            backgroundColor: isFocused ? "#2a2a2a" : "#262626",
            borderWidth: 2,
            borderColor: isFocused ? "#FFFFFF" : "transparent",
-            borderRadius: scaleSize(16),
-            paddingHorizontal: scaleSize(24),
-            paddingVertical: scaleSize(20),
+            borderRadius: 16,
+            paddingHorizontal: 24,
+            paddingVertical: 20,
            flexDirection: "row",
            alignItems: "center",
          }}
@@ -108,23 +108,23 @@ export const TVAccountCard: React.FC<TVAccountCardProps> = ({
          {/* Avatar */}
          <View
            style={{
-              width: scaleSize(56),
-              height: scaleSize(56),
+              width: 56,
+              height: 56,
              backgroundColor: "#404040",
-              borderRadius: scaleSize(28),
+              borderRadius: 28,
              alignItems: "center",
              justifyContent: "center",
-              marginRight: scaleSize(20),
+              marginRight: 20,
            }}
          >
-            <Ionicons name='person' size={scaleSize(28)} color='white' />
+            <Ionicons name='person' size={28} color='white' />
          </View>

          {/* Account Info */}
          <View style={{ flex: 1 }}>
            <Text
              style={{
-                fontSize: scaleSize(22),
+                fontSize: 22,
                fontWeight: "600",
                color: "#FFFFFF",
              }}
@@ -133,9 +133,9 @@ export const TVAccountCard: React.FC<TVAccountCardProps> = ({
            </Text>
            <Text
              style={{
-                fontSize: scaleSize(16),
+                fontSize: 16,
                color: "#9CA3AF",
-                marginTop: scaleSize(4),
+                marginTop: 4,
              }}
            >
              {getSecurityText()}
@@ -143,11 +143,7 @@ export const TVAccountCard: React.FC<TVAccountCardProps> = ({
          </View>

          {/* Security Icon */}
-          <Ionicons
-            name={getSecurityIcon()}
-            size={scaleSize(24)}
-            color='#fff'
-          />
+          <Ionicons name={getSecurityIcon()} size={24} color={Colors.primary} />
        </View>
      </Animated.View>
    </Pressable>
--- a/components/login/TVAddIcon.tsx
+++ b/components/login/TVAddIcon.tsx
@@ -1,83 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import React from "react";
-import { Animated, Pressable, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import { scaleSize } from "@/utils/scaleSize";
-
-export interface TVAddIconProps {
-  label: string;
-  onPress: () => void;
-  hasTVPreferredFocus?: boolean;
-  disabled?: boolean;
-}
-
-export const TVAddIcon = React.forwardRef<View, TVAddIconProps>(
-  ({ label, onPress, hasTVPreferredFocus, disabled = false }, ref) => {
-    const typography = useScaledTVTypography();
-    const { focused, handleFocus, handleBlur, animatedStyle } =
-      useTVFocusAnimation();
-
-    return (
-      <Pressable
-        ref={ref}
-        onPress={onPress}
-        onFocus={handleFocus}
-        onBlur={handleBlur}
-        hasTVPreferredFocus={hasTVPreferredFocus && !disabled}
-        disabled={disabled}
-        focusable={!disabled}
-      >
-        <Animated.View
-          style={[
-            animatedStyle,
-            {
-              alignItems: "center",
-              width: scaleSize(160),
-              shadowColor: "#fff",
-              shadowOffset: { width: 0, height: 0 },
-              shadowOpacity: focused ? 0.5 : 0,
-              shadowRadius: focused ? scaleSize(16) : 0,
-            },
-          ]}
-        >
-          <View
-            style={{
-              width: scaleSize(140),
-              height: scaleSize(140),
-              borderRadius: scaleSize(70),
-              backgroundColor: focused
-                ? "rgba(255,255,255,0.15)"
-                : "rgba(255,255,255,0.05)",
-              marginBottom: scaleSize(14),
-              borderWidth: scaleSize(2),
-              borderColor: focused ? "#fff" : "rgba(255,255,255,0.3)",
-              borderStyle: "dashed",
-              justifyContent: "center",
-              alignItems: "center",
-            }}
-          >
-            <Ionicons
-              name='add'
-              size={scaleSize(56)}
-              color={focused ? "#fff" : "rgba(255,255,255,0.5)"}
-            />
-          </View>
-
-          <Text
-            style={{
-              fontSize: typography.body,
-              fontWeight: "600",
-              color: focused ? "#fff" : "rgba(255,255,255,0.7)",
-              textAlign: "center",
-            }}
-            numberOfLines={2}
-          >
-            {label}
-          </Text>
-        </Animated.View>
-      </Pressable>
-    );
-  },
-);
--- a/Show More
+++ b/Show More