diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..7851727a
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: edde746
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..c274feea
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,101 @@
+name: Bug Report
+description: Report a bug or unexpected behavior
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug! Please fill out the information below to help us diagnose and fix the issue.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug Description
+      description: A clear and concise description of what the bug is.
+      placeholder: What went wrong?
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to Reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Go to '...'
+        2. Tap on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: What did you expect to happen?
+      placeholder: Describe what should have happened
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Behavior
+      description: What actually happened?
+      placeholder: Describe what actually happened
+    validations:
+      required: true
+
+  - type: input
+    id: plezy-version
+    attributes:
+      label: Plezy Version
+      description: Check the app settings for the version number and paste it here
+      placeholder: e.g., 1.7.0
+    validations:
+      required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platform
+      description: Which platform(s) are affected?
+      multiple: true
+      options:
+        - iOS
+        - Android
+        - Windows
+        - macOS
+        - Android TV
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: device
+    attributes:
+      label: Device Information
+      description: What device are you using?
+      placeholder: e.g., iPhone 14 Pro, Pixel 7, Chrome on macOS
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs and Stack Traces
+      description: Please paste any relevant logs or stack traces
+      render: shell
+      placeholder: Paste logs here
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem
+      placeholder: Drag and drop screenshots here
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..0c6e9893
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions and Discussions
+    url: https://github.com/edde746/plezy/discussions
+    about: Ask questions and discuss ideas with the community
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..6931d7dd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,65 @@
+name: Feature Request
+description: Suggest a new feature or enhancement
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for suggesting a new feature! Please provide as much detail as possible.
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem Statement
+      description: Is your feature request related to a problem? Please describe.
+      placeholder: I'm frustrated when... / It would be helpful if...
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed Solution
+      description: Describe the solution you'd like to see
+      placeholder: What feature would solve this problem?
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives Considered
+      description: Have you considered any alternative solutions or features?
+      placeholder: Describe alternatives you've considered
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use Case
+      description: Describe how you would use this feature
+      placeholder: |
+        1. As a user, I would...
+        2. This would help me...
+        3. The benefit would be...
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Target Platform
+      description: Which platform(s) should this feature target?
+      multiple: true
+      options:
+        - Android
+        - iOS
+        - Web
+        - macOS
+        - Windows
+        - Linux
+        - All platforms
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Add any other context, mockups, or screenshots about the feature request
+      placeholder: Add mockups, links to similar features, or any other helpful context
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..e035d5ff
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,161 @@
+name: CI - Sanity Checks
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Code Analysis
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+
+      - name: Cache Pub dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.pub-cache
+          key: ${{ runner.os }}-pub-v2-${{ hashFiles('**/pubspec.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pub-v2-
+
+      - name: Install dependencies
+        run: |
+
+          flutter pub get
+
+      - name: Verify formatting
+        run: |
+          # Find all Dart files excluding generated files
+          find lib $([ -d test ] && echo test) -name "*.dart" ! -name "*.g.dart" ! -name "*.freezed.dart" -type f 2>/dev/null | while IFS= read -r file; do
+            files_found=true
+            break
+          done
+          if [ "$files_found" != "true" ]; then
+            echo "No Dart files found to format"
+            exit 0
+          fi
+          find lib $([ -d test ] && echo test) -name "*.dart" ! -name "*.g.dart" ! -name "*.freezed.dart" -type f 2>/dev/null -print0 | xargs -0 dart format --output=none --set-exit-if-changed
+      - name: Analyze code
+        run: |
+          # Run flutter analyze
+          # Fails on errors or warnings only (info messages are allowed)
+          flutter analyze 2>&1 | tee analyze_output.txt || true
+
+          # Check output for errors or warnings
+          if grep -q "error •" analyze_output.txt; then
+            echo "❌ Analysis failed with errors"
+            exit 1
+          elif grep -q "warning •" analyze_output.txt; then
+            echo "⚠️  Analysis completed with warnings"
+            exit 1
+          else
+            echo "✅ Analysis passed!"
+            exit 0
+          fi
+
+      - name: Check for unused code
+        run: |
+          echo "🔍 Checking for unused code..."
+          dart run dart_code_linter:metrics check-unused-code lib 2>&1 | tee unused_code.txt
+          if grep -qi "no unused code found" unused_code.txt; then
+            echo "✅ No unused code found"
+          else
+            echo "❌ Found unused code:"
+            cat unused_code.txt
+            exit 1
+          fi
+
+      - name: Check for unused files
+        run: |
+          echo "🔍 Checking for unused files..."
+          dart run dart_code_linter:metrics check-unused-files lib 2>&1 | tee unused_files.txt
+          if grep -qi "no unused files found" unused_files.txt; then
+            echo "✅ No unused files found"
+          else
+            echo "❌ Found unused files:"
+            cat unused_files.txt
+            exit 1
+          fi
+
+  test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+
+      - name: Cache Pub dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.pub-cache
+          key: ${{ runner.os }}-pub-v2-${{ hashFiles('**/pubspec.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pub-v2-
+
+      - name: Install dependencies
+        run: |
+          flutter clean
+          flutter pub get
+
+      - name: Run tests
+        run: |
+          if [ -d "test" ] && [ "$(find test -name '*_test.dart' | wc -l)" -gt 0 ]; then
+            flutter test
+          else
+            echo "No tests found, skipping test execution"
+          fi
+
+  dependency-check:
+    name: Dependency Validation
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+
+      - name: Cache Pub dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.pub-cache
+          key: ${{ runner.os }}-pub-v2-${{ hashFiles('**/pubspec.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pub-v2-
+
+      - name: Verify dependencies
+        run: |
+          flutter clean
+          flutter pub get
+          flutter pub outdated
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..6e576967
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,82 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version number (e.g., 1.9.0)'
+        required: true
+        type: string
+
+permissions:
+  contents: write
+  actions: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Validate version format
+        run: |
+          if ! echo "${{ inputs.version }}" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'; then
+            echo "Error: Version must be in semantic versioning format (e.g., 1.9.0)"
+            exit 1
+          fi
+
+      - name: Extract current build number
+        id: get_build
+        run: |
+          # Extract current build number from pubspec.yaml
+          CURRENT_VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //')
+          CURRENT_BUILD=$(echo "$CURRENT_VERSION" | cut -d'+' -f2)
+          NEW_BUILD=$((CURRENT_BUILD + 1))
+
+          echo "current_build=$CURRENT_BUILD" >> $GITHUB_OUTPUT
+          echo "new_build=$NEW_BUILD" >> $GITHUB_OUTPUT
+          echo "Current build: $CURRENT_BUILD"
+          echo "New build: $NEW_BUILD"
+
+      - name: Update pubspec.yaml
+        run: |
+          NEW_VERSION="${{ inputs.version }}+${{ steps.get_build.outputs.new_build }}"
+          sed -i "s/^version: .*/version: $NEW_VERSION/" pubspec.yaml
+          echo "Updated version to: $NEW_VERSION"
+          cat pubspec.yaml | grep '^version:'
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Commit version bump
+        run: |
+          git add pubspec.yaml
+          git commit -m "chore: bump version to ${{ inputs.version }}"
+
+      - name: Create Git tag
+        run: |
+          git tag "${{ inputs.version }}"
+          echo "Created tag: ${{ inputs.version }}"
+
+      - name: Push changes and tag
+        run: |
+          git push origin main
+          git push origin --tags
+
+      - name: Trigger build workflow
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build.yml/dispatches \
+            -d '{"ref":"main"}'
+
+          echo "Build workflow triggered successfully"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1742ed9d..9ce9e5e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,9 +10,29 @@
 ## Development
 
 - Follow Dart/Flutter conventions
-- Run `flutter analyze` before submitting
+- Run `dart format .` to format your code (note: generated files like `*.g.dart` are excluded from CI checks)
+- Run `flutter analyze` before submitting to check for issues
+- Run `flutter test` if tests are available
 - Test your changes thoroughly
 
+### Code Quality Checks
+
+The project includes automated CI checks that run on all pull requests:
+
+1. **Code Formatting**: Ensures code follows Dart formatting standards
+   - Run locally: `dart format .` to format all files
+   - Note: CI only checks non-generated files (excludes `.g.dart`, `.freezed.dart`)
+   - Generated files are reformatted automatically by build tools
+
+2. **Static Analysis**: Checks for code issues and potential bugs
+   - Run locally: `flutter analyze`
+   - Note: CI excludes generated files from analysis (configured in `analysis_options.yaml`)
+
+3. **Tests**: Runs unit and widget tests (when available)
+   - Run locally: `flutter test`
+
+All these checks must pass before your changes can be merged.
+
 ## Internationalization (i18n)
 
 This project uses `slang` for internationalization with JSON files.
diff --git a/README.md b/README.md
index e2092494..654c1dcb 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,6 @@ Plezy is a modern Plex media client that provides a seamless streaming experienc
 <a href='https://apps.apple.com/us/app/id6754315964'><img height='60' alt='Download on the App Store' src='./assets/app-store-badge.png'/></a>
 <a href='https://play.google.com/store/apps/details?id=com.edde746.plezy'><img height='60' alt='Get it on Google Play' src='./assets/play-store-badge.png'/></a>
 
-> Google Play version is in closed testing ([required by Google](https://support.google.com/googleplay/android-developer/answer/14151465#overview)). Join the [Google Group](https://groups.google.com/g/plezy-testers-2) to get access.
-
 ### Desktop
 - [Windows (x64)](https://github.com/edde746/plezy/releases/latest/download/plezy-windows-installer.exe)
 - [macOS (Universal)](https://github.com/edde746/plezy/releases/latest/download/plezy-macos.zip)
@@ -41,6 +39,7 @@ Plezy is a modern Plex media client that provides a seamless streaming experienc
 
 ### 🎬 Video Playback
 - Wide codec support including HEVC, AV1, VP9, and more
+- HDR and Dolby Vision support (iOS, macOS & Windows)
 - Advanced subtitle rendering with full ASS/SSA support
 - Audio and subtitle track selection with user profile preferences
 - Playback progress sync and resume functionality
@@ -85,24 +84,10 @@ The project uses code generation for JSON serialization. After modifying model c
 dart run build_runner build --delete-conflicting-outputs
 ```
 
-## Building for Production
-
-### Android
-```bash
-flutter build apk --release
-# or
-flutter build appbundle --release
-```
-
-### Desktop
-```bash
-flutter build macos --release
-flutter build windows --release
-flutter build linux --release
-```
-
 ## Acknowledgments
 
 - Built with [Flutter](https://flutter.dev)
-- Media playback powered by [MediaKit](https://github.com/media-kit/media-kit)
 - Designed for [Plex Media Server](https://www.plex.tv)
+- Playback powered by [mpv](https://mpv.io)
+  - [MPVKit](https://github.com/mpvkit/MPVKit)
+  - [mpv-android](https://github.com/mpv-android/mpv-android)
diff --git a/analysis_options.yaml b/analysis_options.yaml
index f9b30346..d6f4d7bf 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1 +1,12 @@
 include: package:flutter_lints/flutter.yaml
+
+analyzer:
+  exclude:
+    - "**/*.g.dart"
+    - "**/*.freezed.dart"
+  plugins:
+    - dart_code_linter
+
+dart_code_linter:
+  rules:
+    - avoid-unused-parameters
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 1f4346cd..52e31986 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "com.edde746.plezy"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
+        minSdk = 26  // Required by libmpv-android
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
@@ -62,3 +62,7 @@ android {
 flutter {
     source = "../.."
 }
+
+dependencies {
+    implementation("dev.jdtech.mpv:libmpv:0.5.1")
+}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 13b13acc..3c0021f1 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -13,6 +13,11 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" />
 
+    <!-- Android TV support (not required, but allow detection) -->
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <!-- Touchscreen not required for TV -->
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
     <application
         android:label="Plezy"
         android:name="${applicationName}"
@@ -37,6 +42,8 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
+                <!-- Allow app to appear in Android TV launcher -->
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerCore.kt b/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerCore.kt
new file mode 100644
index 00000000..719be477
--- /dev/null
+++ b/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerCore.kt
@@ -0,0 +1,301 @@
+package com.edde746.plezy.mpv
+
+import android.app.Activity
+import android.graphics.Color
+import android.graphics.PixelFormat
+import android.util.Log
+import android.view.SurfaceHolder
+import android.view.SurfaceView
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
+import android.view.TextureView
+import dev.jdtech.mpv.MPVLib
+
+interface MpvPlayerDelegate {
+    fun onPropertyChange(name: String, value: Any?)
+    fun onEvent(name: String, data: Map<String, Any>?)
+}
+
+class MpvPlayerCore(private val activity: Activity) :
+    SurfaceHolder.Callback,
+    MPVLib.EventObserver {
+
+    companion object {
+        private const val TAG = "MpvPlayerCore"
+    }
+
+    private var surfaceView: SurfaceView? = null
+    private var overlayLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? =
+        null
+    private var voInUse: String = "gpu"
+    var delegate: MpvPlayerDelegate? = null
+    var isInitialized: Boolean = false
+        private set
+
+    private fun ensureFlutterOverlayOnTop() {
+        val contentView = activity.findViewById<ViewGroup>(android.R.id.content)
+        contentView.post {
+            var flutterContainer: ViewGroup? = null
+
+            // First pass: look for FlutterView by name (debug builds)
+            for (i in 0 until contentView.childCount) {
+                val child = contentView.getChildAt(i)
+                if (child is ViewGroup && child.javaClass.name.contains("FlutterView")) {
+                    flutterContainer = child
+                    break
+                }
+            }
+
+            // Fallback for release (FlutterView may be obfuscated): pick the last ViewGroup
+            // that is not our mpv SurfaceView and has children.
+            if (flutterContainer == null) {
+                for (i in contentView.childCount - 1 downTo 0) {
+                    val child = contentView.getChildAt(i)
+                    if (child is ViewGroup && child != surfaceView?.parent && child.childCount > 0) {
+                        flutterContainer = child
+                        break
+                    }
+                }
+            }
+
+            flutterContainer?.let { container ->
+                contentView.bringChildToFront(container)
+                for (j in 0 until container.childCount) {
+                    val flutterChild = container.getChildAt(j)
+                    if (flutterChild is SurfaceView) {
+                        flutterChild.setZOrderOnTop(true)
+                        flutterChild.setZOrderMediaOverlay(true)
+                        flutterChild.holder.setFormat(PixelFormat.TRANSLUCENT)
+                        break
+                    } else if (flutterChild is TextureView) {
+                        // TextureView uses alpha composition; ensure it stays above.
+                        flutterChild.isOpaque = false
+                        break
+                    }
+                }
+            }
+        }
+    }
+
+    fun initialize(): Boolean {
+        if (isInitialized) {
+            Log.d(TAG, "Already initialized")
+            return true
+        }
+
+        try {
+            // Create SurfaceView for video rendering
+            surfaceView = SurfaceView(activity).apply {
+                layoutParams = ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT
+                )
+                setBackgroundColor(Color.BLACK)
+                // Keep video composited in the normal view hierarchy (avoid hardware overlay promotion)
+                // so Flutter controls reliably draw above it in release builds.
+                alpha = 0.999f
+                holder.addCallback(this@MpvPlayerCore)
+
+                // Critical: Ensure SurfaceView renders BEHIND Flutter's view
+                setZOrderOnTop(false)
+                setZOrderMediaOverlay(false)
+            }
+
+            // Insert SurfaceView at bottom of view hierarchy (behind Flutter)
+            val contentView = activity.findViewById<ViewGroup>(android.R.id.content)
+            contentView.addView(surfaceView, 0)
+
+            // Find FlutterView and its internal FlutterSurfaceView, set it on top
+            for (i in 0 until contentView.childCount) {
+                val child = contentView.getChildAt(i)
+                if (child is ViewGroup && child.javaClass.name.contains("FlutterView")) {
+                    contentView.bringChildToFront(child)
+                    // Look inside FlutterView for FlutterSurfaceView
+                    for (j in 0 until child.childCount) {
+                        val flutterChild = child.getChildAt(j)
+                        if (flutterChild is SurfaceView) {
+                            // Put Flutter in media overlay layer (above our video which is in normal layer)
+                            flutterChild.setZOrderOnTop(true)
+                            flutterChild.setZOrderMediaOverlay(true)
+                            flutterChild.holder.setFormat(PixelFormat.TRANSLUCENT)
+                            break
+                        }
+                    }
+                    break
+                }
+            }
+            // Repeat after layout settles to catch late-added Flutter surfaces (release builds)
+            ensureFlutterOverlayOnTop()
+            overlayLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
+                ensureFlutterOverlayOnTop()
+            }
+            contentView.viewTreeObserver.addOnGlobalLayoutListener(overlayLayoutListener)
+
+            Log.d(TAG, "SurfaceView added to content view")
+
+            // Initialize MPVLib
+            MPVLib.create(activity.applicationContext)
+
+            // Configure MPV defaults
+            setupMpvDefaults()
+
+            // Initialize MPV
+            MPVLib.init()
+
+            // Register event observer
+            MPVLib.addObserver(this)
+
+            isInitialized = true
+            Log.d(TAG, "Initialized successfully")
+            return true
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to initialize: ${e.message}", e)
+            return false
+        }
+    }
+
+    private fun setupMpvDefaults() {
+        // Video output configuration
+        MPVLib.setOptionString("vo", "gpu")
+        MPVLib.setOptionString("gpu-context", "android")
+        MPVLib.setOptionString("opengl-es", "yes")
+        // hwdec is set from Flutter via setProperty based on user preference
+
+        // Audio configuration
+        MPVLib.setOptionString("ao", "audiotrack")
+    }
+
+    // SurfaceHolder.Callback
+
+    override fun surfaceCreated(holder: SurfaceHolder) {
+        Log.d(TAG, "Surface created")
+        MPVLib.attachSurface(holder.surface)
+        MPVLib.setOptionString("force-window", "yes")
+        // Restore video output after surface is available
+        MPVLib.setPropertyString("vo", voInUse)
+        // Reassert overlay order whenever the surface is recreated
+        ensureFlutterOverlayOnTop()
+    }
+
+    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
+        Log.d(TAG, "Surface changed: ${width}x${height}")
+        MPVLib.setPropertyString("android-surface-size", "${width}x${height}")
+    }
+
+    override fun surfaceDestroyed(holder: SurfaceHolder) {
+        Log.d(TAG, "Surface destroyed")
+        // Disable video output before detaching (like mpv-android)
+        MPVLib.setPropertyString("vo", "null")
+        MPVLib.setOptionString("force-window", "no")
+        MPVLib.detachSurface()
+    }
+
+    // MPVLib.EventObserver
+
+    override fun eventProperty(property: String) {
+        // No value provided
+    }
+
+    override fun eventProperty(property: String, value: Long) {
+        activity.runOnUiThread {
+            delegate?.onPropertyChange(property, value)
+        }
+    }
+
+    override fun eventProperty(property: String, value: Double) {
+        activity.runOnUiThread {
+            delegate?.onPropertyChange(property, value)
+        }
+    }
+
+    override fun eventProperty(property: String, value: Boolean) {
+        activity.runOnUiThread {
+            delegate?.onPropertyChange(property, value)
+        }
+    }
+
+    override fun eventProperty(property: String, value: String) {
+        activity.runOnUiThread {
+            delegate?.onPropertyChange(property, value)
+        }
+    }
+
+    override fun event(eventId: Int) {
+        val eventName = when (eventId) {
+            MPVLib.MPV_EVENT_FILE_LOADED -> "file-loaded"
+            MPVLib.MPV_EVENT_END_FILE -> "end-file"
+            MPVLib.MPV_EVENT_PLAYBACK_RESTART -> "playback-restart"
+            else -> null
+        }
+        eventName?.let { name ->
+            activity.runOnUiThread {
+                delegate?.onEvent(name, null)
+            }
+        }
+    }
+
+    // Public API
+
+    fun setProperty(name: String, value: String) {
+        if (!isInitialized) return
+        MPVLib.setPropertyString(name, value)
+    }
+
+    fun getProperty(name: String): String? {
+        if (!isInitialized) return null
+        return try {
+            MPVLib.getPropertyString(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    fun observeProperty(name: String, format: String) {
+        if (!isInitialized) return
+
+        val mpvFormat = when (format) {
+            "double" -> MPVLib.MPV_FORMAT_DOUBLE
+            "flag" -> MPVLib.MPV_FORMAT_FLAG
+            "string" -> MPVLib.MPV_FORMAT_STRING
+            "node" -> MPVLib.MPV_FORMAT_NODE
+            else -> MPVLib.MPV_FORMAT_NONE
+        }
+        MPVLib.observeProperty(name, mpvFormat)
+    }
+
+    fun command(args: Array<String>) {
+        if (!isInitialized || args.isEmpty()) return
+        MPVLib.command(args)
+    }
+
+    fun setVisible(visible: Boolean) {
+        activity.runOnUiThread {
+            surfaceView?.visibility = if (visible) View.VISIBLE else View.INVISIBLE
+            Log.d(TAG, "setVisible($visible)")
+        }
+    }
+
+    // Cleanup
+
+    fun dispose() {
+        Log.d(TAG, "Disposing")
+
+        MPVLib.removeObserver(this)
+
+        surfaceView?.holder?.removeCallback(this)
+        overlayLayoutListener?.let { listener ->
+            val contentView = activity.findViewById<ViewGroup>(android.R.id.content)
+            contentView.viewTreeObserver.removeOnGlobalLayoutListener(listener)
+        }
+
+        val contentView = activity.findViewById<ViewGroup>(android.R.id.content)
+        surfaceView?.let { contentView.removeView(it) }
+        surfaceView = null
+
+        MPVLib.destroy()
+        isInitialized = false
+
+        Log.d(TAG, "Disposed")
+    }
+}
diff --git a/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerPlugin.kt b/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerPlugin.kt
new file mode 100644
index 00000000..ec91e944
--- /dev/null
+++ b/android/app/src/main/kotlin/com/edde746/plezy/mpv/MpvPlayerPlugin.kt
@@ -0,0 +1,225 @@
+package com.edde746.plezy.mpv
+
+import android.app.Activity
+import android.util.Log
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+
+class MpvPlayerPlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
+    EventChannel.StreamHandler, ActivityAware, MpvPlayerDelegate {
+
+    companion object {
+        private const val TAG = "MpvPlayerPlugin"
+        private const val METHOD_CHANNEL = "com.plezy/mpv_player"
+        private const val EVENT_CHANNEL = "com.plezy/mpv_player/events"
+    }
+
+    private lateinit var methodChannel: MethodChannel
+    private lateinit var eventChannel: EventChannel
+    private var eventSink: EventChannel.EventSink? = null
+    private var playerCore: MpvPlayerCore? = null
+    private var activity: Activity? = null
+    private var activityBinding: ActivityPluginBinding? = null
+
+    // FlutterPlugin
+
+    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        methodChannel = MethodChannel(binding.binaryMessenger, METHOD_CHANNEL)
+        methodChannel.setMethodCallHandler(this)
+
+        eventChannel = EventChannel(binding.binaryMessenger, EVENT_CHANNEL)
+        eventChannel.setStreamHandler(this)
+
+        Log.d(TAG, "Attached to engine")
+    }
+
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        methodChannel.setMethodCallHandler(null)
+        eventChannel.setStreamHandler(null)
+        Log.d(TAG, "Detached from engine")
+    }
+
+    // ActivityAware
+
+    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+        activity = binding.activity
+        activityBinding = binding
+        Log.d(TAG, "Attached to activity")
+    }
+
+    override fun onDetachedFromActivity() {
+        playerCore?.dispose()
+        playerCore = null
+        activity = null
+        activityBinding = null
+        Log.d(TAG, "Detached from activity")
+    }
+
+    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+        activity = binding.activity
+        activityBinding = binding
+        Log.d(TAG, "Reattached to activity for config changes")
+    }
+
+    override fun onDetachedFromActivityForConfigChanges() {
+        activity = null
+        activityBinding = null
+        Log.d(TAG, "Detached from activity for config changes")
+    }
+
+    // EventChannel.StreamHandler
+
+    override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
+        eventSink = events
+        Log.d(TAG, "Event stream connected")
+    }
+
+    override fun onCancel(arguments: Any?) {
+        eventSink = null
+        Log.d(TAG, "Event stream disconnected")
+    }
+
+    // MethodChannel.MethodCallHandler
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        when (call.method) {
+            "initialize" -> handleInitialize(result)
+            "dispose" -> handleDispose(result)
+            "setProperty" -> handleSetProperty(call, result)
+            "getProperty" -> handleGetProperty(call, result)
+            "observeProperty" -> handleObserveProperty(call, result)
+            "command" -> handleCommand(call, result)
+            "setVisible" -> handleSetVisible(call, result)
+            "isInitialized" -> result.success(playerCore?.isInitialized ?: false)
+            else -> result.notImplemented()
+        }
+    }
+
+    private fun handleInitialize(result: MethodChannel.Result) {
+        val currentActivity = activity
+        if (currentActivity == null) {
+            result.error("NO_ACTIVITY", "Activity not available", null)
+            return
+        }
+
+        if (playerCore?.isInitialized == true) {
+            Log.d(TAG, "Already initialized")
+            result.success(true)
+            return
+        }
+
+        currentActivity.runOnUiThread {
+            try {
+                playerCore = MpvPlayerCore(currentActivity).apply {
+                    delegate = this@MpvPlayerPlugin
+                }
+                val success = playerCore?.initialize() ?: false
+
+                // Start hidden
+                playerCore?.setVisible(false)
+
+                Log.d(TAG, "Initialized: $success")
+                result.success(success)
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to initialize: ${e.message}", e)
+                result.error("INIT_FAILED", e.message, null)
+            }
+        }
+    }
+
+    private fun handleDispose(result: MethodChannel.Result) {
+        activity?.runOnUiThread {
+            playerCore?.dispose()
+            playerCore = null
+            Log.d(TAG, "Disposed")
+            result.success(null)
+        } ?: result.success(null)
+    }
+
+    private fun handleSetProperty(call: MethodCall, result: MethodChannel.Result) {
+        val name = call.argument<String>("name")
+        val value = call.argument<String>("value")
+
+        if (name == null || value == null) {
+            result.error("INVALID_ARGS", "Missing 'name' or 'value'", null)
+            return
+        }
+
+        playerCore?.setProperty(name, value)
+        result.success(null)
+    }
+
+    private fun handleGetProperty(call: MethodCall, result: MethodChannel.Result) {
+        val name = call.argument<String>("name")
+
+        if (name == null) {
+            result.error("INVALID_ARGS", "Missing 'name'", null)
+            return
+        }
+
+        val value = playerCore?.getProperty(name)
+        result.success(value)
+    }
+
+    private fun handleObserveProperty(call: MethodCall, result: MethodChannel.Result) {
+        val name = call.argument<String>("name")
+        val format = call.argument<String>("format")
+
+        if (name == null || format == null) {
+            result.error("INVALID_ARGS", "Missing 'name' or 'format'", null)
+            return
+        }
+
+        playerCore?.observeProperty(name, format)
+        result.success(null)
+    }
+
+    private fun handleCommand(call: MethodCall, result: MethodChannel.Result) {
+        val args = call.argument<List<String>>("args")
+
+        if (args == null) {
+            result.error("INVALID_ARGS", "Missing 'args'", null)
+            return
+        }
+
+        playerCore?.command(args.toTypedArray())
+        result.success(null)
+    }
+
+    private fun handleSetVisible(call: MethodCall, result: MethodChannel.Result) {
+        val visible = call.argument<Boolean>("visible")
+
+        if (visible == null) {
+            result.error("INVALID_ARGS", "Missing 'visible'", null)
+            return
+        }
+
+        playerCore?.setVisible(visible)
+        result.success(null)
+    }
+
+    // MpvPlayerDelegate
+
+    override fun onPropertyChange(name: String, value: Any?) {
+        eventSink?.success(
+            mapOf(
+                "type" to "property",
+                "name" to name,
+                "value" to value
+            )
+        )
+    }
+
+    override fun onEvent(name: String, data: Map<String, Any>?) {
+        val event = mutableMapOf<String, Any>(
+            "type" to "event",
+            "name" to name
+        )
+        data?.let { event["data"] = it }
+        eventSink?.success(event)
+    }
+}
diff --git a/android/app/src/main/kotlin/com/example/flutter_application_1/MainActivity.kt b/android/app/src/main/kotlin/com/example/flutter_application_1/MainActivity.kt
index c545cdce..70a7b545 100644
--- a/android/app/src/main/kotlin/com/example/flutter_application_1/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/flutter_application_1/MainActivity.kt
@@ -1,5 +1,12 @@
 package com.edde746.plezy
 
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import com.edde746.plezy.mpv.MpvPlayerPlugin
 
-class MainActivity : FlutterActivity()
+class MainActivity : FlutterActivity() {
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        flutterEngine.plugins.add(MpvPlayerPlugin())
+    }
+}
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
index d659e115..823e1e79 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
index baac3a19..ad0470ec 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
index 83de9884..6d4c1025 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
index 195a54e5..5e610a3c 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
index b7b40b05..9d7b47e6 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ
diff --git a/assets/droid-sans.ttf b/assets/droid-sans.ttf
deleted file mode 100644
index 56d013f8..00000000
Binary files a/assets/droid-sans.ttf and /dev/null differ
diff --git a/assets/go-noto-current-regular.ttf b/assets/go-noto-current-regular.ttf
new file mode 100644
index 00000000..948d1a63
Binary files /dev/null and b/assets/go-noto-current-regular.ttf differ
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index b352e747..1ee582a1 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,8 +1,44 @@
 PODS:
-  - Flutter (1.0.0)
-  - media_kit_libs_ios_video (1.0.4):
+  - connectivity_plus (0.0.1):
     - Flutter
-  - media_kit_video (0.0.1):
+  - device_info_plus (0.0.1):
+    - Flutter
+  - DKImagePickerController/Core (4.3.9):
+    - DKImagePickerController/ImageDataManager
+    - DKImagePickerController/Resource
+  - DKImagePickerController/ImageDataManager (4.3.9)
+  - DKImagePickerController/PhotoGallery (4.3.9):
+    - DKImagePickerController/Core
+    - DKPhotoGallery
+  - DKImagePickerController/Resource (4.3.9)
+  - DKPhotoGallery (0.0.19):
+    - DKPhotoGallery/Core (= 0.0.19)
+    - DKPhotoGallery/Model (= 0.0.19)
+    - DKPhotoGallery/Preview (= 0.0.19)
+    - DKPhotoGallery/Resource (= 0.0.19)
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Core (0.0.19):
+    - DKPhotoGallery/Model
+    - DKPhotoGallery/Preview
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Model (0.0.19):
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Preview (0.0.19):
+    - DKPhotoGallery/Model
+    - DKPhotoGallery/Resource
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Resource (0.0.19):
+    - SDWebImage
+    - SwiftyGif
+  - file_picker (0.0.1):
+    - DKImagePickerController/PhotoGallery
+    - Flutter
+  - Flutter (1.0.0)
+  - gamepads_ios (0.1.1):
     - Flutter
   - os_media_controls (0.0.1):
     - Flutter
@@ -11,39 +47,83 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - SDWebImage (5.21.3):
+    - SDWebImage/Core (= 5.21.3)
+  - SDWebImage/Core (5.21.3)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
-  - url_launcher_ios (0.0.1):
+  - sqlite3 (3.51.1):
+    - sqlite3/common (= 3.51.1)
+  - sqlite3/common (3.51.1)
+  - sqlite3/dbstatvtab (3.51.1):
+    - sqlite3/common
+  - sqlite3/fts5 (3.51.1):
+    - sqlite3/common
+  - sqlite3/math (3.51.1):
+    - sqlite3/common
+  - sqlite3/perf-threadsafe (3.51.1):
+    - sqlite3/common
+  - sqlite3/rtree (3.51.1):
+    - sqlite3/common
+  - sqlite3/session (3.51.1):
+    - sqlite3/common
+  - sqlite3_flutter_libs (0.0.1):
     - Flutter
-  - volume_controller (0.0.1):
+    - FlutterMacOS
+    - sqlite3 (~> 3.51.1)
+    - sqlite3/dbstatvtab
+    - sqlite3/fts5
+    - sqlite3/math
+    - sqlite3/perf-threadsafe
+    - sqlite3/rtree
+    - sqlite3/session
+  - SwiftyGif (5.4.5)
+  - url_launcher_ios (0.0.1):
     - Flutter
   - wakelock_plus (0.0.1):
     - Flutter
+  - workmanager_apple (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
-  - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
-  - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
+  - gamepads_ios (from `.symlinks/plugins/gamepads_ios/ios`)
   - os_media_controls (from `.symlinks/plugins/os_media_controls/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
+  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
+  - workmanager_apple (from `.symlinks/plugins/workmanager_apple/ios`)
+
+SPEC REPOS:
+  trunk:
+    - DKImagePickerController
+    - DKPhotoGallery
+    - SDWebImage
+    - sqlite3
+    - SwiftyGif
 
 EXTERNAL SOURCES:
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/ios"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
+  file_picker:
+    :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
     :path: Flutter
-  media_kit_libs_ios_video:
-    :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
-  media_kit_video:
-    :path: ".symlinks/plugins/media_kit_video/ios"
+  gamepads_ios:
+    :path: ".symlinks/plugins/gamepads_ios/ios"
   os_media_controls:
     :path: ".symlinks/plugins/os_media_controls/ios"
   package_info_plus:
@@ -54,25 +134,35 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite_darwin:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
+  sqlite3_flutter_libs:
+    :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
-  volume_controller:
-    :path: ".symlinks/plugins/volume_controller/ios"
   wakelock_plus:
     :path: ".symlinks/plugins/wakelock_plus/ios"
+  workmanager_apple:
+    :path: ".symlinks/plugins/workmanager_apple/ios"
 
 SPEC CHECKSUMS:
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
+  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
+  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
+  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
-  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
+  gamepads_ios: c75c6d31377d275b0effb9174c619e2705678c09
   os_media_controls: 86dceab6245a5325af90fc0fdebe243c42d789b4
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
+  SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b
+  sqlite3_flutter_libs: d13b8b3003f18f596e542bcb9482d105577eff41
+  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
   wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
+  workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778
 
 PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
 
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 099583b9..65cff4e7 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -12,6 +12,9 @@
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		50DEEA8E23D1B433DE5341D6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C12D873DE8572579684A82C /* Pods_Runner.framework */; };
 		6A48DFB02EA70C7100C1F7CD /* plezy.icon in Resources */ = {isa = PBXBuildFile; fileRef = 6A48DFAF2EA70C7100C1F7CD /* plezy.icon */; };
+		6A8A46212EDB320D0057B88C /* MPVKit-GPL in Frameworks */ = {isa = PBXBuildFile; productRef = 6A8A46202EDB320D0057B88C /* MPVKit-GPL */; };
+		6A8A46252EDB370C0057B88C /* MpvPlayerPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A8A46232EDB370C0057B88C /* MpvPlayerPlugin.swift */; };
+		6A8A46262EDB370C0057B88C /* MpvPlayerCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A8A46222EDB370C0057B88C /* MpvPlayerCore.swift */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -52,6 +55,8 @@
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		5B81FA7048BFA976F49D555E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		6A48DFAF2EA70C7100C1F7CD /* plezy.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = plezy.icon; sourceTree = "<group>"; };
+		6A8A46222EDB370C0057B88C /* MpvPlayerCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MpvPlayerCore.swift; sourceTree = "<group>"; };
+		6A8A46232EDB370C0057B88C /* MpvPlayerPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MpvPlayerPlugin.swift; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -81,6 +86,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				50DEEA8E23D1B433DE5341D6 /* Pods_Runner.framework in Frameworks */,
+				6A8A46212EDB320D0057B88C /* MPVKit-GPL in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -104,6 +110,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		6A8A46242EDB370C0057B88C /* MpvPlayer */ = {
+			isa = PBXGroup;
+			children = (
+				6A8A46222EDB370C0057B88C /* MpvPlayerCore.swift */,
+				6A8A46232EDB370C0057B88C /* MpvPlayerPlugin.swift */,
+			);
+			path = MpvPlayer;
+			sourceTree = "<group>";
+		};
 		875C8AEFBBA3759A1849D674 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -153,6 +168,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				6A8A46242EDB370C0057B88C /* MpvPlayer */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
 				97C147021CF9000F007C117D /* Info.plist */,
@@ -237,6 +253,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				6A8A461F2EDB320D0057B88C /* XCRemoteSwiftPackageReference "MPVKit" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -376,6 +395,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6A8A46252EDB370C0057B88C /* MpvPlayerPlugin.swift in Sources */,
+				6A8A46262EDB370C0057B88C /* MpvPlayerCore.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 			);
@@ -475,6 +496,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Plezy;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -661,6 +683,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Plezy;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -687,6 +710,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Plezy;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -734,6 +758,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		6A8A461F2EDB320D0057B88C /* XCRemoteSwiftPackageReference "MPVKit" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/edde746/MPVKit";
+			requirement = {
+				kind = revision;
+				revision = 0d0931fbbb25a3483a7edb46babd3f2f55abeefc;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		6A8A46202EDB320D0057B88C /* MPVKit-GPL */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 6A8A461F2EDB320D0057B88C /* XCRemoteSwiftPackageReference "MPVKit" */;
+			productName = "MPVKit-GPL";
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..dd04e7d5
--- /dev/null
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "originHash" : "c535d3cdb62bd4e11e67f3c9e68290fa7ee9306634c5f56d2b0396eb75ed41ee",
+  "pins" : [
+    {
+      "identity" : "mpvkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/edde746/MPVKit",
+      "state" : {
+        "revision" : "0d0931fbbb25a3483a7edb46babd3f2f55abeefc"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..dd04e7d5
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "originHash" : "c535d3cdb62bd4e11e67f3c9e68290fa7ee9306634c5f56d2b0396eb75ed41ee",
+  "pins" : [
+    {
+      "identity" : "mpvkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/edde746/MPVKit",
+      "state" : {
+        "revision" : "0d0931fbbb25a3483a7edb46babd3f2f55abeefc"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index d12f1afe..432d1012 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -10,6 +10,11 @@ import AVFoundation
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
 
+    // Register MPV player plugin
+    if let registrar = self.registrar(forPlugin: "MpvPlayerPlugin") {
+      MpvPlayerPlugin.register(with: registrar)
+    }
+
     // Configure audio session for media playback
     do {
       let session = AVAudioSession.sharedInstance()
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 03b3c3e7..1d395ccc 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -26,6 +26,8 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -39,10 +41,8 @@
 	<string>This app needs to connect to your Plex Media Server on your local network.</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
diff --git a/ios/Runner/MpvPlayer/MpvPlayerCore.swift b/ios/Runner/MpvPlayer/MpvPlayerCore.swift
new file mode 100644
index 00000000..653a8b28
--- /dev/null
+++ b/ios/Runner/MpvPlayer/MpvPlayerCore.swift
@@ -0,0 +1,501 @@
+import Libmpv
+import UIKit
+
+/// Protocol for receiving player events
+protocol MpvPlayerDelegate: AnyObject {
+    func onPropertyChange(name: String, value: Any?)
+    func onEvent(name: String, data: [String: Any]?)
+}
+
+// Workaround for MoltenVK problems that cause flicker
+// https://github.com/mpv-player/mpv/pull/13651
+private class MetalLayer: CAMetalLayer {
+    override var drawableSize: CGSize {
+        get { return super.drawableSize }
+        set {
+            if Int(newValue.width) > 1 && Int(newValue.height) > 1 {
+                super.drawableSize = newValue
+            }
+        }
+    }
+
+    // Fix for target-colorspace-hint - needs main thread for EDR
+    @available(iOS 16.0, *)
+    override var wantsExtendedDynamicRangeContent: Bool {
+        get { return super.wantsExtendedDynamicRangeContent }
+        set {
+            if Thread.isMainThread {
+                super.wantsExtendedDynamicRangeContent = newValue
+            } else {
+                DispatchQueue.main.sync {
+                    super.wantsExtendedDynamicRangeContent = newValue
+                }
+            }
+        }
+    }
+}
+
+/// Core MPV player using Metal rendering for iOS
+class MpvPlayerCore: NSObject {
+
+    // MARK: - Properties
+
+    private var metalLayer: MetalLayer?
+    private var containerView: UIView?  // Container for proper EDR activation
+    private var mpv: OpaquePointer?
+    private weak var window: UIWindow?
+    private lazy var queue = DispatchQueue(label: "mpv", qos: .userInitiated)
+
+    weak var delegate: MpvPlayerDelegate?
+
+    private(set) var isInitialized = false
+
+    // HDR settings
+    private var hdrEnabled = true  // User preference for HDR
+    private var lastSigPeak: Double = 0.0  // Last known sig-peak for re-evaluation
+
+    // MARK: - Initialization
+
+    func initialize(in window: UIWindow) -> Bool {
+        guard !isInitialized else {
+            print("[MpvPlayerCore] Already initialized")
+            return true
+        }
+
+        self.window = window
+
+        // Create container view for proper EDR activation
+        // EDR requires the CAMetalLayer to be in a UIView hierarchy, not just window.layer
+        let container = UIView(frame: window.bounds)
+        container.backgroundColor = .clear
+        container.isUserInteractionEnabled = false
+
+        // Create Metal layer for video rendering
+        let layer = MetalLayer()
+        layer.frame = container.bounds
+        layer.contentsScale = UIScreen.main.nativeScale
+        layer.framebufferOnly = true
+        layer.backgroundColor = UIColor.black.cgColor
+
+        container.layer.addSublayer(layer)
+        containerView = container
+        metalLayer = layer
+
+        // Add container view to window (behind Flutter's root view controller)
+        window.insertSubview(container, at: 0)
+
+        print(
+            "[MpvPlayerCore] Metal layer added to window via container view, frame: \(layer.frame)")
+
+        // Initialize MPV with this Metal layer
+        guard setupMpv() else {
+            print("[MpvPlayerCore] Failed to setup MPV")
+            layer.removeFromSuperlayer()
+            container.removeFromSuperview()
+            metalLayer = nil
+            containerView = nil
+            return false
+        }
+
+        // Setup background/foreground notifications
+        setupNotifications()
+
+        isInitialized = true
+        print("[MpvPlayerCore] Initialized successfully with MPV")
+        return true
+    }
+
+    private func setupMpv() -> Bool {
+        guard let metalLayer = metalLayer else { return false }
+
+        mpv = mpv_create()
+        guard mpv != nil else {
+            print("[MpvPlayerCore] Failed to create MPV context")
+            return false
+        }
+
+        // Logging
+        #if DEBUG
+            checkError(mpv_request_log_messages(mpv, "info"))
+        #else
+            checkError(mpv_request_log_messages(mpv, "warn"))
+        #endif
+
+        // Set the Metal layer as the render target (must use local var for &)
+        var layer = metalLayer
+        checkError(mpv_set_option(mpv, "wid", MPV_FORMAT_INT64, &layer))
+
+        // Video output settings for Metal/Vulkan
+        checkError(mpv_set_option_string(mpv, "vo", "gpu-next"))
+        checkError(mpv_set_option_string(mpv, "gpu-api", "vulkan"))
+        checkError(mpv_set_option_string(mpv, "gpu-context", "moltenvk"))
+        checkError(mpv_set_option_string(mpv, "hwdec", "videotoolbox"))
+        checkError(mpv_set_option_string(mpv, "target-colorspace-hint", "yes"))
+
+        // Initialize MPV
+        let initResult = mpv_initialize(mpv)
+        if initResult < 0 {
+            print(
+                "[MpvPlayerCore] mpv_initialize failed: \(String(cString: mpv_error_string(initResult)))"
+            )
+            mpv_terminate_destroy(mpv)
+            mpv = nil
+            return false
+        }
+
+        // Set up wakeup callback for event handling
+        mpv_set_wakeup_callback(
+            mpv,
+            { ctx in
+                let core = Unmanaged<MpvPlayerCore>.fromOpaque(ctx!).takeUnretainedValue()
+                core.readEvents()
+            }, UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque()))
+
+        // Observe video-params/sig-peak for HDR detection
+        mpv_observe_property(mpv, 0, "video-params/sig-peak", MPV_FORMAT_DOUBLE)
+
+        print("[MpvPlayerCore] MPV initialized successfully")
+        return true
+    }
+
+    // MARK: - Background/Foreground Handling
+
+    private func setupNotifications() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(enterBackground),
+            name: UIApplication.didEnterBackgroundNotification,
+            object: nil
+        )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(enterForeground),
+            name: UIApplication.willEnterForegroundNotification,
+            object: nil
+        )
+    }
+
+    @objc private func enterBackground() {
+        // Disable video output to fix black screen when returning from background
+        print("[MpvPlayerCore] Entering background - disabling video")
+        if mpv != nil {
+            mpv_set_option_string(mpv, "vid", "no")
+        }
+    }
+
+    @objc private func enterForeground() {
+        // Re-enable video output
+        print("[MpvPlayerCore] Entering foreground - enabling video")
+        if mpv != nil {
+            mpv_set_option_string(mpv, "vid", "auto")
+        }
+    }
+
+    // MARK: - MPV Properties and Commands
+
+    func setProperty(_ name: String, value: String) {
+        guard mpv != nil else { return }
+
+        // Handle custom HDR toggle property
+        if name == "hdr-enabled" {
+            let enabled = value == "yes" || value == "true" || value == "1"
+            setHDREnabled(enabled)
+            return
+        }
+
+        mpv_set_property_string(mpv, name, value)
+    }
+
+    /// Enable or disable HDR mode
+    func setHDREnabled(_ enabled: Bool) {
+        hdrEnabled = enabled
+        print("[MpvPlayerCore] HDR enabled: \(enabled)")
+
+        // Update MPV's target-colorspace-hint
+        if mpv != nil {
+            mpv_set_property_string(mpv, "target-colorspace-hint", enabled ? "yes" : "no")
+        }
+
+        // Re-evaluate EDR mode with current sig-peak
+        DispatchQueue.main.async {
+            self.updateEDRMode(sigPeak: self.lastSigPeak)
+        }
+    }
+
+    func getProperty(_ name: String) -> String? {
+        guard mpv != nil else { return nil }
+        let cstr = mpv_get_property_string(mpv, name)
+        defer { mpv_free(cstr) }
+        return cstr.map { String(cString: $0) }
+    }
+
+    func observeProperty(_ name: String, format: String) {
+        guard mpv != nil else { return }
+
+        let mpvFormat: mpv_format
+        switch format {
+        case "double": mpvFormat = MPV_FORMAT_DOUBLE
+        case "flag": mpvFormat = MPV_FORMAT_FLAG
+        case "node": mpvFormat = MPV_FORMAT_NODE
+        case "string": mpvFormat = MPV_FORMAT_STRING
+        default: return
+        }
+
+        mpv_observe_property(mpv, 0, name, mpvFormat)
+    }
+
+    func command(_ args: [String]) {
+        guard mpv != nil, !args.isEmpty else { return }
+        command(args[0], args: Array(args.dropFirst()))
+    }
+
+    // MARK: - Visibility
+
+    func setVisible(_ visible: Bool) {
+        guard let container = containerView else { return }
+
+        if visible {
+            // Re-insert at the bottom of the window view stack
+            container.removeFromSuperview()
+            window?.insertSubview(container, at: 0)
+        }
+
+        container.isHidden = !visible
+        print("[MpvPlayerCore] setVisible(\(visible))")
+    }
+
+    func updateFrame(_ frame: CGRect? = nil) {
+        guard let metalLayer = metalLayer, let container = containerView else { return }
+
+        if let frame = frame {
+            container.frame = frame
+            metalLayer.frame = container.bounds
+        } else if let window = window {
+            container.frame = window.bounds
+            metalLayer.frame = container.bounds
+        }
+
+        // Update drawable size for proper scaling
+        let scale = UIScreen.main.nativeScale
+        metalLayer.drawableSize = CGSize(
+            width: metalLayer.frame.width * scale,
+            height: metalLayer.frame.height * scale
+        )
+
+        print("[MpvPlayerCore] updateFrame: \(container.frame)")
+    }
+
+    // MARK: - Private Helpers
+
+    private func command(_ cmd: String, args: [String] = []) {
+        guard mpv != nil else { return }
+
+        // Build array of C strings for mpv_command
+        var cargs: [UnsafeMutablePointer<CChar>?] = ([cmd] + args).map { strdup($0) }
+        cargs.append(nil)  // null-terminate
+        defer {
+            for ptr in cargs {
+                free(ptr)
+            }
+        }
+
+        // mpv_command expects UnsafePointer, use withUnsafeBufferPointer for the conversion
+        cargs.withUnsafeBufferPointer { buffer in
+            var constPtrs = buffer.map { UnsafePointer($0) }
+            _ = mpv_command(mpv, &constPtrs)
+        }
+    }
+
+    private func readEvents() {
+        queue.async { [weak self] in
+            guard let self = self, let mpv = self.mpv else { return }
+
+            while true {
+                let event = mpv_wait_event(mpv, 0)
+                guard let eventPtr = event else { break }
+
+                if eventPtr.pointee.event_id == MPV_EVENT_NONE {
+                    break
+                }
+
+                self.handleEvent(eventPtr.pointee)
+            }
+        }
+    }
+
+    private func handleEvent(_ event: mpv_event) {
+        switch event.event_id {
+        case MPV_EVENT_PROPERTY_CHANGE:
+            guard let data = event.data else { break }
+            let property = data.assumingMemoryBound(to: mpv_event_property.self).pointee
+            let name = String(cString: property.name)
+            handlePropertyChange(name: name, property: property)
+
+        case MPV_EVENT_FILE_LOADED:
+            DispatchQueue.main.async {
+                self.delegate?.onEvent(name: "file-loaded", data: nil)
+            }
+
+        case MPV_EVENT_END_FILE:
+            DispatchQueue.main.async {
+                self.delegate?.onEvent(name: "end-file", data: nil)
+            }
+
+        case MPV_EVENT_SHUTDOWN:
+            print("[MpvPlayerCore] MPV shutdown event")
+
+        case MPV_EVENT_LOG_MESSAGE:
+            if let msgPtr = event.data?.assumingMemoryBound(to: mpv_event_log_message.self) {
+                let msg = msgPtr.pointee
+                if let prefix = msg.prefix, let level = msg.level, let text = msg.text {
+                    print(
+                        "[MPV:\(String(cString: prefix))] \(String(cString: level)): \(String(cString: text))",
+                        terminator: "")
+                }
+            }
+
+        default:
+            break
+        }
+    }
+
+    private func handlePropertyChange(name: String, property: mpv_event_property) {
+        var value: Any?
+
+        switch property.format {
+        case MPV_FORMAT_DOUBLE:
+            if let ptr = property.data {
+                value = ptr.assumingMemoryBound(to: Double.self).pointee
+            }
+
+        case MPV_FORMAT_FLAG:
+            if let ptr = property.data {
+                value = ptr.assumingMemoryBound(to: Int32.self).pointee != 0
+            }
+
+        case MPV_FORMAT_NODE:
+            if let ptr = property.data {
+                let node = ptr.assumingMemoryBound(to: mpv_node.self).pointee
+                value = convertNode(node)
+            }
+
+        case MPV_FORMAT_STRING:
+            if let ptr = property.data {
+                let cstr = ptr.assumingMemoryBound(to: UnsafePointer<CChar>?.self).pointee
+                value = cstr.map { String(cString: $0) }
+            }
+
+        default:
+            break
+        }
+
+        // Handle sig-peak for HDR/EDR activation
+        if name == "video-params/sig-peak", let sigPeak = value as? Double {
+            lastSigPeak = sigPeak
+            DispatchQueue.main.async {
+                self.updateEDRMode(sigPeak: sigPeak)
+            }
+        }
+
+        DispatchQueue.main.async {
+            self.delegate?.onPropertyChange(name: name, value: value)
+        }
+    }
+
+    // MARK: - HDR/EDR Support
+
+    private func updateEDRMode(sigPeak: Double) {
+        guard let layer = metalLayer else { return }
+
+        // Check if screen supports EDR (iOS 16+)
+        var edrHeadroom: CGFloat = 1.0
+        if #available(iOS 16.0, *) {
+            edrHeadroom = containerView?.window?.screen.potentialEDRHeadroom ?? 1.0
+        }
+
+        let isHDRContent = sigPeak > 1.0
+        let screenSupportsEDR = edrHeadroom > 1.0
+        let shouldEnableEDR = hdrEnabled && isHDRContent && screenSupportsEDR
+
+        if #available(iOS 16.0, *) {
+            layer.wantsExtendedDynamicRangeContent = shouldEnableEDR
+        }
+
+        print(
+            "[MpvPlayerCore] EDR mode: \(shouldEnableEDR) (hdrEnabled: \(hdrEnabled), sigPeak: \(sigPeak), headroom: \(edrHeadroom))"
+        )
+    }
+
+    private func convertNode(_ node: mpv_node) -> Any? {
+        switch node.format {
+        case MPV_FORMAT_STRING:
+            return node.u.string.map { String(cString: $0) }
+
+        case MPV_FORMAT_FLAG:
+            return node.u.flag != 0
+
+        case MPV_FORMAT_INT64:
+            return node.u.int64
+
+        case MPV_FORMAT_DOUBLE:
+            return node.u.double_
+
+        case MPV_FORMAT_NODE_ARRAY:
+            guard let list = node.u.list?.pointee else { return nil }
+            var array = [Any]()
+            for i in 0..<Int(list.num) {
+                if let item = convertNode(list.values[i]) {
+                    array.append(item)
+                }
+            }
+            return array
+
+        case MPV_FORMAT_NODE_MAP:
+            guard let list = node.u.list?.pointee else { return nil }
+            var dict = [String: Any]()
+            for i in 0..<Int(list.num) {
+                if let key = list.keys?[i].map({ String(cString: $0) }),
+                    let val = convertNode(list.values[i])
+                {
+                    dict[key] = val
+                }
+            }
+            return dict
+
+        default:
+            return nil
+        }
+    }
+
+    private func checkError(_ status: CInt) {
+        if status < 0 {
+            print("[MpvPlayerCore] MPV error: \(String(cString: mpv_error_string(status)))")
+        }
+    }
+
+    // MARK: - Cleanup
+
+    func dispose() {
+        NotificationCenter.default.removeObserver(self)
+
+        let mpvHandle = mpv
+        mpv = nil
+
+        queue.sync {
+            if let handle = mpvHandle {
+                mpv_set_wakeup_callback(handle, nil, nil)
+                mpv_terminate_destroy(handle)
+            }
+        }
+        metalLayer?.removeFromSuperlayer()
+        metalLayer = nil
+        containerView?.removeFromSuperview()
+        containerView = nil
+        isInitialized = false
+        print("[MpvPlayerCore] Disposed")
+    }
+
+    deinit {
+        dispose()
+    }
+}
diff --git a/ios/Runner/MpvPlayer/MpvPlayerPlugin.swift b/ios/Runner/MpvPlayer/MpvPlayerPlugin.swift
new file mode 100644
index 00000000..3e81464d
--- /dev/null
+++ b/ios/Runner/MpvPlayer/MpvPlayerPlugin.swift
@@ -0,0 +1,245 @@
+import UIKit
+import Flutter
+
+/// Flutter plugin that bridges MPV player to Dart via method and event channels
+class MpvPlayerPlugin: NSObject, FlutterPlugin, FlutterStreamHandler, MpvPlayerDelegate {
+
+    // MARK: - Properties
+
+    private var playerCore: MpvPlayerCore?
+    private var eventSink: FlutterEventSink?
+    private weak var registrar: FlutterPluginRegistrar?
+
+    // MARK: - FlutterPlugin Registration
+
+    static func register(with registrar: FlutterPluginRegistrar) {
+        // Method channel for commands
+        let methodChannel = FlutterMethodChannel(
+            name: "com.plezy/mpv_player",
+            binaryMessenger: registrar.messenger()
+        )
+
+        // Event channel for state updates
+        let eventChannel = FlutterEventChannel(
+            name: "com.plezy/mpv_player/events",
+            binaryMessenger: registrar.messenger()
+        )
+
+        let instance = MpvPlayerPlugin()
+        instance.registrar = registrar
+
+        registrar.addMethodCallDelegate(instance, channel: methodChannel)
+        eventChannel.setStreamHandler(instance)
+
+        print("[MpvPlayerPlugin] Registered with Flutter")
+    }
+
+    // MARK: - FlutterStreamHandler
+
+    func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
+        self.eventSink = events
+        print("[MpvPlayerPlugin] Event stream connected")
+        return nil
+    }
+
+    func onCancel(withArguments arguments: Any?) -> FlutterError? {
+        self.eventSink = nil
+        print("[MpvPlayerPlugin] Event stream disconnected")
+        return nil
+    }
+
+    // MARK: - FlutterPlugin Method Handler
+
+    func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        switch call.method {
+        case "initialize":
+            handleInitialize(result: result)
+
+        case "dispose":
+            handleDispose(result: result)
+
+        case "setProperty":
+            handleSetProperty(call: call, result: result)
+
+        case "getProperty":
+            handleGetProperty(call: call, result: result)
+
+        case "observeProperty":
+            handleObserveProperty(call: call, result: result)
+
+        case "command":
+            handleCommand(call: call, result: result)
+
+        case "setVisible":
+            handleSetVisible(call: call, result: result)
+
+        case "isInitialized":
+            result(playerCore?.isInitialized ?? false)
+
+        case "updateFrame":
+            handleUpdateFrame(result: result)
+
+        default:
+            result(FlutterMethodNotImplemented)
+        }
+    }
+
+    // MARK: - Method Handlers
+
+    private func handleInitialize(result: @escaping FlutterResult) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else {
+                result(FlutterError(code: "ERROR", message: "Plugin deallocated", details: nil))
+                return
+            }
+
+            // Check if already initialized
+            if self.playerCore?.isInitialized == true {
+                print("[MpvPlayerPlugin] Already initialized")
+                result(true)
+                return
+            }
+
+            // Find the key window
+            guard let window = self.findKeyWindow() else {
+                print("[MpvPlayerPlugin] Failed to find key window")
+                result(FlutterError(code: "NO_WINDOW", message: "Could not find key window", details: nil))
+                return
+            }
+
+            // Create and initialize player core
+            let core = MpvPlayerCore()
+            core.delegate = self
+
+            guard core.initialize(in: window) else {
+                print("[MpvPlayerPlugin] Failed to initialize MPV")
+                result(FlutterError(code: "MPV_INIT_FAILED", message: "Failed to initialize MPV", details: nil))
+                return
+            }
+
+            self.playerCore = core
+
+            // Start hidden
+            core.setVisible(false)
+
+            print("[MpvPlayerPlugin] Initialized successfully")
+            result(true)
+        }
+    }
+
+    private func handleDispose(result: @escaping FlutterResult) {
+        DispatchQueue.main.async { [weak self] in
+            self?.playerCore?.dispose()
+            self?.playerCore = nil
+            print("[MpvPlayerPlugin] Disposed")
+            result(nil)
+        }
+    }
+
+    private func handleSetProperty(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let name = args["name"] as? String,
+              let value = args["value"] as? String else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'name' or 'value' argument", details: nil))
+            return
+        }
+
+        playerCore?.setProperty(name, value: value)
+        result(nil)
+    }
+
+    private func handleGetProperty(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let name = args["name"] as? String else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'name' argument", details: nil))
+            return
+        }
+
+        let value = playerCore?.getProperty(name)
+        result(value)
+    }
+
+    private func handleObserveProperty(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let name = args["name"] as? String,
+              let format = args["format"] as? String else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'name' or 'format' argument", details: nil))
+            return
+        }
+
+        playerCore?.observeProperty(name, format: format)
+        result(nil)
+    }
+
+    private func handleCommand(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let commandArgs = args["args"] as? [String] else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'args' argument", details: nil))
+            return
+        }
+
+        playerCore?.command(commandArgs)
+        result(nil)
+    }
+
+    private func handleSetVisible(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let visible = args["visible"] as? Bool else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'visible' argument", details: nil))
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+            self?.playerCore?.setVisible(visible)
+
+            // Update frame when becoming visible
+            if visible {
+                self?.playerCore?.updateFrame()
+            }
+
+            result(nil)
+        }
+    }
+
+    private func handleUpdateFrame(result: @escaping FlutterResult) {
+        DispatchQueue.main.async { [weak self] in
+            self?.playerCore?.updateFrame()
+            result(nil)
+        }
+    }
+
+    // MARK: - MpvPlayerDelegate
+
+    func onPropertyChange(name: String, value: Any?) {
+        guard let eventSink = eventSink else { return }
+
+        var event: [String: Any] = ["type": "property", "name": name]
+
+        if let value = value {
+            event["value"] = value
+        }
+
+        eventSink(event)
+    }
+
+    func onEvent(name: String, data: [String: Any]?) {
+        guard let eventSink = eventSink else { return }
+
+        var event: [String: Any] = ["type": "event", "name": name]
+        if let data = data {
+            event["data"] = data
+        }
+
+        eventSink(event)
+    }
+
+    // MARK: - Helpers
+
+    private func findKeyWindow() -> UIWindow? {
+        guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+              let window = windowScene.windows.first(where: { $0.isKeyWindow }) else {
+            return nil
+        }
+        return window
+    }
+}
diff --git a/lib/client/plex_client.dart b/lib/client/plex_client.dart
deleted file mode 100644
index ebce3753..00000000
--- a/lib/client/plex_client.dart
+++ /dev/null
@@ -1,1178 +0,0 @@
-import 'dart:convert';
-
-import 'package:dio/dio.dart';
-
-import '../config/plex_config.dart';
-import '../models/plex_file_info.dart';
-import '../models/plex_filter.dart';
-import '../models/plex_hub.dart';
-import '../models/plex_library.dart';
-import '../models/plex_media_info.dart';
-import '../models/plex_media_version.dart';
-import '../models/plex_metadata.dart';
-import '../models/plex_sort.dart';
-import '../models/plex_video_playback_data.dart';
-import '../utils/app_logger.dart';
-
-/// Result of testing a connection, including success status and latency
-class ConnectionTestResult {
-  final bool success;
-  final int latencyMs;
-
-  ConnectionTestResult({required this.success, required this.latencyMs});
-}
-
-class PlexClient {
-  PlexConfig config;
-  late final Dio _dio;
-
-  /// Custom response decoder that handles malformed UTF-8 gracefully
-  static String _lenientUtf8Decoder(
-    List<int> responseBytes,
-    RequestOptions options,
-    ResponseBody responseBody,
-  ) {
-    return utf8.decode(responseBytes, allowMalformed: true);
-  }
-
-  PlexClient(this.config) {
-    _dio = Dio(
-      BaseOptions(
-        baseUrl: config.baseUrl,
-        headers: config.headers,
-        connectTimeout: const Duration(seconds: 10),
-        receiveTimeout: const Duration(seconds: 120),
-        validateStatus: (status) => status != null && status < 500,
-        responseType: ResponseType.json,
-        contentType: 'application/json; charset=utf-8',
-        responseDecoder: _lenientUtf8Decoder,
-      ),
-    );
-
-    // Add interceptor for logging (optional, can be disabled in production)
-    _dio.interceptors.add(
-      LogInterceptor(
-        requestBody: false,
-        responseBody: false,
-        error: true,
-        requestHeader: false,
-        responseHeader: false,
-      ),
-    );
-  }
-
-  /// Update the token used by this client
-  void updateToken(String newToken) {
-    // Update both the Dio headers and the config to ensure consistency
-    _dio.options.headers['X-Plex-Token'] = newToken;
-    config = config.copyWith(token: newToken);
-    appLogger.d('PlexClient token updated (headers and config)');
-  }
-
-  /// Test connection to server
-  Future<bool> testConnection() async {
-    try {
-      final response = await _dio.get('/');
-      return response.statusCode == 200 || response.statusCode == 401;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  /// Test connection to a specific URL with token and measure latency
-  static Future<ConnectionTestResult> testConnectionWithLatency(
-    String baseUrl,
-    String token, {
-    Duration timeout = const Duration(seconds: 5),
-  }) async {
-    final stopwatch = Stopwatch()..start();
-
-    try {
-      final dio = Dio(
-        BaseOptions(
-          baseUrl: baseUrl,
-          connectTimeout: timeout,
-          receiveTimeout: timeout,
-          validateStatus: (status) => status != null && status < 500,
-          responseType: ResponseType.json,
-          contentType: 'application/json; charset=utf-8',
-        ),
-      );
-
-      final response = await dio.get(
-        '/',
-        options: Options(headers: {'X-Plex-Token': token}),
-      );
-
-      stopwatch.stop();
-      final success = response.statusCode == 200 || response.statusCode == 401;
-
-      return ConnectionTestResult(
-        success: success,
-        latencyMs: stopwatch.elapsedMilliseconds,
-      );
-    } catch (e) {
-      stopwatch.stop();
-      return ConnectionTestResult(
-        success: false,
-        latencyMs: stopwatch.elapsedMilliseconds,
-      );
-    }
-  }
-
-  /// Test connection multiple times and return average latency
-  static Future<ConnectionTestResult> testConnectionWithAverageLatency(
-    String baseUrl,
-    String token, {
-    int attempts = 3,
-    Duration timeout = const Duration(seconds: 5),
-  }) async {
-    final results = <ConnectionTestResult>[];
-
-    for (int i = 0; i < attempts; i++) {
-      final result = await testConnectionWithLatency(
-        baseUrl,
-        token,
-        timeout: timeout,
-      );
-
-      // If any attempt fails, return failed result immediately
-      if (!result.success) {
-        return ConnectionTestResult(
-          success: false,
-          latencyMs: result.latencyMs,
-        );
-      }
-
-      results.add(result);
-    }
-
-    // Calculate average latency from successful attempts
-    final avgLatency =
-        results.fold<int>(0, (sum, result) => sum + result.latencyMs) ~/
-        results.length;
-
-    return ConnectionTestResult(success: true, latencyMs: avgLatency);
-  }
-
-  // ============================================================================
-  // API Response Parsing Helpers
-  // ============================================================================
-
-  /// Extract MediaContainer from API response
-  Map<String, dynamic>? _getMediaContainer(Response response) {
-    if (response.data is Map && response.data.containsKey('MediaContainer')) {
-      return response.data['MediaContainer'];
-    }
-    return null;
-  }
-
-  /// Extract list of PlexMetadata from response
-  List<PlexMetadata> _extractMetadataList(Response response) {
-    final container = _getMediaContainer(response);
-    if (container != null && container['Metadata'] != null) {
-      return (container['Metadata'] as List)
-          .map((json) => PlexMetadata.fromJson(json))
-          .toList();
-    }
-    return [];
-  }
-
-  /// Extract first metadata JSON from response (returns raw Map or null)
-  Map<String, dynamic>? _getFirstMetadataJson(Response response) {
-    final container = _getMediaContainer(response);
-    if (container != null &&
-        container['Metadata'] != null &&
-        (container['Metadata'] as List).isNotEmpty) {
-      return container['Metadata'][0] as Map<String, dynamic>;
-    }
-    return null;
-  }
-
-  /// Extract single PlexMetadata from response (returns first item or null)
-  PlexMetadata? _extractSingleMetadata(Response response) {
-    final metadataJson = _getFirstMetadataJson(response);
-    return metadataJson != null ? PlexMetadata.fromJson(metadataJson) : null;
-  }
-
-  /// Generic helper to extract and map Directory list from response
-  List<T> _extractDirectoryList<T>(
-    Response response,
-    T Function(Map<String, dynamic>) fromJson,
-  ) {
-    final container = _getMediaContainer(response);
-    if (container != null && container['Directory'] != null) {
-      return (container['Directory'] as List)
-          .map((json) => fromJson(json as Map<String, dynamic>))
-          .toList();
-    }
-    return [];
-  }
-
-  // ============================================================================
-  // API Methods
-  // ============================================================================
-
-  /// Get server identity
-  Future<Map<String, dynamic>> getServerIdentity() async {
-    final response = await _dio.get('/identity');
-    return response.data;
-  }
-
-  /// Get library sections
-  Future<List<PlexLibrary>> getLibraries() async {
-    final response = await _dio.get('/library/sections');
-    return _extractDirectoryList(response, PlexLibrary.fromJson);
-  }
-
-  /// Get library content by section ID
-  Future<List<PlexMetadata>> getLibraryContent(
-    String sectionId, {
-    int? start,
-    int? size,
-    Map<String, String>? filters,
-    CancelToken? cancelToken,
-  }) async {
-    final queryParams = <String, dynamic>{};
-    if (start != null) queryParams['X-Plex-Container-Start'] = start;
-    if (size != null) queryParams['X-Plex-Container-Size'] = size;
-
-    // Add filter parameters
-    if (filters != null) {
-      queryParams.addAll(filters);
-    }
-
-    final response = await _dio.get(
-      '/library/sections/$sectionId/all',
-      queryParameters: queryParams,
-      cancelToken: cancelToken,
-    );
-
-    return _extractMetadataList(response);
-  }
-
-  /// Get metadata by rating key
-  Future<PlexMetadata?> getMetadata(String ratingKey) async {
-    final response = await _dio.get('/library/metadata/$ratingKey');
-    return _extractSingleMetadata(response);
-  }
-
-  /// Get metadata by rating key with images (includes clearLogo and OnDeck)
-  Future<Map<String, dynamic>> getMetadataWithImagesAndOnDeck(
-    String ratingKey,
-  ) async {
-    final response = await _dio.get(
-      '/library/metadata/$ratingKey',
-      queryParameters: {'includeOnDeck': 1},
-    );
-
-    PlexMetadata? metadata;
-    PlexMetadata? onDeckEpisode;
-
-    final metadataJson = _getFirstMetadataJson(response);
-
-    // Log the parsed metadata JSON
-    if (metadataJson != null) {
-      metadata = PlexMetadata.fromJsonWithImages(metadataJson);
-
-      // Check if OnDeck is nested inside Metadata
-      if (metadataJson.containsKey('OnDeck') &&
-          metadataJson['OnDeck'] != null) {
-        final onDeckData = metadataJson['OnDeck'];
-
-        // OnDeck can be either a Map with 'Metadata' key or direct metadata
-        if (onDeckData is Map && onDeckData.containsKey('Metadata')) {
-          final onDeckMetadata = onDeckData['Metadata'];
-          if (onDeckMetadata != null) {
-            onDeckEpisode = PlexMetadata.fromJson(onDeckMetadata);
-          }
-        }
-      }
-    }
-
-    return {'metadata': metadata, 'onDeckEpisode': onDeckEpisode};
-  }
-
-  /// Get metadata by rating key with images (includes clearLogo)
-  Future<PlexMetadata?> getMetadataWithImages(String ratingKey) async {
-    final response = await _dio.get('/library/metadata/$ratingKey');
-    final metadataJson = _getFirstMetadataJson(response);
-    return metadataJson != null
-        ? PlexMetadata.fromJsonWithImages(metadataJson)
-        : null;
-  }
-
-  /// Search across all libraries using the hub search endpoint
-  /// Only returns movies and shows, filtering out seasons and episodes
-  Future<List<PlexMetadata>> search(String query, {int limit = 10}) async {
-    final response = await _dio.get(
-      '/hubs/search',
-      queryParameters: {
-        'query': query,
-        'limit': limit,
-        'includeCollections': 1,
-      },
-    );
-
-    final results = <PlexMetadata>[];
-
-    if (response.data is Map && response.data.containsKey('MediaContainer')) {
-      final container = response.data['MediaContainer'];
-      if (container['Hub'] != null) {
-        // Each hub contains results of a specific type (movies, shows, etc.)
-        for (final hub in container['Hub'] as List) {
-          final hubType = hub['type'] as String?;
-
-          // Only include movie and show hubs
-          if (hubType != 'movie' && hubType != 'show') {
-            continue;
-          }
-
-          // Hubs can contain either Metadata (for movies) or Directory (for shows)
-          if (hub['Metadata'] != null) {
-            for (final json in hub['Metadata'] as List) {
-              try {
-                results.add(PlexMetadata.fromJson(json));
-              } catch (e) {
-                // Skip items that fail to parse
-                appLogger.w('Failed to parse search result', error: e);
-                appLogger.d('Problematic JSON: $json');
-              }
-            }
-          }
-          if (hub['Directory'] != null) {
-            for (final json in hub['Directory'] as List) {
-              try {
-                results.add(PlexMetadata.fromJson(json));
-              } catch (e) {
-                // Skip items that fail to parse
-                appLogger.w('Failed to parse search result', error: e);
-                appLogger.d('Problematic JSON: $json');
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return results;
-  }
-
-  /// Get recently added media (filtered to video content only)
-  Future<List<PlexMetadata>> getRecentlyAdded({int limit = 50}) async {
-    final response = await _dio.get(
-      '/library/recentlyAdded',
-      queryParameters: {'X-Plex-Container-Size': limit, 'includeGuids': 1},
-    );
-    final allItems = _extractMetadataList(response);
-
-    // Filter out music content (artists, albums, tracks)
-    return allItems.where((item) {
-      final type = item.type.toLowerCase();
-      return type != 'artist' && type != 'album' && type != 'track';
-    }).toList();
-  }
-
-  /// Get on deck items (continue watching, filtered to video content only)
-  Future<List<PlexMetadata>> getOnDeck() async {
-    final response = await _dio.get('/library/onDeck');
-    final container = _getMediaContainer(response);
-    if (container != null && container['Metadata'] != null) {
-      final allItems = (container['Metadata'] as List)
-          .map((json) => PlexMetadata.fromJsonWithImages(json))
-          .toList();
-
-      // Filter out music content (artists, albums, tracks)
-      return allItems.where((item) {
-        final type = item.type.toLowerCase();
-        return type != 'artist' && type != 'album' && type != 'track';
-      }).toList();
-    }
-    return [];
-  }
-
-  /// Get children of a metadata item (e.g., seasons for a show, episodes for a season)
-  Future<List<PlexMetadata>> getChildren(String ratingKey) async {
-    final response = await _dio.get('/library/metadata/$ratingKey/children');
-    return _extractMetadataList(response);
-  }
-
-  /// Get all unwatched episodes for a TV show across all seasons
-  Future<List<PlexMetadata>> getAllUnwatchedEpisodes(
-    String showRatingKey,
-  ) async {
-    final allEpisodes = <PlexMetadata>[];
-
-    // Get all seasons for the show
-    final seasons = await getChildren(showRatingKey);
-
-    // Get episodes from each season
-    for (final season in seasons) {
-      if (season.type == 'season') {
-        final episodes = await getChildren(season.ratingKey);
-
-        // Filter for unwatched episodes
-        final unwatchedEpisodes = episodes
-            .where((ep) => ep.type == 'episode' && (ep.viewCount ?? 0) == 0)
-            .toList();
-
-        allEpisodes.addAll(unwatchedEpisodes);
-      }
-    }
-
-    return allEpisodes;
-  }
-
-  /// Get all unwatched episodes in a specific season
-  Future<List<PlexMetadata>> getUnwatchedEpisodesInSeason(
-    String seasonRatingKey,
-  ) async {
-    final episodes = await getChildren(seasonRatingKey);
-
-    // Filter for unwatched episodes
-    return episodes
-        .where((ep) => ep.type == 'episode' && (ep.viewCount ?? 0) == 0)
-        .toList();
-  }
-
-  /// Get thumbnail URL
-  String getThumbnailUrl(String? thumbPath) {
-    if (thumbPath == null || thumbPath.isEmpty) return '';
-
-    // Remove leading slash if present
-    final path = thumbPath.startsWith('/') ? thumbPath.substring(1) : thumbPath;
-
-    return '${config.baseUrl}/$path?X-Plex-Token=${config.token}';
-  }
-
-  /// Get video URL for direct playback
-  /// [mediaIndex] specifies which Media item to use (defaults to 0 - first version)
-  Future<String?> getVideoUrl(String ratingKey, {int mediaIndex = 0}) async {
-    final response = await _dio.get('/library/metadata/$ratingKey');
-    final metadataJson = _getFirstMetadataJson(response);
-
-    if (metadataJson != null &&
-        metadataJson['Media'] != null &&
-        (metadataJson['Media'] as List).isNotEmpty) {
-      final mediaList = metadataJson['Media'] as List;
-
-      // Ensure the requested index is valid
-      if (mediaIndex < 0 || mediaIndex >= mediaList.length) {
-        mediaIndex = 0;
-      }
-
-      final media = mediaList[mediaIndex];
-      if (media['Part'] != null && (media['Part'] as List).isNotEmpty) {
-        final part = media['Part'][0];
-        final partKey = part['key'] as String?;
-
-        if (partKey != null) {
-          // Return direct play URL
-          return '${config.baseUrl}$partKey?X-Plex-Token=${config.token}';
-        }
-      }
-    }
-
-    return null;
-  }
-
-  /// Get chapters for a media item
-  Future<List<PlexChapter>> getChapters(String ratingKey) async {
-    final response = await _dio.get(
-      '/library/metadata/$ratingKey',
-      queryParameters: {'includeChapters': 1},
-    );
-
-    final metadataJson = _getFirstMetadataJson(response);
-    if (metadataJson != null && metadataJson['Chapter'] != null) {
-      final chapterList = metadataJson['Chapter'] as List<dynamic>;
-      return chapterList.map((chapter) {
-        return PlexChapter(
-          id: chapter['id'] as int,
-          index: chapter['index'] as int?,
-          startTimeOffset: chapter['startTimeOffset'] as int?,
-          endTimeOffset: chapter['endTimeOffset'] as int?,
-          title: chapter['tag'] as String?,
-          thumb: chapter['thumb'] as String?,
-        );
-      }).toList();
-    }
-
-    return [];
-  }
-
-  Future<List<PlexMarker>> getMarkers(String ratingKey) async {
-    final response = await _dio.get(
-      '/library/metadata/$ratingKey',
-      queryParameters: {'includeMarkers': 1},
-    );
-
-    final metadataJson = _getFirstMetadataJson(response);
-
-    if (metadataJson != null && metadataJson['Marker'] != null) {
-      final markerList = metadataJson['Marker'] as List;
-      return markerList.map((marker) {
-        return PlexMarker(
-          id: marker['id'] as int,
-          type: marker['type'] as String,
-          startTimeOffset: marker['startTimeOffset'] as int,
-          endTimeOffset: marker['endTimeOffset'] as int,
-        );
-      }).toList();
-    }
-
-    return [];
-  }
-
-  /// Get detailed media info including chapters and tracks
-  /// [mediaIndex] specifies which Media item to use (defaults to 0 - first version)
-  Future<PlexMediaInfo?> getMediaInfo(
-    String ratingKey, {
-    int mediaIndex = 0,
-  }) async {
-    final response = await _dio.get('/library/metadata/$ratingKey');
-    final metadataJson = _getFirstMetadataJson(response);
-
-    if (metadataJson != null &&
-        metadataJson['Media'] != null &&
-        (metadataJson['Media'] as List).isNotEmpty) {
-      final mediaList = metadataJson['Media'] as List;
-
-      // Ensure the requested index is valid
-      if (mediaIndex < 0 || mediaIndex >= mediaList.length) {
-        mediaIndex = 0;
-      }
-
-      final media = mediaList[mediaIndex];
-      if (media['Part'] != null && (media['Part'] as List).isNotEmpty) {
-        final part = media['Part'][0];
-        final partKey = part['key'] as String?;
-
-        if (partKey != null) {
-          // Parse streams (audio and subtitle tracks)
-          final streams = part['Stream'] as List<dynamic>? ?? [];
-          final audioTracks = <PlexAudioTrack>[];
-          final subtitleTracks = <PlexSubtitleTrack>[];
-
-          for (var stream in streams) {
-            final streamType = stream['streamType'] as int?;
-
-            if (streamType == 2) {
-              // Audio track
-              audioTracks.add(
-                PlexAudioTrack(
-                  id: stream['id'] as int,
-                  index: stream['index'] as int?,
-                  codec: stream['codec'] as String?,
-                  language: stream['language'] as String?,
-                  languageCode: stream['languageCode'] as String?,
-                  title: stream['title'] as String?,
-                  displayTitle: stream['displayTitle'] as String?,
-                  channels: stream['channels'] as int?,
-                  selected: stream['selected'] == 1,
-                ),
-              );
-            } else if (streamType == 3) {
-              // Subtitle track
-              subtitleTracks.add(
-                PlexSubtitleTrack(
-                  id: stream['id'] as int,
-                  index: stream['index'] as int?,
-                  codec: stream['codec'] as String?,
-                  language: stream['language'] as String?,
-                  languageCode: stream['languageCode'] as String?,
-                  title: stream['title'] as String?,
-                  displayTitle: stream['displayTitle'] as String?,
-                  selected: stream['selected'] == 1,
-                  forced: stream['forced'] == 1,
-                  key: stream['key'] as String?,
-                ),
-              );
-            }
-          }
-
-          // Parse chapters
-          final chapters = <PlexChapter>[];
-          if (metadataJson['Chapter'] != null) {
-            final chapterList = metadataJson['Chapter'] as List<dynamic>;
-            for (var chapter in chapterList) {
-              chapters.add(
-                PlexChapter(
-                  id: chapter['id'] as int,
-                  index: chapter['index'] as int?,
-                  startTimeOffset: chapter['startTimeOffset'] as int?,
-                  endTimeOffset: chapter['endTimeOffset'] as int?,
-                  title: chapter['title'] as String?,
-                  thumb: chapter['thumb'] as String?,
-                ),
-              );
-            }
-          }
-
-          return PlexMediaInfo(
-            videoUrl: '${config.baseUrl}$partKey?X-Plex-Token=${config.token}',
-            audioTracks: audioTracks,
-            subtitleTracks: subtitleTracks,
-            chapters: chapters,
-          );
-        }
-      }
-    }
-
-    return null;
-  }
-
-  /// Get all available media versions for a media item
-  /// Returns a list of PlexMediaVersion objects representing different quality/format options
-  Future<List<PlexMediaVersion>> getMediaVersions(String ratingKey) async {
-    final response = await _dio.get('/library/metadata/$ratingKey');
-    final metadataJson = _getFirstMetadataJson(response);
-
-    if (metadataJson != null &&
-        metadataJson['Media'] != null &&
-        (metadataJson['Media'] as List).isNotEmpty) {
-      final mediaList = metadataJson['Media'] as List;
-      return mediaList
-          .map(
-            (media) => PlexMediaVersion.fromJson(media as Map<String, dynamic>),
-          )
-          .toList();
-    }
-
-    return [];
-  }
-
-  /// Get consolidated video playback data (URL, media info, and versions) in a single API call
-  /// This method combines the functionality of getVideoUrl(), getMediaInfo(), and getMediaVersions()
-  /// to reduce redundant API calls during video playback initialization.
-  Future<PlexVideoPlaybackData> getVideoPlaybackData(
-    String ratingKey, {
-    int mediaIndex = 0,
-  }) async {
-    final response = await _dio.get('/library/metadata/$ratingKey');
-    final metadataJson = _getFirstMetadataJson(response);
-
-    String? videoUrl;
-    PlexMediaInfo? mediaInfo;
-    List<PlexMediaVersion> availableVersions = [];
-
-    if (metadataJson != null &&
-        metadataJson['Media'] != null &&
-        (metadataJson['Media'] as List).isNotEmpty) {
-      final mediaList = metadataJson['Media'] as List;
-
-      // Parse available media versions first
-      availableVersions = mediaList
-          .map(
-            (media) => PlexMediaVersion.fromJson(media as Map<String, dynamic>),
-          )
-          .toList();
-
-      // Ensure the requested index is valid
-      if (mediaIndex < 0 || mediaIndex >= mediaList.length) {
-        mediaIndex = 0;
-      }
-
-      final media = mediaList[mediaIndex];
-      if (media['Part'] != null && (media['Part'] as List).isNotEmpty) {
-        final part = media['Part'][0];
-        final partKey = part['key'] as String?;
-
-        if (partKey != null) {
-          // Get video URL
-          videoUrl = '${config.baseUrl}$partKey?X-Plex-Token=${config.token}';
-
-          // Parse streams (audio and subtitle tracks) for media info
-          final streams = part['Stream'] as List<dynamic>? ?? [];
-          final audioTracks = <PlexAudioTrack>[];
-          final subtitleTracks = <PlexSubtitleTrack>[];
-
-          for (var stream in streams) {
-            final streamType = stream['streamType'] as int?;
-
-            if (streamType == 2) {
-              // Audio track
-              audioTracks.add(
-                PlexAudioTrack(
-                  id: stream['id'] as int,
-                  index: stream['index'] as int?,
-                  codec: stream['codec'] as String?,
-                  language: stream['language'] as String?,
-                  languageCode: stream['languageCode'] as String?,
-                  title: stream['title'] as String?,
-                  displayTitle: stream['displayTitle'] as String?,
-                  channels: stream['channels'] as int?,
-                  selected: stream['selected'] == 1,
-                ),
-              );
-            } else if (streamType == 3) {
-              // Subtitle track
-              subtitleTracks.add(
-                PlexSubtitleTrack(
-                  id: stream['id'] as int,
-                  index: stream['index'] as int?,
-                  codec: stream['codec'] as String?,
-                  language: stream['language'] as String?,
-                  languageCode: stream['languageCode'] as String?,
-                  title: stream['title'] as String?,
-                  displayTitle: stream['displayTitle'] as String?,
-                  selected: stream['selected'] == 1,
-                  forced: stream['forced'] == 1,
-                  key: stream['key'] as String?,
-                ),
-              );
-            }
-          }
-
-          // Parse chapters
-          final chapters = <PlexChapter>[];
-          if (metadataJson['Chapter'] != null) {
-            final chapterList = metadataJson['Chapter'] as List<dynamic>;
-            for (var chapter in chapterList) {
-              chapters.add(
-                PlexChapter(
-                  id: chapter['id'] as int,
-                  index: chapter['index'] as int?,
-                  startTimeOffset: chapter['startTimeOffset'] as int?,
-                  endTimeOffset: chapter['endTimeOffset'] as int?,
-                  title: chapter['title'] as String?,
-                  thumb: chapter['thumb'] as String?,
-                ),
-              );
-            }
-          }
-
-          // Create media info
-          mediaInfo = PlexMediaInfo(
-            videoUrl: videoUrl,
-            audioTracks: audioTracks,
-            subtitleTracks: subtitleTracks,
-            chapters: chapters,
-          );
-        }
-      }
-    }
-
-    return PlexVideoPlaybackData(
-      videoUrl: videoUrl,
-      mediaInfo: mediaInfo,
-      availableVersions: availableVersions,
-    );
-  }
-
-  /// Get file information for a media item
-  Future<PlexFileInfo?> getFileInfo(String ratingKey) async {
-    try {
-      final response = await _dio.get('/library/metadata/$ratingKey');
-      final metadataJson = _getFirstMetadataJson(response);
-
-      if (metadataJson != null &&
-          metadataJson['Media'] != null &&
-          (metadataJson['Media'] as List).isNotEmpty) {
-        final media = metadataJson['Media'][0];
-        final part = media['Part'] != null && (media['Part'] as List).isNotEmpty
-            ? media['Part'][0]
-            : null;
-
-        // Extract video stream details
-        final streams = part?['Stream'] as List<dynamic>? ?? [];
-        Map<String, dynamic>? videoStream;
-        Map<String, dynamic>? audioStream;
-
-        for (var stream in streams) {
-          final streamType = stream['streamType'] as int?;
-          if (streamType == 1 && videoStream == null) {
-            videoStream = stream;
-          } else if (streamType == 2 && audioStream == null) {
-            audioStream = stream;
-          }
-        }
-
-        return PlexFileInfo(
-          // Media level properties
-          container: media['container'] as String?,
-          videoCodec: media['videoCodec'] as String?,
-          videoResolution: media['videoResolution'] as String?,
-          videoFrameRate: media['videoFrameRate'] as String?,
-          videoProfile: media['videoProfile'] as String?,
-          width: media['width'] as int?,
-          height: media['height'] as int?,
-          aspectRatio: (media['aspectRatio'] as num?)?.toDouble(),
-          bitrate: media['bitrate'] as int?,
-          duration: media['duration'] as int?,
-          audioCodec: media['audioCodec'] as String?,
-          audioProfile: media['audioProfile'] as String?,
-          audioChannels: media['audioChannels'] as int?,
-          optimizedForStreaming: media['optimizedForStreaming'] as bool?,
-          has64bitOffsets: media['has64bitOffsets'] as bool?,
-          // Part level properties (file)
-          filePath: part?['file'] as String?,
-          fileSize: part?['size'] as int?,
-          // Video stream details
-          colorSpace: videoStream?['colorSpace'] as String?,
-          colorRange: videoStream?['colorRange'] as String?,
-          colorPrimaries: videoStream?['colorPrimaries'] as String?,
-          colorTrc: videoStream?['colorTrc'] as String?,
-          chromaSubsampling: videoStream?['chromaSubsampling'] as String?,
-          frameRate: (videoStream?['frameRate'] as num?)?.toDouble(),
-          bitDepth: videoStream?['bitDepth'] as int?,
-          // Audio stream details
-          audioChannelLayout: audioStream?['audioChannelLayout'] as String?,
-        );
-      }
-
-      return null;
-    } catch (e) {
-      appLogger.e('Failed to get file info: $e');
-      return null;
-    }
-  }
-
-  /// Mark media as watched
-  Future<void> markAsWatched(String ratingKey) async {
-    await _dio.get(
-      '/:/scrobble',
-      queryParameters: {
-        'key': ratingKey,
-        'identifier': 'com.plexapp.plugins.library',
-      },
-    );
-  }
-
-  /// Mark media as unwatched
-  Future<void> markAsUnwatched(String ratingKey) async {
-    await _dio.get(
-      '/:/unscrobble',
-      queryParameters: {
-        'key': ratingKey,
-        'identifier': 'com.plexapp.plugins.library',
-      },
-    );
-  }
-
-  /// Update playback progress
-  Future<void> updateProgress(
-    String ratingKey, {
-    required int time,
-    required String state, // 'playing', 'paused', 'stopped', 'buffering'
-    int? duration,
-  }) async {
-    await _dio.post(
-      '/:/timeline',
-      queryParameters: {
-        'ratingKey': ratingKey,
-        'key': '/library/metadata/$ratingKey',
-        'time': time,
-        'state': state,
-        if (duration != null) 'duration': duration,
-      },
-    );
-  }
-
-  /// Remove item from Continue Watching (On Deck) without affecting watch status or progress
-  /// This uses the same endpoint Plex Web uses to hide items from Continue Watching
-  Future<void> removeFromOnDeck(String ratingKey) async {
-    await _dio.put(
-      '/actions/removeFromContinueWatching',
-      queryParameters: {'ratingKey': ratingKey},
-    );
-  }
-
-  /// Get server preferences
-  Future<Map<String, dynamic>> getServerPreferences() async {
-    final response = await _dio.get('/:/prefs');
-    return response.data;
-  }
-
-  /// Get sessions (currently playing)
-  Future<List<dynamic>> getSessions() async {
-    final response = await _dio.get('/status/sessions');
-    final container = _getMediaContainer(response);
-    if (container != null && container['Metadata'] != null) {
-      return container['Metadata'] as List;
-    }
-    return [];
-  }
-
-  /// Get available filters for a library section
-  Future<List<PlexFilter>> getLibraryFilters(String sectionId) async {
-    final response = await _dio.get('/library/sections/$sectionId/filters');
-    return _extractDirectoryList(response, PlexFilter.fromJson);
-  }
-
-  /// Get filter values (e.g., list of genres, years, etc.)
-  Future<List<PlexFilterValue>> getFilterValues(String filterKey) async {
-    final response = await _dio.get(filterKey);
-    return _extractDirectoryList(response, PlexFilterValue.fromJson);
-  }
-
-  /// Get available sort options for a library section
-  Future<List<PlexSort>> getLibrarySorts(String sectionId) async {
-    try {
-      // Use the dedicated sorts endpoint
-      final response = await _dio.get('/library/sections/$sectionId/sorts');
-
-      // Parse the Directory array (not Sort array) per the API spec
-      final sorts = _extractDirectoryList(response, PlexSort.fromJson);
-
-      if (sorts.isNotEmpty) {
-        return sorts;
-      }
-
-      // Fallback: return common sort options if API doesn't provide them
-      return _getFallbackSorts(sectionId);
-    } catch (e) {
-      appLogger.e('Failed to get library sorts: $e');
-      // Return fallback sort options on error
-      return _getFallbackSorts(sectionId);
-    }
-  }
-
-  Future<List<PlexSort>> _getFallbackSorts(String sectionId) async {
-    try {
-      // Get library type to determine which sorts to include
-      final librariesResponse = await _dio.get('/library/sections');
-      final libraries = _extractDirectoryList(
-        librariesResponse,
-        PlexLibrary.fromJson,
-      );
-      final library = libraries.firstWhere(
-        (lib) => lib.key == sectionId,
-        orElse: () => libraries.first,
-      );
-
-      final fallbackSorts = <PlexSort>[
-        PlexSort(key: 'titleSort', title: 'Title', defaultDirection: 'asc'),
-        PlexSort(
-          key: 'addedAt',
-          descKey: 'addedAt:desc',
-          title: 'Date Added',
-          defaultDirection: 'desc',
-        ),
-      ];
-
-      // Add "Latest Episode Air Date" only for TV show libraries
-      if (library.type.toLowerCase() == 'show') {
-        fallbackSorts.add(
-          PlexSort(
-            key: 'episode.originallyAvailableAt',
-            descKey: 'episode.originallyAvailableAt:desc',
-            title: 'Latest Episode Air Date',
-            defaultDirection: 'desc',
-          ),
-        );
-      }
-
-      fallbackSorts.addAll([
-        PlexSort(
-          key: 'originallyAvailableAt',
-          descKey: 'originallyAvailableAt:desc',
-          title: 'Release Date',
-          defaultDirection: 'desc',
-        ),
-        PlexSort(
-          key: 'rating',
-          descKey: 'rating:desc',
-          title: 'Rating',
-          defaultDirection: 'desc',
-        ),
-      ]);
-
-      return fallbackSorts;
-    } catch (e) {
-      appLogger.e('Failed to get fallback sorts: $e');
-      // Return minimal fallback options
-      return [
-        PlexSort(key: 'titleSort', title: 'Title', defaultDirection: 'asc'),
-        PlexSort(
-          key: 'addedAt',
-          descKey: 'addedAt:desc',
-          title: 'Date Added',
-          defaultDirection: 'desc',
-        ),
-      ];
-    }
-  }
-
-  /// Find adjacent episode in a given direction
-  ///
-  /// [direction]: +1 for next episode, -1 for previous episode
-  ///
-  /// Handles navigation within current season and across seasons automatically.
-  Future<PlexMetadata?> findAdjacentEpisode(
-    PlexMetadata currentEpisode,
-    int direction,
-  ) async {
-    if (currentEpisode.type.toLowerCase() != 'episode') {
-      return null;
-    }
-
-    final parentKey = currentEpisode.parentRatingKey;
-    final grandparentKey = currentEpisode.grandparentRatingKey;
-
-    if (parentKey == null || grandparentKey == null) {
-      return null;
-    }
-
-    try {
-      // Get all episodes in the current season
-      final episodes = await getChildren(parentKey);
-
-      // Find the current episode index
-      final currentIndex = episodes.indexWhere(
-        (e) => e.ratingKey == currentEpisode.ratingKey,
-      );
-
-      if (currentIndex == -1) return null;
-
-      final targetIndex = currentIndex + direction;
-
-      // Check if target episode is within current season
-      if (targetIndex >= 0 && targetIndex < episodes.length) {
-        return episodes[targetIndex];
-      }
-
-      // Need to move to adjacent season
-      final isAtBoundary = direction > 0
-          ? currentIndex == episodes.length - 1
-          : currentIndex == 0;
-
-      if (isAtBoundary) {
-        // Get all seasons
-        final seasons = await getChildren(grandparentKey);
-        final currentSeasonIndex = seasons.indexWhere(
-          (s) => s.ratingKey == parentKey,
-        );
-
-        if (currentSeasonIndex == -1) return null;
-
-        final targetSeasonIndex = currentSeasonIndex + direction;
-
-        // Check if target season exists
-        if (targetSeasonIndex >= 0 && targetSeasonIndex < seasons.length) {
-          final targetSeason = seasons[targetSeasonIndex];
-          final targetSeasonEpisodes = await getChildren(
-            targetSeason.ratingKey,
-          );
-
-          if (targetSeasonEpisodes.isNotEmpty) {
-            // Return first episode for next season, last for previous
-            return direction > 0
-                ? targetSeasonEpisodes.first
-                : targetSeasonEpisodes.last;
-          }
-        }
-      }
-    } catch (e) {
-      // Silently handle errors
-    }
-
-    return null;
-  }
-
-  /// Get library hubs (recommendations for a specific library section)
-  /// Returns a list of recommendation hubs like "Trending Movies", "Top in Genre", etc.
-  Future<List<PlexHub>> getLibraryHubs(
-    String sectionId, {
-    int limit = 10,
-  }) async {
-    try {
-      final response = await _dio.get(
-        '/hubs/sections/$sectionId',
-        queryParameters: {'count': limit, 'includeGuids': 1},
-      );
-
-      final container = _getMediaContainer(response);
-      if (container != null && container['Hub'] != null) {
-        final hubs = <PlexHub>[];
-        for (final hubJson in container['Hub'] as List) {
-          try {
-            final hub = PlexHub.fromJson(hubJson);
-            // Only include hubs that have items and are movie/show content
-            if (hub.items.isNotEmpty) {
-              // Filter out non-video content types
-              final videoItems = hub.items.where((item) {
-                final type = item.type.toLowerCase();
-                return type == 'movie' || type == 'show';
-              }).toList();
-
-              if (videoItems.isNotEmpty) {
-                hubs.add(
-                  PlexHub(
-                    hubKey: hub.hubKey,
-                    title: hub.title,
-                    type: hub.type,
-                    hubIdentifier: hub.hubIdentifier,
-                    size: hub.size,
-                    more: hub.more,
-                    items: videoItems,
-                  ),
-                );
-              }
-            }
-          } catch (e) {
-            appLogger.w('Failed to parse hub', error: e);
-          }
-        }
-        return hubs;
-      }
-    } catch (e) {
-      appLogger.e('Failed to get library hubs: $e');
-    }
-    return [];
-  }
-
-  /// Get full content from a hub using its hub key
-  /// Returns the complete list of metadata items in the hub
-  Future<List<PlexMetadata>> getHubContent(String hubKey) async {
-    try {
-      final response = await _dio.get(hubKey);
-      final allItems = _extractMetadataList(response);
-
-      // Filter out non-video content types
-      return allItems.where((item) {
-        final type = item.type.toLowerCase();
-        return type == 'movie' || type == 'show';
-      }).toList();
-    } catch (e) {
-      appLogger.e('Failed to get hub content: $e');
-      return [];
-    }
-  }
-
-  /// Get playlist content by playlist ID
-  /// Returns the list of metadata items in the playlist
-  Future<List<PlexMetadata>> getPlaylist(String playlistId) async {
-    try {
-      final response = await _dio.get('/playlists/$playlistId/items');
-      return _extractMetadataList(response);
-    } catch (e) {
-      appLogger.e('Failed to get playlist: $e');
-      return [];
-    }
-  }
-
-  // ============================================================================
-  // Library Management Methods
-  // ============================================================================
-
-  /// Scan/refresh a library section to detect new files
-  Future<void> scanLibrary(String sectionId) async {
-    await _dio.get('/library/sections/$sectionId/refresh');
-  }
-
-  /// Refresh metadata for a library section
-  Future<void> refreshLibraryMetadata(String sectionId) async {
-    await _dio.get('/library/sections/$sectionId/refresh?force=1');
-  }
-
-  /// Empty trash for a library section
-  Future<void> emptyLibraryTrash(String sectionId) async {
-    await _dio.put('/library/sections/$sectionId/emptyTrash');
-  }
-
-  /// Analyze library section
-  Future<void> analyzeLibrary(String sectionId) async {
-    await _dio.get('/library/sections/$sectionId/analyze');
-  }
-}
diff --git a/lib/database/app_database.dart b/lib/database/app_database.dart
new file mode 100644
index 00000000..7dd01486
--- /dev/null
+++ b/lib/database/app_database.dart
@@ -0,0 +1,232 @@
+import 'dart:io';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:path/path.dart' as p;
+
+import 'tables/downloaded_media.dart';
+import 'tables/download_queue.dart';
+import 'tables/api_cache.dart';
+import 'tables/offline_watch_progress.dart';
+import '../models/download_status.dart';
+import '../utils/app_logger.dart';
+
+part 'app_database.g.dart';
+
+// Simplified database with API cache for offline support
+@DriftDatabase(
+  tables: [DownloadedMedia, DownloadQueue, ApiCache, OfflineWatchProgress],
+)
+class AppDatabase extends _$AppDatabase {
+  AppDatabase() : super(_openConnection());
+
+  @override
+  int get schemaVersion => 7; // Added OfflineWatchProgress table
+
+  @override
+  MigrationStrategy get migration {
+    return MigrationStrategy(
+      onCreate: (Migrator m) async {
+        await m.createAll();
+      },
+      onUpgrade: (Migrator m, int from, int to) async {
+        // Additive migration for schema version 7
+        if (from < 7) {
+          appLogger.i('Adding OfflineWatchProgress table (v7 migration)');
+          await m.createTable(offlineWatchProgress);
+        }
+      },
+    );
+  }
+
+  // ============================================================
+  // Offline Watch Progress Operations
+  // ============================================================
+
+  /// Get all pending offline watch actions for sync
+  Future<List<OfflineWatchProgressItem>> getPendingWatchActions() {
+    return (select(
+      offlineWatchProgress,
+    )..orderBy([(t) => OrderingTerm.asc(t.createdAt)])).get();
+  }
+
+  /// Get pending watch actions for a specific server
+  Future<List<OfflineWatchProgressItem>> getPendingWatchActionsForServer(
+    String serverId,
+  ) {
+    return (select(offlineWatchProgress)
+          ..where((t) => t.serverId.equals(serverId))
+          ..orderBy([(t) => OrderingTerm.asc(t.createdAt)]))
+        .get();
+  }
+
+  /// Get the latest action for a specific item
+  Future<OfflineWatchProgressItem?> getLatestWatchAction(String globalKey) {
+    return (select(offlineWatchProgress)
+          ..where((t) => t.globalKey.equals(globalKey))
+          ..orderBy([(t) => OrderingTerm.desc(t.updatedAt)])
+          ..limit(1))
+        .getSingleOrNull();
+  }
+
+  /// Get the latest actions for multiple items in a single query
+  ///
+  /// Returns a map of globalKey -> latest action for each key.
+  /// Keys with no actions will not be present in the returned map.
+  Future<Map<String, OfflineWatchProgressItem>> getLatestWatchActionsForKeys(
+    Set<String> globalKeys,
+  ) async {
+    if (globalKeys.isEmpty) return {};
+
+    // Query all actions for the given keys
+    final allActions =
+        await (select(offlineWatchProgress)
+              ..where((t) => t.globalKey.isIn(globalKeys))
+              ..orderBy([(t) => OrderingTerm.desc(t.updatedAt)]))
+            .get();
+
+    // Group by globalKey and take the latest (first due to ordering)
+    final result = <String, OfflineWatchProgressItem>{};
+    for (final action in allActions) {
+      // Only keep the first (latest) action for each key
+      result.putIfAbsent(action.globalKey, () => action);
+    }
+
+    return result;
+  }
+
+  /// Insert or update a progress action (merges with existing)
+  Future<void> upsertProgressAction({
+    required String serverId,
+    required String ratingKey,
+    required int viewOffset,
+    required int duration,
+    required bool shouldMarkWatched,
+  }) async {
+    final globalKey = '$serverId:$ratingKey';
+    final now = DateTime.now().millisecondsSinceEpoch;
+
+    // Check for existing progress entry
+    final existing =
+        await (select(offlineWatchProgress)
+              ..where(
+                (t) =>
+                    t.globalKey.equals(globalKey) &
+                    t.actionType.equals('progress'),
+              )
+              ..limit(1))
+            .getSingleOrNull();
+
+    if (existing != null) {
+      // Update existing progress entry
+      await (update(
+        offlineWatchProgress,
+      )..where((t) => t.id.equals(existing.id))).write(
+        OfflineWatchProgressCompanion(
+          viewOffset: Value(viewOffset),
+          duration: Value(duration),
+          shouldMarkWatched: Value(shouldMarkWatched),
+          updatedAt: Value(now),
+        ),
+      );
+    } else {
+      // Insert new progress entry
+      await into(offlineWatchProgress).insert(
+        OfflineWatchProgressCompanion.insert(
+          serverId: serverId,
+          ratingKey: ratingKey,
+          globalKey: globalKey,
+          actionType: 'progress',
+          viewOffset: Value(viewOffset),
+          duration: Value(duration),
+          shouldMarkWatched: Value(shouldMarkWatched),
+          createdAt: now,
+          updatedAt: now,
+        ),
+      );
+    }
+  }
+
+  /// Insert a manual watch action (watched or unwatched)
+  /// Removes conflicting actions for the same item
+  Future<void> insertWatchAction({
+    required String serverId,
+    required String ratingKey,
+    required String actionType, // 'watched' or 'unwatched'
+  }) async {
+    final globalKey = '$serverId:$ratingKey';
+    final now = DateTime.now().millisecondsSinceEpoch;
+
+    // Remove conflicting actions (opposite action type and progress)
+    await (delete(
+      offlineWatchProgress,
+    )..where((t) => t.globalKey.equals(globalKey))).go();
+
+    // Insert the new action
+    await into(offlineWatchProgress).insert(
+      OfflineWatchProgressCompanion.insert(
+        serverId: serverId,
+        ratingKey: ratingKey,
+        globalKey: globalKey,
+        actionType: actionType,
+        createdAt: now,
+        updatedAt: now,
+      ),
+    );
+  }
+
+  /// Delete a specific watch action after successful sync
+  Future<void> deleteWatchAction(int id) {
+    return (delete(offlineWatchProgress)..where((t) => t.id.equals(id))).go();
+  }
+
+  /// Update sync attempt count and error message
+  Future<void> updateSyncAttempt(int id, String? errorMessage) async {
+    final existing = await (select(
+      offlineWatchProgress,
+    )..where((t) => t.id.equals(id))).getSingleOrNull();
+
+    if (existing != null) {
+      await (update(offlineWatchProgress)..where((t) => t.id.equals(id))).write(
+        OfflineWatchProgressCompanion(
+          syncAttempts: Value(existing.syncAttempts + 1),
+          lastError: Value(errorMessage),
+        ),
+      );
+    }
+  }
+
+  /// Get count of pending sync items
+  Future<int> getPendingSyncCount() async {
+    final count =
+        await (selectOnly(offlineWatchProgress)
+              ..addColumns([offlineWatchProgress.id.count()]))
+            .map((row) => row.read(offlineWatchProgress.id.count()))
+            .getSingle();
+    return count ?? 0;
+  }
+
+  /// Clear all pending watch actions (e.g., after logout)
+  Future<void> clearAllWatchActions() {
+    return delete(offlineWatchProgress).go();
+  }
+
+  // ============================================================
+  // Downloaded Media Queries for Watch State Sync
+  // ============================================================
+
+  /// Get all downloaded media items (for syncing watch states)
+  Future<List<DownloadedMediaItem>> getAllDownloadedMetadata() {
+    return (select(
+      downloadedMedia,
+    )..where((t) => t.status.equals(DownloadStatus.completed.index))).get();
+  }
+}
+
+LazyDatabase _openConnection() {
+  return LazyDatabase(() async {
+    final dbFolder = await getApplicationDocumentsDirectory();
+    final file = File(p.join(dbFolder.path, 'plezy_downloads.db'));
+    return NativeDatabase(file);
+  });
+}
diff --git a/lib/database/app_database.g.dart b/lib/database/app_database.g.dart
new file mode 100644
index 00000000..db269630
--- /dev/null
+++ b/lib/database/app_database.g.dart
@@ -0,0 +1,3635 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'app_database.dart';
+
+// ignore_for_file: type=lint
+class $DownloadedMediaTable extends DownloadedMedia
+    with TableInfo<$DownloadedMediaTable, DownloadedMediaItem> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $DownloadedMediaTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _idMeta = const VerificationMeta('id');
+  @override
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'PRIMARY KEY AUTOINCREMENT',
+    ),
+  );
+  static const VerificationMeta _serverIdMeta = const VerificationMeta(
+    'serverId',
+  );
+  @override
+  late final GeneratedColumn<String> serverId = GeneratedColumn<String>(
+    'server_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _ratingKeyMeta = const VerificationMeta(
+    'ratingKey',
+  );
+  @override
+  late final GeneratedColumn<String> ratingKey = GeneratedColumn<String>(
+    'rating_key',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _globalKeyMeta = const VerificationMeta(
+    'globalKey',
+  );
+  @override
+  late final GeneratedColumn<String> globalKey = GeneratedColumn<String>(
+    'global_key',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways('UNIQUE'),
+  );
+  static const VerificationMeta _typeMeta = const VerificationMeta('type');
+  @override
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _parentRatingKeyMeta = const VerificationMeta(
+    'parentRatingKey',
+  );
+  @override
+  late final GeneratedColumn<String> parentRatingKey = GeneratedColumn<String>(
+    'parent_rating_key',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _grandparentRatingKeyMeta =
+      const VerificationMeta('grandparentRatingKey');
+  @override
+  late final GeneratedColumn<String> grandparentRatingKey =
+      GeneratedColumn<String>(
+        'grandparent_rating_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+      );
+  static const VerificationMeta _statusMeta = const VerificationMeta('status');
+  @override
+  late final GeneratedColumn<int> status = GeneratedColumn<int>(
+    'status',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _progressMeta = const VerificationMeta(
+    'progress',
+  );
+  @override
+  late final GeneratedColumn<int> progress = GeneratedColumn<int>(
+    'progress',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _totalBytesMeta = const VerificationMeta(
+    'totalBytes',
+  );
+  @override
+  late final GeneratedColumn<int> totalBytes = GeneratedColumn<int>(
+    'total_bytes',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _downloadedBytesMeta = const VerificationMeta(
+    'downloadedBytes',
+  );
+  @override
+  late final GeneratedColumn<int> downloadedBytes = GeneratedColumn<int>(
+    'downloaded_bytes',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _videoFilePathMeta = const VerificationMeta(
+    'videoFilePath',
+  );
+  @override
+  late final GeneratedColumn<String> videoFilePath = GeneratedColumn<String>(
+    'video_file_path',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _thumbPathMeta = const VerificationMeta(
+    'thumbPath',
+  );
+  @override
+  late final GeneratedColumn<String> thumbPath = GeneratedColumn<String>(
+    'thumb_path',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _downloadedAtMeta = const VerificationMeta(
+    'downloadedAt',
+  );
+  @override
+  late final GeneratedColumn<int> downloadedAt = GeneratedColumn<int>(
+    'downloaded_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _errorMessageMeta = const VerificationMeta(
+    'errorMessage',
+  );
+  @override
+  late final GeneratedColumn<String> errorMessage = GeneratedColumn<String>(
+    'error_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _retryCountMeta = const VerificationMeta(
+    'retryCount',
+  );
+  @override
+  late final GeneratedColumn<int> retryCount = GeneratedColumn<int>(
+    'retry_count',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    serverId,
+    ratingKey,
+    globalKey,
+    type,
+    parentRatingKey,
+    grandparentRatingKey,
+    status,
+    progress,
+    totalBytes,
+    downloadedBytes,
+    videoFilePath,
+    thumbPath,
+    downloadedAt,
+    errorMessage,
+    retryCount,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'downloaded_media';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<DownloadedMediaItem> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    }
+    if (data.containsKey('server_id')) {
+      context.handle(
+        _serverIdMeta,
+        serverId.isAcceptableOrUnknown(data['server_id']!, _serverIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_serverIdMeta);
+    }
+    if (data.containsKey('rating_key')) {
+      context.handle(
+        _ratingKeyMeta,
+        ratingKey.isAcceptableOrUnknown(data['rating_key']!, _ratingKeyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_ratingKeyMeta);
+    }
+    if (data.containsKey('global_key')) {
+      context.handle(
+        _globalKeyMeta,
+        globalKey.isAcceptableOrUnknown(data['global_key']!, _globalKeyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_globalKeyMeta);
+    }
+    if (data.containsKey('type')) {
+      context.handle(
+        _typeMeta,
+        type.isAcceptableOrUnknown(data['type']!, _typeMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_typeMeta);
+    }
+    if (data.containsKey('parent_rating_key')) {
+      context.handle(
+        _parentRatingKeyMeta,
+        parentRatingKey.isAcceptableOrUnknown(
+          data['parent_rating_key']!,
+          _parentRatingKeyMeta,
+        ),
+      );
+    }
+    if (data.containsKey('grandparent_rating_key')) {
+      context.handle(
+        _grandparentRatingKeyMeta,
+        grandparentRatingKey.isAcceptableOrUnknown(
+          data['grandparent_rating_key']!,
+          _grandparentRatingKeyMeta,
+        ),
+      );
+    }
+    if (data.containsKey('status')) {
+      context.handle(
+        _statusMeta,
+        status.isAcceptableOrUnknown(data['status']!, _statusMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_statusMeta);
+    }
+    if (data.containsKey('progress')) {
+      context.handle(
+        _progressMeta,
+        progress.isAcceptableOrUnknown(data['progress']!, _progressMeta),
+      );
+    }
+    if (data.containsKey('total_bytes')) {
+      context.handle(
+        _totalBytesMeta,
+        totalBytes.isAcceptableOrUnknown(data['total_bytes']!, _totalBytesMeta),
+      );
+    }
+    if (data.containsKey('downloaded_bytes')) {
+      context.handle(
+        _downloadedBytesMeta,
+        downloadedBytes.isAcceptableOrUnknown(
+          data['downloaded_bytes']!,
+          _downloadedBytesMeta,
+        ),
+      );
+    }
+    if (data.containsKey('video_file_path')) {
+      context.handle(
+        _videoFilePathMeta,
+        videoFilePath.isAcceptableOrUnknown(
+          data['video_file_path']!,
+          _videoFilePathMeta,
+        ),
+      );
+    }
+    if (data.containsKey('thumb_path')) {
+      context.handle(
+        _thumbPathMeta,
+        thumbPath.isAcceptableOrUnknown(data['thumb_path']!, _thumbPathMeta),
+      );
+    }
+    if (data.containsKey('downloaded_at')) {
+      context.handle(
+        _downloadedAtMeta,
+        downloadedAt.isAcceptableOrUnknown(
+          data['downloaded_at']!,
+          _downloadedAtMeta,
+        ),
+      );
+    }
+    if (data.containsKey('error_message')) {
+      context.handle(
+        _errorMessageMeta,
+        errorMessage.isAcceptableOrUnknown(
+          data['error_message']!,
+          _errorMessageMeta,
+        ),
+      );
+    }
+    if (data.containsKey('retry_count')) {
+      context.handle(
+        _retryCountMeta,
+        retryCount.isAcceptableOrUnknown(data['retry_count']!, _retryCountMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  DownloadedMediaItem map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return DownloadedMediaItem(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      serverId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}server_id'],
+      )!,
+      ratingKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}rating_key'],
+      )!,
+      globalKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}global_key'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      parentRatingKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}parent_rating_key'],
+      ),
+      grandparentRatingKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}grandparent_rating_key'],
+      ),
+      status: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}status'],
+      )!,
+      progress: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}progress'],
+      )!,
+      totalBytes: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}total_bytes'],
+      ),
+      downloadedBytes: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}downloaded_bytes'],
+      )!,
+      videoFilePath: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}video_file_path'],
+      ),
+      thumbPath: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}thumb_path'],
+      ),
+      downloadedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}downloaded_at'],
+      ),
+      errorMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}error_message'],
+      ),
+      retryCount: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}retry_count'],
+      )!,
+    );
+  }
+
+  @override
+  $DownloadedMediaTable createAlias(String alias) {
+    return $DownloadedMediaTable(attachedDatabase, alias);
+  }
+}
+
+class DownloadedMediaItem extends DataClass
+    implements Insertable<DownloadedMediaItem> {
+  final int id;
+  final String serverId;
+  final String ratingKey;
+  final String globalKey;
+  final String type;
+  final String? parentRatingKey;
+  final String? grandparentRatingKey;
+  final int status;
+  final int progress;
+  final int? totalBytes;
+  final int downloadedBytes;
+  final String? videoFilePath;
+  final String? thumbPath;
+  final int? downloadedAt;
+  final String? errorMessage;
+  final int retryCount;
+  const DownloadedMediaItem({
+    required this.id,
+    required this.serverId,
+    required this.ratingKey,
+    required this.globalKey,
+    required this.type,
+    this.parentRatingKey,
+    this.grandparentRatingKey,
+    required this.status,
+    required this.progress,
+    this.totalBytes,
+    required this.downloadedBytes,
+    this.videoFilePath,
+    this.thumbPath,
+    this.downloadedAt,
+    this.errorMessage,
+    required this.retryCount,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['server_id'] = Variable<String>(serverId);
+    map['rating_key'] = Variable<String>(ratingKey);
+    map['global_key'] = Variable<String>(globalKey);
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || parentRatingKey != null) {
+      map['parent_rating_key'] = Variable<String>(parentRatingKey);
+    }
+    if (!nullToAbsent || grandparentRatingKey != null) {
+      map['grandparent_rating_key'] = Variable<String>(grandparentRatingKey);
+    }
+    map['status'] = Variable<int>(status);
+    map['progress'] = Variable<int>(progress);
+    if (!nullToAbsent || totalBytes != null) {
+      map['total_bytes'] = Variable<int>(totalBytes);
+    }
+    map['downloaded_bytes'] = Variable<int>(downloadedBytes);
+    if (!nullToAbsent || videoFilePath != null) {
+      map['video_file_path'] = Variable<String>(videoFilePath);
+    }
+    if (!nullToAbsent || thumbPath != null) {
+      map['thumb_path'] = Variable<String>(thumbPath);
+    }
+    if (!nullToAbsent || downloadedAt != null) {
+      map['downloaded_at'] = Variable<int>(downloadedAt);
+    }
+    if (!nullToAbsent || errorMessage != null) {
+      map['error_message'] = Variable<String>(errorMessage);
+    }
+    map['retry_count'] = Variable<int>(retryCount);
+    return map;
+  }
+
+  DownloadedMediaCompanion toCompanion(bool nullToAbsent) {
+    return DownloadedMediaCompanion(
+      id: Value(id),
+      serverId: Value(serverId),
+      ratingKey: Value(ratingKey),
+      globalKey: Value(globalKey),
+      type: Value(type),
+      parentRatingKey: parentRatingKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(parentRatingKey),
+      grandparentRatingKey: grandparentRatingKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(grandparentRatingKey),
+      status: Value(status),
+      progress: Value(progress),
+      totalBytes: totalBytes == null && nullToAbsent
+          ? const Value.absent()
+          : Value(totalBytes),
+      downloadedBytes: Value(downloadedBytes),
+      videoFilePath: videoFilePath == null && nullToAbsent
+          ? const Value.absent()
+          : Value(videoFilePath),
+      thumbPath: thumbPath == null && nullToAbsent
+          ? const Value.absent()
+          : Value(thumbPath),
+      downloadedAt: downloadedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadedAt),
+      errorMessage: errorMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(errorMessage),
+      retryCount: Value(retryCount),
+    );
+  }
+
+  factory DownloadedMediaItem.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return DownloadedMediaItem(
+      id: serializer.fromJson<int>(json['id']),
+      serverId: serializer.fromJson<String>(json['serverId']),
+      ratingKey: serializer.fromJson<String>(json['ratingKey']),
+      globalKey: serializer.fromJson<String>(json['globalKey']),
+      type: serializer.fromJson<String>(json['type']),
+      parentRatingKey: serializer.fromJson<String?>(json['parentRatingKey']),
+      grandparentRatingKey: serializer.fromJson<String?>(
+        json['grandparentRatingKey'],
+      ),
+      status: serializer.fromJson<int>(json['status']),
+      progress: serializer.fromJson<int>(json['progress']),
+      totalBytes: serializer.fromJson<int?>(json['totalBytes']),
+      downloadedBytes: serializer.fromJson<int>(json['downloadedBytes']),
+      videoFilePath: serializer.fromJson<String?>(json['videoFilePath']),
+      thumbPath: serializer.fromJson<String?>(json['thumbPath']),
+      downloadedAt: serializer.fromJson<int?>(json['downloadedAt']),
+      errorMessage: serializer.fromJson<String?>(json['errorMessage']),
+      retryCount: serializer.fromJson<int>(json['retryCount']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'serverId': serializer.toJson<String>(serverId),
+      'ratingKey': serializer.toJson<String>(ratingKey),
+      'globalKey': serializer.toJson<String>(globalKey),
+      'type': serializer.toJson<String>(type),
+      'parentRatingKey': serializer.toJson<String?>(parentRatingKey),
+      'grandparentRatingKey': serializer.toJson<String?>(grandparentRatingKey),
+      'status': serializer.toJson<int>(status),
+      'progress': serializer.toJson<int>(progress),
+      'totalBytes': serializer.toJson<int?>(totalBytes),
+      'downloadedBytes': serializer.toJson<int>(downloadedBytes),
+      'videoFilePath': serializer.toJson<String?>(videoFilePath),
+      'thumbPath': serializer.toJson<String?>(thumbPath),
+      'downloadedAt': serializer.toJson<int?>(downloadedAt),
+      'errorMessage': serializer.toJson<String?>(errorMessage),
+      'retryCount': serializer.toJson<int>(retryCount),
+    };
+  }
+
+  DownloadedMediaItem copyWith({
+    int? id,
+    String? serverId,
+    String? ratingKey,
+    String? globalKey,
+    String? type,
+    Value<String?> parentRatingKey = const Value.absent(),
+    Value<String?> grandparentRatingKey = const Value.absent(),
+    int? status,
+    int? progress,
+    Value<int?> totalBytes = const Value.absent(),
+    int? downloadedBytes,
+    Value<String?> videoFilePath = const Value.absent(),
+    Value<String?> thumbPath = const Value.absent(),
+    Value<int?> downloadedAt = const Value.absent(),
+    Value<String?> errorMessage = const Value.absent(),
+    int? retryCount,
+  }) => DownloadedMediaItem(
+    id: id ?? this.id,
+    serverId: serverId ?? this.serverId,
+    ratingKey: ratingKey ?? this.ratingKey,
+    globalKey: globalKey ?? this.globalKey,
+    type: type ?? this.type,
+    parentRatingKey: parentRatingKey.present
+        ? parentRatingKey.value
+        : this.parentRatingKey,
+    grandparentRatingKey: grandparentRatingKey.present
+        ? grandparentRatingKey.value
+        : this.grandparentRatingKey,
+    status: status ?? this.status,
+    progress: progress ?? this.progress,
+    totalBytes: totalBytes.present ? totalBytes.value : this.totalBytes,
+    downloadedBytes: downloadedBytes ?? this.downloadedBytes,
+    videoFilePath: videoFilePath.present
+        ? videoFilePath.value
+        : this.videoFilePath,
+    thumbPath: thumbPath.present ? thumbPath.value : this.thumbPath,
+    downloadedAt: downloadedAt.present ? downloadedAt.value : this.downloadedAt,
+    errorMessage: errorMessage.present ? errorMessage.value : this.errorMessage,
+    retryCount: retryCount ?? this.retryCount,
+  );
+  DownloadedMediaItem copyWithCompanion(DownloadedMediaCompanion data) {
+    return DownloadedMediaItem(
+      id: data.id.present ? data.id.value : this.id,
+      serverId: data.serverId.present ? data.serverId.value : this.serverId,
+      ratingKey: data.ratingKey.present ? data.ratingKey.value : this.ratingKey,
+      globalKey: data.globalKey.present ? data.globalKey.value : this.globalKey,
+      type: data.type.present ? data.type.value : this.type,
+      parentRatingKey: data.parentRatingKey.present
+          ? data.parentRatingKey.value
+          : this.parentRatingKey,
+      grandparentRatingKey: data.grandparentRatingKey.present
+          ? data.grandparentRatingKey.value
+          : this.grandparentRatingKey,
+      status: data.status.present ? data.status.value : this.status,
+      progress: data.progress.present ? data.progress.value : this.progress,
+      totalBytes: data.totalBytes.present
+          ? data.totalBytes.value
+          : this.totalBytes,
+      downloadedBytes: data.downloadedBytes.present
+          ? data.downloadedBytes.value
+          : this.downloadedBytes,
+      videoFilePath: data.videoFilePath.present
+          ? data.videoFilePath.value
+          : this.videoFilePath,
+      thumbPath: data.thumbPath.present ? data.thumbPath.value : this.thumbPath,
+      downloadedAt: data.downloadedAt.present
+          ? data.downloadedAt.value
+          : this.downloadedAt,
+      errorMessage: data.errorMessage.present
+          ? data.errorMessage.value
+          : this.errorMessage,
+      retryCount: data.retryCount.present
+          ? data.retryCount.value
+          : this.retryCount,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('DownloadedMediaItem(')
+          ..write('id: $id, ')
+          ..write('serverId: $serverId, ')
+          ..write('ratingKey: $ratingKey, ')
+          ..write('globalKey: $globalKey, ')
+          ..write('type: $type, ')
+          ..write('parentRatingKey: $parentRatingKey, ')
+          ..write('grandparentRatingKey: $grandparentRatingKey, ')
+          ..write('status: $status, ')
+          ..write('progress: $progress, ')
+          ..write('totalBytes: $totalBytes, ')
+          ..write('downloadedBytes: $downloadedBytes, ')
+          ..write('videoFilePath: $videoFilePath, ')
+          ..write('thumbPath: $thumbPath, ')
+          ..write('downloadedAt: $downloadedAt, ')
+          ..write('errorMessage: $errorMessage, ')
+          ..write('retryCount: $retryCount')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    serverId,
+    ratingKey,
+    globalKey,
+    type,
+    parentRatingKey,
+    grandparentRatingKey,
+    status,
+    progress,
+    totalBytes,
+    downloadedBytes,
+    videoFilePath,
+    thumbPath,
+    downloadedAt,
+    errorMessage,
+    retryCount,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is DownloadedMediaItem &&
+          other.id == this.id &&
+          other.serverId == this.serverId &&
+          other.ratingKey == this.ratingKey &&
+          other.globalKey == this.globalKey &&
+          other.type == this.type &&
+          other.parentRatingKey == this.parentRatingKey &&
+          other.grandparentRatingKey == this.grandparentRatingKey &&
+          other.status == this.status &&
+          other.progress == this.progress &&
+          other.totalBytes == this.totalBytes &&
+          other.downloadedBytes == this.downloadedBytes &&
+          other.videoFilePath == this.videoFilePath &&
+          other.thumbPath == this.thumbPath &&
+          other.downloadedAt == this.downloadedAt &&
+          other.errorMessage == this.errorMessage &&
+          other.retryCount == this.retryCount);
+}
+
+class DownloadedMediaCompanion extends UpdateCompanion<DownloadedMediaItem> {
+  final Value<int> id;
+  final Value<String> serverId;
+  final Value<String> ratingKey;
+  final Value<String> globalKey;
+  final Value<String> type;
+  final Value<String?> parentRatingKey;
+  final Value<String?> grandparentRatingKey;
+  final Value<int> status;
+  final Value<int> progress;
+  final Value<int?> totalBytes;
+  final Value<int> downloadedBytes;
+  final Value<String?> videoFilePath;
+  final Value<String?> thumbPath;
+  final Value<int?> downloadedAt;
+  final Value<String?> errorMessage;
+  final Value<int> retryCount;
+  const DownloadedMediaCompanion({
+    this.id = const Value.absent(),
+    this.serverId = const Value.absent(),
+    this.ratingKey = const Value.absent(),
+    this.globalKey = const Value.absent(),
+    this.type = const Value.absent(),
+    this.parentRatingKey = const Value.absent(),
+    this.grandparentRatingKey = const Value.absent(),
+    this.status = const Value.absent(),
+    this.progress = const Value.absent(),
+    this.totalBytes = const Value.absent(),
+    this.downloadedBytes = const Value.absent(),
+    this.videoFilePath = const Value.absent(),
+    this.thumbPath = const Value.absent(),
+    this.downloadedAt = const Value.absent(),
+    this.errorMessage = const Value.absent(),
+    this.retryCount = const Value.absent(),
+  });
+  DownloadedMediaCompanion.insert({
+    this.id = const Value.absent(),
+    required String serverId,
+    required String ratingKey,
+    required String globalKey,
+    required String type,
+    this.parentRatingKey = const Value.absent(),
+    this.grandparentRatingKey = const Value.absent(),
+    required int status,
+    this.progress = const Value.absent(),
+    this.totalBytes = const Value.absent(),
+    this.downloadedBytes = const Value.absent(),
+    this.videoFilePath = const Value.absent(),
+    this.thumbPath = const Value.absent(),
+    this.downloadedAt = const Value.absent(),
+    this.errorMessage = const Value.absent(),
+    this.retryCount = const Value.absent(),
+  }) : serverId = Value(serverId),
+       ratingKey = Value(ratingKey),
+       globalKey = Value(globalKey),
+       type = Value(type),
+       status = Value(status);
+  static Insertable<DownloadedMediaItem> custom({
+    Expression<int>? id,
+    Expression<String>? serverId,
+    Expression<String>? ratingKey,
+    Expression<String>? globalKey,
+    Expression<String>? type,
+    Expression<String>? parentRatingKey,
+    Expression<String>? grandparentRatingKey,
+    Expression<int>? status,
+    Expression<int>? progress,
+    Expression<int>? totalBytes,
+    Expression<int>? downloadedBytes,
+    Expression<String>? videoFilePath,
+    Expression<String>? thumbPath,
+    Expression<int>? downloadedAt,
+    Expression<String>? errorMessage,
+    Expression<int>? retryCount,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (serverId != null) 'server_id': serverId,
+      if (ratingKey != null) 'rating_key': ratingKey,
+      if (globalKey != null) 'global_key': globalKey,
+      if (type != null) 'type': type,
+      if (parentRatingKey != null) 'parent_rating_key': parentRatingKey,
+      if (grandparentRatingKey != null)
+        'grandparent_rating_key': grandparentRatingKey,
+      if (status != null) 'status': status,
+      if (progress != null) 'progress': progress,
+      if (totalBytes != null) 'total_bytes': totalBytes,
+      if (downloadedBytes != null) 'downloaded_bytes': downloadedBytes,
+      if (videoFilePath != null) 'video_file_path': videoFilePath,
+      if (thumbPath != null) 'thumb_path': thumbPath,
+      if (downloadedAt != null) 'downloaded_at': downloadedAt,
+      if (errorMessage != null) 'error_message': errorMessage,
+      if (retryCount != null) 'retry_count': retryCount,
+    });
+  }
+
+  DownloadedMediaCompanion copyWith({
+    Value<int>? id,
+    Value<String>? serverId,
+    Value<String>? ratingKey,
+    Value<String>? globalKey,
+    Value<String>? type,
+    Value<String?>? parentRatingKey,
+    Value<String?>? grandparentRatingKey,
+    Value<int>? status,
+    Value<int>? progress,
+    Value<int?>? totalBytes,
+    Value<int>? downloadedBytes,
+    Value<String?>? videoFilePath,
+    Value<String?>? thumbPath,
+    Value<int?>? downloadedAt,
+    Value<String?>? errorMessage,
+    Value<int>? retryCount,
+  }) {
+    return DownloadedMediaCompanion(
+      id: id ?? this.id,
+      serverId: serverId ?? this.serverId,
+      ratingKey: ratingKey ?? this.ratingKey,
+      globalKey: globalKey ?? this.globalKey,
+      type: type ?? this.type,
+      parentRatingKey: parentRatingKey ?? this.parentRatingKey,
+      grandparentRatingKey: grandparentRatingKey ?? this.grandparentRatingKey,
+      status: status ?? this.status,
+      progress: progress ?? this.progress,
+      totalBytes: totalBytes ?? this.totalBytes,
+      downloadedBytes: downloadedBytes ?? this.downloadedBytes,
+      videoFilePath: videoFilePath ?? this.videoFilePath,
+      thumbPath: thumbPath ?? this.thumbPath,
+      downloadedAt: downloadedAt ?? this.downloadedAt,
+      errorMessage: errorMessage ?? this.errorMessage,
+      retryCount: retryCount ?? this.retryCount,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (serverId.present) {
+      map['server_id'] = Variable<String>(serverId.value);
+    }
+    if (ratingKey.present) {
+      map['rating_key'] = Variable<String>(ratingKey.value);
+    }
+    if (globalKey.present) {
+      map['global_key'] = Variable<String>(globalKey.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (parentRatingKey.present) {
+      map['parent_rating_key'] = Variable<String>(parentRatingKey.value);
+    }
+    if (grandparentRatingKey.present) {
+      map['grandparent_rating_key'] = Variable<String>(
+        grandparentRatingKey.value,
+      );
+    }
+    if (status.present) {
+      map['status'] = Variable<int>(status.value);
+    }
+    if (progress.present) {
+      map['progress'] = Variable<int>(progress.value);
+    }
+    if (totalBytes.present) {
+      map['total_bytes'] = Variable<int>(totalBytes.value);
+    }
+    if (downloadedBytes.present) {
+      map['downloaded_bytes'] = Variable<int>(downloadedBytes.value);
+    }
+    if (videoFilePath.present) {
+      map['video_file_path'] = Variable<String>(videoFilePath.value);
+    }
+    if (thumbPath.present) {
+      map['thumb_path'] = Variable<String>(thumbPath.value);
+    }
+    if (downloadedAt.present) {
+      map['downloaded_at'] = Variable<int>(downloadedAt.value);
+    }
+    if (errorMessage.present) {
+      map['error_message'] = Variable<String>(errorMessage.value);
+    }
+    if (retryCount.present) {
+      map['retry_count'] = Variable<int>(retryCount.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('DownloadedMediaCompanion(')
+          ..write('id: $id, ')
+          ..write('serverId: $serverId, ')
+          ..write('ratingKey: $ratingKey, ')
+          ..write('globalKey: $globalKey, ')
+          ..write('type: $type, ')
+          ..write('parentRatingKey: $parentRatingKey, ')
+          ..write('grandparentRatingKey: $grandparentRatingKey, ')
+          ..write('status: $status, ')
+          ..write('progress: $progress, ')
+          ..write('totalBytes: $totalBytes, ')
+          ..write('downloadedBytes: $downloadedBytes, ')
+          ..write('videoFilePath: $videoFilePath, ')
+          ..write('thumbPath: $thumbPath, ')
+          ..write('downloadedAt: $downloadedAt, ')
+          ..write('errorMessage: $errorMessage, ')
+          ..write('retryCount: $retryCount')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $DownloadQueueTable extends DownloadQueue
+    with TableInfo<$DownloadQueueTable, DownloadQueueItem> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $DownloadQueueTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _idMeta = const VerificationMeta('id');
+  @override
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'PRIMARY KEY AUTOINCREMENT',
+    ),
+  );
+  static const VerificationMeta _mediaGlobalKeyMeta = const VerificationMeta(
+    'mediaGlobalKey',
+  );
+  @override
+  late final GeneratedColumn<String> mediaGlobalKey = GeneratedColumn<String>(
+    'media_global_key',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways('UNIQUE'),
+  );
+  static const VerificationMeta _priorityMeta = const VerificationMeta(
+    'priority',
+  );
+  @override
+  late final GeneratedColumn<int> priority = GeneratedColumn<int>(
+    'priority',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _addedAtMeta = const VerificationMeta(
+    'addedAt',
+  );
+  @override
+  late final GeneratedColumn<int> addedAt = GeneratedColumn<int>(
+    'added_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _downloadSubtitlesMeta = const VerificationMeta(
+    'downloadSubtitles',
+  );
+  @override
+  late final GeneratedColumn<bool> downloadSubtitles = GeneratedColumn<bool>(
+    'download_subtitles',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("download_subtitles" IN (0, 1))',
+    ),
+    defaultValue: const Constant(true),
+  );
+  static const VerificationMeta _downloadArtworkMeta = const VerificationMeta(
+    'downloadArtwork',
+  );
+  @override
+  late final GeneratedColumn<bool> downloadArtwork = GeneratedColumn<bool>(
+    'download_artwork',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("download_artwork" IN (0, 1))',
+    ),
+    defaultValue: const Constant(true),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    mediaGlobalKey,
+    priority,
+    addedAt,
+    downloadSubtitles,
+    downloadArtwork,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'download_queue';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<DownloadQueueItem> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    }
+    if (data.containsKey('media_global_key')) {
+      context.handle(
+        _mediaGlobalKeyMeta,
+        mediaGlobalKey.isAcceptableOrUnknown(
+          data['media_global_key']!,
+          _mediaGlobalKeyMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_mediaGlobalKeyMeta);
+    }
+    if (data.containsKey('priority')) {
+      context.handle(
+        _priorityMeta,
+        priority.isAcceptableOrUnknown(data['priority']!, _priorityMeta),
+      );
+    }
+    if (data.containsKey('added_at')) {
+      context.handle(
+        _addedAtMeta,
+        addedAt.isAcceptableOrUnknown(data['added_at']!, _addedAtMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_addedAtMeta);
+    }
+    if (data.containsKey('download_subtitles')) {
+      context.handle(
+        _downloadSubtitlesMeta,
+        downloadSubtitles.isAcceptableOrUnknown(
+          data['download_subtitles']!,
+          _downloadSubtitlesMeta,
+        ),
+      );
+    }
+    if (data.containsKey('download_artwork')) {
+      context.handle(
+        _downloadArtworkMeta,
+        downloadArtwork.isAcceptableOrUnknown(
+          data['download_artwork']!,
+          _downloadArtworkMeta,
+        ),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  DownloadQueueItem map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return DownloadQueueItem(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      mediaGlobalKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_global_key'],
+      )!,
+      priority: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}priority'],
+      )!,
+      addedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}added_at'],
+      )!,
+      downloadSubtitles: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}download_subtitles'],
+      )!,
+      downloadArtwork: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}download_artwork'],
+      )!,
+    );
+  }
+
+  @override
+  $DownloadQueueTable createAlias(String alias) {
+    return $DownloadQueueTable(attachedDatabase, alias);
+  }
+}
+
+class DownloadQueueItem extends DataClass
+    implements Insertable<DownloadQueueItem> {
+  final int id;
+  final String mediaGlobalKey;
+  final int priority;
+  final int addedAt;
+  final bool downloadSubtitles;
+  final bool downloadArtwork;
+  const DownloadQueueItem({
+    required this.id,
+    required this.mediaGlobalKey,
+    required this.priority,
+    required this.addedAt,
+    required this.downloadSubtitles,
+    required this.downloadArtwork,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['media_global_key'] = Variable<String>(mediaGlobalKey);
+    map['priority'] = Variable<int>(priority);
+    map['added_at'] = Variable<int>(addedAt);
+    map['download_subtitles'] = Variable<bool>(downloadSubtitles);
+    map['download_artwork'] = Variable<bool>(downloadArtwork);
+    return map;
+  }
+
+  DownloadQueueCompanion toCompanion(bool nullToAbsent) {
+    return DownloadQueueCompanion(
+      id: Value(id),
+      mediaGlobalKey: Value(mediaGlobalKey),
+      priority: Value(priority),
+      addedAt: Value(addedAt),
+      downloadSubtitles: Value(downloadSubtitles),
+      downloadArtwork: Value(downloadArtwork),
+    );
+  }
+
+  factory DownloadQueueItem.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return DownloadQueueItem(
+      id: serializer.fromJson<int>(json['id']),
+      mediaGlobalKey: serializer.fromJson<String>(json['mediaGlobalKey']),
+      priority: serializer.fromJson<int>(json['priority']),
+      addedAt: serializer.fromJson<int>(json['addedAt']),
+      downloadSubtitles: serializer.fromJson<bool>(json['downloadSubtitles']),
+      downloadArtwork: serializer.fromJson<bool>(json['downloadArtwork']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'mediaGlobalKey': serializer.toJson<String>(mediaGlobalKey),
+      'priority': serializer.toJson<int>(priority),
+      'addedAt': serializer.toJson<int>(addedAt),
+      'downloadSubtitles': serializer.toJson<bool>(downloadSubtitles),
+      'downloadArtwork': serializer.toJson<bool>(downloadArtwork),
+    };
+  }
+
+  DownloadQueueItem copyWith({
+    int? id,
+    String? mediaGlobalKey,
+    int? priority,
+    int? addedAt,
+    bool? downloadSubtitles,
+    bool? downloadArtwork,
+  }) => DownloadQueueItem(
+    id: id ?? this.id,
+    mediaGlobalKey: mediaGlobalKey ?? this.mediaGlobalKey,
+    priority: priority ?? this.priority,
+    addedAt: addedAt ?? this.addedAt,
+    downloadSubtitles: downloadSubtitles ?? this.downloadSubtitles,
+    downloadArtwork: downloadArtwork ?? this.downloadArtwork,
+  );
+  DownloadQueueItem copyWithCompanion(DownloadQueueCompanion data) {
+    return DownloadQueueItem(
+      id: data.id.present ? data.id.value : this.id,
+      mediaGlobalKey: data.mediaGlobalKey.present
+          ? data.mediaGlobalKey.value
+          : this.mediaGlobalKey,
+      priority: data.priority.present ? data.priority.value : this.priority,
+      addedAt: data.addedAt.present ? data.addedAt.value : this.addedAt,
+      downloadSubtitles: data.downloadSubtitles.present
+          ? data.downloadSubtitles.value
+          : this.downloadSubtitles,
+      downloadArtwork: data.downloadArtwork.present
+          ? data.downloadArtwork.value
+          : this.downloadArtwork,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('DownloadQueueItem(')
+          ..write('id: $id, ')
+          ..write('mediaGlobalKey: $mediaGlobalKey, ')
+          ..write('priority: $priority, ')
+          ..write('addedAt: $addedAt, ')
+          ..write('downloadSubtitles: $downloadSubtitles, ')
+          ..write('downloadArtwork: $downloadArtwork')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    mediaGlobalKey,
+    priority,
+    addedAt,
+    downloadSubtitles,
+    downloadArtwork,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is DownloadQueueItem &&
+          other.id == this.id &&
+          other.mediaGlobalKey == this.mediaGlobalKey &&
+          other.priority == this.priority &&
+          other.addedAt == this.addedAt &&
+          other.downloadSubtitles == this.downloadSubtitles &&
+          other.downloadArtwork == this.downloadArtwork);
+}
+
+class DownloadQueueCompanion extends UpdateCompanion<DownloadQueueItem> {
+  final Value<int> id;
+  final Value<String> mediaGlobalKey;
+  final Value<int> priority;
+  final Value<int> addedAt;
+  final Value<bool> downloadSubtitles;
+  final Value<bool> downloadArtwork;
+  const DownloadQueueCompanion({
+    this.id = const Value.absent(),
+    this.mediaGlobalKey = const Value.absent(),
+    this.priority = const Value.absent(),
+    this.addedAt = const Value.absent(),
+    this.downloadSubtitles = const Value.absent(),
+    this.downloadArtwork = const Value.absent(),
+  });
+  DownloadQueueCompanion.insert({
+    this.id = const Value.absent(),
+    required String mediaGlobalKey,
+    this.priority = const Value.absent(),
+    required int addedAt,
+    this.downloadSubtitles = const Value.absent(),
+    this.downloadArtwork = const Value.absent(),
+  }) : mediaGlobalKey = Value(mediaGlobalKey),
+       addedAt = Value(addedAt);
+  static Insertable<DownloadQueueItem> custom({
+    Expression<int>? id,
+    Expression<String>? mediaGlobalKey,
+    Expression<int>? priority,
+    Expression<int>? addedAt,
+    Expression<bool>? downloadSubtitles,
+    Expression<bool>? downloadArtwork,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (mediaGlobalKey != null) 'media_global_key': mediaGlobalKey,
+      if (priority != null) 'priority': priority,
+      if (addedAt != null) 'added_at': addedAt,
+      if (downloadSubtitles != null) 'download_subtitles': downloadSubtitles,
+      if (downloadArtwork != null) 'download_artwork': downloadArtwork,
+    });
+  }
+
+  DownloadQueueCompanion copyWith({
+    Value<int>? id,
+    Value<String>? mediaGlobalKey,
+    Value<int>? priority,
+    Value<int>? addedAt,
+    Value<bool>? downloadSubtitles,
+    Value<bool>? downloadArtwork,
+  }) {
+    return DownloadQueueCompanion(
+      id: id ?? this.id,
+      mediaGlobalKey: mediaGlobalKey ?? this.mediaGlobalKey,
+      priority: priority ?? this.priority,
+      addedAt: addedAt ?? this.addedAt,
+      downloadSubtitles: downloadSubtitles ?? this.downloadSubtitles,
+      downloadArtwork: downloadArtwork ?? this.downloadArtwork,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (mediaGlobalKey.present) {
+      map['media_global_key'] = Variable<String>(mediaGlobalKey.value);
+    }
+    if (priority.present) {
+      map['priority'] = Variable<int>(priority.value);
+    }
+    if (addedAt.present) {
+      map['added_at'] = Variable<int>(addedAt.value);
+    }
+    if (downloadSubtitles.present) {
+      map['download_subtitles'] = Variable<bool>(downloadSubtitles.value);
+    }
+    if (downloadArtwork.present) {
+      map['download_artwork'] = Variable<bool>(downloadArtwork.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('DownloadQueueCompanion(')
+          ..write('id: $id, ')
+          ..write('mediaGlobalKey: $mediaGlobalKey, ')
+          ..write('priority: $priority, ')
+          ..write('addedAt: $addedAt, ')
+          ..write('downloadSubtitles: $downloadSubtitles, ')
+          ..write('downloadArtwork: $downloadArtwork')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $ApiCacheTable extends ApiCache
+    with TableInfo<$ApiCacheTable, ApiCacheData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $ApiCacheTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _cacheKeyMeta = const VerificationMeta(
+    'cacheKey',
+  );
+  @override
+  late final GeneratedColumn<String> cacheKey = GeneratedColumn<String>(
+    'cache_key',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _dataMeta = const VerificationMeta('data');
+  @override
+  late final GeneratedColumn<String> data = GeneratedColumn<String>(
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _pinnedMeta = const VerificationMeta('pinned');
+  @override
+  late final GeneratedColumn<bool> pinned = GeneratedColumn<bool>(
+    'pinned',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("pinned" IN (0, 1))',
+    ),
+    defaultValue: const Constant(false),
+  );
+  static const VerificationMeta _cachedAtMeta = const VerificationMeta(
+    'cachedAt',
+  );
+  @override
+  late final GeneratedColumn<DateTime> cachedAt = GeneratedColumn<DateTime>(
+    'cached_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: currentDateAndTime,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [cacheKey, data, pinned, cachedAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'api_cache';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<ApiCacheData> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('cache_key')) {
+      context.handle(
+        _cacheKeyMeta,
+        cacheKey.isAcceptableOrUnknown(data['cache_key']!, _cacheKeyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_cacheKeyMeta);
+    }
+    if (data.containsKey('data')) {
+      context.handle(
+        _dataMeta,
+        this.data.isAcceptableOrUnknown(data['data']!, _dataMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_dataMeta);
+    }
+    if (data.containsKey('pinned')) {
+      context.handle(
+        _pinnedMeta,
+        pinned.isAcceptableOrUnknown(data['pinned']!, _pinnedMeta),
+      );
+    }
+    if (data.containsKey('cached_at')) {
+      context.handle(
+        _cachedAtMeta,
+        cachedAt.isAcceptableOrUnknown(data['cached_at']!, _cachedAtMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {cacheKey};
+  @override
+  ApiCacheData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ApiCacheData(
+      cacheKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}cache_key'],
+      )!,
+      data: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}data'],
+      )!,
+      pinned: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}pinned'],
+      )!,
+      cachedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}cached_at'],
+      )!,
+    );
+  }
+
+  @override
+  $ApiCacheTable createAlias(String alias) {
+    return $ApiCacheTable(attachedDatabase, alias);
+  }
+}
+
+class ApiCacheData extends DataClass implements Insertable<ApiCacheData> {
+  /// Composite key: serverId:endpoint (e.g., "abc123:/library/metadata/12345")
+  final String cacheKey;
+
+  /// JSON response data
+  final String data;
+
+  /// Whether this item is pinned for offline access
+  final bool pinned;
+
+  /// Timestamp for cache invalidation (optional future use)
+  final DateTime cachedAt;
+  const ApiCacheData({
+    required this.cacheKey,
+    required this.data,
+    required this.pinned,
+    required this.cachedAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['cache_key'] = Variable<String>(cacheKey);
+    map['data'] = Variable<String>(data);
+    map['pinned'] = Variable<bool>(pinned);
+    map['cached_at'] = Variable<DateTime>(cachedAt);
+    return map;
+  }
+
+  ApiCacheCompanion toCompanion(bool nullToAbsent) {
+    return ApiCacheCompanion(
+      cacheKey: Value(cacheKey),
+      data: Value(data),
+      pinned: Value(pinned),
+      cachedAt: Value(cachedAt),
+    );
+  }
+
+  factory ApiCacheData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ApiCacheData(
+      cacheKey: serializer.fromJson<String>(json['cacheKey']),
+      data: serializer.fromJson<String>(json['data']),
+      pinned: serializer.fromJson<bool>(json['pinned']),
+      cachedAt: serializer.fromJson<DateTime>(json['cachedAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'cacheKey': serializer.toJson<String>(cacheKey),
+      'data': serializer.toJson<String>(data),
+      'pinned': serializer.toJson<bool>(pinned),
+      'cachedAt': serializer.toJson<DateTime>(cachedAt),
+    };
+  }
+
+  ApiCacheData copyWith({
+    String? cacheKey,
+    String? data,
+    bool? pinned,
+    DateTime? cachedAt,
+  }) => ApiCacheData(
+    cacheKey: cacheKey ?? this.cacheKey,
+    data: data ?? this.data,
+    pinned: pinned ?? this.pinned,
+    cachedAt: cachedAt ?? this.cachedAt,
+  );
+  ApiCacheData copyWithCompanion(ApiCacheCompanion data) {
+    return ApiCacheData(
+      cacheKey: data.cacheKey.present ? data.cacheKey.value : this.cacheKey,
+      data: data.data.present ? data.data.value : this.data,
+      pinned: data.pinned.present ? data.pinned.value : this.pinned,
+      cachedAt: data.cachedAt.present ? data.cachedAt.value : this.cachedAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ApiCacheData(')
+          ..write('cacheKey: $cacheKey, ')
+          ..write('data: $data, ')
+          ..write('pinned: $pinned, ')
+          ..write('cachedAt: $cachedAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(cacheKey, data, pinned, cachedAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ApiCacheData &&
+          other.cacheKey == this.cacheKey &&
+          other.data == this.data &&
+          other.pinned == this.pinned &&
+          other.cachedAt == this.cachedAt);
+}
+
+class ApiCacheCompanion extends UpdateCompanion<ApiCacheData> {
+  final Value<String> cacheKey;
+  final Value<String> data;
+  final Value<bool> pinned;
+  final Value<DateTime> cachedAt;
+  final Value<int> rowid;
+  const ApiCacheCompanion({
+    this.cacheKey = const Value.absent(),
+    this.data = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.cachedAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ApiCacheCompanion.insert({
+    required String cacheKey,
+    required String data,
+    this.pinned = const Value.absent(),
+    this.cachedAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : cacheKey = Value(cacheKey),
+       data = Value(data);
+  static Insertable<ApiCacheData> custom({
+    Expression<String>? cacheKey,
+    Expression<String>? data,
+    Expression<bool>? pinned,
+    Expression<DateTime>? cachedAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (cacheKey != null) 'cache_key': cacheKey,
+      if (data != null) 'data': data,
+      if (pinned != null) 'pinned': pinned,
+      if (cachedAt != null) 'cached_at': cachedAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ApiCacheCompanion copyWith({
+    Value<String>? cacheKey,
+    Value<String>? data,
+    Value<bool>? pinned,
+    Value<DateTime>? cachedAt,
+    Value<int>? rowid,
+  }) {
+    return ApiCacheCompanion(
+      cacheKey: cacheKey ?? this.cacheKey,
+      data: data ?? this.data,
+      pinned: pinned ?? this.pinned,
+      cachedAt: cachedAt ?? this.cachedAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (cacheKey.present) {
+      map['cache_key'] = Variable<String>(cacheKey.value);
+    }
+    if (data.present) {
+      map['data'] = Variable<String>(data.value);
+    }
+    if (pinned.present) {
+      map['pinned'] = Variable<bool>(pinned.value);
+    }
+    if (cachedAt.present) {
+      map['cached_at'] = Variable<DateTime>(cachedAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ApiCacheCompanion(')
+          ..write('cacheKey: $cacheKey, ')
+          ..write('data: $data, ')
+          ..write('pinned: $pinned, ')
+          ..write('cachedAt: $cachedAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $OfflineWatchProgressTable extends OfflineWatchProgress
+    with TableInfo<$OfflineWatchProgressTable, OfflineWatchProgressItem> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $OfflineWatchProgressTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _idMeta = const VerificationMeta('id');
+  @override
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'PRIMARY KEY AUTOINCREMENT',
+    ),
+  );
+  static const VerificationMeta _serverIdMeta = const VerificationMeta(
+    'serverId',
+  );
+  @override
+  late final GeneratedColumn<String> serverId = GeneratedColumn<String>(
+    'server_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _ratingKeyMeta = const VerificationMeta(
+    'ratingKey',
+  );
+  @override
+  late final GeneratedColumn<String> ratingKey = GeneratedColumn<String>(
+    'rating_key',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _globalKeyMeta = const VerificationMeta(
+    'globalKey',
+  );
+  @override
+  late final GeneratedColumn<String> globalKey = GeneratedColumn<String>(
+    'global_key',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _actionTypeMeta = const VerificationMeta(
+    'actionType',
+  );
+  @override
+  late final GeneratedColumn<String> actionType = GeneratedColumn<String>(
+    'action_type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _viewOffsetMeta = const VerificationMeta(
+    'viewOffset',
+  );
+  @override
+  late final GeneratedColumn<int> viewOffset = GeneratedColumn<int>(
+    'view_offset',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _durationMeta = const VerificationMeta(
+    'duration',
+  );
+  @override
+  late final GeneratedColumn<int> duration = GeneratedColumn<int>(
+    'duration',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _shouldMarkWatchedMeta = const VerificationMeta(
+    'shouldMarkWatched',
+  );
+  @override
+  late final GeneratedColumn<bool> shouldMarkWatched = GeneratedColumn<bool>(
+    'should_mark_watched',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("should_mark_watched" IN (0, 1))',
+    ),
+    defaultValue: const Constant(false),
+  );
+  static const VerificationMeta _createdAtMeta = const VerificationMeta(
+    'createdAt',
+  );
+  @override
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _updatedAtMeta = const VerificationMeta(
+    'updatedAt',
+  );
+  @override
+  late final GeneratedColumn<int> updatedAt = GeneratedColumn<int>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _syncAttemptsMeta = const VerificationMeta(
+    'syncAttempts',
+  );
+  @override
+  late final GeneratedColumn<int> syncAttempts = GeneratedColumn<int>(
+    'sync_attempts',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _lastErrorMeta = const VerificationMeta(
+    'lastError',
+  );
+  @override
+  late final GeneratedColumn<String> lastError = GeneratedColumn<String>(
+    'last_error',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    serverId,
+    ratingKey,
+    globalKey,
+    actionType,
+    viewOffset,
+    duration,
+    shouldMarkWatched,
+    createdAt,
+    updatedAt,
+    syncAttempts,
+    lastError,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'offline_watch_progress';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<OfflineWatchProgressItem> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    }
+    if (data.containsKey('server_id')) {
+      context.handle(
+        _serverIdMeta,
+        serverId.isAcceptableOrUnknown(data['server_id']!, _serverIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_serverIdMeta);
+    }
+    if (data.containsKey('rating_key')) {
+      context.handle(
+        _ratingKeyMeta,
+        ratingKey.isAcceptableOrUnknown(data['rating_key']!, _ratingKeyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_ratingKeyMeta);
+    }
+    if (data.containsKey('global_key')) {
+      context.handle(
+        _globalKeyMeta,
+        globalKey.isAcceptableOrUnknown(data['global_key']!, _globalKeyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_globalKeyMeta);
+    }
+    if (data.containsKey('action_type')) {
+      context.handle(
+        _actionTypeMeta,
+        actionType.isAcceptableOrUnknown(data['action_type']!, _actionTypeMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_actionTypeMeta);
+    }
+    if (data.containsKey('view_offset')) {
+      context.handle(
+        _viewOffsetMeta,
+        viewOffset.isAcceptableOrUnknown(data['view_offset']!, _viewOffsetMeta),
+      );
+    }
+    if (data.containsKey('duration')) {
+      context.handle(
+        _durationMeta,
+        duration.isAcceptableOrUnknown(data['duration']!, _durationMeta),
+      );
+    }
+    if (data.containsKey('should_mark_watched')) {
+      context.handle(
+        _shouldMarkWatchedMeta,
+        shouldMarkWatched.isAcceptableOrUnknown(
+          data['should_mark_watched']!,
+          _shouldMarkWatchedMeta,
+        ),
+      );
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(
+        _createdAtMeta,
+        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_createdAtMeta);
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_updatedAtMeta);
+    }
+    if (data.containsKey('sync_attempts')) {
+      context.handle(
+        _syncAttemptsMeta,
+        syncAttempts.isAcceptableOrUnknown(
+          data['sync_attempts']!,
+          _syncAttemptsMeta,
+        ),
+      );
+    }
+    if (data.containsKey('last_error')) {
+      context.handle(
+        _lastErrorMeta,
+        lastError.isAcceptableOrUnknown(data['last_error']!, _lastErrorMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  OfflineWatchProgressItem map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return OfflineWatchProgressItem(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      serverId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}server_id'],
+      )!,
+      ratingKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}rating_key'],
+      )!,
+      globalKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}global_key'],
+      )!,
+      actionType: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}action_type'],
+      )!,
+      viewOffset: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}view_offset'],
+      ),
+      duration: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}duration'],
+      ),
+      shouldMarkWatched: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}should_mark_watched'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      syncAttempts: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sync_attempts'],
+      )!,
+      lastError: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}last_error'],
+      ),
+    );
+  }
+
+  @override
+  $OfflineWatchProgressTable createAlias(String alias) {
+    return $OfflineWatchProgressTable(attachedDatabase, alias);
+  }
+}
+
+class OfflineWatchProgressItem extends DataClass
+    implements Insertable<OfflineWatchProgressItem> {
+  /// Auto-incrementing primary key
+  final int id;
+
+  /// Server ID this media belongs to
+  final String serverId;
+
+  /// Rating key of the media item
+  final String ratingKey;
+
+  /// Global key (serverId:ratingKey) for easy lookup
+  final String globalKey;
+
+  /// Type of action: 'progress', 'watched', 'unwatched'
+  final String actionType;
+
+  /// Current playback position in milliseconds (for 'progress' actions)
+  final int? viewOffset;
+
+  /// Duration of the media in milliseconds (for calculating percentage)
+  final int? duration;
+
+  /// Whether this item should be marked as watched (for progress sync)
+  /// Auto-set to true when viewOffset >= 90% of duration
+  final bool shouldMarkWatched;
+
+  /// Timestamp when this action was recorded (milliseconds since epoch)
+  final int createdAt;
+
+  /// Timestamp when this action was last updated (for merging progress updates)
+  final int updatedAt;
+
+  /// Number of sync attempts (for retry logic)
+  final int syncAttempts;
+
+  /// Last sync error message
+  final String? lastError;
+  const OfflineWatchProgressItem({
+    required this.id,
+    required this.serverId,
+    required this.ratingKey,
+    required this.globalKey,
+    required this.actionType,
+    this.viewOffset,
+    this.duration,
+    required this.shouldMarkWatched,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.syncAttempts,
+    this.lastError,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['server_id'] = Variable<String>(serverId);
+    map['rating_key'] = Variable<String>(ratingKey);
+    map['global_key'] = Variable<String>(globalKey);
+    map['action_type'] = Variable<String>(actionType);
+    if (!nullToAbsent || viewOffset != null) {
+      map['view_offset'] = Variable<int>(viewOffset);
+    }
+    if (!nullToAbsent || duration != null) {
+      map['duration'] = Variable<int>(duration);
+    }
+    map['should_mark_watched'] = Variable<bool>(shouldMarkWatched);
+    map['created_at'] = Variable<int>(createdAt);
+    map['updated_at'] = Variable<int>(updatedAt);
+    map['sync_attempts'] = Variable<int>(syncAttempts);
+    if (!nullToAbsent || lastError != null) {
+      map['last_error'] = Variable<String>(lastError);
+    }
+    return map;
+  }
+
+  OfflineWatchProgressCompanion toCompanion(bool nullToAbsent) {
+    return OfflineWatchProgressCompanion(
+      id: Value(id),
+      serverId: Value(serverId),
+      ratingKey: Value(ratingKey),
+      globalKey: Value(globalKey),
+      actionType: Value(actionType),
+      viewOffset: viewOffset == null && nullToAbsent
+          ? const Value.absent()
+          : Value(viewOffset),
+      duration: duration == null && nullToAbsent
+          ? const Value.absent()
+          : Value(duration),
+      shouldMarkWatched: Value(shouldMarkWatched),
+      createdAt: Value(createdAt),
+      updatedAt: Value(updatedAt),
+      syncAttempts: Value(syncAttempts),
+      lastError: lastError == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastError),
+    );
+  }
+
+  factory OfflineWatchProgressItem.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return OfflineWatchProgressItem(
+      id: serializer.fromJson<int>(json['id']),
+      serverId: serializer.fromJson<String>(json['serverId']),
+      ratingKey: serializer.fromJson<String>(json['ratingKey']),
+      globalKey: serializer.fromJson<String>(json['globalKey']),
+      actionType: serializer.fromJson<String>(json['actionType']),
+      viewOffset: serializer.fromJson<int?>(json['viewOffset']),
+      duration: serializer.fromJson<int?>(json['duration']),
+      shouldMarkWatched: serializer.fromJson<bool>(json['shouldMarkWatched']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      updatedAt: serializer.fromJson<int>(json['updatedAt']),
+      syncAttempts: serializer.fromJson<int>(json['syncAttempts']),
+      lastError: serializer.fromJson<String?>(json['lastError']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'serverId': serializer.toJson<String>(serverId),
+      'ratingKey': serializer.toJson<String>(ratingKey),
+      'globalKey': serializer.toJson<String>(globalKey),
+      'actionType': serializer.toJson<String>(actionType),
+      'viewOffset': serializer.toJson<int?>(viewOffset),
+      'duration': serializer.toJson<int?>(duration),
+      'shouldMarkWatched': serializer.toJson<bool>(shouldMarkWatched),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'updatedAt': serializer.toJson<int>(updatedAt),
+      'syncAttempts': serializer.toJson<int>(syncAttempts),
+      'lastError': serializer.toJson<String?>(lastError),
+    };
+  }
+
+  OfflineWatchProgressItem copyWith({
+    int? id,
+    String? serverId,
+    String? ratingKey,
+    String? globalKey,
+    String? actionType,
+    Value<int?> viewOffset = const Value.absent(),
+    Value<int?> duration = const Value.absent(),
+    bool? shouldMarkWatched,
+    int? createdAt,
+    int? updatedAt,
+    int? syncAttempts,
+    Value<String?> lastError = const Value.absent(),
+  }) => OfflineWatchProgressItem(
+    id: id ?? this.id,
+    serverId: serverId ?? this.serverId,
+    ratingKey: ratingKey ?? this.ratingKey,
+    globalKey: globalKey ?? this.globalKey,
+    actionType: actionType ?? this.actionType,
+    viewOffset: viewOffset.present ? viewOffset.value : this.viewOffset,
+    duration: duration.present ? duration.value : this.duration,
+    shouldMarkWatched: shouldMarkWatched ?? this.shouldMarkWatched,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    syncAttempts: syncAttempts ?? this.syncAttempts,
+    lastError: lastError.present ? lastError.value : this.lastError,
+  );
+  OfflineWatchProgressItem copyWithCompanion(
+    OfflineWatchProgressCompanion data,
+  ) {
+    return OfflineWatchProgressItem(
+      id: data.id.present ? data.id.value : this.id,
+      serverId: data.serverId.present ? data.serverId.value : this.serverId,
+      ratingKey: data.ratingKey.present ? data.ratingKey.value : this.ratingKey,
+      globalKey: data.globalKey.present ? data.globalKey.value : this.globalKey,
+      actionType: data.actionType.present
+          ? data.actionType.value
+          : this.actionType,
+      viewOffset: data.viewOffset.present
+          ? data.viewOffset.value
+          : this.viewOffset,
+      duration: data.duration.present ? data.duration.value : this.duration,
+      shouldMarkWatched: data.shouldMarkWatched.present
+          ? data.shouldMarkWatched.value
+          : this.shouldMarkWatched,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      syncAttempts: data.syncAttempts.present
+          ? data.syncAttempts.value
+          : this.syncAttempts,
+      lastError: data.lastError.present ? data.lastError.value : this.lastError,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('OfflineWatchProgressItem(')
+          ..write('id: $id, ')
+          ..write('serverId: $serverId, ')
+          ..write('ratingKey: $ratingKey, ')
+          ..write('globalKey: $globalKey, ')
+          ..write('actionType: $actionType, ')
+          ..write('viewOffset: $viewOffset, ')
+          ..write('duration: $duration, ')
+          ..write('shouldMarkWatched: $shouldMarkWatched, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('syncAttempts: $syncAttempts, ')
+          ..write('lastError: $lastError')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    serverId,
+    ratingKey,
+    globalKey,
+    actionType,
+    viewOffset,
+    duration,
+    shouldMarkWatched,
+    createdAt,
+    updatedAt,
+    syncAttempts,
+    lastError,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is OfflineWatchProgressItem &&
+          other.id == this.id &&
+          other.serverId == this.serverId &&
+          other.ratingKey == this.ratingKey &&
+          other.globalKey == this.globalKey &&
+          other.actionType == this.actionType &&
+          other.viewOffset == this.viewOffset &&
+          other.duration == this.duration &&
+          other.shouldMarkWatched == this.shouldMarkWatched &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.syncAttempts == this.syncAttempts &&
+          other.lastError == this.lastError);
+}
+
+class OfflineWatchProgressCompanion
+    extends UpdateCompanion<OfflineWatchProgressItem> {
+  final Value<int> id;
+  final Value<String> serverId;
+  final Value<String> ratingKey;
+  final Value<String> globalKey;
+  final Value<String> actionType;
+  final Value<int?> viewOffset;
+  final Value<int?> duration;
+  final Value<bool> shouldMarkWatched;
+  final Value<int> createdAt;
+  final Value<int> updatedAt;
+  final Value<int> syncAttempts;
+  final Value<String?> lastError;
+  const OfflineWatchProgressCompanion({
+    this.id = const Value.absent(),
+    this.serverId = const Value.absent(),
+    this.ratingKey = const Value.absent(),
+    this.globalKey = const Value.absent(),
+    this.actionType = const Value.absent(),
+    this.viewOffset = const Value.absent(),
+    this.duration = const Value.absent(),
+    this.shouldMarkWatched = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.syncAttempts = const Value.absent(),
+    this.lastError = const Value.absent(),
+  });
+  OfflineWatchProgressCompanion.insert({
+    this.id = const Value.absent(),
+    required String serverId,
+    required String ratingKey,
+    required String globalKey,
+    required String actionType,
+    this.viewOffset = const Value.absent(),
+    this.duration = const Value.absent(),
+    this.shouldMarkWatched = const Value.absent(),
+    required int createdAt,
+    required int updatedAt,
+    this.syncAttempts = const Value.absent(),
+    this.lastError = const Value.absent(),
+  }) : serverId = Value(serverId),
+       ratingKey = Value(ratingKey),
+       globalKey = Value(globalKey),
+       actionType = Value(actionType),
+       createdAt = Value(createdAt),
+       updatedAt = Value(updatedAt);
+  static Insertable<OfflineWatchProgressItem> custom({
+    Expression<int>? id,
+    Expression<String>? serverId,
+    Expression<String>? ratingKey,
+    Expression<String>? globalKey,
+    Expression<String>? actionType,
+    Expression<int>? viewOffset,
+    Expression<int>? duration,
+    Expression<bool>? shouldMarkWatched,
+    Expression<int>? createdAt,
+    Expression<int>? updatedAt,
+    Expression<int>? syncAttempts,
+    Expression<String>? lastError,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (serverId != null) 'server_id': serverId,
+      if (ratingKey != null) 'rating_key': ratingKey,
+      if (globalKey != null) 'global_key': globalKey,
+      if (actionType != null) 'action_type': actionType,
+      if (viewOffset != null) 'view_offset': viewOffset,
+      if (duration != null) 'duration': duration,
+      if (shouldMarkWatched != null) 'should_mark_watched': shouldMarkWatched,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (syncAttempts != null) 'sync_attempts': syncAttempts,
+      if (lastError != null) 'last_error': lastError,
+    });
+  }
+
+  OfflineWatchProgressCompanion copyWith({
+    Value<int>? id,
+    Value<String>? serverId,
+    Value<String>? ratingKey,
+    Value<String>? globalKey,
+    Value<String>? actionType,
+    Value<int?>? viewOffset,
+    Value<int?>? duration,
+    Value<bool>? shouldMarkWatched,
+    Value<int>? createdAt,
+    Value<int>? updatedAt,
+    Value<int>? syncAttempts,
+    Value<String?>? lastError,
+  }) {
+    return OfflineWatchProgressCompanion(
+      id: id ?? this.id,
+      serverId: serverId ?? this.serverId,
+      ratingKey: ratingKey ?? this.ratingKey,
+      globalKey: globalKey ?? this.globalKey,
+      actionType: actionType ?? this.actionType,
+      viewOffset: viewOffset ?? this.viewOffset,
+      duration: duration ?? this.duration,
+      shouldMarkWatched: shouldMarkWatched ?? this.shouldMarkWatched,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      syncAttempts: syncAttempts ?? this.syncAttempts,
+      lastError: lastError ?? this.lastError,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (serverId.present) {
+      map['server_id'] = Variable<String>(serverId.value);
+    }
+    if (ratingKey.present) {
+      map['rating_key'] = Variable<String>(ratingKey.value);
+    }
+    if (globalKey.present) {
+      map['global_key'] = Variable<String>(globalKey.value);
+    }
+    if (actionType.present) {
+      map['action_type'] = Variable<String>(actionType.value);
+    }
+    if (viewOffset.present) {
+      map['view_offset'] = Variable<int>(viewOffset.value);
+    }
+    if (duration.present) {
+      map['duration'] = Variable<int>(duration.value);
+    }
+    if (shouldMarkWatched.present) {
+      map['should_mark_watched'] = Variable<bool>(shouldMarkWatched.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<int>(updatedAt.value);
+    }
+    if (syncAttempts.present) {
+      map['sync_attempts'] = Variable<int>(syncAttempts.value);
+    }
+    if (lastError.present) {
+      map['last_error'] = Variable<String>(lastError.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('OfflineWatchProgressCompanion(')
+          ..write('id: $id, ')
+          ..write('serverId: $serverId, ')
+          ..write('ratingKey: $ratingKey, ')
+          ..write('globalKey: $globalKey, ')
+          ..write('actionType: $actionType, ')
+          ..write('viewOffset: $viewOffset, ')
+          ..write('duration: $duration, ')
+          ..write('shouldMarkWatched: $shouldMarkWatched, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('syncAttempts: $syncAttempts, ')
+          ..write('lastError: $lastError')
+          ..write(')'))
+        .toString();
+  }
+}
+
+abstract class _$AppDatabase extends GeneratedDatabase {
+  _$AppDatabase(QueryExecutor e) : super(e);
+  $AppDatabaseManager get managers => $AppDatabaseManager(this);
+  late final $DownloadedMediaTable downloadedMedia = $DownloadedMediaTable(
+    this,
+  );
+  late final $DownloadQueueTable downloadQueue = $DownloadQueueTable(this);
+  late final $ApiCacheTable apiCache = $ApiCacheTable(this);
+  late final $OfflineWatchProgressTable offlineWatchProgress =
+      $OfflineWatchProgressTable(this);
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    downloadedMedia,
+    downloadQueue,
+    apiCache,
+    offlineWatchProgress,
+  ];
+}
+
+typedef $$DownloadedMediaTableCreateCompanionBuilder =
+    DownloadedMediaCompanion Function({
+      Value<int> id,
+      required String serverId,
+      required String ratingKey,
+      required String globalKey,
+      required String type,
+      Value<String?> parentRatingKey,
+      Value<String?> grandparentRatingKey,
+      required int status,
+      Value<int> progress,
+      Value<int?> totalBytes,
+      Value<int> downloadedBytes,
+      Value<String?> videoFilePath,
+      Value<String?> thumbPath,
+      Value<int?> downloadedAt,
+      Value<String?> errorMessage,
+      Value<int> retryCount,
+    });
+typedef $$DownloadedMediaTableUpdateCompanionBuilder =
+    DownloadedMediaCompanion Function({
+      Value<int> id,
+      Value<String> serverId,
+      Value<String> ratingKey,
+      Value<String> globalKey,
+      Value<String> type,
+      Value<String?> parentRatingKey,
+      Value<String?> grandparentRatingKey,
+      Value<int> status,
+      Value<int> progress,
+      Value<int?> totalBytes,
+      Value<int> downloadedBytes,
+      Value<String?> videoFilePath,
+      Value<String?> thumbPath,
+      Value<int?> downloadedAt,
+      Value<String?> errorMessage,
+      Value<int> retryCount,
+    });
+
+class $$DownloadedMediaTableFilterComposer
+    extends Composer<_$AppDatabase, $DownloadedMediaTable> {
+  $$DownloadedMediaTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get serverId => $composableBuilder(
+    column: $table.serverId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get ratingKey => $composableBuilder(
+    column: $table.ratingKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get globalKey => $composableBuilder(
+    column: $table.globalKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get type => $composableBuilder(
+    column: $table.type,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get parentRatingKey => $composableBuilder(
+    column: $table.parentRatingKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get grandparentRatingKey => $composableBuilder(
+    column: $table.grandparentRatingKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get status => $composableBuilder(
+    column: $table.status,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get progress => $composableBuilder(
+    column: $table.progress,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get totalBytes => $composableBuilder(
+    column: $table.totalBytes,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get downloadedBytes => $composableBuilder(
+    column: $table.downloadedBytes,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get videoFilePath => $composableBuilder(
+    column: $table.videoFilePath,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get thumbPath => $composableBuilder(
+    column: $table.thumbPath,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get downloadedAt => $composableBuilder(
+    column: $table.downloadedAt,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get errorMessage => $composableBuilder(
+    column: $table.errorMessage,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get retryCount => $composableBuilder(
+    column: $table.retryCount,
+    builder: (column) => ColumnFilters(column),
+  );
+}
+
+class $$DownloadedMediaTableOrderingComposer
+    extends Composer<_$AppDatabase, $DownloadedMediaTable> {
+  $$DownloadedMediaTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get serverId => $composableBuilder(
+    column: $table.serverId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get ratingKey => $composableBuilder(
+    column: $table.ratingKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get globalKey => $composableBuilder(
+    column: $table.globalKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get type => $composableBuilder(
+    column: $table.type,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get parentRatingKey => $composableBuilder(
+    column: $table.parentRatingKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get grandparentRatingKey => $composableBuilder(
+    column: $table.grandparentRatingKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get status => $composableBuilder(
+    column: $table.status,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get progress => $composableBuilder(
+    column: $table.progress,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get totalBytes => $composableBuilder(
+    column: $table.totalBytes,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get downloadedBytes => $composableBuilder(
+    column: $table.downloadedBytes,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get videoFilePath => $composableBuilder(
+    column: $table.videoFilePath,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get thumbPath => $composableBuilder(
+    column: $table.thumbPath,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get downloadedAt => $composableBuilder(
+    column: $table.downloadedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get errorMessage => $composableBuilder(
+    column: $table.errorMessage,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get retryCount => $composableBuilder(
+    column: $table.retryCount,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$DownloadedMediaTableAnnotationComposer
+    extends Composer<_$AppDatabase, $DownloadedMediaTable> {
+  $$DownloadedMediaTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get serverId =>
+      $composableBuilder(column: $table.serverId, builder: (column) => column);
+
+  GeneratedColumn<String> get ratingKey =>
+      $composableBuilder(column: $table.ratingKey, builder: (column) => column);
+
+  GeneratedColumn<String> get globalKey =>
+      $composableBuilder(column: $table.globalKey, builder: (column) => column);
+
+  GeneratedColumn<String> get type =>
+      $composableBuilder(column: $table.type, builder: (column) => column);
+
+  GeneratedColumn<String> get parentRatingKey => $composableBuilder(
+    column: $table.parentRatingKey,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<String> get grandparentRatingKey => $composableBuilder(
+    column: $table.grandparentRatingKey,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get status =>
+      $composableBuilder(column: $table.status, builder: (column) => column);
+
+  GeneratedColumn<int> get progress =>
+      $composableBuilder(column: $table.progress, builder: (column) => column);
+
+  GeneratedColumn<int> get totalBytes => $composableBuilder(
+    column: $table.totalBytes,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get downloadedBytes => $composableBuilder(
+    column: $table.downloadedBytes,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<String> get videoFilePath => $composableBuilder(
+    column: $table.videoFilePath,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<String> get thumbPath =>
+      $composableBuilder(column: $table.thumbPath, builder: (column) => column);
+
+  GeneratedColumn<int> get downloadedAt => $composableBuilder(
+    column: $table.downloadedAt,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<String> get errorMessage => $composableBuilder(
+    column: $table.errorMessage,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get retryCount => $composableBuilder(
+    column: $table.retryCount,
+    builder: (column) => column,
+  );
+}
+
+class $$DownloadedMediaTableTableManager
+    extends
+        RootTableManager<
+          _$AppDatabase,
+          $DownloadedMediaTable,
+          DownloadedMediaItem,
+          $$DownloadedMediaTableFilterComposer,
+          $$DownloadedMediaTableOrderingComposer,
+          $$DownloadedMediaTableAnnotationComposer,
+          $$DownloadedMediaTableCreateCompanionBuilder,
+          $$DownloadedMediaTableUpdateCompanionBuilder,
+          (
+            DownloadedMediaItem,
+            BaseReferences<
+              _$AppDatabase,
+              $DownloadedMediaTable,
+              DownloadedMediaItem
+            >,
+          ),
+          DownloadedMediaItem,
+          PrefetchHooks Function()
+        > {
+  $$DownloadedMediaTableTableManager(
+    _$AppDatabase db,
+    $DownloadedMediaTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$DownloadedMediaTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$DownloadedMediaTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$DownloadedMediaTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<String> serverId = const Value.absent(),
+                Value<String> ratingKey = const Value.absent(),
+                Value<String> globalKey = const Value.absent(),
+                Value<String> type = const Value.absent(),
+                Value<String?> parentRatingKey = const Value.absent(),
+                Value<String?> grandparentRatingKey = const Value.absent(),
+                Value<int> status = const Value.absent(),
+                Value<int> progress = const Value.absent(),
+                Value<int?> totalBytes = const Value.absent(),
+                Value<int> downloadedBytes = const Value.absent(),
+                Value<String?> videoFilePath = const Value.absent(),
+                Value<String?> thumbPath = const Value.absent(),
+                Value<int?> downloadedAt = const Value.absent(),
+                Value<String?> errorMessage = const Value.absent(),
+                Value<int> retryCount = const Value.absent(),
+              }) => DownloadedMediaCompanion(
+                id: id,
+                serverId: serverId,
+                ratingKey: ratingKey,
+                globalKey: globalKey,
+                type: type,
+                parentRatingKey: parentRatingKey,
+                grandparentRatingKey: grandparentRatingKey,
+                status: status,
+                progress: progress,
+                totalBytes: totalBytes,
+                downloadedBytes: downloadedBytes,
+                videoFilePath: videoFilePath,
+                thumbPath: thumbPath,
+                downloadedAt: downloadedAt,
+                errorMessage: errorMessage,
+                retryCount: retryCount,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                required String serverId,
+                required String ratingKey,
+                required String globalKey,
+                required String type,
+                Value<String?> parentRatingKey = const Value.absent(),
+                Value<String?> grandparentRatingKey = const Value.absent(),
+                required int status,
+                Value<int> progress = const Value.absent(),
+                Value<int?> totalBytes = const Value.absent(),
+                Value<int> downloadedBytes = const Value.absent(),
+                Value<String?> videoFilePath = const Value.absent(),
+                Value<String?> thumbPath = const Value.absent(),
+                Value<int?> downloadedAt = const Value.absent(),
+                Value<String?> errorMessage = const Value.absent(),
+                Value<int> retryCount = const Value.absent(),
+              }) => DownloadedMediaCompanion.insert(
+                id: id,
+                serverId: serverId,
+                ratingKey: ratingKey,
+                globalKey: globalKey,
+                type: type,
+                parentRatingKey: parentRatingKey,
+                grandparentRatingKey: grandparentRatingKey,
+                status: status,
+                progress: progress,
+                totalBytes: totalBytes,
+                downloadedBytes: downloadedBytes,
+                videoFilePath: videoFilePath,
+                thumbPath: thumbPath,
+                downloadedAt: downloadedAt,
+                errorMessage: errorMessage,
+                retryCount: retryCount,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$DownloadedMediaTableProcessedTableManager =
+    ProcessedTableManager<
+      _$AppDatabase,
+      $DownloadedMediaTable,
+      DownloadedMediaItem,
+      $$DownloadedMediaTableFilterComposer,
+      $$DownloadedMediaTableOrderingComposer,
+      $$DownloadedMediaTableAnnotationComposer,
+      $$DownloadedMediaTableCreateCompanionBuilder,
+      $$DownloadedMediaTableUpdateCompanionBuilder,
+      (
+        DownloadedMediaItem,
+        BaseReferences<
+          _$AppDatabase,
+          $DownloadedMediaTable,
+          DownloadedMediaItem
+        >,
+      ),
+      DownloadedMediaItem,
+      PrefetchHooks Function()
+    >;
+typedef $$DownloadQueueTableCreateCompanionBuilder =
+    DownloadQueueCompanion Function({
+      Value<int> id,
+      required String mediaGlobalKey,
+      Value<int> priority,
+      required int addedAt,
+      Value<bool> downloadSubtitles,
+      Value<bool> downloadArtwork,
+    });
+typedef $$DownloadQueueTableUpdateCompanionBuilder =
+    DownloadQueueCompanion Function({
+      Value<int> id,
+      Value<String> mediaGlobalKey,
+      Value<int> priority,
+      Value<int> addedAt,
+      Value<bool> downloadSubtitles,
+      Value<bool> downloadArtwork,
+    });
+
+class $$DownloadQueueTableFilterComposer
+    extends Composer<_$AppDatabase, $DownloadQueueTable> {
+  $$DownloadQueueTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get mediaGlobalKey => $composableBuilder(
+    column: $table.mediaGlobalKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get priority => $composableBuilder(
+    column: $table.priority,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get addedAt => $composableBuilder(
+    column: $table.addedAt,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get downloadSubtitles => $composableBuilder(
+    column: $table.downloadSubtitles,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get downloadArtwork => $composableBuilder(
+    column: $table.downloadArtwork,
+    builder: (column) => ColumnFilters(column),
+  );
+}
+
+class $$DownloadQueueTableOrderingComposer
+    extends Composer<_$AppDatabase, $DownloadQueueTable> {
+  $$DownloadQueueTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get mediaGlobalKey => $composableBuilder(
+    column: $table.mediaGlobalKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get priority => $composableBuilder(
+    column: $table.priority,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get addedAt => $composableBuilder(
+    column: $table.addedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get downloadSubtitles => $composableBuilder(
+    column: $table.downloadSubtitles,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get downloadArtwork => $composableBuilder(
+    column: $table.downloadArtwork,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$DownloadQueueTableAnnotationComposer
+    extends Composer<_$AppDatabase, $DownloadQueueTable> {
+  $$DownloadQueueTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get mediaGlobalKey => $composableBuilder(
+    column: $table.mediaGlobalKey,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get priority =>
+      $composableBuilder(column: $table.priority, builder: (column) => column);
+
+  GeneratedColumn<int> get addedAt =>
+      $composableBuilder(column: $table.addedAt, builder: (column) => column);
+
+  GeneratedColumn<bool> get downloadSubtitles => $composableBuilder(
+    column: $table.downloadSubtitles,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<bool> get downloadArtwork => $composableBuilder(
+    column: $table.downloadArtwork,
+    builder: (column) => column,
+  );
+}
+
+class $$DownloadQueueTableTableManager
+    extends
+        RootTableManager<
+          _$AppDatabase,
+          $DownloadQueueTable,
+          DownloadQueueItem,
+          $$DownloadQueueTableFilterComposer,
+          $$DownloadQueueTableOrderingComposer,
+          $$DownloadQueueTableAnnotationComposer,
+          $$DownloadQueueTableCreateCompanionBuilder,
+          $$DownloadQueueTableUpdateCompanionBuilder,
+          (
+            DownloadQueueItem,
+            BaseReferences<
+              _$AppDatabase,
+              $DownloadQueueTable,
+              DownloadQueueItem
+            >,
+          ),
+          DownloadQueueItem,
+          PrefetchHooks Function()
+        > {
+  $$DownloadQueueTableTableManager(_$AppDatabase db, $DownloadQueueTable table)
+    : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$DownloadQueueTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$DownloadQueueTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$DownloadQueueTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<String> mediaGlobalKey = const Value.absent(),
+                Value<int> priority = const Value.absent(),
+                Value<int> addedAt = const Value.absent(),
+                Value<bool> downloadSubtitles = const Value.absent(),
+                Value<bool> downloadArtwork = const Value.absent(),
+              }) => DownloadQueueCompanion(
+                id: id,
+                mediaGlobalKey: mediaGlobalKey,
+                priority: priority,
+                addedAt: addedAt,
+                downloadSubtitles: downloadSubtitles,
+                downloadArtwork: downloadArtwork,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                required String mediaGlobalKey,
+                Value<int> priority = const Value.absent(),
+                required int addedAt,
+                Value<bool> downloadSubtitles = const Value.absent(),
+                Value<bool> downloadArtwork = const Value.absent(),
+              }) => DownloadQueueCompanion.insert(
+                id: id,
+                mediaGlobalKey: mediaGlobalKey,
+                priority: priority,
+                addedAt: addedAt,
+                downloadSubtitles: downloadSubtitles,
+                downloadArtwork: downloadArtwork,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$DownloadQueueTableProcessedTableManager =
+    ProcessedTableManager<
+      _$AppDatabase,
+      $DownloadQueueTable,
+      DownloadQueueItem,
+      $$DownloadQueueTableFilterComposer,
+      $$DownloadQueueTableOrderingComposer,
+      $$DownloadQueueTableAnnotationComposer,
+      $$DownloadQueueTableCreateCompanionBuilder,
+      $$DownloadQueueTableUpdateCompanionBuilder,
+      (
+        DownloadQueueItem,
+        BaseReferences<_$AppDatabase, $DownloadQueueTable, DownloadQueueItem>,
+      ),
+      DownloadQueueItem,
+      PrefetchHooks Function()
+    >;
+typedef $$ApiCacheTableCreateCompanionBuilder =
+    ApiCacheCompanion Function({
+      required String cacheKey,
+      required String data,
+      Value<bool> pinned,
+      Value<DateTime> cachedAt,
+      Value<int> rowid,
+    });
+typedef $$ApiCacheTableUpdateCompanionBuilder =
+    ApiCacheCompanion Function({
+      Value<String> cacheKey,
+      Value<String> data,
+      Value<bool> pinned,
+      Value<DateTime> cachedAt,
+      Value<int> rowid,
+    });
+
+class $$ApiCacheTableFilterComposer
+    extends Composer<_$AppDatabase, $ApiCacheTable> {
+  $$ApiCacheTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<String> get cacheKey => $composableBuilder(
+    column: $table.cacheKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get data => $composableBuilder(
+    column: $table.data,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get pinned => $composableBuilder(
+    column: $table.pinned,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<DateTime> get cachedAt => $composableBuilder(
+    column: $table.cachedAt,
+    builder: (column) => ColumnFilters(column),
+  );
+}
+
+class $$ApiCacheTableOrderingComposer
+    extends Composer<_$AppDatabase, $ApiCacheTable> {
+  $$ApiCacheTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<String> get cacheKey => $composableBuilder(
+    column: $table.cacheKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get data => $composableBuilder(
+    column: $table.data,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get pinned => $composableBuilder(
+    column: $table.pinned,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<DateTime> get cachedAt => $composableBuilder(
+    column: $table.cachedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$ApiCacheTableAnnotationComposer
+    extends Composer<_$AppDatabase, $ApiCacheTable> {
+  $$ApiCacheTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<String> get cacheKey =>
+      $composableBuilder(column: $table.cacheKey, builder: (column) => column);
+
+  GeneratedColumn<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+
+  GeneratedColumn<bool> get pinned =>
+      $composableBuilder(column: $table.pinned, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get cachedAt =>
+      $composableBuilder(column: $table.cachedAt, builder: (column) => column);
+}
+
+class $$ApiCacheTableTableManager
+    extends
+        RootTableManager<
+          _$AppDatabase,
+          $ApiCacheTable,
+          ApiCacheData,
+          $$ApiCacheTableFilterComposer,
+          $$ApiCacheTableOrderingComposer,
+          $$ApiCacheTableAnnotationComposer,
+          $$ApiCacheTableCreateCompanionBuilder,
+          $$ApiCacheTableUpdateCompanionBuilder,
+          (
+            ApiCacheData,
+            BaseReferences<_$AppDatabase, $ApiCacheTable, ApiCacheData>,
+          ),
+          ApiCacheData,
+          PrefetchHooks Function()
+        > {
+  $$ApiCacheTableTableManager(_$AppDatabase db, $ApiCacheTable table)
+    : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$ApiCacheTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$ApiCacheTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$ApiCacheTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<String> cacheKey = const Value.absent(),
+                Value<String> data = const Value.absent(),
+                Value<bool> pinned = const Value.absent(),
+                Value<DateTime> cachedAt = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => ApiCacheCompanion(
+                cacheKey: cacheKey,
+                data: data,
+                pinned: pinned,
+                cachedAt: cachedAt,
+                rowid: rowid,
+              ),
+          createCompanionCallback:
+              ({
+                required String cacheKey,
+                required String data,
+                Value<bool> pinned = const Value.absent(),
+                Value<DateTime> cachedAt = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => ApiCacheCompanion.insert(
+                cacheKey: cacheKey,
+                data: data,
+                pinned: pinned,
+                cachedAt: cachedAt,
+                rowid: rowid,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$ApiCacheTableProcessedTableManager =
+    ProcessedTableManager<
+      _$AppDatabase,
+      $ApiCacheTable,
+      ApiCacheData,
+      $$ApiCacheTableFilterComposer,
+      $$ApiCacheTableOrderingComposer,
+      $$ApiCacheTableAnnotationComposer,
+      $$ApiCacheTableCreateCompanionBuilder,
+      $$ApiCacheTableUpdateCompanionBuilder,
+      (
+        ApiCacheData,
+        BaseReferences<_$AppDatabase, $ApiCacheTable, ApiCacheData>,
+      ),
+      ApiCacheData,
+      PrefetchHooks Function()
+    >;
+typedef $$OfflineWatchProgressTableCreateCompanionBuilder =
+    OfflineWatchProgressCompanion Function({
+      Value<int> id,
+      required String serverId,
+      required String ratingKey,
+      required String globalKey,
+      required String actionType,
+      Value<int?> viewOffset,
+      Value<int?> duration,
+      Value<bool> shouldMarkWatched,
+      required int createdAt,
+      required int updatedAt,
+      Value<int> syncAttempts,
+      Value<String?> lastError,
+    });
+typedef $$OfflineWatchProgressTableUpdateCompanionBuilder =
+    OfflineWatchProgressCompanion Function({
+      Value<int> id,
+      Value<String> serverId,
+      Value<String> ratingKey,
+      Value<String> globalKey,
+      Value<String> actionType,
+      Value<int?> viewOffset,
+      Value<int?> duration,
+      Value<bool> shouldMarkWatched,
+      Value<int> createdAt,
+      Value<int> updatedAt,
+      Value<int> syncAttempts,
+      Value<String?> lastError,
+    });
+
+class $$OfflineWatchProgressTableFilterComposer
+    extends Composer<_$AppDatabase, $OfflineWatchProgressTable> {
+  $$OfflineWatchProgressTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get serverId => $composableBuilder(
+    column: $table.serverId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get ratingKey => $composableBuilder(
+    column: $table.ratingKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get globalKey => $composableBuilder(
+    column: $table.globalKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get actionType => $composableBuilder(
+    column: $table.actionType,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get viewOffset => $composableBuilder(
+    column: $table.viewOffset,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get duration => $composableBuilder(
+    column: $table.duration,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get shouldMarkWatched => $composableBuilder(
+    column: $table.shouldMarkWatched,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get syncAttempts => $composableBuilder(
+    column: $table.syncAttempts,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get lastError => $composableBuilder(
+    column: $table.lastError,
+    builder: (column) => ColumnFilters(column),
+  );
+}
+
+class $$OfflineWatchProgressTableOrderingComposer
+    extends Composer<_$AppDatabase, $OfflineWatchProgressTable> {
+  $$OfflineWatchProgressTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get serverId => $composableBuilder(
+    column: $table.serverId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get ratingKey => $composableBuilder(
+    column: $table.ratingKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get globalKey => $composableBuilder(
+    column: $table.globalKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get actionType => $composableBuilder(
+    column: $table.actionType,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get viewOffset => $composableBuilder(
+    column: $table.viewOffset,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get duration => $composableBuilder(
+    column: $table.duration,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get shouldMarkWatched => $composableBuilder(
+    column: $table.shouldMarkWatched,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get syncAttempts => $composableBuilder(
+    column: $table.syncAttempts,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get lastError => $composableBuilder(
+    column: $table.lastError,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$OfflineWatchProgressTableAnnotationComposer
+    extends Composer<_$AppDatabase, $OfflineWatchProgressTable> {
+  $$OfflineWatchProgressTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get serverId =>
+      $composableBuilder(column: $table.serverId, builder: (column) => column);
+
+  GeneratedColumn<String> get ratingKey =>
+      $composableBuilder(column: $table.ratingKey, builder: (column) => column);
+
+  GeneratedColumn<String> get globalKey =>
+      $composableBuilder(column: $table.globalKey, builder: (column) => column);
+
+  GeneratedColumn<String> get actionType => $composableBuilder(
+    column: $table.actionType,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get viewOffset => $composableBuilder(
+    column: $table.viewOffset,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get duration =>
+      $composableBuilder(column: $table.duration, builder: (column) => column);
+
+  GeneratedColumn<bool> get shouldMarkWatched => $composableBuilder(
+    column: $table.shouldMarkWatched,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
+  GeneratedColumn<int> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+
+  GeneratedColumn<int> get syncAttempts => $composableBuilder(
+    column: $table.syncAttempts,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<String> get lastError =>
+      $composableBuilder(column: $table.lastError, builder: (column) => column);
+}
+
+class $$OfflineWatchProgressTableTableManager
+    extends
+        RootTableManager<
+          _$AppDatabase,
+          $OfflineWatchProgressTable,
+          OfflineWatchProgressItem,
+          $$OfflineWatchProgressTableFilterComposer,
+          $$OfflineWatchProgressTableOrderingComposer,
+          $$OfflineWatchProgressTableAnnotationComposer,
+          $$OfflineWatchProgressTableCreateCompanionBuilder,
+          $$OfflineWatchProgressTableUpdateCompanionBuilder,
+          (
+            OfflineWatchProgressItem,
+            BaseReferences<
+              _$AppDatabase,
+              $OfflineWatchProgressTable,
+              OfflineWatchProgressItem
+            >,
+          ),
+          OfflineWatchProgressItem,
+          PrefetchHooks Function()
+        > {
+  $$OfflineWatchProgressTableTableManager(
+    _$AppDatabase db,
+    $OfflineWatchProgressTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$OfflineWatchProgressTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$OfflineWatchProgressTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              $$OfflineWatchProgressTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                Value<String> serverId = const Value.absent(),
+                Value<String> ratingKey = const Value.absent(),
+                Value<String> globalKey = const Value.absent(),
+                Value<String> actionType = const Value.absent(),
+                Value<int?> viewOffset = const Value.absent(),
+                Value<int?> duration = const Value.absent(),
+                Value<bool> shouldMarkWatched = const Value.absent(),
+                Value<int> createdAt = const Value.absent(),
+                Value<int> updatedAt = const Value.absent(),
+                Value<int> syncAttempts = const Value.absent(),
+                Value<String?> lastError = const Value.absent(),
+              }) => OfflineWatchProgressCompanion(
+                id: id,
+                serverId: serverId,
+                ratingKey: ratingKey,
+                globalKey: globalKey,
+                actionType: actionType,
+                viewOffset: viewOffset,
+                duration: duration,
+                shouldMarkWatched: shouldMarkWatched,
+                createdAt: createdAt,
+                updatedAt: updatedAt,
+                syncAttempts: syncAttempts,
+                lastError: lastError,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> id = const Value.absent(),
+                required String serverId,
+                required String ratingKey,
+                required String globalKey,
+                required String actionType,
+                Value<int?> viewOffset = const Value.absent(),
+                Value<int?> duration = const Value.absent(),
+                Value<bool> shouldMarkWatched = const Value.absent(),
+                required int createdAt,
+                required int updatedAt,
+                Value<int> syncAttempts = const Value.absent(),
+                Value<String?> lastError = const Value.absent(),
+              }) => OfflineWatchProgressCompanion.insert(
+                id: id,
+                serverId: serverId,
+                ratingKey: ratingKey,
+                globalKey: globalKey,
+                actionType: actionType,
+                viewOffset: viewOffset,
+                duration: duration,
+                shouldMarkWatched: shouldMarkWatched,
+                createdAt: createdAt,
+                updatedAt: updatedAt,
+                syncAttempts: syncAttempts,
+                lastError: lastError,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$OfflineWatchProgressTableProcessedTableManager =
+    ProcessedTableManager<
+      _$AppDatabase,
+      $OfflineWatchProgressTable,
+      OfflineWatchProgressItem,
+      $$OfflineWatchProgressTableFilterComposer,
+      $$OfflineWatchProgressTableOrderingComposer,
+      $$OfflineWatchProgressTableAnnotationComposer,
+      $$OfflineWatchProgressTableCreateCompanionBuilder,
+      $$OfflineWatchProgressTableUpdateCompanionBuilder,
+      (
+        OfflineWatchProgressItem,
+        BaseReferences<
+          _$AppDatabase,
+          $OfflineWatchProgressTable,
+          OfflineWatchProgressItem
+        >,
+      ),
+      OfflineWatchProgressItem,
+      PrefetchHooks Function()
+    >;
+
+class $AppDatabaseManager {
+  final _$AppDatabase _db;
+  $AppDatabaseManager(this._db);
+  $$DownloadedMediaTableTableManager get downloadedMedia =>
+      $$DownloadedMediaTableTableManager(_db, _db.downloadedMedia);
+  $$DownloadQueueTableTableManager get downloadQueue =>
+      $$DownloadQueueTableTableManager(_db, _db.downloadQueue);
+  $$ApiCacheTableTableManager get apiCache =>
+      $$ApiCacheTableTableManager(_db, _db.apiCache);
+  $$OfflineWatchProgressTableTableManager get offlineWatchProgress =>
+      $$OfflineWatchProgressTableTableManager(_db, _db.offlineWatchProgress);
+}
diff --git a/lib/database/tables/api_cache.dart b/lib/database/tables/api_cache.dart
new file mode 100644
index 00000000..dcafcb5c
--- /dev/null
+++ b/lib/database/tables/api_cache.dart
@@ -0,0 +1,20 @@
+import 'package:drift/drift.dart';
+
+/// Key-value cache table for Plex API responses.
+/// Used for offline support - stores raw JSON responses.
+class ApiCache extends Table {
+  /// Composite key: serverId:endpoint (e.g., "abc123:/library/metadata/12345")
+  TextColumn get cacheKey => text()();
+
+  /// JSON response data
+  TextColumn get data => text()();
+
+  /// Whether this item is pinned for offline access
+  BoolColumn get pinned => boolean().withDefault(const Constant(false))();
+
+  /// Timestamp for cache invalidation (optional future use)
+  DateTimeColumn get cachedAt => dateTime().withDefault(currentDateAndTime)();
+
+  @override
+  Set<Column> get primaryKey => {cacheKey};
+}
diff --git a/lib/database/tables/download_queue.dart b/lib/database/tables/download_queue.dart
new file mode 100644
index 00000000..f4bee463
--- /dev/null
+++ b/lib/database/tables/download_queue.dart
@@ -0,0 +1,13 @@
+import 'package:drift/drift.dart';
+
+@DataClassName('DownloadQueueItem')
+class DownloadQueue extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get mediaGlobalKey => text().unique()();
+  IntColumn get priority => integer().withDefault(const Constant(0))();
+  IntColumn get addedAt => integer()();
+  BoolColumn get downloadSubtitles =>
+      boolean().withDefault(const Constant(true))();
+  BoolColumn get downloadArtwork =>
+      boolean().withDefault(const Constant(true))();
+}
diff --git a/lib/database/tables/downloaded_media.dart b/lib/database/tables/downloaded_media.dart
new file mode 100644
index 00000000..582d802a
--- /dev/null
+++ b/lib/database/tables/downloaded_media.dart
@@ -0,0 +1,21 @@
+import 'package:drift/drift.dart';
+
+@DataClassName('DownloadedMediaItem')
+class DownloadedMedia extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get serverId => text()();
+  TextColumn get ratingKey => text()();
+  TextColumn get globalKey => text().unique()();
+  TextColumn get type => text()();
+  TextColumn get parentRatingKey => text().nullable()();
+  TextColumn get grandparentRatingKey => text().nullable()();
+  IntColumn get status => integer()();
+  IntColumn get progress => integer().withDefault(const Constant(0))();
+  IntColumn get totalBytes => integer().nullable()();
+  IntColumn get downloadedBytes => integer().withDefault(const Constant(0))();
+  TextColumn get videoFilePath => text().nullable()();
+  TextColumn get thumbPath => text().nullable()();
+  IntColumn get downloadedAt => integer().nullable()();
+  TextColumn get errorMessage => text().nullable()();
+  IntColumn get retryCount => integer().withDefault(const Constant(0))();
+}
diff --git a/lib/database/tables/offline_watch_progress.dart b/lib/database/tables/offline_watch_progress.dart
new file mode 100644
index 00000000..c6bf11db
--- /dev/null
+++ b/lib/database/tables/offline_watch_progress.dart
@@ -0,0 +1,46 @@
+import 'package:drift/drift.dart';
+
+/// Queue for offline watch progress and manual watch actions.
+///
+/// Stores watch progress updates and manual watch/unwatch actions
+/// that need to be synced to the Plex server when back online.
+@DataClassName('OfflineWatchProgressItem')
+class OfflineWatchProgress extends Table {
+  /// Auto-incrementing primary key
+  IntColumn get id => integer().autoIncrement()();
+
+  /// Server ID this media belongs to
+  TextColumn get serverId => text()();
+
+  /// Rating key of the media item
+  TextColumn get ratingKey => text()();
+
+  /// Global key (serverId:ratingKey) for easy lookup
+  TextColumn get globalKey => text()();
+
+  /// Type of action: 'progress', 'watched', 'unwatched'
+  TextColumn get actionType => text()();
+
+  /// Current playback position in milliseconds (for 'progress' actions)
+  IntColumn get viewOffset => integer().nullable()();
+
+  /// Duration of the media in milliseconds (for calculating percentage)
+  IntColumn get duration => integer().nullable()();
+
+  /// Whether this item should be marked as watched (for progress sync)
+  /// Auto-set to true when viewOffset >= 90% of duration
+  BoolColumn get shouldMarkWatched =>
+      boolean().withDefault(const Constant(false))();
+
+  /// Timestamp when this action was recorded (milliseconds since epoch)
+  IntColumn get createdAt => integer()();
+
+  /// Timestamp when this action was last updated (for merging progress updates)
+  IntColumn get updatedAt => integer()();
+
+  /// Number of sync attempts (for retry logic)
+  IntColumn get syncAttempts => integer().withDefault(const Constant(0))();
+
+  /// Last sync error message
+  TextColumn get lastError => text().nullable()();
+}
diff --git a/lib/focus/dpad_navigator.dart b/lib/focus/dpad_navigator.dart
new file mode 100644
index 00000000..676a1bb6
--- /dev/null
+++ b/lib/focus/dpad_navigator.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/services.dart';
+
+/// Shared sets for keyboard key categories.
+final _dpadDirectionKeys = {
+  LogicalKeyboardKey.arrowUp,
+  LogicalKeyboardKey.arrowDown,
+  LogicalKeyboardKey.arrowLeft,
+  LogicalKeyboardKey.arrowRight,
+};
+
+final _selectKeys = {
+  LogicalKeyboardKey.select,
+  LogicalKeyboardKey.enter,
+  LogicalKeyboardKey.numpadEnter,
+  LogicalKeyboardKey.gameButtonA,
+};
+
+final _backKeys = {
+  LogicalKeyboardKey.escape,
+  LogicalKeyboardKey.goBack,
+  LogicalKeyboardKey.browserBack,
+  LogicalKeyboardKey.gameButtonB,
+};
+
+final _contextMenuKeys = {
+  LogicalKeyboardKey.contextMenu,
+  LogicalKeyboardKey.gameButtonX,
+};
+
+/// Extension methods for checking D-pad related keys.
+extension DpadKeyExtension on LogicalKeyboardKey {
+  /// Whether this key is a D-pad directional key.
+  bool get isDpadDirection => _dpadDirectionKeys.contains(this);
+
+  /// Whether this key is a select/activate key.
+  bool get isSelectKey => _selectKeys.contains(this);
+
+  /// Whether this key is a back/cancel key.
+  bool get isBackKey => _backKeys.contains(this);
+
+  /// Whether this key is a context menu key.
+  bool get isContextMenuKey => _contextMenuKeys.contains(this);
+
+  /// Whether this key moves focus left.
+  bool get isLeftKey => this == LogicalKeyboardKey.arrowLeft;
+
+  /// Whether this key moves focus right.
+  bool get isRightKey => this == LogicalKeyboardKey.arrowRight;
+
+  /// Whether this key moves focus up.
+  bool get isUpKey => this == LogicalKeyboardKey.arrowUp;
+
+  /// Whether this key moves focus down.
+  bool get isDownKey => this == LogicalKeyboardKey.arrowDown;
+}
diff --git a/lib/focus/focus_theme.dart b/lib/focus/focus_theme.dart
new file mode 100644
index 00000000..553e0cc9
--- /dev/null
+++ b/lib/focus/focus_theme.dart
@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import '../theme/mono_tokens.dart';
+
+/// Focus styling constants for D-pad navigation.
+class FocusTheme {
+  FocusTheme._();
+
+  /// Scale factor when an item is focused.
+  static const double focusScale = 1.02;
+
+  /// Border width for the focus indicator.
+  static const double focusBorderWidth = 2.5;
+
+  /// Default border radius (matches MonoTokens.radiusSm).
+  static const double defaultBorderRadius = 8.0;
+
+  /// Get the focus border color from the theme.
+  static Color getFocusBorderColor(BuildContext context) {
+    return Theme.of(context).colorScheme.primary;
+  }
+
+  /// Get the animation duration from MonoTokens.
+  static Duration getAnimationDuration(BuildContext context) {
+    return Theme.of(context).extension<MonoTokens>()?.fast ??
+        const Duration(milliseconds: 150);
+  }
+
+  /// Build the focus border decoration.
+  static BoxDecoration focusDecoration(
+    BuildContext context, {
+    required bool isFocused,
+    double borderRadius = defaultBorderRadius,
+  }) {
+    final focusColor = getFocusBorderColor(context);
+
+    return BoxDecoration(
+      borderRadius: BorderRadius.circular(borderRadius),
+      border: Border.all(
+        color: isFocused ? focusColor : Colors.transparent,
+        width: focusBorderWidth,
+      ),
+    );
+  }
+
+  /// Build focus decoration with background color instead of border.
+  /// Useful for video controls where it should match the native hover style.
+  static BoxDecoration focusBackgroundDecoration({
+    required bool isFocused,
+    double borderRadius = defaultBorderRadius,
+  }) {
+    return BoxDecoration(
+      borderRadius: BorderRadius.circular(borderRadius),
+      color: isFocused
+          ? Colors.white.withValues(alpha: 0.2)
+          : Colors.transparent,
+    );
+  }
+}
diff --git a/lib/focus/focusable_chip_mixin.dart b/lib/focus/focusable_chip_mixin.dart
new file mode 100644
index 00000000..0c96a245
--- /dev/null
+++ b/lib/focus/focusable_chip_mixin.dart
@@ -0,0 +1,155 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'dpad_navigator.dart';
+
+/// Callbacks for chip key event handling.
+class ChipKeyCallbacks {
+  /// Called when SELECT key is pressed.
+  final VoidCallback? onSelect;
+
+  /// Called when DOWN arrow is pressed.
+  final VoidCallback? onNavigateDown;
+
+  /// Called when UP arrow is pressed.
+  final VoidCallback? onNavigateUp;
+
+  /// Called when LEFT arrow is pressed.
+  final VoidCallback? onNavigateLeft;
+
+  /// Called when RIGHT arrow is pressed.
+  final VoidCallback? onNavigateRight;
+
+  /// Called when BACK key is pressed.
+  final VoidCallback? onBack;
+
+  const ChipKeyCallbacks({
+    this.onSelect,
+    this.onNavigateDown,
+    this.onNavigateUp,
+    this.onNavigateLeft,
+    this.onNavigateRight,
+    this.onBack,
+  });
+}
+
+/// A mixin that provides common FocusNode lifecycle management for chip widgets.
+///
+/// This mixin handles:
+/// - Internal/external FocusNode pattern
+/// - `_isFocused` state tracking
+/// - Listener setup in `initState`
+/// - Listener handoff in `didUpdateWidget`
+/// - Cleanup in `dispose`
+///
+/// To use this mixin:
+/// 1. Add `with FocusableChipStateMixin<YourWidget>` to your State class
+/// 2. Implement [widgetFocusNode] to return the widget's optional focusNode
+/// 3. Implement [debugLabel] to return a debug label for the internal node
+/// 4. Call [initFocusNode] in your `initState`
+/// 5. Call [updateFocusNode] in your `didUpdateWidget`
+/// 6. Call [disposeFocusNode] in your `dispose`
+/// 7. Use [focusNode] and [isFocused] in your build method
+mixin FocusableChipStateMixin<T extends StatefulWidget> on State<T> {
+  FocusNode? _internalFocusNode;
+  bool _isFocused = false;
+
+  /// Override to return the widget's optional external focus node.
+  FocusNode? get widgetFocusNode;
+
+  /// Override to return a debug label for the internal focus node.
+  String get debugLabel;
+
+  /// The active focus node (external if provided, otherwise internal).
+  FocusNode get focusNode {
+    return widgetFocusNode ??
+        (_internalFocusNode ??= FocusNode(debugLabel: debugLabel));
+  }
+
+  /// Whether this widget is currently focused.
+  bool get isFocused => _isFocused;
+
+  /// Call this in your `initState` to set up the focus listener.
+  void initFocusNode() {
+    focusNode.addListener(_onFocusChange);
+  }
+
+  /// Call this in your `didUpdateWidget` with the old widget's focusNode.
+  void updateFocusNode(FocusNode? oldFocusNode) {
+    if (oldFocusNode != widgetFocusNode) {
+      oldFocusNode?.removeListener(_onFocusChange);
+      focusNode.addListener(_onFocusChange);
+    }
+  }
+
+  /// Call this in your `dispose` to clean up the focus listener.
+  void disposeFocusNode() {
+    focusNode.removeListener(_onFocusChange);
+    _internalFocusNode?.dispose();
+  }
+
+  void _onFocusChange() {
+    if (mounted) {
+      setState(() => _isFocused = focusNode.hasFocus);
+    }
+  }
+
+  /// Shared key event handler for chip widgets.
+  ///
+  /// Handles common key patterns:
+  /// - SELECT key -> onSelect
+  /// - Arrow keys -> navigation callbacks
+  /// - BACK key -> onBack
+  ///
+  /// Returns [KeyEventResult.handled] if the event was consumed,
+  /// [KeyEventResult.ignored] otherwise.
+  KeyEventResult handleChipKeyEvent(
+    FocusNode node,
+    KeyEvent event,
+    ChipKeyCallbacks callbacks,
+  ) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    // SELECT key activates the chip
+    if (key.isSelectKey && callbacks.onSelect != null) {
+      callbacks.onSelect!();
+      return KeyEventResult.handled;
+    }
+
+    // LEFT arrow
+    if (key.isLeftKey && callbacks.onNavigateLeft != null) {
+      callbacks.onNavigateLeft!();
+      return KeyEventResult.handled;
+    }
+
+    // RIGHT arrow
+    if (key.isRightKey && callbacks.onNavigateRight != null) {
+      callbacks.onNavigateRight!();
+      return KeyEventResult.handled;
+    }
+
+    // DOWN arrow
+    if (key.isDownKey) {
+      callbacks.onNavigateDown?.call();
+      return KeyEventResult.handled;
+    }
+
+    // UP arrow
+    if (key.isUpKey && callbacks.onNavigateUp != null) {
+      callbacks.onNavigateUp!();
+      return KeyEventResult.handled;
+    }
+
+    // BACK key
+    if (key.isBackKey && callbacks.onBack != null) {
+      callbacks.onBack!();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+}
diff --git a/lib/focus/focusable_wrapper.dart b/lib/focus/focusable_wrapper.dart
new file mode 100644
index 00000000..ef904cd2
--- /dev/null
+++ b/lib/focus/focusable_wrapper.dart
@@ -0,0 +1,389 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'dpad_navigator.dart';
+import 'focus_theme.dart';
+import 'input_mode_tracker.dart';
+
+/// A wrapper widget that makes its child focusable with D-pad navigation support.
+///
+/// Provides:
+/// - Visual focus indicator (border + scale animation)
+/// - Keyboard/D-pad event handling (Enter/Select to activate)
+/// - Optional auto-scroll to keep focused item visible
+/// - Long-press detection for SELECT key
+/// - Navigation callbacks (UP, BACK)
+class FocusableWrapper extends StatefulWidget {
+  /// The child widget to wrap.
+  final Widget child;
+
+  /// Called when the item is selected (Enter/Select/GamepadA).
+  /// For short press when [enableLongPress] is true.
+  final VoidCallback? onSelect;
+
+  /// Called when long press is triggered (hold SELECT key or context menu key).
+  /// Only triggered if [enableLongPress] is true.
+  final VoidCallback? onLongPress;
+
+  /// Called when focus changes.
+  final ValueChanged<bool>? onFocusChange;
+
+  /// Called when the user presses UP and there's no focusable item above.
+  final VoidCallback? onNavigateUp;
+
+  /// Called when the user presses BACK.
+  final VoidCallback? onBack;
+
+  /// Whether this widget should request focus when first built.
+  final bool autofocus;
+
+  /// Optional external FocusNode for programmatic focus control.
+  final FocusNode? focusNode;
+
+  /// Border radius for the focus indicator.
+  final double borderRadius;
+
+  /// Whether to scroll the widget into view when focused.
+  final bool autoScroll;
+
+  /// Alignment for auto-scroll (0.0 = start, 0.5 = center, 1.0 = end).
+  final double scrollAlignment;
+
+  /// Whether to use comfortable zone scrolling (only scroll if item is outside middle 60%).
+  /// If false, always scrolls to [scrollAlignment].
+  final bool useComfortableZone;
+
+  /// Optional semantic label for accessibility.
+  final String? semanticLabel;
+
+  /// Whether the wrapper can receive focus.
+  final bool canRequestFocus;
+
+  /// Custom key event handler. Return KeyEventResult.handled to consume the event.
+  /// This is called before the default key handling.
+  final KeyEventResult Function(FocusNode node, KeyEvent event)? onKeyEvent;
+
+  /// Whether to enable long-press detection for SELECT key.
+  /// When enabled, holding SELECT triggers [onLongPress] after 500ms.
+  /// Short press triggers [onSelect].
+  final bool enableLongPress;
+
+  /// Duration for long-press detection.
+  final Duration longPressDuration;
+
+  /// Whether to use background color instead of border for focus indicator.
+  /// Useful for video controls where outline doesn't look good.
+  final bool useBackgroundFocus;
+
+  /// Whether to disable the scale animation on focus.
+  /// Useful for elements like sliders where scaling looks odd.
+  final bool disableScale;
+
+  const FocusableWrapper({
+    super.key,
+    required this.child,
+    this.onSelect,
+    this.onLongPress,
+    this.onFocusChange,
+    this.onNavigateUp,
+    this.onBack,
+    this.autofocus = false,
+    this.focusNode,
+    this.borderRadius = FocusTheme.defaultBorderRadius,
+    this.autoScroll = true,
+    this.scrollAlignment = 0.5,
+    this.useComfortableZone = false,
+    this.semanticLabel,
+    this.canRequestFocus = true,
+    this.onKeyEvent,
+    this.enableLongPress = false,
+    this.longPressDuration = const Duration(milliseconds: 500),
+    this.useBackgroundFocus = false,
+    this.disableScale = false,
+  });
+
+  @override
+  State<FocusableWrapper> createState() => _FocusableWrapperState();
+}
+
+class _FocusableWrapperState extends State<FocusableWrapper>
+    with SingleTickerProviderStateMixin {
+  late FocusNode _focusNode;
+  bool _ownsNode = false;
+  bool _isFocused = false;
+
+  late AnimationController _animationController;
+  late Animation<double> _scaleAnimation;
+
+  // Long-press detection for SELECT key
+  Timer? _longPressTimer;
+  bool _isSelectKeyDown = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _initFocusNode();
+    _initAnimations();
+  }
+
+  void _initFocusNode() {
+    if (widget.focusNode != null) {
+      _focusNode = widget.focusNode!;
+      _ownsNode = false;
+    } else {
+      _focusNode = FocusNode(
+        debugLabel: widget.semanticLabel ?? 'FocusableWrapper',
+        canRequestFocus: widget.canRequestFocus,
+      );
+      _ownsNode = true;
+    }
+  }
+
+  void _initAnimations() {
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 150),
+    );
+
+    _scaleAnimation = Tween<double>(begin: 1.0, end: FocusTheme.focusScale)
+        .animate(
+          CurvedAnimation(
+            parent: _animationController,
+            curve: Curves.easeOutCubic,
+          ),
+        );
+  }
+
+  @override
+  void didUpdateWidget(FocusableWrapper oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    // Handle focusNode changes
+    if (widget.focusNode != oldWidget.focusNode) {
+      if (_ownsNode) {
+        _focusNode.dispose();
+      }
+      _initFocusNode();
+    }
+
+    // Update canRequestFocus
+    if (widget.canRequestFocus != oldWidget.canRequestFocus) {
+      _focusNode.canRequestFocus = widget.canRequestFocus;
+    }
+  }
+
+  @override
+  void dispose() {
+    _longPressTimer?.cancel();
+    _animationController.dispose();
+    if (_ownsNode) {
+      _focusNode.dispose();
+    }
+    super.dispose();
+  }
+
+  void _handleFocusChange(bool hasFocus) {
+    if (_isFocused != hasFocus) {
+      setState(() {
+        _isFocused = hasFocus;
+      });
+
+      // Animate scale
+      if (hasFocus) {
+        _animationController.forward();
+      } else {
+        _animationController.reverse();
+      }
+
+      // Auto-scroll into view
+      if (hasFocus && widget.autoScroll) {
+        _scrollIntoView();
+      }
+
+      // Notify listener
+      widget.onFocusChange?.call(hasFocus);
+    }
+  }
+
+  void _scrollIntoView() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted || !_isFocused) return;
+
+      final renderObject = context.findRenderObject();
+      if (renderObject == null) return;
+
+      if (widget.useComfortableZone) {
+        // Check if item is already in the comfortable zone
+        final scrollable = Scrollable.maybeOf(context);
+        if (scrollable == null) return;
+
+        final viewport = scrollable.context.findRenderObject() as RenderBox?;
+        if (viewport == null) return;
+
+        // Get item's position relative to viewport
+        final itemBox = renderObject as RenderBox;
+        final itemPosition = itemBox.localToGlobal(
+          Offset.zero,
+          ancestor: viewport,
+        );
+
+        // Check if item is already in the comfortable zone
+        final viewportHeight = viewport.size.height;
+        final itemHeight = itemBox.size.height;
+        final itemVerticalCenter = itemPosition.dy + itemHeight / 2;
+
+        // Define comfortable zone - if item center is within middle 60% of viewport, don't scroll
+        final comfortZoneTop = viewportHeight * 0.2;
+        final comfortZoneBottom = viewportHeight * 0.8;
+
+        if (itemVerticalCenter >= comfortZoneTop &&
+            itemVerticalCenter <= comfortZoneBottom) {
+          // Item is in comfortable zone, no need to scroll
+          return;
+        }
+      }
+
+      // Item is outside comfortable zone or comfortable zone disabled, scroll to alignment
+      Scrollable.ensureVisible(
+        context,
+        alignment: widget.scrollAlignment,
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeInOut,
+      );
+    });
+  }
+
+  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
+    final key = event.logicalKey;
+
+    // Call custom key handler first
+    if (widget.onKeyEvent != null) {
+      final result = widget.onKeyEvent!(node, event);
+      if (result == KeyEventResult.handled) {
+        return result;
+      }
+    }
+
+    // Handle SELECT key with optional long-press detection
+    if (key.isSelectKey) {
+      if (widget.enableLongPress) {
+        if (event is KeyDownEvent) {
+          // Only start timer on initial press, not repeats
+          if (!_isSelectKeyDown) {
+            _isSelectKeyDown = true;
+            _longPressTimer?.cancel();
+            _longPressTimer = Timer(widget.longPressDuration, () {
+              // Long press detected
+              if (mounted) {
+                widget.onLongPress?.call();
+              }
+            });
+          }
+          return KeyEventResult.handled;
+        } else if (event is KeyRepeatEvent) {
+          // Consume repeat events to prevent system sounds
+          return KeyEventResult.handled;
+        } else if (event is KeyUpEvent) {
+          final timerWasActive = _longPressTimer?.isActive ?? false;
+          _longPressTimer?.cancel();
+          if (timerWasActive && _isSelectKeyDown) {
+            // Timer still active - short press
+            widget.onSelect?.call();
+          }
+          // If timer already fired, long press was triggered - do nothing on key up
+          _isSelectKeyDown = false;
+          return KeyEventResult.handled;
+        }
+      } else {
+        // Simple select handling without long-press
+        if (event is KeyDownEvent) {
+          widget.onSelect?.call();
+          return KeyEventResult.handled;
+        }
+      }
+    }
+
+    // Ignore key repeat events for other keys
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    // Context menu key
+    if (key.isContextMenuKey) {
+      widget.onLongPress?.call();
+      return KeyEventResult.handled;
+    }
+
+    // UP arrow - if callback provided, navigate up
+    if (key == LogicalKeyboardKey.arrowUp && widget.onNavigateUp != null) {
+      widget.onNavigateUp!();
+      return KeyEventResult.handled;
+    }
+
+    // BACK key
+    if (key.isBackKey && widget.onBack != null) {
+      widget.onBack!();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final duration = FocusTheme.getAnimationDuration(context);
+    // Only show focus effects during keyboard/d-pad navigation
+    final showFocus = _isFocused && InputModeTracker.isKeyboardMode(context);
+
+    // Update animation duration if theme changes
+    if (_animationController.duration != duration) {
+      _animationController.duration = duration;
+    }
+
+    // Choose decoration based on useBackgroundFocus
+    final decoration = widget.useBackgroundFocus
+        ? FocusTheme.focusBackgroundDecoration(
+            isFocused: showFocus,
+            borderRadius: widget.borderRadius,
+          )
+        : FocusTheme.focusDecoration(
+            context,
+            isFocused: showFocus,
+            borderRadius: widget.borderRadius,
+          );
+
+    Widget result = Focus(
+      focusNode: _focusNode,
+      autofocus: widget.autofocus,
+      onFocusChange: _handleFocusChange,
+      onKeyEvent: _handleKeyEvent,
+      child: AnimatedBuilder(
+        animation: _scaleAnimation,
+        builder: (context, child) {
+          final shouldScale = showFocus && !widget.disableScale;
+          return Transform.scale(
+            scale: shouldScale ? _scaleAnimation.value : 1.0,
+            child: AnimatedContainer(
+              duration: duration,
+              curve: Curves.easeOutCubic,
+              decoration: decoration,
+              child: widget.child,
+            ),
+          );
+        },
+      ),
+    );
+
+    // Add semantics if label provided
+    if (widget.semanticLabel != null) {
+      result = Semantics(
+        label: widget.semanticLabel,
+        button: widget.onSelect != null,
+        child: result,
+      );
+    }
+
+    return result;
+  }
+}
diff --git a/lib/focus/input_mode_tracker.dart b/lib/focus/input_mode_tracker.dart
new file mode 100644
index 00000000..da06e873
--- /dev/null
+++ b/lib/focus/input_mode_tracker.dart
@@ -0,0 +1,121 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import '../services/tv_detection_service.dart';
+import '../services/gamepad_service.dart';
+
+/// Tracks whether the user is navigating via keyboard/d-pad or pointer (mouse/touch).
+///
+/// Focus effects should only be shown during keyboard navigation.
+enum InputMode { keyboard, pointer }
+
+/// Provides input mode tracking to descendant widgets.
+///
+/// Wrap your app with this widget to enable input mode detection:
+/// ```dart
+/// InputModeTracker(
+///   child: MaterialApp(...),
+/// )
+/// ```
+///
+/// Then check the mode in focusable widgets:
+/// ```dart
+/// final showFocus = _isFocused && InputModeTracker.isKeyboardMode(context);
+/// ```
+class InputModeTracker extends StatefulWidget {
+  final Widget child;
+
+  const InputModeTracker({super.key, required this.child});
+
+  /// Get the current input mode.
+  static InputMode of(BuildContext context) {
+    final provider = context
+        .dependOnInheritedWidgetOfExactType<_InputModeProvider>();
+    return provider?.mode ?? InputMode.pointer;
+  }
+
+  /// Convenience method to check if we're in keyboard mode.
+  static bool isKeyboardMode(BuildContext context) {
+    return of(context) == InputMode.keyboard;
+  }
+
+  @override
+  State<InputModeTracker> createState() => _InputModeTrackerState();
+}
+
+class _InputModeTrackerState extends State<InputModeTracker> {
+  // Default to keyboard mode on Android TV, pointer mode elsewhere
+  InputMode _mode = TvDetectionService.isTVSync()
+      ? InputMode.keyboard
+      : InputMode.pointer;
+
+  @override
+  void initState() {
+    super.initState();
+    // Initialize focus highlight strategy based on starting mode
+    _updateFocusHighlightStrategy(_mode);
+    // Listen to hardware keyboard events globally
+    HardwareKeyboard.instance.addHandler(_handleKeyEvent);
+
+    // Register callback for gamepad input to switch to keyboard mode
+    GamepadService.onGamepadInput = () => _setMode(InputMode.keyboard);
+  }
+
+  @override
+  void dispose() {
+    HardwareKeyboard.instance.removeHandler(_handleKeyEvent);
+    GamepadService.onGamepadInput = null;
+    super.dispose();
+  }
+
+  bool _handleKeyEvent(KeyEvent event) {
+    // Only switch to keyboard mode on key down (not repeats or releases)
+    if (event is KeyDownEvent) {
+      _setMode(InputMode.keyboard);
+    }
+    // Return false to let the event continue propagating
+    return false;
+  }
+
+  void _setMode(InputMode mode) {
+    if (_mode != mode) {
+      setState(() => _mode = mode);
+    }
+    _updateFocusHighlightStrategy(mode);
+  }
+
+  // Keep Material focus highlights in sync with our input mode so keyboard/gamepad
+  // navigation immediately shows focus without waiting for a real keypress.
+  void _updateFocusHighlightStrategy(InputMode mode) {
+    final desiredStrategy = mode == InputMode.keyboard
+        ? FocusHighlightStrategy.alwaysTraditional
+        : FocusHighlightStrategy.automatic;
+
+    if (FocusManager.instance.highlightStrategy != desiredStrategy) {
+      FocusManager.instance.highlightStrategy = desiredStrategy;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Listener(
+      // Switch to pointer mode on mouse activity
+      onPointerDown: (_) => _setMode(InputMode.pointer),
+      onPointerHover: (_) => _setMode(InputMode.pointer),
+      behavior: HitTestBehavior.translucent,
+      child: _InputModeProvider(mode: _mode, child: widget.child),
+    );
+  }
+}
+
+/// InheritedWidget that provides the current input mode.
+class _InputModeProvider extends InheritedWidget {
+  final InputMode mode;
+
+  const _InputModeProvider({required this.mode, required super.child});
+
+  @override
+  bool updateShouldNotify(_InputModeProvider oldWidget) {
+    return mode != oldWidget.mode;
+  }
+}
diff --git a/lib/focus/key_event_utils.dart b/lib/focus/key_event_utils.dart
new file mode 100644
index 00000000..fd5be15b
--- /dev/null
+++ b/lib/focus/key_event_utils.dart
@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'dpad_navigator.dart';
+
+/// Handles back key events by popping the current route.
+///
+/// Optionally pass a [result] to return to the previous route.
+///
+/// Use this as an `onKeyEvent` callback for Focus widgets that need
+/// simple back navigation behavior:
+///
+/// ```dart
+/// Focus(
+///   onKeyEvent: (node, event) => handleBackKeyNavigation(context, event),
+///   child: ...
+/// )
+/// ```
+///
+/// With a result value:
+/// ```dart
+/// Focus(
+///   onKeyEvent: (node, event) => handleBackKeyNavigation(
+///     context,
+///     event,
+///     result: _hasChanges,
+///   ),
+///   child: ...
+/// )
+/// ```
+KeyEventResult handleBackKeyNavigation<T>(
+  BuildContext context,
+  KeyEvent event, {
+  T? result,
+}) {
+  if (event is KeyDownEvent && event.logicalKey.isBackKey) {
+    Navigator.pop(context, result);
+    return KeyEventResult.handled;
+  }
+  return KeyEventResult.ignored;
+}
diff --git a/lib/focus/locked_hub_controller.dart b/lib/focus/locked_hub_controller.dart
new file mode 100644
index 00000000..1fca807a
--- /dev/null
+++ b/lib/focus/locked_hub_controller.dart
@@ -0,0 +1,35 @@
+/// Manages focus memory for hub navigation.
+///
+/// Tracks two things:
+/// 1. Per-hub memory: Each hub remembers which item was last focused
+/// 2. Global column hint: When entering a hub that hasn't been visited,
+///    we use the column position from the last focused hub as a hint
+class HubFocusMemory {
+  static final Map<String, int> _perHubMemory = {};
+  static int _lastColumnHint = 0;
+
+  /// Remember the focused index for a specific hub
+  static void setForHub(String hubKey, int index) {
+    _perHubMemory[hubKey] = index;
+    _lastColumnHint = index;
+  }
+
+  /// Get the remembered index for a hub, or fall back to column hint
+  static int getForHub(String hubKey, int itemCount) {
+    if (itemCount <= 0) return 0;
+
+    // If this hub has memory, use it
+    if (_perHubMemory.containsKey(hubKey)) {
+      return _perHubMemory[hubKey]!.clamp(0, itemCount - 1);
+    }
+
+    // Otherwise use the last column hint (clamped to this hub's item count)
+    return _lastColumnHint.clamp(0, itemCount - 1);
+  }
+
+  /// Clear all memory (e.g., when leaving a screen)
+  static void clear() {
+    _perHubMemory.clear();
+    _lastColumnHint = 0;
+  }
+}
diff --git a/lib/i18n/strings.g.dart b/lib/i18n/strings.g.dart
index 6d055508..8001657e 100644
--- a/lib/i18n/strings.g.dart
+++ b/lib/i18n/strings.g.dart
@@ -3,10 +3,10 @@
 /// Original: lib/i18n
 /// To regenerate, run: `dart run slang`
 ///
-/// Locales: 4
-/// Strings: 1256 (314 per locale)
+/// Locales: 6
+/// Strings: 2608 (434 per locale)
 ///
-/// Built on 2025-11-13 at 21:35 UTC
+/// Built on 2025-12-12 at 16:59 UTC
 
 // coverage:ignore-file
 // ignore_for_file: type=lint
@@ -26,9 +26,11 @@ const AppLocale _baseLocale = AppLocale.en;
 /// - if (LocaleSettings.currentLocale == AppLocale.en) // locale check
 enum AppLocale with BaseAppLocale<AppLocale, Translations> {
 	en(languageCode: 'en', build: Translations.build),
+	de(languageCode: 'de', build: _StringsDe.build),
 	it(languageCode: 'it', build: _StringsIt.build),
 	nl(languageCode: 'nl', build: _StringsNl.build),
-	sv(languageCode: 'sv', build: _StringsSv.build);
+	sv(languageCode: 'sv', build: _StringsSv.build),
+	zh(languageCode: 'zh', build: _StringsZh.build);
 
 	const AppLocale({required this.languageCode, this.scriptCode, this.countryCode, required this.build}); // ignore: unused_element
 
@@ -161,11 +163,11 @@ class Translations implements BaseTranslations<AppLocale, Translations> {
 	late final _StringsPinEntryEn pinEntry = _StringsPinEntryEn._(_root);
 	late final _StringsFileInfoEn fileInfo = _StringsFileInfoEn._(_root);
 	late final _StringsMediaMenuEn mediaMenu = _StringsMediaMenuEn._(_root);
+	late final _StringsAccessibilityEn accessibility = _StringsAccessibilityEn._(_root);
 	late final _StringsTooltipsEn tooltips = _StringsTooltipsEn._(_root);
 	late final _StringsVideoControlsEn videoControls = _StringsVideoControlsEn._(_root);
 	late final _StringsUserStatusEn userStatus = _StringsUserStatusEn._(_root);
 	late final _StringsMessagesEn messages = _StringsMessagesEn._(_root);
-	late final _StringsProfileEn profile = _StringsProfileEn._(_root);
 	late final _StringsSubtitlingStylingEn subtitlingStyling = _StringsSubtitlingStylingEn._(_root);
 	late final _StringsDialogEn dialog = _StringsDialogEn._(_root);
 	late final _StringsDiscoverEn discover = _StringsDiscoverEn._(_root);
@@ -177,6 +179,9 @@ class Translations implements BaseTranslations<AppLocale, Translations> {
 	late final _StringsLogsEn logs = _StringsLogsEn._(_root);
 	late final _StringsLicensesEn licenses = _StringsLicensesEn._(_root);
 	late final _StringsNavigationEn navigation = _StringsNavigationEn._(_root);
+	late final _StringsCollectionsEn collections = _StringsCollectionsEn._(_root);
+	late final _StringsPlaylistsEn playlists = _StringsPlaylistsEn._(_root);
+	late final _StringsDownloadsEn downloads = _StringsDownloadsEn._(_root);
 }
 
 // Path: app
@@ -226,18 +231,14 @@ class _StringsCommonEn {
 	String get submit => 'Submit';
 	String get confirm => 'Confirm';
 	String get retry => 'Retry';
-	String get playNow => 'Play Now';
 	String get logout => 'Logout';
-	String get online => 'Online';
-	String get offline => 'Offline';
-	String get owned => 'Owned';
-	String get shared => 'Shared';
-	String get current => 'CURRENT';
 	String get unknown => 'Unknown';
 	String get refresh => 'Refresh';
 	String get yes => 'Yes';
 	String get no => 'No';
-	String get server => 'Server';
+	String get delete => 'Delete';
+	String get shuffle => 'Shuffle';
+	String get addTo => 'Add to...';
 }
 
 // Path: screens
@@ -248,7 +249,6 @@ class _StringsScreensEn {
 
 	// Translations
 	String get licenses => 'Licenses';
-	String get selectServer => 'Select Server';
 	String get switchProfile => 'Switch Profile';
 	String get subtitleStyling => 'Subtitle Styling';
 	String get search => 'Search';
@@ -283,7 +283,6 @@ class _StringsSettingsEn {
 	String get theme => 'Theme';
 	String get appearance => 'Appearance';
 	String get videoPlayback => 'Video Playback';
-	String get shufflePlay => 'Shuffle Play';
 	String get advanced => 'Advanced';
 	String get useSeasonPostersDescription => 'Show season poster instead of series poster for episodes';
 	String get showHeroSectionDescription => 'Display featured content carousel on home screen';
@@ -321,15 +320,13 @@ class _StringsSettingsEn {
 	String secondsUnit({required Object seconds}) => '${seconds} seconds';
 	String get defaultSleepTimer => 'Default Sleep Timer';
 	String minutesUnit({required Object minutes}) => '${minutes} minutes';
-	String get unwatchedOnly => 'Unwatched Only';
-	String get unwatchedOnlyDescription => 'Only include unwatched episodes in shuffle queue';
-	String get shuffleOrderNavigation => 'Shuffle Order Navigation';
-	String get shuffleOrderNavigationDescription => 'Next/previous buttons follow shuffled order';
-	String get loopShuffleQueue => 'Loop Shuffle Queue';
-	String get loopShuffleQueueDescription => 'Restart queue when reaching the end';
+	String get rememberTrackSelections => 'Remember track selections per show/movie';
+	String get rememberTrackSelectionsDescription => 'Automatically save audio and subtitle language preferences when you change tracks during playback';
 	String get videoPlayerControls => 'Video Player Controls';
 	String get keyboardShortcuts => 'Keyboard Shortcuts';
 	String get keyboardShortcutsDescription => 'Customize keyboard shortcuts';
+	String get videoPlayerNavigation => 'Video Player Navigation';
+	String get videoPlayerNavigationDescription => 'Use arrow keys to navigate video player controls';
 	String get debugLogging => 'Debug Logging';
 	String get debugLoggingDescription => 'Enable detailed logging for troubleshooting';
 	String get viewLogs => 'View Logs';
@@ -350,6 +347,27 @@ class _StringsSettingsEn {
 	String validationErrorDuration({required Object min, required Object max, required Object unit}) => 'Duration must be between ${min} and ${max} ${unit}';
 	String shortcutAlreadyAssigned({required Object action}) => 'Shortcut already assigned to ${action}';
 	String shortcutUpdated({required Object action}) => 'Shortcut updated for ${action}';
+	String get autoSkip => 'Auto Skip';
+	String get autoSkipIntro => 'Auto Skip Intro';
+	String get autoSkipIntroDescription => 'Automatically skip intro markers after a few seconds';
+	String get autoSkipCredits => 'Auto Skip Credits';
+	String get autoSkipCreditsDescription => 'Automatically skip credits and play next episode';
+	String get autoSkipDelay => 'Auto Skip Delay';
+	String autoSkipDelayDescription({required Object seconds}) => 'Wait ${seconds} seconds before auto-skipping';
+	String get downloads => 'Downloads';
+	String get downloadLocationDescription => 'Choose where to store downloaded content';
+	String get downloadLocationDefault => 'Default (App Storage)';
+	String get downloadLocationCustom => 'Custom Location';
+	String get selectFolder => 'Select Folder';
+	String get resetToDefault => 'Reset to Default';
+	String currentPath({required Object path}) => 'Current: ${path}';
+	String get downloadLocationChanged => 'Download location changed';
+	String get downloadLocationReset => 'Download location reset to default';
+	String get downloadLocationInvalid => 'Selected folder is not writable';
+	String get downloadLocationSelectError => 'Failed to select folder';
+	String get downloadOnWifiOnly => 'Download on WiFi only';
+	String get downloadOnWifiOnlyDescription => 'Prevent downloads when on cellular data';
+	String get cellularDownloadBlocked => 'Downloads are disabled on cellular data. Connect to WiFi or change the setting.';
 }
 
 // Path: search
@@ -436,6 +454,23 @@ class _StringsMediaMenuEn {
 	String get fileInfo => 'File Info';
 }
 
+// Path: accessibility
+class _StringsAccessibilityEn {
+	_StringsAccessibilityEn._(this._root);
+
+	final Translations _root; // ignore: unused_field
+
+	// Translations
+	String mediaCardMovie({required Object title}) => '${title}, movie';
+	String mediaCardShow({required Object title}) => '${title}, TV show';
+	String mediaCardEpisode({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+	String mediaCardSeason({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+	String get mediaCardWatched => 'watched';
+	String mediaCardPartiallyWatched({required Object percent}) => '${percent} percent watched';
+	String get mediaCardUnwatched => 'unwatched';
+	String get tapToPlay => 'Tap to play';
+}
+
 // Path: tooltips
 class _StringsTooltipsEn {
 	_StringsTooltipsEn._(this._root);
@@ -468,6 +503,32 @@ class _StringsVideoControlsEn {
 	String get stretch => 'Stretch';
 	String get lockRotation => 'Lock rotation';
 	String get unlockRotation => 'Unlock rotation';
+	String get sleepTimer => 'Sleep Timer';
+	String get timerActive => 'Timer Active';
+	String playbackWillPauseIn({required Object duration}) => 'Playback will pause in ${duration}';
+	String get sleepTimerCompleted => 'Sleep timer completed - playback paused';
+	String get playButton => 'Play';
+	String get pauseButton => 'Pause';
+	String seekBackwardButton({required Object seconds}) => 'Seek backward ${seconds} seconds';
+	String seekForwardButton({required Object seconds}) => 'Seek forward ${seconds} seconds';
+	String get previousButton => 'Previous episode';
+	String get nextButton => 'Next episode';
+	String get previousChapterButton => 'Previous chapter';
+	String get nextChapterButton => 'Next chapter';
+	String get muteButton => 'Mute';
+	String get unmuteButton => 'Unmute';
+	String get settingsButton => 'Video settings';
+	String get audioTrackButton => 'Audio tracks';
+	String get subtitlesButton => 'Subtitles';
+	String get chaptersButton => 'Chapters';
+	String get versionsButton => 'Video versions';
+	String get aspectRatioButton => 'Aspect ratio';
+	String get fullscreenButton => 'Enter fullscreen';
+	String get exitFullscreenButton => 'Exit fullscreen';
+	String get rotationLockButton => 'Rotation lock';
+	String get timelineSlider => 'Video timeline';
+	String get volumeSlider => 'Volume level';
+	String get backButton => 'Back';
 }
 
 // Path: userStatus
@@ -480,6 +541,7 @@ class _StringsUserStatusEn {
 	String get admin => 'Admin';
 	String get restricted => 'Restricted';
 	String get protected => 'Protected';
+	String get current => 'CURRENT';
 }
 
 // Path: messages
@@ -491,6 +553,8 @@ class _StringsMessagesEn {
 	// Translations
 	String get markedAsWatched => 'Marked as watched';
 	String get markedAsUnwatched => 'Marked as unwatched';
+	String get markedAsWatchedOffline => 'Marked as watched (will sync when online)';
+	String get markedAsUnwatchedOffline => 'Marked as unwatched (will sync when online)';
 	String get removedFromContinueWatching => 'Removed from Continue Watching';
 	String errorLoading({required Object error}) => 'Error: ${error}';
 	String get fileInfoNotAvailable => 'File information not available';
@@ -507,24 +571,18 @@ class _StringsMessagesEn {
 	String metadataRefreshing({required Object title}) => 'Refreshing metadata for "${title}"...';
 	String metadataRefreshStarted({required Object title}) => 'Metadata refresh started for "${title}"';
 	String metadataRefreshFailed({required Object error}) => 'Failed to refresh metadata: ${error}';
-	String get noPlexToken => 'No Plex token found. Please login again.';
 	String get logoutConfirm => 'Are you sure you want to logout?';
 	String get noSeasonsFound => 'No seasons found';
 	String get noEpisodesFound => 'No episodes found in first season';
 	String get noEpisodesFoundGeneral => 'No episodes found';
 	String get noResultsFound => 'No results found';
 	String sleepTimerSet({required Object label}) => 'Sleep timer set for ${label}';
-	String failedToSwitchProfile({required Object displayName}) => 'Failed to switch to ${displayName}';
-}
-
-// Path: profile
-class _StringsProfileEn {
-	_StringsProfileEn._(this._root);
-
-	final Translations _root; // ignore: unused_field
-
-	// Translations
-	String get noUsersAvailable => 'No users available';
+	String get noItemsAvailable => 'No items available';
+	String get failedToCreatePlayQueue => 'Failed to create play queue';
+	String get failedToCreatePlayQueueNoItems => 'Failed to create play queue - no items';
+	String failedPlayback({required Object action, required Object error}) => 'Failed to ${action}: ${error}';
+	String get youAreOffline => 'You\'re Offline';
+	String get offlineFeatureUnavailable => 'This feature requires an internet connection. Your downloads and settings are still available.';
 }
 
 // Path: subtitlingStyling
@@ -551,7 +609,6 @@ class _StringsDialogEn {
 
 	// Translations
 	String get confirmAction => 'Confirm Action';
-	String get areYouSure => 'Are you sure you want to perform this action?';
 	String get cancel => 'Cancel';
 	String get playNow => 'Play Now';
 }
@@ -565,19 +622,19 @@ class _StringsDiscoverEn {
 	// Translations
 	String get title => 'Discover';
 	String get switchProfile => 'Switch Profile';
-	String get switchServer => 'Switch Server';
 	String get logout => 'Logout';
 	String get noContentAvailable => 'No content available';
 	String get addMediaToLibraries => 'Add some media to your libraries';
 	String get continueWatching => 'Continue Watching';
-	String get recentlyAdded => 'Recently Added';
 	String get play => 'Play';
-	String get resume => 'Resume';
-	String playEpisode({required Object season, required Object episode}) => 'Play S${season}, E${episode}';
-	String resumeEpisode({required Object season, required Object episode}) => 'Resume S${season}, E${episode}';
+	String playEpisode({required Object season, required Object episode}) => 'S${season}E${episode}';
 	String get pause => 'Pause';
 	String get overview => 'Overview';
 	String get cast => 'Cast';
+	String get seasons => 'Seasons';
+	String get studio => 'Studio';
+	String get rating => 'Rating';
+	String get watched => 'Watched';
 	String episodeCount({required Object count}) => '${count} episodes';
 	String watchedProgress({required Object watched, required Object total}) => '${watched}/${total} watched';
 	String get movie => 'Movie';
@@ -603,7 +660,6 @@ class _StringsErrorsEn {
 	String get invalidToken => 'Invalid token';
 	String failedToVerifyToken({required Object error}) => 'Failed to verify token: ${error}';
 	String failedToSwitchProfile({required Object displayName}) => 'Failed to switch to ${displayName}';
-	String get connectionFailedGeneric => 'Connection failed';
 }
 
 // Path: libraries
@@ -638,11 +694,19 @@ class _StringsLibrariesEn {
 	String get sort => 'Sort';
 	String get sortBy => 'Sort By';
 	String get filters => 'Filters';
-	String loadingLibraryWithCount({required Object count}) => 'Loading library... (${count} items loaded)';
 	String get confirmActionMessage => 'Are you sure you want to perform this action?';
 	String get showLibrary => 'Show library';
 	String get hideLibrary => 'Hide library';
 	String get libraryOptions => 'Library options';
+	String get content => 'library content';
+	String get selectLibrary => 'Select library';
+	String filtersWithCount({required Object count}) => 'Filters (${count})';
+	String get noRecommendations => 'No recommendations available';
+	String get noCollections => 'No collections in this library';
+	String get noFoldersFound => 'No folders found';
+	String get folders => 'folders';
+	late final _StringsLibrariesTabsEn tabs = _StringsLibrariesTabsEn._(_root);
+	late final _StringsLibrariesGroupingsEn groupings = _StringsLibrariesGroupingsEn._(_root);
 }
 
 // Path: about
@@ -666,17 +730,9 @@ class _StringsServerSelectionEn {
 	final Translations _root; // ignore: unused_field
 
 	// Translations
-	String get connectingToServer => 'Connecting to server...';
-	String get serverDebugCopied => 'Server debug data copied to clipboard';
-	String get copyDebugData => 'Copy Debug Data';
+	String get allServerConnectionsFailed => 'Failed to connect to any servers. Please check your network and try again.';
 	String get noServersFound => 'No servers found';
-	String malformedServerData({required Object count}) => 'Found ${count} server(s) with malformed data. No valid servers available.';
-	String get incompleteServerInfo => 'Some servers have incomplete information and were skipped. Please check your Plex.tv account.';
-	String get incompleteConnectionInfo => 'Server connection information is incomplete. Please try again.';
-	String malformedServerInfo({required Object message}) => 'Server information is malformed: ${message}';
-	String get networkConnectionFailed => 'Network connection failed. Please check your internet connection and try again.';
-	String get authenticationFailed => 'Authentication failed. Please sign in again.';
-	String get plexServiceUnavailable => 'Plex service unavailable. Please try again later.';
+	String noServersFoundForAccount({required Object username, required Object email}) => 'No servers found for ${username} (${email})';
 	String failedToLoadServers({required Object error}) => 'Failed to load servers: ${error}';
 }
 
@@ -701,11 +757,8 @@ class _StringsLogsEn {
 	final Translations _root; // ignore: unused_field
 
 	// Translations
-	String get title => 'Logs';
 	String get clearLogs => 'Clear Logs';
 	String get copyLogs => 'Copy Logs';
-	String get exportLogs => 'Export Logs';
-	String get noLogsToShow => 'No logs to show';
 	String get error => 'Error:';
 	String get stackTrace => 'Stack Trace:';
 }
@@ -734,6 +787,905 @@ class _StringsNavigationEn {
 	String get search => 'Search';
 	String get libraries => 'Libraries';
 	String get settings => 'Settings';
+	String get downloads => 'Downloads';
+}
+
+// Path: collections
+class _StringsCollectionsEn {
+	_StringsCollectionsEn._(this._root);
+
+	final Translations _root; // ignore: unused_field
+
+	// Translations
+	String get title => 'Collections';
+	String get collection => 'Collection';
+	String get empty => 'Collection is empty';
+	String get unknownLibrarySection => 'Cannot delete: Unknown library section';
+	String get deleteCollection => 'Delete Collection';
+	String deleteConfirm({required Object title}) => 'Are you sure you want to delete "${title}"? This action cannot be undone.';
+	String get deleted => 'Collection deleted';
+	String get deleteFailed => 'Failed to delete collection';
+	String deleteFailedWithError({required Object error}) => 'Failed to delete collection: ${error}';
+	String failedToLoadItems({required Object error}) => 'Failed to load collection items: ${error}';
+	String get selectCollection => 'Select Collection';
+	String get createNewCollection => 'Create New Collection';
+	String get collectionName => 'Collection Name';
+	String get enterCollectionName => 'Enter collection name';
+	String get addedToCollection => 'Added to collection';
+	String get errorAddingToCollection => 'Failed to add to collection';
+	String get created => 'Collection created';
+	String get removeFromCollection => 'Remove from collection';
+	String removeFromCollectionConfirm({required Object title}) => 'Remove "${title}" from this collection?';
+	String get removedFromCollection => 'Removed from collection';
+	String get removeFromCollectionFailed => 'Failed to remove from collection';
+	String removeFromCollectionError({required Object error}) => 'Error removing from collection: ${error}';
+}
+
+// Path: playlists
+class _StringsPlaylistsEn {
+	_StringsPlaylistsEn._(this._root);
+
+	final Translations _root; // ignore: unused_field
+
+	// Translations
+	String get title => 'Playlists';
+	String get playlist => 'Playlist';
+	String get noPlaylists => 'No playlists found';
+	String get create => 'Create Playlist';
+	String get playlistName => 'Playlist Name';
+	String get enterPlaylistName => 'Enter playlist name';
+	String get delete => 'Delete Playlist';
+	String get removeItem => 'Remove from Playlist';
+	String get smartPlaylist => 'Smart Playlist';
+	String itemCount({required Object count}) => '${count} items';
+	String get oneItem => '1 item';
+	String get emptyPlaylist => 'This playlist is empty';
+	String get deleteConfirm => 'Delete Playlist?';
+	String deleteMessage({required Object name}) => 'Are you sure you want to delete "${name}"?';
+	String get created => 'Playlist created';
+	String get deleted => 'Playlist deleted';
+	String get itemAdded => 'Added to playlist';
+	String get itemRemoved => 'Removed from playlist';
+	String get selectPlaylist => 'Select Playlist';
+	String get createNewPlaylist => 'Create New Playlist';
+	String get errorCreating => 'Failed to create playlist';
+	String get errorDeleting => 'Failed to delete playlist';
+	String get errorLoading => 'Failed to load playlists';
+	String get errorAdding => 'Failed to add to playlist';
+	String get errorReordering => 'Failed to reorder playlist item';
+	String get errorRemoving => 'Failed to remove from playlist';
+}
+
+// Path: downloads
+class _StringsDownloadsEn {
+	_StringsDownloadsEn._(this._root);
+
+	final Translations _root; // ignore: unused_field
+
+	// Translations
+	String get title => 'Downloads';
+	String get manage => 'Manage';
+	String get tvShows => 'TV Shows';
+	String get movies => 'Movies';
+	String get noDownloads => 'No downloads yet';
+	String get noDownloadsDescription => 'Downloaded content will appear here for offline viewing';
+	String get downloadNow => 'Download';
+	String get deleteDownload => 'Delete download';
+	String get retryDownload => 'Retry download';
+	String get downloadQueued => 'Download queued';
+	String episodesQueued({required Object count}) => '${count} episodes queued for download';
+	String get downloadDeleted => 'Download deleted';
+	String deleteConfirm({required Object title}) => 'Are you sure you want to delete "${title}"? This will remove the downloaded file from your device.';
+	String deletingWithProgress({required Object title, required Object current, required Object total}) => 'Deleting ${title}... (${current} of ${total})';
+}
+
+// Path: libraries.tabs
+class _StringsLibrariesTabsEn {
+	_StringsLibrariesTabsEn._(this._root);
+
+	final Translations _root; // ignore: unused_field
+
+	// Translations
+	String get recommended => 'Recommended';
+	String get browse => 'Browse';
+	String get collections => 'Collections';
+	String get playlists => 'Playlists';
+}
+
+// Path: libraries.groupings
+class _StringsLibrariesGroupingsEn {
+	_StringsLibrariesGroupingsEn._(this._root);
+
+	final Translations _root; // ignore: unused_field
+
+	// Translations
+	String get all => 'All';
+	String get movies => 'Movies';
+	String get shows => 'TV Shows';
+	String get seasons => 'Seasons';
+	String get episodes => 'Episodes';
+	String get folders => 'Folders';
+}
+
+// Path: <root>
+class _StringsDe implements Translations {
+	/// You can call this constructor and build your own translation instance of this locale.
+	/// Constructing via the enum [AppLocale.build] is preferred.
+	_StringsDe.build({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+		: assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+		  $meta = TranslationMetadata(
+		    locale: AppLocale.de,
+		    overrides: overrides ?? {},
+		    cardinalResolver: cardinalResolver,
+		    ordinalResolver: ordinalResolver,
+		  ) {
+		$meta.setFlatMapFunction(_flatMapFunction);
+	}
+
+	/// Metadata for the translations of <de>.
+	@override final TranslationMetadata<AppLocale, Translations> $meta;
+
+	/// Access flat map
+	@override dynamic operator[](String key) => $meta.getTranslation(key);
+
+	@override late final _StringsDe _root = this; // ignore: unused_field
+
+	// Translations
+	@override late final _StringsAppDe app = _StringsAppDe._(_root);
+	@override late final _StringsAuthDe auth = _StringsAuthDe._(_root);
+	@override late final _StringsCommonDe common = _StringsCommonDe._(_root);
+	@override late final _StringsScreensDe screens = _StringsScreensDe._(_root);
+	@override late final _StringsUpdateDe update = _StringsUpdateDe._(_root);
+	@override late final _StringsSettingsDe settings = _StringsSettingsDe._(_root);
+	@override late final _StringsSearchDe search = _StringsSearchDe._(_root);
+	@override late final _StringsHotkeysDe hotkeys = _StringsHotkeysDe._(_root);
+	@override late final _StringsPinEntryDe pinEntry = _StringsPinEntryDe._(_root);
+	@override late final _StringsFileInfoDe fileInfo = _StringsFileInfoDe._(_root);
+	@override late final _StringsMediaMenuDe mediaMenu = _StringsMediaMenuDe._(_root);
+	@override late final _StringsAccessibilityDe accessibility = _StringsAccessibilityDe._(_root);
+	@override late final _StringsTooltipsDe tooltips = _StringsTooltipsDe._(_root);
+	@override late final _StringsVideoControlsDe videoControls = _StringsVideoControlsDe._(_root);
+	@override late final _StringsUserStatusDe userStatus = _StringsUserStatusDe._(_root);
+	@override late final _StringsMessagesDe messages = _StringsMessagesDe._(_root);
+	@override late final _StringsSubtitlingStylingDe subtitlingStyling = _StringsSubtitlingStylingDe._(_root);
+	@override late final _StringsDialogDe dialog = _StringsDialogDe._(_root);
+	@override late final _StringsDiscoverDe discover = _StringsDiscoverDe._(_root);
+	@override late final _StringsErrorsDe errors = _StringsErrorsDe._(_root);
+	@override late final _StringsLibrariesDe libraries = _StringsLibrariesDe._(_root);
+	@override late final _StringsAboutDe about = _StringsAboutDe._(_root);
+	@override late final _StringsServerSelectionDe serverSelection = _StringsServerSelectionDe._(_root);
+	@override late final _StringsHubDetailDe hubDetail = _StringsHubDetailDe._(_root);
+	@override late final _StringsLogsDe logs = _StringsLogsDe._(_root);
+	@override late final _StringsLicensesDe licenses = _StringsLicensesDe._(_root);
+	@override late final _StringsNavigationDe navigation = _StringsNavigationDe._(_root);
+	@override late final _StringsDownloadsDe downloads = _StringsDownloadsDe._(_root);
+	@override late final _StringsPlaylistsDe playlists = _StringsPlaylistsDe._(_root);
+	@override late final _StringsCollectionsDe collections = _StringsCollectionsDe._(_root);
+}
+
+// Path: app
+class _StringsAppDe implements _StringsAppEn {
+	_StringsAppDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Plezy';
+	@override String get loading => 'Lädt...';
+}
+
+// Path: auth
+class _StringsAuthDe implements _StringsAuthEn {
+	_StringsAuthDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get signInWithPlex => 'Mit Plex anmelden';
+	@override String get showQRCode => 'QR-Code anzeigen';
+	@override String get cancel => 'Abbrechen';
+	@override String get authenticate => 'Authentifizieren';
+	@override String get retry => 'Erneut versuchen';
+	@override String get debugEnterToken => 'Debug: Plex-Token eingeben';
+	@override String get plexTokenLabel => 'Plex-Auth-Token';
+	@override String get plexTokenHint => 'Plex.tv-Token eingeben';
+	@override String get authenticationTimeout => 'Authentifizierung abgelaufen. Bitte erneut versuchen.';
+	@override String get scanQRCodeInstruction => 'Diesen QR-Code mit einem bei Plex angemeldeten Gerät scannen, um zu authentifizieren.';
+	@override String get waitingForAuth => 'Warte auf Authentifizierung...\nBitte Anmeldung im Browser abschließen.';
+}
+
+// Path: common
+class _StringsCommonDe implements _StringsCommonEn {
+	_StringsCommonDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get cancel => 'Abbrechen';
+	@override String get save => 'Speichern';
+	@override String get close => 'Schließen';
+	@override String get clear => 'Leeren';
+	@override String get reset => 'Zurücksetzen';
+	@override String get later => 'Später';
+	@override String get submit => 'Senden';
+	@override String get confirm => 'Bestätigen';
+	@override String get retry => 'Erneut versuchen';
+	@override String get logout => 'Abmelden';
+	@override String get unknown => 'Unbekannt';
+	@override String get refresh => 'Aktualisieren';
+	@override String get yes => 'Ja';
+	@override String get no => 'Nein';
+	@override String get delete => 'Löschen';
+	@override String get shuffle => 'Zufall';
+	@override String get addTo => 'Hinzufügen zu...';
+}
+
+// Path: screens
+class _StringsScreensDe implements _StringsScreensEn {
+	_StringsScreensDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get licenses => 'Lizenzen';
+	@override String get selectServer => 'Server auswählen';
+	@override String get switchProfile => 'Profil wechseln';
+	@override String get subtitleStyling => 'Untertitel-Stil';
+	@override String get search => 'Suche';
+	@override String get logs => 'Protokolle';
+}
+
+// Path: update
+class _StringsUpdateDe implements _StringsUpdateEn {
+	_StringsUpdateDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get available => 'Update verfügbar';
+	@override String versionAvailable({required Object version}) => 'Version ${version} ist verfügbar';
+	@override String currentVersion({required Object version}) => 'Aktuell: ${version}';
+	@override String get skipVersion => 'Diese Version überspringen';
+	@override String get viewRelease => 'Release anzeigen';
+	@override String get latestVersion => 'Aktuellste Version installiert';
+	@override String get checkFailed => 'Fehler bei der Updateprüfung';
+}
+
+// Path: settings
+class _StringsSettingsDe implements _StringsSettingsEn {
+	_StringsSettingsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Einstellungen';
+	@override String get language => 'Sprache';
+	@override String get theme => 'Design';
+	@override String get appearance => 'Darstellung';
+	@override String get videoPlayback => 'Videowiedergabe';
+	@override String get advanced => 'Erweitert';
+	@override String get useSeasonPostersDescription => 'Staffelposter statt Serienposter für Episoden anzeigen';
+	@override String get showHeroSectionDescription => 'Bereich mit empfohlenen Inhalten auf der Startseite anzeigen';
+	@override String get secondsLabel => 'Sekunden';
+	@override String get minutesLabel => 'Minuten';
+	@override String get secondsShort => 's';
+	@override String get minutesShort => 'm';
+	@override String durationHint({required Object min, required Object max}) => 'Dauer eingeben (${min}-${max})';
+	@override String get systemTheme => 'System';
+	@override String get systemThemeDescription => 'Systemeinstellungen folgen';
+	@override String get lightTheme => 'Hell';
+	@override String get darkTheme => 'Dunkel';
+	@override String get libraryDensity => 'Mediathekdichte';
+	@override String get compact => 'Kompakt';
+	@override String get compactDescription => 'Kleinere Karten, mehr Elemente sichtbar';
+	@override String get normal => 'Normal';
+	@override String get normalDescription => 'Standardgröße';
+	@override String get comfortable => 'Großzügig';
+	@override String get comfortableDescription => 'Größere Karten, weniger Elemente sichtbar';
+	@override String get viewMode => 'Ansichtsmodus';
+	@override String get gridView => 'Raster';
+	@override String get gridViewDescription => 'Elemente im Raster anzeigen';
+	@override String get listView => 'Liste';
+	@override String get listViewDescription => 'Elemente in Listenansicht anzeigen';
+	@override String get useSeasonPosters => 'Staffelposter verwenden';
+	@override String get showHeroSection => 'Hero-Bereich anzeigen';
+	@override String get hardwareDecoding => 'Hardware-Decodierung';
+	@override String get hardwareDecodingDescription => 'Hardwarebeschleunigung verwenden, sofern verfügbar';
+	@override String get bufferSize => 'Puffergröße';
+	@override String bufferSizeMB({required Object size}) => '${size}MB';
+	@override String get subtitleStyling => 'Untertitel-Stil';
+	@override String get subtitleStylingDescription => 'Aussehen von Untertiteln anpassen';
+	@override String get smallSkipDuration => 'Kleine Sprungdauer';
+	@override String get largeSkipDuration => 'Große Sprungdauer';
+	@override String secondsUnit({required Object seconds}) => '${seconds} Sekunden';
+	@override String get defaultSleepTimer => 'Standard-Sleep-Timer';
+	@override String minutesUnit({required Object minutes}) => '${minutes} Minuten';
+	@override String get rememberTrackSelections => 'Spurauswahl pro Serie/Film merken';
+	@override String get rememberTrackSelectionsDescription => 'Audio- und Untertitelsprache automatisch speichern, wenn während der Wiedergabe geändert';
+	@override String get videoPlayerControls => 'Videoplayer-Steuerung';
+	@override String get keyboardShortcuts => 'Tastenkürzel';
+	@override String get keyboardShortcutsDescription => 'Tastenkürzel anpassen';
+	@override String get videoPlayerNavigation => 'Videoplayer-Navigation';
+	@override String get videoPlayerNavigationDescription => 'Pfeiltasten zur Navigation der Videoplayer-Steuerung verwenden';
+	@override String get debugLogging => 'Debug-Protokollierung';
+	@override String get debugLoggingDescription => 'Detaillierte Protokolle zur Fehleranalyse aktivieren';
+	@override String get viewLogs => 'Protokolle anzeigen';
+	@override String get viewLogsDescription => 'App-Protokolle anzeigen';
+	@override String get clearCache => 'Cache löschen';
+	@override String get clearCacheDescription => 'Löscht alle zwischengespeicherten Bilder und Daten. Die App kann danach langsamer laden.';
+	@override String get clearCacheSuccess => 'Cache erfolgreich gelöscht';
+	@override String get resetSettings => 'Einstellungen zurücksetzen';
+	@override String get resetSettingsDescription => 'Alle Einstellungen auf Standard zurücksetzen. Dies kann nicht rückgängig gemacht werden.';
+	@override String get resetSettingsSuccess => 'Einstellungen erfolgreich zurückgesetzt';
+	@override String get shortcutsReset => 'Tastenkürzel auf Standard zurückgesetzt';
+	@override String get about => 'Über';
+	@override String get aboutDescription => 'App-Informationen und Lizenzen';
+	@override String get updates => 'Updates';
+	@override String get updateAvailable => 'Update verfügbar';
+	@override String get checkForUpdates => 'Nach Updates suchen';
+	@override String get validationErrorEnterNumber => 'Bitte eine gültige Zahl eingeben';
+	@override String validationErrorDuration({required Object min, required Object max, required Object unit}) => 'Dauer muss zwischen ${min} und ${max} ${unit} liegen';
+	@override String shortcutAlreadyAssigned({required Object action}) => 'Tastenkürzel bereits zugewiesen an ${action}';
+	@override String shortcutUpdated({required Object action}) => 'Tastenkürzel aktualisiert für ${action}';
+	@override String get autoSkip => 'Automatisches Überspringen';
+	@override String get autoSkipIntro => 'Intro automatisch überspringen';
+	@override String get autoSkipIntroDescription => 'Intro-Marker nach wenigen Sekunden automatisch überspringen';
+	@override String get autoSkipCredits => 'Abspann automatisch überspringen';
+	@override String get autoSkipCreditsDescription => 'Abspann automatisch überspringen und nächste Episode abspielen';
+	@override String get autoSkipDelay => 'Verzögerung für automatisches Überspringen';
+	@override String autoSkipDelayDescription({required Object seconds}) => '${seconds} Sekunden vor dem automatischen Überspringen warten';
+	@override String get downloads => 'Downloads';
+	@override String get downloadLocationDescription => 'Speicherort für heruntergeladene Inhalte wählen';
+	@override String get downloadLocationDefault => 'Standard (App-Speicher)';
+	@override String get downloadLocationCustom => 'Benutzerdefinierter Speicherort';
+	@override String get selectFolder => 'Ordner auswählen';
+	@override String get resetToDefault => 'Auf Standard zurücksetzen';
+	@override String currentPath({required Object path}) => 'Aktuell: ${path}';
+	@override String get downloadLocationChanged => 'Download-Speicherort geändert';
+	@override String get downloadLocationReset => 'Download-Speicherort auf Standard zurückgesetzt';
+	@override String get downloadLocationInvalid => 'Ausgewählter Ordner ist nicht beschreibbar';
+	@override String get downloadLocationSelectError => 'Ordnerauswahl fehlgeschlagen';
+	@override String get downloadOnWifiOnly => 'Nur über WLAN herunterladen';
+	@override String get downloadOnWifiOnlyDescription => 'Downloads über mobile Daten verhindern';
+	@override String get cellularDownloadBlocked => 'Downloads sind über mobile Daten deaktiviert. Verbinde dich mit einem WLAN oder ändere die Einstellung.';
+}
+
+// Path: search
+class _StringsSearchDe implements _StringsSearchEn {
+	_StringsSearchDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get hint => 'Filme, Serien, Musik suchen...';
+	@override String get tryDifferentTerm => 'Anderen Suchbegriff versuchen';
+	@override String get searchYourMedia => 'In den eigenen Medien suchen';
+	@override String get enterTitleActorOrKeyword => 'Titel, Schauspieler oder Stichwort eingeben';
+}
+
+// Path: hotkeys
+class _StringsHotkeysDe implements _StringsHotkeysEn {
+	_StringsHotkeysDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String setShortcutFor({required Object actionName}) => 'Tastenkürzel festlegen für ${actionName}';
+	@override String get clearShortcut => 'Kürzel löschen';
+}
+
+// Path: pinEntry
+class _StringsPinEntryDe implements _StringsPinEntryEn {
+	_StringsPinEntryDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get enterPin => 'PIN eingeben';
+	@override String get showPin => 'PIN anzeigen';
+	@override String get hidePin => 'PIN verbergen';
+}
+
+// Path: fileInfo
+class _StringsFileInfoDe implements _StringsFileInfoEn {
+	_StringsFileInfoDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Dateiinfo';
+	@override String get video => 'Video';
+	@override String get audio => 'Audio';
+	@override String get file => 'Datei';
+	@override String get advanced => 'Erweitert';
+	@override String get codec => 'Codec';
+	@override String get resolution => 'Auflösung';
+	@override String get bitrate => 'Bitrate';
+	@override String get frameRate => 'Bildrate';
+	@override String get aspectRatio => 'Seitenverhältnis';
+	@override String get profile => 'Profil';
+	@override String get bitDepth => 'Farbtiefe';
+	@override String get colorSpace => 'Farbraum';
+	@override String get colorRange => 'Farbbereich';
+	@override String get colorPrimaries => 'Primärfarben';
+	@override String get chromaSubsampling => 'Chroma-Subsampling';
+	@override String get channels => 'Kanäle';
+	@override String get path => 'Pfad';
+	@override String get size => 'Größe';
+	@override String get container => 'Container';
+	@override String get duration => 'Dauer';
+	@override String get optimizedForStreaming => 'Für Streaming optimiert';
+	@override String get has64bitOffsets => '64-Bit-Offsets';
+}
+
+// Path: mediaMenu
+class _StringsMediaMenuDe implements _StringsMediaMenuEn {
+	_StringsMediaMenuDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get markAsWatched => 'Als gesehen markieren';
+	@override String get markAsUnwatched => 'Als ungesehen markieren';
+	@override String get removeFromContinueWatching => 'Aus ‚Weiterschauen‘ entfernen';
+	@override String get goToSeries => 'Zur Serie';
+	@override String get goToSeason => 'Zur Staffel';
+	@override String get shufflePlay => 'Zufallswiedergabe';
+	@override String get fileInfo => 'Dateiinfo';
+}
+
+// Path: accessibility
+class _StringsAccessibilityDe implements _StringsAccessibilityEn {
+	_StringsAccessibilityDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String mediaCardMovie({required Object title}) => '${title}, Film';
+	@override String mediaCardShow({required Object title}) => '${title}, Serie';
+	@override String mediaCardEpisode({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+	@override String mediaCardSeason({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+	@override String get mediaCardWatched => 'angesehen';
+	@override String mediaCardPartiallyWatched({required Object percent}) => '${percent} Prozent angesehen';
+	@override String get mediaCardUnwatched => 'ungeschaut';
+	@override String get tapToPlay => 'Zum Abspielen tippen';
+}
+
+// Path: tooltips
+class _StringsTooltipsDe implements _StringsTooltipsEn {
+	_StringsTooltipsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get shufflePlay => 'Zufallswiedergabe';
+	@override String get markAsWatched => 'Als gesehen markieren';
+	@override String get markAsUnwatched => 'Als ungesehen markieren';
+}
+
+// Path: videoControls
+class _StringsVideoControlsDe implements _StringsVideoControlsEn {
+	_StringsVideoControlsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get audioLabel => 'Audio';
+	@override String get subtitlesLabel => 'Untertitel';
+	@override String get resetToZero => 'Auf 0 ms zurücksetzen';
+	@override String addTime({required Object amount, required Object unit}) => '+${amount}${unit}';
+	@override String minusTime({required Object amount, required Object unit}) => '-${amount}${unit}';
+	@override String playsLater({required Object label}) => '${label} spielt später';
+	@override String playsEarlier({required Object label}) => '${label} spielt früher';
+	@override String get noOffset => 'Kein Offset';
+	@override String get letterbox => 'Letterbox';
+	@override String get fillScreen => 'Bild füllen';
+	@override String get stretch => 'Strecken';
+	@override String get lockRotation => 'Rotation sperren';
+	@override String get unlockRotation => 'Rotation entsperren';
+	@override String get sleepTimer => 'Schlaftimer';
+	@override String get timerActive => 'Schlaftimer aktiv';
+	@override String playbackWillPauseIn({required Object duration}) => 'Wiedergabe wird in ${duration} pausiert';
+	@override String get sleepTimerCompleted => 'Schlaftimer abgelaufen – Wiedergabe pausiert';
+	@override String get playButton => 'Wiedergeben';
+	@override String get pauseButton => 'Pause';
+	@override String seekBackwardButton({required Object seconds}) => '${seconds} Sekunden zurück';
+	@override String seekForwardButton({required Object seconds}) => '${seconds} Sekunden vor';
+	@override String get previousButton => 'Vorherige Episode';
+	@override String get nextButton => 'Nächste Episode';
+	@override String get previousChapterButton => 'Vorheriges Kapitel';
+	@override String get nextChapterButton => 'Nächstes Kapitel';
+	@override String get muteButton => 'Stumm schalten';
+	@override String get unmuteButton => 'Stummschaltung aufheben';
+	@override String get settingsButton => 'Videoeinstellungen';
+	@override String get audioTrackButton => 'Tonspuren';
+	@override String get subtitlesButton => 'Untertitel';
+	@override String get chaptersButton => 'Kapitel';
+	@override String get versionsButton => 'Videoversionen';
+	@override String get aspectRatioButton => 'Seitenverhältnis';
+	@override String get fullscreenButton => 'Vollbild aktivieren';
+	@override String get exitFullscreenButton => 'Vollbild verlassen';
+	@override String get rotationLockButton => 'Dreh­sperre';
+	@override String get timelineSlider => 'Video-Zeitleiste';
+	@override String get volumeSlider => 'Lautstärkepegel';
+	@override String get backButton => 'Zurück';
+}
+
+// Path: userStatus
+class _StringsUserStatusDe implements _StringsUserStatusEn {
+	_StringsUserStatusDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get admin => 'Eigentümer';
+	@override String get restricted => 'Eingeschränkt';
+	@override String get protected => 'Geschützt';
+	@override String get current => 'AKTUELL';
+}
+
+// Path: messages
+class _StringsMessagesDe implements _StringsMessagesEn {
+	_StringsMessagesDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get markedAsWatched => 'Als gesehen markiert';
+	@override String get markedAsUnwatched => 'Als ungesehen markiert';
+	@override String get markedAsWatchedOffline => 'Als gesehen markiert (wird synchronisiert, wenn online)';
+	@override String get markedAsUnwatchedOffline => 'Als ungesehen markiert (wird synchronisiert, wenn online)';
+	@override String get removedFromContinueWatching => 'Aus ‚Weiterschauen\' entfernt';
+	@override String errorLoading({required Object error}) => 'Fehler: ${error}';
+	@override String get fileInfoNotAvailable => 'Dateiinfo nicht verfügbar';
+	@override String errorLoadingFileInfo({required Object error}) => 'Fehler beim Laden der Dateiinfo: ${error}';
+	@override String get errorLoadingSeries => 'Fehler beim Laden der Serie';
+	@override String get errorLoadingSeason => 'Fehler beim Laden der Staffel';
+	@override String get musicNotSupported => 'Musikwiedergabe wird noch nicht unterstützt';
+	@override String get logsCleared => 'Protokolle gelöscht';
+	@override String get logsCopied => 'Protokolle in Zwischenablage kopiert';
+	@override String get noLogsAvailable => 'Keine Protokolle verfügbar';
+	@override String libraryScanning({required Object title}) => 'Scanne „${title}“...';
+	@override String libraryScanStarted({required Object title}) => 'Mediathekscan gestartet für „${title}“';
+	@override String libraryScanFailed({required Object error}) => 'Fehler beim Scannen der Mediathek: ${error}';
+	@override String metadataRefreshing({required Object title}) => 'Metadaten werden aktualisiert für „${title}“...';
+	@override String metadataRefreshStarted({required Object title}) => 'Metadaten-Aktualisierung gestartet für „${title}“';
+	@override String metadataRefreshFailed({required Object error}) => 'Metadaten konnten nicht aktualisiert werden: ${error}';
+	@override String get logoutConfirm => 'Abmeldung wirklich durchführen?';
+	@override String get noSeasonsFound => 'Keine Staffeln gefunden';
+	@override String get noEpisodesFound => 'Keine Episoden in der ersten Staffel gefunden';
+	@override String get noEpisodesFoundGeneral => 'Keine Episoden gefunden';
+	@override String get noResultsFound => 'Keine Ergebnisse gefunden';
+	@override String sleepTimerSet({required Object label}) => 'Sleep-Timer gesetzt auf ${label}';
+	@override String get noItemsAvailable => 'Keine Elemente verfügbar';
+	@override String get failedToCreatePlayQueue => 'Wiedergabewarteschlange konnte nicht erstellt werden';
+	@override String get failedToCreatePlayQueueNoItems => 'Wiedergabewarteschlange konnte nicht erstellt werden – keine Elemente';
+	@override String failedPlayback({required Object action, required Object error}) => 'Wiedergabe für ${action} fehlgeschlagen: ${error}';
+	@override String get youAreOffline => 'Du bist offline';
+	@override String get offlineFeatureUnavailable => 'Diese Funktion erfordert eine Internetverbindung. Deine Downloads und Einstellungen sind weiterhin verfügbar.';
+}
+
+// Path: subtitlingStyling
+class _StringsSubtitlingStylingDe implements _StringsSubtitlingStylingEn {
+	_StringsSubtitlingStylingDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get stylingOptions => 'Stiloptionen';
+	@override String get fontSize => 'Schriftgröße';
+	@override String get textColor => 'Textfarbe';
+	@override String get borderSize => 'Rahmengröße';
+	@override String get borderColor => 'Rahmenfarbe';
+	@override String get backgroundOpacity => 'Hintergrunddeckkraft';
+	@override String get backgroundColor => 'Hintergrundfarbe';
+}
+
+// Path: dialog
+class _StringsDialogDe implements _StringsDialogEn {
+	_StringsDialogDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get confirmAction => 'Aktion bestätigen';
+	@override String get cancel => 'Abbrechen';
+	@override String get playNow => 'Jetzt abspielen';
+}
+
+// Path: discover
+class _StringsDiscoverDe implements _StringsDiscoverEn {
+	_StringsDiscoverDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Entdecken';
+	@override String get switchProfile => 'Profil wechseln';
+	@override String get switchServer => 'Server wechseln';
+	@override String get logout => 'Abmelden';
+	@override String get noContentAvailable => 'Kein Inhalt verfügbar';
+	@override String get addMediaToLibraries => 'Medien zur Mediathek hinzufügen';
+	@override String get continueWatching => 'Weiterschauen';
+	@override String get play => 'Abspielen';
+	@override String playEpisode({required Object season, required Object episode}) => 'S${season}E${episode}';
+	@override String get pause => 'Pause';
+	@override String get overview => 'Übersicht';
+	@override String get cast => 'Besetzung';
+	@override String get seasons => 'Staffeln';
+	@override String get studio => 'Studio';
+	@override String get rating => 'Altersfreigabe';
+	@override String get watched => 'Gesehen';
+	@override String episodeCount({required Object count}) => '${count} Episoden';
+	@override String watchedProgress({required Object watched, required Object total}) => '${watched} von ${total} gesehen';
+	@override String get movie => 'Film';
+	@override String get tvShow => 'Serie';
+	@override String minutesLeft({required Object minutes}) => '${minutes} Min übrig';
+}
+
+// Path: errors
+class _StringsErrorsDe implements _StringsErrorsEn {
+	_StringsErrorsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String searchFailed({required Object error}) => 'Suche fehlgeschlagen: ${error}';
+	@override String connectionTimeout({required Object context}) => 'Zeitüberschreitung beim Laden von ${context}';
+	@override String get connectionFailed => 'Verbindung zum Plex-Server fehlgeschlagen';
+	@override String failedToLoad({required Object context, required Object error}) => 'Fehler beim Laden von ${context}: ${error}';
+	@override String get noClientAvailable => 'Kein Client verfügbar';
+	@override String authenticationFailed({required Object error}) => 'Authentifizierung fehlgeschlagen: ${error}';
+	@override String get couldNotLaunchUrl => 'Auth-URL konnte nicht geöffnet werden';
+	@override String get pleaseEnterToken => 'Bitte Token eingeben';
+	@override String get invalidToken => 'Ungültiges Token';
+	@override String failedToVerifyToken({required Object error}) => 'Token-Verifizierung fehlgeschlagen: ${error}';
+	@override String failedToSwitchProfile({required Object displayName}) => 'Profilwechsel zu ${displayName} fehlgeschlagen';
+}
+
+// Path: libraries
+class _StringsLibrariesDe implements _StringsLibrariesEn {
+	_StringsLibrariesDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Mediatheken';
+	@override String get scanLibraryFiles => 'Mediatheksdateien scannen';
+	@override String get scanLibrary => 'Mediathek scannen';
+	@override String get analyze => 'Analysieren';
+	@override String get analyzeLibrary => 'Mediathek analysieren';
+	@override String get refreshMetadata => 'Metadaten aktualisieren';
+	@override String get emptyTrash => 'Papierkorb leeren';
+	@override String emptyingTrash({required Object title}) => 'Papierkorb für „${title}“ wird geleert...';
+	@override String trashEmptied({required Object title}) => 'Papierkorb für „${title}“ geleert';
+	@override String failedToEmptyTrash({required Object error}) => 'Papierkorb konnte nicht geleert werden: ${error}';
+	@override String analyzing({required Object title}) => 'Analysiere „${title}“...';
+	@override String analysisStarted({required Object title}) => 'Analyse gestartet für „${title}“';
+	@override String failedToAnalyze({required Object error}) => 'Analyse der Mediathek fehlgeschlagen: ${error}';
+	@override String get noLibrariesFound => 'Keine Mediatheken gefunden';
+	@override String get thisLibraryIsEmpty => 'Diese Mediathek ist leer';
+	@override String get all => 'Alle';
+	@override String get clearAll => 'Alle löschen';
+	@override String scanLibraryConfirm({required Object title}) => '„${title}“ wirklich scannen?';
+	@override String analyzeLibraryConfirm({required Object title}) => '„${title}“ wirklich analysieren?';
+	@override String refreshMetadataConfirm({required Object title}) => 'Metadaten für „${title}“ wirklich aktualisieren?';
+	@override String emptyTrashConfirm({required Object title}) => 'Papierkorb für „${title}“ wirklich leeren?';
+	@override String get manageLibraries => 'Mediatheken verwalten';
+	@override String get sort => 'Sortieren';
+	@override String get sortBy => 'Sortieren nach';
+	@override String get filters => 'Filter';
+	@override String get confirmActionMessage => 'Aktion wirklich durchführen?';
+	@override String get showLibrary => 'Mediathek anzeigen';
+	@override String get hideLibrary => 'Mediathek ausblenden';
+	@override String get libraryOptions => 'Mediatheksoptionen';
+	@override String get content => 'Bibliotheksinhalt';
+	@override String get selectLibrary => 'Bibliothek auswählen';
+	@override String filtersWithCount({required Object count}) => 'Filter (${count})';
+	@override String get noRecommendations => 'Keine Empfehlungen verfügbar';
+	@override String get noCollections => 'Keine Sammlungen in dieser Mediathek';
+	@override String get noFoldersFound => 'Keine Ordner gefunden';
+	@override String get folders => 'Ordner';
+	@override late final _StringsLibrariesTabsDe tabs = _StringsLibrariesTabsDe._(_root);
+	@override late final _StringsLibrariesGroupingsDe groupings = _StringsLibrariesGroupingsDe._(_root);
+}
+
+// Path: about
+class _StringsAboutDe implements _StringsAboutEn {
+	_StringsAboutDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Über';
+	@override String get openSourceLicenses => 'Open-Source-Lizenzen';
+	@override String versionLabel({required Object version}) => 'Version ${version}';
+	@override String get appDescription => 'Ein schöner Plex-Client für Flutter';
+	@override String get viewLicensesDescription => 'Lizenzen von Drittanbieter-Bibliotheken anzeigen';
+}
+
+// Path: serverSelection
+class _StringsServerSelectionDe implements _StringsServerSelectionEn {
+	_StringsServerSelectionDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get allServerConnectionsFailed => 'Verbindung zu allen Servern fehlgeschlagen. Bitte Netzwerk prüfen und erneut versuchen.';
+	@override String get noServersFound => 'Keine Server gefunden';
+	@override String noServersFoundForAccount({required Object username, required Object email}) => 'Keine Server gefunden für ${username} (${email})';
+	@override String failedToLoadServers({required Object error}) => 'Server konnten nicht geladen werden: ${error}';
+}
+
+// Path: hubDetail
+class _StringsHubDetailDe implements _StringsHubDetailEn {
+	_StringsHubDetailDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Titel';
+	@override String get releaseYear => 'Erscheinungsjahr';
+	@override String get dateAdded => 'Hinzugefügt am';
+	@override String get rating => 'Bewertung';
+	@override String get noItemsFound => 'Keine Elemente gefunden';
+}
+
+// Path: logs
+class _StringsLogsDe implements _StringsLogsEn {
+	_StringsLogsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get clearLogs => 'Protokolle löschen';
+	@override String get copyLogs => 'Protokolle kopieren';
+	@override String get error => 'Fehler:';
+	@override String get stackTrace => 'Stacktrace:';
+}
+
+// Path: licenses
+class _StringsLicensesDe implements _StringsLicensesEn {
+	_StringsLicensesDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get relatedPackages => 'Verwandte Pakete';
+	@override String get license => 'Lizenz';
+	@override String licenseNumber({required Object number}) => 'Lizenz ${number}';
+	@override String licensesCount({required Object count}) => '${count} Lizenzen';
+}
+
+// Path: navigation
+class _StringsNavigationDe implements _StringsNavigationEn {
+	_StringsNavigationDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get home => 'Start';
+	@override String get search => 'Suche';
+	@override String get libraries => 'Mediatheken';
+	@override String get settings => 'Einstellungen';
+	@override String get downloads => 'Downloads';
+}
+
+// Path: downloads
+class _StringsDownloadsDe implements _StringsDownloadsEn {
+	_StringsDownloadsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Downloads';
+	@override String get manage => 'Verwalten';
+	@override String get tvShows => 'Serien';
+	@override String get movies => 'Filme';
+	@override String get noDownloads => 'Noch keine Downloads';
+	@override String get noDownloadsDescription => 'Heruntergeladene Inhalte werden hier für die Offline-Wiedergabe angezeigt';
+	@override String get downloadNow => 'Herunterladen';
+	@override String get deleteDownload => 'Download löschen';
+	@override String get retryDownload => 'Download wiederholen';
+	@override String get downloadQueued => 'Download in Warteschlange';
+	@override String episodesQueued({required Object count}) => '${count} Episoden zum Download hinzugefügt';
+	@override String get downloadDeleted => 'Download gelöscht';
+	@override String deleteConfirm({required Object title}) => 'Möchtest du "${title}" wirklich löschen? Die heruntergeladene Datei wird von deinem Gerät entfernt.';
+	@override String deletingWithProgress({required Object title, required Object current, required Object total}) => 'Lösche ${title}... (${current} von ${total})';
+}
+
+// Path: playlists
+class _StringsPlaylistsDe implements _StringsPlaylistsEn {
+	_StringsPlaylistsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Wiedergabelisten';
+	@override String get noPlaylists => 'Keine Wiedergabelisten gefunden';
+	@override String get create => 'Wiedergabeliste erstellen';
+	@override String get playlistName => 'Name der Wiedergabeliste';
+	@override String get enterPlaylistName => 'Name der Wiedergabeliste eingeben';
+	@override String get delete => 'Wiedergabeliste löschen';
+	@override String get removeItem => 'Aus Wiedergabeliste entfernen';
+	@override String get smartPlaylist => 'Intelligente Wiedergabeliste';
+	@override String itemCount({required Object count}) => '${count} Elemente';
+	@override String get oneItem => '1 Element';
+	@override String get emptyPlaylist => 'Diese Wiedergabeliste ist leer';
+	@override String get deleteConfirm => 'Wiedergabeliste löschen?';
+	@override String deleteMessage({required Object name}) => 'Soll "${name}" wirklich gelöscht werden?';
+	@override String get created => 'Wiedergabeliste erstellt';
+	@override String get deleted => 'Wiedergabeliste gelöscht';
+	@override String get itemAdded => 'Zur Wiedergabeliste hinzugefügt';
+	@override String get itemRemoved => 'Aus Wiedergabeliste entfernt';
+	@override String get selectPlaylist => 'Wiedergabeliste auswählen';
+	@override String get createNewPlaylist => 'Neue Wiedergabeliste erstellen';
+	@override String get errorCreating => 'Wiedergabeliste konnte nicht erstellt werden';
+	@override String get errorDeleting => 'Wiedergabeliste konnte nicht gelöscht werden';
+	@override String get errorLoading => 'Wiedergabelisten konnten nicht geladen werden';
+	@override String get errorAdding => 'Konnte nicht zur Wiedergabeliste hinzugefügt werden';
+	@override String get errorReordering => 'Element der Wiedergabeliste konnte nicht neu geordnet werden';
+	@override String get errorRemoving => 'Konnte nicht aus der Wiedergabeliste entfernt werden';
+	@override String get playlist => 'Wiedergabeliste';
+}
+
+// Path: collections
+class _StringsCollectionsDe implements _StringsCollectionsEn {
+	_StringsCollectionsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Sammlungen';
+	@override String get collection => 'Sammlung';
+	@override String get empty => 'Sammlung ist leer';
+	@override String get unknownLibrarySection => 'Löschen nicht möglich: Unbekannte Bibliothekssektion';
+	@override String get deleteCollection => 'Sammlung löschen';
+	@override String deleteConfirm({required Object title}) => 'Sind Sie sicher, dass Sie "${title}" löschen möchten? Dies kann nicht rückgängig gemacht werden.';
+	@override String get deleted => 'Sammlung gelöscht';
+	@override String get deleteFailed => 'Sammlung konnte nicht gelöscht werden';
+	@override String deleteFailedWithError({required Object error}) => 'Sammlung konnte nicht gelöscht werden: ${error}';
+	@override String failedToLoadItems({required Object error}) => 'Sammlungselemente konnten nicht geladen werden: ${error}';
+	@override String get selectCollection => 'Sammlung auswählen';
+	@override String get createNewCollection => 'Neue Sammlung erstellen';
+	@override String get collectionName => 'Sammlungsname';
+	@override String get enterCollectionName => 'Sammlungsnamen eingeben';
+	@override String get addedToCollection => 'Zur Sammlung hinzugefügt';
+	@override String get errorAddingToCollection => 'Fehler beim Hinzufügen zur Sammlung';
+	@override String get created => 'Sammlung erstellt';
+	@override String get removeFromCollection => 'Aus Sammlung entfernen';
+	@override String removeFromCollectionConfirm({required Object title}) => '"${title}" aus dieser Sammlung entfernen?';
+	@override String get removedFromCollection => 'Aus Sammlung entfernt';
+	@override String get removeFromCollectionFailed => 'Entfernen aus Sammlung fehlgeschlagen';
+	@override String removeFromCollectionError({required Object error}) => 'Fehler beim Entfernen aus der Sammlung: ${error}';
+}
+
+// Path: libraries.tabs
+class _StringsLibrariesTabsDe implements _StringsLibrariesTabsEn {
+	_StringsLibrariesTabsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get recommended => 'Empfohlen';
+	@override String get browse => 'Durchsuchen';
+	@override String get collections => 'Sammlungen';
+	@override String get playlists => 'Wiedergabelisten';
+}
+
+// Path: libraries.groupings
+class _StringsLibrariesGroupingsDe implements _StringsLibrariesGroupingsEn {
+	_StringsLibrariesGroupingsDe._(this._root);
+
+	@override final _StringsDe _root; // ignore: unused_field
+
+	// Translations
+	@override String get all => 'Alle';
+	@override String get movies => 'Filme';
+	@override String get shows => 'Serien';
+	@override String get seasons => 'Staffeln';
+	@override String get episodes => 'Episoden';
+	@override String get folders => 'Ordner';
 }
 
 // Path: <root>
@@ -771,11 +1723,11 @@ class _StringsIt implements Translations {
 	@override late final _StringsPinEntryIt pinEntry = _StringsPinEntryIt._(_root);
 	@override late final _StringsFileInfoIt fileInfo = _StringsFileInfoIt._(_root);
 	@override late final _StringsMediaMenuIt mediaMenu = _StringsMediaMenuIt._(_root);
+	@override late final _StringsAccessibilityIt accessibility = _StringsAccessibilityIt._(_root);
 	@override late final _StringsTooltipsIt tooltips = _StringsTooltipsIt._(_root);
 	@override late final _StringsVideoControlsIt videoControls = _StringsVideoControlsIt._(_root);
 	@override late final _StringsUserStatusIt userStatus = _StringsUserStatusIt._(_root);
 	@override late final _StringsMessagesIt messages = _StringsMessagesIt._(_root);
-	@override late final _StringsProfileIt profile = _StringsProfileIt._(_root);
 	@override late final _StringsSubtitlingStylingIt subtitlingStyling = _StringsSubtitlingStylingIt._(_root);
 	@override late final _StringsDialogIt dialog = _StringsDialogIt._(_root);
 	@override late final _StringsDiscoverIt discover = _StringsDiscoverIt._(_root);
@@ -787,6 +1739,9 @@ class _StringsIt implements Translations {
 	@override late final _StringsLogsIt logs = _StringsLogsIt._(_root);
 	@override late final _StringsLicensesIt licenses = _StringsLicensesIt._(_root);
 	@override late final _StringsNavigationIt navigation = _StringsNavigationIt._(_root);
+	@override late final _StringsDownloadsIt downloads = _StringsDownloadsIt._(_root);
+	@override late final _StringsPlaylistsIt playlists = _StringsPlaylistsIt._(_root);
+	@override late final _StringsCollectionsIt collections = _StringsCollectionsIt._(_root);
 }
 
 // Path: app
@@ -836,18 +1791,14 @@ class _StringsCommonIt implements _StringsCommonEn {
 	@override String get submit => 'Invia';
 	@override String get confirm => 'Conferma';
 	@override String get retry => 'Riprova';
-	@override String get playNow => 'Riproduci ora';
 	@override String get logout => 'Disconnetti';
-	@override String get online => 'Online';
-	@override String get offline => 'Offline';
-	@override String get owned => 'Di proprietà';
-	@override String get shared => 'Condiviso';
-	@override String get current => 'CORRENTE';
 	@override String get unknown => 'Sconosciuto';
 	@override String get refresh => 'Aggiorna';
 	@override String get yes => 'Sì';
 	@override String get no => 'No';
-	@override String get server => 'Server';
+	@override String get delete => 'Elimina';
+	@override String get shuffle => 'Casuale';
+	@override String get addTo => 'Aggiungi a...';
 }
 
 // Path: screens
@@ -862,7 +1813,7 @@ class _StringsScreensIt implements _StringsScreensEn {
 	@override String get switchProfile => 'Cambia profilo';
 	@override String get subtitleStyling => 'Stile sottotitoli';
 	@override String get search => 'Cerca';
-	@override String get logs => 'Logs';
+	@override String get logs => 'Registro';
 }
 
 // Path: update
@@ -893,7 +1844,6 @@ class _StringsSettingsIt implements _StringsSettingsEn {
 	@override String get theme => 'Tema';
 	@override String get appearance => 'Aspetto';
 	@override String get videoPlayback => 'Riproduzione video';
-	@override String get shufflePlay => 'Riproduzione casuale';
 	@override String get advanced => 'Avanzate';
 	@override String get useSeasonPostersDescription => 'Mostra il poster della stagione invece del poster della serie per gli episodi';
 	@override String get showHeroSectionDescription => 'Visualizza il carosello dei contenuti in primo piano sulla schermata iniziale';
@@ -931,15 +1881,13 @@ class _StringsSettingsIt implements _StringsSettingsEn {
 	@override String secondsUnit({required Object seconds}) => '${seconds} secondi';
 	@override String get defaultSleepTimer => 'Timer spegnimento predefinito';
 	@override String minutesUnit({required Object minutes}) => '${minutes} minuti';
-	@override String get unwatchedOnly => 'Solo non guardati';
-	@override String get unwatchedOnlyDescription => 'Includi solo gli episodi non guardati nella coda di riproduzione casuale';
-	@override String get shuffleOrderNavigation => 'Navigazione in ordine casuale';
-	@override String get shuffleOrderNavigationDescription => 'I pulsanti Avanti/Indietro seguono l\'ordine casuale';
-	@override String get loopShuffleQueue => 'Coda di riproduzione casuale in loop';
-	@override String get loopShuffleQueueDescription => 'Riavvia la coda quando raggiungi la fine';
+	@override String get rememberTrackSelections => 'Ricorda selezioni tracce per serie/film';
+	@override String get rememberTrackSelectionsDescription => 'Salva automaticamente le preferenze delle lingue audio e sottotitoli quando cambi tracce durante la riproduzione';
 	@override String get videoPlayerControls => 'Controlli del lettore video';
 	@override String get keyboardShortcuts => 'Scorciatoie da tastiera';
 	@override String get keyboardShortcutsDescription => 'Personalizza le scorciatoie da tastiera';
+	@override String get videoPlayerNavigation => 'Navigazione del lettore video';
+	@override String get videoPlayerNavigationDescription => 'Usa i tasti freccia per navigare nei controlli del lettore video';
 	@override String get debugLogging => 'Log di debug';
 	@override String get debugLoggingDescription => 'Abilita il logging dettagliato per la risoluzione dei problemi';
 	@override String get viewLogs => 'Visualizza log';
@@ -960,6 +1908,27 @@ class _StringsSettingsIt implements _StringsSettingsEn {
 	@override String validationErrorDuration({required Object min, required Object max, required Object unit}) => 'la durata deve essere compresa tra ${min} e ${max} ${unit}';
 	@override String shortcutAlreadyAssigned({required Object action}) => 'Scorciatoia già assegnata a ${action}';
 	@override String shortcutUpdated({required Object action}) => 'Scorciatoia aggiornata per ${action}';
+	@override String get autoSkip => 'Salto Automatico';
+	@override String get autoSkipIntro => 'Salta Intro Automaticamente';
+	@override String get autoSkipIntroDescription => 'Salta automaticamente i marcatori dell\'intro dopo alcuni secondi';
+	@override String get autoSkipCredits => 'Salta Crediti Automaticamente';
+	@override String get autoSkipCreditsDescription => 'Salta automaticamente i crediti e riproduci l\'episodio successivo';
+	@override String get autoSkipDelay => 'Ritardo Salto Automatico';
+	@override String autoSkipDelayDescription({required Object seconds}) => 'Aspetta ${seconds} secondi prima del salto automatico';
+	@override String get downloads => 'Download';
+	@override String get downloadLocationDescription => 'Scegli dove salvare i contenuti scaricati';
+	@override String get downloadLocationDefault => 'Predefinita (Archiviazione App)';
+	@override String get downloadLocationCustom => 'Posizione Personalizzata';
+	@override String get selectFolder => 'Seleziona Cartella';
+	@override String get resetToDefault => 'Ripristina Predefinita';
+	@override String currentPath({required Object path}) => 'Corrente: ${path}';
+	@override String get downloadLocationChanged => 'Posizione di download modificata';
+	@override String get downloadLocationReset => 'Posizione di download ripristinata a predefinita';
+	@override String get downloadLocationInvalid => 'La cartella selezionata non è scrivibile';
+	@override String get downloadLocationSelectError => 'Impossibile selezionare la cartella';
+	@override String get downloadOnWifiOnly => 'Scarica solo con WiFi';
+	@override String get downloadOnWifiOnlyDescription => 'Impedisci i download quando si utilizza la rete dati cellulare';
+	@override String get cellularDownloadBlocked => 'I download sono disabilitati sulla rete dati cellulare. Connettiti al WiFi o modifica l\'impostazione.';
 }
 
 // Path: search
@@ -1046,6 +2015,23 @@ class _StringsMediaMenuIt implements _StringsMediaMenuEn {
 	@override String get fileInfo => 'Info sul file';
 }
 
+// Path: accessibility
+class _StringsAccessibilityIt implements _StringsAccessibilityEn {
+	_StringsAccessibilityIt._(this._root);
+
+	@override final _StringsIt _root; // ignore: unused_field
+
+	// Translations
+	@override String mediaCardMovie({required Object title}) => '${title}, film';
+	@override String mediaCardShow({required Object title}) => '${title}, serie TV';
+	@override String mediaCardEpisode({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+	@override String mediaCardSeason({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+	@override String get mediaCardWatched => 'visto';
+	@override String mediaCardPartiallyWatched({required Object percent}) => '${percent} percento visto';
+	@override String get mediaCardUnwatched => 'non visto';
+	@override String get tapToPlay => 'Tocca per riprodurre';
+}
+
 // Path: tooltips
 class _StringsTooltipsIt implements _StringsTooltipsEn {
 	_StringsTooltipsIt._(this._root);
@@ -1072,12 +2058,38 @@ class _StringsVideoControlsIt implements _StringsVideoControlsEn {
 	@override String minusTime({required Object amount, required Object unit}) => '-${amount}${unit}';
 	@override String playsLater({required Object label}) => '${label} riprodotto dopo';
 	@override String playsEarlier({required Object label}) => '${label} riprodotto prima';
-	@override String get noOffset => 'No offset';
+	@override String get noOffset => 'Nessun offset';
 	@override String get letterbox => 'Letterbox';
 	@override String get fillScreen => 'Riempi schermo';
 	@override String get stretch => 'Allunga';
 	@override String get lockRotation => 'Blocca rotazione';
 	@override String get unlockRotation => 'Sblocca rotazione';
+	@override String get sleepTimer => 'Timer di spegnimento';
+	@override String get timerActive => 'Timer attivo';
+	@override String playbackWillPauseIn({required Object duration}) => 'La riproduzione si interromperà tra ${duration}';
+	@override String get sleepTimerCompleted => 'Timer di spegnimento completato - riproduzione in pausa';
+	@override String get playButton => 'Riproduci';
+	@override String get pauseButton => 'Pausa';
+	@override String seekBackwardButton({required Object seconds}) => 'Riavvolgi di ${seconds} secondi';
+	@override String seekForwardButton({required Object seconds}) => 'Avanza di ${seconds} secondi';
+	@override String get previousButton => 'Episodio precedente';
+	@override String get nextButton => 'Episodio successivo';
+	@override String get previousChapterButton => 'Capitolo precedente';
+	@override String get nextChapterButton => 'Capitolo successivo';
+	@override String get muteButton => 'Silenzia';
+	@override String get unmuteButton => 'Riattiva audio';
+	@override String get settingsButton => 'Impostazioni video';
+	@override String get audioTrackButton => 'Tracce audio';
+	@override String get subtitlesButton => 'Sottotitoli';
+	@override String get chaptersButton => 'Capitoli';
+	@override String get versionsButton => 'Versioni video';
+	@override String get aspectRatioButton => 'Proporzioni';
+	@override String get fullscreenButton => 'Attiva schermo intero';
+	@override String get exitFullscreenButton => 'Esci da schermo intero';
+	@override String get rotationLockButton => 'Blocco rotazione';
+	@override String get timelineSlider => 'Timeline video';
+	@override String get volumeSlider => 'Livello volume';
+	@override String get backButton => 'Indietro';
 }
 
 // Path: userStatus
@@ -1090,6 +2102,7 @@ class _StringsUserStatusIt implements _StringsUserStatusEn {
 	@override String get admin => 'Admin';
 	@override String get restricted => 'Limitato';
 	@override String get protected => 'Protetto';
+	@override String get current => 'ATTUALE';
 }
 
 // Path: messages
@@ -1101,6 +2114,8 @@ class _StringsMessagesIt implements _StringsMessagesEn {
 	// Translations
 	@override String get markedAsWatched => 'Segna come visto';
 	@override String get markedAsUnwatched => 'Segna come non visto';
+	@override String get markedAsWatchedOffline => 'Segnato come visto (sincronizzato online)';
+	@override String get markedAsUnwatchedOffline => 'Segnato come non visto (sincronizzato online)';
 	@override String get removedFromContinueWatching => 'Rimosso da Continua a guardare';
 	@override String errorLoading({required Object error}) => 'Errore: ${error}';
 	@override String get fileInfoNotAvailable => 'Informazioni sul file non disponibili';
@@ -1117,24 +2132,18 @@ class _StringsMessagesIt implements _StringsMessagesEn {
 	@override String metadataRefreshing({required Object title}) => 'Aggiornamento metadati per "${title}"...';
 	@override String metadataRefreshStarted({required Object title}) => 'Aggiornamento metadati per "${title}"';
 	@override String metadataRefreshFailed({required Object error}) => 'Errore aggiornamento metadati: ${error}';
-	@override String get noPlexToken => 'Nessun token Plex trovato. Riesegui l\'accesso.';
 	@override String get logoutConfirm => 'Sei sicuro di volerti disconnettere?';
 	@override String get noSeasonsFound => 'Nessuna stagione trovata';
 	@override String get noEpisodesFound => 'Nessun episodio trovato nella prima stagione';
 	@override String get noEpisodesFoundGeneral => 'Nessun episodio trovato';
 	@override String get noResultsFound => 'Nessun risultato';
 	@override String sleepTimerSet({required Object label}) => 'Imposta timer spegnimento per ${label}';
-	@override String failedToSwitchProfile({required Object displayName}) => 'Impossibile passare a ${displayName}';
-}
-
-// Path: profile
-class _StringsProfileIt implements _StringsProfileEn {
-	_StringsProfileIt._(this._root);
-
-	@override final _StringsIt _root; // ignore: unused_field
-
-	// Translations
-	@override String get noUsersAvailable => 'Nessun utente disponibile';
+	@override String get noItemsAvailable => 'Nessun elemento disponibile';
+	@override String get failedToCreatePlayQueue => 'Impossibile creare la coda di riproduzione';
+	@override String get failedToCreatePlayQueueNoItems => 'Impossibile creare la coda di riproduzione - nessun elemento';
+	@override String failedPlayback({required Object action, required Object error}) => 'Impossibile ${action}: ${error}';
+	@override String get youAreOffline => 'Sei offline';
+	@override String get offlineFeatureUnavailable => 'Questa funzione richiede una connessione internet. I tuoi download e le impostazioni sono ancora disponibili.';
 }
 
 // Path: subtitlingStyling
@@ -1161,7 +2170,6 @@ class _StringsDialogIt implements _StringsDialogEn {
 
 	// Translations
 	@override String get confirmAction => 'Conferma azione';
-	@override String get areYouSure => 'Sei sicuro di voler eseguire questa azione?';
 	@override String get cancel => 'Cancella';
 	@override String get playNow => 'Riproduci ora';
 }
@@ -1173,21 +2181,22 @@ class _StringsDiscoverIt implements _StringsDiscoverEn {
 	@override final _StringsIt _root; // ignore: unused_field
 
 	// Translations
-	@override String get title => 'Discover';
+	@override String get title => 'Esplora';
 	@override String get switchProfile => 'Cambia profilo';
 	@override String get switchServer => 'Cambia server';
 	@override String get logout => 'Disconnetti';
 	@override String get noContentAvailable => 'Nessun contenuto disponibile';
 	@override String get addMediaToLibraries => 'Aggiungi alcuni file multimediali alle tue librerie';
 	@override String get continueWatching => 'Continua a guardare';
-	@override String get recentlyAdded => 'Aggiunti di recente';
 	@override String get play => 'Riproduci';
-	@override String get resume => 'Riprendi';
-	@override String playEpisode({required Object season, required Object episode}) => 'Riproduci S${season}, E${episode}';
-	@override String resumeEpisode({required Object season, required Object episode}) => 'Riprendi S${season}, E${episode}';
+	@override String playEpisode({required Object season, required Object episode}) => 'S${season}E${episode}';
 	@override String get pause => 'Pausa';
 	@override String get overview => 'Panoramica';
-	@override String get cast => 'Cast';
+	@override String get cast => 'Attori';
+	@override String get seasons => 'Stagioni';
+	@override String get studio => 'Studio';
+	@override String get rating => 'Classificazione';
+	@override String get watched => 'Guardato';
 	@override String episodeCount({required Object count}) => '${count} episodi';
 	@override String watchedProgress({required Object watched, required Object total}) => '${watched}/${total} guardati';
 	@override String get movie => 'Film';
@@ -1213,7 +2222,6 @@ class _StringsErrorsIt implements _StringsErrorsEn {
 	@override String get invalidToken => 'Token non valido';
 	@override String failedToVerifyToken({required Object error}) => 'Verifica token fallita: ${error}';
 	@override String failedToSwitchProfile({required Object displayName}) => 'Impossibile passare a ${displayName}';
-	@override String get connectionFailedGeneric => 'Connessione fallita';
 }
 
 // Path: libraries
@@ -1248,11 +2256,19 @@ class _StringsLibrariesIt implements _StringsLibrariesEn {
 	@override String get sort => 'Ordina';
 	@override String get sortBy => 'Ordina per';
 	@override String get filters => 'Filtri';
-	@override String loadingLibraryWithCount({required Object count}) => 'Caricamento librerie... (${count} oggetti caricati)';
 	@override String get confirmActionMessage => 'Sei sicuro di voler eseguire questa azione?';
 	@override String get showLibrary => 'Mostra libreria';
 	@override String get hideLibrary => 'Nascondi libreria';
 	@override String get libraryOptions => 'Opzioni libreria';
+	@override String get content => 'contenuto della libreria';
+	@override String get selectLibrary => 'Seleziona libreria';
+	@override String filtersWithCount({required Object count}) => 'Filtri (${count})';
+	@override String get noRecommendations => 'Nessun consiglio disponibile';
+	@override String get noCollections => 'Nessuna raccolta in questa libreria';
+	@override String get noFoldersFound => 'Nessuna cartella trovata';
+	@override String get folders => 'cartelle';
+	@override late final _StringsLibrariesTabsIt tabs = _StringsLibrariesTabsIt._(_root);
+	@override late final _StringsLibrariesGroupingsIt groupings = _StringsLibrariesGroupingsIt._(_root);
 }
 
 // Path: about
@@ -1276,17 +2292,9 @@ class _StringsServerSelectionIt implements _StringsServerSelectionEn {
 	@override final _StringsIt _root; // ignore: unused_field
 
 	// Translations
-	@override String get connectingToServer => 'Connessione al server...';
-	@override String get serverDebugCopied => 'Dati di debug del server copiati negli appunti';
-	@override String get copyDebugData => 'Copia dati di debug';
+	@override String get allServerConnectionsFailed => 'Impossibile connettersi a nessun server. Controlla la tua rete e riprova.';
 	@override String get noServersFound => 'Nessun server trovato';
-	@override String malformedServerData({required Object count}) => 'Trovato ${count} server con dati difettosi. Nessun server valido disponibile.';
-	@override String get incompleteServerInfo => 'Alcuni server presentano informazioni incomplete e sono stati ignorati. Controlla il tuo account Plex.tv.';
-	@override String get incompleteConnectionInfo => 'Le informazioni di connessione al server sono incomplete. Riprova.';
-	@override String malformedServerInfo({required Object message}) => 'Le informazioni sul server sono errate: ${message}';
-	@override String get networkConnectionFailed => 'Connessione di rete non riuscita. Controlla la tua connessione Internet e riprova.';
-	@override String get authenticationFailed => 'Autenticazione fallita. Effettua nuovamente l\'accesso.';
-	@override String get plexServiceUnavailable => 'Servizio Plex non disponibile. Riprova più tardi.';
+	@override String noServersFoundForAccount({required Object username, required Object email}) => 'Nessun server trovato per ${username} (${email})';
 	@override String failedToLoadServers({required Object error}) => 'Impossibile caricare i server: ${error}';
 }
 
@@ -1311,11 +2319,8 @@ class _StringsLogsIt implements _StringsLogsEn {
 	@override final _StringsIt _root; // ignore: unused_field
 
 	// Translations
-	@override String get title => 'Log';
 	@override String get clearLogs => 'Cancella log';
 	@override String get copyLogs => 'Copia log';
-	@override String get exportLogs => 'Esporta log';
-	@override String get noLogsToShow => 'Nessun log da mostrare';
 	@override String get error => 'Errore:';
 	@override String get stackTrace => 'Traccia dello stack:';
 }
@@ -1344,6 +2349,124 @@ class _StringsNavigationIt implements _StringsNavigationEn {
 	@override String get search => 'Cerca';
 	@override String get libraries => 'Librerie';
 	@override String get settings => 'Impostazioni';
+	@override String get downloads => 'Download';
+}
+
+// Path: downloads
+class _StringsDownloadsIt implements _StringsDownloadsEn {
+	_StringsDownloadsIt._(this._root);
+
+	@override final _StringsIt _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Download';
+	@override String get manage => 'Gestisci';
+	@override String get tvShows => 'Serie TV';
+	@override String get movies => 'Film';
+	@override String get noDownloads => 'Nessun download';
+	@override String get noDownloadsDescription => 'I contenuti scaricati appariranno qui per la visualizzazione offline';
+	@override String get downloadNow => 'Scarica';
+	@override String get deleteDownload => 'Elimina download';
+	@override String get retryDownload => 'Riprova download';
+	@override String get downloadQueued => 'Download in coda';
+	@override String episodesQueued({required Object count}) => '${count} episodi in coda per il download';
+	@override String get downloadDeleted => 'Download eliminato';
+	@override String deleteConfirm({required Object title}) => 'Sei sicuro di voler eliminare "${title}"? Il file scaricato verrà rimosso dal tuo dispositivo.';
+	@override String deletingWithProgress({required Object title, required Object current, required Object total}) => 'Eliminazione di ${title}... (${current} di ${total})';
+}
+
+// Path: playlists
+class _StringsPlaylistsIt implements _StringsPlaylistsEn {
+	_StringsPlaylistsIt._(this._root);
+
+	@override final _StringsIt _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Playlist';
+	@override String get noPlaylists => 'Nessuna playlist trovata';
+	@override String get create => 'Crea playlist';
+	@override String get playlistName => 'Nome playlist';
+	@override String get enterPlaylistName => 'Inserisci nome playlist';
+	@override String get delete => 'Elimina playlist';
+	@override String get removeItem => 'Rimuovi da playlist';
+	@override String get smartPlaylist => 'Playlist intelligente';
+	@override String itemCount({required Object count}) => '${count} elementi';
+	@override String get oneItem => '1 elemento';
+	@override String get emptyPlaylist => 'Questa playlist è vuota';
+	@override String get deleteConfirm => 'Eliminare playlist?';
+	@override String deleteMessage({required Object name}) => 'Sei sicuro di voler eliminare "${name}"?';
+	@override String get created => 'Playlist creata';
+	@override String get deleted => 'Playlist eliminata';
+	@override String get itemAdded => 'Aggiunto alla playlist';
+	@override String get itemRemoved => 'Rimosso dalla playlist';
+	@override String get selectPlaylist => 'Seleziona playlist';
+	@override String get createNewPlaylist => 'Crea nuova playlist';
+	@override String get errorCreating => 'Errore durante la creazione della playlist';
+	@override String get errorDeleting => 'Errore durante l\'eliminazione della playlist';
+	@override String get errorLoading => 'Errore durante il caricamento delle playlist';
+	@override String get errorAdding => 'Errore durante l\'aggiunta alla playlist';
+	@override String get errorReordering => 'Errore durante il riordino dell\'elemento della playlist';
+	@override String get errorRemoving => 'Errore durante la rimozione dalla playlist';
+	@override String get playlist => 'Playlist';
+}
+
+// Path: collections
+class _StringsCollectionsIt implements _StringsCollectionsEn {
+	_StringsCollectionsIt._(this._root);
+
+	@override final _StringsIt _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Raccolte';
+	@override String get collection => 'Raccolta';
+	@override String get empty => 'La raccolta è vuota';
+	@override String get unknownLibrarySection => 'Impossibile eliminare: sezione libreria sconosciuta';
+	@override String get deleteCollection => 'Elimina raccolta';
+	@override String deleteConfirm({required Object title}) => 'Sei sicuro di voler eliminare "${title}"? Questa azione non può essere annullata.';
+	@override String get deleted => 'Raccolta eliminata';
+	@override String get deleteFailed => 'Impossibile eliminare la raccolta';
+	@override String deleteFailedWithError({required Object error}) => 'Impossibile eliminare la raccolta: ${error}';
+	@override String failedToLoadItems({required Object error}) => 'Impossibile caricare gli elementi della raccolta: ${error}';
+	@override String get selectCollection => 'Seleziona raccolta';
+	@override String get createNewCollection => 'Crea nuova raccolta';
+	@override String get collectionName => 'Nome raccolta';
+	@override String get enterCollectionName => 'Inserisci nome raccolta';
+	@override String get addedToCollection => 'Aggiunto alla raccolta';
+	@override String get errorAddingToCollection => 'Errore nell\'aggiunta alla raccolta';
+	@override String get created => 'Raccolta creata';
+	@override String get removeFromCollection => 'Rimuovi dalla raccolta';
+	@override String removeFromCollectionConfirm({required Object title}) => 'Rimuovere "${title}" da questa raccolta?';
+	@override String get removedFromCollection => 'Rimosso dalla raccolta';
+	@override String get removeFromCollectionFailed => 'Impossibile rimuovere dalla raccolta';
+	@override String removeFromCollectionError({required Object error}) => 'Errore durante la rimozione dalla raccolta: ${error}';
+}
+
+// Path: libraries.tabs
+class _StringsLibrariesTabsIt implements _StringsLibrariesTabsEn {
+	_StringsLibrariesTabsIt._(this._root);
+
+	@override final _StringsIt _root; // ignore: unused_field
+
+	// Translations
+	@override String get recommended => 'Consigliati';
+	@override String get browse => 'Esplora';
+	@override String get collections => 'Raccolte';
+	@override String get playlists => 'Playlist';
+}
+
+// Path: libraries.groupings
+class _StringsLibrariesGroupingsIt implements _StringsLibrariesGroupingsEn {
+	_StringsLibrariesGroupingsIt._(this._root);
+
+	@override final _StringsIt _root; // ignore: unused_field
+
+	// Translations
+	@override String get all => 'Tutti';
+	@override String get movies => 'Film';
+	@override String get shows => 'Serie TV';
+	@override String get seasons => 'Stagioni';
+	@override String get episodes => 'Episodi';
+	@override String get folders => 'Cartelle';
 }
 
 // Path: <root>
@@ -1381,11 +2504,11 @@ class _StringsNl implements Translations {
 	@override late final _StringsPinEntryNl pinEntry = _StringsPinEntryNl._(_root);
 	@override late final _StringsFileInfoNl fileInfo = _StringsFileInfoNl._(_root);
 	@override late final _StringsMediaMenuNl mediaMenu = _StringsMediaMenuNl._(_root);
+	@override late final _StringsAccessibilityNl accessibility = _StringsAccessibilityNl._(_root);
 	@override late final _StringsTooltipsNl tooltips = _StringsTooltipsNl._(_root);
 	@override late final _StringsVideoControlsNl videoControls = _StringsVideoControlsNl._(_root);
 	@override late final _StringsUserStatusNl userStatus = _StringsUserStatusNl._(_root);
 	@override late final _StringsMessagesNl messages = _StringsMessagesNl._(_root);
-	@override late final _StringsProfileNl profile = _StringsProfileNl._(_root);
 	@override late final _StringsSubtitlingStylingNl subtitlingStyling = _StringsSubtitlingStylingNl._(_root);
 	@override late final _StringsDialogNl dialog = _StringsDialogNl._(_root);
 	@override late final _StringsDiscoverNl discover = _StringsDiscoverNl._(_root);
@@ -1397,6 +2520,9 @@ class _StringsNl implements Translations {
 	@override late final _StringsLogsNl logs = _StringsLogsNl._(_root);
 	@override late final _StringsLicensesNl licenses = _StringsLicensesNl._(_root);
 	@override late final _StringsNavigationNl navigation = _StringsNavigationNl._(_root);
+	@override late final _StringsDownloadsNl downloads = _StringsDownloadsNl._(_root);
+	@override late final _StringsPlaylistsNl playlists = _StringsPlaylistsNl._(_root);
+	@override late final _StringsCollectionsNl collections = _StringsCollectionsNl._(_root);
 }
 
 // Path: app
@@ -1423,7 +2549,7 @@ class _StringsAuthNl implements _StringsAuthEn {
 	@override String get authenticate => 'Authenticeren';
 	@override String get retry => 'Opnieuw proberen';
 	@override String get debugEnterToken => 'Debug: Voer Plex Token in';
-	@override String get plexTokenLabel => 'Plex Auth Token';
+	@override String get plexTokenLabel => 'Plex Authenticatietoken';
 	@override String get plexTokenHint => 'Voer je Plex.tv token in';
 	@override String get authenticationTimeout => 'Authenticatie verlopen. Probeer opnieuw.';
 	@override String get scanQRCodeInstruction => 'Scan deze QR-code met een apparaat dat is ingelogd op Plex om te authenticeren.';
@@ -1446,18 +2572,14 @@ class _StringsCommonNl implements _StringsCommonEn {
 	@override String get submit => 'Verzenden';
 	@override String get confirm => 'Bevestigen';
 	@override String get retry => 'Opnieuw proberen';
-	@override String get playNow => 'Nu afspelen';
 	@override String get logout => 'Uitloggen';
-	@override String get online => 'Online';
-	@override String get offline => 'Offline';
-	@override String get owned => 'Eigendom';
-	@override String get shared => 'Gedeeld';
-	@override String get current => 'HUIDIG';
 	@override String get unknown => 'Onbekend';
 	@override String get refresh => 'Vernieuwen';
 	@override String get yes => 'Ja';
 	@override String get no => 'Nee';
-	@override String get server => 'Server';
+	@override String get delete => 'Verwijderen';
+	@override String get shuffle => 'Willekeurig';
+	@override String get addTo => 'Toevoegen aan...';
 }
 
 // Path: screens
@@ -1472,7 +2594,7 @@ class _StringsScreensNl implements _StringsScreensEn {
 	@override String get switchProfile => 'Wissel van profiel';
 	@override String get subtitleStyling => 'Ondertitel opmaak';
 	@override String get search => 'Zoeken';
-	@override String get logs => 'Logs';
+	@override String get logs => 'Logbestanden';
 }
 
 // Path: update
@@ -1503,7 +2625,6 @@ class _StringsSettingsNl implements _StringsSettingsEn {
 	@override String get theme => 'Thema';
 	@override String get appearance => 'Uiterlijk';
 	@override String get videoPlayback => 'Video afspelen';
-	@override String get shufflePlay => 'Willekeurig afspelen';
 	@override String get advanced => 'Geavanceerd';
 	@override String get useSeasonPostersDescription => 'Toon seizoenposter in plaats van serieposter voor afleveringen';
 	@override String get showHeroSectionDescription => 'Toon uitgelichte inhoud carrousel op startscherm';
@@ -1541,15 +2662,13 @@ class _StringsSettingsNl implements _StringsSettingsEn {
 	@override String secondsUnit({required Object seconds}) => '${seconds} seconden';
 	@override String get defaultSleepTimer => 'Standaard slaap timer';
 	@override String minutesUnit({required Object minutes}) => 'bij ${minutes} minuten';
-	@override String get unwatchedOnly => 'Alleen ongekeken';
-	@override String get unwatchedOnlyDescription => 'Alleen ongekeken afleveringen opnemen in willekeurige wachtrij';
-	@override String get shuffleOrderNavigation => 'Willekeurige volgorde navigatie';
-	@override String get shuffleOrderNavigationDescription => 'Volgende/vorige knoppen volgen willekeurige volgorde';
-	@override String get loopShuffleQueue => 'Herhaal willekeurige wachtrij';
-	@override String get loopShuffleQueueDescription => 'Start wachtrij opnieuw bij het einde';
+	@override String get rememberTrackSelections => 'Onthoud track selecties per serie/film';
+	@override String get rememberTrackSelectionsDescription => 'Bewaar automatisch audio- en ondertiteltaalvoorkeuren wanneer je tracks wijzigt tijdens afspelen';
 	@override String get videoPlayerControls => 'Videospeler bediening';
 	@override String get keyboardShortcuts => 'Toetsenbord sneltoetsen';
 	@override String get keyboardShortcutsDescription => 'Pas toetsenbord sneltoetsen aan';
+	@override String get videoPlayerNavigation => 'Videospeler navigatie';
+	@override String get videoPlayerNavigationDescription => 'Gebruik pijltjestoetsen om door de videospeler bediening te navigeren';
 	@override String get debugLogging => 'Debug logging';
 	@override String get debugLoggingDescription => 'Schakel gedetailleerde logging in voor probleemoplossing';
 	@override String get viewLogs => 'Bekijk logs';
@@ -1570,6 +2689,27 @@ class _StringsSettingsNl implements _StringsSettingsEn {
 	@override String validationErrorDuration({required Object min, required Object max, required Object unit}) => 'Duur moet tussen ${min} en ${max} ${unit} zijn';
 	@override String shortcutAlreadyAssigned({required Object action}) => 'Sneltoets al toegewezen aan ${action}';
 	@override String shortcutUpdated({required Object action}) => 'Sneltoets bijgewerkt voor ${action}';
+	@override String get autoSkip => 'Automatisch Overslaan';
+	@override String get autoSkipIntro => 'Intro Automatisch Overslaan';
+	@override String get autoSkipIntroDescription => 'Intro-markeringen na enkele seconden automatisch overslaan';
+	@override String get autoSkipCredits => 'Credits Automatisch Overslaan';
+	@override String get autoSkipCreditsDescription => 'Credits automatisch overslaan en volgende aflevering afspelen';
+	@override String get autoSkipDelay => 'Vertraging Automatisch Overslaan';
+	@override String autoSkipDelayDescription({required Object seconds}) => '${seconds} seconden wachten voor automatisch overslaan';
+	@override String get downloads => 'Downloads';
+	@override String get downloadLocationDescription => 'Kies waar gedownloade content wordt opgeslagen';
+	@override String get downloadLocationDefault => 'Standaard (App-opslag)';
+	@override String get downloadLocationCustom => 'Aangepaste Locatie';
+	@override String get selectFolder => 'Selecteer Map';
+	@override String get resetToDefault => 'Herstel naar Standaard';
+	@override String currentPath({required Object path}) => 'Huidig: ${path}';
+	@override String get downloadLocationChanged => 'Downloadlocatie gewijzigd';
+	@override String get downloadLocationReset => 'Downloadlocatie hersteld naar standaard';
+	@override String get downloadLocationInvalid => 'Geselecteerde map is niet beschrijfbaar';
+	@override String get downloadLocationSelectError => 'Kan map niet selecteren';
+	@override String get downloadOnWifiOnly => 'Alleen via WiFi downloaden';
+	@override String get downloadOnWifiOnlyDescription => 'Voorkom downloads bij gebruik van mobiele data';
+	@override String get cellularDownloadBlocked => 'Downloads zijn uitgeschakeld bij mobiele data. Maak verbinding met WiFi of wijzig de instelling.';
 }
 
 // Path: search
@@ -1656,6 +2796,23 @@ class _StringsMediaMenuNl implements _StringsMediaMenuEn {
 	@override String get fileInfo => 'Bestand info';
 }
 
+// Path: accessibility
+class _StringsAccessibilityNl implements _StringsAccessibilityEn {
+	_StringsAccessibilityNl._(this._root);
+
+	@override final _StringsNl _root; // ignore: unused_field
+
+	// Translations
+	@override String mediaCardMovie({required Object title}) => '${title}, film';
+	@override String mediaCardShow({required Object title}) => '${title}, TV-serie';
+	@override String mediaCardEpisode({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+	@override String mediaCardSeason({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+	@override String get mediaCardWatched => 'bekeken';
+	@override String mediaCardPartiallyWatched({required Object percent}) => '${percent} procent bekeken';
+	@override String get mediaCardUnwatched => 'niet bekeken';
+	@override String get tapToPlay => 'Tik om af te spelen';
+}
+
 // Path: tooltips
 class _StringsTooltipsNl implements _StringsTooltipsEn {
 	_StringsTooltipsNl._(this._root);
@@ -1688,6 +2845,32 @@ class _StringsVideoControlsNl implements _StringsVideoControlsEn {
 	@override String get stretch => 'Uitrekken';
 	@override String get lockRotation => 'Vergrendel rotatie';
 	@override String get unlockRotation => 'Ontgrendel rotatie';
+	@override String get sleepTimer => 'Slaaptimer';
+	@override String get timerActive => 'Timer actief';
+	@override String playbackWillPauseIn({required Object duration}) => 'Afspelen wordt gepauzeerd over ${duration}';
+	@override String get sleepTimerCompleted => 'Slaaptimer voltooid - afspelen gepauzeerd';
+	@override String get playButton => 'Afspelen';
+	@override String get pauseButton => 'Pauzeren';
+	@override String seekBackwardButton({required Object seconds}) => 'Terugspoelen ${seconds} seconden';
+	@override String seekForwardButton({required Object seconds}) => 'Vooruitspoelen ${seconds} seconden';
+	@override String get previousButton => 'Vorige aflevering';
+	@override String get nextButton => 'Volgende aflevering';
+	@override String get previousChapterButton => 'Vorig hoofdstuk';
+	@override String get nextChapterButton => 'Volgend hoofdstuk';
+	@override String get muteButton => 'Dempen';
+	@override String get unmuteButton => 'Dempen opheffen';
+	@override String get settingsButton => 'Video-instellingen';
+	@override String get audioTrackButton => 'Audiosporen';
+	@override String get subtitlesButton => 'Ondertitels';
+	@override String get chaptersButton => 'Hoofdstukken';
+	@override String get versionsButton => 'Videoversies';
+	@override String get aspectRatioButton => 'Beeldverhouding';
+	@override String get fullscreenButton => 'Volledig scherm activeren';
+	@override String get exitFullscreenButton => 'Volledig scherm verlaten';
+	@override String get rotationLockButton => 'Rotatievergrendeling';
+	@override String get timelineSlider => 'Videotijdlijn';
+	@override String get volumeSlider => 'Volumeniveau';
+	@override String get backButton => 'Terug';
 }
 
 // Path: userStatus
@@ -1700,6 +2883,7 @@ class _StringsUserStatusNl implements _StringsUserStatusEn {
 	@override String get admin => 'Beheerder';
 	@override String get restricted => 'Beperkt';
 	@override String get protected => 'Beschermd';
+	@override String get current => 'HUIDIG';
 }
 
 // Path: messages
@@ -1711,6 +2895,8 @@ class _StringsMessagesNl implements _StringsMessagesEn {
 	// Translations
 	@override String get markedAsWatched => 'Gemarkeerd als gekeken';
 	@override String get markedAsUnwatched => 'Gemarkeerd als ongekeken';
+	@override String get markedAsWatchedOffline => 'Gemarkeerd als gekeken (sync wanneer online)';
+	@override String get markedAsUnwatchedOffline => 'Gemarkeerd als ongekeken (sync wanneer online)';
 	@override String get removedFromContinueWatching => 'Verwijderd uit Doorgaan met kijken';
 	@override String errorLoading({required Object error}) => 'Fout: ${error}';
 	@override String get fileInfoNotAvailable => 'Bestand informatie niet beschikbaar';
@@ -1727,24 +2913,18 @@ class _StringsMessagesNl implements _StringsMessagesEn {
 	@override String metadataRefreshing({required Object title}) => 'Metadata vernieuwen voor "${title}"...';
 	@override String metadataRefreshStarted({required Object title}) => 'Metadata vernieuwen gestart voor "${title}"';
 	@override String metadataRefreshFailed({required Object error}) => 'Kon metadata niet vernieuwen: ${error}';
-	@override String get noPlexToken => 'Geen Plex token gevonden. Log opnieuw in.';
 	@override String get logoutConfirm => 'Weet je zeker dat je wilt uitloggen?';
 	@override String get noSeasonsFound => 'Geen seizoenen gevonden';
 	@override String get noEpisodesFound => 'Geen afleveringen gevonden in eerste seizoen';
 	@override String get noEpisodesFoundGeneral => 'Geen afleveringen gevonden';
 	@override String get noResultsFound => 'Geen resultaten gevonden';
 	@override String sleepTimerSet({required Object label}) => 'Slaap timer ingesteld voor ${label}';
-	@override String failedToSwitchProfile({required Object displayName}) => 'Kon niet wisselen naar ${displayName}';
-}
-
-// Path: profile
-class _StringsProfileNl implements _StringsProfileEn {
-	_StringsProfileNl._(this._root);
-
-	@override final _StringsNl _root; // ignore: unused_field
-
-	// Translations
-	@override String get noUsersAvailable => 'Geen gebruikers beschikbaar';
+	@override String get noItemsAvailable => 'Geen items beschikbaar';
+	@override String get failedToCreatePlayQueue => 'Kan afspeelwachtrij niet maken';
+	@override String get failedToCreatePlayQueueNoItems => 'Kan afspeelwachtrij niet maken - geen items';
+	@override String failedPlayback({required Object action, required Object error}) => 'Afspelen van ${action} mislukt: ${error}';
+	@override String get youAreOffline => 'Je bent offline';
+	@override String get offlineFeatureUnavailable => 'Deze functie vereist een internetverbinding. Je downloads en instellingen zijn nog steeds beschikbaar.';
 }
 
 // Path: subtitlingStyling
@@ -1771,7 +2951,6 @@ class _StringsDialogNl implements _StringsDialogEn {
 
 	// Translations
 	@override String get confirmAction => 'Bevestig actie';
-	@override String get areYouSure => 'Weet je zeker dat je deze actie wilt uitvoeren?';
 	@override String get cancel => 'Annuleren';
 	@override String get playNow => 'Nu afspelen';
 }
@@ -1790,14 +2969,15 @@ class _StringsDiscoverNl implements _StringsDiscoverEn {
 	@override String get noContentAvailable => 'Geen inhoud beschikbaar';
 	@override String get addMediaToLibraries => 'Voeg wat media toe aan je bibliotheken';
 	@override String get continueWatching => 'Verder kijken';
-	@override String get recentlyAdded => 'Recent toegevoegd';
 	@override String get play => 'Afspelen';
-	@override String get resume => 'Hervatten';
-	@override String playEpisode({required Object season, required Object episode}) => 'Speel S${season}, E${episode}';
-	@override String resumeEpisode({required Object season, required Object episode}) => 'Hervat S${season}, E${episode}';
+	@override String playEpisode({required Object season, required Object episode}) => 'S${season}E${episode}';
 	@override String get pause => 'Pauzeren';
 	@override String get overview => 'Overzicht';
-	@override String get cast => 'Cast';
+	@override String get cast => 'Acteurs';
+	@override String get seasons => 'Seizoenen';
+	@override String get studio => 'Studio';
+	@override String get rating => 'Leeftijd';
+	@override String get watched => 'Bekeken';
 	@override String episodeCount({required Object count}) => '${count} afleveringen';
 	@override String watchedProgress({required Object watched, required Object total}) => '${watched}/${total} gekeken';
 	@override String get movie => 'Film';
@@ -1823,7 +3003,6 @@ class _StringsErrorsNl implements _StringsErrorsEn {
 	@override String get invalidToken => 'Ongeldig token';
 	@override String failedToVerifyToken({required Object error}) => 'Kon token niet verifiëren: ${error}';
 	@override String failedToSwitchProfile({required Object displayName}) => 'Kon niet wisselen naar ${displayName}';
-	@override String get connectionFailedGeneric => 'Verbinding mislukt';
 }
 
 // Path: libraries
@@ -1858,11 +3037,19 @@ class _StringsLibrariesNl implements _StringsLibrariesEn {
 	@override String get sort => 'Sorteren';
 	@override String get sortBy => 'Sorteer op';
 	@override String get filters => 'Filters';
-	@override String loadingLibraryWithCount({required Object count}) => 'Bibliotheek laden... (${count} items geladen)';
 	@override String get confirmActionMessage => 'Weet je zeker dat je deze actie wilt uitvoeren?';
 	@override String get showLibrary => 'Toon bibliotheek';
 	@override String get hideLibrary => 'Verberg bibliotheek';
 	@override String get libraryOptions => 'Bibliotheek opties';
+	@override String get content => 'bibliotheekinhoud';
+	@override String get selectLibrary => 'Bibliotheek kiezen';
+	@override String filtersWithCount({required Object count}) => 'Filters (${count})';
+	@override String get noRecommendations => 'Geen aanbevelingen beschikbaar';
+	@override String get noCollections => 'Geen collecties in deze bibliotheek';
+	@override String get noFoldersFound => 'Geen mappen gevonden';
+	@override String get folders => 'mappen';
+	@override late final _StringsLibrariesTabsNl tabs = _StringsLibrariesTabsNl._(_root);
+	@override late final _StringsLibrariesGroupingsNl groupings = _StringsLibrariesGroupingsNl._(_root);
 }
 
 // Path: about
@@ -1886,17 +3073,9 @@ class _StringsServerSelectionNl implements _StringsServerSelectionEn {
 	@override final _StringsNl _root; // ignore: unused_field
 
 	// Translations
-	@override String get connectingToServer => 'Verbinden met server...';
-	@override String get serverDebugCopied => 'Server debug gegevens gekopieerd naar klembord';
-	@override String get copyDebugData => 'Kopieer debug gegevens';
+	@override String get allServerConnectionsFailed => 'Kon niet verbinden met servers. Controleer je netwerk en probeer opnieuw.';
 	@override String get noServersFound => 'Geen servers gevonden';
-	@override String malformedServerData({required Object count}) => '${count} server(s) gevonden met verkeerde data. Geen geldige servers beschikbaar.';
-	@override String get incompleteServerInfo => 'Sommige servers hebben incomplete informatie en zijn overgeslagen. Controleer je Plex.tv account.';
-	@override String get incompleteConnectionInfo => 'Server verbinding informatie is incompleet. Probeer opnieuw.';
-	@override String malformedServerInfo({required Object message}) => 'Server informatie is verkeerd geformatteerd: ${message}';
-	@override String get networkConnectionFailed => 'Netwerkverbinding mislukt. Controleer je internetverbinding en probeer opnieuw.';
-	@override String get authenticationFailed => 'Authenticatie mislukt. Log opnieuw in.';
-	@override String get plexServiceUnavailable => 'Plex service niet beschikbaar. Probeer later opnieuw.';
+	@override String noServersFoundForAccount({required Object username, required Object email}) => 'Geen servers gevonden voor ${username} (${email})';
 	@override String failedToLoadServers({required Object error}) => 'Kon servers niet laden: ${error}';
 }
 
@@ -1921,13 +3100,10 @@ class _StringsLogsNl implements _StringsLogsEn {
 	@override final _StringsNl _root; // ignore: unused_field
 
 	// Translations
-	@override String get title => 'Logs';
 	@override String get clearLogs => 'Wis logs';
 	@override String get copyLogs => 'Kopieer logs';
-	@override String get exportLogs => 'Exporteer logs';
-	@override String get noLogsToShow => 'Geen logs om te tonen';
 	@override String get error => 'Fout:';
-	@override String get stackTrace => 'Stack Trace:';
+	@override String get stackTrace => 'Stacktracering:';
 }
 
 // Path: licenses
@@ -1950,10 +3126,128 @@ class _StringsNavigationNl implements _StringsNavigationEn {
 	@override final _StringsNl _root; // ignore: unused_field
 
 	// Translations
-	@override String get home => 'Home';
+	@override String get home => 'Thuis';
 	@override String get search => 'Zoeken';
 	@override String get libraries => 'Bibliotheken';
 	@override String get settings => 'Instellingen';
+	@override String get downloads => 'Downloads';
+}
+
+// Path: downloads
+class _StringsDownloadsNl implements _StringsDownloadsEn {
+	_StringsDownloadsNl._(this._root);
+
+	@override final _StringsNl _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Downloads';
+	@override String get manage => 'Beheren';
+	@override String get tvShows => 'Series';
+	@override String get movies => 'Films';
+	@override String get noDownloads => 'Nog geen downloads';
+	@override String get noDownloadsDescription => 'Gedownloade content verschijnt hier voor offline weergave';
+	@override String get downloadNow => 'Download';
+	@override String get deleteDownload => 'Download verwijderen';
+	@override String get retryDownload => 'Download opnieuw proberen';
+	@override String get downloadQueued => 'Download in wachtrij';
+	@override String episodesQueued({required Object count}) => '${count} afleveringen in wachtrij voor download';
+	@override String get downloadDeleted => 'Download verwijderd';
+	@override String deleteConfirm({required Object title}) => 'Weet je zeker dat je "${title}" wilt verwijderen? Het gedownloade bestand wordt van je apparaat verwijderd.';
+	@override String deletingWithProgress({required Object title, required Object current, required Object total}) => 'Verwijderen van ${title}... (${current} van ${total})';
+}
+
+// Path: playlists
+class _StringsPlaylistsNl implements _StringsPlaylistsEn {
+	_StringsPlaylistsNl._(this._root);
+
+	@override final _StringsNl _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Afspeellijsten';
+	@override String get noPlaylists => 'Geen afspeellijsten gevonden';
+	@override String get create => 'Afspeellijst maken';
+	@override String get playlistName => 'Naam afspeellijst';
+	@override String get enterPlaylistName => 'Voer naam afspeellijst in';
+	@override String get delete => 'Afspeellijst verwijderen';
+	@override String get removeItem => 'Verwijderen uit afspeellijst';
+	@override String get smartPlaylist => 'Slimme afspeellijst';
+	@override String itemCount({required Object count}) => '${count} items';
+	@override String get oneItem => '1 item';
+	@override String get emptyPlaylist => 'Deze afspeellijst is leeg';
+	@override String get deleteConfirm => 'Afspeellijst verwijderen?';
+	@override String deleteMessage({required Object name}) => 'Weet je zeker dat je "${name}" wilt verwijderen?';
+	@override String get created => 'Afspeellijst gemaakt';
+	@override String get deleted => 'Afspeellijst verwijderd';
+	@override String get itemAdded => 'Toegevoegd aan afspeellijst';
+	@override String get itemRemoved => 'Verwijderd uit afspeellijst';
+	@override String get selectPlaylist => 'Selecteer afspeellijst';
+	@override String get createNewPlaylist => 'Nieuwe afspeellijst maken';
+	@override String get errorCreating => 'Fout bij maken afspeellijst';
+	@override String get errorDeleting => 'Fout bij verwijderen afspeellijst';
+	@override String get errorLoading => 'Fout bij laden afspeellijsten';
+	@override String get errorAdding => 'Fout bij toevoegen aan afspeellijst';
+	@override String get errorReordering => 'Fout bij herschikken van afspeellijstitem';
+	@override String get errorRemoving => 'Fout bij verwijderen uit afspeellijst';
+	@override String get playlist => 'Afspeellijst';
+}
+
+// Path: collections
+class _StringsCollectionsNl implements _StringsCollectionsEn {
+	_StringsCollectionsNl._(this._root);
+
+	@override final _StringsNl _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Collecties';
+	@override String get collection => 'Collectie';
+	@override String get empty => 'Collectie is leeg';
+	@override String get unknownLibrarySection => 'Kan niet verwijderen: onbekende bibliotheeksectie';
+	@override String get deleteCollection => 'Collectie verwijderen';
+	@override String deleteConfirm({required Object title}) => 'Weet je zeker dat je "${title}" wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.';
+	@override String get deleted => 'Collectie verwijderd';
+	@override String get deleteFailed => 'Collectie verwijderen mislukt';
+	@override String deleteFailedWithError({required Object error}) => 'Collectie verwijderen mislukt: ${error}';
+	@override String failedToLoadItems({required Object error}) => 'Collectie-items laden mislukt: ${error}';
+	@override String get selectCollection => 'Selecteer collectie';
+	@override String get createNewCollection => 'Nieuwe collectie maken';
+	@override String get collectionName => 'Collectienaam';
+	@override String get enterCollectionName => 'Voer collectienaam in';
+	@override String get addedToCollection => 'Toegevoegd aan collectie';
+	@override String get errorAddingToCollection => 'Fout bij toevoegen aan collectie';
+	@override String get created => 'Collectie gemaakt';
+	@override String get removeFromCollection => 'Verwijderen uit collectie';
+	@override String removeFromCollectionConfirm({required Object title}) => '"${title}" uit deze collectie verwijderen?';
+	@override String get removedFromCollection => 'Uit collectie verwijderd';
+	@override String get removeFromCollectionFailed => 'Verwijderen uit collectie mislukt';
+	@override String removeFromCollectionError({required Object error}) => 'Fout bij verwijderen uit collectie: ${error}';
+}
+
+// Path: libraries.tabs
+class _StringsLibrariesTabsNl implements _StringsLibrariesTabsEn {
+	_StringsLibrariesTabsNl._(this._root);
+
+	@override final _StringsNl _root; // ignore: unused_field
+
+	// Translations
+	@override String get recommended => 'Aanbevolen';
+	@override String get browse => 'Bladeren';
+	@override String get collections => 'Collecties';
+	@override String get playlists => 'Afspeellijsten';
+}
+
+// Path: libraries.groupings
+class _StringsLibrariesGroupingsNl implements _StringsLibrariesGroupingsEn {
+	_StringsLibrariesGroupingsNl._(this._root);
+
+	@override final _StringsNl _root; // ignore: unused_field
+
+	// Translations
+	@override String get all => 'Alles';
+	@override String get movies => 'Films';
+	@override String get shows => 'Series';
+	@override String get seasons => 'Seizoenen';
+	@override String get episodes => 'Afleveringen';
+	@override String get folders => 'Mappen';
 }
 
 // Path: <root>
@@ -1991,11 +3285,11 @@ class _StringsSv implements Translations {
 	@override late final _StringsPinEntrySv pinEntry = _StringsPinEntrySv._(_root);
 	@override late final _StringsFileInfoSv fileInfo = _StringsFileInfoSv._(_root);
 	@override late final _StringsMediaMenuSv mediaMenu = _StringsMediaMenuSv._(_root);
+	@override late final _StringsAccessibilitySv accessibility = _StringsAccessibilitySv._(_root);
 	@override late final _StringsTooltipsSv tooltips = _StringsTooltipsSv._(_root);
 	@override late final _StringsVideoControlsSv videoControls = _StringsVideoControlsSv._(_root);
 	@override late final _StringsUserStatusSv userStatus = _StringsUserStatusSv._(_root);
 	@override late final _StringsMessagesSv messages = _StringsMessagesSv._(_root);
-	@override late final _StringsProfileSv profile = _StringsProfileSv._(_root);
 	@override late final _StringsSubtitlingStylingSv subtitlingStyling = _StringsSubtitlingStylingSv._(_root);
 	@override late final _StringsDialogSv dialog = _StringsDialogSv._(_root);
 	@override late final _StringsDiscoverSv discover = _StringsDiscoverSv._(_root);
@@ -2007,6 +3301,9 @@ class _StringsSv implements Translations {
 	@override late final _StringsLogsSv logs = _StringsLogsSv._(_root);
 	@override late final _StringsLicensesSv licenses = _StringsLicensesSv._(_root);
 	@override late final _StringsNavigationSv navigation = _StringsNavigationSv._(_root);
+	@override late final _StringsDownloadsSv downloads = _StringsDownloadsSv._(_root);
+	@override late final _StringsPlaylistsSv playlists = _StringsPlaylistsSv._(_root);
+	@override late final _StringsCollectionsSv collections = _StringsCollectionsSv._(_root);
 }
 
 // Path: app
@@ -2056,18 +3353,14 @@ class _StringsCommonSv implements _StringsCommonEn {
 	@override String get submit => 'Skicka';
 	@override String get confirm => 'Bekräfta';
 	@override String get retry => 'Försök igen';
-	@override String get playNow => 'Spela nu';
 	@override String get logout => 'Logga ut';
-	@override String get online => 'Online';
-	@override String get offline => 'Offline';
-	@override String get owned => 'Egen';
-	@override String get shared => 'Delad';
-	@override String get current => 'NUVARANDE';
 	@override String get unknown => 'Okänd';
 	@override String get refresh => 'Uppdatera';
 	@override String get yes => 'Ja';
 	@override String get no => 'Nej';
-	@override String get server => 'Server';
+	@override String get delete => 'Ta bort';
+	@override String get shuffle => 'Blanda';
+	@override String get addTo => 'Lägg till i...';
 }
 
 // Path: screens
@@ -2113,7 +3406,6 @@ class _StringsSettingsSv implements _StringsSettingsEn {
 	@override String get theme => 'Tema';
 	@override String get appearance => 'Utseende';
 	@override String get videoPlayback => 'Videouppspelning';
-	@override String get shufflePlay => 'Blanda uppspelning';
 	@override String get advanced => 'Avancerat';
 	@override String get useSeasonPostersDescription => 'Visa säsongsaffisch istället för serieaffisch för avsnitt';
 	@override String get showHeroSectionDescription => 'Visa utvalda innehållskarusell på startsidan';
@@ -2151,15 +3443,13 @@ class _StringsSettingsSv implements _StringsSettingsEn {
 	@override String secondsUnit({required Object seconds}) => '${seconds} sekunder';
 	@override String get defaultSleepTimer => 'Standard sovtimer';
 	@override String minutesUnit({required Object minutes}) => '${minutes} minuter';
-	@override String get unwatchedOnly => 'Endast osedda';
-	@override String get unwatchedOnlyDescription => 'Inkludera endast osedda avsnitt i blandningskön';
-	@override String get shuffleOrderNavigation => 'Blandningsordning-navigation';
-	@override String get shuffleOrderNavigationDescription => 'Nästa/föregående knappar följer blandad ordning';
-	@override String get loopShuffleQueue => 'Loopa blandningskö';
-	@override String get loopShuffleQueueDescription => 'Starta om kö när slutet nås';
+	@override String get rememberTrackSelections => 'Kom ihåg spårval per serie/film';
+	@override String get rememberTrackSelectionsDescription => 'Spara automatiskt ljud- och undertextspråkpreferenser när du ändrar spår under uppspelning';
 	@override String get videoPlayerControls => 'Videospelar-kontroller';
 	@override String get keyboardShortcuts => 'Tangentbordsgenvägar';
 	@override String get keyboardShortcutsDescription => 'Anpassa tangentbordsgenvägar';
+	@override String get videoPlayerNavigation => 'Navigering i videospelaren';
+	@override String get videoPlayerNavigationDescription => 'Använd piltangenter för att navigera videospelarens kontroller';
 	@override String get debugLogging => 'Felsökningsloggning';
 	@override String get debugLoggingDescription => 'Aktivera detaljerad loggning för felsökning';
 	@override String get viewLogs => 'Visa loggar';
@@ -2180,6 +3470,27 @@ class _StringsSettingsSv implements _StringsSettingsEn {
 	@override String validationErrorDuration({required Object min, required Object max, required Object unit}) => 'Tiden måste vara mellan ${min} och ${max} ${unit}';
 	@override String shortcutAlreadyAssigned({required Object action}) => 'Genväg redan tilldelad ${action}';
 	@override String shortcutUpdated({required Object action}) => 'Genväg uppdaterad för ${action}';
+	@override String get autoSkip => 'Auto Hoppa Över';
+	@override String get autoSkipIntro => 'Hoppa Över Intro Automatiskt';
+	@override String get autoSkipIntroDescription => 'Hoppa automatiskt över intro-markörer efter några sekunder';
+	@override String get autoSkipCredits => 'Hoppa Över Credits Automatiskt';
+	@override String get autoSkipCreditsDescription => 'Hoppa automatiskt över credits och spela nästa avsnitt';
+	@override String get autoSkipDelay => 'Fördröjning Auto Hoppa Över';
+	@override String autoSkipDelayDescription({required Object seconds}) => 'Vänta ${seconds} sekunder innan automatisk överhoppning';
+	@override String get downloads => 'Nedladdningar';
+	@override String get downloadLocationDescription => 'Välj var nedladdat innehåll ska lagras';
+	@override String get downloadLocationDefault => 'Standard (App-lagring)';
+	@override String get downloadLocationCustom => 'Anpassad Plats';
+	@override String get selectFolder => 'Välj Mapp';
+	@override String get resetToDefault => 'Återställ till Standard';
+	@override String currentPath({required Object path}) => 'Nuvarande: ${path}';
+	@override String get downloadLocationChanged => 'Nedladdningsplats ändrad';
+	@override String get downloadLocationReset => 'Nedladdningsplats återställd till standard';
+	@override String get downloadLocationInvalid => 'Vald mapp är inte skrivbar';
+	@override String get downloadLocationSelectError => 'Kunde inte välja mapp';
+	@override String get downloadOnWifiOnly => 'Ladda ner endast på WiFi';
+	@override String get downloadOnWifiOnlyDescription => 'Förhindra nedladdningar vid användning av mobildata';
+	@override String get cellularDownloadBlocked => 'Nedladdningar är inaktiverade på mobildata. Anslut till WiFi eller ändra inställningen.';
 }
 
 // Path: search
@@ -2266,6 +3577,23 @@ class _StringsMediaMenuSv implements _StringsMediaMenuEn {
 	@override String get fileInfo => 'Filinformation';
 }
 
+// Path: accessibility
+class _StringsAccessibilitySv implements _StringsAccessibilityEn {
+	_StringsAccessibilitySv._(this._root);
+
+	@override final _StringsSv _root; // ignore: unused_field
+
+	// Translations
+	@override String mediaCardMovie({required Object title}) => '${title}, film';
+	@override String mediaCardShow({required Object title}) => '${title}, TV-serie';
+	@override String mediaCardEpisode({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+	@override String mediaCardSeason({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+	@override String get mediaCardWatched => 'sedd';
+	@override String mediaCardPartiallyWatched({required Object percent}) => '${percent} procent sedd';
+	@override String get mediaCardUnwatched => 'osedd';
+	@override String get tapToPlay => 'Tryck för att spela';
+}
+
 // Path: tooltips
 class _StringsTooltipsSv implements _StringsTooltipsEn {
 	_StringsTooltipsSv._(this._root);
@@ -2298,6 +3626,32 @@ class _StringsVideoControlsSv implements _StringsVideoControlsEn {
 	@override String get stretch => 'Sträck';
 	@override String get lockRotation => 'Lås rotation';
 	@override String get unlockRotation => 'Lås upp rotation';
+	@override String get sleepTimer => 'Sovtimer';
+	@override String get timerActive => 'Timer aktiv';
+	@override String playbackWillPauseIn({required Object duration}) => 'Uppspelningen pausas om ${duration}';
+	@override String get sleepTimerCompleted => 'Sovtimer slutförd - uppspelning pausad';
+	@override String get playButton => 'Spela';
+	@override String get pauseButton => 'Pausa';
+	@override String seekBackwardButton({required Object seconds}) => 'Spola bakåt ${seconds} sekunder';
+	@override String seekForwardButton({required Object seconds}) => 'Spola framåt ${seconds} sekunder';
+	@override String get previousButton => 'Föregående avsnitt';
+	@override String get nextButton => 'Nästa avsnitt';
+	@override String get previousChapterButton => 'Föregående kapitel';
+	@override String get nextChapterButton => 'Nästa kapitel';
+	@override String get muteButton => 'Tysta';
+	@override String get unmuteButton => 'Slå på ljud';
+	@override String get settingsButton => 'Videoinställningar';
+	@override String get audioTrackButton => 'Ljudspår';
+	@override String get subtitlesButton => 'Undertexter';
+	@override String get chaptersButton => 'Kapitel';
+	@override String get versionsButton => 'Videoversioner';
+	@override String get aspectRatioButton => 'Bildförhållande';
+	@override String get fullscreenButton => 'Aktivera helskärm';
+	@override String get exitFullscreenButton => 'Avsluta helskärm';
+	@override String get rotationLockButton => 'Rotationslås';
+	@override String get timelineSlider => 'Videotidslinje';
+	@override String get volumeSlider => 'Volymnivå';
+	@override String get backButton => 'Tillbaka';
 }
 
 // Path: userStatus
@@ -2310,6 +3664,7 @@ class _StringsUserStatusSv implements _StringsUserStatusEn {
 	@override String get admin => 'Admin';
 	@override String get restricted => 'Begränsad';
 	@override String get protected => 'Skyddad';
+	@override String get current => 'NUVARANDE';
 }
 
 // Path: messages
@@ -2321,6 +3676,8 @@ class _StringsMessagesSv implements _StringsMessagesEn {
 	// Translations
 	@override String get markedAsWatched => 'Markerad som sedd';
 	@override String get markedAsUnwatched => 'Markerad som osedd';
+	@override String get markedAsWatchedOffline => 'Markerad som sedd (synkroniseras när online)';
+	@override String get markedAsUnwatchedOffline => 'Markerad som osedd (synkroniseras när online)';
 	@override String get removedFromContinueWatching => 'Borttagen från Fortsätt titta';
 	@override String errorLoading({required Object error}) => 'Fel: ${error}';
 	@override String get fileInfoNotAvailable => 'Filinformation inte tillgänglig';
@@ -2337,24 +3694,18 @@ class _StringsMessagesSv implements _StringsMessagesEn {
 	@override String metadataRefreshing({required Object title}) => 'Uppdaterar metadata för "${title}"...';
 	@override String metadataRefreshStarted({required Object title}) => 'Metadata-uppdatering startad för "${title}"';
 	@override String metadataRefreshFailed({required Object error}) => 'Misslyckades att uppdatera metadata: ${error}';
-	@override String get noPlexToken => 'Ingen Plex-token hittad. Vänligen logga in igen.';
 	@override String get logoutConfirm => 'Är du säker på att du vill logga ut?';
 	@override String get noSeasonsFound => 'Inga säsonger hittades';
 	@override String get noEpisodesFound => 'Inga avsnitt hittades i första säsongen';
 	@override String get noEpisodesFoundGeneral => 'Inga avsnitt hittades';
 	@override String get noResultsFound => 'Inga resultat hittades';
 	@override String sleepTimerSet({required Object label}) => 'Sovtimer inställd för ${label}';
-	@override String failedToSwitchProfile({required Object displayName}) => 'Misslyckades att byta till ${displayName}';
-}
-
-// Path: profile
-class _StringsProfileSv implements _StringsProfileEn {
-	_StringsProfileSv._(this._root);
-
-	@override final _StringsSv _root; // ignore: unused_field
-
-	// Translations
-	@override String get noUsersAvailable => 'Inga användare tillgängliga';
+	@override String get noItemsAvailable => 'Inga objekt tillgängliga';
+	@override String get failedToCreatePlayQueue => 'Det gick inte att skapa uppspelningskö';
+	@override String get failedToCreatePlayQueueNoItems => 'Det gick inte att skapa uppspelningskö – inga objekt';
+	@override String failedPlayback({required Object action, required Object error}) => 'Kunde inte ${action}: ${error}';
+	@override String get youAreOffline => 'Du är offline';
+	@override String get offlineFeatureUnavailable => 'Denna funktion kräver en internetanslutning. Dina nedladdningar och inställningar är fortfarande tillgängliga.';
 }
 
 // Path: subtitlingStyling
@@ -2381,7 +3732,6 @@ class _StringsDialogSv implements _StringsDialogEn {
 
 	// Translations
 	@override String get confirmAction => 'Bekräfta åtgärd';
-	@override String get areYouSure => 'Är du säker på att du vill utföra denna åtgärd?';
 	@override String get cancel => 'Avbryt';
 	@override String get playNow => 'Spela nu';
 }
@@ -2400,14 +3750,15 @@ class _StringsDiscoverSv implements _StringsDiscoverEn {
 	@override String get noContentAvailable => 'Inget innehåll tillgängligt';
 	@override String get addMediaToLibraries => 'Lägg till media till dina bibliotek';
 	@override String get continueWatching => 'Fortsätt titta';
-	@override String get recentlyAdded => 'Nyligen tillagda';
 	@override String get play => 'Spela';
-	@override String get resume => 'Återuppta';
-	@override String playEpisode({required Object season, required Object episode}) => 'Spela S${season}, E${episode}';
-	@override String resumeEpisode({required Object season, required Object episode}) => 'Återuppta S${season}, E${episode}';
+	@override String playEpisode({required Object season, required Object episode}) => 'S${season}E${episode}';
 	@override String get pause => 'Pausa';
 	@override String get overview => 'Översikt';
 	@override String get cast => 'Rollbesättning';
+	@override String get seasons => 'Säsonger';
+	@override String get studio => 'Studio';
+	@override String get rating => 'Åldersgräns';
+	@override String get watched => 'Tittad';
 	@override String episodeCount({required Object count}) => '${count} avsnitt';
 	@override String watchedProgress({required Object watched, required Object total}) => '${watched}/${total} sedda';
 	@override String get movie => 'Film';
@@ -2433,7 +3784,6 @@ class _StringsErrorsSv implements _StringsErrorsEn {
 	@override String get invalidToken => 'Ogiltig token';
 	@override String failedToVerifyToken({required Object error}) => 'Misslyckades att verifiera token: ${error}';
 	@override String failedToSwitchProfile({required Object displayName}) => 'Misslyckades att byta till ${displayName}';
-	@override String get connectionFailedGeneric => 'Anslutning misslyckades';
 }
 
 // Path: libraries
@@ -2468,11 +3818,19 @@ class _StringsLibrariesSv implements _StringsLibrariesEn {
 	@override String get sort => 'Sortera';
 	@override String get sortBy => 'Sortera efter';
 	@override String get filters => 'Filter';
-	@override String loadingLibraryWithCount({required Object count}) => 'Laddar bibliotek... (${count} objekt laddade)';
 	@override String get confirmActionMessage => 'Är du säker på att du vill utföra denna åtgärd?';
 	@override String get showLibrary => 'Visa bibliotek';
 	@override String get hideLibrary => 'Dölj bibliotek';
 	@override String get libraryOptions => 'Biblioteksalternativ';
+	@override String get content => 'bibliotekets innehåll';
+	@override String get selectLibrary => 'Välj bibliotek';
+	@override String filtersWithCount({required Object count}) => 'Filter (${count})';
+	@override String get noRecommendations => 'Inga rekommendationer tillgängliga';
+	@override String get noCollections => 'Inga samlingar i det här biblioteket';
+	@override String get noFoldersFound => 'Inga mappar hittades';
+	@override String get folders => 'mappar';
+	@override late final _StringsLibrariesTabsSv tabs = _StringsLibrariesTabsSv._(_root);
+	@override late final _StringsLibrariesGroupingsSv groupings = _StringsLibrariesGroupingsSv._(_root);
 }
 
 // Path: about
@@ -2496,17 +3854,9 @@ class _StringsServerSelectionSv implements _StringsServerSelectionEn {
 	@override final _StringsSv _root; // ignore: unused_field
 
 	// Translations
-	@override String get connectingToServer => 'Ansluter till server...';
-	@override String get serverDebugCopied => 'Server-felsökningsdata kopierad till urklipp';
-	@override String get copyDebugData => 'Kopiera felsökningsdata';
+	@override String get allServerConnectionsFailed => 'Misslyckades att ansluta till servrar. Kontrollera ditt nätverk och försök igen.';
 	@override String get noServersFound => 'Inga servrar hittades';
-	@override String malformedServerData({required Object count}) => 'Hittade ${count} server(ar) med felformaterad data. Inga giltiga servrar tillgängliga.';
-	@override String get incompleteServerInfo => 'Vissa servrar har ofullständig information och hoppades över. Vänligen kontrollera ditt Plex.tv-konto.';
-	@override String get incompleteConnectionInfo => 'Server-anslutningsinformation är ofullständig. Försök igen.';
-	@override String malformedServerInfo({required Object message}) => 'Serverinformation är felformaterad: ${message}';
-	@override String get networkConnectionFailed => 'Nätverksanslutning misslyckades. Kontrollera din internetanslutning och försök igen.';
-	@override String get authenticationFailed => 'Autentisering misslyckades. Logga in igen.';
-	@override String get plexServiceUnavailable => 'Plex-tjänst otillgänglig. Försök igen senare.';
+	@override String noServersFoundForAccount({required Object username, required Object email}) => 'Inga servrar hittades för ${username} (${email})';
 	@override String failedToLoadServers({required Object error}) => 'Misslyckades att ladda servrar: ${error}';
 }
 
@@ -2531,11 +3881,8 @@ class _StringsLogsSv implements _StringsLogsEn {
 	@override final _StringsSv _root; // ignore: unused_field
 
 	// Translations
-	@override String get title => 'Loggar';
 	@override String get clearLogs => 'Rensa loggar';
 	@override String get copyLogs => 'Kopiera loggar';
-	@override String get exportLogs => 'Exportera loggar';
-	@override String get noLogsToShow => 'Inga loggar att visa';
 	@override String get error => 'Fel:';
 	@override String get stackTrace => 'Stack trace:';
 }
@@ -2564,6 +3911,905 @@ class _StringsNavigationSv implements _StringsNavigationEn {
 	@override String get search => 'Sök';
 	@override String get libraries => 'Bibliotek';
 	@override String get settings => 'Inställningar';
+	@override String get downloads => 'Nedladdningar';
+}
+
+// Path: downloads
+class _StringsDownloadsSv implements _StringsDownloadsEn {
+	_StringsDownloadsSv._(this._root);
+
+	@override final _StringsSv _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Nedladdningar';
+	@override String get manage => 'Hantera';
+	@override String get tvShows => 'TV-serier';
+	@override String get movies => 'Filmer';
+	@override String get noDownloads => 'Inga nedladdningar ännu';
+	@override String get noDownloadsDescription => 'Nedladdat innehåll visas här för offline-visning';
+	@override String get downloadNow => 'Ladda ner';
+	@override String get deleteDownload => 'Ta bort nedladdning';
+	@override String get retryDownload => 'Försök igen';
+	@override String get downloadQueued => 'Nedladdning köad';
+	@override String episodesQueued({required Object count}) => '${count} avsnitt köade för nedladdning';
+	@override String get downloadDeleted => 'Nedladdning borttagen';
+	@override String deleteConfirm({required Object title}) => 'Är du säker på att du vill ta bort "${title}"? Den nedladdade filen kommer att tas bort från din enhet.';
+	@override String deletingWithProgress({required Object title, required Object current, required Object total}) => 'Tar bort ${title}... (${current} av ${total})';
+}
+
+// Path: playlists
+class _StringsPlaylistsSv implements _StringsPlaylistsEn {
+	_StringsPlaylistsSv._(this._root);
+
+	@override final _StringsSv _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Spellistor';
+	@override String get noPlaylists => 'Inga spellistor hittades';
+	@override String get create => 'Skapa spellista';
+	@override String get playlistName => 'Spellistans namn';
+	@override String get enterPlaylistName => 'Ange spellistans namn';
+	@override String get delete => 'Ta bort spellista';
+	@override String get removeItem => 'Ta bort från spellista';
+	@override String get smartPlaylist => 'Smart spellista';
+	@override String itemCount({required Object count}) => '${count} objekt';
+	@override String get oneItem => '1 objekt';
+	@override String get emptyPlaylist => 'Denna spellista är tom';
+	@override String get deleteConfirm => 'Ta bort spellista?';
+	@override String deleteMessage({required Object name}) => 'Är du säker på att du vill ta bort "${name}"?';
+	@override String get created => 'Spellista skapad';
+	@override String get deleted => 'Spellista borttagen';
+	@override String get itemAdded => 'Tillagd i spellista';
+	@override String get itemRemoved => 'Borttagen från spellista';
+	@override String get selectPlaylist => 'Välj spellista';
+	@override String get createNewPlaylist => 'Skapa ny spellista';
+	@override String get errorCreating => 'Det gick inte att skapa spellista';
+	@override String get errorDeleting => 'Det gick inte att ta bort spellista';
+	@override String get errorLoading => 'Det gick inte att ladda spellistor';
+	@override String get errorAdding => 'Det gick inte att lägga till i spellista';
+	@override String get errorReordering => 'Det gick inte att omordna spellisteobjekt';
+	@override String get errorRemoving => 'Det gick inte att ta bort från spellista';
+	@override String get playlist => 'Spellista';
+}
+
+// Path: collections
+class _StringsCollectionsSv implements _StringsCollectionsEn {
+	_StringsCollectionsSv._(this._root);
+
+	@override final _StringsSv _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Samlingar';
+	@override String get collection => 'Samling';
+	@override String get empty => 'Samlingen är tom';
+	@override String get unknownLibrarySection => 'Kan inte ta bort: okänd bibliotekssektion';
+	@override String get deleteCollection => 'Ta bort samling';
+	@override String deleteConfirm({required Object title}) => 'Är du säker på att du vill ta bort "${title}"? Detta går inte att ångra.';
+	@override String get deleted => 'Samling borttagen';
+	@override String get deleteFailed => 'Det gick inte att ta bort samlingen';
+	@override String deleteFailedWithError({required Object error}) => 'Det gick inte att ta bort samlingen: ${error}';
+	@override String failedToLoadItems({required Object error}) => 'Det gick inte att läsa in samlingsobjekt: ${error}';
+	@override String get selectCollection => 'Välj samling';
+	@override String get createNewCollection => 'Skapa ny samling';
+	@override String get collectionName => 'Samlingsnamn';
+	@override String get enterCollectionName => 'Ange samlingsnamn';
+	@override String get addedToCollection => 'Tillagd i samling';
+	@override String get errorAddingToCollection => 'Fel vid tillägg i samling';
+	@override String get created => 'Samling skapad';
+	@override String get removeFromCollection => 'Ta bort från samling';
+	@override String removeFromCollectionConfirm({required Object title}) => 'Ta bort "${title}" från denna samling?';
+	@override String get removedFromCollection => 'Borttagen från samling';
+	@override String get removeFromCollectionFailed => 'Misslyckades med att ta bort från samling';
+	@override String removeFromCollectionError({required Object error}) => 'Fel vid borttagning från samling: ${error}';
+}
+
+// Path: libraries.tabs
+class _StringsLibrariesTabsSv implements _StringsLibrariesTabsEn {
+	_StringsLibrariesTabsSv._(this._root);
+
+	@override final _StringsSv _root; // ignore: unused_field
+
+	// Translations
+	@override String get recommended => 'Rekommenderat';
+	@override String get browse => 'Bläddra';
+	@override String get collections => 'Samlingar';
+	@override String get playlists => 'Spellistor';
+}
+
+// Path: libraries.groupings
+class _StringsLibrariesGroupingsSv implements _StringsLibrariesGroupingsEn {
+	_StringsLibrariesGroupingsSv._(this._root);
+
+	@override final _StringsSv _root; // ignore: unused_field
+
+	// Translations
+	@override String get all => 'Alla';
+	@override String get movies => 'Filmer';
+	@override String get shows => 'Serier';
+	@override String get seasons => 'Säsonger';
+	@override String get episodes => 'Avsnitt';
+	@override String get folders => 'Mappar';
+}
+
+// Path: <root>
+class _StringsZh implements Translations {
+	/// You can call this constructor and build your own translation instance of this locale.
+	/// Constructing via the enum [AppLocale.build] is preferred.
+	_StringsZh.build({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+		: assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+		  $meta = TranslationMetadata(
+		    locale: AppLocale.zh,
+		    overrides: overrides ?? {},
+		    cardinalResolver: cardinalResolver,
+		    ordinalResolver: ordinalResolver,
+		  ) {
+		$meta.setFlatMapFunction(_flatMapFunction);
+	}
+
+	/// Metadata for the translations of <zh>.
+	@override final TranslationMetadata<AppLocale, Translations> $meta;
+
+	/// Access flat map
+	@override dynamic operator[](String key) => $meta.getTranslation(key);
+
+	@override late final _StringsZh _root = this; // ignore: unused_field
+
+	// Translations
+	@override late final _StringsAppZh app = _StringsAppZh._(_root);
+	@override late final _StringsAuthZh auth = _StringsAuthZh._(_root);
+	@override late final _StringsCommonZh common = _StringsCommonZh._(_root);
+	@override late final _StringsScreensZh screens = _StringsScreensZh._(_root);
+	@override late final _StringsUpdateZh update = _StringsUpdateZh._(_root);
+	@override late final _StringsSettingsZh settings = _StringsSettingsZh._(_root);
+	@override late final _StringsSearchZh search = _StringsSearchZh._(_root);
+	@override late final _StringsHotkeysZh hotkeys = _StringsHotkeysZh._(_root);
+	@override late final _StringsPinEntryZh pinEntry = _StringsPinEntryZh._(_root);
+	@override late final _StringsFileInfoZh fileInfo = _StringsFileInfoZh._(_root);
+	@override late final _StringsMediaMenuZh mediaMenu = _StringsMediaMenuZh._(_root);
+	@override late final _StringsAccessibilityZh accessibility = _StringsAccessibilityZh._(_root);
+	@override late final _StringsTooltipsZh tooltips = _StringsTooltipsZh._(_root);
+	@override late final _StringsVideoControlsZh videoControls = _StringsVideoControlsZh._(_root);
+	@override late final _StringsUserStatusZh userStatus = _StringsUserStatusZh._(_root);
+	@override late final _StringsMessagesZh messages = _StringsMessagesZh._(_root);
+	@override late final _StringsSubtitlingStylingZh subtitlingStyling = _StringsSubtitlingStylingZh._(_root);
+	@override late final _StringsDialogZh dialog = _StringsDialogZh._(_root);
+	@override late final _StringsDiscoverZh discover = _StringsDiscoverZh._(_root);
+	@override late final _StringsErrorsZh errors = _StringsErrorsZh._(_root);
+	@override late final _StringsLibrariesZh libraries = _StringsLibrariesZh._(_root);
+	@override late final _StringsAboutZh about = _StringsAboutZh._(_root);
+	@override late final _StringsServerSelectionZh serverSelection = _StringsServerSelectionZh._(_root);
+	@override late final _StringsHubDetailZh hubDetail = _StringsHubDetailZh._(_root);
+	@override late final _StringsLogsZh logs = _StringsLogsZh._(_root);
+	@override late final _StringsLicensesZh licenses = _StringsLicensesZh._(_root);
+	@override late final _StringsNavigationZh navigation = _StringsNavigationZh._(_root);
+	@override late final _StringsDownloadsZh downloads = _StringsDownloadsZh._(_root);
+	@override late final _StringsPlaylistsZh playlists = _StringsPlaylistsZh._(_root);
+	@override late final _StringsCollectionsZh collections = _StringsCollectionsZh._(_root);
+}
+
+// Path: app
+class _StringsAppZh implements _StringsAppEn {
+	_StringsAppZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => 'Plezy';
+	@override String get loading => '加载中...';
+}
+
+// Path: auth
+class _StringsAuthZh implements _StringsAuthEn {
+	_StringsAuthZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get signInWithPlex => '使用 Plex 登录';
+	@override String get showQRCode => '显示二维码';
+	@override String get cancel => '取消';
+	@override String get authenticate => '验证';
+	@override String get retry => '重试';
+	@override String get debugEnterToken => '调试：输入 Plex Token';
+	@override String get plexTokenLabel => 'Plex 授权令牌 (Auth Token)';
+	@override String get plexTokenHint => '输入你的 Plex.tv 令牌';
+	@override String get authenticationTimeout => '验证超时。请重试。';
+	@override String get scanQRCodeInstruction => '请使用已登录 Plex 的设备扫描此二维码进行验证。';
+	@override String get waitingForAuth => '等待验证中...\n请在你的浏览器中完成登录。';
+}
+
+// Path: common
+class _StringsCommonZh implements _StringsCommonEn {
+	_StringsCommonZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get cancel => '取消';
+	@override String get save => '保存';
+	@override String get close => '关闭';
+	@override String get clear => '清除';
+	@override String get reset => '重置';
+	@override String get later => '稍后';
+	@override String get submit => '提交';
+	@override String get confirm => '确认';
+	@override String get retry => '重试';
+	@override String get logout => '登出';
+	@override String get unknown => '未知';
+	@override String get refresh => '刷新';
+	@override String get yes => '是';
+	@override String get no => '否';
+	@override String get delete => '删除';
+	@override String get shuffle => '随机播放';
+	@override String get addTo => '添加到...';
+}
+
+// Path: screens
+class _StringsScreensZh implements _StringsScreensEn {
+	_StringsScreensZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get licenses => '许可证';
+	@override String get selectServer => '选择服务器';
+	@override String get switchProfile => '切换配置文件';
+	@override String get subtitleStyling => '字幕样式';
+	@override String get search => '搜索';
+	@override String get logs => '日志';
+}
+
+// Path: update
+class _StringsUpdateZh implements _StringsUpdateEn {
+	_StringsUpdateZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get available => '有可用更新';
+	@override String versionAvailable({required Object version}) => '版本 ${version} 已发布';
+	@override String currentVersion({required Object version}) => '当前版本: ${version}';
+	@override String get skipVersion => '跳过此版本';
+	@override String get viewRelease => '查看发布详情';
+	@override String get latestVersion => '已安装的版本是可用的最新版本';
+	@override String get checkFailed => '无法检查更新';
+}
+
+// Path: settings
+class _StringsSettingsZh implements _StringsSettingsEn {
+	_StringsSettingsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '设置';
+	@override String get language => '语言';
+	@override String get theme => '主题';
+	@override String get appearance => '外观';
+	@override String get videoPlayback => '视频播放';
+	@override String get advanced => '高级';
+	@override String get useSeasonPostersDescription => '为剧集显示季海报而非剧集海报';
+	@override String get showHeroSectionDescription => '在主屏幕上显示精选内容轮播区';
+	@override String get secondsLabel => '秒';
+	@override String get minutesLabel => '分钟';
+	@override String get secondsShort => 's';
+	@override String get minutesShort => 'm';
+	@override String durationHint({required Object min, required Object max}) => '输入时长 (${min}-${max})';
+	@override String get systemTheme => '系统';
+	@override String get systemThemeDescription => '跟随系统设置';
+	@override String get lightTheme => '浅色';
+	@override String get darkTheme => '深色';
+	@override String get libraryDensity => '媒体库密度';
+	@override String get compact => '紧凑';
+	@override String get compactDescription => '卡片更小，显示更多项目';
+	@override String get normal => '标准';
+	@override String get normalDescription => '默认尺寸';
+	@override String get comfortable => '舒适';
+	@override String get comfortableDescription => '卡片更大，显示更少项目';
+	@override String get viewMode => '视图模式';
+	@override String get gridView => '网格视图';
+	@override String get gridViewDescription => '以网格布局显示项目';
+	@override String get listView => '列表视图';
+	@override String get listViewDescription => '以列表布局显示项目';
+	@override String get useSeasonPosters => '使用季海报';
+	@override String get showHeroSection => '显示主要精选区';
+	@override String get hardwareDecoding => '硬件解码';
+	@override String get hardwareDecodingDescription => '如果可用，使用硬件加速';
+	@override String get bufferSize => '缓冲区大小';
+	@override String bufferSizeMB({required Object size}) => '${size}MB';
+	@override String get subtitleStyling => '字幕样式';
+	@override String get subtitleStylingDescription => '调整字幕外观';
+	@override String get smallSkipDuration => '短跳过时长';
+	@override String get largeSkipDuration => '长跳过时长';
+	@override String secondsUnit({required Object seconds}) => '${seconds} 秒';
+	@override String get defaultSleepTimer => '默认睡眠定时器';
+	@override String minutesUnit({required Object minutes}) => '${minutes} 分钟';
+	@override String get rememberTrackSelections => '记住每个剧集/电影的音轨选择';
+	@override String get rememberTrackSelectionsDescription => '在播放过程中更改音轨时自动保存音频和字幕语言偏好';
+	@override String get videoPlayerControls => '视频播放器控制';
+	@override String get keyboardShortcuts => '键盘快捷键';
+	@override String get keyboardShortcutsDescription => '自定义键盘快捷键';
+	@override String get videoPlayerNavigation => '视频播放器导航';
+	@override String get videoPlayerNavigationDescription => '使用方向键导航视频播放器控件';
+	@override String get debugLogging => '调试日志';
+	@override String get debugLoggingDescription => '启用详细日志记录以便故障排除';
+	@override String get viewLogs => '查看日志';
+	@override String get viewLogsDescription => '查看应用程序日志';
+	@override String get clearCache => '清除缓存';
+	@override String get clearCacheDescription => '这将清除所有缓存的图片和数据。清除缓存后，应用程序加载内容可能会变慢。';
+	@override String get clearCacheSuccess => '缓存清除成功';
+	@override String get resetSettings => '重置设置';
+	@override String get resetSettingsDescription => '这会将所有设置重置为其默认值。此操作无法撤销。';
+	@override String get resetSettingsSuccess => '设置重置成功';
+	@override String get shortcutsReset => '快捷键已重置为默认值';
+	@override String get about => '关于';
+	@override String get aboutDescription => '应用程序信息和许可证';
+	@override String get updates => '更新';
+	@override String get updateAvailable => '有可用更新';
+	@override String get checkForUpdates => '检查更新';
+	@override String get validationErrorEnterNumber => '请输入一个有效的数字';
+	@override String validationErrorDuration({required Object min, required Object max, required Object unit}) => '时长必须介于 ${min} 和 ${max} ${unit} 之间';
+	@override String shortcutAlreadyAssigned({required Object action}) => '快捷键已被分配给 ${action}';
+	@override String shortcutUpdated({required Object action}) => '快捷键已为 ${action} 更新';
+	@override String get autoSkip => '自动跳过';
+	@override String get autoSkipIntro => '自动跳过片头';
+	@override String get autoSkipIntroDescription => '几秒钟后自动跳过片头标记';
+	@override String get autoSkipCredits => '自动跳过片尾';
+	@override String get autoSkipCreditsDescription => '自动跳过片尾并播放下一集';
+	@override String get autoSkipDelay => '自动跳过延迟';
+	@override String autoSkipDelayDescription({required Object seconds}) => '自动跳过前等待 ${seconds} 秒';
+	@override String get downloads => '下载';
+	@override String get downloadLocationDescription => '选择下载内容的存储位置';
+	@override String get downloadLocationDefault => '默认（应用存储）';
+	@override String get downloadLocationCustom => '自定义位置';
+	@override String get selectFolder => '选择文件夹';
+	@override String get resetToDefault => '重置为默认';
+	@override String currentPath({required Object path}) => '当前: ${path}';
+	@override String get downloadLocationChanged => '下载位置已更改';
+	@override String get downloadLocationReset => '下载位置已重置为默认';
+	@override String get downloadLocationInvalid => '所选文件夹不可写入';
+	@override String get downloadLocationSelectError => '选择文件夹失败';
+	@override String get downloadOnWifiOnly => '仅在 WiFi 时下载';
+	@override String get downloadOnWifiOnlyDescription => '使用蜂窝数据时禁止下载';
+	@override String get cellularDownloadBlocked => '蜂窝数据下已禁用下载。请连接 WiFi 或更改设置。';
+}
+
+// Path: search
+class _StringsSearchZh implements _StringsSearchEn {
+	_StringsSearchZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get hint => '搜索电影、系列、音乐...';
+	@override String get tryDifferentTerm => '尝试不同的搜索词';
+	@override String get searchYourMedia => '搜索媒体';
+	@override String get enterTitleActorOrKeyword => '输入标题、演员或关键词';
+}
+
+// Path: hotkeys
+class _StringsHotkeysZh implements _StringsHotkeysEn {
+	_StringsHotkeysZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String setShortcutFor({required Object actionName}) => '为 ${actionName} 设置快捷键';
+	@override String get clearShortcut => '清除快捷键';
+}
+
+// Path: pinEntry
+class _StringsPinEntryZh implements _StringsPinEntryEn {
+	_StringsPinEntryZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get enterPin => '输入 PIN';
+	@override String get showPin => '显示 PIN';
+	@override String get hidePin => '隐藏 PIN';
+}
+
+// Path: fileInfo
+class _StringsFileInfoZh implements _StringsFileInfoEn {
+	_StringsFileInfoZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '文件信息';
+	@override String get video => '视频';
+	@override String get audio => '音频';
+	@override String get file => '文件';
+	@override String get advanced => '高级';
+	@override String get codec => '编解码器';
+	@override String get resolution => '分辨率';
+	@override String get bitrate => '比特率';
+	@override String get frameRate => '帧率';
+	@override String get aspectRatio => '宽高比';
+	@override String get profile => '配置文件';
+	@override String get bitDepth => '位深度';
+	@override String get colorSpace => '色彩空间';
+	@override String get colorRange => '色彩范围';
+	@override String get colorPrimaries => '颜色原色';
+	@override String get chromaSubsampling => '色度子采样';
+	@override String get channels => '声道';
+	@override String get path => '路径';
+	@override String get size => '大小';
+	@override String get container => '容器';
+	@override String get duration => '时长';
+	@override String get optimizedForStreaming => '已优化用于流媒体';
+	@override String get has64bitOffsets => '64位偏移量';
+}
+
+// Path: mediaMenu
+class _StringsMediaMenuZh implements _StringsMediaMenuEn {
+	_StringsMediaMenuZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get markAsWatched => '标记为已观看';
+	@override String get markAsUnwatched => '标记为未观看';
+	@override String get removeFromContinueWatching => '从继续观看中移除';
+	@override String get goToSeries => '转到系列';
+	@override String get goToSeason => '转到季';
+	@override String get shufflePlay => '随机播放';
+	@override String get fileInfo => '文件信息';
+}
+
+// Path: accessibility
+class _StringsAccessibilityZh implements _StringsAccessibilityEn {
+	_StringsAccessibilityZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String mediaCardMovie({required Object title}) => '${title}, 电影';
+	@override String mediaCardShow({required Object title}) => '${title}, 电视剧';
+	@override String mediaCardEpisode({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+	@override String mediaCardSeason({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+	@override String get mediaCardWatched => '已观看';
+	@override String mediaCardPartiallyWatched({required Object percent}) => '已观看 ${percent} 百分比';
+	@override String get mediaCardUnwatched => '未观看';
+	@override String get tapToPlay => '点击播放';
+}
+
+// Path: tooltips
+class _StringsTooltipsZh implements _StringsTooltipsEn {
+	_StringsTooltipsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get shufflePlay => '随机播放';
+	@override String get markAsWatched => '标记为已观看';
+	@override String get markAsUnwatched => '标记为未观看';
+}
+
+// Path: videoControls
+class _StringsVideoControlsZh implements _StringsVideoControlsEn {
+	_StringsVideoControlsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get audioLabel => '音频';
+	@override String get subtitlesLabel => '字幕';
+	@override String get resetToZero => '重置为 0ms';
+	@override String addTime({required Object amount, required Object unit}) => '+${amount}${unit}';
+	@override String minusTime({required Object amount, required Object unit}) => '-${amount}${unit}';
+	@override String playsLater({required Object label}) => '${label} 播放较晚';
+	@override String playsEarlier({required Object label}) => '${label} 播放较早';
+	@override String get noOffset => '无偏移';
+	@override String get letterbox => '信箱模式（Letterbox）';
+	@override String get fillScreen => '填充屏幕';
+	@override String get stretch => '拉伸';
+	@override String get lockRotation => '锁定旋转';
+	@override String get unlockRotation => '解锁旋转';
+	@override String get sleepTimer => '睡眠定时器';
+	@override String get timerActive => '定时器已激活';
+	@override String playbackWillPauseIn({required Object duration}) => '播放将在 ${duration} 后暂停';
+	@override String get sleepTimerCompleted => '睡眠定时器已完成 - 播放已暂停';
+	@override String get playButton => '播放';
+	@override String get pauseButton => '暂停';
+	@override String seekBackwardButton({required Object seconds}) => '后退 ${seconds} 秒';
+	@override String seekForwardButton({required Object seconds}) => '前进 ${seconds} 秒';
+	@override String get previousButton => '上一集';
+	@override String get nextButton => '下一集';
+	@override String get previousChapterButton => '上一章节';
+	@override String get nextChapterButton => '下一章节';
+	@override String get muteButton => '静音';
+	@override String get unmuteButton => '取消静音';
+	@override String get settingsButton => '视频设置';
+	@override String get audioTrackButton => '音轨';
+	@override String get subtitlesButton => '字幕';
+	@override String get chaptersButton => '章节';
+	@override String get versionsButton => '视频版本';
+	@override String get aspectRatioButton => '宽高比';
+	@override String get fullscreenButton => '进入全屏';
+	@override String get exitFullscreenButton => '退出全屏';
+	@override String get rotationLockButton => '旋转锁定';
+	@override String get timelineSlider => '视频时间轴';
+	@override String get volumeSlider => '音量调节';
+	@override String get backButton => '返回';
+}
+
+// Path: userStatus
+class _StringsUserStatusZh implements _StringsUserStatusEn {
+	_StringsUserStatusZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get admin => '管理员';
+	@override String get restricted => '受限';
+	@override String get protected => '受保护';
+	@override String get current => '当前';
+}
+
+// Path: messages
+class _StringsMessagesZh implements _StringsMessagesEn {
+	_StringsMessagesZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get markedAsWatched => '已标记为已观看';
+	@override String get markedAsUnwatched => '已标记为未观看';
+	@override String get markedAsWatchedOffline => '已标记为已观看 (将在联网时同步)';
+	@override String get markedAsUnwatchedOffline => '已标记为未观看 (将在联网时同步)';
+	@override String get removedFromContinueWatching => '已从继续观看中移除';
+	@override String errorLoading({required Object error}) => '错误: ${error}';
+	@override String get fileInfoNotAvailable => '文件信息不可用';
+	@override String errorLoadingFileInfo({required Object error}) => '加载文件信息时出错: ${error}';
+	@override String get errorLoadingSeries => '加载系列时出错';
+	@override String get errorLoadingSeason => '加载季时出错';
+	@override String get musicNotSupported => '尚不支持播放音乐';
+	@override String get logsCleared => '日志已清除';
+	@override String get logsCopied => '日志已复制到剪贴板';
+	@override String get noLogsAvailable => '没有可用日志';
+	@override String libraryScanning({required Object title}) => '正在扫描 “${title}”...';
+	@override String libraryScanStarted({required Object title}) => '已开始扫描 “${title}” 媒体库';
+	@override String libraryScanFailed({required Object error}) => '无法扫描媒体库: ${error}';
+	@override String metadataRefreshing({required Object title}) => '正在刷新 “${title}” 的元数据...';
+	@override String metadataRefreshStarted({required Object title}) => '已开始刷新 “${title}” 的元数据';
+	@override String metadataRefreshFailed({required Object error}) => '无法刷新元数据: ${error}';
+	@override String get logoutConfirm => '你确定要登出吗？';
+	@override String get noSeasonsFound => '未找到季';
+	@override String get noEpisodesFound => '在第一季中未找到剧集';
+	@override String get noEpisodesFoundGeneral => '未找到剧集';
+	@override String get noResultsFound => '未找到结果';
+	@override String sleepTimerSet({required Object label}) => '睡眠定时器已设置为 ${label}';
+	@override String get noItemsAvailable => '没有可用的项目';
+	@override String get failedToCreatePlayQueue => '创建播放队列失败';
+	@override String get failedToCreatePlayQueueNoItems => '创建播放队列失败 - 没有项目';
+	@override String failedPlayback({required Object action, required Object error}) => '无法${action}: ${error}';
+	@override String get youAreOffline => '您已离线';
+	@override String get offlineFeatureUnavailable => '此功能需要网络连接。您的下载内容和设置仍然可用。';
+}
+
+// Path: subtitlingStyling
+class _StringsSubtitlingStylingZh implements _StringsSubtitlingStylingEn {
+	_StringsSubtitlingStylingZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get stylingOptions => '样式选项';
+	@override String get fontSize => '字号';
+	@override String get textColor => '文本颜色';
+	@override String get borderSize => '边框大小';
+	@override String get borderColor => '边框颜色';
+	@override String get backgroundOpacity => '背景不透明度';
+	@override String get backgroundColor => '背景颜色';
+}
+
+// Path: dialog
+class _StringsDialogZh implements _StringsDialogEn {
+	_StringsDialogZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get confirmAction => '确认操作';
+	@override String get cancel => '取消';
+	@override String get playNow => '立即播放';
+}
+
+// Path: discover
+class _StringsDiscoverZh implements _StringsDiscoverEn {
+	_StringsDiscoverZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '发现';
+	@override String get switchProfile => '切换配置文件';
+	@override String get switchServer => '切换服务器';
+	@override String get logout => '登出';
+	@override String get noContentAvailable => '没有可用内容';
+	@override String get addMediaToLibraries => '请向你的媒体库添加一些媒体';
+	@override String get continueWatching => '继续观看';
+	@override String get play => '播放';
+	@override String playEpisode({required Object season, required Object episode}) => 'S${season}E${episode}';
+	@override String get pause => '暂停';
+	@override String get overview => '概述';
+	@override String get cast => '演员表';
+	@override String get seasons => '季数';
+	@override String get studio => '制作公司';
+	@override String get rating => '年龄分级';
+	@override String get watched => '已观看';
+	@override String episodeCount({required Object count}) => '${count} 集';
+	@override String watchedProgress({required Object watched, required Object total}) => '已观看 ${watched}/${total} 集';
+	@override String get movie => '电影';
+	@override String get tvShow => '电视剧';
+	@override String minutesLeft({required Object minutes}) => '剩余 ${minutes} 分钟';
+}
+
+// Path: errors
+class _StringsErrorsZh implements _StringsErrorsEn {
+	_StringsErrorsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String searchFailed({required Object error}) => '搜索失败: ${error}';
+	@override String connectionTimeout({required Object context}) => '加载 ${context} 时连接超时';
+	@override String get connectionFailed => '无法连接到 Plex 服务器';
+	@override String failedToLoad({required Object context, required Object error}) => '无法加载 ${context}: ${error}';
+	@override String get noClientAvailable => '没有可用客户端';
+	@override String authenticationFailed({required Object error}) => '验证失败: ${error}';
+	@override String get couldNotLaunchUrl => '无法打开授权 URL';
+	@override String get pleaseEnterToken => '请输入一个令牌';
+	@override String get invalidToken => '令牌无效';
+	@override String failedToVerifyToken({required Object error}) => '无法验证令牌: ${error}';
+	@override String failedToSwitchProfile({required Object displayName}) => '无法切换到 ${displayName}';
+}
+
+// Path: libraries
+class _StringsLibrariesZh implements _StringsLibrariesEn {
+	_StringsLibrariesZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '媒体库';
+	@override String get scanLibraryFiles => '扫描媒体库文件';
+	@override String get scanLibrary => '扫描媒体库';
+	@override String get analyze => '分析';
+	@override String get analyzeLibrary => '分析媒体库';
+	@override String get refreshMetadata => '刷新元数据';
+	@override String get emptyTrash => '清空回收站';
+	@override String emptyingTrash({required Object title}) => '正在清空 “${title}” 的回收站...';
+	@override String trashEmptied({required Object title}) => '已清空 “${title}” 的回收站';
+	@override String failedToEmptyTrash({required Object error}) => '无法清空回收站: ${error}';
+	@override String analyzing({required Object title}) => '正在分析 “${title}”...';
+	@override String analysisStarted({required Object title}) => '已开始分析 “${title}”';
+	@override String failedToAnalyze({required Object error}) => '无法分析媒体库: ${error}';
+	@override String get noLibrariesFound => '未找到媒体库';
+	@override String get thisLibraryIsEmpty => '此媒体库为空';
+	@override String get all => '全部';
+	@override String get clearAll => '全部清除';
+	@override String scanLibraryConfirm({required Object title}) => '确定要扫描 “${title}” 吗？';
+	@override String analyzeLibraryConfirm({required Object title}) => '确定要分析 “${title}” 吗？';
+	@override String refreshMetadataConfirm({required Object title}) => '确定要刷新 “${title}” 的元数据吗？';
+	@override String emptyTrashConfirm({required Object title}) => '确定要清空 “${title}” 的回收站吗？';
+	@override String get manageLibraries => '管理媒体库';
+	@override String get sort => '排序';
+	@override String get sortBy => '排序依据';
+	@override String get filters => '筛选器';
+	@override String get confirmActionMessage => '确定要执行此操作吗？';
+	@override String get showLibrary => '显示媒体库';
+	@override String get hideLibrary => '隐藏媒体库';
+	@override String get libraryOptions => '媒体库选项';
+	@override String get content => '媒体库内容';
+	@override String get selectLibrary => '选择媒体库';
+	@override String filtersWithCount({required Object count}) => '筛选器（${count}）';
+	@override String get noRecommendations => '暂无推荐';
+	@override String get noCollections => '此媒体库中没有合集';
+	@override String get noFoldersFound => '未找到文件夹';
+	@override String get folders => '文件夹';
+	@override late final _StringsLibrariesTabsZh tabs = _StringsLibrariesTabsZh._(_root);
+	@override late final _StringsLibrariesGroupingsZh groupings = _StringsLibrariesGroupingsZh._(_root);
+}
+
+// Path: about
+class _StringsAboutZh implements _StringsAboutEn {
+	_StringsAboutZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '关于';
+	@override String get openSourceLicenses => '开源许可证';
+	@override String versionLabel({required Object version}) => '版本 ${version}';
+	@override String get appDescription => '一款精美的 Flutter Plex 客户端';
+	@override String get viewLicensesDescription => '查看第三方库的许可证';
+}
+
+// Path: serverSelection
+class _StringsServerSelectionZh implements _StringsServerSelectionEn {
+	_StringsServerSelectionZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get allServerConnectionsFailed => '无法连接到任何服务器。请检查你的网络并重试。';
+	@override String get noServersFound => '未找到服务器';
+	@override String noServersFoundForAccount({required Object username, required Object email}) => '未找到 ${username} (${email}) 的服务器';
+	@override String failedToLoadServers({required Object error}) => '无法加载服务器: ${error}';
+}
+
+// Path: hubDetail
+class _StringsHubDetailZh implements _StringsHubDetailEn {
+	_StringsHubDetailZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '标题';
+	@override String get releaseYear => '发行年份';
+	@override String get dateAdded => '添加日期';
+	@override String get rating => '评分';
+	@override String get noItemsFound => '未找到项目';
+}
+
+// Path: logs
+class _StringsLogsZh implements _StringsLogsEn {
+	_StringsLogsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get clearLogs => '清除日志';
+	@override String get copyLogs => '复制日志';
+	@override String get error => '错误:';
+	@override String get stackTrace => '堆栈跟踪 (Stack Trace):';
+}
+
+// Path: licenses
+class _StringsLicensesZh implements _StringsLicensesEn {
+	_StringsLicensesZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get relatedPackages => '相关软件包';
+	@override String get license => '许可证';
+	@override String licenseNumber({required Object number}) => '许可证 ${number}';
+	@override String licensesCount({required Object count}) => '${count} 个许可证';
+}
+
+// Path: navigation
+class _StringsNavigationZh implements _StringsNavigationEn {
+	_StringsNavigationZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get home => '主页';
+	@override String get search => '搜索';
+	@override String get libraries => '媒体库';
+	@override String get settings => '设置';
+	@override String get downloads => '下载';
+}
+
+// Path: downloads
+class _StringsDownloadsZh implements _StringsDownloadsEn {
+	_StringsDownloadsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '下载';
+	@override String get manage => '管理';
+	@override String get tvShows => '电视剧';
+	@override String get movies => '电影';
+	@override String get noDownloads => '暂无下载';
+	@override String get noDownloadsDescription => '下载的内容将在此处显示以供离线观看';
+	@override String get downloadNow => '下载';
+	@override String get deleteDownload => '删除下载';
+	@override String get retryDownload => '重试下载';
+	@override String get downloadQueued => '下载已排队';
+	@override String episodesQueued({required Object count}) => '${count} 集已加入下载队列';
+	@override String get downloadDeleted => '下载已删除';
+	@override String deleteConfirm({required Object title}) => '确定要删除 "${title}" 吗？下载的文件将从您的设备中删除。';
+	@override String deletingWithProgress({required Object title, required Object current, required Object total}) => '正在删除 ${title}... (${current}/${total})';
+}
+
+// Path: playlists
+class _StringsPlaylistsZh implements _StringsPlaylistsEn {
+	_StringsPlaylistsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '播放列表';
+	@override String get noPlaylists => '未找到播放列表';
+	@override String get create => '创建播放列表';
+	@override String get playlistName => '播放列表名称';
+	@override String get enterPlaylistName => '输入播放列表名称';
+	@override String get delete => '删除播放列表';
+	@override String get removeItem => '从播放列表中移除';
+	@override String get smartPlaylist => '智能播放列表';
+	@override String itemCount({required Object count}) => '${count} 个项目';
+	@override String get oneItem => '1 个项目';
+	@override String get emptyPlaylist => '此播放列表为空';
+	@override String get deleteConfirm => '删除播放列表？';
+	@override String deleteMessage({required Object name}) => '确定要删除 "${name}" 吗？';
+	@override String get created => '播放列表已创建';
+	@override String get deleted => '播放列表已删除';
+	@override String get itemAdded => '已添加到播放列表';
+	@override String get itemRemoved => '已从播放列表中移除';
+	@override String get selectPlaylist => '选择播放列表';
+	@override String get createNewPlaylist => '创建新播放列表';
+	@override String get errorCreating => '创建播放列表失败';
+	@override String get errorDeleting => '删除播放列表失败';
+	@override String get errorLoading => '加载播放列表失败';
+	@override String get errorAdding => '添加到播放列表失败';
+	@override String get errorReordering => '重新排序播放列表项目失败';
+	@override String get errorRemoving => '从播放列表中移除失败';
+	@override String get playlist => '播放列表';
+}
+
+// Path: collections
+class _StringsCollectionsZh implements _StringsCollectionsEn {
+	_StringsCollectionsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get title => '合集';
+	@override String get collection => '合集';
+	@override String get empty => '合集为空';
+	@override String get unknownLibrarySection => '无法删除：未知的媒体库分区';
+	@override String get deleteCollection => '删除合集';
+	@override String deleteConfirm({required Object title}) => '确定要删除"${title}"吗？此操作无法撤销。';
+	@override String get deleted => '已删除合集';
+	@override String get deleteFailed => '删除合集失败';
+	@override String deleteFailedWithError({required Object error}) => '删除合集失败：${error}';
+	@override String failedToLoadItems({required Object error}) => '加载合集项目失败：${error}';
+	@override String get selectCollection => '选择合集';
+	@override String get createNewCollection => '创建新合集';
+	@override String get collectionName => '合集名称';
+	@override String get enterCollectionName => '输入合集名称';
+	@override String get addedToCollection => '已添加到合集';
+	@override String get errorAddingToCollection => '添加到合集失败';
+	@override String get created => '已创建合集';
+	@override String get removeFromCollection => '从合集移除';
+	@override String removeFromCollectionConfirm({required Object title}) => '将“${title}”从此合集移除？';
+	@override String get removedFromCollection => '已从合集移除';
+	@override String get removeFromCollectionFailed => '从合集移除失败';
+	@override String removeFromCollectionError({required Object error}) => '从合集移除时出错：${error}';
+}
+
+// Path: libraries.tabs
+class _StringsLibrariesTabsZh implements _StringsLibrariesTabsEn {
+	_StringsLibrariesTabsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get recommended => '推荐';
+	@override String get browse => '浏览';
+	@override String get collections => '合集';
+	@override String get playlists => '播放列表';
+}
+
+// Path: libraries.groupings
+class _StringsLibrariesGroupingsZh implements _StringsLibrariesGroupingsEn {
+	_StringsLibrariesGroupingsZh._(this._root);
+
+	@override final _StringsZh _root; // ignore: unused_field
+
+	// Translations
+	@override String get all => '全部';
+	@override String get movies => '电影';
+	@override String get shows => '剧集';
+	@override String get seasons => '季';
+	@override String get episodes => '集';
+	@override String get folders => '文件夹';
 }
 
 /// Flat map(s) containing all translations.
@@ -2594,20 +4840,15 @@ extension on Translations {
 			case 'common.submit': return 'Submit';
 			case 'common.confirm': return 'Confirm';
 			case 'common.retry': return 'Retry';
-			case 'common.playNow': return 'Play Now';
 			case 'common.logout': return 'Logout';
-			case 'common.online': return 'Online';
-			case 'common.offline': return 'Offline';
-			case 'common.owned': return 'Owned';
-			case 'common.shared': return 'Shared';
-			case 'common.current': return 'CURRENT';
 			case 'common.unknown': return 'Unknown';
 			case 'common.refresh': return 'Refresh';
 			case 'common.yes': return 'Yes';
 			case 'common.no': return 'No';
-			case 'common.server': return 'Server';
+			case 'common.delete': return 'Delete';
+			case 'common.shuffle': return 'Shuffle';
+			case 'common.addTo': return 'Add to...';
 			case 'screens.licenses': return 'Licenses';
-			case 'screens.selectServer': return 'Select Server';
 			case 'screens.switchProfile': return 'Switch Profile';
 			case 'screens.subtitleStyling': return 'Subtitle Styling';
 			case 'screens.search': return 'Search';
@@ -2624,7 +4865,6 @@ extension on Translations {
 			case 'settings.theme': return 'Theme';
 			case 'settings.appearance': return 'Appearance';
 			case 'settings.videoPlayback': return 'Video Playback';
-			case 'settings.shufflePlay': return 'Shuffle Play';
 			case 'settings.advanced': return 'Advanced';
 			case 'settings.useSeasonPostersDescription': return 'Show season poster instead of series poster for episodes';
 			case 'settings.showHeroSectionDescription': return 'Display featured content carousel on home screen';
@@ -2662,15 +4902,13 @@ extension on Translations {
 			case 'settings.secondsUnit': return ({required Object seconds}) => '${seconds} seconds';
 			case 'settings.defaultSleepTimer': return 'Default Sleep Timer';
 			case 'settings.minutesUnit': return ({required Object minutes}) => '${minutes} minutes';
-			case 'settings.unwatchedOnly': return 'Unwatched Only';
-			case 'settings.unwatchedOnlyDescription': return 'Only include unwatched episodes in shuffle queue';
-			case 'settings.shuffleOrderNavigation': return 'Shuffle Order Navigation';
-			case 'settings.shuffleOrderNavigationDescription': return 'Next/previous buttons follow shuffled order';
-			case 'settings.loopShuffleQueue': return 'Loop Shuffle Queue';
-			case 'settings.loopShuffleQueueDescription': return 'Restart queue when reaching the end';
+			case 'settings.rememberTrackSelections': return 'Remember track selections per show/movie';
+			case 'settings.rememberTrackSelectionsDescription': return 'Automatically save audio and subtitle language preferences when you change tracks during playback';
 			case 'settings.videoPlayerControls': return 'Video Player Controls';
 			case 'settings.keyboardShortcuts': return 'Keyboard Shortcuts';
 			case 'settings.keyboardShortcutsDescription': return 'Customize keyboard shortcuts';
+			case 'settings.videoPlayerNavigation': return 'Video Player Navigation';
+			case 'settings.videoPlayerNavigationDescription': return 'Use arrow keys to navigate video player controls';
 			case 'settings.debugLogging': return 'Debug Logging';
 			case 'settings.debugLoggingDescription': return 'Enable detailed logging for troubleshooting';
 			case 'settings.viewLogs': return 'View Logs';
@@ -2691,6 +4929,27 @@ extension on Translations {
 			case 'settings.validationErrorDuration': return ({required Object min, required Object max, required Object unit}) => 'Duration must be between ${min} and ${max} ${unit}';
 			case 'settings.shortcutAlreadyAssigned': return ({required Object action}) => 'Shortcut already assigned to ${action}';
 			case 'settings.shortcutUpdated': return ({required Object action}) => 'Shortcut updated for ${action}';
+			case 'settings.autoSkip': return 'Auto Skip';
+			case 'settings.autoSkipIntro': return 'Auto Skip Intro';
+			case 'settings.autoSkipIntroDescription': return 'Automatically skip intro markers after a few seconds';
+			case 'settings.autoSkipCredits': return 'Auto Skip Credits';
+			case 'settings.autoSkipCreditsDescription': return 'Automatically skip credits and play next episode';
+			case 'settings.autoSkipDelay': return 'Auto Skip Delay';
+			case 'settings.autoSkipDelayDescription': return ({required Object seconds}) => 'Wait ${seconds} seconds before auto-skipping';
+			case 'settings.downloads': return 'Downloads';
+			case 'settings.downloadLocationDescription': return 'Choose where to store downloaded content';
+			case 'settings.downloadLocationDefault': return 'Default (App Storage)';
+			case 'settings.downloadLocationCustom': return 'Custom Location';
+			case 'settings.selectFolder': return 'Select Folder';
+			case 'settings.resetToDefault': return 'Reset to Default';
+			case 'settings.currentPath': return ({required Object path}) => 'Current: ${path}';
+			case 'settings.downloadLocationChanged': return 'Download location changed';
+			case 'settings.downloadLocationReset': return 'Download location reset to default';
+			case 'settings.downloadLocationInvalid': return 'Selected folder is not writable';
+			case 'settings.downloadLocationSelectError': return 'Failed to select folder';
+			case 'settings.downloadOnWifiOnly': return 'Download on WiFi only';
+			case 'settings.downloadOnWifiOnlyDescription': return 'Prevent downloads when on cellular data';
+			case 'settings.cellularDownloadBlocked': return 'Downloads are disabled on cellular data. Connect to WiFi or change the setting.';
 			case 'search.hint': return 'Search movies, shows, music...';
 			case 'search.tryDifferentTerm': return 'Try a different search term';
 			case 'search.searchYourMedia': return 'Search your media';
@@ -2730,6 +4989,14 @@ extension on Translations {
 			case 'mediaMenu.goToSeason': return 'Go to season';
 			case 'mediaMenu.shufflePlay': return 'Shuffle Play';
 			case 'mediaMenu.fileInfo': return 'File Info';
+			case 'accessibility.mediaCardMovie': return ({required Object title}) => '${title}, movie';
+			case 'accessibility.mediaCardShow': return ({required Object title}) => '${title}, TV show';
+			case 'accessibility.mediaCardEpisode': return ({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+			case 'accessibility.mediaCardSeason': return ({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+			case 'accessibility.mediaCardWatched': return 'watched';
+			case 'accessibility.mediaCardPartiallyWatched': return ({required Object percent}) => '${percent} percent watched';
+			case 'accessibility.mediaCardUnwatched': return 'unwatched';
+			case 'accessibility.tapToPlay': return 'Tap to play';
 			case 'tooltips.shufflePlay': return 'Shuffle play';
 			case 'tooltips.markAsWatched': return 'Mark as watched';
 			case 'tooltips.markAsUnwatched': return 'Mark as unwatched';
@@ -2746,11 +5013,40 @@ extension on Translations {
 			case 'videoControls.stretch': return 'Stretch';
 			case 'videoControls.lockRotation': return 'Lock rotation';
 			case 'videoControls.unlockRotation': return 'Unlock rotation';
+			case 'videoControls.sleepTimer': return 'Sleep Timer';
+			case 'videoControls.timerActive': return 'Timer Active';
+			case 'videoControls.playbackWillPauseIn': return ({required Object duration}) => 'Playback will pause in ${duration}';
+			case 'videoControls.sleepTimerCompleted': return 'Sleep timer completed - playback paused';
+			case 'videoControls.playButton': return 'Play';
+			case 'videoControls.pauseButton': return 'Pause';
+			case 'videoControls.seekBackwardButton': return ({required Object seconds}) => 'Seek backward ${seconds} seconds';
+			case 'videoControls.seekForwardButton': return ({required Object seconds}) => 'Seek forward ${seconds} seconds';
+			case 'videoControls.previousButton': return 'Previous episode';
+			case 'videoControls.nextButton': return 'Next episode';
+			case 'videoControls.previousChapterButton': return 'Previous chapter';
+			case 'videoControls.nextChapterButton': return 'Next chapter';
+			case 'videoControls.muteButton': return 'Mute';
+			case 'videoControls.unmuteButton': return 'Unmute';
+			case 'videoControls.settingsButton': return 'Video settings';
+			case 'videoControls.audioTrackButton': return 'Audio tracks';
+			case 'videoControls.subtitlesButton': return 'Subtitles';
+			case 'videoControls.chaptersButton': return 'Chapters';
+			case 'videoControls.versionsButton': return 'Video versions';
+			case 'videoControls.aspectRatioButton': return 'Aspect ratio';
+			case 'videoControls.fullscreenButton': return 'Enter fullscreen';
+			case 'videoControls.exitFullscreenButton': return 'Exit fullscreen';
+			case 'videoControls.rotationLockButton': return 'Rotation lock';
+			case 'videoControls.timelineSlider': return 'Video timeline';
+			case 'videoControls.volumeSlider': return 'Volume level';
+			case 'videoControls.backButton': return 'Back';
 			case 'userStatus.admin': return 'Admin';
 			case 'userStatus.restricted': return 'Restricted';
 			case 'userStatus.protected': return 'Protected';
+			case 'userStatus.current': return 'CURRENT';
 			case 'messages.markedAsWatched': return 'Marked as watched';
 			case 'messages.markedAsUnwatched': return 'Marked as unwatched';
+			case 'messages.markedAsWatchedOffline': return 'Marked as watched (will sync when online)';
+			case 'messages.markedAsUnwatchedOffline': return 'Marked as unwatched (will sync when online)';
 			case 'messages.removedFromContinueWatching': return 'Removed from Continue Watching';
 			case 'messages.errorLoading': return ({required Object error}) => 'Error: ${error}';
 			case 'messages.fileInfoNotAvailable': return 'File information not available';
@@ -2767,15 +5063,18 @@ extension on Translations {
 			case 'messages.metadataRefreshing': return ({required Object title}) => 'Refreshing metadata for "${title}"...';
 			case 'messages.metadataRefreshStarted': return ({required Object title}) => 'Metadata refresh started for "${title}"';
 			case 'messages.metadataRefreshFailed': return ({required Object error}) => 'Failed to refresh metadata: ${error}';
-			case 'messages.noPlexToken': return 'No Plex token found. Please login again.';
 			case 'messages.logoutConfirm': return 'Are you sure you want to logout?';
 			case 'messages.noSeasonsFound': return 'No seasons found';
 			case 'messages.noEpisodesFound': return 'No episodes found in first season';
 			case 'messages.noEpisodesFoundGeneral': return 'No episodes found';
 			case 'messages.noResultsFound': return 'No results found';
 			case 'messages.sleepTimerSet': return ({required Object label}) => 'Sleep timer set for ${label}';
-			case 'messages.failedToSwitchProfile': return ({required Object displayName}) => 'Failed to switch to ${displayName}';
-			case 'profile.noUsersAvailable': return 'No users available';
+			case 'messages.noItemsAvailable': return 'No items available';
+			case 'messages.failedToCreatePlayQueue': return 'Failed to create play queue';
+			case 'messages.failedToCreatePlayQueueNoItems': return 'Failed to create play queue - no items';
+			case 'messages.failedPlayback': return ({required Object action, required Object error}) => 'Failed to ${action}: ${error}';
+			case 'messages.youAreOffline': return 'You\'re Offline';
+			case 'messages.offlineFeatureUnavailable': return 'This feature requires an internet connection. Your downloads and settings are still available.';
 			case 'subtitlingStyling.stylingOptions': return 'Styling Options';
 			case 'subtitlingStyling.fontSize': return 'Font Size';
 			case 'subtitlingStyling.textColor': return 'Text Color';
@@ -2784,24 +5083,23 @@ extension on Translations {
 			case 'subtitlingStyling.backgroundOpacity': return 'Background Opacity';
 			case 'subtitlingStyling.backgroundColor': return 'Background Color';
 			case 'dialog.confirmAction': return 'Confirm Action';
-			case 'dialog.areYouSure': return 'Are you sure you want to perform this action?';
 			case 'dialog.cancel': return 'Cancel';
 			case 'dialog.playNow': return 'Play Now';
 			case 'discover.title': return 'Discover';
 			case 'discover.switchProfile': return 'Switch Profile';
-			case 'discover.switchServer': return 'Switch Server';
 			case 'discover.logout': return 'Logout';
 			case 'discover.noContentAvailable': return 'No content available';
 			case 'discover.addMediaToLibraries': return 'Add some media to your libraries';
 			case 'discover.continueWatching': return 'Continue Watching';
-			case 'discover.recentlyAdded': return 'Recently Added';
 			case 'discover.play': return 'Play';
-			case 'discover.resume': return 'Resume';
-			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'Play S${season}, E${episode}';
-			case 'discover.resumeEpisode': return ({required Object season, required Object episode}) => 'Resume S${season}, E${episode}';
+			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'S${season}E${episode}';
 			case 'discover.pause': return 'Pause';
 			case 'discover.overview': return 'Overview';
 			case 'discover.cast': return 'Cast';
+			case 'discover.seasons': return 'Seasons';
+			case 'discover.studio': return 'Studio';
+			case 'discover.rating': return 'Rating';
+			case 'discover.watched': return 'Watched';
 			case 'discover.episodeCount': return ({required Object count}) => '${count} episodes';
 			case 'discover.watchedProgress': return ({required Object watched, required Object total}) => '${watched}/${total} watched';
 			case 'discover.movie': return 'Movie';
@@ -2818,7 +5116,6 @@ extension on Translations {
 			case 'errors.invalidToken': return 'Invalid token';
 			case 'errors.failedToVerifyToken': return ({required Object error}) => 'Failed to verify token: ${error}';
 			case 'errors.failedToSwitchProfile': return ({required Object displayName}) => 'Failed to switch to ${displayName}';
-			case 'errors.connectionFailedGeneric': return 'Connection failed';
 			case 'libraries.title': return 'Libraries';
 			case 'libraries.scanLibraryFiles': return 'Scan Library Files';
 			case 'libraries.scanLibrary': return 'Scan Library';
@@ -2844,38 +5141,43 @@ extension on Translations {
 			case 'libraries.sort': return 'Sort';
 			case 'libraries.sortBy': return 'Sort By';
 			case 'libraries.filters': return 'Filters';
-			case 'libraries.loadingLibraryWithCount': return ({required Object count}) => 'Loading library... (${count} items loaded)';
 			case 'libraries.confirmActionMessage': return 'Are you sure you want to perform this action?';
 			case 'libraries.showLibrary': return 'Show library';
 			case 'libraries.hideLibrary': return 'Hide library';
 			case 'libraries.libraryOptions': return 'Library options';
+			case 'libraries.content': return 'library content';
+			case 'libraries.selectLibrary': return 'Select library';
+			case 'libraries.filtersWithCount': return ({required Object count}) => 'Filters (${count})';
+			case 'libraries.noRecommendations': return 'No recommendations available';
+			case 'libraries.noCollections': return 'No collections in this library';
+			case 'libraries.noFoldersFound': return 'No folders found';
+			case 'libraries.folders': return 'folders';
+			case 'libraries.tabs.recommended': return 'Recommended';
+			case 'libraries.tabs.browse': return 'Browse';
+			case 'libraries.tabs.collections': return 'Collections';
+			case 'libraries.tabs.playlists': return 'Playlists';
+			case 'libraries.groupings.all': return 'All';
+			case 'libraries.groupings.movies': return 'Movies';
+			case 'libraries.groupings.shows': return 'TV Shows';
+			case 'libraries.groupings.seasons': return 'Seasons';
+			case 'libraries.groupings.episodes': return 'Episodes';
+			case 'libraries.groupings.folders': return 'Folders';
 			case 'about.title': return 'About';
 			case 'about.openSourceLicenses': return 'Open Source Licenses';
 			case 'about.versionLabel': return ({required Object version}) => 'Version ${version}';
 			case 'about.appDescription': return 'A beautiful Plex client for Flutter';
 			case 'about.viewLicensesDescription': return 'View licenses of third-party libraries';
-			case 'serverSelection.connectingToServer': return 'Connecting to server...';
-			case 'serverSelection.serverDebugCopied': return 'Server debug data copied to clipboard';
-			case 'serverSelection.copyDebugData': return 'Copy Debug Data';
+			case 'serverSelection.allServerConnectionsFailed': return 'Failed to connect to any servers. Please check your network and try again.';
 			case 'serverSelection.noServersFound': return 'No servers found';
-			case 'serverSelection.malformedServerData': return ({required Object count}) => 'Found ${count} server(s) with malformed data. No valid servers available.';
-			case 'serverSelection.incompleteServerInfo': return 'Some servers have incomplete information and were skipped. Please check your Plex.tv account.';
-			case 'serverSelection.incompleteConnectionInfo': return 'Server connection information is incomplete. Please try again.';
-			case 'serverSelection.malformedServerInfo': return ({required Object message}) => 'Server information is malformed: ${message}';
-			case 'serverSelection.networkConnectionFailed': return 'Network connection failed. Please check your internet connection and try again.';
-			case 'serverSelection.authenticationFailed': return 'Authentication failed. Please sign in again.';
-			case 'serverSelection.plexServiceUnavailable': return 'Plex service unavailable. Please try again later.';
+			case 'serverSelection.noServersFoundForAccount': return ({required Object username, required Object email}) => 'No servers found for ${username} (${email})';
 			case 'serverSelection.failedToLoadServers': return ({required Object error}) => 'Failed to load servers: ${error}';
 			case 'hubDetail.title': return 'Title';
 			case 'hubDetail.releaseYear': return 'Release Year';
 			case 'hubDetail.dateAdded': return 'Date Added';
 			case 'hubDetail.rating': return 'Rating';
 			case 'hubDetail.noItemsFound': return 'No items found';
-			case 'logs.title': return 'Logs';
 			case 'logs.clearLogs': return 'Clear Logs';
 			case 'logs.copyLogs': return 'Copy Logs';
-			case 'logs.exportLogs': return 'Export Logs';
-			case 'logs.noLogsToShow': return 'No logs to show';
 			case 'logs.error': return 'Error:';
 			case 'logs.stackTrace': return 'Stack Trace:';
 			case 'licenses.relatedPackages': return 'Related Packages';
@@ -2886,6 +5188,512 @@ extension on Translations {
 			case 'navigation.search': return 'Search';
 			case 'navigation.libraries': return 'Libraries';
 			case 'navigation.settings': return 'Settings';
+			case 'navigation.downloads': return 'Downloads';
+			case 'collections.title': return 'Collections';
+			case 'collections.collection': return 'Collection';
+			case 'collections.empty': return 'Collection is empty';
+			case 'collections.unknownLibrarySection': return 'Cannot delete: Unknown library section';
+			case 'collections.deleteCollection': return 'Delete Collection';
+			case 'collections.deleteConfirm': return ({required Object title}) => 'Are you sure you want to delete "${title}"? This action cannot be undone.';
+			case 'collections.deleted': return 'Collection deleted';
+			case 'collections.deleteFailed': return 'Failed to delete collection';
+			case 'collections.deleteFailedWithError': return ({required Object error}) => 'Failed to delete collection: ${error}';
+			case 'collections.failedToLoadItems': return ({required Object error}) => 'Failed to load collection items: ${error}';
+			case 'collections.selectCollection': return 'Select Collection';
+			case 'collections.createNewCollection': return 'Create New Collection';
+			case 'collections.collectionName': return 'Collection Name';
+			case 'collections.enterCollectionName': return 'Enter collection name';
+			case 'collections.addedToCollection': return 'Added to collection';
+			case 'collections.errorAddingToCollection': return 'Failed to add to collection';
+			case 'collections.created': return 'Collection created';
+			case 'collections.removeFromCollection': return 'Remove from collection';
+			case 'collections.removeFromCollectionConfirm': return ({required Object title}) => 'Remove "${title}" from this collection?';
+			case 'collections.removedFromCollection': return 'Removed from collection';
+			case 'collections.removeFromCollectionFailed': return 'Failed to remove from collection';
+			case 'collections.removeFromCollectionError': return ({required Object error}) => 'Error removing from collection: ${error}';
+			case 'playlists.title': return 'Playlists';
+			case 'playlists.playlist': return 'Playlist';
+			case 'playlists.noPlaylists': return 'No playlists found';
+			case 'playlists.create': return 'Create Playlist';
+			case 'playlists.playlistName': return 'Playlist Name';
+			case 'playlists.enterPlaylistName': return 'Enter playlist name';
+			case 'playlists.delete': return 'Delete Playlist';
+			case 'playlists.removeItem': return 'Remove from Playlist';
+			case 'playlists.smartPlaylist': return 'Smart Playlist';
+			case 'playlists.itemCount': return ({required Object count}) => '${count} items';
+			case 'playlists.oneItem': return '1 item';
+			case 'playlists.emptyPlaylist': return 'This playlist is empty';
+			case 'playlists.deleteConfirm': return 'Delete Playlist?';
+			case 'playlists.deleteMessage': return ({required Object name}) => 'Are you sure you want to delete "${name}"?';
+			case 'playlists.created': return 'Playlist created';
+			case 'playlists.deleted': return 'Playlist deleted';
+			case 'playlists.itemAdded': return 'Added to playlist';
+			case 'playlists.itemRemoved': return 'Removed from playlist';
+			case 'playlists.selectPlaylist': return 'Select Playlist';
+			case 'playlists.createNewPlaylist': return 'Create New Playlist';
+			case 'playlists.errorCreating': return 'Failed to create playlist';
+			case 'playlists.errorDeleting': return 'Failed to delete playlist';
+			case 'playlists.errorLoading': return 'Failed to load playlists';
+			case 'playlists.errorAdding': return 'Failed to add to playlist';
+			case 'playlists.errorReordering': return 'Failed to reorder playlist item';
+			case 'playlists.errorRemoving': return 'Failed to remove from playlist';
+			case 'downloads.title': return 'Downloads';
+			case 'downloads.manage': return 'Manage';
+			case 'downloads.tvShows': return 'TV Shows';
+			case 'downloads.movies': return 'Movies';
+			case 'downloads.noDownloads': return 'No downloads yet';
+			case 'downloads.noDownloadsDescription': return 'Downloaded content will appear here for offline viewing';
+			case 'downloads.downloadNow': return 'Download';
+			case 'downloads.deleteDownload': return 'Delete download';
+			case 'downloads.retryDownload': return 'Retry download';
+			case 'downloads.downloadQueued': return 'Download queued';
+			case 'downloads.episodesQueued': return ({required Object count}) => '${count} episodes queued for download';
+			case 'downloads.downloadDeleted': return 'Download deleted';
+			case 'downloads.deleteConfirm': return ({required Object title}) => 'Are you sure you want to delete "${title}"? This will remove the downloaded file from your device.';
+			case 'downloads.deletingWithProgress': return ({required Object title, required Object current, required Object total}) => 'Deleting ${title}... (${current} of ${total})';
+			default: return null;
+		}
+	}
+}
+
+extension on _StringsDe {
+	dynamic _flatMapFunction(String path) {
+		switch (path) {
+			case 'app.title': return 'Plezy';
+			case 'app.loading': return 'Lädt...';
+			case 'auth.signInWithPlex': return 'Mit Plex anmelden';
+			case 'auth.showQRCode': return 'QR-Code anzeigen';
+			case 'auth.cancel': return 'Abbrechen';
+			case 'auth.authenticate': return 'Authentifizieren';
+			case 'auth.retry': return 'Erneut versuchen';
+			case 'auth.debugEnterToken': return 'Debug: Plex-Token eingeben';
+			case 'auth.plexTokenLabel': return 'Plex-Auth-Token';
+			case 'auth.plexTokenHint': return 'Plex.tv-Token eingeben';
+			case 'auth.authenticationTimeout': return 'Authentifizierung abgelaufen. Bitte erneut versuchen.';
+			case 'auth.scanQRCodeInstruction': return 'Diesen QR-Code mit einem bei Plex angemeldeten Gerät scannen, um zu authentifizieren.';
+			case 'auth.waitingForAuth': return 'Warte auf Authentifizierung...\nBitte Anmeldung im Browser abschließen.';
+			case 'common.cancel': return 'Abbrechen';
+			case 'common.save': return 'Speichern';
+			case 'common.close': return 'Schließen';
+			case 'common.clear': return 'Leeren';
+			case 'common.reset': return 'Zurücksetzen';
+			case 'common.later': return 'Später';
+			case 'common.submit': return 'Senden';
+			case 'common.confirm': return 'Bestätigen';
+			case 'common.retry': return 'Erneut versuchen';
+			case 'common.logout': return 'Abmelden';
+			case 'common.unknown': return 'Unbekannt';
+			case 'common.refresh': return 'Aktualisieren';
+			case 'common.yes': return 'Ja';
+			case 'common.no': return 'Nein';
+			case 'common.delete': return 'Löschen';
+			case 'common.shuffle': return 'Zufall';
+			case 'common.addTo': return 'Hinzufügen zu...';
+			case 'screens.licenses': return 'Lizenzen';
+			case 'screens.selectServer': return 'Server auswählen';
+			case 'screens.switchProfile': return 'Profil wechseln';
+			case 'screens.subtitleStyling': return 'Untertitel-Stil';
+			case 'screens.search': return 'Suche';
+			case 'screens.logs': return 'Protokolle';
+			case 'update.available': return 'Update verfügbar';
+			case 'update.versionAvailable': return ({required Object version}) => 'Version ${version} ist verfügbar';
+			case 'update.currentVersion': return ({required Object version}) => 'Aktuell: ${version}';
+			case 'update.skipVersion': return 'Diese Version überspringen';
+			case 'update.viewRelease': return 'Release anzeigen';
+			case 'update.latestVersion': return 'Aktuellste Version installiert';
+			case 'update.checkFailed': return 'Fehler bei der Updateprüfung';
+			case 'settings.title': return 'Einstellungen';
+			case 'settings.language': return 'Sprache';
+			case 'settings.theme': return 'Design';
+			case 'settings.appearance': return 'Darstellung';
+			case 'settings.videoPlayback': return 'Videowiedergabe';
+			case 'settings.advanced': return 'Erweitert';
+			case 'settings.useSeasonPostersDescription': return 'Staffelposter statt Serienposter für Episoden anzeigen';
+			case 'settings.showHeroSectionDescription': return 'Bereich mit empfohlenen Inhalten auf der Startseite anzeigen';
+			case 'settings.secondsLabel': return 'Sekunden';
+			case 'settings.minutesLabel': return 'Minuten';
+			case 'settings.secondsShort': return 's';
+			case 'settings.minutesShort': return 'm';
+			case 'settings.durationHint': return ({required Object min, required Object max}) => 'Dauer eingeben (${min}-${max})';
+			case 'settings.systemTheme': return 'System';
+			case 'settings.systemThemeDescription': return 'Systemeinstellungen folgen';
+			case 'settings.lightTheme': return 'Hell';
+			case 'settings.darkTheme': return 'Dunkel';
+			case 'settings.libraryDensity': return 'Mediathekdichte';
+			case 'settings.compact': return 'Kompakt';
+			case 'settings.compactDescription': return 'Kleinere Karten, mehr Elemente sichtbar';
+			case 'settings.normal': return 'Normal';
+			case 'settings.normalDescription': return 'Standardgröße';
+			case 'settings.comfortable': return 'Großzügig';
+			case 'settings.comfortableDescription': return 'Größere Karten, weniger Elemente sichtbar';
+			case 'settings.viewMode': return 'Ansichtsmodus';
+			case 'settings.gridView': return 'Raster';
+			case 'settings.gridViewDescription': return 'Elemente im Raster anzeigen';
+			case 'settings.listView': return 'Liste';
+			case 'settings.listViewDescription': return 'Elemente in Listenansicht anzeigen';
+			case 'settings.useSeasonPosters': return 'Staffelposter verwenden';
+			case 'settings.showHeroSection': return 'Hero-Bereich anzeigen';
+			case 'settings.hardwareDecoding': return 'Hardware-Decodierung';
+			case 'settings.hardwareDecodingDescription': return 'Hardwarebeschleunigung verwenden, sofern verfügbar';
+			case 'settings.bufferSize': return 'Puffergröße';
+			case 'settings.bufferSizeMB': return ({required Object size}) => '${size}MB';
+			case 'settings.subtitleStyling': return 'Untertitel-Stil';
+			case 'settings.subtitleStylingDescription': return 'Aussehen von Untertiteln anpassen';
+			case 'settings.smallSkipDuration': return 'Kleine Sprungdauer';
+			case 'settings.largeSkipDuration': return 'Große Sprungdauer';
+			case 'settings.secondsUnit': return ({required Object seconds}) => '${seconds} Sekunden';
+			case 'settings.defaultSleepTimer': return 'Standard-Sleep-Timer';
+			case 'settings.minutesUnit': return ({required Object minutes}) => '${minutes} Minuten';
+			case 'settings.rememberTrackSelections': return 'Spurauswahl pro Serie/Film merken';
+			case 'settings.rememberTrackSelectionsDescription': return 'Audio- und Untertitelsprache automatisch speichern, wenn während der Wiedergabe geändert';
+			case 'settings.videoPlayerControls': return 'Videoplayer-Steuerung';
+			case 'settings.keyboardShortcuts': return 'Tastenkürzel';
+			case 'settings.keyboardShortcutsDescription': return 'Tastenkürzel anpassen';
+			case 'settings.videoPlayerNavigation': return 'Videoplayer-Navigation';
+			case 'settings.videoPlayerNavigationDescription': return 'Pfeiltasten zur Navigation der Videoplayer-Steuerung verwenden';
+			case 'settings.debugLogging': return 'Debug-Protokollierung';
+			case 'settings.debugLoggingDescription': return 'Detaillierte Protokolle zur Fehleranalyse aktivieren';
+			case 'settings.viewLogs': return 'Protokolle anzeigen';
+			case 'settings.viewLogsDescription': return 'App-Protokolle anzeigen';
+			case 'settings.clearCache': return 'Cache löschen';
+			case 'settings.clearCacheDescription': return 'Löscht alle zwischengespeicherten Bilder und Daten. Die App kann danach langsamer laden.';
+			case 'settings.clearCacheSuccess': return 'Cache erfolgreich gelöscht';
+			case 'settings.resetSettings': return 'Einstellungen zurücksetzen';
+			case 'settings.resetSettingsDescription': return 'Alle Einstellungen auf Standard zurücksetzen. Dies kann nicht rückgängig gemacht werden.';
+			case 'settings.resetSettingsSuccess': return 'Einstellungen erfolgreich zurückgesetzt';
+			case 'settings.shortcutsReset': return 'Tastenkürzel auf Standard zurückgesetzt';
+			case 'settings.about': return 'Über';
+			case 'settings.aboutDescription': return 'App-Informationen und Lizenzen';
+			case 'settings.updates': return 'Updates';
+			case 'settings.updateAvailable': return 'Update verfügbar';
+			case 'settings.checkForUpdates': return 'Nach Updates suchen';
+			case 'settings.validationErrorEnterNumber': return 'Bitte eine gültige Zahl eingeben';
+			case 'settings.validationErrorDuration': return ({required Object min, required Object max, required Object unit}) => 'Dauer muss zwischen ${min} und ${max} ${unit} liegen';
+			case 'settings.shortcutAlreadyAssigned': return ({required Object action}) => 'Tastenkürzel bereits zugewiesen an ${action}';
+			case 'settings.shortcutUpdated': return ({required Object action}) => 'Tastenkürzel aktualisiert für ${action}';
+			case 'settings.autoSkip': return 'Automatisches Überspringen';
+			case 'settings.autoSkipIntro': return 'Intro automatisch überspringen';
+			case 'settings.autoSkipIntroDescription': return 'Intro-Marker nach wenigen Sekunden automatisch überspringen';
+			case 'settings.autoSkipCredits': return 'Abspann automatisch überspringen';
+			case 'settings.autoSkipCreditsDescription': return 'Abspann automatisch überspringen und nächste Episode abspielen';
+			case 'settings.autoSkipDelay': return 'Verzögerung für automatisches Überspringen';
+			case 'settings.autoSkipDelayDescription': return ({required Object seconds}) => '${seconds} Sekunden vor dem automatischen Überspringen warten';
+			case 'settings.downloads': return 'Downloads';
+			case 'settings.downloadLocationDescription': return 'Speicherort für heruntergeladene Inhalte wählen';
+			case 'settings.downloadLocationDefault': return 'Standard (App-Speicher)';
+			case 'settings.downloadLocationCustom': return 'Benutzerdefinierter Speicherort';
+			case 'settings.selectFolder': return 'Ordner auswählen';
+			case 'settings.resetToDefault': return 'Auf Standard zurücksetzen';
+			case 'settings.currentPath': return ({required Object path}) => 'Aktuell: ${path}';
+			case 'settings.downloadLocationChanged': return 'Download-Speicherort geändert';
+			case 'settings.downloadLocationReset': return 'Download-Speicherort auf Standard zurückgesetzt';
+			case 'settings.downloadLocationInvalid': return 'Ausgewählter Ordner ist nicht beschreibbar';
+			case 'settings.downloadLocationSelectError': return 'Ordnerauswahl fehlgeschlagen';
+			case 'settings.downloadOnWifiOnly': return 'Nur über WLAN herunterladen';
+			case 'settings.downloadOnWifiOnlyDescription': return 'Downloads über mobile Daten verhindern';
+			case 'settings.cellularDownloadBlocked': return 'Downloads sind über mobile Daten deaktiviert. Verbinde dich mit einem WLAN oder ändere die Einstellung.';
+			case 'search.hint': return 'Filme, Serien, Musik suchen...';
+			case 'search.tryDifferentTerm': return 'Anderen Suchbegriff versuchen';
+			case 'search.searchYourMedia': return 'In den eigenen Medien suchen';
+			case 'search.enterTitleActorOrKeyword': return 'Titel, Schauspieler oder Stichwort eingeben';
+			case 'hotkeys.setShortcutFor': return ({required Object actionName}) => 'Tastenkürzel festlegen für ${actionName}';
+			case 'hotkeys.clearShortcut': return 'Kürzel löschen';
+			case 'pinEntry.enterPin': return 'PIN eingeben';
+			case 'pinEntry.showPin': return 'PIN anzeigen';
+			case 'pinEntry.hidePin': return 'PIN verbergen';
+			case 'fileInfo.title': return 'Dateiinfo';
+			case 'fileInfo.video': return 'Video';
+			case 'fileInfo.audio': return 'Audio';
+			case 'fileInfo.file': return 'Datei';
+			case 'fileInfo.advanced': return 'Erweitert';
+			case 'fileInfo.codec': return 'Codec';
+			case 'fileInfo.resolution': return 'Auflösung';
+			case 'fileInfo.bitrate': return 'Bitrate';
+			case 'fileInfo.frameRate': return 'Bildrate';
+			case 'fileInfo.aspectRatio': return 'Seitenverhältnis';
+			case 'fileInfo.profile': return 'Profil';
+			case 'fileInfo.bitDepth': return 'Farbtiefe';
+			case 'fileInfo.colorSpace': return 'Farbraum';
+			case 'fileInfo.colorRange': return 'Farbbereich';
+			case 'fileInfo.colorPrimaries': return 'Primärfarben';
+			case 'fileInfo.chromaSubsampling': return 'Chroma-Subsampling';
+			case 'fileInfo.channels': return 'Kanäle';
+			case 'fileInfo.path': return 'Pfad';
+			case 'fileInfo.size': return 'Größe';
+			case 'fileInfo.container': return 'Container';
+			case 'fileInfo.duration': return 'Dauer';
+			case 'fileInfo.optimizedForStreaming': return 'Für Streaming optimiert';
+			case 'fileInfo.has64bitOffsets': return '64-Bit-Offsets';
+			case 'mediaMenu.markAsWatched': return 'Als gesehen markieren';
+			case 'mediaMenu.markAsUnwatched': return 'Als ungesehen markieren';
+			case 'mediaMenu.removeFromContinueWatching': return 'Aus ‚Weiterschauen‘ entfernen';
+			case 'mediaMenu.goToSeries': return 'Zur Serie';
+			case 'mediaMenu.goToSeason': return 'Zur Staffel';
+			case 'mediaMenu.shufflePlay': return 'Zufallswiedergabe';
+			case 'mediaMenu.fileInfo': return 'Dateiinfo';
+			case 'accessibility.mediaCardMovie': return ({required Object title}) => '${title}, Film';
+			case 'accessibility.mediaCardShow': return ({required Object title}) => '${title}, Serie';
+			case 'accessibility.mediaCardEpisode': return ({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+			case 'accessibility.mediaCardSeason': return ({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+			case 'accessibility.mediaCardWatched': return 'angesehen';
+			case 'accessibility.mediaCardPartiallyWatched': return ({required Object percent}) => '${percent} Prozent angesehen';
+			case 'accessibility.mediaCardUnwatched': return 'ungeschaut';
+			case 'accessibility.tapToPlay': return 'Zum Abspielen tippen';
+			case 'tooltips.shufflePlay': return 'Zufallswiedergabe';
+			case 'tooltips.markAsWatched': return 'Als gesehen markieren';
+			case 'tooltips.markAsUnwatched': return 'Als ungesehen markieren';
+			case 'videoControls.audioLabel': return 'Audio';
+			case 'videoControls.subtitlesLabel': return 'Untertitel';
+			case 'videoControls.resetToZero': return 'Auf 0 ms zurücksetzen';
+			case 'videoControls.addTime': return ({required Object amount, required Object unit}) => '+${amount}${unit}';
+			case 'videoControls.minusTime': return ({required Object amount, required Object unit}) => '-${amount}${unit}';
+			case 'videoControls.playsLater': return ({required Object label}) => '${label} spielt später';
+			case 'videoControls.playsEarlier': return ({required Object label}) => '${label} spielt früher';
+			case 'videoControls.noOffset': return 'Kein Offset';
+			case 'videoControls.letterbox': return 'Letterbox';
+			case 'videoControls.fillScreen': return 'Bild füllen';
+			case 'videoControls.stretch': return 'Strecken';
+			case 'videoControls.lockRotation': return 'Rotation sperren';
+			case 'videoControls.unlockRotation': return 'Rotation entsperren';
+			case 'videoControls.sleepTimer': return 'Schlaftimer';
+			case 'videoControls.timerActive': return 'Schlaftimer aktiv';
+			case 'videoControls.playbackWillPauseIn': return ({required Object duration}) => 'Wiedergabe wird in ${duration} pausiert';
+			case 'videoControls.sleepTimerCompleted': return 'Schlaftimer abgelaufen – Wiedergabe pausiert';
+			case 'videoControls.playButton': return 'Wiedergeben';
+			case 'videoControls.pauseButton': return 'Pause';
+			case 'videoControls.seekBackwardButton': return ({required Object seconds}) => '${seconds} Sekunden zurück';
+			case 'videoControls.seekForwardButton': return ({required Object seconds}) => '${seconds} Sekunden vor';
+			case 'videoControls.previousButton': return 'Vorherige Episode';
+			case 'videoControls.nextButton': return 'Nächste Episode';
+			case 'videoControls.previousChapterButton': return 'Vorheriges Kapitel';
+			case 'videoControls.nextChapterButton': return 'Nächstes Kapitel';
+			case 'videoControls.muteButton': return 'Stumm schalten';
+			case 'videoControls.unmuteButton': return 'Stummschaltung aufheben';
+			case 'videoControls.settingsButton': return 'Videoeinstellungen';
+			case 'videoControls.audioTrackButton': return 'Tonspuren';
+			case 'videoControls.subtitlesButton': return 'Untertitel';
+			case 'videoControls.chaptersButton': return 'Kapitel';
+			case 'videoControls.versionsButton': return 'Videoversionen';
+			case 'videoControls.aspectRatioButton': return 'Seitenverhältnis';
+			case 'videoControls.fullscreenButton': return 'Vollbild aktivieren';
+			case 'videoControls.exitFullscreenButton': return 'Vollbild verlassen';
+			case 'videoControls.rotationLockButton': return 'Dreh­sperre';
+			case 'videoControls.timelineSlider': return 'Video-Zeitleiste';
+			case 'videoControls.volumeSlider': return 'Lautstärkepegel';
+			case 'videoControls.backButton': return 'Zurück';
+			case 'userStatus.admin': return 'Eigentümer';
+			case 'userStatus.restricted': return 'Eingeschränkt';
+			case 'userStatus.protected': return 'Geschützt';
+			case 'userStatus.current': return 'AKTUELL';
+			case 'messages.markedAsWatched': return 'Als gesehen markiert';
+			case 'messages.markedAsUnwatched': return 'Als ungesehen markiert';
+			case 'messages.markedAsWatchedOffline': return 'Als gesehen markiert (wird synchronisiert, wenn online)';
+			case 'messages.markedAsUnwatchedOffline': return 'Als ungesehen markiert (wird synchronisiert, wenn online)';
+			case 'messages.removedFromContinueWatching': return 'Aus ‚Weiterschauen\' entfernt';
+			case 'messages.errorLoading': return ({required Object error}) => 'Fehler: ${error}';
+			case 'messages.fileInfoNotAvailable': return 'Dateiinfo nicht verfügbar';
+			case 'messages.errorLoadingFileInfo': return ({required Object error}) => 'Fehler beim Laden der Dateiinfo: ${error}';
+			case 'messages.errorLoadingSeries': return 'Fehler beim Laden der Serie';
+			case 'messages.errorLoadingSeason': return 'Fehler beim Laden der Staffel';
+			case 'messages.musicNotSupported': return 'Musikwiedergabe wird noch nicht unterstützt';
+			case 'messages.logsCleared': return 'Protokolle gelöscht';
+			case 'messages.logsCopied': return 'Protokolle in Zwischenablage kopiert';
+			case 'messages.noLogsAvailable': return 'Keine Protokolle verfügbar';
+			case 'messages.libraryScanning': return ({required Object title}) => 'Scanne „${title}“...';
+			case 'messages.libraryScanStarted': return ({required Object title}) => 'Mediathekscan gestartet für „${title}“';
+			case 'messages.libraryScanFailed': return ({required Object error}) => 'Fehler beim Scannen der Mediathek: ${error}';
+			case 'messages.metadataRefreshing': return ({required Object title}) => 'Metadaten werden aktualisiert für „${title}“...';
+			case 'messages.metadataRefreshStarted': return ({required Object title}) => 'Metadaten-Aktualisierung gestartet für „${title}“';
+			case 'messages.metadataRefreshFailed': return ({required Object error}) => 'Metadaten konnten nicht aktualisiert werden: ${error}';
+			case 'messages.logoutConfirm': return 'Abmeldung wirklich durchführen?';
+			case 'messages.noSeasonsFound': return 'Keine Staffeln gefunden';
+			case 'messages.noEpisodesFound': return 'Keine Episoden in der ersten Staffel gefunden';
+			case 'messages.noEpisodesFoundGeneral': return 'Keine Episoden gefunden';
+			case 'messages.noResultsFound': return 'Keine Ergebnisse gefunden';
+			case 'messages.sleepTimerSet': return ({required Object label}) => 'Sleep-Timer gesetzt auf ${label}';
+			case 'messages.noItemsAvailable': return 'Keine Elemente verfügbar';
+			case 'messages.failedToCreatePlayQueue': return 'Wiedergabewarteschlange konnte nicht erstellt werden';
+			case 'messages.failedToCreatePlayQueueNoItems': return 'Wiedergabewarteschlange konnte nicht erstellt werden – keine Elemente';
+			case 'messages.failedPlayback': return ({required Object action, required Object error}) => 'Wiedergabe für ${action} fehlgeschlagen: ${error}';
+			case 'messages.youAreOffline': return 'Du bist offline';
+			case 'messages.offlineFeatureUnavailable': return 'Diese Funktion erfordert eine Internetverbindung. Deine Downloads und Einstellungen sind weiterhin verfügbar.';
+			case 'subtitlingStyling.stylingOptions': return 'Stiloptionen';
+			case 'subtitlingStyling.fontSize': return 'Schriftgröße';
+			case 'subtitlingStyling.textColor': return 'Textfarbe';
+			case 'subtitlingStyling.borderSize': return 'Rahmengröße';
+			case 'subtitlingStyling.borderColor': return 'Rahmenfarbe';
+			case 'subtitlingStyling.backgroundOpacity': return 'Hintergrunddeckkraft';
+			case 'subtitlingStyling.backgroundColor': return 'Hintergrundfarbe';
+			case 'dialog.confirmAction': return 'Aktion bestätigen';
+			case 'dialog.cancel': return 'Abbrechen';
+			case 'dialog.playNow': return 'Jetzt abspielen';
+			case 'discover.title': return 'Entdecken';
+			case 'discover.switchProfile': return 'Profil wechseln';
+			case 'discover.switchServer': return 'Server wechseln';
+			case 'discover.logout': return 'Abmelden';
+			case 'discover.noContentAvailable': return 'Kein Inhalt verfügbar';
+			case 'discover.addMediaToLibraries': return 'Medien zur Mediathek hinzufügen';
+			case 'discover.continueWatching': return 'Weiterschauen';
+			case 'discover.play': return 'Abspielen';
+			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'S${season}E${episode}';
+			case 'discover.pause': return 'Pause';
+			case 'discover.overview': return 'Übersicht';
+			case 'discover.cast': return 'Besetzung';
+			case 'discover.seasons': return 'Staffeln';
+			case 'discover.studio': return 'Studio';
+			case 'discover.rating': return 'Altersfreigabe';
+			case 'discover.watched': return 'Gesehen';
+			case 'discover.episodeCount': return ({required Object count}) => '${count} Episoden';
+			case 'discover.watchedProgress': return ({required Object watched, required Object total}) => '${watched} von ${total} gesehen';
+			case 'discover.movie': return 'Film';
+			case 'discover.tvShow': return 'Serie';
+			case 'discover.minutesLeft': return ({required Object minutes}) => '${minutes} Min übrig';
+			case 'errors.searchFailed': return ({required Object error}) => 'Suche fehlgeschlagen: ${error}';
+			case 'errors.connectionTimeout': return ({required Object context}) => 'Zeitüberschreitung beim Laden von ${context}';
+			case 'errors.connectionFailed': return 'Verbindung zum Plex-Server fehlgeschlagen';
+			case 'errors.failedToLoad': return ({required Object context, required Object error}) => 'Fehler beim Laden von ${context}: ${error}';
+			case 'errors.noClientAvailable': return 'Kein Client verfügbar';
+			case 'errors.authenticationFailed': return ({required Object error}) => 'Authentifizierung fehlgeschlagen: ${error}';
+			case 'errors.couldNotLaunchUrl': return 'Auth-URL konnte nicht geöffnet werden';
+			case 'errors.pleaseEnterToken': return 'Bitte Token eingeben';
+			case 'errors.invalidToken': return 'Ungültiges Token';
+			case 'errors.failedToVerifyToken': return ({required Object error}) => 'Token-Verifizierung fehlgeschlagen: ${error}';
+			case 'errors.failedToSwitchProfile': return ({required Object displayName}) => 'Profilwechsel zu ${displayName} fehlgeschlagen';
+			case 'libraries.title': return 'Mediatheken';
+			case 'libraries.scanLibraryFiles': return 'Mediatheksdateien scannen';
+			case 'libraries.scanLibrary': return 'Mediathek scannen';
+			case 'libraries.analyze': return 'Analysieren';
+			case 'libraries.analyzeLibrary': return 'Mediathek analysieren';
+			case 'libraries.refreshMetadata': return 'Metadaten aktualisieren';
+			case 'libraries.emptyTrash': return 'Papierkorb leeren';
+			case 'libraries.emptyingTrash': return ({required Object title}) => 'Papierkorb für „${title}“ wird geleert...';
+			case 'libraries.trashEmptied': return ({required Object title}) => 'Papierkorb für „${title}“ geleert';
+			case 'libraries.failedToEmptyTrash': return ({required Object error}) => 'Papierkorb konnte nicht geleert werden: ${error}';
+			case 'libraries.analyzing': return ({required Object title}) => 'Analysiere „${title}“...';
+			case 'libraries.analysisStarted': return ({required Object title}) => 'Analyse gestartet für „${title}“';
+			case 'libraries.failedToAnalyze': return ({required Object error}) => 'Analyse der Mediathek fehlgeschlagen: ${error}';
+			case 'libraries.noLibrariesFound': return 'Keine Mediatheken gefunden';
+			case 'libraries.thisLibraryIsEmpty': return 'Diese Mediathek ist leer';
+			case 'libraries.all': return 'Alle';
+			case 'libraries.clearAll': return 'Alle löschen';
+			case 'libraries.scanLibraryConfirm': return ({required Object title}) => '„${title}“ wirklich scannen?';
+			case 'libraries.analyzeLibraryConfirm': return ({required Object title}) => '„${title}“ wirklich analysieren?';
+			case 'libraries.refreshMetadataConfirm': return ({required Object title}) => 'Metadaten für „${title}“ wirklich aktualisieren?';
+			case 'libraries.emptyTrashConfirm': return ({required Object title}) => 'Papierkorb für „${title}“ wirklich leeren?';
+			case 'libraries.manageLibraries': return 'Mediatheken verwalten';
+			case 'libraries.sort': return 'Sortieren';
+			case 'libraries.sortBy': return 'Sortieren nach';
+			case 'libraries.filters': return 'Filter';
+			case 'libraries.confirmActionMessage': return 'Aktion wirklich durchführen?';
+			case 'libraries.showLibrary': return 'Mediathek anzeigen';
+			case 'libraries.hideLibrary': return 'Mediathek ausblenden';
+			case 'libraries.libraryOptions': return 'Mediatheksoptionen';
+			case 'libraries.content': return 'Bibliotheksinhalt';
+			case 'libraries.selectLibrary': return 'Bibliothek auswählen';
+			case 'libraries.filtersWithCount': return ({required Object count}) => 'Filter (${count})';
+			case 'libraries.noRecommendations': return 'Keine Empfehlungen verfügbar';
+			case 'libraries.noCollections': return 'Keine Sammlungen in dieser Mediathek';
+			case 'libraries.noFoldersFound': return 'Keine Ordner gefunden';
+			case 'libraries.folders': return 'Ordner';
+			case 'libraries.tabs.recommended': return 'Empfohlen';
+			case 'libraries.tabs.browse': return 'Durchsuchen';
+			case 'libraries.tabs.collections': return 'Sammlungen';
+			case 'libraries.tabs.playlists': return 'Wiedergabelisten';
+			case 'libraries.groupings.all': return 'Alle';
+			case 'libraries.groupings.movies': return 'Filme';
+			case 'libraries.groupings.shows': return 'Serien';
+			case 'libraries.groupings.seasons': return 'Staffeln';
+			case 'libraries.groupings.episodes': return 'Episoden';
+			case 'libraries.groupings.folders': return 'Ordner';
+			case 'about.title': return 'Über';
+			case 'about.openSourceLicenses': return 'Open-Source-Lizenzen';
+			case 'about.versionLabel': return ({required Object version}) => 'Version ${version}';
+			case 'about.appDescription': return 'Ein schöner Plex-Client für Flutter';
+			case 'about.viewLicensesDescription': return 'Lizenzen von Drittanbieter-Bibliotheken anzeigen';
+			case 'serverSelection.allServerConnectionsFailed': return 'Verbindung zu allen Servern fehlgeschlagen. Bitte Netzwerk prüfen und erneut versuchen.';
+			case 'serverSelection.noServersFound': return 'Keine Server gefunden';
+			case 'serverSelection.noServersFoundForAccount': return ({required Object username, required Object email}) => 'Keine Server gefunden für ${username} (${email})';
+			case 'serverSelection.failedToLoadServers': return ({required Object error}) => 'Server konnten nicht geladen werden: ${error}';
+			case 'hubDetail.title': return 'Titel';
+			case 'hubDetail.releaseYear': return 'Erscheinungsjahr';
+			case 'hubDetail.dateAdded': return 'Hinzugefügt am';
+			case 'hubDetail.rating': return 'Bewertung';
+			case 'hubDetail.noItemsFound': return 'Keine Elemente gefunden';
+			case 'logs.clearLogs': return 'Protokolle löschen';
+			case 'logs.copyLogs': return 'Protokolle kopieren';
+			case 'logs.error': return 'Fehler:';
+			case 'logs.stackTrace': return 'Stacktrace:';
+			case 'licenses.relatedPackages': return 'Verwandte Pakete';
+			case 'licenses.license': return 'Lizenz';
+			case 'licenses.licenseNumber': return ({required Object number}) => 'Lizenz ${number}';
+			case 'licenses.licensesCount': return ({required Object count}) => '${count} Lizenzen';
+			case 'navigation.home': return 'Start';
+			case 'navigation.search': return 'Suche';
+			case 'navigation.libraries': return 'Mediatheken';
+			case 'navigation.settings': return 'Einstellungen';
+			case 'navigation.downloads': return 'Downloads';
+			case 'downloads.title': return 'Downloads';
+			case 'downloads.manage': return 'Verwalten';
+			case 'downloads.tvShows': return 'Serien';
+			case 'downloads.movies': return 'Filme';
+			case 'downloads.noDownloads': return 'Noch keine Downloads';
+			case 'downloads.noDownloadsDescription': return 'Heruntergeladene Inhalte werden hier für die Offline-Wiedergabe angezeigt';
+			case 'downloads.downloadNow': return 'Herunterladen';
+			case 'downloads.deleteDownload': return 'Download löschen';
+			case 'downloads.retryDownload': return 'Download wiederholen';
+			case 'downloads.downloadQueued': return 'Download in Warteschlange';
+			case 'downloads.episodesQueued': return ({required Object count}) => '${count} Episoden zum Download hinzugefügt';
+			case 'downloads.downloadDeleted': return 'Download gelöscht';
+			case 'downloads.deleteConfirm': return ({required Object title}) => 'Möchtest du "${title}" wirklich löschen? Die heruntergeladene Datei wird von deinem Gerät entfernt.';
+			case 'downloads.deletingWithProgress': return ({required Object title, required Object current, required Object total}) => 'Lösche ${title}... (${current} von ${total})';
+			case 'playlists.title': return 'Wiedergabelisten';
+			case 'playlists.noPlaylists': return 'Keine Wiedergabelisten gefunden';
+			case 'playlists.create': return 'Wiedergabeliste erstellen';
+			case 'playlists.playlistName': return 'Name der Wiedergabeliste';
+			case 'playlists.enterPlaylistName': return 'Name der Wiedergabeliste eingeben';
+			case 'playlists.delete': return 'Wiedergabeliste löschen';
+			case 'playlists.removeItem': return 'Aus Wiedergabeliste entfernen';
+			case 'playlists.smartPlaylist': return 'Intelligente Wiedergabeliste';
+			case 'playlists.itemCount': return ({required Object count}) => '${count} Elemente';
+			case 'playlists.oneItem': return '1 Element';
+			case 'playlists.emptyPlaylist': return 'Diese Wiedergabeliste ist leer';
+			case 'playlists.deleteConfirm': return 'Wiedergabeliste löschen?';
+			case 'playlists.deleteMessage': return ({required Object name}) => 'Soll "${name}" wirklich gelöscht werden?';
+			case 'playlists.created': return 'Wiedergabeliste erstellt';
+			case 'playlists.deleted': return 'Wiedergabeliste gelöscht';
+			case 'playlists.itemAdded': return 'Zur Wiedergabeliste hinzugefügt';
+			case 'playlists.itemRemoved': return 'Aus Wiedergabeliste entfernt';
+			case 'playlists.selectPlaylist': return 'Wiedergabeliste auswählen';
+			case 'playlists.createNewPlaylist': return 'Neue Wiedergabeliste erstellen';
+			case 'playlists.errorCreating': return 'Wiedergabeliste konnte nicht erstellt werden';
+			case 'playlists.errorDeleting': return 'Wiedergabeliste konnte nicht gelöscht werden';
+			case 'playlists.errorLoading': return 'Wiedergabelisten konnten nicht geladen werden';
+			case 'playlists.errorAdding': return 'Konnte nicht zur Wiedergabeliste hinzugefügt werden';
+			case 'playlists.errorReordering': return 'Element der Wiedergabeliste konnte nicht neu geordnet werden';
+			case 'playlists.errorRemoving': return 'Konnte nicht aus der Wiedergabeliste entfernt werden';
+			case 'playlists.playlist': return 'Wiedergabeliste';
+			case 'collections.title': return 'Sammlungen';
+			case 'collections.collection': return 'Sammlung';
+			case 'collections.empty': return 'Sammlung ist leer';
+			case 'collections.unknownLibrarySection': return 'Löschen nicht möglich: Unbekannte Bibliothekssektion';
+			case 'collections.deleteCollection': return 'Sammlung löschen';
+			case 'collections.deleteConfirm': return ({required Object title}) => 'Sind Sie sicher, dass Sie "${title}" löschen möchten? Dies kann nicht rückgängig gemacht werden.';
+			case 'collections.deleted': return 'Sammlung gelöscht';
+			case 'collections.deleteFailed': return 'Sammlung konnte nicht gelöscht werden';
+			case 'collections.deleteFailedWithError': return ({required Object error}) => 'Sammlung konnte nicht gelöscht werden: ${error}';
+			case 'collections.failedToLoadItems': return ({required Object error}) => 'Sammlungselemente konnten nicht geladen werden: ${error}';
+			case 'collections.selectCollection': return 'Sammlung auswählen';
+			case 'collections.createNewCollection': return 'Neue Sammlung erstellen';
+			case 'collections.collectionName': return 'Sammlungsname';
+			case 'collections.enterCollectionName': return 'Sammlungsnamen eingeben';
+			case 'collections.addedToCollection': return 'Zur Sammlung hinzugefügt';
+			case 'collections.errorAddingToCollection': return 'Fehler beim Hinzufügen zur Sammlung';
+			case 'collections.created': return 'Sammlung erstellt';
+			case 'collections.removeFromCollection': return 'Aus Sammlung entfernen';
+			case 'collections.removeFromCollectionConfirm': return ({required Object title}) => '"${title}" aus dieser Sammlung entfernen?';
+			case 'collections.removedFromCollection': return 'Aus Sammlung entfernt';
+			case 'collections.removeFromCollectionFailed': return 'Entfernen aus Sammlung fehlgeschlagen';
+			case 'collections.removeFromCollectionError': return ({required Object error}) => 'Fehler beim Entfernen aus der Sammlung: ${error}';
 			default: return null;
 		}
 	}
@@ -2916,24 +5724,20 @@ extension on _StringsIt {
 			case 'common.submit': return 'Invia';
 			case 'common.confirm': return 'Conferma';
 			case 'common.retry': return 'Riprova';
-			case 'common.playNow': return 'Riproduci ora';
 			case 'common.logout': return 'Disconnetti';
-			case 'common.online': return 'Online';
-			case 'common.offline': return 'Offline';
-			case 'common.owned': return 'Di proprietà';
-			case 'common.shared': return 'Condiviso';
-			case 'common.current': return 'CORRENTE';
 			case 'common.unknown': return 'Sconosciuto';
 			case 'common.refresh': return 'Aggiorna';
 			case 'common.yes': return 'Sì';
 			case 'common.no': return 'No';
-			case 'common.server': return 'Server';
+			case 'common.delete': return 'Elimina';
+			case 'common.shuffle': return 'Casuale';
+			case 'common.addTo': return 'Aggiungi a...';
 			case 'screens.licenses': return 'Licenze';
 			case 'screens.selectServer': return 'Seleziona server';
 			case 'screens.switchProfile': return 'Cambia profilo';
 			case 'screens.subtitleStyling': return 'Stile sottotitoli';
 			case 'screens.search': return 'Cerca';
-			case 'screens.logs': return 'Logs';
+			case 'screens.logs': return 'Registro';
 			case 'update.available': return 'Aggiornamento disponibile';
 			case 'update.versionAvailable': return ({required Object version}) => 'Versione ${version} disponibile';
 			case 'update.currentVersion': return ({required Object version}) => 'Corrente: ${version}';
@@ -2946,7 +5750,6 @@ extension on _StringsIt {
 			case 'settings.theme': return 'Tema';
 			case 'settings.appearance': return 'Aspetto';
 			case 'settings.videoPlayback': return 'Riproduzione video';
-			case 'settings.shufflePlay': return 'Riproduzione casuale';
 			case 'settings.advanced': return 'Avanzate';
 			case 'settings.useSeasonPostersDescription': return 'Mostra il poster della stagione invece del poster della serie per gli episodi';
 			case 'settings.showHeroSectionDescription': return 'Visualizza il carosello dei contenuti in primo piano sulla schermata iniziale';
@@ -2984,15 +5787,13 @@ extension on _StringsIt {
 			case 'settings.secondsUnit': return ({required Object seconds}) => '${seconds} secondi';
 			case 'settings.defaultSleepTimer': return 'Timer spegnimento predefinito';
 			case 'settings.minutesUnit': return ({required Object minutes}) => '${minutes} minuti';
-			case 'settings.unwatchedOnly': return 'Solo non guardati';
-			case 'settings.unwatchedOnlyDescription': return 'Includi solo gli episodi non guardati nella coda di riproduzione casuale';
-			case 'settings.shuffleOrderNavigation': return 'Navigazione in ordine casuale';
-			case 'settings.shuffleOrderNavigationDescription': return 'I pulsanti Avanti/Indietro seguono l\'ordine casuale';
-			case 'settings.loopShuffleQueue': return 'Coda di riproduzione casuale in loop';
-			case 'settings.loopShuffleQueueDescription': return 'Riavvia la coda quando raggiungi la fine';
+			case 'settings.rememberTrackSelections': return 'Ricorda selezioni tracce per serie/film';
+			case 'settings.rememberTrackSelectionsDescription': return 'Salva automaticamente le preferenze delle lingue audio e sottotitoli quando cambi tracce durante la riproduzione';
 			case 'settings.videoPlayerControls': return 'Controlli del lettore video';
 			case 'settings.keyboardShortcuts': return 'Scorciatoie da tastiera';
 			case 'settings.keyboardShortcutsDescription': return 'Personalizza le scorciatoie da tastiera';
+			case 'settings.videoPlayerNavigation': return 'Navigazione del lettore video';
+			case 'settings.videoPlayerNavigationDescription': return 'Usa i tasti freccia per navigare nei controlli del lettore video';
 			case 'settings.debugLogging': return 'Log di debug';
 			case 'settings.debugLoggingDescription': return 'Abilita il logging dettagliato per la risoluzione dei problemi';
 			case 'settings.viewLogs': return 'Visualizza log';
@@ -3013,6 +5814,27 @@ extension on _StringsIt {
 			case 'settings.validationErrorDuration': return ({required Object min, required Object max, required Object unit}) => 'la durata deve essere compresa tra ${min} e ${max} ${unit}';
 			case 'settings.shortcutAlreadyAssigned': return ({required Object action}) => 'Scorciatoia già assegnata a ${action}';
 			case 'settings.shortcutUpdated': return ({required Object action}) => 'Scorciatoia aggiornata per ${action}';
+			case 'settings.autoSkip': return 'Salto Automatico';
+			case 'settings.autoSkipIntro': return 'Salta Intro Automaticamente';
+			case 'settings.autoSkipIntroDescription': return 'Salta automaticamente i marcatori dell\'intro dopo alcuni secondi';
+			case 'settings.autoSkipCredits': return 'Salta Crediti Automaticamente';
+			case 'settings.autoSkipCreditsDescription': return 'Salta automaticamente i crediti e riproduci l\'episodio successivo';
+			case 'settings.autoSkipDelay': return 'Ritardo Salto Automatico';
+			case 'settings.autoSkipDelayDescription': return ({required Object seconds}) => 'Aspetta ${seconds} secondi prima del salto automatico';
+			case 'settings.downloads': return 'Download';
+			case 'settings.downloadLocationDescription': return 'Scegli dove salvare i contenuti scaricati';
+			case 'settings.downloadLocationDefault': return 'Predefinita (Archiviazione App)';
+			case 'settings.downloadLocationCustom': return 'Posizione Personalizzata';
+			case 'settings.selectFolder': return 'Seleziona Cartella';
+			case 'settings.resetToDefault': return 'Ripristina Predefinita';
+			case 'settings.currentPath': return ({required Object path}) => 'Corrente: ${path}';
+			case 'settings.downloadLocationChanged': return 'Posizione di download modificata';
+			case 'settings.downloadLocationReset': return 'Posizione di download ripristinata a predefinita';
+			case 'settings.downloadLocationInvalid': return 'La cartella selezionata non è scrivibile';
+			case 'settings.downloadLocationSelectError': return 'Impossibile selezionare la cartella';
+			case 'settings.downloadOnWifiOnly': return 'Scarica solo con WiFi';
+			case 'settings.downloadOnWifiOnlyDescription': return 'Impedisci i download quando si utilizza la rete dati cellulare';
+			case 'settings.cellularDownloadBlocked': return 'I download sono disabilitati sulla rete dati cellulare. Connettiti al WiFi o modifica l\'impostazione.';
 			case 'search.hint': return 'Cerca film. spettacoli, musica...';
 			case 'search.tryDifferentTerm': return 'Prova altri termini di ricerca';
 			case 'search.searchYourMedia': return 'Cerca nei tuoi media';
@@ -3052,6 +5874,14 @@ extension on _StringsIt {
 			case 'mediaMenu.goToSeason': return 'Vai alla stagione';
 			case 'mediaMenu.shufflePlay': return 'Riproduzione casuale';
 			case 'mediaMenu.fileInfo': return 'Info sul file';
+			case 'accessibility.mediaCardMovie': return ({required Object title}) => '${title}, film';
+			case 'accessibility.mediaCardShow': return ({required Object title}) => '${title}, serie TV';
+			case 'accessibility.mediaCardEpisode': return ({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+			case 'accessibility.mediaCardSeason': return ({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+			case 'accessibility.mediaCardWatched': return 'visto';
+			case 'accessibility.mediaCardPartiallyWatched': return ({required Object percent}) => '${percent} percento visto';
+			case 'accessibility.mediaCardUnwatched': return 'non visto';
+			case 'accessibility.tapToPlay': return 'Tocca per riprodurre';
 			case 'tooltips.shufflePlay': return 'Riproduzione casuale';
 			case 'tooltips.markAsWatched': return 'Segna come visto';
 			case 'tooltips.markAsUnwatched': return 'Segna come non visto';
@@ -3062,17 +5892,46 @@ extension on _StringsIt {
 			case 'videoControls.minusTime': return ({required Object amount, required Object unit}) => '-${amount}${unit}';
 			case 'videoControls.playsLater': return ({required Object label}) => '${label} riprodotto dopo';
 			case 'videoControls.playsEarlier': return ({required Object label}) => '${label} riprodotto prima';
-			case 'videoControls.noOffset': return 'No offset';
+			case 'videoControls.noOffset': return 'Nessun offset';
 			case 'videoControls.letterbox': return 'Letterbox';
 			case 'videoControls.fillScreen': return 'Riempi schermo';
 			case 'videoControls.stretch': return 'Allunga';
 			case 'videoControls.lockRotation': return 'Blocca rotazione';
 			case 'videoControls.unlockRotation': return 'Sblocca rotazione';
+			case 'videoControls.sleepTimer': return 'Timer di spegnimento';
+			case 'videoControls.timerActive': return 'Timer attivo';
+			case 'videoControls.playbackWillPauseIn': return ({required Object duration}) => 'La riproduzione si interromperà tra ${duration}';
+			case 'videoControls.sleepTimerCompleted': return 'Timer di spegnimento completato - riproduzione in pausa';
+			case 'videoControls.playButton': return 'Riproduci';
+			case 'videoControls.pauseButton': return 'Pausa';
+			case 'videoControls.seekBackwardButton': return ({required Object seconds}) => 'Riavvolgi di ${seconds} secondi';
+			case 'videoControls.seekForwardButton': return ({required Object seconds}) => 'Avanza di ${seconds} secondi';
+			case 'videoControls.previousButton': return 'Episodio precedente';
+			case 'videoControls.nextButton': return 'Episodio successivo';
+			case 'videoControls.previousChapterButton': return 'Capitolo precedente';
+			case 'videoControls.nextChapterButton': return 'Capitolo successivo';
+			case 'videoControls.muteButton': return 'Silenzia';
+			case 'videoControls.unmuteButton': return 'Riattiva audio';
+			case 'videoControls.settingsButton': return 'Impostazioni video';
+			case 'videoControls.audioTrackButton': return 'Tracce audio';
+			case 'videoControls.subtitlesButton': return 'Sottotitoli';
+			case 'videoControls.chaptersButton': return 'Capitoli';
+			case 'videoControls.versionsButton': return 'Versioni video';
+			case 'videoControls.aspectRatioButton': return 'Proporzioni';
+			case 'videoControls.fullscreenButton': return 'Attiva schermo intero';
+			case 'videoControls.exitFullscreenButton': return 'Esci da schermo intero';
+			case 'videoControls.rotationLockButton': return 'Blocco rotazione';
+			case 'videoControls.timelineSlider': return 'Timeline video';
+			case 'videoControls.volumeSlider': return 'Livello volume';
+			case 'videoControls.backButton': return 'Indietro';
 			case 'userStatus.admin': return 'Admin';
 			case 'userStatus.restricted': return 'Limitato';
 			case 'userStatus.protected': return 'Protetto';
+			case 'userStatus.current': return 'ATTUALE';
 			case 'messages.markedAsWatched': return 'Segna come visto';
 			case 'messages.markedAsUnwatched': return 'Segna come non visto';
+			case 'messages.markedAsWatchedOffline': return 'Segnato come visto (sincronizzato online)';
+			case 'messages.markedAsUnwatchedOffline': return 'Segnato come non visto (sincronizzato online)';
 			case 'messages.removedFromContinueWatching': return 'Rimosso da Continua a guardare';
 			case 'messages.errorLoading': return ({required Object error}) => 'Errore: ${error}';
 			case 'messages.fileInfoNotAvailable': return 'Informazioni sul file non disponibili';
@@ -3089,15 +5948,18 @@ extension on _StringsIt {
 			case 'messages.metadataRefreshing': return ({required Object title}) => 'Aggiornamento metadati per "${title}"...';
 			case 'messages.metadataRefreshStarted': return ({required Object title}) => 'Aggiornamento metadati per "${title}"';
 			case 'messages.metadataRefreshFailed': return ({required Object error}) => 'Errore aggiornamento metadati: ${error}';
-			case 'messages.noPlexToken': return 'Nessun token Plex trovato. Riesegui l\'accesso.';
 			case 'messages.logoutConfirm': return 'Sei sicuro di volerti disconnettere?';
 			case 'messages.noSeasonsFound': return 'Nessuna stagione trovata';
 			case 'messages.noEpisodesFound': return 'Nessun episodio trovato nella prima stagione';
 			case 'messages.noEpisodesFoundGeneral': return 'Nessun episodio trovato';
 			case 'messages.noResultsFound': return 'Nessun risultato';
 			case 'messages.sleepTimerSet': return ({required Object label}) => 'Imposta timer spegnimento per ${label}';
-			case 'messages.failedToSwitchProfile': return ({required Object displayName}) => 'Impossibile passare a ${displayName}';
-			case 'profile.noUsersAvailable': return 'Nessun utente disponibile';
+			case 'messages.noItemsAvailable': return 'Nessun elemento disponibile';
+			case 'messages.failedToCreatePlayQueue': return 'Impossibile creare la coda di riproduzione';
+			case 'messages.failedToCreatePlayQueueNoItems': return 'Impossibile creare la coda di riproduzione - nessun elemento';
+			case 'messages.failedPlayback': return ({required Object action, required Object error}) => 'Impossibile ${action}: ${error}';
+			case 'messages.youAreOffline': return 'Sei offline';
+			case 'messages.offlineFeatureUnavailable': return 'Questa funzione richiede una connessione internet. I tuoi download e le impostazioni sono ancora disponibili.';
 			case 'subtitlingStyling.stylingOptions': return 'Opzioni stile';
 			case 'subtitlingStyling.fontSize': return 'Dimensione';
 			case 'subtitlingStyling.textColor': return 'Colore testo';
@@ -3106,24 +5968,24 @@ extension on _StringsIt {
 			case 'subtitlingStyling.backgroundOpacity': return 'Opacità sfondo';
 			case 'subtitlingStyling.backgroundColor': return 'Colore sfondo';
 			case 'dialog.confirmAction': return 'Conferma azione';
-			case 'dialog.areYouSure': return 'Sei sicuro di voler eseguire questa azione?';
 			case 'dialog.cancel': return 'Cancella';
 			case 'dialog.playNow': return 'Riproduci ora';
-			case 'discover.title': return 'Discover';
+			case 'discover.title': return 'Esplora';
 			case 'discover.switchProfile': return 'Cambia profilo';
 			case 'discover.switchServer': return 'Cambia server';
 			case 'discover.logout': return 'Disconnetti';
 			case 'discover.noContentAvailable': return 'Nessun contenuto disponibile';
 			case 'discover.addMediaToLibraries': return 'Aggiungi alcuni file multimediali alle tue librerie';
 			case 'discover.continueWatching': return 'Continua a guardare';
-			case 'discover.recentlyAdded': return 'Aggiunti di recente';
 			case 'discover.play': return 'Riproduci';
-			case 'discover.resume': return 'Riprendi';
-			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'Riproduci S${season}, E${episode}';
-			case 'discover.resumeEpisode': return ({required Object season, required Object episode}) => 'Riprendi S${season}, E${episode}';
+			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'S${season}E${episode}';
 			case 'discover.pause': return 'Pausa';
 			case 'discover.overview': return 'Panoramica';
-			case 'discover.cast': return 'Cast';
+			case 'discover.cast': return 'Attori';
+			case 'discover.seasons': return 'Stagioni';
+			case 'discover.studio': return 'Studio';
+			case 'discover.rating': return 'Classificazione';
+			case 'discover.watched': return 'Guardato';
 			case 'discover.episodeCount': return ({required Object count}) => '${count} episodi';
 			case 'discover.watchedProgress': return ({required Object watched, required Object total}) => '${watched}/${total} guardati';
 			case 'discover.movie': return 'Film';
@@ -3140,7 +6002,6 @@ extension on _StringsIt {
 			case 'errors.invalidToken': return 'Token non valido';
 			case 'errors.failedToVerifyToken': return ({required Object error}) => 'Verifica token fallita: ${error}';
 			case 'errors.failedToSwitchProfile': return ({required Object displayName}) => 'Impossibile passare a ${displayName}';
-			case 'errors.connectionFailedGeneric': return 'Connessione fallita';
 			case 'libraries.title': return 'Librerie';
 			case 'libraries.scanLibraryFiles': return 'Scansiona file libreria';
 			case 'libraries.scanLibrary': return 'Scansiona libreria';
@@ -3166,38 +6027,43 @@ extension on _StringsIt {
 			case 'libraries.sort': return 'Ordina';
 			case 'libraries.sortBy': return 'Ordina per';
 			case 'libraries.filters': return 'Filtri';
-			case 'libraries.loadingLibraryWithCount': return ({required Object count}) => 'Caricamento librerie... (${count} oggetti caricati)';
 			case 'libraries.confirmActionMessage': return 'Sei sicuro di voler eseguire questa azione?';
 			case 'libraries.showLibrary': return 'Mostra libreria';
 			case 'libraries.hideLibrary': return 'Nascondi libreria';
 			case 'libraries.libraryOptions': return 'Opzioni libreria';
+			case 'libraries.content': return 'contenuto della libreria';
+			case 'libraries.selectLibrary': return 'Seleziona libreria';
+			case 'libraries.filtersWithCount': return ({required Object count}) => 'Filtri (${count})';
+			case 'libraries.noRecommendations': return 'Nessun consiglio disponibile';
+			case 'libraries.noCollections': return 'Nessuna raccolta in questa libreria';
+			case 'libraries.noFoldersFound': return 'Nessuna cartella trovata';
+			case 'libraries.folders': return 'cartelle';
+			case 'libraries.tabs.recommended': return 'Consigliati';
+			case 'libraries.tabs.browse': return 'Esplora';
+			case 'libraries.tabs.collections': return 'Raccolte';
+			case 'libraries.tabs.playlists': return 'Playlist';
+			case 'libraries.groupings.all': return 'Tutti';
+			case 'libraries.groupings.movies': return 'Film';
+			case 'libraries.groupings.shows': return 'Serie TV';
+			case 'libraries.groupings.seasons': return 'Stagioni';
+			case 'libraries.groupings.episodes': return 'Episodi';
+			case 'libraries.groupings.folders': return 'Cartelle';
 			case 'about.title': return 'Informazioni';
 			case 'about.openSourceLicenses': return 'Licenze Open Source';
 			case 'about.versionLabel': return ({required Object version}) => 'Versione ${version}';
 			case 'about.appDescription': return 'Un bellissimo client Plex per Flutter';
 			case 'about.viewLicensesDescription': return 'Visualizza le licenze delle librerie di terze parti';
-			case 'serverSelection.connectingToServer': return 'Connessione al server...';
-			case 'serverSelection.serverDebugCopied': return 'Dati di debug del server copiati negli appunti';
-			case 'serverSelection.copyDebugData': return 'Copia dati di debug';
+			case 'serverSelection.allServerConnectionsFailed': return 'Impossibile connettersi a nessun server. Controlla la tua rete e riprova.';
 			case 'serverSelection.noServersFound': return 'Nessun server trovato';
-			case 'serverSelection.malformedServerData': return ({required Object count}) => 'Trovato ${count} server con dati difettosi. Nessun server valido disponibile.';
-			case 'serverSelection.incompleteServerInfo': return 'Alcuni server presentano informazioni incomplete e sono stati ignorati. Controlla il tuo account Plex.tv.';
-			case 'serverSelection.incompleteConnectionInfo': return 'Le informazioni di connessione al server sono incomplete. Riprova.';
-			case 'serverSelection.malformedServerInfo': return ({required Object message}) => 'Le informazioni sul server sono errate: ${message}';
-			case 'serverSelection.networkConnectionFailed': return 'Connessione di rete non riuscita. Controlla la tua connessione Internet e riprova.';
-			case 'serverSelection.authenticationFailed': return 'Autenticazione fallita. Effettua nuovamente l\'accesso.';
-			case 'serverSelection.plexServiceUnavailable': return 'Servizio Plex non disponibile. Riprova più tardi.';
+			case 'serverSelection.noServersFoundForAccount': return ({required Object username, required Object email}) => 'Nessun server trovato per ${username} (${email})';
 			case 'serverSelection.failedToLoadServers': return ({required Object error}) => 'Impossibile caricare i server: ${error}';
 			case 'hubDetail.title': return 'Titolo';
 			case 'hubDetail.releaseYear': return 'Anno rilascio';
 			case 'hubDetail.dateAdded': return 'Data aggiunta';
 			case 'hubDetail.rating': return 'Valutazione';
 			case 'hubDetail.noItemsFound': return 'Nessun elemento trovato';
-			case 'logs.title': return 'Log';
 			case 'logs.clearLogs': return 'Cancella log';
 			case 'logs.copyLogs': return 'Copia log';
-			case 'logs.exportLogs': return 'Esporta log';
-			case 'logs.noLogsToShow': return 'Nessun log da mostrare';
 			case 'logs.error': return 'Errore:';
 			case 'logs.stackTrace': return 'Traccia dello stack:';
 			case 'licenses.relatedPackages': return 'Pacchetti correlati';
@@ -3208,6 +6074,69 @@ extension on _StringsIt {
 			case 'navigation.search': return 'Cerca';
 			case 'navigation.libraries': return 'Librerie';
 			case 'navigation.settings': return 'Impostazioni';
+			case 'navigation.downloads': return 'Download';
+			case 'downloads.title': return 'Download';
+			case 'downloads.manage': return 'Gestisci';
+			case 'downloads.tvShows': return 'Serie TV';
+			case 'downloads.movies': return 'Film';
+			case 'downloads.noDownloads': return 'Nessun download';
+			case 'downloads.noDownloadsDescription': return 'I contenuti scaricati appariranno qui per la visualizzazione offline';
+			case 'downloads.downloadNow': return 'Scarica';
+			case 'downloads.deleteDownload': return 'Elimina download';
+			case 'downloads.retryDownload': return 'Riprova download';
+			case 'downloads.downloadQueued': return 'Download in coda';
+			case 'downloads.episodesQueued': return ({required Object count}) => '${count} episodi in coda per il download';
+			case 'downloads.downloadDeleted': return 'Download eliminato';
+			case 'downloads.deleteConfirm': return ({required Object title}) => 'Sei sicuro di voler eliminare "${title}"? Il file scaricato verrà rimosso dal tuo dispositivo.';
+			case 'downloads.deletingWithProgress': return ({required Object title, required Object current, required Object total}) => 'Eliminazione di ${title}... (${current} di ${total})';
+			case 'playlists.title': return 'Playlist';
+			case 'playlists.noPlaylists': return 'Nessuna playlist trovata';
+			case 'playlists.create': return 'Crea playlist';
+			case 'playlists.playlistName': return 'Nome playlist';
+			case 'playlists.enterPlaylistName': return 'Inserisci nome playlist';
+			case 'playlists.delete': return 'Elimina playlist';
+			case 'playlists.removeItem': return 'Rimuovi da playlist';
+			case 'playlists.smartPlaylist': return 'Playlist intelligente';
+			case 'playlists.itemCount': return ({required Object count}) => '${count} elementi';
+			case 'playlists.oneItem': return '1 elemento';
+			case 'playlists.emptyPlaylist': return 'Questa playlist è vuota';
+			case 'playlists.deleteConfirm': return 'Eliminare playlist?';
+			case 'playlists.deleteMessage': return ({required Object name}) => 'Sei sicuro di voler eliminare "${name}"?';
+			case 'playlists.created': return 'Playlist creata';
+			case 'playlists.deleted': return 'Playlist eliminata';
+			case 'playlists.itemAdded': return 'Aggiunto alla playlist';
+			case 'playlists.itemRemoved': return 'Rimosso dalla playlist';
+			case 'playlists.selectPlaylist': return 'Seleziona playlist';
+			case 'playlists.createNewPlaylist': return 'Crea nuova playlist';
+			case 'playlists.errorCreating': return 'Errore durante la creazione della playlist';
+			case 'playlists.errorDeleting': return 'Errore durante l\'eliminazione della playlist';
+			case 'playlists.errorLoading': return 'Errore durante il caricamento delle playlist';
+			case 'playlists.errorAdding': return 'Errore durante l\'aggiunta alla playlist';
+			case 'playlists.errorReordering': return 'Errore durante il riordino dell\'elemento della playlist';
+			case 'playlists.errorRemoving': return 'Errore durante la rimozione dalla playlist';
+			case 'playlists.playlist': return 'Playlist';
+			case 'collections.title': return 'Raccolte';
+			case 'collections.collection': return 'Raccolta';
+			case 'collections.empty': return 'La raccolta è vuota';
+			case 'collections.unknownLibrarySection': return 'Impossibile eliminare: sezione libreria sconosciuta';
+			case 'collections.deleteCollection': return 'Elimina raccolta';
+			case 'collections.deleteConfirm': return ({required Object title}) => 'Sei sicuro di voler eliminare "${title}"? Questa azione non può essere annullata.';
+			case 'collections.deleted': return 'Raccolta eliminata';
+			case 'collections.deleteFailed': return 'Impossibile eliminare la raccolta';
+			case 'collections.deleteFailedWithError': return ({required Object error}) => 'Impossibile eliminare la raccolta: ${error}';
+			case 'collections.failedToLoadItems': return ({required Object error}) => 'Impossibile caricare gli elementi della raccolta: ${error}';
+			case 'collections.selectCollection': return 'Seleziona raccolta';
+			case 'collections.createNewCollection': return 'Crea nuova raccolta';
+			case 'collections.collectionName': return 'Nome raccolta';
+			case 'collections.enterCollectionName': return 'Inserisci nome raccolta';
+			case 'collections.addedToCollection': return 'Aggiunto alla raccolta';
+			case 'collections.errorAddingToCollection': return 'Errore nell\'aggiunta alla raccolta';
+			case 'collections.created': return 'Raccolta creata';
+			case 'collections.removeFromCollection': return 'Rimuovi dalla raccolta';
+			case 'collections.removeFromCollectionConfirm': return ({required Object title}) => 'Rimuovere "${title}" da questa raccolta?';
+			case 'collections.removedFromCollection': return 'Rimosso dalla raccolta';
+			case 'collections.removeFromCollectionFailed': return 'Impossibile rimuovere dalla raccolta';
+			case 'collections.removeFromCollectionError': return ({required Object error}) => 'Errore durante la rimozione dalla raccolta: ${error}';
 			default: return null;
 		}
 	}
@@ -3224,7 +6153,7 @@ extension on _StringsNl {
 			case 'auth.authenticate': return 'Authenticeren';
 			case 'auth.retry': return 'Opnieuw proberen';
 			case 'auth.debugEnterToken': return 'Debug: Voer Plex Token in';
-			case 'auth.plexTokenLabel': return 'Plex Auth Token';
+			case 'auth.plexTokenLabel': return 'Plex Authenticatietoken';
 			case 'auth.plexTokenHint': return 'Voer je Plex.tv token in';
 			case 'auth.authenticationTimeout': return 'Authenticatie verlopen. Probeer opnieuw.';
 			case 'auth.scanQRCodeInstruction': return 'Scan deze QR-code met een apparaat dat is ingelogd op Plex om te authenticeren.';
@@ -3238,24 +6167,20 @@ extension on _StringsNl {
 			case 'common.submit': return 'Verzenden';
 			case 'common.confirm': return 'Bevestigen';
 			case 'common.retry': return 'Opnieuw proberen';
-			case 'common.playNow': return 'Nu afspelen';
 			case 'common.logout': return 'Uitloggen';
-			case 'common.online': return 'Online';
-			case 'common.offline': return 'Offline';
-			case 'common.owned': return 'Eigendom';
-			case 'common.shared': return 'Gedeeld';
-			case 'common.current': return 'HUIDIG';
 			case 'common.unknown': return 'Onbekend';
 			case 'common.refresh': return 'Vernieuwen';
 			case 'common.yes': return 'Ja';
 			case 'common.no': return 'Nee';
-			case 'common.server': return 'Server';
+			case 'common.delete': return 'Verwijderen';
+			case 'common.shuffle': return 'Willekeurig';
+			case 'common.addTo': return 'Toevoegen aan...';
 			case 'screens.licenses': return 'Licenties';
 			case 'screens.selectServer': return 'Selecteer server';
 			case 'screens.switchProfile': return 'Wissel van profiel';
 			case 'screens.subtitleStyling': return 'Ondertitel opmaak';
 			case 'screens.search': return 'Zoeken';
-			case 'screens.logs': return 'Logs';
+			case 'screens.logs': return 'Logbestanden';
 			case 'update.available': return 'Update beschikbaar';
 			case 'update.versionAvailable': return ({required Object version}) => 'Versie ${version} is beschikbaar';
 			case 'update.currentVersion': return ({required Object version}) => 'Huidig: ${version}';
@@ -3268,7 +6193,6 @@ extension on _StringsNl {
 			case 'settings.theme': return 'Thema';
 			case 'settings.appearance': return 'Uiterlijk';
 			case 'settings.videoPlayback': return 'Video afspelen';
-			case 'settings.shufflePlay': return 'Willekeurig afspelen';
 			case 'settings.advanced': return 'Geavanceerd';
 			case 'settings.useSeasonPostersDescription': return 'Toon seizoenposter in plaats van serieposter voor afleveringen';
 			case 'settings.showHeroSectionDescription': return 'Toon uitgelichte inhoud carrousel op startscherm';
@@ -3306,15 +6230,13 @@ extension on _StringsNl {
 			case 'settings.secondsUnit': return ({required Object seconds}) => '${seconds} seconden';
 			case 'settings.defaultSleepTimer': return 'Standaard slaap timer';
 			case 'settings.minutesUnit': return ({required Object minutes}) => 'bij ${minutes} minuten';
-			case 'settings.unwatchedOnly': return 'Alleen ongekeken';
-			case 'settings.unwatchedOnlyDescription': return 'Alleen ongekeken afleveringen opnemen in willekeurige wachtrij';
-			case 'settings.shuffleOrderNavigation': return 'Willekeurige volgorde navigatie';
-			case 'settings.shuffleOrderNavigationDescription': return 'Volgende/vorige knoppen volgen willekeurige volgorde';
-			case 'settings.loopShuffleQueue': return 'Herhaal willekeurige wachtrij';
-			case 'settings.loopShuffleQueueDescription': return 'Start wachtrij opnieuw bij het einde';
+			case 'settings.rememberTrackSelections': return 'Onthoud track selecties per serie/film';
+			case 'settings.rememberTrackSelectionsDescription': return 'Bewaar automatisch audio- en ondertiteltaalvoorkeuren wanneer je tracks wijzigt tijdens afspelen';
 			case 'settings.videoPlayerControls': return 'Videospeler bediening';
 			case 'settings.keyboardShortcuts': return 'Toetsenbord sneltoetsen';
 			case 'settings.keyboardShortcutsDescription': return 'Pas toetsenbord sneltoetsen aan';
+			case 'settings.videoPlayerNavigation': return 'Videospeler navigatie';
+			case 'settings.videoPlayerNavigationDescription': return 'Gebruik pijltjestoetsen om door de videospeler bediening te navigeren';
 			case 'settings.debugLogging': return 'Debug logging';
 			case 'settings.debugLoggingDescription': return 'Schakel gedetailleerde logging in voor probleemoplossing';
 			case 'settings.viewLogs': return 'Bekijk logs';
@@ -3335,6 +6257,27 @@ extension on _StringsNl {
 			case 'settings.validationErrorDuration': return ({required Object min, required Object max, required Object unit}) => 'Duur moet tussen ${min} en ${max} ${unit} zijn';
 			case 'settings.shortcutAlreadyAssigned': return ({required Object action}) => 'Sneltoets al toegewezen aan ${action}';
 			case 'settings.shortcutUpdated': return ({required Object action}) => 'Sneltoets bijgewerkt voor ${action}';
+			case 'settings.autoSkip': return 'Automatisch Overslaan';
+			case 'settings.autoSkipIntro': return 'Intro Automatisch Overslaan';
+			case 'settings.autoSkipIntroDescription': return 'Intro-markeringen na enkele seconden automatisch overslaan';
+			case 'settings.autoSkipCredits': return 'Credits Automatisch Overslaan';
+			case 'settings.autoSkipCreditsDescription': return 'Credits automatisch overslaan en volgende aflevering afspelen';
+			case 'settings.autoSkipDelay': return 'Vertraging Automatisch Overslaan';
+			case 'settings.autoSkipDelayDescription': return ({required Object seconds}) => '${seconds} seconden wachten voor automatisch overslaan';
+			case 'settings.downloads': return 'Downloads';
+			case 'settings.downloadLocationDescription': return 'Kies waar gedownloade content wordt opgeslagen';
+			case 'settings.downloadLocationDefault': return 'Standaard (App-opslag)';
+			case 'settings.downloadLocationCustom': return 'Aangepaste Locatie';
+			case 'settings.selectFolder': return 'Selecteer Map';
+			case 'settings.resetToDefault': return 'Herstel naar Standaard';
+			case 'settings.currentPath': return ({required Object path}) => 'Huidig: ${path}';
+			case 'settings.downloadLocationChanged': return 'Downloadlocatie gewijzigd';
+			case 'settings.downloadLocationReset': return 'Downloadlocatie hersteld naar standaard';
+			case 'settings.downloadLocationInvalid': return 'Geselecteerde map is niet beschrijfbaar';
+			case 'settings.downloadLocationSelectError': return 'Kan map niet selecteren';
+			case 'settings.downloadOnWifiOnly': return 'Alleen via WiFi downloaden';
+			case 'settings.downloadOnWifiOnlyDescription': return 'Voorkom downloads bij gebruik van mobiele data';
+			case 'settings.cellularDownloadBlocked': return 'Downloads zijn uitgeschakeld bij mobiele data. Maak verbinding met WiFi of wijzig de instelling.';
 			case 'search.hint': return 'Zoek films, series, muziek...';
 			case 'search.tryDifferentTerm': return 'Probeer een andere zoekterm';
 			case 'search.searchYourMedia': return 'Zoek in je media';
@@ -3374,6 +6317,14 @@ extension on _StringsNl {
 			case 'mediaMenu.goToSeason': return 'Ga naar seizoen';
 			case 'mediaMenu.shufflePlay': return 'Willekeurig afspelen';
 			case 'mediaMenu.fileInfo': return 'Bestand info';
+			case 'accessibility.mediaCardMovie': return ({required Object title}) => '${title}, film';
+			case 'accessibility.mediaCardShow': return ({required Object title}) => '${title}, TV-serie';
+			case 'accessibility.mediaCardEpisode': return ({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+			case 'accessibility.mediaCardSeason': return ({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+			case 'accessibility.mediaCardWatched': return 'bekeken';
+			case 'accessibility.mediaCardPartiallyWatched': return ({required Object percent}) => '${percent} procent bekeken';
+			case 'accessibility.mediaCardUnwatched': return 'niet bekeken';
+			case 'accessibility.tapToPlay': return 'Tik om af te spelen';
 			case 'tooltips.shufflePlay': return 'Willekeurig afspelen';
 			case 'tooltips.markAsWatched': return 'Markeer als gekeken';
 			case 'tooltips.markAsUnwatched': return 'Markeer als ongekeken';
@@ -3390,11 +6341,40 @@ extension on _StringsNl {
 			case 'videoControls.stretch': return 'Uitrekken';
 			case 'videoControls.lockRotation': return 'Vergrendel rotatie';
 			case 'videoControls.unlockRotation': return 'Ontgrendel rotatie';
+			case 'videoControls.sleepTimer': return 'Slaaptimer';
+			case 'videoControls.timerActive': return 'Timer actief';
+			case 'videoControls.playbackWillPauseIn': return ({required Object duration}) => 'Afspelen wordt gepauzeerd over ${duration}';
+			case 'videoControls.sleepTimerCompleted': return 'Slaaptimer voltooid - afspelen gepauzeerd';
+			case 'videoControls.playButton': return 'Afspelen';
+			case 'videoControls.pauseButton': return 'Pauzeren';
+			case 'videoControls.seekBackwardButton': return ({required Object seconds}) => 'Terugspoelen ${seconds} seconden';
+			case 'videoControls.seekForwardButton': return ({required Object seconds}) => 'Vooruitspoelen ${seconds} seconden';
+			case 'videoControls.previousButton': return 'Vorige aflevering';
+			case 'videoControls.nextButton': return 'Volgende aflevering';
+			case 'videoControls.previousChapterButton': return 'Vorig hoofdstuk';
+			case 'videoControls.nextChapterButton': return 'Volgend hoofdstuk';
+			case 'videoControls.muteButton': return 'Dempen';
+			case 'videoControls.unmuteButton': return 'Dempen opheffen';
+			case 'videoControls.settingsButton': return 'Video-instellingen';
+			case 'videoControls.audioTrackButton': return 'Audiosporen';
+			case 'videoControls.subtitlesButton': return 'Ondertitels';
+			case 'videoControls.chaptersButton': return 'Hoofdstukken';
+			case 'videoControls.versionsButton': return 'Videoversies';
+			case 'videoControls.aspectRatioButton': return 'Beeldverhouding';
+			case 'videoControls.fullscreenButton': return 'Volledig scherm activeren';
+			case 'videoControls.exitFullscreenButton': return 'Volledig scherm verlaten';
+			case 'videoControls.rotationLockButton': return 'Rotatievergrendeling';
+			case 'videoControls.timelineSlider': return 'Videotijdlijn';
+			case 'videoControls.volumeSlider': return 'Volumeniveau';
+			case 'videoControls.backButton': return 'Terug';
 			case 'userStatus.admin': return 'Beheerder';
 			case 'userStatus.restricted': return 'Beperkt';
 			case 'userStatus.protected': return 'Beschermd';
+			case 'userStatus.current': return 'HUIDIG';
 			case 'messages.markedAsWatched': return 'Gemarkeerd als gekeken';
 			case 'messages.markedAsUnwatched': return 'Gemarkeerd als ongekeken';
+			case 'messages.markedAsWatchedOffline': return 'Gemarkeerd als gekeken (sync wanneer online)';
+			case 'messages.markedAsUnwatchedOffline': return 'Gemarkeerd als ongekeken (sync wanneer online)';
 			case 'messages.removedFromContinueWatching': return 'Verwijderd uit Doorgaan met kijken';
 			case 'messages.errorLoading': return ({required Object error}) => 'Fout: ${error}';
 			case 'messages.fileInfoNotAvailable': return 'Bestand informatie niet beschikbaar';
@@ -3411,15 +6391,18 @@ extension on _StringsNl {
 			case 'messages.metadataRefreshing': return ({required Object title}) => 'Metadata vernieuwen voor "${title}"...';
 			case 'messages.metadataRefreshStarted': return ({required Object title}) => 'Metadata vernieuwen gestart voor "${title}"';
 			case 'messages.metadataRefreshFailed': return ({required Object error}) => 'Kon metadata niet vernieuwen: ${error}';
-			case 'messages.noPlexToken': return 'Geen Plex token gevonden. Log opnieuw in.';
 			case 'messages.logoutConfirm': return 'Weet je zeker dat je wilt uitloggen?';
 			case 'messages.noSeasonsFound': return 'Geen seizoenen gevonden';
 			case 'messages.noEpisodesFound': return 'Geen afleveringen gevonden in eerste seizoen';
 			case 'messages.noEpisodesFoundGeneral': return 'Geen afleveringen gevonden';
 			case 'messages.noResultsFound': return 'Geen resultaten gevonden';
 			case 'messages.sleepTimerSet': return ({required Object label}) => 'Slaap timer ingesteld voor ${label}';
-			case 'messages.failedToSwitchProfile': return ({required Object displayName}) => 'Kon niet wisselen naar ${displayName}';
-			case 'profile.noUsersAvailable': return 'Geen gebruikers beschikbaar';
+			case 'messages.noItemsAvailable': return 'Geen items beschikbaar';
+			case 'messages.failedToCreatePlayQueue': return 'Kan afspeelwachtrij niet maken';
+			case 'messages.failedToCreatePlayQueueNoItems': return 'Kan afspeelwachtrij niet maken - geen items';
+			case 'messages.failedPlayback': return ({required Object action, required Object error}) => 'Afspelen van ${action} mislukt: ${error}';
+			case 'messages.youAreOffline': return 'Je bent offline';
+			case 'messages.offlineFeatureUnavailable': return 'Deze functie vereist een internetverbinding. Je downloads en instellingen zijn nog steeds beschikbaar.';
 			case 'subtitlingStyling.stylingOptions': return 'Opmaak opties';
 			case 'subtitlingStyling.fontSize': return 'Lettergrootte';
 			case 'subtitlingStyling.textColor': return 'Tekstkleur';
@@ -3428,7 +6411,6 @@ extension on _StringsNl {
 			case 'subtitlingStyling.backgroundOpacity': return 'Achtergrond transparantie';
 			case 'subtitlingStyling.backgroundColor': return 'Achtergrondkleur';
 			case 'dialog.confirmAction': return 'Bevestig actie';
-			case 'dialog.areYouSure': return 'Weet je zeker dat je deze actie wilt uitvoeren?';
 			case 'dialog.cancel': return 'Annuleren';
 			case 'dialog.playNow': return 'Nu afspelen';
 			case 'discover.title': return 'Ontdekken';
@@ -3438,14 +6420,15 @@ extension on _StringsNl {
 			case 'discover.noContentAvailable': return 'Geen inhoud beschikbaar';
 			case 'discover.addMediaToLibraries': return 'Voeg wat media toe aan je bibliotheken';
 			case 'discover.continueWatching': return 'Verder kijken';
-			case 'discover.recentlyAdded': return 'Recent toegevoegd';
 			case 'discover.play': return 'Afspelen';
-			case 'discover.resume': return 'Hervatten';
-			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'Speel S${season}, E${episode}';
-			case 'discover.resumeEpisode': return ({required Object season, required Object episode}) => 'Hervat S${season}, E${episode}';
+			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'S${season}E${episode}';
 			case 'discover.pause': return 'Pauzeren';
 			case 'discover.overview': return 'Overzicht';
-			case 'discover.cast': return 'Cast';
+			case 'discover.cast': return 'Acteurs';
+			case 'discover.seasons': return 'Seizoenen';
+			case 'discover.studio': return 'Studio';
+			case 'discover.rating': return 'Leeftijd';
+			case 'discover.watched': return 'Bekeken';
 			case 'discover.episodeCount': return ({required Object count}) => '${count} afleveringen';
 			case 'discover.watchedProgress': return ({required Object watched, required Object total}) => '${watched}/${total} gekeken';
 			case 'discover.movie': return 'Film';
@@ -3462,7 +6445,6 @@ extension on _StringsNl {
 			case 'errors.invalidToken': return 'Ongeldig token';
 			case 'errors.failedToVerifyToken': return ({required Object error}) => 'Kon token niet verifiëren: ${error}';
 			case 'errors.failedToSwitchProfile': return ({required Object displayName}) => 'Kon niet wisselen naar ${displayName}';
-			case 'errors.connectionFailedGeneric': return 'Verbinding mislukt';
 			case 'libraries.title': return 'Bibliotheken';
 			case 'libraries.scanLibraryFiles': return 'Scan bibliotheek bestanden';
 			case 'libraries.scanLibrary': return 'Scan bibliotheek';
@@ -3488,48 +6470,116 @@ extension on _StringsNl {
 			case 'libraries.sort': return 'Sorteren';
 			case 'libraries.sortBy': return 'Sorteer op';
 			case 'libraries.filters': return 'Filters';
-			case 'libraries.loadingLibraryWithCount': return ({required Object count}) => 'Bibliotheek laden... (${count} items geladen)';
 			case 'libraries.confirmActionMessage': return 'Weet je zeker dat je deze actie wilt uitvoeren?';
 			case 'libraries.showLibrary': return 'Toon bibliotheek';
 			case 'libraries.hideLibrary': return 'Verberg bibliotheek';
 			case 'libraries.libraryOptions': return 'Bibliotheek opties';
+			case 'libraries.content': return 'bibliotheekinhoud';
+			case 'libraries.selectLibrary': return 'Bibliotheek kiezen';
+			case 'libraries.filtersWithCount': return ({required Object count}) => 'Filters (${count})';
+			case 'libraries.noRecommendations': return 'Geen aanbevelingen beschikbaar';
+			case 'libraries.noCollections': return 'Geen collecties in deze bibliotheek';
+			case 'libraries.noFoldersFound': return 'Geen mappen gevonden';
+			case 'libraries.folders': return 'mappen';
+			case 'libraries.tabs.recommended': return 'Aanbevolen';
+			case 'libraries.tabs.browse': return 'Bladeren';
+			case 'libraries.tabs.collections': return 'Collecties';
+			case 'libraries.tabs.playlists': return 'Afspeellijsten';
+			case 'libraries.groupings.all': return 'Alles';
+			case 'libraries.groupings.movies': return 'Films';
+			case 'libraries.groupings.shows': return 'Series';
+			case 'libraries.groupings.seasons': return 'Seizoenen';
+			case 'libraries.groupings.episodes': return 'Afleveringen';
+			case 'libraries.groupings.folders': return 'Mappen';
 			case 'about.title': return 'Over';
 			case 'about.openSourceLicenses': return 'Open Source licenties';
 			case 'about.versionLabel': return ({required Object version}) => 'Versie ${version}';
 			case 'about.appDescription': return 'Een mooie Plex client voor Flutter';
 			case 'about.viewLicensesDescription': return 'Bekijk licenties van third-party bibliotheken';
-			case 'serverSelection.connectingToServer': return 'Verbinden met server...';
-			case 'serverSelection.serverDebugCopied': return 'Server debug gegevens gekopieerd naar klembord';
-			case 'serverSelection.copyDebugData': return 'Kopieer debug gegevens';
+			case 'serverSelection.allServerConnectionsFailed': return 'Kon niet verbinden met servers. Controleer je netwerk en probeer opnieuw.';
 			case 'serverSelection.noServersFound': return 'Geen servers gevonden';
-			case 'serverSelection.malformedServerData': return ({required Object count}) => '${count} server(s) gevonden met verkeerde data. Geen geldige servers beschikbaar.';
-			case 'serverSelection.incompleteServerInfo': return 'Sommige servers hebben incomplete informatie en zijn overgeslagen. Controleer je Plex.tv account.';
-			case 'serverSelection.incompleteConnectionInfo': return 'Server verbinding informatie is incompleet. Probeer opnieuw.';
-			case 'serverSelection.malformedServerInfo': return ({required Object message}) => 'Server informatie is verkeerd geformatteerd: ${message}';
-			case 'serverSelection.networkConnectionFailed': return 'Netwerkverbinding mislukt. Controleer je internetverbinding en probeer opnieuw.';
-			case 'serverSelection.authenticationFailed': return 'Authenticatie mislukt. Log opnieuw in.';
-			case 'serverSelection.plexServiceUnavailable': return 'Plex service niet beschikbaar. Probeer later opnieuw.';
+			case 'serverSelection.noServersFoundForAccount': return ({required Object username, required Object email}) => 'Geen servers gevonden voor ${username} (${email})';
 			case 'serverSelection.failedToLoadServers': return ({required Object error}) => 'Kon servers niet laden: ${error}';
 			case 'hubDetail.title': return 'Titel';
 			case 'hubDetail.releaseYear': return 'Uitgavejaar';
 			case 'hubDetail.dateAdded': return 'Datum toegevoegd';
 			case 'hubDetail.rating': return 'Beoordeling';
 			case 'hubDetail.noItemsFound': return 'Geen items gevonden';
-			case 'logs.title': return 'Logs';
 			case 'logs.clearLogs': return 'Wis logs';
 			case 'logs.copyLogs': return 'Kopieer logs';
-			case 'logs.exportLogs': return 'Exporteer logs';
-			case 'logs.noLogsToShow': return 'Geen logs om te tonen';
 			case 'logs.error': return 'Fout:';
-			case 'logs.stackTrace': return 'Stack Trace:';
+			case 'logs.stackTrace': return 'Stacktracering:';
 			case 'licenses.relatedPackages': return 'Gerelateerde pakketten';
 			case 'licenses.license': return 'Licentie';
 			case 'licenses.licenseNumber': return ({required Object number}) => 'Licentie ${number}';
 			case 'licenses.licensesCount': return ({required Object count}) => '${count} licenties';
-			case 'navigation.home': return 'Home';
+			case 'navigation.home': return 'Thuis';
 			case 'navigation.search': return 'Zoeken';
 			case 'navigation.libraries': return 'Bibliotheken';
 			case 'navigation.settings': return 'Instellingen';
+			case 'navigation.downloads': return 'Downloads';
+			case 'downloads.title': return 'Downloads';
+			case 'downloads.manage': return 'Beheren';
+			case 'downloads.tvShows': return 'Series';
+			case 'downloads.movies': return 'Films';
+			case 'downloads.noDownloads': return 'Nog geen downloads';
+			case 'downloads.noDownloadsDescription': return 'Gedownloade content verschijnt hier voor offline weergave';
+			case 'downloads.downloadNow': return 'Download';
+			case 'downloads.deleteDownload': return 'Download verwijderen';
+			case 'downloads.retryDownload': return 'Download opnieuw proberen';
+			case 'downloads.downloadQueued': return 'Download in wachtrij';
+			case 'downloads.episodesQueued': return ({required Object count}) => '${count} afleveringen in wachtrij voor download';
+			case 'downloads.downloadDeleted': return 'Download verwijderd';
+			case 'downloads.deleteConfirm': return ({required Object title}) => 'Weet je zeker dat je "${title}" wilt verwijderen? Het gedownloade bestand wordt van je apparaat verwijderd.';
+			case 'downloads.deletingWithProgress': return ({required Object title, required Object current, required Object total}) => 'Verwijderen van ${title}... (${current} van ${total})';
+			case 'playlists.title': return 'Afspeellijsten';
+			case 'playlists.noPlaylists': return 'Geen afspeellijsten gevonden';
+			case 'playlists.create': return 'Afspeellijst maken';
+			case 'playlists.playlistName': return 'Naam afspeellijst';
+			case 'playlists.enterPlaylistName': return 'Voer naam afspeellijst in';
+			case 'playlists.delete': return 'Afspeellijst verwijderen';
+			case 'playlists.removeItem': return 'Verwijderen uit afspeellijst';
+			case 'playlists.smartPlaylist': return 'Slimme afspeellijst';
+			case 'playlists.itemCount': return ({required Object count}) => '${count} items';
+			case 'playlists.oneItem': return '1 item';
+			case 'playlists.emptyPlaylist': return 'Deze afspeellijst is leeg';
+			case 'playlists.deleteConfirm': return 'Afspeellijst verwijderen?';
+			case 'playlists.deleteMessage': return ({required Object name}) => 'Weet je zeker dat je "${name}" wilt verwijderen?';
+			case 'playlists.created': return 'Afspeellijst gemaakt';
+			case 'playlists.deleted': return 'Afspeellijst verwijderd';
+			case 'playlists.itemAdded': return 'Toegevoegd aan afspeellijst';
+			case 'playlists.itemRemoved': return 'Verwijderd uit afspeellijst';
+			case 'playlists.selectPlaylist': return 'Selecteer afspeellijst';
+			case 'playlists.createNewPlaylist': return 'Nieuwe afspeellijst maken';
+			case 'playlists.errorCreating': return 'Fout bij maken afspeellijst';
+			case 'playlists.errorDeleting': return 'Fout bij verwijderen afspeellijst';
+			case 'playlists.errorLoading': return 'Fout bij laden afspeellijsten';
+			case 'playlists.errorAdding': return 'Fout bij toevoegen aan afspeellijst';
+			case 'playlists.errorReordering': return 'Fout bij herschikken van afspeellijstitem';
+			case 'playlists.errorRemoving': return 'Fout bij verwijderen uit afspeellijst';
+			case 'playlists.playlist': return 'Afspeellijst';
+			case 'collections.title': return 'Collecties';
+			case 'collections.collection': return 'Collectie';
+			case 'collections.empty': return 'Collectie is leeg';
+			case 'collections.unknownLibrarySection': return 'Kan niet verwijderen: onbekende bibliotheeksectie';
+			case 'collections.deleteCollection': return 'Collectie verwijderen';
+			case 'collections.deleteConfirm': return ({required Object title}) => 'Weet je zeker dat je "${title}" wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.';
+			case 'collections.deleted': return 'Collectie verwijderd';
+			case 'collections.deleteFailed': return 'Collectie verwijderen mislukt';
+			case 'collections.deleteFailedWithError': return ({required Object error}) => 'Collectie verwijderen mislukt: ${error}';
+			case 'collections.failedToLoadItems': return ({required Object error}) => 'Collectie-items laden mislukt: ${error}';
+			case 'collections.selectCollection': return 'Selecteer collectie';
+			case 'collections.createNewCollection': return 'Nieuwe collectie maken';
+			case 'collections.collectionName': return 'Collectienaam';
+			case 'collections.enterCollectionName': return 'Voer collectienaam in';
+			case 'collections.addedToCollection': return 'Toegevoegd aan collectie';
+			case 'collections.errorAddingToCollection': return 'Fout bij toevoegen aan collectie';
+			case 'collections.created': return 'Collectie gemaakt';
+			case 'collections.removeFromCollection': return 'Verwijderen uit collectie';
+			case 'collections.removeFromCollectionConfirm': return ({required Object title}) => '"${title}" uit deze collectie verwijderen?';
+			case 'collections.removedFromCollection': return 'Uit collectie verwijderd';
+			case 'collections.removeFromCollectionFailed': return 'Verwijderen uit collectie mislukt';
+			case 'collections.removeFromCollectionError': return ({required Object error}) => 'Fout bij verwijderen uit collectie: ${error}';
 			default: return null;
 		}
 	}
@@ -3560,18 +6610,14 @@ extension on _StringsSv {
 			case 'common.submit': return 'Skicka';
 			case 'common.confirm': return 'Bekräfta';
 			case 'common.retry': return 'Försök igen';
-			case 'common.playNow': return 'Spela nu';
 			case 'common.logout': return 'Logga ut';
-			case 'common.online': return 'Online';
-			case 'common.offline': return 'Offline';
-			case 'common.owned': return 'Egen';
-			case 'common.shared': return 'Delad';
-			case 'common.current': return 'NUVARANDE';
 			case 'common.unknown': return 'Okänd';
 			case 'common.refresh': return 'Uppdatera';
 			case 'common.yes': return 'Ja';
 			case 'common.no': return 'Nej';
-			case 'common.server': return 'Server';
+			case 'common.delete': return 'Ta bort';
+			case 'common.shuffle': return 'Blanda';
+			case 'common.addTo': return 'Lägg till i...';
 			case 'screens.licenses': return 'Licenser';
 			case 'screens.selectServer': return 'Välj server';
 			case 'screens.switchProfile': return 'Byt profil';
@@ -3590,7 +6636,6 @@ extension on _StringsSv {
 			case 'settings.theme': return 'Tema';
 			case 'settings.appearance': return 'Utseende';
 			case 'settings.videoPlayback': return 'Videouppspelning';
-			case 'settings.shufflePlay': return 'Blanda uppspelning';
 			case 'settings.advanced': return 'Avancerat';
 			case 'settings.useSeasonPostersDescription': return 'Visa säsongsaffisch istället för serieaffisch för avsnitt';
 			case 'settings.showHeroSectionDescription': return 'Visa utvalda innehållskarusell på startsidan';
@@ -3628,15 +6673,13 @@ extension on _StringsSv {
 			case 'settings.secondsUnit': return ({required Object seconds}) => '${seconds} sekunder';
 			case 'settings.defaultSleepTimer': return 'Standard sovtimer';
 			case 'settings.minutesUnit': return ({required Object minutes}) => '${minutes} minuter';
-			case 'settings.unwatchedOnly': return 'Endast osedda';
-			case 'settings.unwatchedOnlyDescription': return 'Inkludera endast osedda avsnitt i blandningskön';
-			case 'settings.shuffleOrderNavigation': return 'Blandningsordning-navigation';
-			case 'settings.shuffleOrderNavigationDescription': return 'Nästa/föregående knappar följer blandad ordning';
-			case 'settings.loopShuffleQueue': return 'Loopa blandningskö';
-			case 'settings.loopShuffleQueueDescription': return 'Starta om kö när slutet nås';
+			case 'settings.rememberTrackSelections': return 'Kom ihåg spårval per serie/film';
+			case 'settings.rememberTrackSelectionsDescription': return 'Spara automatiskt ljud- och undertextspråkpreferenser när du ändrar spår under uppspelning';
 			case 'settings.videoPlayerControls': return 'Videospelar-kontroller';
 			case 'settings.keyboardShortcuts': return 'Tangentbordsgenvägar';
 			case 'settings.keyboardShortcutsDescription': return 'Anpassa tangentbordsgenvägar';
+			case 'settings.videoPlayerNavigation': return 'Navigering i videospelaren';
+			case 'settings.videoPlayerNavigationDescription': return 'Använd piltangenter för att navigera videospelarens kontroller';
 			case 'settings.debugLogging': return 'Felsökningsloggning';
 			case 'settings.debugLoggingDescription': return 'Aktivera detaljerad loggning för felsökning';
 			case 'settings.viewLogs': return 'Visa loggar';
@@ -3657,6 +6700,27 @@ extension on _StringsSv {
 			case 'settings.validationErrorDuration': return ({required Object min, required Object max, required Object unit}) => 'Tiden måste vara mellan ${min} och ${max} ${unit}';
 			case 'settings.shortcutAlreadyAssigned': return ({required Object action}) => 'Genväg redan tilldelad ${action}';
 			case 'settings.shortcutUpdated': return ({required Object action}) => 'Genväg uppdaterad för ${action}';
+			case 'settings.autoSkip': return 'Auto Hoppa Över';
+			case 'settings.autoSkipIntro': return 'Hoppa Över Intro Automatiskt';
+			case 'settings.autoSkipIntroDescription': return 'Hoppa automatiskt över intro-markörer efter några sekunder';
+			case 'settings.autoSkipCredits': return 'Hoppa Över Credits Automatiskt';
+			case 'settings.autoSkipCreditsDescription': return 'Hoppa automatiskt över credits och spela nästa avsnitt';
+			case 'settings.autoSkipDelay': return 'Fördröjning Auto Hoppa Över';
+			case 'settings.autoSkipDelayDescription': return ({required Object seconds}) => 'Vänta ${seconds} sekunder innan automatisk överhoppning';
+			case 'settings.downloads': return 'Nedladdningar';
+			case 'settings.downloadLocationDescription': return 'Välj var nedladdat innehåll ska lagras';
+			case 'settings.downloadLocationDefault': return 'Standard (App-lagring)';
+			case 'settings.downloadLocationCustom': return 'Anpassad Plats';
+			case 'settings.selectFolder': return 'Välj Mapp';
+			case 'settings.resetToDefault': return 'Återställ till Standard';
+			case 'settings.currentPath': return ({required Object path}) => 'Nuvarande: ${path}';
+			case 'settings.downloadLocationChanged': return 'Nedladdningsplats ändrad';
+			case 'settings.downloadLocationReset': return 'Nedladdningsplats återställd till standard';
+			case 'settings.downloadLocationInvalid': return 'Vald mapp är inte skrivbar';
+			case 'settings.downloadLocationSelectError': return 'Kunde inte välja mapp';
+			case 'settings.downloadOnWifiOnly': return 'Ladda ner endast på WiFi';
+			case 'settings.downloadOnWifiOnlyDescription': return 'Förhindra nedladdningar vid användning av mobildata';
+			case 'settings.cellularDownloadBlocked': return 'Nedladdningar är inaktiverade på mobildata. Anslut till WiFi eller ändra inställningen.';
 			case 'search.hint': return 'Sök filmer, serier, musik...';
 			case 'search.tryDifferentTerm': return 'Prova en annan sökterm';
 			case 'search.searchYourMedia': return 'Sök i dina media';
@@ -3696,6 +6760,14 @@ extension on _StringsSv {
 			case 'mediaMenu.goToSeason': return 'Gå till säsong';
 			case 'mediaMenu.shufflePlay': return 'Blanda uppspelning';
 			case 'mediaMenu.fileInfo': return 'Filinformation';
+			case 'accessibility.mediaCardMovie': return ({required Object title}) => '${title}, film';
+			case 'accessibility.mediaCardShow': return ({required Object title}) => '${title}, TV-serie';
+			case 'accessibility.mediaCardEpisode': return ({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+			case 'accessibility.mediaCardSeason': return ({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+			case 'accessibility.mediaCardWatched': return 'sedd';
+			case 'accessibility.mediaCardPartiallyWatched': return ({required Object percent}) => '${percent} procent sedd';
+			case 'accessibility.mediaCardUnwatched': return 'osedd';
+			case 'accessibility.tapToPlay': return 'Tryck för att spela';
 			case 'tooltips.shufflePlay': return 'Blanda uppspelning';
 			case 'tooltips.markAsWatched': return 'Markera som sedd';
 			case 'tooltips.markAsUnwatched': return 'Markera som osedd';
@@ -3712,11 +6784,40 @@ extension on _StringsSv {
 			case 'videoControls.stretch': return 'Sträck';
 			case 'videoControls.lockRotation': return 'Lås rotation';
 			case 'videoControls.unlockRotation': return 'Lås upp rotation';
+			case 'videoControls.sleepTimer': return 'Sovtimer';
+			case 'videoControls.timerActive': return 'Timer aktiv';
+			case 'videoControls.playbackWillPauseIn': return ({required Object duration}) => 'Uppspelningen pausas om ${duration}';
+			case 'videoControls.sleepTimerCompleted': return 'Sovtimer slutförd - uppspelning pausad';
+			case 'videoControls.playButton': return 'Spela';
+			case 'videoControls.pauseButton': return 'Pausa';
+			case 'videoControls.seekBackwardButton': return ({required Object seconds}) => 'Spola bakåt ${seconds} sekunder';
+			case 'videoControls.seekForwardButton': return ({required Object seconds}) => 'Spola framåt ${seconds} sekunder';
+			case 'videoControls.previousButton': return 'Föregående avsnitt';
+			case 'videoControls.nextButton': return 'Nästa avsnitt';
+			case 'videoControls.previousChapterButton': return 'Föregående kapitel';
+			case 'videoControls.nextChapterButton': return 'Nästa kapitel';
+			case 'videoControls.muteButton': return 'Tysta';
+			case 'videoControls.unmuteButton': return 'Slå på ljud';
+			case 'videoControls.settingsButton': return 'Videoinställningar';
+			case 'videoControls.audioTrackButton': return 'Ljudspår';
+			case 'videoControls.subtitlesButton': return 'Undertexter';
+			case 'videoControls.chaptersButton': return 'Kapitel';
+			case 'videoControls.versionsButton': return 'Videoversioner';
+			case 'videoControls.aspectRatioButton': return 'Bildförhållande';
+			case 'videoControls.fullscreenButton': return 'Aktivera helskärm';
+			case 'videoControls.exitFullscreenButton': return 'Avsluta helskärm';
+			case 'videoControls.rotationLockButton': return 'Rotationslås';
+			case 'videoControls.timelineSlider': return 'Videotidslinje';
+			case 'videoControls.volumeSlider': return 'Volymnivå';
+			case 'videoControls.backButton': return 'Tillbaka';
 			case 'userStatus.admin': return 'Admin';
 			case 'userStatus.restricted': return 'Begränsad';
 			case 'userStatus.protected': return 'Skyddad';
+			case 'userStatus.current': return 'NUVARANDE';
 			case 'messages.markedAsWatched': return 'Markerad som sedd';
 			case 'messages.markedAsUnwatched': return 'Markerad som osedd';
+			case 'messages.markedAsWatchedOffline': return 'Markerad som sedd (synkroniseras när online)';
+			case 'messages.markedAsUnwatchedOffline': return 'Markerad som osedd (synkroniseras när online)';
 			case 'messages.removedFromContinueWatching': return 'Borttagen från Fortsätt titta';
 			case 'messages.errorLoading': return ({required Object error}) => 'Fel: ${error}';
 			case 'messages.fileInfoNotAvailable': return 'Filinformation inte tillgänglig';
@@ -3733,15 +6834,18 @@ extension on _StringsSv {
 			case 'messages.metadataRefreshing': return ({required Object title}) => 'Uppdaterar metadata för "${title}"...';
 			case 'messages.metadataRefreshStarted': return ({required Object title}) => 'Metadata-uppdatering startad för "${title}"';
 			case 'messages.metadataRefreshFailed': return ({required Object error}) => 'Misslyckades att uppdatera metadata: ${error}';
-			case 'messages.noPlexToken': return 'Ingen Plex-token hittad. Vänligen logga in igen.';
 			case 'messages.logoutConfirm': return 'Är du säker på att du vill logga ut?';
 			case 'messages.noSeasonsFound': return 'Inga säsonger hittades';
 			case 'messages.noEpisodesFound': return 'Inga avsnitt hittades i första säsongen';
 			case 'messages.noEpisodesFoundGeneral': return 'Inga avsnitt hittades';
 			case 'messages.noResultsFound': return 'Inga resultat hittades';
 			case 'messages.sleepTimerSet': return ({required Object label}) => 'Sovtimer inställd för ${label}';
-			case 'messages.failedToSwitchProfile': return ({required Object displayName}) => 'Misslyckades att byta till ${displayName}';
-			case 'profile.noUsersAvailable': return 'Inga användare tillgängliga';
+			case 'messages.noItemsAvailable': return 'Inga objekt tillgängliga';
+			case 'messages.failedToCreatePlayQueue': return 'Det gick inte att skapa uppspelningskö';
+			case 'messages.failedToCreatePlayQueueNoItems': return 'Det gick inte att skapa uppspelningskö – inga objekt';
+			case 'messages.failedPlayback': return ({required Object action, required Object error}) => 'Kunde inte ${action}: ${error}';
+			case 'messages.youAreOffline': return 'Du är offline';
+			case 'messages.offlineFeatureUnavailable': return 'Denna funktion kräver en internetanslutning. Dina nedladdningar och inställningar är fortfarande tillgängliga.';
 			case 'subtitlingStyling.stylingOptions': return 'Stilalternativ';
 			case 'subtitlingStyling.fontSize': return 'Teckenstorlek';
 			case 'subtitlingStyling.textColor': return 'Textfärg';
@@ -3750,7 +6854,6 @@ extension on _StringsSv {
 			case 'subtitlingStyling.backgroundOpacity': return 'Bakgrundsopacitet';
 			case 'subtitlingStyling.backgroundColor': return 'Bakgrundsfärg';
 			case 'dialog.confirmAction': return 'Bekräfta åtgärd';
-			case 'dialog.areYouSure': return 'Är du säker på att du vill utföra denna åtgärd?';
 			case 'dialog.cancel': return 'Avbryt';
 			case 'dialog.playNow': return 'Spela nu';
 			case 'discover.title': return 'Upptäck';
@@ -3760,14 +6863,15 @@ extension on _StringsSv {
 			case 'discover.noContentAvailable': return 'Inget innehåll tillgängligt';
 			case 'discover.addMediaToLibraries': return 'Lägg till media till dina bibliotek';
 			case 'discover.continueWatching': return 'Fortsätt titta';
-			case 'discover.recentlyAdded': return 'Nyligen tillagda';
 			case 'discover.play': return 'Spela';
-			case 'discover.resume': return 'Återuppta';
-			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'Spela S${season}, E${episode}';
-			case 'discover.resumeEpisode': return ({required Object season, required Object episode}) => 'Återuppta S${season}, E${episode}';
+			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'S${season}E${episode}';
 			case 'discover.pause': return 'Pausa';
 			case 'discover.overview': return 'Översikt';
 			case 'discover.cast': return 'Rollbesättning';
+			case 'discover.seasons': return 'Säsonger';
+			case 'discover.studio': return 'Studio';
+			case 'discover.rating': return 'Åldersgräns';
+			case 'discover.watched': return 'Tittad';
 			case 'discover.episodeCount': return ({required Object count}) => '${count} avsnitt';
 			case 'discover.watchedProgress': return ({required Object watched, required Object total}) => '${watched}/${total} sedda';
 			case 'discover.movie': return 'Film';
@@ -3784,7 +6888,6 @@ extension on _StringsSv {
 			case 'errors.invalidToken': return 'Ogiltig token';
 			case 'errors.failedToVerifyToken': return ({required Object error}) => 'Misslyckades att verifiera token: ${error}';
 			case 'errors.failedToSwitchProfile': return ({required Object displayName}) => 'Misslyckades att byta till ${displayName}';
-			case 'errors.connectionFailedGeneric': return 'Anslutning misslyckades';
 			case 'libraries.title': return 'Bibliotek';
 			case 'libraries.scanLibraryFiles': return 'Skanna biblioteksfiler';
 			case 'libraries.scanLibrary': return 'Skanna bibliotek';
@@ -3810,38 +6913,43 @@ extension on _StringsSv {
 			case 'libraries.sort': return 'Sortera';
 			case 'libraries.sortBy': return 'Sortera efter';
 			case 'libraries.filters': return 'Filter';
-			case 'libraries.loadingLibraryWithCount': return ({required Object count}) => 'Laddar bibliotek... (${count} objekt laddade)';
 			case 'libraries.confirmActionMessage': return 'Är du säker på att du vill utföra denna åtgärd?';
 			case 'libraries.showLibrary': return 'Visa bibliotek';
 			case 'libraries.hideLibrary': return 'Dölj bibliotek';
 			case 'libraries.libraryOptions': return 'Biblioteksalternativ';
+			case 'libraries.content': return 'bibliotekets innehåll';
+			case 'libraries.selectLibrary': return 'Välj bibliotek';
+			case 'libraries.filtersWithCount': return ({required Object count}) => 'Filter (${count})';
+			case 'libraries.noRecommendations': return 'Inga rekommendationer tillgängliga';
+			case 'libraries.noCollections': return 'Inga samlingar i det här biblioteket';
+			case 'libraries.noFoldersFound': return 'Inga mappar hittades';
+			case 'libraries.folders': return 'mappar';
+			case 'libraries.tabs.recommended': return 'Rekommenderat';
+			case 'libraries.tabs.browse': return 'Bläddra';
+			case 'libraries.tabs.collections': return 'Samlingar';
+			case 'libraries.tabs.playlists': return 'Spellistor';
+			case 'libraries.groupings.all': return 'Alla';
+			case 'libraries.groupings.movies': return 'Filmer';
+			case 'libraries.groupings.shows': return 'Serier';
+			case 'libraries.groupings.seasons': return 'Säsonger';
+			case 'libraries.groupings.episodes': return 'Avsnitt';
+			case 'libraries.groupings.folders': return 'Mappar';
 			case 'about.title': return 'Om';
 			case 'about.openSourceLicenses': return 'Öppen källkod-licenser';
 			case 'about.versionLabel': return ({required Object version}) => 'Version ${version}';
 			case 'about.appDescription': return 'En vacker Plex-klient för Flutter';
 			case 'about.viewLicensesDescription': return 'Visa licenser för tredjepartsbibliotek';
-			case 'serverSelection.connectingToServer': return 'Ansluter till server...';
-			case 'serverSelection.serverDebugCopied': return 'Server-felsökningsdata kopierad till urklipp';
-			case 'serverSelection.copyDebugData': return 'Kopiera felsökningsdata';
+			case 'serverSelection.allServerConnectionsFailed': return 'Misslyckades att ansluta till servrar. Kontrollera ditt nätverk och försök igen.';
 			case 'serverSelection.noServersFound': return 'Inga servrar hittades';
-			case 'serverSelection.malformedServerData': return ({required Object count}) => 'Hittade ${count} server(ar) med felformaterad data. Inga giltiga servrar tillgängliga.';
-			case 'serverSelection.incompleteServerInfo': return 'Vissa servrar har ofullständig information och hoppades över. Vänligen kontrollera ditt Plex.tv-konto.';
-			case 'serverSelection.incompleteConnectionInfo': return 'Server-anslutningsinformation är ofullständig. Försök igen.';
-			case 'serverSelection.malformedServerInfo': return ({required Object message}) => 'Serverinformation är felformaterad: ${message}';
-			case 'serverSelection.networkConnectionFailed': return 'Nätverksanslutning misslyckades. Kontrollera din internetanslutning och försök igen.';
-			case 'serverSelection.authenticationFailed': return 'Autentisering misslyckades. Logga in igen.';
-			case 'serverSelection.plexServiceUnavailable': return 'Plex-tjänst otillgänglig. Försök igen senare.';
+			case 'serverSelection.noServersFoundForAccount': return ({required Object username, required Object email}) => 'Inga servrar hittades för ${username} (${email})';
 			case 'serverSelection.failedToLoadServers': return ({required Object error}) => 'Misslyckades att ladda servrar: ${error}';
 			case 'hubDetail.title': return 'Titel';
 			case 'hubDetail.releaseYear': return 'Utgivningsår';
 			case 'hubDetail.dateAdded': return 'Datum tillagd';
 			case 'hubDetail.rating': return 'Betyg';
 			case 'hubDetail.noItemsFound': return 'Inga objekt hittades';
-			case 'logs.title': return 'Loggar';
 			case 'logs.clearLogs': return 'Rensa loggar';
 			case 'logs.copyLogs': return 'Kopiera loggar';
-			case 'logs.exportLogs': return 'Exportera loggar';
-			case 'logs.noLogsToShow': return 'Inga loggar att visa';
 			case 'logs.error': return 'Fel:';
 			case 'logs.stackTrace': return 'Stack trace:';
 			case 'licenses.relatedPackages': return 'Relaterade paket';
@@ -3852,6 +6960,512 @@ extension on _StringsSv {
 			case 'navigation.search': return 'Sök';
 			case 'navigation.libraries': return 'Bibliotek';
 			case 'navigation.settings': return 'Inställningar';
+			case 'navigation.downloads': return 'Nedladdningar';
+			case 'downloads.title': return 'Nedladdningar';
+			case 'downloads.manage': return 'Hantera';
+			case 'downloads.tvShows': return 'TV-serier';
+			case 'downloads.movies': return 'Filmer';
+			case 'downloads.noDownloads': return 'Inga nedladdningar ännu';
+			case 'downloads.noDownloadsDescription': return 'Nedladdat innehåll visas här för offline-visning';
+			case 'downloads.downloadNow': return 'Ladda ner';
+			case 'downloads.deleteDownload': return 'Ta bort nedladdning';
+			case 'downloads.retryDownload': return 'Försök igen';
+			case 'downloads.downloadQueued': return 'Nedladdning köad';
+			case 'downloads.episodesQueued': return ({required Object count}) => '${count} avsnitt köade för nedladdning';
+			case 'downloads.downloadDeleted': return 'Nedladdning borttagen';
+			case 'downloads.deleteConfirm': return ({required Object title}) => 'Är du säker på att du vill ta bort "${title}"? Den nedladdade filen kommer att tas bort från din enhet.';
+			case 'downloads.deletingWithProgress': return ({required Object title, required Object current, required Object total}) => 'Tar bort ${title}... (${current} av ${total})';
+			case 'playlists.title': return 'Spellistor';
+			case 'playlists.noPlaylists': return 'Inga spellistor hittades';
+			case 'playlists.create': return 'Skapa spellista';
+			case 'playlists.playlistName': return 'Spellistans namn';
+			case 'playlists.enterPlaylistName': return 'Ange spellistans namn';
+			case 'playlists.delete': return 'Ta bort spellista';
+			case 'playlists.removeItem': return 'Ta bort från spellista';
+			case 'playlists.smartPlaylist': return 'Smart spellista';
+			case 'playlists.itemCount': return ({required Object count}) => '${count} objekt';
+			case 'playlists.oneItem': return '1 objekt';
+			case 'playlists.emptyPlaylist': return 'Denna spellista är tom';
+			case 'playlists.deleteConfirm': return 'Ta bort spellista?';
+			case 'playlists.deleteMessage': return ({required Object name}) => 'Är du säker på att du vill ta bort "${name}"?';
+			case 'playlists.created': return 'Spellista skapad';
+			case 'playlists.deleted': return 'Spellista borttagen';
+			case 'playlists.itemAdded': return 'Tillagd i spellista';
+			case 'playlists.itemRemoved': return 'Borttagen från spellista';
+			case 'playlists.selectPlaylist': return 'Välj spellista';
+			case 'playlists.createNewPlaylist': return 'Skapa ny spellista';
+			case 'playlists.errorCreating': return 'Det gick inte att skapa spellista';
+			case 'playlists.errorDeleting': return 'Det gick inte att ta bort spellista';
+			case 'playlists.errorLoading': return 'Det gick inte att ladda spellistor';
+			case 'playlists.errorAdding': return 'Det gick inte att lägga till i spellista';
+			case 'playlists.errorReordering': return 'Det gick inte att omordna spellisteobjekt';
+			case 'playlists.errorRemoving': return 'Det gick inte att ta bort från spellista';
+			case 'playlists.playlist': return 'Spellista';
+			case 'collections.title': return 'Samlingar';
+			case 'collections.collection': return 'Samling';
+			case 'collections.empty': return 'Samlingen är tom';
+			case 'collections.unknownLibrarySection': return 'Kan inte ta bort: okänd bibliotekssektion';
+			case 'collections.deleteCollection': return 'Ta bort samling';
+			case 'collections.deleteConfirm': return ({required Object title}) => 'Är du säker på att du vill ta bort "${title}"? Detta går inte att ångra.';
+			case 'collections.deleted': return 'Samling borttagen';
+			case 'collections.deleteFailed': return 'Det gick inte att ta bort samlingen';
+			case 'collections.deleteFailedWithError': return ({required Object error}) => 'Det gick inte att ta bort samlingen: ${error}';
+			case 'collections.failedToLoadItems': return ({required Object error}) => 'Det gick inte att läsa in samlingsobjekt: ${error}';
+			case 'collections.selectCollection': return 'Välj samling';
+			case 'collections.createNewCollection': return 'Skapa ny samling';
+			case 'collections.collectionName': return 'Samlingsnamn';
+			case 'collections.enterCollectionName': return 'Ange samlingsnamn';
+			case 'collections.addedToCollection': return 'Tillagd i samling';
+			case 'collections.errorAddingToCollection': return 'Fel vid tillägg i samling';
+			case 'collections.created': return 'Samling skapad';
+			case 'collections.removeFromCollection': return 'Ta bort från samling';
+			case 'collections.removeFromCollectionConfirm': return ({required Object title}) => 'Ta bort "${title}" från denna samling?';
+			case 'collections.removedFromCollection': return 'Borttagen från samling';
+			case 'collections.removeFromCollectionFailed': return 'Misslyckades med att ta bort från samling';
+			case 'collections.removeFromCollectionError': return ({required Object error}) => 'Fel vid borttagning från samling: ${error}';
+			default: return null;
+		}
+	}
+}
+
+extension on _StringsZh {
+	dynamic _flatMapFunction(String path) {
+		switch (path) {
+			case 'app.title': return 'Plezy';
+			case 'app.loading': return '加载中...';
+			case 'auth.signInWithPlex': return '使用 Plex 登录';
+			case 'auth.showQRCode': return '显示二维码';
+			case 'auth.cancel': return '取消';
+			case 'auth.authenticate': return '验证';
+			case 'auth.retry': return '重试';
+			case 'auth.debugEnterToken': return '调试：输入 Plex Token';
+			case 'auth.plexTokenLabel': return 'Plex 授权令牌 (Auth Token)';
+			case 'auth.plexTokenHint': return '输入你的 Plex.tv 令牌';
+			case 'auth.authenticationTimeout': return '验证超时。请重试。';
+			case 'auth.scanQRCodeInstruction': return '请使用已登录 Plex 的设备扫描此二维码进行验证。';
+			case 'auth.waitingForAuth': return '等待验证中...\n请在你的浏览器中完成登录。';
+			case 'common.cancel': return '取消';
+			case 'common.save': return '保存';
+			case 'common.close': return '关闭';
+			case 'common.clear': return '清除';
+			case 'common.reset': return '重置';
+			case 'common.later': return '稍后';
+			case 'common.submit': return '提交';
+			case 'common.confirm': return '确认';
+			case 'common.retry': return '重试';
+			case 'common.logout': return '登出';
+			case 'common.unknown': return '未知';
+			case 'common.refresh': return '刷新';
+			case 'common.yes': return '是';
+			case 'common.no': return '否';
+			case 'common.delete': return '删除';
+			case 'common.shuffle': return '随机播放';
+			case 'common.addTo': return '添加到...';
+			case 'screens.licenses': return '许可证';
+			case 'screens.selectServer': return '选择服务器';
+			case 'screens.switchProfile': return '切换配置文件';
+			case 'screens.subtitleStyling': return '字幕样式';
+			case 'screens.search': return '搜索';
+			case 'screens.logs': return '日志';
+			case 'update.available': return '有可用更新';
+			case 'update.versionAvailable': return ({required Object version}) => '版本 ${version} 已发布';
+			case 'update.currentVersion': return ({required Object version}) => '当前版本: ${version}';
+			case 'update.skipVersion': return '跳过此版本';
+			case 'update.viewRelease': return '查看发布详情';
+			case 'update.latestVersion': return '已安装的版本是可用的最新版本';
+			case 'update.checkFailed': return '无法检查更新';
+			case 'settings.title': return '设置';
+			case 'settings.language': return '语言';
+			case 'settings.theme': return '主题';
+			case 'settings.appearance': return '外观';
+			case 'settings.videoPlayback': return '视频播放';
+			case 'settings.advanced': return '高级';
+			case 'settings.useSeasonPostersDescription': return '为剧集显示季海报而非剧集海报';
+			case 'settings.showHeroSectionDescription': return '在主屏幕上显示精选内容轮播区';
+			case 'settings.secondsLabel': return '秒';
+			case 'settings.minutesLabel': return '分钟';
+			case 'settings.secondsShort': return 's';
+			case 'settings.minutesShort': return 'm';
+			case 'settings.durationHint': return ({required Object min, required Object max}) => '输入时长 (${min}-${max})';
+			case 'settings.systemTheme': return '系统';
+			case 'settings.systemThemeDescription': return '跟随系统设置';
+			case 'settings.lightTheme': return '浅色';
+			case 'settings.darkTheme': return '深色';
+			case 'settings.libraryDensity': return '媒体库密度';
+			case 'settings.compact': return '紧凑';
+			case 'settings.compactDescription': return '卡片更小，显示更多项目';
+			case 'settings.normal': return '标准';
+			case 'settings.normalDescription': return '默认尺寸';
+			case 'settings.comfortable': return '舒适';
+			case 'settings.comfortableDescription': return '卡片更大，显示更少项目';
+			case 'settings.viewMode': return '视图模式';
+			case 'settings.gridView': return '网格视图';
+			case 'settings.gridViewDescription': return '以网格布局显示项目';
+			case 'settings.listView': return '列表视图';
+			case 'settings.listViewDescription': return '以列表布局显示项目';
+			case 'settings.useSeasonPosters': return '使用季海报';
+			case 'settings.showHeroSection': return '显示主要精选区';
+			case 'settings.hardwareDecoding': return '硬件解码';
+			case 'settings.hardwareDecodingDescription': return '如果可用，使用硬件加速';
+			case 'settings.bufferSize': return '缓冲区大小';
+			case 'settings.bufferSizeMB': return ({required Object size}) => '${size}MB';
+			case 'settings.subtitleStyling': return '字幕样式';
+			case 'settings.subtitleStylingDescription': return '调整字幕外观';
+			case 'settings.smallSkipDuration': return '短跳过时长';
+			case 'settings.largeSkipDuration': return '长跳过时长';
+			case 'settings.secondsUnit': return ({required Object seconds}) => '${seconds} 秒';
+			case 'settings.defaultSleepTimer': return '默认睡眠定时器';
+			case 'settings.minutesUnit': return ({required Object minutes}) => '${minutes} 分钟';
+			case 'settings.rememberTrackSelections': return '记住每个剧集/电影的音轨选择';
+			case 'settings.rememberTrackSelectionsDescription': return '在播放过程中更改音轨时自动保存音频和字幕语言偏好';
+			case 'settings.videoPlayerControls': return '视频播放器控制';
+			case 'settings.keyboardShortcuts': return '键盘快捷键';
+			case 'settings.keyboardShortcutsDescription': return '自定义键盘快捷键';
+			case 'settings.videoPlayerNavigation': return '视频播放器导航';
+			case 'settings.videoPlayerNavigationDescription': return '使用方向键导航视频播放器控件';
+			case 'settings.debugLogging': return '调试日志';
+			case 'settings.debugLoggingDescription': return '启用详细日志记录以便故障排除';
+			case 'settings.viewLogs': return '查看日志';
+			case 'settings.viewLogsDescription': return '查看应用程序日志';
+			case 'settings.clearCache': return '清除缓存';
+			case 'settings.clearCacheDescription': return '这将清除所有缓存的图片和数据。清除缓存后，应用程序加载内容可能会变慢。';
+			case 'settings.clearCacheSuccess': return '缓存清除成功';
+			case 'settings.resetSettings': return '重置设置';
+			case 'settings.resetSettingsDescription': return '这会将所有设置重置为其默认值。此操作无法撤销。';
+			case 'settings.resetSettingsSuccess': return '设置重置成功';
+			case 'settings.shortcutsReset': return '快捷键已重置为默认值';
+			case 'settings.about': return '关于';
+			case 'settings.aboutDescription': return '应用程序信息和许可证';
+			case 'settings.updates': return '更新';
+			case 'settings.updateAvailable': return '有可用更新';
+			case 'settings.checkForUpdates': return '检查更新';
+			case 'settings.validationErrorEnterNumber': return '请输入一个有效的数字';
+			case 'settings.validationErrorDuration': return ({required Object min, required Object max, required Object unit}) => '时长必须介于 ${min} 和 ${max} ${unit} 之间';
+			case 'settings.shortcutAlreadyAssigned': return ({required Object action}) => '快捷键已被分配给 ${action}';
+			case 'settings.shortcutUpdated': return ({required Object action}) => '快捷键已为 ${action} 更新';
+			case 'settings.autoSkip': return '自动跳过';
+			case 'settings.autoSkipIntro': return '自动跳过片头';
+			case 'settings.autoSkipIntroDescription': return '几秒钟后自动跳过片头标记';
+			case 'settings.autoSkipCredits': return '自动跳过片尾';
+			case 'settings.autoSkipCreditsDescription': return '自动跳过片尾并播放下一集';
+			case 'settings.autoSkipDelay': return '自动跳过延迟';
+			case 'settings.autoSkipDelayDescription': return ({required Object seconds}) => '自动跳过前等待 ${seconds} 秒';
+			case 'settings.downloads': return '下载';
+			case 'settings.downloadLocationDescription': return '选择下载内容的存储位置';
+			case 'settings.downloadLocationDefault': return '默认（应用存储）';
+			case 'settings.downloadLocationCustom': return '自定义位置';
+			case 'settings.selectFolder': return '选择文件夹';
+			case 'settings.resetToDefault': return '重置为默认';
+			case 'settings.currentPath': return ({required Object path}) => '当前: ${path}';
+			case 'settings.downloadLocationChanged': return '下载位置已更改';
+			case 'settings.downloadLocationReset': return '下载位置已重置为默认';
+			case 'settings.downloadLocationInvalid': return '所选文件夹不可写入';
+			case 'settings.downloadLocationSelectError': return '选择文件夹失败';
+			case 'settings.downloadOnWifiOnly': return '仅在 WiFi 时下载';
+			case 'settings.downloadOnWifiOnlyDescription': return '使用蜂窝数据时禁止下载';
+			case 'settings.cellularDownloadBlocked': return '蜂窝数据下已禁用下载。请连接 WiFi 或更改设置。';
+			case 'search.hint': return '搜索电影、系列、音乐...';
+			case 'search.tryDifferentTerm': return '尝试不同的搜索词';
+			case 'search.searchYourMedia': return '搜索媒体';
+			case 'search.enterTitleActorOrKeyword': return '输入标题、演员或关键词';
+			case 'hotkeys.setShortcutFor': return ({required Object actionName}) => '为 ${actionName} 设置快捷键';
+			case 'hotkeys.clearShortcut': return '清除快捷键';
+			case 'pinEntry.enterPin': return '输入 PIN';
+			case 'pinEntry.showPin': return '显示 PIN';
+			case 'pinEntry.hidePin': return '隐藏 PIN';
+			case 'fileInfo.title': return '文件信息';
+			case 'fileInfo.video': return '视频';
+			case 'fileInfo.audio': return '音频';
+			case 'fileInfo.file': return '文件';
+			case 'fileInfo.advanced': return '高级';
+			case 'fileInfo.codec': return '编解码器';
+			case 'fileInfo.resolution': return '分辨率';
+			case 'fileInfo.bitrate': return '比特率';
+			case 'fileInfo.frameRate': return '帧率';
+			case 'fileInfo.aspectRatio': return '宽高比';
+			case 'fileInfo.profile': return '配置文件';
+			case 'fileInfo.bitDepth': return '位深度';
+			case 'fileInfo.colorSpace': return '色彩空间';
+			case 'fileInfo.colorRange': return '色彩范围';
+			case 'fileInfo.colorPrimaries': return '颜色原色';
+			case 'fileInfo.chromaSubsampling': return '色度子采样';
+			case 'fileInfo.channels': return '声道';
+			case 'fileInfo.path': return '路径';
+			case 'fileInfo.size': return '大小';
+			case 'fileInfo.container': return '容器';
+			case 'fileInfo.duration': return '时长';
+			case 'fileInfo.optimizedForStreaming': return '已优化用于流媒体';
+			case 'fileInfo.has64bitOffsets': return '64位偏移量';
+			case 'mediaMenu.markAsWatched': return '标记为已观看';
+			case 'mediaMenu.markAsUnwatched': return '标记为未观看';
+			case 'mediaMenu.removeFromContinueWatching': return '从继续观看中移除';
+			case 'mediaMenu.goToSeries': return '转到系列';
+			case 'mediaMenu.goToSeason': return '转到季';
+			case 'mediaMenu.shufflePlay': return '随机播放';
+			case 'mediaMenu.fileInfo': return '文件信息';
+			case 'accessibility.mediaCardMovie': return ({required Object title}) => '${title}, 电影';
+			case 'accessibility.mediaCardShow': return ({required Object title}) => '${title}, 电视剧';
+			case 'accessibility.mediaCardEpisode': return ({required Object title, required Object episodeInfo}) => '${title}, ${episodeInfo}';
+			case 'accessibility.mediaCardSeason': return ({required Object title, required Object seasonInfo}) => '${title}, ${seasonInfo}';
+			case 'accessibility.mediaCardWatched': return '已观看';
+			case 'accessibility.mediaCardPartiallyWatched': return ({required Object percent}) => '已观看 ${percent} 百分比';
+			case 'accessibility.mediaCardUnwatched': return '未观看';
+			case 'accessibility.tapToPlay': return '点击播放';
+			case 'tooltips.shufflePlay': return '随机播放';
+			case 'tooltips.markAsWatched': return '标记为已观看';
+			case 'tooltips.markAsUnwatched': return '标记为未观看';
+			case 'videoControls.audioLabel': return '音频';
+			case 'videoControls.subtitlesLabel': return '字幕';
+			case 'videoControls.resetToZero': return '重置为 0ms';
+			case 'videoControls.addTime': return ({required Object amount, required Object unit}) => '+${amount}${unit}';
+			case 'videoControls.minusTime': return ({required Object amount, required Object unit}) => '-${amount}${unit}';
+			case 'videoControls.playsLater': return ({required Object label}) => '${label} 播放较晚';
+			case 'videoControls.playsEarlier': return ({required Object label}) => '${label} 播放较早';
+			case 'videoControls.noOffset': return '无偏移';
+			case 'videoControls.letterbox': return '信箱模式（Letterbox）';
+			case 'videoControls.fillScreen': return '填充屏幕';
+			case 'videoControls.stretch': return '拉伸';
+			case 'videoControls.lockRotation': return '锁定旋转';
+			case 'videoControls.unlockRotation': return '解锁旋转';
+			case 'videoControls.sleepTimer': return '睡眠定时器';
+			case 'videoControls.timerActive': return '定时器已激活';
+			case 'videoControls.playbackWillPauseIn': return ({required Object duration}) => '播放将在 ${duration} 后暂停';
+			case 'videoControls.sleepTimerCompleted': return '睡眠定时器已完成 - 播放已暂停';
+			case 'videoControls.playButton': return '播放';
+			case 'videoControls.pauseButton': return '暂停';
+			case 'videoControls.seekBackwardButton': return ({required Object seconds}) => '后退 ${seconds} 秒';
+			case 'videoControls.seekForwardButton': return ({required Object seconds}) => '前进 ${seconds} 秒';
+			case 'videoControls.previousButton': return '上一集';
+			case 'videoControls.nextButton': return '下一集';
+			case 'videoControls.previousChapterButton': return '上一章节';
+			case 'videoControls.nextChapterButton': return '下一章节';
+			case 'videoControls.muteButton': return '静音';
+			case 'videoControls.unmuteButton': return '取消静音';
+			case 'videoControls.settingsButton': return '视频设置';
+			case 'videoControls.audioTrackButton': return '音轨';
+			case 'videoControls.subtitlesButton': return '字幕';
+			case 'videoControls.chaptersButton': return '章节';
+			case 'videoControls.versionsButton': return '视频版本';
+			case 'videoControls.aspectRatioButton': return '宽高比';
+			case 'videoControls.fullscreenButton': return '进入全屏';
+			case 'videoControls.exitFullscreenButton': return '退出全屏';
+			case 'videoControls.rotationLockButton': return '旋转锁定';
+			case 'videoControls.timelineSlider': return '视频时间轴';
+			case 'videoControls.volumeSlider': return '音量调节';
+			case 'videoControls.backButton': return '返回';
+			case 'userStatus.admin': return '管理员';
+			case 'userStatus.restricted': return '受限';
+			case 'userStatus.protected': return '受保护';
+			case 'userStatus.current': return '当前';
+			case 'messages.markedAsWatched': return '已标记为已观看';
+			case 'messages.markedAsUnwatched': return '已标记为未观看';
+			case 'messages.markedAsWatchedOffline': return '已标记为已观看 (将在联网时同步)';
+			case 'messages.markedAsUnwatchedOffline': return '已标记为未观看 (将在联网时同步)';
+			case 'messages.removedFromContinueWatching': return '已从继续观看中移除';
+			case 'messages.errorLoading': return ({required Object error}) => '错误: ${error}';
+			case 'messages.fileInfoNotAvailable': return '文件信息不可用';
+			case 'messages.errorLoadingFileInfo': return ({required Object error}) => '加载文件信息时出错: ${error}';
+			case 'messages.errorLoadingSeries': return '加载系列时出错';
+			case 'messages.errorLoadingSeason': return '加载季时出错';
+			case 'messages.musicNotSupported': return '尚不支持播放音乐';
+			case 'messages.logsCleared': return '日志已清除';
+			case 'messages.logsCopied': return '日志已复制到剪贴板';
+			case 'messages.noLogsAvailable': return '没有可用日志';
+			case 'messages.libraryScanning': return ({required Object title}) => '正在扫描 “${title}”...';
+			case 'messages.libraryScanStarted': return ({required Object title}) => '已开始扫描 “${title}” 媒体库';
+			case 'messages.libraryScanFailed': return ({required Object error}) => '无法扫描媒体库: ${error}';
+			case 'messages.metadataRefreshing': return ({required Object title}) => '正在刷新 “${title}” 的元数据...';
+			case 'messages.metadataRefreshStarted': return ({required Object title}) => '已开始刷新 “${title}” 的元数据';
+			case 'messages.metadataRefreshFailed': return ({required Object error}) => '无法刷新元数据: ${error}';
+			case 'messages.logoutConfirm': return '你确定要登出吗？';
+			case 'messages.noSeasonsFound': return '未找到季';
+			case 'messages.noEpisodesFound': return '在第一季中未找到剧集';
+			case 'messages.noEpisodesFoundGeneral': return '未找到剧集';
+			case 'messages.noResultsFound': return '未找到结果';
+			case 'messages.sleepTimerSet': return ({required Object label}) => '睡眠定时器已设置为 ${label}';
+			case 'messages.noItemsAvailable': return '没有可用的项目';
+			case 'messages.failedToCreatePlayQueue': return '创建播放队列失败';
+			case 'messages.failedToCreatePlayQueueNoItems': return '创建播放队列失败 - 没有项目';
+			case 'messages.failedPlayback': return ({required Object action, required Object error}) => '无法${action}: ${error}';
+			case 'messages.youAreOffline': return '您已离线';
+			case 'messages.offlineFeatureUnavailable': return '此功能需要网络连接。您的下载内容和设置仍然可用。';
+			case 'subtitlingStyling.stylingOptions': return '样式选项';
+			case 'subtitlingStyling.fontSize': return '字号';
+			case 'subtitlingStyling.textColor': return '文本颜色';
+			case 'subtitlingStyling.borderSize': return '边框大小';
+			case 'subtitlingStyling.borderColor': return '边框颜色';
+			case 'subtitlingStyling.backgroundOpacity': return '背景不透明度';
+			case 'subtitlingStyling.backgroundColor': return '背景颜色';
+			case 'dialog.confirmAction': return '确认操作';
+			case 'dialog.cancel': return '取消';
+			case 'dialog.playNow': return '立即播放';
+			case 'discover.title': return '发现';
+			case 'discover.switchProfile': return '切换配置文件';
+			case 'discover.switchServer': return '切换服务器';
+			case 'discover.logout': return '登出';
+			case 'discover.noContentAvailable': return '没有可用内容';
+			case 'discover.addMediaToLibraries': return '请向你的媒体库添加一些媒体';
+			case 'discover.continueWatching': return '继续观看';
+			case 'discover.play': return '播放';
+			case 'discover.playEpisode': return ({required Object season, required Object episode}) => 'S${season}E${episode}';
+			case 'discover.pause': return '暂停';
+			case 'discover.overview': return '概述';
+			case 'discover.cast': return '演员表';
+			case 'discover.seasons': return '季数';
+			case 'discover.studio': return '制作公司';
+			case 'discover.rating': return '年龄分级';
+			case 'discover.watched': return '已观看';
+			case 'discover.episodeCount': return ({required Object count}) => '${count} 集';
+			case 'discover.watchedProgress': return ({required Object watched, required Object total}) => '已观看 ${watched}/${total} 集';
+			case 'discover.movie': return '电影';
+			case 'discover.tvShow': return '电视剧';
+			case 'discover.minutesLeft': return ({required Object minutes}) => '剩余 ${minutes} 分钟';
+			case 'errors.searchFailed': return ({required Object error}) => '搜索失败: ${error}';
+			case 'errors.connectionTimeout': return ({required Object context}) => '加载 ${context} 时连接超时';
+			case 'errors.connectionFailed': return '无法连接到 Plex 服务器';
+			case 'errors.failedToLoad': return ({required Object context, required Object error}) => '无法加载 ${context}: ${error}';
+			case 'errors.noClientAvailable': return '没有可用客户端';
+			case 'errors.authenticationFailed': return ({required Object error}) => '验证失败: ${error}';
+			case 'errors.couldNotLaunchUrl': return '无法打开授权 URL';
+			case 'errors.pleaseEnterToken': return '请输入一个令牌';
+			case 'errors.invalidToken': return '令牌无效';
+			case 'errors.failedToVerifyToken': return ({required Object error}) => '无法验证令牌: ${error}';
+			case 'errors.failedToSwitchProfile': return ({required Object displayName}) => '无法切换到 ${displayName}';
+			case 'libraries.title': return '媒体库';
+			case 'libraries.scanLibraryFiles': return '扫描媒体库文件';
+			case 'libraries.scanLibrary': return '扫描媒体库';
+			case 'libraries.analyze': return '分析';
+			case 'libraries.analyzeLibrary': return '分析媒体库';
+			case 'libraries.refreshMetadata': return '刷新元数据';
+			case 'libraries.emptyTrash': return '清空回收站';
+			case 'libraries.emptyingTrash': return ({required Object title}) => '正在清空 “${title}” 的回收站...';
+			case 'libraries.trashEmptied': return ({required Object title}) => '已清空 “${title}” 的回收站';
+			case 'libraries.failedToEmptyTrash': return ({required Object error}) => '无法清空回收站: ${error}';
+			case 'libraries.analyzing': return ({required Object title}) => '正在分析 “${title}”...';
+			case 'libraries.analysisStarted': return ({required Object title}) => '已开始分析 “${title}”';
+			case 'libraries.failedToAnalyze': return ({required Object error}) => '无法分析媒体库: ${error}';
+			case 'libraries.noLibrariesFound': return '未找到媒体库';
+			case 'libraries.thisLibraryIsEmpty': return '此媒体库为空';
+			case 'libraries.all': return '全部';
+			case 'libraries.clearAll': return '全部清除';
+			case 'libraries.scanLibraryConfirm': return ({required Object title}) => '确定要扫描 “${title}” 吗？';
+			case 'libraries.analyzeLibraryConfirm': return ({required Object title}) => '确定要分析 “${title}” 吗？';
+			case 'libraries.refreshMetadataConfirm': return ({required Object title}) => '确定要刷新 “${title}” 的元数据吗？';
+			case 'libraries.emptyTrashConfirm': return ({required Object title}) => '确定要清空 “${title}” 的回收站吗？';
+			case 'libraries.manageLibraries': return '管理媒体库';
+			case 'libraries.sort': return '排序';
+			case 'libraries.sortBy': return '排序依据';
+			case 'libraries.filters': return '筛选器';
+			case 'libraries.confirmActionMessage': return '确定要执行此操作吗？';
+			case 'libraries.showLibrary': return '显示媒体库';
+			case 'libraries.hideLibrary': return '隐藏媒体库';
+			case 'libraries.libraryOptions': return '媒体库选项';
+			case 'libraries.content': return '媒体库内容';
+			case 'libraries.selectLibrary': return '选择媒体库';
+			case 'libraries.filtersWithCount': return ({required Object count}) => '筛选器（${count}）';
+			case 'libraries.noRecommendations': return '暂无推荐';
+			case 'libraries.noCollections': return '此媒体库中没有合集';
+			case 'libraries.noFoldersFound': return '未找到文件夹';
+			case 'libraries.folders': return '文件夹';
+			case 'libraries.tabs.recommended': return '推荐';
+			case 'libraries.tabs.browse': return '浏览';
+			case 'libraries.tabs.collections': return '合集';
+			case 'libraries.tabs.playlists': return '播放列表';
+			case 'libraries.groupings.all': return '全部';
+			case 'libraries.groupings.movies': return '电影';
+			case 'libraries.groupings.shows': return '剧集';
+			case 'libraries.groupings.seasons': return '季';
+			case 'libraries.groupings.episodes': return '集';
+			case 'libraries.groupings.folders': return '文件夹';
+			case 'about.title': return '关于';
+			case 'about.openSourceLicenses': return '开源许可证';
+			case 'about.versionLabel': return ({required Object version}) => '版本 ${version}';
+			case 'about.appDescription': return '一款精美的 Flutter Plex 客户端';
+			case 'about.viewLicensesDescription': return '查看第三方库的许可证';
+			case 'serverSelection.allServerConnectionsFailed': return '无法连接到任何服务器。请检查你的网络并重试。';
+			case 'serverSelection.noServersFound': return '未找到服务器';
+			case 'serverSelection.noServersFoundForAccount': return ({required Object username, required Object email}) => '未找到 ${username} (${email}) 的服务器';
+			case 'serverSelection.failedToLoadServers': return ({required Object error}) => '无法加载服务器: ${error}';
+			case 'hubDetail.title': return '标题';
+			case 'hubDetail.releaseYear': return '发行年份';
+			case 'hubDetail.dateAdded': return '添加日期';
+			case 'hubDetail.rating': return '评分';
+			case 'hubDetail.noItemsFound': return '未找到项目';
+			case 'logs.clearLogs': return '清除日志';
+			case 'logs.copyLogs': return '复制日志';
+			case 'logs.error': return '错误:';
+			case 'logs.stackTrace': return '堆栈跟踪 (Stack Trace):';
+			case 'licenses.relatedPackages': return '相关软件包';
+			case 'licenses.license': return '许可证';
+			case 'licenses.licenseNumber': return ({required Object number}) => '许可证 ${number}';
+			case 'licenses.licensesCount': return ({required Object count}) => '${count} 个许可证';
+			case 'navigation.home': return '主页';
+			case 'navigation.search': return '搜索';
+			case 'navigation.libraries': return '媒体库';
+			case 'navigation.settings': return '设置';
+			case 'navigation.downloads': return '下载';
+			case 'downloads.title': return '下载';
+			case 'downloads.manage': return '管理';
+			case 'downloads.tvShows': return '电视剧';
+			case 'downloads.movies': return '电影';
+			case 'downloads.noDownloads': return '暂无下载';
+			case 'downloads.noDownloadsDescription': return '下载的内容将在此处显示以供离线观看';
+			case 'downloads.downloadNow': return '下载';
+			case 'downloads.deleteDownload': return '删除下载';
+			case 'downloads.retryDownload': return '重试下载';
+			case 'downloads.downloadQueued': return '下载已排队';
+			case 'downloads.episodesQueued': return ({required Object count}) => '${count} 集已加入下载队列';
+			case 'downloads.downloadDeleted': return '下载已删除';
+			case 'downloads.deleteConfirm': return ({required Object title}) => '确定要删除 "${title}" 吗？下载的文件将从您的设备中删除。';
+			case 'downloads.deletingWithProgress': return ({required Object title, required Object current, required Object total}) => '正在删除 ${title}... (${current}/${total})';
+			case 'playlists.title': return '播放列表';
+			case 'playlists.noPlaylists': return '未找到播放列表';
+			case 'playlists.create': return '创建播放列表';
+			case 'playlists.playlistName': return '播放列表名称';
+			case 'playlists.enterPlaylistName': return '输入播放列表名称';
+			case 'playlists.delete': return '删除播放列表';
+			case 'playlists.removeItem': return '从播放列表中移除';
+			case 'playlists.smartPlaylist': return '智能播放列表';
+			case 'playlists.itemCount': return ({required Object count}) => '${count} 个项目';
+			case 'playlists.oneItem': return '1 个项目';
+			case 'playlists.emptyPlaylist': return '此播放列表为空';
+			case 'playlists.deleteConfirm': return '删除播放列表？';
+			case 'playlists.deleteMessage': return ({required Object name}) => '确定要删除 "${name}" 吗？';
+			case 'playlists.created': return '播放列表已创建';
+			case 'playlists.deleted': return '播放列表已删除';
+			case 'playlists.itemAdded': return '已添加到播放列表';
+			case 'playlists.itemRemoved': return '已从播放列表中移除';
+			case 'playlists.selectPlaylist': return '选择播放列表';
+			case 'playlists.createNewPlaylist': return '创建新播放列表';
+			case 'playlists.errorCreating': return '创建播放列表失败';
+			case 'playlists.errorDeleting': return '删除播放列表失败';
+			case 'playlists.errorLoading': return '加载播放列表失败';
+			case 'playlists.errorAdding': return '添加到播放列表失败';
+			case 'playlists.errorReordering': return '重新排序播放列表项目失败';
+			case 'playlists.errorRemoving': return '从播放列表中移除失败';
+			case 'playlists.playlist': return '播放列表';
+			case 'collections.title': return '合集';
+			case 'collections.collection': return '合集';
+			case 'collections.empty': return '合集为空';
+			case 'collections.unknownLibrarySection': return '无法删除：未知的媒体库分区';
+			case 'collections.deleteCollection': return '删除合集';
+			case 'collections.deleteConfirm': return ({required Object title}) => '确定要删除"${title}"吗？此操作无法撤销。';
+			case 'collections.deleted': return '已删除合集';
+			case 'collections.deleteFailed': return '删除合集失败';
+			case 'collections.deleteFailedWithError': return ({required Object error}) => '删除合集失败：${error}';
+			case 'collections.failedToLoadItems': return ({required Object error}) => '加载合集项目失败：${error}';
+			case 'collections.selectCollection': return '选择合集';
+			case 'collections.createNewCollection': return '创建新合集';
+			case 'collections.collectionName': return '合集名称';
+			case 'collections.enterCollectionName': return '输入合集名称';
+			case 'collections.addedToCollection': return '已添加到合集';
+			case 'collections.errorAddingToCollection': return '添加到合集失败';
+			case 'collections.created': return '已创建合集';
+			case 'collections.removeFromCollection': return '从合集移除';
+			case 'collections.removeFromCollectionConfirm': return ({required Object title}) => '将“${title}”从此合集移除？';
+			case 'collections.removedFromCollection': return '已从合集移除';
+			case 'collections.removeFromCollectionFailed': return '从合集移除失败';
+			case 'collections.removeFromCollectionError': return ({required Object error}) => '从合集移除时出错：${error}';
 			default: return null;
 		}
 	}
diff --git a/lib/i18n/strings.i18n.json b/lib/i18n/strings.i18n.json
index 9a5182fa..d0459cb1 100644
--- a/lib/i18n/strings.i18n.json
+++ b/lib/i18n/strings.i18n.json
@@ -26,22 +26,17 @@
     "submit": "Submit",
     "confirm": "Confirm",
     "retry": "Retry",
-    "playNow": "Play Now",
     "logout": "Logout",
-    "online": "Online",
-    "offline": "Offline",
-    "owned": "Owned",
-    "shared": "Shared",
-    "current": "CURRENT",
     "unknown": "Unknown",
     "refresh": "Refresh",
     "yes": "Yes",
     "no": "No",
-    "server": "Server"
+    "delete": "Delete",
+    "shuffle": "Shuffle",
+    "addTo": "Add to..."
   },
   "screens": {
     "licenses": "Licenses",
-    "selectServer": "Select Server",
     "switchProfile": "Switch Profile",
     "subtitleStyling": "Subtitle Styling",
     "search": "Search",
@@ -62,7 +57,6 @@
     "theme": "Theme",
     "appearance": "Appearance",
     "videoPlayback": "Video Playback",
-    "shufflePlay": "Shuffle Play",
     "advanced": "Advanced",
     "useSeasonPostersDescription": "Show season poster instead of series poster for episodes",
     "showHeroSectionDescription": "Display featured content carousel on home screen",
@@ -100,15 +94,13 @@
     "secondsUnit": "${seconds} seconds",
     "defaultSleepTimer": "Default Sleep Timer",
     "minutesUnit": "${minutes} minutes",
-    "unwatchedOnly": "Unwatched Only",
-    "unwatchedOnlyDescription": "Only include unwatched episodes in shuffle queue",
-    "shuffleOrderNavigation": "Shuffle Order Navigation",
-    "shuffleOrderNavigationDescription": "Next/previous buttons follow shuffled order",
-    "loopShuffleQueue": "Loop Shuffle Queue",
-    "loopShuffleQueueDescription": "Restart queue when reaching the end",
+    "rememberTrackSelections": "Remember track selections per show/movie",
+    "rememberTrackSelectionsDescription": "Automatically save audio and subtitle language preferences when you change tracks during playback",
     "videoPlayerControls": "Video Player Controls",
     "keyboardShortcuts": "Keyboard Shortcuts",
     "keyboardShortcutsDescription": "Customize keyboard shortcuts",
+    "videoPlayerNavigation": "Video Player Navigation",
+    "videoPlayerNavigationDescription": "Use arrow keys to navigate video player controls",
     "debugLogging": "Debug Logging",
     "debugLoggingDescription": "Enable detailed logging for troubleshooting",
     "viewLogs": "View Logs",
@@ -128,7 +120,28 @@
     "validationErrorEnterNumber": "Please enter a valid number",
     "validationErrorDuration": "Duration must be between ${min} and ${max} ${unit}",
     "shortcutAlreadyAssigned": "Shortcut already assigned to ${action}",
-    "shortcutUpdated": "Shortcut updated for ${action}"
+    "shortcutUpdated": "Shortcut updated for ${action}",
+    "autoSkip": "Auto Skip",
+    "autoSkipIntro": "Auto Skip Intro",
+    "autoSkipIntroDescription": "Automatically skip intro markers after a few seconds",
+    "autoSkipCredits": "Auto Skip Credits",
+    "autoSkipCreditsDescription": "Automatically skip credits and play next episode",
+    "autoSkipDelay": "Auto Skip Delay",
+    "autoSkipDelayDescription": "Wait ${seconds} seconds before auto-skipping",
+    "downloads": "Downloads",
+    "downloadLocationDescription": "Choose where to store downloaded content",
+    "downloadLocationDefault": "Default (App Storage)",
+    "downloadLocationCustom": "Custom Location",
+    "selectFolder": "Select Folder",
+    "resetToDefault": "Reset to Default",
+    "currentPath": "Current: ${path}",
+    "downloadLocationChanged": "Download location changed",
+    "downloadLocationReset": "Download location reset to default",
+    "downloadLocationInvalid": "Selected folder is not writable",
+    "downloadLocationSelectError": "Failed to select folder",
+    "downloadOnWifiOnly": "Download on WiFi only",
+    "downloadOnWifiOnlyDescription": "Prevent downloads when on cellular data",
+    "cellularDownloadBlocked": "Downloads are disabled on cellular data. Connect to WiFi or change the setting."
   },
   "search": {
     "hint": "Search movies, shows, music...",
@@ -179,6 +192,16 @@
     "shufflePlay": "Shuffle Play",
     "fileInfo": "File Info"
   },
+  "accessibility": {
+    "mediaCardMovie": "${title}, movie",
+    "mediaCardShow": "${title}, TV show",
+    "mediaCardEpisode": "${title}, ${episodeInfo}",
+    "mediaCardSeason": "${title}, ${seasonInfo}",
+    "mediaCardWatched": "watched",
+    "mediaCardPartiallyWatched": "${percent} percent watched",
+    "mediaCardUnwatched": "unwatched",
+    "tapToPlay": "Tap to play"
+  },
   "tooltips": {
     "shufflePlay": "Shuffle play",
     "markAsWatched": "Mark as watched",
@@ -197,16 +220,45 @@
     "fillScreen": "Fill screen",
     "stretch": "Stretch",
     "lockRotation": "Lock rotation",
-    "unlockRotation": "Unlock rotation"
+    "unlockRotation": "Unlock rotation",
+    "sleepTimer": "Sleep Timer",
+    "timerActive": "Timer Active",
+    "playbackWillPauseIn": "Playback will pause in ${duration}",
+    "sleepTimerCompleted": "Sleep timer completed - playback paused",
+    "playButton": "Play",
+    "pauseButton": "Pause",
+    "seekBackwardButton": "Seek backward ${seconds} seconds",
+    "seekForwardButton": "Seek forward ${seconds} seconds",
+    "previousButton": "Previous episode",
+    "nextButton": "Next episode",
+    "previousChapterButton": "Previous chapter",
+    "nextChapterButton": "Next chapter",
+    "muteButton": "Mute",
+    "unmuteButton": "Unmute",
+    "settingsButton": "Video settings",
+    "audioTrackButton": "Audio tracks",
+    "subtitlesButton": "Subtitles",
+    "chaptersButton": "Chapters",
+    "versionsButton": "Video versions",
+    "aspectRatioButton": "Aspect ratio",
+    "fullscreenButton": "Enter fullscreen",
+    "exitFullscreenButton": "Exit fullscreen",
+    "rotationLockButton": "Rotation lock",
+    "timelineSlider": "Video timeline",
+    "volumeSlider": "Volume level",
+    "backButton": "Back"
   },
   "userStatus": {
     "admin": "Admin",
     "restricted": "Restricted",
-    "protected": "Protected"
+    "protected": "Protected",
+    "current": "CURRENT"
   },
   "messages": {
     "markedAsWatched": "Marked as watched",
     "markedAsUnwatched": "Marked as unwatched",
+    "markedAsWatchedOffline": "Marked as watched (will sync when online)",
+    "markedAsUnwatchedOffline": "Marked as unwatched (will sync when online)",
     "removedFromContinueWatching": "Removed from Continue Watching",
     "errorLoading": "Error: ${error}",
     "fileInfoNotAvailable": "File information not available",
@@ -223,17 +275,18 @@
     "metadataRefreshing": "Refreshing metadata for \"${title}\"...",
     "metadataRefreshStarted": "Metadata refresh started for \"${title}\"",
     "metadataRefreshFailed": "Failed to refresh metadata: ${error}",
-    "noPlexToken": "No Plex token found. Please login again.",
     "logoutConfirm": "Are you sure you want to logout?",
     "noSeasonsFound": "No seasons found",
     "noEpisodesFound": "No episodes found in first season",
     "noEpisodesFoundGeneral": "No episodes found",
     "noResultsFound": "No results found",
     "sleepTimerSet": "Sleep timer set for ${label}",
-    "failedToSwitchProfile": "Failed to switch to ${displayName}"
-  },
-  "profile": {
-    "noUsersAvailable": "No users available"
+    "noItemsAvailable": "No items available",
+    "failedToCreatePlayQueue": "Failed to create play queue",
+    "failedToCreatePlayQueueNoItems": "Failed to create play queue - no items",
+    "failedPlayback": "Failed to ${action}: ${error}",
+    "youAreOffline": "You're Offline",
+    "offlineFeatureUnavailable": "This feature requires an internet connection. Your downloads and settings are still available."
   },
   "subtitlingStyling": {
     "stylingOptions": "Styling Options",
@@ -246,26 +299,25 @@
   },
   "dialog": {
     "confirmAction": "Confirm Action",
-    "areYouSure": "Are you sure you want to perform this action?",
     "cancel": "Cancel",
     "playNow": "Play Now"
   },
   "discover": {
     "title": "Discover",
     "switchProfile": "Switch Profile",
-    "switchServer": "Switch Server",
     "logout": "Logout",
     "noContentAvailable": "No content available",
     "addMediaToLibraries": "Add some media to your libraries",
     "continueWatching": "Continue Watching",
-    "recentlyAdded": "Recently Added",
     "play": "Play",
-    "resume": "Resume",
-    "playEpisode": "Play S${season}, E${episode}",
-    "resumeEpisode": "Resume S${season}, E${episode}",
+    "playEpisode": "S${season}E${episode}",
     "pause": "Pause",
     "overview": "Overview",
     "cast": "Cast",
+    "seasons": "Seasons",
+    "studio": "Studio",
+    "rating": "Rating",
+    "watched": "Watched",
     "episodeCount": "${count} episodes",
     "watchedProgress": "${watched}/${total} watched",
     "movie": "Movie",
@@ -283,8 +335,7 @@
     "pleaseEnterToken": "Please enter a token",
     "invalidToken": "Invalid token",
     "failedToVerifyToken": "Failed to verify token: ${error}",
-    "failedToSwitchProfile": "Failed to switch to ${displayName}",
-    "connectionFailedGeneric": "Connection failed"
+    "failedToSwitchProfile": "Failed to switch to ${displayName}"
   },
   "libraries": {
     "title": "Libraries",
@@ -312,11 +363,31 @@
     "sort": "Sort",
     "sortBy": "Sort By",
     "filters": "Filters",
-    "loadingLibraryWithCount": "Loading library... (${count} items loaded)",
     "confirmActionMessage": "Are you sure you want to perform this action?",
     "showLibrary": "Show library",
     "hideLibrary": "Hide library",
-    "libraryOptions": "Library options"
+    "libraryOptions": "Library options",
+    "content": "library content",
+    "selectLibrary": "Select library",
+    "filtersWithCount": "Filters (${count})",
+    "noRecommendations": "No recommendations available",
+    "noCollections": "No collections in this library",
+    "noFoldersFound": "No folders found",
+    "folders": "folders",
+    "tabs": {
+      "recommended": "Recommended",
+      "browse": "Browse",
+      "collections": "Collections",
+      "playlists": "Playlists"
+    },
+    "groupings": {
+      "all": "All",
+      "movies": "Movies",
+      "shows": "TV Shows",
+      "seasons": "Seasons",
+      "episodes": "Episodes",
+      "folders": "Folders"
+    }
   },
   "about": {
     "title": "About",
@@ -326,17 +397,9 @@
     "viewLicensesDescription": "View licenses of third-party libraries"
   },
   "serverSelection": {
-    "connectingToServer": "Connecting to server...",
-    "serverDebugCopied": "Server debug data copied to clipboard",
-    "copyDebugData": "Copy Debug Data",
+    "allServerConnectionsFailed": "Failed to connect to any servers. Please check your network and try again.",
     "noServersFound": "No servers found",
-    "malformedServerData": "Found ${count} server(s) with malformed data. No valid servers available.",
-    "incompleteServerInfo": "Some servers have incomplete information and were skipped. Please check your Plex.tv account.",
-    "incompleteConnectionInfo": "Server connection information is incomplete. Please try again.",
-    "malformedServerInfo": "Server information is malformed: ${message}",
-    "networkConnectionFailed": "Network connection failed. Please check your internet connection and try again.",
-    "authenticationFailed": "Authentication failed. Please sign in again.",
-    "plexServiceUnavailable": "Plex service unavailable. Please try again later.",
+    "noServersFoundForAccount": "No servers found for ${username} (${email})",
     "failedToLoadServers": "Failed to load servers: ${error}"
   },
   "hubDetail": {
@@ -347,11 +410,8 @@
     "noItemsFound": "No items found"
   },
   "logs": {
-    "title": "Logs",
     "clearLogs": "Clear Logs",
     "copyLogs": "Copy Logs",
-    "exportLogs": "Export Logs",
-    "noLogsToShow": "No logs to show",
     "error": "Error:",
     "stackTrace": "Stack Trace:"
   },
@@ -365,6 +425,75 @@
     "home": "Home",
     "search": "Search",
     "libraries": "Libraries",
-    "settings": "Settings"
+    "settings": "Settings",
+    "downloads": "Downloads"
+  },
+  "collections": {
+    "title": "Collections",
+    "collection": "Collection",
+    "empty": "Collection is empty",
+    "unknownLibrarySection": "Cannot delete: Unknown library section",
+    "deleteCollection": "Delete Collection",
+    "deleteConfirm": "Are you sure you want to delete \"${title}\"? This action cannot be undone.",
+    "deleted": "Collection deleted",
+    "deleteFailed": "Failed to delete collection",
+    "deleteFailedWithError": "Failed to delete collection: ${error}",
+    "failedToLoadItems": "Failed to load collection items: ${error}",
+    "selectCollection": "Select Collection",
+    "createNewCollection": "Create New Collection",
+    "collectionName": "Collection Name",
+    "enterCollectionName": "Enter collection name",
+    "addedToCollection": "Added to collection",
+    "errorAddingToCollection": "Failed to add to collection",
+    "created": "Collection created",
+    "removeFromCollection": "Remove from collection",
+    "removeFromCollectionConfirm": "Remove \"${title}\" from this collection?",
+    "removedFromCollection": "Removed from collection",
+    "removeFromCollectionFailed": "Failed to remove from collection",
+    "removeFromCollectionError": "Error removing from collection: ${error}"
+  },
+  "playlists": {
+    "title": "Playlists",
+    "playlist": "Playlist",
+    "noPlaylists": "No playlists found",
+    "create": "Create Playlist",
+    "playlistName": "Playlist Name",
+    "enterPlaylistName": "Enter playlist name",
+    "delete": "Delete Playlist",
+    "removeItem": "Remove from Playlist",
+    "smartPlaylist": "Smart Playlist",
+    "itemCount": "${count} items",
+    "oneItem": "1 item",
+    "emptyPlaylist": "This playlist is empty",
+    "deleteConfirm": "Delete Playlist?",
+    "deleteMessage": "Are you sure you want to delete \"${name}\"?",
+    "created": "Playlist created",
+    "deleted": "Playlist deleted",
+    "itemAdded": "Added to playlist",
+    "itemRemoved": "Removed from playlist",
+    "selectPlaylist": "Select Playlist",
+    "createNewPlaylist": "Create New Playlist",
+    "errorCreating": "Failed to create playlist",
+    "errorDeleting": "Failed to delete playlist",
+    "errorLoading": "Failed to load playlists",
+    "errorAdding": "Failed to add to playlist",
+    "errorReordering": "Failed to reorder playlist item",
+    "errorRemoving": "Failed to remove from playlist"
+  },
+  "downloads": {
+    "title": "Downloads",
+    "manage": "Manage",
+    "tvShows": "TV Shows",
+    "movies": "Movies",
+    "noDownloads": "No downloads yet",
+    "noDownloadsDescription": "Downloaded content will appear here for offline viewing",
+    "downloadNow": "Download",
+    "deleteDownload": "Delete download",
+    "retryDownload": "Retry download",
+    "downloadQueued": "Download queued",
+    "episodesQueued": "${count} episodes queued for download",
+    "downloadDeleted": "Download deleted",
+    "deleteConfirm": "Are you sure you want to delete \"${title}\"? This will remove the downloaded file from your device.",
+    "deletingWithProgress": "Deleting ${title}... (${current} of ${total})"
   }
 }
diff --git a/lib/i18n/strings_de.i18n.json b/lib/i18n/strings_de.i18n.json
new file mode 100644
index 00000000..4a8ecd13
--- /dev/null
+++ b/lib/i18n/strings_de.i18n.json
@@ -0,0 +1,501 @@
+{
+  "app": {
+    "title": "Plezy",
+    "loading": "Lädt..."
+  },
+  "auth": {
+    "signInWithPlex": "Mit Plex anmelden",
+    "showQRCode": "QR-Code anzeigen",
+    "cancel": "Abbrechen",
+    "authenticate": "Authentifizieren",
+    "retry": "Erneut versuchen",
+    "debugEnterToken": "Debug: Plex-Token eingeben",
+    "plexTokenLabel": "Plex-Auth-Token",
+    "plexTokenHint": "Plex.tv-Token eingeben",
+    "authenticationTimeout": "Authentifizierung abgelaufen. Bitte erneut versuchen.",
+    "scanQRCodeInstruction": "Diesen QR-Code mit einem bei Plex angemeldeten Gerät scannen, um zu authentifizieren.",
+    "waitingForAuth": "Warte auf Authentifizierung...\nBitte Anmeldung im Browser abschließen."
+  },
+  "common": {
+    "cancel": "Abbrechen",
+    "save": "Speichern",
+    "close": "Schließen",
+    "clear": "Leeren",
+    "reset": "Zurücksetzen",
+    "later": "Später",
+    "submit": "Senden",
+    "confirm": "Bestätigen",
+    "retry": "Erneut versuchen",
+    "logout": "Abmelden",
+    "unknown": "Unbekannt",
+    "refresh": "Aktualisieren",
+    "yes": "Ja",
+    "no": "Nein",
+    "delete": "Löschen",
+    "shuffle": "Zufall",
+    "addTo": "Hinzufügen zu..."
+  },
+  "screens": {
+    "licenses": "Lizenzen",
+    "selectServer": "Server auswählen",
+    "switchProfile": "Profil wechseln",
+    "subtitleStyling": "Untertitel-Stil",
+    "search": "Suche",
+    "logs": "Protokolle"
+  },
+  "update": {
+    "available": "Update verfügbar",
+    "versionAvailable": "Version ${version} ist verfügbar",
+    "currentVersion": "Aktuell: ${version}",
+    "skipVersion": "Diese Version überspringen",
+    "viewRelease": "Release anzeigen",
+    "latestVersion": "Aktuellste Version installiert",
+    "checkFailed": "Fehler bei der Updateprüfung"
+  },
+  "settings": {
+    "title": "Einstellungen",
+    "language": "Sprache",
+    "theme": "Design",
+    "appearance": "Darstellung",
+    "videoPlayback": "Videowiedergabe",
+    "advanced": "Erweitert",
+    "useSeasonPostersDescription": "Staffelposter statt Serienposter für Episoden anzeigen",
+    "showHeroSectionDescription": "Bereich mit empfohlenen Inhalten auf der Startseite anzeigen",
+    "secondsLabel": "Sekunden",
+    "minutesLabel": "Minuten",
+    "secondsShort": "s",
+    "minutesShort": "m",
+    "durationHint": "Dauer eingeben (${min}-${max})",
+    "systemTheme": "System",
+    "systemThemeDescription": "Systemeinstellungen folgen",
+    "lightTheme": "Hell",
+    "darkTheme": "Dunkel",
+    "libraryDensity": "Mediathekdichte",
+    "compact": "Kompakt",
+    "compactDescription": "Kleinere Karten, mehr Elemente sichtbar",
+    "normal": "Normal",
+    "normalDescription": "Standardgröße",
+    "comfortable": "Großzügig",
+    "comfortableDescription": "Größere Karten, weniger Elemente sichtbar",
+    "viewMode": "Ansichtsmodus",
+    "gridView": "Raster",
+    "gridViewDescription": "Elemente im Raster anzeigen",
+    "listView": "Liste",
+    "listViewDescription": "Elemente in Listenansicht anzeigen",
+    "useSeasonPosters": "Staffelposter verwenden",
+    "showHeroSection": "Hero-Bereich anzeigen",
+    "hardwareDecoding": "Hardware-Decodierung",
+    "hardwareDecodingDescription": "Hardwarebeschleunigung verwenden, sofern verfügbar",
+    "bufferSize": "Puffergröße",
+    "bufferSizeMB": "${size}MB",
+    "subtitleStyling": "Untertitel-Stil",
+    "subtitleStylingDescription": "Aussehen von Untertiteln anpassen",
+    "smallSkipDuration": "Kleine Sprungdauer",
+    "largeSkipDuration": "Große Sprungdauer",
+    "secondsUnit": "${seconds} Sekunden",
+    "defaultSleepTimer": "Standard-Sleep-Timer",
+    "minutesUnit": "${minutes} Minuten",
+    "rememberTrackSelections": "Spurauswahl pro Serie/Film merken",
+    "rememberTrackSelectionsDescription": "Audio- und Untertitelsprache automatisch speichern, wenn während der Wiedergabe geändert",
+    "videoPlayerControls": "Videoplayer-Steuerung",
+    "keyboardShortcuts": "Tastenkürzel",
+    "keyboardShortcutsDescription": "Tastenkürzel anpassen",
+    "videoPlayerNavigation": "Videoplayer-Navigation",
+    "videoPlayerNavigationDescription": "Pfeiltasten zur Navigation der Videoplayer-Steuerung verwenden",
+    "debugLogging": "Debug-Protokollierung",
+    "debugLoggingDescription": "Detaillierte Protokolle zur Fehleranalyse aktivieren",
+    "viewLogs": "Protokolle anzeigen",
+    "viewLogsDescription": "App-Protokolle anzeigen",
+    "clearCache": "Cache löschen",
+    "clearCacheDescription": "Löscht alle zwischengespeicherten Bilder und Daten. Die App kann danach langsamer laden.",
+    "clearCacheSuccess": "Cache erfolgreich gelöscht",
+    "resetSettings": "Einstellungen zurücksetzen",
+    "resetSettingsDescription": "Alle Einstellungen auf Standard zurücksetzen. Dies kann nicht rückgängig gemacht werden.",
+    "resetSettingsSuccess": "Einstellungen erfolgreich zurückgesetzt",
+    "shortcutsReset": "Tastenkürzel auf Standard zurückgesetzt",
+    "about": "Über",
+    "aboutDescription": "App-Informationen und Lizenzen",
+    "updates": "Updates",
+    "updateAvailable": "Update verfügbar",
+    "checkForUpdates": "Nach Updates suchen",
+    "validationErrorEnterNumber": "Bitte eine gültige Zahl eingeben",
+    "validationErrorDuration": "Dauer muss zwischen ${min} und ${max} ${unit} liegen",
+    "shortcutAlreadyAssigned": "Tastenkürzel bereits zugewiesen an ${action}",
+    "shortcutUpdated": "Tastenkürzel aktualisiert für ${action}",
+    "autoSkip": "Automatisches Überspringen",
+    "autoSkipIntro": "Intro automatisch überspringen",
+    "autoSkipIntroDescription": "Intro-Marker nach wenigen Sekunden automatisch überspringen",
+    "autoSkipCredits": "Abspann automatisch überspringen",
+    "autoSkipCreditsDescription": "Abspann automatisch überspringen und nächste Episode abspielen",
+    "autoSkipDelay": "Verzögerung für automatisches Überspringen",
+    "autoSkipDelayDescription": "${seconds} Sekunden vor dem automatischen Überspringen warten",
+    "downloads": "Downloads",
+    "downloadLocationDescription": "Speicherort für heruntergeladene Inhalte wählen",
+    "downloadLocationDefault": "Standard (App-Speicher)",
+    "downloadLocationCustom": "Benutzerdefinierter Speicherort",
+    "selectFolder": "Ordner auswählen",
+    "resetToDefault": "Auf Standard zurücksetzen",
+    "currentPath": "Aktuell: ${path}",
+    "downloadLocationChanged": "Download-Speicherort geändert",
+    "downloadLocationReset": "Download-Speicherort auf Standard zurückgesetzt",
+    "downloadLocationInvalid": "Ausgewählter Ordner ist nicht beschreibbar",
+    "downloadLocationSelectError": "Ordnerauswahl fehlgeschlagen",
+    "downloadOnWifiOnly": "Nur über WLAN herunterladen",
+    "downloadOnWifiOnlyDescription": "Downloads über mobile Daten verhindern",
+    "cellularDownloadBlocked": "Downloads sind über mobile Daten deaktiviert. Verbinde dich mit einem WLAN oder ändere die Einstellung."
+  },
+  "search": {
+    "hint": "Filme, Serien, Musik suchen...",
+    "tryDifferentTerm": "Anderen Suchbegriff versuchen",
+    "searchYourMedia": "In den eigenen Medien suchen",
+    "enterTitleActorOrKeyword": "Titel, Schauspieler oder Stichwort eingeben"
+  },
+  "hotkeys": {
+    "setShortcutFor": "Tastenkürzel festlegen für ${actionName}",
+    "clearShortcut": "Kürzel löschen"
+  },
+  "pinEntry": {
+    "enterPin": "PIN eingeben",
+    "showPin": "PIN anzeigen",
+    "hidePin": "PIN verbergen"
+  },
+  "fileInfo": {
+    "title": "Dateiinfo",
+    "video": "Video",
+    "audio": "Audio",
+    "file": "Datei",
+    "advanced": "Erweitert",
+    "codec": "Codec",
+    "resolution": "Auflösung",
+    "bitrate": "Bitrate",
+    "frameRate": "Bildrate",
+    "aspectRatio": "Seitenverhältnis",
+    "profile": "Profil",
+    "bitDepth": "Farbtiefe",
+    "colorSpace": "Farbraum",
+    "colorRange": "Farbbereich",
+    "colorPrimaries": "Primärfarben",
+    "chromaSubsampling": "Chroma-Subsampling",
+    "channels": "Kanäle",
+    "path": "Pfad",
+    "size": "Größe",
+    "container": "Container",
+    "duration": "Dauer",
+    "optimizedForStreaming": "Für Streaming optimiert",
+    "has64bitOffsets": "64-Bit-Offsets"
+  },
+  "mediaMenu": {
+    "markAsWatched": "Als gesehen markieren",
+    "markAsUnwatched": "Als ungesehen markieren",
+    "removeFromContinueWatching": "Aus ‚Weiterschauen‘ entfernen",
+    "goToSeries": "Zur Serie",
+    "goToSeason": "Zur Staffel",
+    "shufflePlay": "Zufallswiedergabe",
+    "fileInfo": "Dateiinfo"
+  },
+  "accessibility": {
+    "mediaCardMovie": "${title}, Film",
+    "mediaCardShow": "${title}, Serie",
+    "mediaCardEpisode": "${title}, ${episodeInfo}",
+    "mediaCardSeason": "${title}, ${seasonInfo}",
+    "mediaCardWatched": "angesehen",
+    "mediaCardPartiallyWatched": "${percent} Prozent angesehen",
+    "mediaCardUnwatched": "ungeschaut",
+    "tapToPlay": "Zum Abspielen tippen"
+  },
+  "tooltips": {
+    "shufflePlay": "Zufallswiedergabe",
+    "markAsWatched": "Als gesehen markieren",
+    "markAsUnwatched": "Als ungesehen markieren"
+  },
+  "videoControls": {
+    "audioLabel": "Audio",
+    "subtitlesLabel": "Untertitel",
+    "resetToZero": "Auf 0 ms zurücksetzen",
+    "addTime": "+${amount}${unit}",
+    "minusTime": "-${amount}${unit}",
+    "playsLater": "${label} spielt später",
+    "playsEarlier": "${label} spielt früher",
+    "noOffset": "Kein Offset",
+    "letterbox": "Letterbox",
+    "fillScreen": "Bild füllen",
+    "stretch": "Strecken",
+    "lockRotation": "Rotation sperren",
+    "unlockRotation": "Rotation entsperren",
+    "sleepTimer": "Schlaftimer",
+    "timerActive": "Schlaftimer aktiv",
+    "playbackWillPauseIn": "Wiedergabe wird in ${duration} pausiert",
+    "sleepTimerCompleted": "Schlaftimer abgelaufen – Wiedergabe pausiert",
+    "playButton": "Wiedergeben",
+    "pauseButton": "Pause",
+    "seekBackwardButton": "${seconds} Sekunden zurück",
+    "seekForwardButton": "${seconds} Sekunden vor",
+    "previousButton": "Vorherige Episode",
+    "nextButton": "Nächste Episode",
+    "previousChapterButton": "Vorheriges Kapitel",
+    "nextChapterButton": "Nächstes Kapitel",
+    "muteButton": "Stumm schalten",
+    "unmuteButton": "Stummschaltung aufheben",
+    "settingsButton": "Videoeinstellungen",
+    "audioTrackButton": "Tonspuren",
+    "subtitlesButton": "Untertitel",
+    "chaptersButton": "Kapitel",
+    "versionsButton": "Videoversionen",
+    "aspectRatioButton": "Seitenverhältnis",
+    "fullscreenButton": "Vollbild aktivieren",
+    "exitFullscreenButton": "Vollbild verlassen",
+    "rotationLockButton": "Dreh­sperre",
+    "timelineSlider": "Video-Zeitleiste",
+    "volumeSlider": "Lautstärkepegel",
+    "backButton": "Zurück"
+  },
+  "userStatus": {
+    "admin": "Eigentümer",
+    "restricted": "Eingeschränkt",
+    "protected": "Geschützt",
+    "current": "AKTUELL"
+  },
+  "messages": {
+    "markedAsWatched": "Als gesehen markiert",
+    "markedAsUnwatched": "Als ungesehen markiert",
+    "markedAsWatchedOffline": "Als gesehen markiert (wird synchronisiert, wenn online)",
+    "markedAsUnwatchedOffline": "Als ungesehen markiert (wird synchronisiert, wenn online)",
+    "removedFromContinueWatching": "Aus ‚Weiterschauen' entfernt",
+    "errorLoading": "Fehler: ${error}",
+    "fileInfoNotAvailable": "Dateiinfo nicht verfügbar",
+    "errorLoadingFileInfo": "Fehler beim Laden der Dateiinfo: ${error}",
+    "errorLoadingSeries": "Fehler beim Laden der Serie",
+    "errorLoadingSeason": "Fehler beim Laden der Staffel",
+    "musicNotSupported": "Musikwiedergabe wird noch nicht unterstützt",
+    "logsCleared": "Protokolle gelöscht",
+    "logsCopied": "Protokolle in Zwischenablage kopiert",
+    "noLogsAvailable": "Keine Protokolle verfügbar",
+    "libraryScanning": "Scanne „${title}“...",
+    "libraryScanStarted": "Mediathekscan gestartet für „${title}“",
+    "libraryScanFailed": "Fehler beim Scannen der Mediathek: ${error}",
+    "metadataRefreshing": "Metadaten werden aktualisiert für „${title}“...",
+    "metadataRefreshStarted": "Metadaten-Aktualisierung gestartet für „${title}“",
+    "metadataRefreshFailed": "Metadaten konnten nicht aktualisiert werden: ${error}",
+    "logoutConfirm": "Abmeldung wirklich durchführen?",
+    "noSeasonsFound": "Keine Staffeln gefunden",
+    "noEpisodesFound": "Keine Episoden in der ersten Staffel gefunden",
+    "noEpisodesFoundGeneral": "Keine Episoden gefunden",
+    "noResultsFound": "Keine Ergebnisse gefunden",
+    "sleepTimerSet": "Sleep-Timer gesetzt auf ${label}",
+    "noItemsAvailable": "Keine Elemente verfügbar",
+    "failedToCreatePlayQueue": "Wiedergabewarteschlange konnte nicht erstellt werden",
+    "failedToCreatePlayQueueNoItems": "Wiedergabewarteschlange konnte nicht erstellt werden – keine Elemente",
+    "failedPlayback": "Wiedergabe für ${action} fehlgeschlagen: ${error}",
+    "youAreOffline": "Du bist offline",
+    "offlineFeatureUnavailable": "Diese Funktion erfordert eine Internetverbindung. Deine Downloads und Einstellungen sind weiterhin verfügbar."
+  },
+  "subtitlingStyling": {
+    "stylingOptions": "Stiloptionen",
+    "fontSize": "Schriftgröße",
+    "textColor": "Textfarbe",
+    "borderSize": "Rahmengröße",
+    "borderColor": "Rahmenfarbe",
+    "backgroundOpacity": "Hintergrunddeckkraft",
+    "backgroundColor": "Hintergrundfarbe"
+  },
+  "dialog": {
+    "confirmAction": "Aktion bestätigen",
+    "cancel": "Abbrechen",
+    "playNow": "Jetzt abspielen"
+  },
+  "discover": {
+    "title": "Entdecken",
+    "switchProfile": "Profil wechseln",
+    "switchServer": "Server wechseln",
+    "logout": "Abmelden",
+    "noContentAvailable": "Kein Inhalt verfügbar",
+    "addMediaToLibraries": "Medien zur Mediathek hinzufügen",
+    "continueWatching": "Weiterschauen",
+    "play": "Abspielen",
+    "playEpisode": "S${season}E${episode}",
+    "pause": "Pause",
+    "overview": "Übersicht",
+    "cast": "Besetzung",
+    "seasons": "Staffeln",
+    "studio": "Studio",
+    "rating": "Altersfreigabe",
+    "watched": "Gesehen",
+    "episodeCount": "${count} Episoden",
+    "watchedProgress": "${watched} von ${total} gesehen",
+    "movie": "Film",
+    "tvShow": "Serie",
+    "minutesLeft": "${minutes} Min übrig"
+  },
+  "errors": {
+    "searchFailed": "Suche fehlgeschlagen: ${error}",
+    "connectionTimeout": "Zeitüberschreitung beim Laden von ${context}",
+    "connectionFailed": "Verbindung zum Plex-Server fehlgeschlagen",
+    "failedToLoad": "Fehler beim Laden von ${context}: ${error}",
+    "noClientAvailable": "Kein Client verfügbar",
+    "authenticationFailed": "Authentifizierung fehlgeschlagen: ${error}",
+    "couldNotLaunchUrl": "Auth-URL konnte nicht geöffnet werden",
+    "pleaseEnterToken": "Bitte Token eingeben",
+    "invalidToken": "Ungültiges Token",
+    "failedToVerifyToken": "Token-Verifizierung fehlgeschlagen: ${error}",
+    "failedToSwitchProfile": "Profilwechsel zu ${displayName} fehlgeschlagen"
+  },
+  "libraries": {
+    "title": "Mediatheken",
+    "scanLibraryFiles": "Mediatheksdateien scannen",
+    "scanLibrary": "Mediathek scannen",
+    "analyze": "Analysieren",
+    "analyzeLibrary": "Mediathek analysieren",
+    "refreshMetadata": "Metadaten aktualisieren",
+    "emptyTrash": "Papierkorb leeren",
+    "emptyingTrash": "Papierkorb für „${title}“ wird geleert...",
+    "trashEmptied": "Papierkorb für „${title}“ geleert",
+    "failedToEmptyTrash": "Papierkorb konnte nicht geleert werden: ${error}",
+    "analyzing": "Analysiere „${title}“...",
+    "analysisStarted": "Analyse gestartet für „${title}“",
+    "failedToAnalyze": "Analyse der Mediathek fehlgeschlagen: ${error}",
+    "noLibrariesFound": "Keine Mediatheken gefunden",
+    "thisLibraryIsEmpty": "Diese Mediathek ist leer",
+    "all": "Alle",
+    "clearAll": "Alle löschen",
+    "scanLibraryConfirm": "„${title}“ wirklich scannen?",
+    "analyzeLibraryConfirm": "„${title}“ wirklich analysieren?",
+    "refreshMetadataConfirm": "Metadaten für „${title}“ wirklich aktualisieren?",
+    "emptyTrashConfirm": "Papierkorb für „${title}“ wirklich leeren?",
+    "manageLibraries": "Mediatheken verwalten",
+    "sort": "Sortieren",
+    "sortBy": "Sortieren nach",
+    "filters": "Filter",
+    "confirmActionMessage": "Aktion wirklich durchführen?",
+    "showLibrary": "Mediathek anzeigen",
+    "hideLibrary": "Mediathek ausblenden",
+    "libraryOptions": "Mediatheksoptionen",
+    "content": "Bibliotheksinhalt",
+    "selectLibrary": "Bibliothek auswählen",
+    "filtersWithCount": "Filter (${count})",
+    "noRecommendations": "Keine Empfehlungen verfügbar",
+    "noCollections": "Keine Sammlungen in dieser Mediathek",
+    "noFoldersFound": "Keine Ordner gefunden",
+    "folders": "Ordner",
+    "tabs": {
+      "recommended": "Empfohlen",
+      "browse": "Durchsuchen",
+      "collections": "Sammlungen",
+      "playlists": "Wiedergabelisten"
+    },
+    "groupings": {
+      "all": "Alle",
+      "movies": "Filme",
+      "shows": "Serien",
+      "seasons": "Staffeln",
+      "episodes": "Episoden",
+      "folders": "Ordner"
+    }
+  },
+  "about": {
+    "title": "Über",
+    "openSourceLicenses": "Open-Source-Lizenzen",
+    "versionLabel": "Version ${version}",
+    "appDescription": "Ein schöner Plex-Client für Flutter",
+    "viewLicensesDescription": "Lizenzen von Drittanbieter-Bibliotheken anzeigen"
+  },
+  "serverSelection": {
+    "allServerConnectionsFailed": "Verbindung zu allen Servern fehlgeschlagen. Bitte Netzwerk prüfen und erneut versuchen.",
+    "noServersFound": "Keine Server gefunden",
+    "noServersFoundForAccount": "Keine Server gefunden für ${username} (${email})",
+    "failedToLoadServers": "Server konnten nicht geladen werden: ${error}"
+  },
+  "hubDetail": {
+    "title": "Titel",
+    "releaseYear": "Erscheinungsjahr",
+    "dateAdded": "Hinzugefügt am",
+    "rating": "Bewertung",
+    "noItemsFound": "Keine Elemente gefunden"
+  },
+  "logs": {
+    "clearLogs": "Protokolle löschen",
+    "copyLogs": "Protokolle kopieren",
+    "error": "Fehler:",
+    "stackTrace": "Stacktrace:"
+  },
+  "licenses": {
+    "relatedPackages": "Verwandte Pakete",
+    "license": "Lizenz",
+    "licenseNumber": "Lizenz ${number}",
+    "licensesCount": "${count} Lizenzen"
+  },
+  "navigation": {
+    "home": "Start",
+    "search": "Suche",
+    "libraries": "Mediatheken",
+    "settings": "Einstellungen",
+    "downloads": "Downloads"
+  },
+  "downloads": {
+    "title": "Downloads",
+    "manage": "Verwalten",
+    "tvShows": "Serien",
+    "movies": "Filme",
+    "noDownloads": "Noch keine Downloads",
+    "noDownloadsDescription": "Heruntergeladene Inhalte werden hier für die Offline-Wiedergabe angezeigt",
+    "downloadNow": "Herunterladen",
+    "deleteDownload": "Download löschen",
+    "retryDownload": "Download wiederholen",
+    "downloadQueued": "Download in Warteschlange",
+    "episodesQueued": "${count} Episoden zum Download hinzugefügt",
+    "downloadDeleted": "Download gelöscht",
+    "deleteConfirm": "Möchtest du \"${title}\" wirklich löschen? Die heruntergeladene Datei wird von deinem Gerät entfernt.",
+    "deletingWithProgress": "Lösche ${title}... (${current} von ${total})"
+  },
+  "playlists": {
+    "title": "Wiedergabelisten",
+    "noPlaylists": "Keine Wiedergabelisten gefunden",
+    "create": "Wiedergabeliste erstellen",
+    "playlistName": "Name der Wiedergabeliste",
+    "enterPlaylistName": "Name der Wiedergabeliste eingeben",
+    "delete": "Wiedergabeliste löschen",
+    "removeItem": "Aus Wiedergabeliste entfernen",
+    "smartPlaylist": "Intelligente Wiedergabeliste",
+    "itemCount": "${count} Elemente",
+    "oneItem": "1 Element",
+    "emptyPlaylist": "Diese Wiedergabeliste ist leer",
+    "deleteConfirm": "Wiedergabeliste löschen?",
+    "deleteMessage": "Soll \"${name}\" wirklich gelöscht werden?",
+    "created": "Wiedergabeliste erstellt",
+    "deleted": "Wiedergabeliste gelöscht",
+    "itemAdded": "Zur Wiedergabeliste hinzugefügt",
+    "itemRemoved": "Aus Wiedergabeliste entfernt",
+    "selectPlaylist": "Wiedergabeliste auswählen",
+    "createNewPlaylist": "Neue Wiedergabeliste erstellen",
+    "errorCreating": "Wiedergabeliste konnte nicht erstellt werden",
+    "errorDeleting": "Wiedergabeliste konnte nicht gelöscht werden",
+    "errorLoading": "Wiedergabelisten konnten nicht geladen werden",
+    "errorAdding": "Konnte nicht zur Wiedergabeliste hinzugefügt werden",
+    "errorReordering": "Element der Wiedergabeliste konnte nicht neu geordnet werden",
+    "errorRemoving": "Konnte nicht aus der Wiedergabeliste entfernt werden",
+    "playlist": "Wiedergabeliste"
+  },
+  "collections": {
+    "title": "Sammlungen",
+    "collection": "Sammlung",
+    "empty": "Sammlung ist leer",
+    "unknownLibrarySection": "Löschen nicht möglich: Unbekannte Bibliothekssektion",
+    "deleteCollection": "Sammlung löschen",
+    "deleteConfirm": "Sind Sie sicher, dass Sie \"${title}\" löschen möchten? Dies kann nicht rückgängig gemacht werden.",
+    "deleted": "Sammlung gelöscht",
+    "deleteFailed": "Sammlung konnte nicht gelöscht werden",
+    "deleteFailedWithError": "Sammlung konnte nicht gelöscht werden: ${error}",
+    "failedToLoadItems": "Sammlungselemente konnten nicht geladen werden: ${error}",
+    "selectCollection": "Sammlung auswählen",
+    "createNewCollection": "Neue Sammlung erstellen",
+    "collectionName": "Sammlungsname",
+    "enterCollectionName": "Sammlungsnamen eingeben",
+    "addedToCollection": "Zur Sammlung hinzugefügt",
+    "errorAddingToCollection": "Fehler beim Hinzufügen zur Sammlung",
+    "created": "Sammlung erstellt",
+    "removeFromCollection": "Aus Sammlung entfernen",
+    "removeFromCollectionConfirm": "\"${title}\" aus dieser Sammlung entfernen?",
+    "removedFromCollection": "Aus Sammlung entfernt",
+    "removeFromCollectionFailed": "Entfernen aus Sammlung fehlgeschlagen",
+    "removeFromCollectionError": "Fehler beim Entfernen aus der Sammlung: ${error}"
+  }
+}
diff --git a/lib/i18n/strings_it.i18n.json b/lib/i18n/strings_it.i18n.json
index efe57079..cfdfabfc 100644
--- a/lib/i18n/strings_it.i18n.json
+++ b/lib/i18n/strings_it.i18n.json
@@ -26,18 +26,14 @@
     "submit": "Invia",
     "confirm": "Conferma",
     "retry": "Riprova",
-    "playNow": "Riproduci ora",
     "logout": "Disconnetti",
-    "online": "Online",
-    "offline": "Offline",
-    "owned": "Di proprietà",
-    "shared": "Condiviso",
-    "current": "CORRENTE",
     "unknown": "Sconosciuto",
     "refresh": "Aggiorna",
     "yes": "Sì",
     "no": "No",
-    "server": "Server"
+    "delete": "Elimina",
+    "shuffle": "Casuale",
+    "addTo": "Aggiungi a..."
   },
   "screens": {
     "licenses": "Licenze",
@@ -45,7 +41,7 @@
     "switchProfile": "Cambia profilo",
     "subtitleStyling": "Stile sottotitoli",
     "search": "Cerca",
-    "logs": "Logs"
+    "logs": "Registro"
   },
   "update": {
     "available": "Aggiornamento disponibile",
@@ -62,7 +58,6 @@
     "theme": "Tema",
     "appearance": "Aspetto",
     "videoPlayback": "Riproduzione video",
-    "shufflePlay": "Riproduzione casuale",
     "advanced": "Avanzate",
     "useSeasonPostersDescription": "Mostra il poster della stagione invece del poster della serie per gli episodi",
     "showHeroSectionDescription": "Visualizza il carosello dei contenuti in primo piano sulla schermata iniziale",
@@ -100,15 +95,13 @@
     "secondsUnit": "${seconds} secondi",
     "defaultSleepTimer": "Timer spegnimento predefinito",
     "minutesUnit": "${minutes} minuti",
-    "unwatchedOnly": "Solo non guardati",
-    "unwatchedOnlyDescription": "Includi solo gli episodi non guardati nella coda di riproduzione casuale",
-    "shuffleOrderNavigation": "Navigazione in ordine casuale",
-    "shuffleOrderNavigationDescription": "I pulsanti Avanti/Indietro seguono l'ordine casuale",
-    "loopShuffleQueue": "Coda di riproduzione casuale in loop",
-    "loopShuffleQueueDescription": "Riavvia la coda quando raggiungi la fine",
+    "rememberTrackSelections": "Ricorda selezioni tracce per serie/film",
+    "rememberTrackSelectionsDescription": "Salva automaticamente le preferenze delle lingue audio e sottotitoli quando cambi tracce durante la riproduzione",
     "videoPlayerControls": "Controlli del lettore video",
     "keyboardShortcuts": "Scorciatoie da tastiera",
     "keyboardShortcutsDescription": "Personalizza le scorciatoie da tastiera",
+    "videoPlayerNavigation": "Navigazione del lettore video",
+    "videoPlayerNavigationDescription": "Usa i tasti freccia per navigare nei controlli del lettore video",
     "debugLogging": "Log di debug",
     "debugLoggingDescription": "Abilita il logging dettagliato per la risoluzione dei problemi",
     "viewLogs": "Visualizza log",
@@ -128,7 +121,28 @@
     "validationErrorEnterNumber": "Inserisci un numero valido",
     "validationErrorDuration": "la durata deve essere compresa tra ${min} e ${max} ${unit}",
     "shortcutAlreadyAssigned": "Scorciatoia già assegnata a ${action}",
-    "shortcutUpdated": "Scorciatoia aggiornata per ${action}"
+    "shortcutUpdated": "Scorciatoia aggiornata per ${action}",
+    "autoSkip": "Salto Automatico",
+    "autoSkipIntro": "Salta Intro Automaticamente",
+    "autoSkipIntroDescription": "Salta automaticamente i marcatori dell'intro dopo alcuni secondi",
+    "autoSkipCredits": "Salta Crediti Automaticamente",
+    "autoSkipCreditsDescription": "Salta automaticamente i crediti e riproduci l'episodio successivo",
+    "autoSkipDelay": "Ritardo Salto Automatico",
+    "autoSkipDelayDescription": "Aspetta ${seconds} secondi prima del salto automatico",
+    "downloads": "Download",
+    "downloadLocationDescription": "Scegli dove salvare i contenuti scaricati",
+    "downloadLocationDefault": "Predefinita (Archiviazione App)",
+    "downloadLocationCustom": "Posizione Personalizzata",
+    "selectFolder": "Seleziona Cartella",
+    "resetToDefault": "Ripristina Predefinita",
+    "currentPath": "Corrente: ${path}",
+    "downloadLocationChanged": "Posizione di download modificata",
+    "downloadLocationReset": "Posizione di download ripristinata a predefinita",
+    "downloadLocationInvalid": "La cartella selezionata non è scrivibile",
+    "downloadLocationSelectError": "Impossibile selezionare la cartella",
+    "downloadOnWifiOnly": "Scarica solo con WiFi",
+    "downloadOnWifiOnlyDescription": "Impedisci i download quando si utilizza la rete dati cellulare",
+    "cellularDownloadBlocked": "I download sono disabilitati sulla rete dati cellulare. Connettiti al WiFi o modifica l'impostazione."
   },
   "search": {
     "hint": "Cerca film. spettacoli, musica...",
@@ -179,6 +193,16 @@
     "shufflePlay": "Riproduzione casuale",
     "fileInfo": "Info sul file"
   },
+  "accessibility": {
+    "mediaCardMovie": "${title}, film",
+    "mediaCardShow": "${title}, serie TV",
+    "mediaCardEpisode": "${title}, ${episodeInfo}",
+    "mediaCardSeason": "${title}, ${seasonInfo}",
+    "mediaCardWatched": "visto",
+    "mediaCardPartiallyWatched": "${percent} percento visto",
+    "mediaCardUnwatched": "non visto",
+    "tapToPlay": "Tocca per riprodurre"
+  },
   "tooltips": {
     "shufflePlay": "Riproduzione casuale",
     "markAsWatched": "Segna come visto",
@@ -192,21 +216,50 @@
     "minusTime": "-${amount}${unit}",
     "playsLater": "${label} riprodotto dopo",
     "playsEarlier": "${label} riprodotto prima",
-    "noOffset": "No offset",
+    "noOffset": "Nessun offset",
     "letterbox": "Letterbox",
     "fillScreen": "Riempi schermo",
     "stretch": "Allunga",
     "lockRotation": "Blocca rotazione",
-    "unlockRotation": "Sblocca rotazione"
+    "unlockRotation": "Sblocca rotazione",
+    "sleepTimer": "Timer di spegnimento",
+    "timerActive": "Timer attivo",
+    "playbackWillPauseIn": "La riproduzione si interromperà tra ${duration}",
+    "sleepTimerCompleted": "Timer di spegnimento completato - riproduzione in pausa",
+    "playButton": "Riproduci",
+    "pauseButton": "Pausa",
+    "seekBackwardButton": "Riavvolgi di ${seconds} secondi",
+    "seekForwardButton": "Avanza di ${seconds} secondi",
+    "previousButton": "Episodio precedente",
+    "nextButton": "Episodio successivo",
+    "previousChapterButton": "Capitolo precedente",
+    "nextChapterButton": "Capitolo successivo",
+    "muteButton": "Silenzia",
+    "unmuteButton": "Riattiva audio",
+    "settingsButton": "Impostazioni video",
+    "audioTrackButton": "Tracce audio",
+    "subtitlesButton": "Sottotitoli",
+    "chaptersButton": "Capitoli",
+    "versionsButton": "Versioni video",
+    "aspectRatioButton": "Proporzioni",
+    "fullscreenButton": "Attiva schermo intero",
+    "exitFullscreenButton": "Esci da schermo intero",
+    "rotationLockButton": "Blocco rotazione",
+    "timelineSlider": "Timeline video",
+    "volumeSlider": "Livello volume",
+    "backButton": "Indietro"
   },
   "userStatus": {
     "admin": "Admin",
     "restricted": "Limitato",
-    "protected": "Protetto"
+    "protected": "Protetto",
+    "current": "ATTUALE"
   },
   "messages": {
     "markedAsWatched": "Segna come visto",
     "markedAsUnwatched": "Segna come non visto",
+    "markedAsWatchedOffline": "Segnato come visto (sincronizzato online)",
+    "markedAsUnwatchedOffline": "Segnato come non visto (sincronizzato online)",
     "removedFromContinueWatching": "Rimosso da Continua a guardare",
     "errorLoading": "Errore: ${error}",
     "fileInfoNotAvailable": "Informazioni sul file non disponibili",
@@ -223,17 +276,18 @@
     "metadataRefreshing": "Aggiornamento metadati per \"${title}\"...",
     "metadataRefreshStarted": "Aggiornamento metadati per \"${title}\"",
     "metadataRefreshFailed": "Errore aggiornamento metadati: ${error}",
-    "noPlexToken": "Nessun token Plex trovato. Riesegui l'accesso.",
     "logoutConfirm": "Sei sicuro di volerti disconnettere?",
     "noSeasonsFound": "Nessuna stagione trovata",
     "noEpisodesFound": "Nessun episodio trovato nella prima stagione",
     "noEpisodesFoundGeneral": "Nessun episodio trovato",
     "noResultsFound": "Nessun risultato",
     "sleepTimerSet": "Imposta timer spegnimento per ${label}",
-    "failedToSwitchProfile": "Impossibile passare a ${displayName}"
-  },
-  "profile": {
-    "noUsersAvailable": "Nessun utente disponibile"
+    "noItemsAvailable": "Nessun elemento disponibile",
+    "failedToCreatePlayQueue": "Impossibile creare la coda di riproduzione",
+    "failedToCreatePlayQueueNoItems": "Impossibile creare la coda di riproduzione - nessun elemento",
+    "failedPlayback": "Impossibile ${action}: ${error}",
+    "youAreOffline": "Sei offline",
+    "offlineFeatureUnavailable": "Questa funzione richiede una connessione internet. I tuoi download e le impostazioni sono ancora disponibili."
   },
   "subtitlingStyling": {
     "stylingOptions": "Opzioni stile",
@@ -246,26 +300,26 @@
   },
   "dialog": {
     "confirmAction": "Conferma azione",
-    "areYouSure": "Sei sicuro di voler eseguire questa azione?",
     "cancel": "Cancella",
     "playNow": "Riproduci ora"
   },
   "discover": {
-    "title": "Discover",
+    "title": "Esplora",
     "switchProfile": "Cambia profilo",
     "switchServer": "Cambia server",
     "logout": "Disconnetti",
     "noContentAvailable": "Nessun contenuto disponibile",
     "addMediaToLibraries": "Aggiungi alcuni file multimediali alle tue librerie",
     "continueWatching": "Continua a guardare",
-    "recentlyAdded": "Aggiunti di recente",
     "play": "Riproduci",
-    "resume": "Riprendi",
-    "playEpisode": "Riproduci S${season}, E${episode}",
-    "resumeEpisode": "Riprendi S${season}, E${episode}",
+    "playEpisode": "S${season}E${episode}",
     "pause": "Pausa",
     "overview": "Panoramica",
-    "cast": "Cast",
+    "cast": "Attori",
+    "seasons": "Stagioni",
+    "studio": "Studio",
+    "rating": "Classificazione",
+    "watched": "Guardato",
     "episodeCount": "${count} episodi",
     "watchedProgress": "${watched}/${total} guardati",
     "movie": "Film",
@@ -283,8 +337,7 @@
     "pleaseEnterToken": "Inserisci token",
     "invalidToken": "Token non valido",
     "failedToVerifyToken": "Verifica token fallita: ${error}",
-    "failedToSwitchProfile": "Impossibile passare a ${displayName}",
-    "connectionFailedGeneric": "Connessione fallita"
+    "failedToSwitchProfile": "Impossibile passare a ${displayName}"
   },
   "libraries": {
     "title": "Librerie",
@@ -312,11 +365,31 @@
     "sort": "Ordina",
     "sortBy": "Ordina per",
     "filters": "Filtri",
-    "loadingLibraryWithCount": "Caricamento librerie... (${count} oggetti caricati)",
     "confirmActionMessage": "Sei sicuro di voler eseguire questa azione?",
     "showLibrary": "Mostra libreria",
     "hideLibrary": "Nascondi libreria",
-    "libraryOptions": "Opzioni libreria"
+    "libraryOptions": "Opzioni libreria",
+    "content": "contenuto della libreria",
+    "selectLibrary": "Seleziona libreria",
+    "filtersWithCount": "Filtri (${count})",
+    "noRecommendations": "Nessun consiglio disponibile",
+    "noCollections": "Nessuna raccolta in questa libreria",
+    "noFoldersFound": "Nessuna cartella trovata",
+    "folders": "cartelle",
+    "tabs": {
+      "recommended": "Consigliati",
+      "browse": "Esplora",
+      "collections": "Raccolte",
+      "playlists": "Playlist"
+    },
+    "groupings": {
+      "all": "Tutti",
+      "movies": "Film",
+      "shows": "Serie TV",
+      "seasons": "Stagioni",
+      "episodes": "Episodi",
+      "folders": "Cartelle"
+    }
   },
   "about": {
     "title": "Informazioni",
@@ -326,17 +399,9 @@
     "viewLicensesDescription": "Visualizza le licenze delle librerie di terze parti"
   },
   "serverSelection": {
-    "connectingToServer": "Connessione al server...",
-    "serverDebugCopied": "Dati di debug del server copiati negli appunti",
-    "copyDebugData": "Copia dati di debug",
+    "allServerConnectionsFailed": "Impossibile connettersi a nessun server. Controlla la tua rete e riprova.",
     "noServersFound": "Nessun server trovato",
-    "malformedServerData": "Trovato ${count} server con dati difettosi. Nessun server valido disponibile.",
-    "incompleteServerInfo": "Alcuni server presentano informazioni incomplete e sono stati ignorati. Controlla il tuo account Plex.tv.",
-    "incompleteConnectionInfo": "Le informazioni di connessione al server sono incomplete. Riprova.",
-    "malformedServerInfo": "Le informazioni sul server sono errate: ${message}",
-    "networkConnectionFailed": "Connessione di rete non riuscita. Controlla la tua connessione Internet e riprova.",
-    "authenticationFailed": "Autenticazione fallita. Effettua nuovamente l'accesso.",
-    "plexServiceUnavailable": "Servizio Plex non disponibile. Riprova più tardi.",
+    "noServersFoundForAccount": "Nessun server trovato per ${username} (${email})",
     "failedToLoadServers": "Impossibile caricare i server: ${error}"
   },
   "hubDetail": {
@@ -347,11 +412,8 @@
     "noItemsFound": "Nessun elemento trovato"
   },
   "logs": {
-    "title": "Log",
     "clearLogs": "Cancella log",
     "copyLogs": "Copia log",
-    "exportLogs": "Esporta log",
-    "noLogsToShow": "Nessun log da mostrare",
     "error": "Errore:",
     "stackTrace": "Traccia dello stack:"
   },
@@ -365,6 +427,75 @@
     "home": "Home",
     "search": "Cerca",
     "libraries": "Librerie",
-    "settings": "Impostazioni"
+    "settings": "Impostazioni",
+    "downloads": "Download"
+  },
+  "downloads": {
+    "title": "Download",
+    "manage": "Gestisci",
+    "tvShows": "Serie TV",
+    "movies": "Film",
+    "noDownloads": "Nessun download",
+    "noDownloadsDescription": "I contenuti scaricati appariranno qui per la visualizzazione offline",
+    "downloadNow": "Scarica",
+    "deleteDownload": "Elimina download",
+    "retryDownload": "Riprova download",
+    "downloadQueued": "Download in coda",
+    "episodesQueued": "${count} episodi in coda per il download",
+    "downloadDeleted": "Download eliminato",
+    "deleteConfirm": "Sei sicuro di voler eliminare \"${title}\"? Il file scaricato verrà rimosso dal tuo dispositivo.",
+    "deletingWithProgress": "Eliminazione di ${title}... (${current} di ${total})"
+  },
+  "playlists": {
+    "title": "Playlist",
+    "noPlaylists": "Nessuna playlist trovata",
+    "create": "Crea playlist",
+    "playlistName": "Nome playlist",
+    "enterPlaylistName": "Inserisci nome playlist",
+    "delete": "Elimina playlist",
+    "removeItem": "Rimuovi da playlist",
+    "smartPlaylist": "Playlist intelligente",
+    "itemCount": "${count} elementi",
+    "oneItem": "1 elemento",
+    "emptyPlaylist": "Questa playlist è vuota",
+    "deleteConfirm": "Eliminare playlist?",
+    "deleteMessage": "Sei sicuro di voler eliminare \"${name}\"?",
+    "created": "Playlist creata",
+    "deleted": "Playlist eliminata",
+    "itemAdded": "Aggiunto alla playlist",
+    "itemRemoved": "Rimosso dalla playlist",
+    "selectPlaylist": "Seleziona playlist",
+    "createNewPlaylist": "Crea nuova playlist",
+    "errorCreating": "Errore durante la creazione della playlist",
+    "errorDeleting": "Errore durante l'eliminazione della playlist",
+    "errorLoading": "Errore durante il caricamento delle playlist",
+    "errorAdding": "Errore durante l'aggiunta alla playlist",
+    "errorReordering": "Errore durante il riordino dell'elemento della playlist",
+    "errorRemoving": "Errore durante la rimozione dalla playlist",
+    "playlist": "Playlist"
+  },
+  "collections": {
+    "title": "Raccolte",
+    "collection": "Raccolta",
+    "empty": "La raccolta è vuota",
+    "unknownLibrarySection": "Impossibile eliminare: sezione libreria sconosciuta",
+    "deleteCollection": "Elimina raccolta",
+    "deleteConfirm": "Sei sicuro di voler eliminare \"${title}\"? Questa azione non può essere annullata.",
+    "deleted": "Raccolta eliminata",
+    "deleteFailed": "Impossibile eliminare la raccolta",
+    "deleteFailedWithError": "Impossibile eliminare la raccolta: ${error}",
+    "failedToLoadItems": "Impossibile caricare gli elementi della raccolta: ${error}",
+    "selectCollection": "Seleziona raccolta",
+    "createNewCollection": "Crea nuova raccolta",
+    "collectionName": "Nome raccolta",
+    "enterCollectionName": "Inserisci nome raccolta",
+    "addedToCollection": "Aggiunto alla raccolta",
+    "errorAddingToCollection": "Errore nell'aggiunta alla raccolta",
+    "created": "Raccolta creata",
+    "removeFromCollection": "Rimuovi dalla raccolta",
+    "removeFromCollectionConfirm": "Rimuovere \"${title}\" da questa raccolta?",
+    "removedFromCollection": "Rimosso dalla raccolta",
+    "removeFromCollectionFailed": "Impossibile rimuovere dalla raccolta",
+    "removeFromCollectionError": "Errore durante la rimozione dalla raccolta: ${error}"
   }
 }
diff --git a/lib/i18n/strings_nl.i18n.json b/lib/i18n/strings_nl.i18n.json
index 68f2084a..ebe5f008 100644
--- a/lib/i18n/strings_nl.i18n.json
+++ b/lib/i18n/strings_nl.i18n.json
@@ -10,7 +10,7 @@
     "authenticate": "Authenticeren",
     "retry": "Opnieuw proberen",
     "debugEnterToken": "Debug: Voer Plex Token in",
-    "plexTokenLabel": "Plex Auth Token",
+    "plexTokenLabel": "Plex Authenticatietoken",
     "plexTokenHint": "Voer je Plex.tv token in",
     "authenticationTimeout": "Authenticatie verlopen. Probeer opnieuw.",
     "scanQRCodeInstruction": "Scan deze QR-code met een apparaat dat is ingelogd op Plex om te authenticeren.",
@@ -26,18 +26,14 @@
     "submit": "Verzenden",
     "confirm": "Bevestigen",
     "retry": "Opnieuw proberen",
-    "playNow": "Nu afspelen",
     "logout": "Uitloggen",
-    "online": "Online",
-    "offline": "Offline",
-    "owned": "Eigendom",
-    "shared": "Gedeeld",
-    "current": "HUIDIG",
     "unknown": "Onbekend",
     "refresh": "Vernieuwen",
     "yes": "Ja",
     "no": "Nee",
-    "server": "Server"
+    "delete": "Verwijderen",
+    "shuffle": "Willekeurig",
+    "addTo": "Toevoegen aan..."
   },
   "screens": {
     "licenses": "Licenties",
@@ -45,7 +41,7 @@
     "switchProfile": "Wissel van profiel",
     "subtitleStyling": "Ondertitel opmaak",
     "search": "Zoeken",
-    "logs": "Logs"
+    "logs": "Logbestanden"
   },
   "update": {
     "available": "Update beschikbaar",
@@ -62,7 +58,6 @@
     "theme": "Thema",
     "appearance": "Uiterlijk",
     "videoPlayback": "Video afspelen",
-    "shufflePlay": "Willekeurig afspelen",
     "advanced": "Geavanceerd",
     "useSeasonPostersDescription": "Toon seizoenposter in plaats van serieposter voor afleveringen",
     "showHeroSectionDescription": "Toon uitgelichte inhoud carrousel op startscherm",
@@ -100,15 +95,13 @@
     "secondsUnit": "${seconds} seconden",
     "defaultSleepTimer": "Standaard slaap timer",
     "minutesUnit": "bij ${minutes} minuten",
-    "unwatchedOnly": "Alleen ongekeken",
-    "unwatchedOnlyDescription": "Alleen ongekeken afleveringen opnemen in willekeurige wachtrij",
-    "shuffleOrderNavigation": "Willekeurige volgorde navigatie",
-    "shuffleOrderNavigationDescription": "Volgende/vorige knoppen volgen willekeurige volgorde",
-    "loopShuffleQueue": "Herhaal willekeurige wachtrij",
-    "loopShuffleQueueDescription": "Start wachtrij opnieuw bij het einde",
+    "rememberTrackSelections": "Onthoud track selecties per serie/film",
+    "rememberTrackSelectionsDescription": "Bewaar automatisch audio- en ondertiteltaalvoorkeuren wanneer je tracks wijzigt tijdens afspelen",
     "videoPlayerControls": "Videospeler bediening",
     "keyboardShortcuts": "Toetsenbord sneltoetsen",
     "keyboardShortcutsDescription": "Pas toetsenbord sneltoetsen aan",
+    "videoPlayerNavigation": "Videospeler navigatie",
+    "videoPlayerNavigationDescription": "Gebruik pijltjestoetsen om door de videospeler bediening te navigeren",
     "debugLogging": "Debug logging",
     "debugLoggingDescription": "Schakel gedetailleerde logging in voor probleemoplossing",
     "viewLogs": "Bekijk logs",
@@ -128,7 +121,28 @@
     "validationErrorEnterNumber": "Voer een geldig nummer in",
     "validationErrorDuration": "Duur moet tussen ${min} en ${max} ${unit} zijn",
     "shortcutAlreadyAssigned": "Sneltoets al toegewezen aan ${action}",
-    "shortcutUpdated": "Sneltoets bijgewerkt voor ${action}"
+    "shortcutUpdated": "Sneltoets bijgewerkt voor ${action}",
+    "autoSkip": "Automatisch Overslaan",
+    "autoSkipIntro": "Intro Automatisch Overslaan",
+    "autoSkipIntroDescription": "Intro-markeringen na enkele seconden automatisch overslaan",
+    "autoSkipCredits": "Credits Automatisch Overslaan",
+    "autoSkipCreditsDescription": "Credits automatisch overslaan en volgende aflevering afspelen",
+    "autoSkipDelay": "Vertraging Automatisch Overslaan",
+    "autoSkipDelayDescription": "${seconds} seconden wachten voor automatisch overslaan",
+    "downloads": "Downloads",
+    "downloadLocationDescription": "Kies waar gedownloade content wordt opgeslagen",
+    "downloadLocationDefault": "Standaard (App-opslag)",
+    "downloadLocationCustom": "Aangepaste Locatie",
+    "selectFolder": "Selecteer Map",
+    "resetToDefault": "Herstel naar Standaard",
+    "currentPath": "Huidig: ${path}",
+    "downloadLocationChanged": "Downloadlocatie gewijzigd",
+    "downloadLocationReset": "Downloadlocatie hersteld naar standaard",
+    "downloadLocationInvalid": "Geselecteerde map is niet beschrijfbaar",
+    "downloadLocationSelectError": "Kan map niet selecteren",
+    "downloadOnWifiOnly": "Alleen via WiFi downloaden",
+    "downloadOnWifiOnlyDescription": "Voorkom downloads bij gebruik van mobiele data",
+    "cellularDownloadBlocked": "Downloads zijn uitgeschakeld bij mobiele data. Maak verbinding met WiFi of wijzig de instelling."
   },
   "search": {
     "hint": "Zoek films, series, muziek...",
@@ -179,6 +193,16 @@
     "shufflePlay": "Willekeurig afspelen",
     "fileInfo": "Bestand info"
   },
+  "accessibility": {
+    "mediaCardMovie": "${title}, film",
+    "mediaCardShow": "${title}, TV-serie",
+    "mediaCardEpisode": "${title}, ${episodeInfo}",
+    "mediaCardSeason": "${title}, ${seasonInfo}",
+    "mediaCardWatched": "bekeken",
+    "mediaCardPartiallyWatched": "${percent} procent bekeken",
+    "mediaCardUnwatched": "niet bekeken",
+    "tapToPlay": "Tik om af te spelen"
+  },
   "tooltips": {
     "shufflePlay": "Willekeurig afspelen",
     "markAsWatched": "Markeer als gekeken",
@@ -197,16 +221,45 @@
     "fillScreen": "Vul scherm",
     "stretch": "Uitrekken",
     "lockRotation": "Vergrendel rotatie",
-    "unlockRotation": "Ontgrendel rotatie"
+    "unlockRotation": "Ontgrendel rotatie",
+    "sleepTimer": "Slaaptimer",
+    "timerActive": "Timer actief",
+    "playbackWillPauseIn": "Afspelen wordt gepauzeerd over ${duration}",
+    "sleepTimerCompleted": "Slaaptimer voltooid - afspelen gepauzeerd",
+    "playButton": "Afspelen",
+    "pauseButton": "Pauzeren",
+    "seekBackwardButton": "Terugspoelen ${seconds} seconden",
+    "seekForwardButton": "Vooruitspoelen ${seconds} seconden",
+    "previousButton": "Vorige aflevering",
+    "nextButton": "Volgende aflevering",
+    "previousChapterButton": "Vorig hoofdstuk",
+    "nextChapterButton": "Volgend hoofdstuk",
+    "muteButton": "Dempen",
+    "unmuteButton": "Dempen opheffen",
+    "settingsButton": "Video-instellingen",
+    "audioTrackButton": "Audiosporen",
+    "subtitlesButton": "Ondertitels",
+    "chaptersButton": "Hoofdstukken",
+    "versionsButton": "Videoversies",
+    "aspectRatioButton": "Beeldverhouding",
+    "fullscreenButton": "Volledig scherm activeren",
+    "exitFullscreenButton": "Volledig scherm verlaten",
+    "rotationLockButton": "Rotatievergrendeling",
+    "timelineSlider": "Videotijdlijn",
+    "volumeSlider": "Volumeniveau",
+    "backButton": "Terug"
   },
   "userStatus": {
     "admin": "Beheerder",
     "restricted": "Beperkt",
-    "protected": "Beschermd"
+    "protected": "Beschermd",
+    "current": "HUIDIG"
   },
   "messages": {
     "markedAsWatched": "Gemarkeerd als gekeken",
     "markedAsUnwatched": "Gemarkeerd als ongekeken",
+    "markedAsWatchedOffline": "Gemarkeerd als gekeken (sync wanneer online)",
+    "markedAsUnwatchedOffline": "Gemarkeerd als ongekeken (sync wanneer online)",
     "removedFromContinueWatching": "Verwijderd uit Doorgaan met kijken",
     "errorLoading": "Fout: ${error}",
     "fileInfoNotAvailable": "Bestand informatie niet beschikbaar",
@@ -223,17 +276,18 @@
     "metadataRefreshing": "Metadata vernieuwen voor \"${title}\"...",
     "metadataRefreshStarted": "Metadata vernieuwen gestart voor \"${title}\"",
     "metadataRefreshFailed": "Kon metadata niet vernieuwen: ${error}",
-    "noPlexToken": "Geen Plex token gevonden. Log opnieuw in.",
     "logoutConfirm": "Weet je zeker dat je wilt uitloggen?",
     "noSeasonsFound": "Geen seizoenen gevonden",
     "noEpisodesFound": "Geen afleveringen gevonden in eerste seizoen",
     "noEpisodesFoundGeneral": "Geen afleveringen gevonden",
     "noResultsFound": "Geen resultaten gevonden",
     "sleepTimerSet": "Slaap timer ingesteld voor ${label}",
-    "failedToSwitchProfile": "Kon niet wisselen naar ${displayName}"
-  },
-  "profile": {
-    "noUsersAvailable": "Geen gebruikers beschikbaar"
+    "noItemsAvailable": "Geen items beschikbaar",
+    "failedToCreatePlayQueue": "Kan afspeelwachtrij niet maken",
+    "failedToCreatePlayQueueNoItems": "Kan afspeelwachtrij niet maken - geen items",
+    "failedPlayback": "Afspelen van ${action} mislukt: ${error}",
+    "youAreOffline": "Je bent offline",
+    "offlineFeatureUnavailable": "Deze functie vereist een internetverbinding. Je downloads en instellingen zijn nog steeds beschikbaar."
   },
   "subtitlingStyling": {
     "stylingOptions": "Opmaak opties",
@@ -246,7 +300,6 @@
   },
   "dialog": {
     "confirmAction": "Bevestig actie",
-    "areYouSure": "Weet je zeker dat je deze actie wilt uitvoeren?",
     "cancel": "Annuleren",
     "playNow": "Nu afspelen"
   },
@@ -258,14 +311,15 @@
     "noContentAvailable": "Geen inhoud beschikbaar",
     "addMediaToLibraries": "Voeg wat media toe aan je bibliotheken",
     "continueWatching": "Verder kijken",
-    "recentlyAdded": "Recent toegevoegd",
     "play": "Afspelen",
-    "resume": "Hervatten",
-    "playEpisode": "Speel S${season}, E${episode}",
-    "resumeEpisode": "Hervat S${season}, E${episode}",
+    "playEpisode": "S${season}E${episode}",
     "pause": "Pauzeren",
     "overview": "Overzicht",
-    "cast": "Cast",
+    "cast": "Acteurs",
+    "seasons": "Seizoenen",
+    "studio": "Studio",
+    "rating": "Leeftijd",
+    "watched": "Bekeken",
     "episodeCount": "${count} afleveringen",
     "watchedProgress": "${watched}/${total} gekeken",
     "movie": "Film",
@@ -283,8 +337,7 @@
     "pleaseEnterToken": "Voer een token in",
     "invalidToken": "Ongeldig token",
     "failedToVerifyToken": "Kon token niet verifiëren: ${error}",
-    "failedToSwitchProfile": "Kon niet wisselen naar ${displayName}",
-    "connectionFailedGeneric": "Verbinding mislukt"
+    "failedToSwitchProfile": "Kon niet wisselen naar ${displayName}"
   },
   "libraries": {
     "title": "Bibliotheken",
@@ -312,11 +365,31 @@
     "sort": "Sorteren",
     "sortBy": "Sorteer op",
     "filters": "Filters",
-    "loadingLibraryWithCount": "Bibliotheek laden... (${count} items geladen)",
     "confirmActionMessage": "Weet je zeker dat je deze actie wilt uitvoeren?",
     "showLibrary": "Toon bibliotheek",
     "hideLibrary": "Verberg bibliotheek",
-    "libraryOptions": "Bibliotheek opties"
+    "libraryOptions": "Bibliotheek opties",
+    "content": "bibliotheekinhoud",
+    "selectLibrary": "Bibliotheek kiezen",
+    "filtersWithCount": "Filters (${count})",
+    "noRecommendations": "Geen aanbevelingen beschikbaar",
+    "noCollections": "Geen collecties in deze bibliotheek",
+    "noFoldersFound": "Geen mappen gevonden",
+    "folders": "mappen",
+    "tabs": {
+      "recommended": "Aanbevolen",
+      "browse": "Bladeren",
+      "collections": "Collecties",
+      "playlists": "Afspeellijsten"
+    },
+    "groupings": {
+      "all": "Alles",
+      "movies": "Films",
+      "shows": "Series",
+      "seasons": "Seizoenen",
+      "episodes": "Afleveringen",
+      "folders": "Mappen"
+    }
   },
   "about": {
     "title": "Over",
@@ -326,17 +399,9 @@
     "viewLicensesDescription": "Bekijk licenties van third-party bibliotheken"
   },
   "serverSelection": {
-    "connectingToServer": "Verbinden met server...",
-    "serverDebugCopied": "Server debug gegevens gekopieerd naar klembord",
-    "copyDebugData": "Kopieer debug gegevens",
+    "allServerConnectionsFailed": "Kon niet verbinden met servers. Controleer je netwerk en probeer opnieuw.",
     "noServersFound": "Geen servers gevonden",
-    "malformedServerData": "${count} server(s) gevonden met verkeerde data. Geen geldige servers beschikbaar.",
-    "incompleteServerInfo": "Sommige servers hebben incomplete informatie en zijn overgeslagen. Controleer je Plex.tv account.",
-    "incompleteConnectionInfo": "Server verbinding informatie is incompleet. Probeer opnieuw.",
-    "malformedServerInfo": "Server informatie is verkeerd geformatteerd: ${message}",
-    "networkConnectionFailed": "Netwerkverbinding mislukt. Controleer je internetverbinding en probeer opnieuw.",
-    "authenticationFailed": "Authenticatie mislukt. Log opnieuw in.",
-    "plexServiceUnavailable": "Plex service niet beschikbaar. Probeer later opnieuw.",
+    "noServersFoundForAccount": "Geen servers gevonden voor ${username} (${email})",
     "failedToLoadServers": "Kon servers niet laden: ${error}"
   },
   "hubDetail": {
@@ -347,13 +412,10 @@
     "noItemsFound": "Geen items gevonden"
   },
   "logs": {
-    "title": "Logs",
     "clearLogs": "Wis logs",
     "copyLogs": "Kopieer logs",
-    "exportLogs": "Exporteer logs",
-    "noLogsToShow": "Geen logs om te tonen",
     "error": "Fout:",
-    "stackTrace": "Stack Trace:"
+    "stackTrace": "Stacktracering:"
   },
   "licenses": {
     "relatedPackages": "Gerelateerde pakketten",
@@ -362,9 +424,78 @@
     "licensesCount": "${count} licenties"
   },
   "navigation": {
-    "home": "Home",
+    "home": "Thuis",
     "search": "Zoeken",
     "libraries": "Bibliotheken",
-    "settings": "Instellingen"
+    "settings": "Instellingen",
+    "downloads": "Downloads"
+  },
+  "downloads": {
+    "title": "Downloads",
+    "manage": "Beheren",
+    "tvShows": "Series",
+    "movies": "Films",
+    "noDownloads": "Nog geen downloads",
+    "noDownloadsDescription": "Gedownloade content verschijnt hier voor offline weergave",
+    "downloadNow": "Download",
+    "deleteDownload": "Download verwijderen",
+    "retryDownload": "Download opnieuw proberen",
+    "downloadQueued": "Download in wachtrij",
+    "episodesQueued": "${count} afleveringen in wachtrij voor download",
+    "downloadDeleted": "Download verwijderd",
+    "deleteConfirm": "Weet je zeker dat je \"${title}\" wilt verwijderen? Het gedownloade bestand wordt van je apparaat verwijderd.",
+    "deletingWithProgress": "Verwijderen van ${title}... (${current} van ${total})"
+  },
+  "playlists": {
+    "title": "Afspeellijsten",
+    "noPlaylists": "Geen afspeellijsten gevonden",
+    "create": "Afspeellijst maken",
+    "playlistName": "Naam afspeellijst",
+    "enterPlaylistName": "Voer naam afspeellijst in",
+    "delete": "Afspeellijst verwijderen",
+    "removeItem": "Verwijderen uit afspeellijst",
+    "smartPlaylist": "Slimme afspeellijst",
+    "itemCount": "${count} items",
+    "oneItem": "1 item",
+    "emptyPlaylist": "Deze afspeellijst is leeg",
+    "deleteConfirm": "Afspeellijst verwijderen?",
+    "deleteMessage": "Weet je zeker dat je \"${name}\" wilt verwijderen?",
+    "created": "Afspeellijst gemaakt",
+    "deleted": "Afspeellijst verwijderd",
+    "itemAdded": "Toegevoegd aan afspeellijst",
+    "itemRemoved": "Verwijderd uit afspeellijst",
+    "selectPlaylist": "Selecteer afspeellijst",
+    "createNewPlaylist": "Nieuwe afspeellijst maken",
+    "errorCreating": "Fout bij maken afspeellijst",
+    "errorDeleting": "Fout bij verwijderen afspeellijst",
+    "errorLoading": "Fout bij laden afspeellijsten",
+    "errorAdding": "Fout bij toevoegen aan afspeellijst",
+    "errorReordering": "Fout bij herschikken van afspeellijstitem",
+    "errorRemoving": "Fout bij verwijderen uit afspeellijst",
+    "playlist": "Afspeellijst"
+  },
+  "collections": {
+    "title": "Collecties",
+    "collection": "Collectie",
+    "empty": "Collectie is leeg",
+    "unknownLibrarySection": "Kan niet verwijderen: onbekende bibliotheeksectie",
+    "deleteCollection": "Collectie verwijderen",
+    "deleteConfirm": "Weet je zeker dat je \"${title}\" wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
+    "deleted": "Collectie verwijderd",
+    "deleteFailed": "Collectie verwijderen mislukt",
+    "deleteFailedWithError": "Collectie verwijderen mislukt: ${error}",
+    "failedToLoadItems": "Collectie-items laden mislukt: ${error}",
+    "selectCollection": "Selecteer collectie",
+    "createNewCollection": "Nieuwe collectie maken",
+    "collectionName": "Collectienaam",
+    "enterCollectionName": "Voer collectienaam in",
+    "addedToCollection": "Toegevoegd aan collectie",
+    "errorAddingToCollection": "Fout bij toevoegen aan collectie",
+    "created": "Collectie gemaakt",
+    "removeFromCollection": "Verwijderen uit collectie",
+    "removeFromCollectionConfirm": "\"${title}\" uit deze collectie verwijderen?",
+    "removedFromCollection": "Uit collectie verwijderd",
+    "removeFromCollectionFailed": "Verwijderen uit collectie mislukt",
+    "removeFromCollectionError": "Fout bij verwijderen uit collectie: ${error}"
   }
 }
diff --git a/lib/i18n/strings_sv.i18n.json b/lib/i18n/strings_sv.i18n.json
index c81bc3fc..769c63d0 100644
--- a/lib/i18n/strings_sv.i18n.json
+++ b/lib/i18n/strings_sv.i18n.json
@@ -26,18 +26,14 @@
     "submit": "Skicka",
     "confirm": "Bekräfta",
     "retry": "Försök igen",
-    "playNow": "Spela nu",
     "logout": "Logga ut",
-    "online": "Online",
-    "offline": "Offline",
-    "owned": "Egen",
-    "shared": "Delad",
-    "current": "NUVARANDE",
     "unknown": "Okänd",
     "refresh": "Uppdatera",
     "yes": "Ja",
     "no": "Nej",
-    "server": "Server"
+    "delete": "Ta bort",
+    "shuffle": "Blanda",
+    "addTo": "Lägg till i..."
   },
   "screens": {
     "licenses": "Licenser",
@@ -62,7 +58,6 @@
     "theme": "Tema",
     "appearance": "Utseende",
     "videoPlayback": "Videouppspelning",
-    "shufflePlay": "Blanda uppspelning",
     "advanced": "Avancerat",
     "useSeasonPostersDescription": "Visa säsongsaffisch istället för serieaffisch för avsnitt",
     "showHeroSectionDescription": "Visa utvalda innehållskarusell på startsidan",
@@ -100,15 +95,13 @@
     "secondsUnit": "${seconds} sekunder",
     "defaultSleepTimer": "Standard sovtimer",
     "minutesUnit": "${minutes} minuter",
-    "unwatchedOnly": "Endast osedda",
-    "unwatchedOnlyDescription": "Inkludera endast osedda avsnitt i blandningskön",
-    "shuffleOrderNavigation": "Blandningsordning-navigation",
-    "shuffleOrderNavigationDescription": "Nästa/föregående knappar följer blandad ordning",
-    "loopShuffleQueue": "Loopa blandningskö",
-    "loopShuffleQueueDescription": "Starta om kö när slutet nås",
+    "rememberTrackSelections": "Kom ihåg spårval per serie/film",
+    "rememberTrackSelectionsDescription": "Spara automatiskt ljud- och undertextspråkpreferenser när du ändrar spår under uppspelning",
     "videoPlayerControls": "Videospelar-kontroller",
     "keyboardShortcuts": "Tangentbordsgenvägar",
     "keyboardShortcutsDescription": "Anpassa tangentbordsgenvägar",
+    "videoPlayerNavigation": "Navigering i videospelaren",
+    "videoPlayerNavigationDescription": "Använd piltangenter för att navigera videospelarens kontroller",
     "debugLogging": "Felsökningsloggning",
     "debugLoggingDescription": "Aktivera detaljerad loggning för felsökning",
     "viewLogs": "Visa loggar",
@@ -128,7 +121,28 @@
     "validationErrorEnterNumber": "Vänligen ange ett giltigt nummer",
     "validationErrorDuration": "Tiden måste vara mellan ${min} och ${max} ${unit}",
     "shortcutAlreadyAssigned": "Genväg redan tilldelad ${action}",
-    "shortcutUpdated": "Genväg uppdaterad för ${action}"
+    "shortcutUpdated": "Genväg uppdaterad för ${action}",
+    "autoSkip": "Auto Hoppa Över",
+    "autoSkipIntro": "Hoppa Över Intro Automatiskt",
+    "autoSkipIntroDescription": "Hoppa automatiskt över intro-markörer efter några sekunder",
+    "autoSkipCredits": "Hoppa Över Credits Automatiskt",
+    "autoSkipCreditsDescription": "Hoppa automatiskt över credits och spela nästa avsnitt",
+    "autoSkipDelay": "Fördröjning Auto Hoppa Över",
+    "autoSkipDelayDescription": "Vänta ${seconds} sekunder innan automatisk överhoppning",
+    "downloads": "Nedladdningar",
+    "downloadLocationDescription": "Välj var nedladdat innehåll ska lagras",
+    "downloadLocationDefault": "Standard (App-lagring)",
+    "downloadLocationCustom": "Anpassad Plats",
+    "selectFolder": "Välj Mapp",
+    "resetToDefault": "Återställ till Standard",
+    "currentPath": "Nuvarande: ${path}",
+    "downloadLocationChanged": "Nedladdningsplats ändrad",
+    "downloadLocationReset": "Nedladdningsplats återställd till standard",
+    "downloadLocationInvalid": "Vald mapp är inte skrivbar",
+    "downloadLocationSelectError": "Kunde inte välja mapp",
+    "downloadOnWifiOnly": "Ladda ner endast på WiFi",
+    "downloadOnWifiOnlyDescription": "Förhindra nedladdningar vid användning av mobildata",
+    "cellularDownloadBlocked": "Nedladdningar är inaktiverade på mobildata. Anslut till WiFi eller ändra inställningen."
   },
   "search": {
     "hint": "Sök filmer, serier, musik...",
@@ -179,6 +193,16 @@
     "shufflePlay": "Blanda uppspelning",
     "fileInfo": "Filinformation"
   },
+  "accessibility": {
+    "mediaCardMovie": "${title}, film",
+    "mediaCardShow": "${title}, TV-serie",
+    "mediaCardEpisode": "${title}, ${episodeInfo}",
+    "mediaCardSeason": "${title}, ${seasonInfo}",
+    "mediaCardWatched": "sedd",
+    "mediaCardPartiallyWatched": "${percent} procent sedd",
+    "mediaCardUnwatched": "osedd",
+    "tapToPlay": "Tryck för att spela"
+  },
   "tooltips": {
     "shufflePlay": "Blanda uppspelning",
     "markAsWatched": "Markera som sedd",
@@ -197,16 +221,45 @@
     "fillScreen": "Fyll skärm",
     "stretch": "Sträck",
     "lockRotation": "Lås rotation",
-    "unlockRotation": "Lås upp rotation"
+    "unlockRotation": "Lås upp rotation",
+    "sleepTimer": "Sovtimer",
+    "timerActive": "Timer aktiv",
+    "playbackWillPauseIn": "Uppspelningen pausas om ${duration}",
+    "sleepTimerCompleted": "Sovtimer slutförd - uppspelning pausad",
+    "playButton": "Spela",
+    "pauseButton": "Pausa",
+    "seekBackwardButton": "Spola bakåt ${seconds} sekunder",
+    "seekForwardButton": "Spola framåt ${seconds} sekunder",
+    "previousButton": "Föregående avsnitt",
+    "nextButton": "Nästa avsnitt",
+    "previousChapterButton": "Föregående kapitel",
+    "nextChapterButton": "Nästa kapitel",
+    "muteButton": "Tysta",
+    "unmuteButton": "Slå på ljud",
+    "settingsButton": "Videoinställningar",
+    "audioTrackButton": "Ljudspår",
+    "subtitlesButton": "Undertexter",
+    "chaptersButton": "Kapitel",
+    "versionsButton": "Videoversioner",
+    "aspectRatioButton": "Bildförhållande",
+    "fullscreenButton": "Aktivera helskärm",
+    "exitFullscreenButton": "Avsluta helskärm",
+    "rotationLockButton": "Rotationslås",
+    "timelineSlider": "Videotidslinje",
+    "volumeSlider": "Volymnivå",
+    "backButton": "Tillbaka"
   },
   "userStatus": {
     "admin": "Admin",
     "restricted": "Begränsad",
-    "protected": "Skyddad"
+    "protected": "Skyddad",
+    "current": "NUVARANDE"
   },
   "messages": {
     "markedAsWatched": "Markerad som sedd",
     "markedAsUnwatched": "Markerad som osedd",
+    "markedAsWatchedOffline": "Markerad som sedd (synkroniseras när online)",
+    "markedAsUnwatchedOffline": "Markerad som osedd (synkroniseras när online)",
     "removedFromContinueWatching": "Borttagen från Fortsätt titta",
     "errorLoading": "Fel: ${error}",
     "fileInfoNotAvailable": "Filinformation inte tillgänglig",
@@ -223,17 +276,18 @@
     "metadataRefreshing": "Uppdaterar metadata för \"${title}\"...",
     "metadataRefreshStarted": "Metadata-uppdatering startad för \"${title}\"",
     "metadataRefreshFailed": "Misslyckades att uppdatera metadata: ${error}",
-    "noPlexToken": "Ingen Plex-token hittad. Vänligen logga in igen.",
     "logoutConfirm": "Är du säker på att du vill logga ut?",
     "noSeasonsFound": "Inga säsonger hittades",
     "noEpisodesFound": "Inga avsnitt hittades i första säsongen",
     "noEpisodesFoundGeneral": "Inga avsnitt hittades",
     "noResultsFound": "Inga resultat hittades",
     "sleepTimerSet": "Sovtimer inställd för ${label}",
-    "failedToSwitchProfile": "Misslyckades att byta till ${displayName}"
-  },
-  "profile": {
-    "noUsersAvailable": "Inga användare tillgängliga"
+    "noItemsAvailable": "Inga objekt tillgängliga",
+    "failedToCreatePlayQueue": "Det gick inte att skapa uppspelningskö",
+    "failedToCreatePlayQueueNoItems": "Det gick inte att skapa uppspelningskö – inga objekt",
+    "failedPlayback": "Kunde inte ${action}: ${error}",
+    "youAreOffline": "Du är offline",
+    "offlineFeatureUnavailable": "Denna funktion kräver en internetanslutning. Dina nedladdningar och inställningar är fortfarande tillgängliga."
   },
   "subtitlingStyling": {
     "stylingOptions": "Stilalternativ",
@@ -246,7 +300,6 @@
   },
   "dialog": {
     "confirmAction": "Bekräfta åtgärd",
-    "areYouSure": "Är du säker på att du vill utföra denna åtgärd?",
     "cancel": "Avbryt",
     "playNow": "Spela nu"
   },
@@ -258,14 +311,15 @@
     "noContentAvailable": "Inget innehåll tillgängligt",
     "addMediaToLibraries": "Lägg till media till dina bibliotek",
     "continueWatching": "Fortsätt titta",
-    "recentlyAdded": "Nyligen tillagda",
     "play": "Spela",
-    "resume": "Återuppta",
-    "playEpisode": "Spela S${season}, E${episode}",
-    "resumeEpisode": "Återuppta S${season}, E${episode}",
+    "playEpisode": "S${season}E${episode}",
     "pause": "Pausa",
     "overview": "Översikt",
     "cast": "Rollbesättning",
+    "seasons": "Säsonger",
+    "studio": "Studio",
+    "rating": "Åldersgräns",
+    "watched": "Tittad",
     "episodeCount": "${count} avsnitt",
     "watchedProgress": "${watched}/${total} sedda",
     "movie": "Film",
@@ -283,8 +337,7 @@
     "pleaseEnterToken": "Vänligen ange en token",
     "invalidToken": "Ogiltig token",
     "failedToVerifyToken": "Misslyckades att verifiera token: ${error}",
-    "failedToSwitchProfile": "Misslyckades att byta till ${displayName}",
-    "connectionFailedGeneric": "Anslutning misslyckades"
+    "failedToSwitchProfile": "Misslyckades att byta till ${displayName}"
   },
   "libraries": {
     "title": "Bibliotek",
@@ -312,11 +365,31 @@
     "sort": "Sortera",
     "sortBy": "Sortera efter",
     "filters": "Filter",
-    "loadingLibraryWithCount": "Laddar bibliotek... (${count} objekt laddade)",
     "confirmActionMessage": "Är du säker på att du vill utföra denna åtgärd?",
     "showLibrary": "Visa bibliotek",
     "hideLibrary": "Dölj bibliotek",
-    "libraryOptions": "Biblioteksalternativ"
+    "libraryOptions": "Biblioteksalternativ",
+    "content": "bibliotekets innehåll",
+    "selectLibrary": "Välj bibliotek",
+    "filtersWithCount": "Filter (${count})",
+    "noRecommendations": "Inga rekommendationer tillgängliga",
+    "noCollections": "Inga samlingar i det här biblioteket",
+    "noFoldersFound": "Inga mappar hittades",
+    "folders": "mappar",
+    "tabs": {
+      "recommended": "Rekommenderat",
+      "browse": "Bläddra",
+      "collections": "Samlingar",
+      "playlists": "Spellistor"
+    },
+    "groupings": {
+      "all": "Alla",
+      "movies": "Filmer",
+      "shows": "Serier",
+      "seasons": "Säsonger",
+      "episodes": "Avsnitt",
+      "folders": "Mappar"
+    }
   },
   "about": {
     "title": "Om",
@@ -326,17 +399,9 @@
     "viewLicensesDescription": "Visa licenser för tredjepartsbibliotek"
   },
   "serverSelection": {
-    "connectingToServer": "Ansluter till server...",
-    "serverDebugCopied": "Server-felsökningsdata kopierad till urklipp",
-    "copyDebugData": "Kopiera felsökningsdata",
+    "allServerConnectionsFailed": "Misslyckades att ansluta till servrar. Kontrollera ditt nätverk och försök igen.",
     "noServersFound": "Inga servrar hittades",
-    "malformedServerData": "Hittade ${count} server(ar) med felformaterad data. Inga giltiga servrar tillgängliga.",
-    "incompleteServerInfo": "Vissa servrar har ofullständig information och hoppades över. Vänligen kontrollera ditt Plex.tv-konto.",
-    "incompleteConnectionInfo": "Server-anslutningsinformation är ofullständig. Försök igen.",
-    "malformedServerInfo": "Serverinformation är felformaterad: ${message}",
-    "networkConnectionFailed": "Nätverksanslutning misslyckades. Kontrollera din internetanslutning och försök igen.",
-    "authenticationFailed": "Autentisering misslyckades. Logga in igen.",
-    "plexServiceUnavailable": "Plex-tjänst otillgänglig. Försök igen senare.",
+    "noServersFoundForAccount": "Inga servrar hittades för ${username} (${email})",
     "failedToLoadServers": "Misslyckades att ladda servrar: ${error}"
   },
   "hubDetail": {
@@ -347,11 +412,8 @@
     "noItemsFound": "Inga objekt hittades"
   },
   "logs": {
-    "title": "Loggar",
     "clearLogs": "Rensa loggar",
     "copyLogs": "Kopiera loggar",
-    "exportLogs": "Exportera loggar",
-    "noLogsToShow": "Inga loggar att visa",
     "error": "Fel:",
     "stackTrace": "Stack trace:"
   },
@@ -365,6 +427,75 @@
     "home": "Hem",
     "search": "Sök",
     "libraries": "Bibliotek",
-    "settings": "Inställningar"
+    "settings": "Inställningar",
+    "downloads": "Nedladdningar"
+  },
+  "downloads": {
+    "title": "Nedladdningar",
+    "manage": "Hantera",
+    "tvShows": "TV-serier",
+    "movies": "Filmer",
+    "noDownloads": "Inga nedladdningar ännu",
+    "noDownloadsDescription": "Nedladdat innehåll visas här för offline-visning",
+    "downloadNow": "Ladda ner",
+    "deleteDownload": "Ta bort nedladdning",
+    "retryDownload": "Försök igen",
+    "downloadQueued": "Nedladdning köad",
+    "episodesQueued": "${count} avsnitt köade för nedladdning",
+    "downloadDeleted": "Nedladdning borttagen",
+    "deleteConfirm": "Är du säker på att du vill ta bort \"${title}\"? Den nedladdade filen kommer att tas bort från din enhet.",
+    "deletingWithProgress": "Tar bort ${title}... (${current} av ${total})"
+  },
+  "playlists": {
+    "title": "Spellistor",
+    "noPlaylists": "Inga spellistor hittades",
+    "create": "Skapa spellista",
+    "playlistName": "Spellistans namn",
+    "enterPlaylistName": "Ange spellistans namn",
+    "delete": "Ta bort spellista",
+    "removeItem": "Ta bort från spellista",
+    "smartPlaylist": "Smart spellista",
+    "itemCount": "${count} objekt",
+    "oneItem": "1 objekt",
+    "emptyPlaylist": "Denna spellista är tom",
+    "deleteConfirm": "Ta bort spellista?",
+    "deleteMessage": "Är du säker på att du vill ta bort \"${name}\"?",
+    "created": "Spellista skapad",
+    "deleted": "Spellista borttagen",
+    "itemAdded": "Tillagd i spellista",
+    "itemRemoved": "Borttagen från spellista",
+    "selectPlaylist": "Välj spellista",
+    "createNewPlaylist": "Skapa ny spellista",
+    "errorCreating": "Det gick inte att skapa spellista",
+    "errorDeleting": "Det gick inte att ta bort spellista",
+    "errorLoading": "Det gick inte att ladda spellistor",
+    "errorAdding": "Det gick inte att lägga till i spellista",
+    "errorReordering": "Det gick inte att omordna spellisteobjekt",
+    "errorRemoving": "Det gick inte att ta bort från spellista",
+    "playlist": "Spellista"
+  },
+  "collections": {
+    "title": "Samlingar",
+    "collection": "Samling",
+    "empty": "Samlingen är tom",
+    "unknownLibrarySection": "Kan inte ta bort: okänd bibliotekssektion",
+    "deleteCollection": "Ta bort samling",
+    "deleteConfirm": "Är du säker på att du vill ta bort \"${title}\"? Detta går inte att ångra.",
+    "deleted": "Samling borttagen",
+    "deleteFailed": "Det gick inte att ta bort samlingen",
+    "deleteFailedWithError": "Det gick inte att ta bort samlingen: ${error}",
+    "failedToLoadItems": "Det gick inte att läsa in samlingsobjekt: ${error}",
+    "selectCollection": "Välj samling",
+    "createNewCollection": "Skapa ny samling",
+    "collectionName": "Samlingsnamn",
+    "enterCollectionName": "Ange samlingsnamn",
+    "addedToCollection": "Tillagd i samling",
+    "errorAddingToCollection": "Fel vid tillägg i samling",
+    "created": "Samling skapad",
+    "removeFromCollection": "Ta bort från samling",
+    "removeFromCollectionConfirm": "Ta bort \"${title}\" från denna samling?",
+    "removedFromCollection": "Borttagen från samling",
+    "removeFromCollectionFailed": "Misslyckades med att ta bort från samling",
+    "removeFromCollectionError": "Fel vid borttagning från samling: ${error}"
   }
 }
diff --git a/lib/i18n/strings_zh.i18n.json b/lib/i18n/strings_zh.i18n.json
index 5cc98236..aa6c0e58 100644
--- a/lib/i18n/strings_zh.i18n.json
+++ b/lib/i18n/strings_zh.i18n.json
@@ -26,18 +26,14 @@
     "submit": "提交",
     "confirm": "确认",
     "retry": "重试",
-    "playNow": "立即播放",
     "logout": "登出",
-    "online": "在线",
-    "offline": "离线",
-    "owned": "拥有",
-    "shared": "共享",
-    "current": "当前",
     "unknown": "未知",
     "refresh": "刷新",
     "yes": "是",
     "no": "否",
-    "server": "服务器"
+    "delete": "删除",
+    "shuffle": "随机播放",
+    "addTo": "添加到..."
   },
   "screens": {
     "licenses": "许可证",
@@ -62,7 +58,6 @@
     "theme": "主题",
     "appearance": "外观",
     "videoPlayback": "视频播放",
-    "shufflePlay": "随机播放",
     "advanced": "高级",
     "useSeasonPostersDescription": "为剧集显示季海报而非剧集海报",
     "showHeroSectionDescription": "在主屏幕上显示精选内容轮播区",
@@ -100,15 +95,13 @@
     "secondsUnit": "${seconds} 秒",
     "defaultSleepTimer": "默认睡眠定时器",
     "minutesUnit": "${minutes} 分钟",
-    "unwatchedOnly": "仅未观看",
-    "unwatchedOnlyDescription": "随机队列中仅包含未观看的剧集",
-    "shuffleOrderNavigation": "随机顺序导航",
-    "shuffleOrderNavigationDescription": "下一集/上一集按钮遵循随机播放顺序",
-    "loopShuffleQueue": "循环随机队列",
-    "loopShuffleQueueDescription": "在队列结束时重新开始",
+    "rememberTrackSelections": "记住每个剧集/电影的音轨选择",
+    "rememberTrackSelectionsDescription": "在播放过程中更改音轨时自动保存音频和字幕语言偏好",
     "videoPlayerControls": "视频播放器控制",
     "keyboardShortcuts": "键盘快捷键",
     "keyboardShortcutsDescription": "自定义键盘快捷键",
+    "videoPlayerNavigation": "视频播放器导航",
+    "videoPlayerNavigationDescription": "使用方向键导航视频播放器控件",
     "debugLogging": "调试日志",
     "debugLoggingDescription": "启用详细日志记录以便故障排除",
     "viewLogs": "查看日志",
@@ -128,7 +121,28 @@
     "validationErrorEnterNumber": "请输入一个有效的数字",
     "validationErrorDuration": "时长必须介于 ${min} 和 ${max} ${unit} 之间",
     "shortcutAlreadyAssigned": "快捷键已被分配给 ${action}",
-    "shortcutUpdated": "快捷键已为 ${action} 更新"
+    "shortcutUpdated": "快捷键已为 ${action} 更新",
+    "autoSkip": "自动跳过",
+    "autoSkipIntro": "自动跳过片头",
+    "autoSkipIntroDescription": "几秒钟后自动跳过片头标记",
+    "autoSkipCredits": "自动跳过片尾",
+    "autoSkipCreditsDescription": "自动跳过片尾并播放下一集",
+    "autoSkipDelay": "自动跳过延迟",
+    "autoSkipDelayDescription": "自动跳过前等待 ${seconds} 秒",
+    "downloads": "下载",
+    "downloadLocationDescription": "选择下载内容的存储位置",
+    "downloadLocationDefault": "默认（应用存储）",
+    "downloadLocationCustom": "自定义位置",
+    "selectFolder": "选择文件夹",
+    "resetToDefault": "重置为默认",
+    "currentPath": "当前: ${path}",
+    "downloadLocationChanged": "下载位置已更改",
+    "downloadLocationReset": "下载位置已重置为默认",
+    "downloadLocationInvalid": "所选文件夹不可写入",
+    "downloadLocationSelectError": "选择文件夹失败",
+    "downloadOnWifiOnly": "仅在 WiFi 时下载",
+    "downloadOnWifiOnlyDescription": "使用蜂窝数据时禁止下载",
+    "cellularDownloadBlocked": "蜂窝数据下已禁用下载。请连接 WiFi 或更改设置。"
   },
   "search": {
     "hint": "搜索电影、系列、音乐...",
@@ -179,6 +193,16 @@
     "shufflePlay": "随机播放",
     "fileInfo": "文件信息"
   },
+  "accessibility": {
+    "mediaCardMovie": "${title}, 电影",
+    "mediaCardShow": "${title}, 电视剧",
+    "mediaCardEpisode": "${title}, ${episodeInfo}",
+    "mediaCardSeason": "${title}, ${seasonInfo}",
+    "mediaCardWatched": "已观看",
+    "mediaCardPartiallyWatched": "已观看 ${percent} 百分比",
+    "mediaCardUnwatched": "未观看",
+    "tapToPlay": "点击播放"
+  },
   "tooltips": {
     "shufflePlay": "随机播放",
     "markAsWatched": "标记为已观看",
@@ -197,16 +221,45 @@
     "fillScreen": "填充屏幕",
     "stretch": "拉伸",
     "lockRotation": "锁定旋转",
-    "unlockRotation": "解锁旋转"
+    "unlockRotation": "解锁旋转",
+    "sleepTimer": "睡眠定时器",
+    "timerActive": "定时器已激活",
+    "playbackWillPauseIn": "播放将在 ${duration} 后暂停",
+    "sleepTimerCompleted": "睡眠定时器已完成 - 播放已暂停",
+    "playButton": "播放",
+    "pauseButton": "暂停",
+    "seekBackwardButton": "后退 ${seconds} 秒",
+    "seekForwardButton": "前进 ${seconds} 秒",
+    "previousButton": "上一集",
+    "nextButton": "下一集",
+    "previousChapterButton": "上一章节",
+    "nextChapterButton": "下一章节",
+    "muteButton": "静音",
+    "unmuteButton": "取消静音",
+    "settingsButton": "视频设置",
+    "audioTrackButton": "音轨",
+    "subtitlesButton": "字幕",
+    "chaptersButton": "章节",
+    "versionsButton": "视频版本",
+    "aspectRatioButton": "宽高比",
+    "fullscreenButton": "进入全屏",
+    "exitFullscreenButton": "退出全屏",
+    "rotationLockButton": "旋转锁定",
+    "timelineSlider": "视频时间轴",
+    "volumeSlider": "音量调节",
+    "backButton": "返回"
   },
   "userStatus": {
     "admin": "管理员",
     "restricted": "受限",
-    "protected": "受保护"
+    "protected": "受保护",
+    "current": "当前"
   },
   "messages": {
     "markedAsWatched": "已标记为已观看",
     "markedAsUnwatched": "已标记为未观看",
+    "markedAsWatchedOffline": "已标记为已观看 (将在联网时同步)",
+    "markedAsUnwatchedOffline": "已标记为未观看 (将在联网时同步)",
     "removedFromContinueWatching": "已从继续观看中移除",
     "errorLoading": "错误: ${error}",
     "fileInfoNotAvailable": "文件信息不可用",
@@ -223,17 +276,18 @@
     "metadataRefreshing": "正在刷新 “${title}” 的元数据...",
     "metadataRefreshStarted": "已开始刷新 “${title}” 的元数据",
     "metadataRefreshFailed": "无法刷新元数据: ${error}",
-    "noPlexToken": "未找到 Plex 令牌。请重新登录。",
     "logoutConfirm": "你确定要登出吗？",
     "noSeasonsFound": "未找到季",
     "noEpisodesFound": "在第一季中未找到剧集",
     "noEpisodesFoundGeneral": "未找到剧集",
     "noResultsFound": "未找到结果",
     "sleepTimerSet": "睡眠定时器已设置为 ${label}",
-    "failedToSwitchProfile": "无法切换到 ${displayName}"
-  },
-  "profile": {
-    "noUsersAvailable": "没有可用用户"
+    "noItemsAvailable": "没有可用的项目",
+    "failedToCreatePlayQueue": "创建播放队列失败",
+    "failedToCreatePlayQueueNoItems": "创建播放队列失败 - 没有项目",
+    "failedPlayback": "无法${action}: ${error}",
+    "youAreOffline": "您已离线",
+    "offlineFeatureUnavailable": "此功能需要网络连接。您的下载内容和设置仍然可用。"
   },
   "subtitlingStyling": {
     "stylingOptions": "样式选项",
@@ -246,7 +300,6 @@
   },
   "dialog": {
     "confirmAction": "确认操作",
-    "areYouSure": "确定要执行此操作吗？",
     "cancel": "取消",
     "playNow": "立即播放"
   },
@@ -258,14 +311,15 @@
     "noContentAvailable": "没有可用内容",
     "addMediaToLibraries": "请向你的媒体库添加一些媒体",
     "continueWatching": "继续观看",
-    "recentlyAdded": "最近添加",
     "play": "播放",
-    "resume": "继续",
-    "playEpisode": "播放 S${season}, E${episode}",
-    "resumeEpisode": "继续 S${season}, E${episode}",
+    "playEpisode": "S${season}E${episode}",
     "pause": "暂停",
     "overview": "概述",
     "cast": "演员表",
+    "seasons": "季数",
+    "studio": "制作公司",
+    "rating": "年龄分级",
+    "watched": "已观看",
     "episodeCount": "${count} 集",
     "watchedProgress": "已观看 ${watched}/${total} 集",
     "movie": "电影",
@@ -283,8 +337,7 @@
     "pleaseEnterToken": "请输入一个令牌",
     "invalidToken": "令牌无效",
     "failedToVerifyToken": "无法验证令牌: ${error}",
-    "failedToSwitchProfile": "无法切换到 ${displayName}",
-    "connectionFailedGeneric": "连接失败"
+    "failedToSwitchProfile": "无法切换到 ${displayName}"
   },
   "libraries": {
     "title": "媒体库",
@@ -312,11 +365,31 @@
     "sort": "排序",
     "sortBy": "排序依据",
     "filters": "筛选器",
-    "loadingLibraryWithCount": "正在加载媒体库... (已加载 ${count} 个项目)",
     "confirmActionMessage": "确定要执行此操作吗？",
     "showLibrary": "显示媒体库",
     "hideLibrary": "隐藏媒体库",
-    "libraryOptions": "媒体库选项"
+    "libraryOptions": "媒体库选项",
+    "content": "媒体库内容",
+    "selectLibrary": "选择媒体库",
+    "filtersWithCount": "筛选器（${count}）",
+    "noRecommendations": "暂无推荐",
+    "noCollections": "此媒体库中没有合集",
+    "noFoldersFound": "未找到文件夹",
+    "folders": "文件夹",
+    "tabs": {
+      "recommended": "推荐",
+      "browse": "浏览",
+      "collections": "合集",
+      "playlists": "播放列表"
+    },
+    "groupings": {
+      "all": "全部",
+      "movies": "电影",
+      "shows": "剧集",
+      "seasons": "季",
+      "episodes": "集",
+      "folders": "文件夹"
+    }
   },
   "about": {
     "title": "关于",
@@ -326,17 +399,9 @@
     "viewLicensesDescription": "查看第三方库的许可证"
   },
   "serverSelection": {
-    "connectingToServer": "正在连接服务器...",
-    "serverDebugCopied": "服务器调试数据已复制到剪贴板",
-    "copyDebugData": "复制调试数据",
+    "allServerConnectionsFailed": "无法连接到任何服务器。请检查你的网络并重试。",
     "noServersFound": "未找到服务器",
-    "malformedServerData": "找到 ${count} 个数据格式错误的服务器。没有可用的有效服务器。",
-    "incompleteServerInfo": "某些服务器信息不完整，已被跳过。请检查你的 Plex.tv 账户。",
-    "incompleteConnectionInfo": "服务器连接信息不完整。请重试。",
-    "malformedServerInfo": "服务器信息格式错误: ${message}",
-    "networkConnectionFailed": "网络连接失败。请检查你的网络连接并重试。",
-    "authenticationFailed": "验证失败。请重新登录。",
-    "plexServiceUnavailable": "Plex 服务不可用。请稍后重试。",
+    "noServersFoundForAccount": "未找到 ${username} (${email}) 的服务器",
     "failedToLoadServers": "无法加载服务器: ${error}"
   },
   "hubDetail": {
@@ -347,11 +412,8 @@
     "noItemsFound": "未找到项目"
   },
   "logs": {
-    "title": "日志",
     "clearLogs": "清除日志",
     "copyLogs": "复制日志",
-    "exportLogs": "导出日志",
-    "noLogsToShow": "没有可显示的日志",
     "error": "错误:",
     "stackTrace": "堆栈跟踪 (Stack Trace):"
   },
@@ -365,6 +427,75 @@
     "home": "主页",
     "search": "搜索",
     "libraries": "媒体库",
-    "settings": "设置"
+    "settings": "设置",
+    "downloads": "下载"
+  },
+  "downloads": {
+    "title": "下载",
+    "manage": "管理",
+    "tvShows": "电视剧",
+    "movies": "电影",
+    "noDownloads": "暂无下载",
+    "noDownloadsDescription": "下载的内容将在此处显示以供离线观看",
+    "downloadNow": "下载",
+    "deleteDownload": "删除下载",
+    "retryDownload": "重试下载",
+    "downloadQueued": "下载已排队",
+    "episodesQueued": "${count} 集已加入下载队列",
+    "downloadDeleted": "下载已删除",
+    "deleteConfirm": "确定要删除 \"${title}\" 吗？下载的文件将从您的设备中删除。",
+    "deletingWithProgress": "正在删除 ${title}... (${current}/${total})"
+  },
+  "playlists": {
+    "title": "播放列表",
+    "noPlaylists": "未找到播放列表",
+    "create": "创建播放列表",
+    "playlistName": "播放列表名称",
+    "enterPlaylistName": "输入播放列表名称",
+    "delete": "删除播放列表",
+    "removeItem": "从播放列表中移除",
+    "smartPlaylist": "智能播放列表",
+    "itemCount": "${count} 个项目",
+    "oneItem": "1 个项目",
+    "emptyPlaylist": "此播放列表为空",
+    "deleteConfirm": "删除播放列表？",
+    "deleteMessage": "确定要删除 \"${name}\" 吗？",
+    "created": "播放列表已创建",
+    "deleted": "播放列表已删除",
+    "itemAdded": "已添加到播放列表",
+    "itemRemoved": "已从播放列表中移除",
+    "selectPlaylist": "选择播放列表",
+    "createNewPlaylist": "创建新播放列表",
+    "errorCreating": "创建播放列表失败",
+    "errorDeleting": "删除播放列表失败",
+    "errorLoading": "加载播放列表失败",
+    "errorAdding": "添加到播放列表失败",
+    "errorReordering": "重新排序播放列表项目失败",
+    "errorRemoving": "从播放列表中移除失败",
+    "playlist": "播放列表"
+  },
+  "collections": {
+    "title": "合集",
+    "collection": "合集",
+    "empty": "合集为空",
+    "unknownLibrarySection": "无法删除：未知的媒体库分区",
+    "deleteCollection": "删除合集",
+    "deleteConfirm": "确定要删除\"${title}\"吗？此操作无法撤销。",
+    "deleted": "已删除合集",
+    "deleteFailed": "删除合集失败",
+    "deleteFailedWithError": "删除合集失败：${error}",
+    "failedToLoadItems": "加载合集项目失败：${error}",
+    "selectCollection": "选择合集",
+    "createNewCollection": "创建新合集",
+    "collectionName": "合集名称",
+    "enterCollectionName": "输入合集名称",
+    "addedToCollection": "已添加到合集",
+    "errorAddingToCollection": "添加到合集失败",
+    "created": "已创建合集",
+    "removeFromCollection": "从合集移除",
+    "removeFromCollectionConfirm": "将“${title}”从此合集移除？",
+    "removedFromCollection": "已从合集移除",
+    "removeFromCollectionFailed": "从合集移除失败",
+    "removeFromCollectionError": "从合集移除时出错：${error}"
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
index 0a8a041b..64964a9e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,29 +1,41 @@
 import 'package:flutter/material.dart';
 import 'dart:io' show Platform;
-import 'package:media_kit/media_kit.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'screens/main_screen.dart';
 import 'screens/auth_screen.dart';
 import 'services/storage_service.dart';
-import 'services/plex_auth_service.dart';
-import 'services/server_connection_service.dart';
 import 'services/macos_titlebar_service.dart';
 import 'services/fullscreen_state_manager.dart';
 import 'services/update_service.dart';
 import 'services/settings_service.dart';
+import 'services/tv_detection_service.dart';
+import 'services/gamepad_service.dart';
 import 'providers/user_profile_provider.dart';
 import 'providers/plex_client_provider.dart';
+import 'providers/multi_server_provider.dart';
+import 'providers/server_state_provider.dart';
 import 'providers/theme_provider.dart';
 import 'providers/settings_provider.dart';
 import 'providers/hidden_libraries_provider.dart';
 import 'providers/playback_state_provider.dart';
-import 'utils/language_codes.dart';
+import 'providers/download_provider.dart';
+import 'providers/offline_mode_provider.dart';
+import 'providers/offline_watch_provider.dart';
+import 'services/multi_server_manager.dart';
+import 'services/offline_watch_sync_service.dart';
+import 'services/data_aggregation_service.dart';
+import 'services/server_registry.dart';
+import 'services/download_manager_service.dart';
+import 'services/download_storage_service.dart';
+import 'services/plex_api_cache.dart';
+import 'database/app_database.dart';
 import 'utils/app_logger.dart';
-import 'utils/provider_extensions.dart';
 import 'utils/orientation_helper.dart';
+import 'utils/language_codes.dart';
 import 'i18n/strings.g.dart';
+import 'focus/input_mode_tracker.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -36,34 +48,48 @@ void main() async {
   LocaleSettings.setLocale(savedLocale);
 
   // Configure image cache for large libraries
-  PaintingBinding.instance.imageCache.maximumSizeBytes = 500 << 20; // 500MB
-  PaintingBinding.instance.imageCache.maximumSize = 500; // 500 images
+  PaintingBinding.instance.imageCache.maximumSizeBytes = 200 << 20; // 200MB
+
+  // Initialize services in parallel where possible
+  final futures = <Future<void>>[];
 
   // Initialize window_manager for desktop platforms
   if (Platform.isMacOS || Platform.isWindows || Platform.isLinux) {
-    await windowManager.ensureInitialized();
+    futures.add(windowManager.ensureInitialized());
   }
 
-  // Configure macOS window with custom titlebar
-  await MacOSTitlebarService.setupCustomTitlebar();
+  // Initialize TV detection for Android
+  if (Platform.isAndroid) {
+    futures.add(TvDetectionService.getInstance().then((_) {}));
+  }
 
-  // Initialize MediaKit
-  MediaKit.ensureInitialized();
+  // Configure macOS window with custom titlebar (depends on window manager)
+  futures.add(MacOSTitlebarService.setupCustomTitlebar());
 
-  // Note: Orientation will be set dynamically based on device type in MainApp
-
-  await StorageService.getInstance();
+  // Initialize storage service
+  futures.add(StorageService.getInstance().then((_) {}));
 
   // Initialize language codes for track selection
-  await LanguageCodes.initialize();
+  futures.add(LanguageCodes.initialize());
+
+  // Wait for all parallel services to complete
+  await Future.wait(futures);
 
   // Initialize logger level based on debug setting
   final debugEnabled = settings.getEnableDebugLogging();
   setLoggerLevel(debugEnabled);
 
+  // Initialize download storage service with settings
+  await DownloadStorageService.instance.initialize(settings);
+
   // Start global fullscreen state monitoring
   FullscreenStateManager().startMonitoring();
 
+  // Initialize gamepad service for desktop platforms
+  if (Platform.isMacOS || Platform.isWindows || Platform.isLinux) {
+    GamepadService.instance.start();
+  }
+
   // DTD service is available for MCP tooling connection if needed
 
   runApp(const MainApp());
@@ -72,33 +98,151 @@ void main() async {
 // Global RouteObserver for tracking navigation
 final RouteObserver<PageRoute> routeObserver = RouteObserver<PageRoute>();
 
-class MainApp extends StatelessWidget {
+class MainApp extends StatefulWidget {
   const MainApp({super.key});
 
+  @override
+  State<MainApp> createState() => _MainAppState();
+}
+
+class _MainAppState extends State<MainApp> with WidgetsBindingObserver {
+  // Initialize multi-server infrastructure
+  late final MultiServerManager _serverManager;
+  late final DataAggregationService _aggregationService;
+  late final AppDatabase _appDatabase;
+  late final DownloadManagerService _downloadManager;
+  late final OfflineWatchSyncService _offlineWatchSyncService;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+
+    _serverManager = MultiServerManager();
+    _aggregationService = DataAggregationService(_serverManager);
+    _appDatabase = AppDatabase();
+
+    // Initialize API cache with database
+    PlexApiCache.initialize(_appDatabase);
+
+    _downloadManager = DownloadManagerService(
+      database: _appDatabase,
+      storageService: DownloadStorageService.instance,
+    );
+
+    _offlineWatchSyncService = OfflineWatchSyncService(
+      database: _appDatabase,
+      serverManager: _serverManager,
+    );
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      // App came back to foreground - trigger sync check
+      _offlineWatchSyncService.onAppResumed();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return MultiProvider(
       providers: [
+        // Legacy provider for backward compatibility
         ChangeNotifierProvider(create: (context) => PlexClientProvider()),
+        // New multi-server providers
         ChangeNotifierProvider(
-          create: (context) => UserProfileProvider()..initialize(),
+          create: (context) =>
+              MultiServerProvider(_serverManager, _aggregationService),
         ),
+        ChangeNotifierProvider(create: (context) => ServerStateProvider()),
+        // Offline mode provider - depends on MultiServerProvider
+        ChangeNotifierProxyProvider<MultiServerProvider, OfflineModeProvider>(
+          create: (_) {
+            final provider = OfflineModeProvider(_serverManager);
+            provider.initialize(); // Initialize immediately so statusStream listener is ready
+            return provider;
+          },
+          update: (_, multiServerProvider, previous) {
+            final provider = previous ?? OfflineModeProvider(_serverManager);
+            provider.initialize(); // Idempotent - safe to call again
+            return provider;
+          },
+        ),
+        // Download provider
+        ChangeNotifierProvider(
+          create: (context) =>
+              DownloadProvider(downloadManager: _downloadManager),
+        ),
+        // Offline watch sync service
+        ChangeNotifierProvider<OfflineWatchSyncService>(
+          create: (context) {
+            final offlineModeProvider = context.read<OfflineModeProvider>();
+            final downloadProvider = context.read<DownloadProvider>();
+
+            // Wire up callback to refresh download provider after watch state sync
+            _offlineWatchSyncService.onWatchStatesRefreshed = () {
+              downloadProvider.refreshMetadataFromCache();
+            };
+
+            _offlineWatchSyncService.startConnectivityMonitoring(
+              offlineModeProvider,
+            );
+            return _offlineWatchSyncService;
+          },
+        ),
+        // Offline watch provider - depends on sync service and download provider
+        ChangeNotifierProxyProvider2<
+          OfflineWatchSyncService,
+          DownloadProvider,
+          OfflineWatchProvider
+        >(
+          create: (context) => OfflineWatchProvider(
+            syncService: _offlineWatchSyncService,
+            downloadProvider: context.read<DownloadProvider>(),
+            apiCache: PlexApiCache.instance,
+          ),
+          update: (_, syncService, downloadProvider, previous) {
+            return previous ??
+                OfflineWatchProvider(
+                  syncService: syncService,
+                  downloadProvider: downloadProvider,
+                  apiCache: PlexApiCache.instance,
+                );
+          },
+        ),
+        // Existing providers
+        ChangeNotifierProvider(create: (context) => UserProfileProvider()),
         ChangeNotifierProvider(create: (context) => ThemeProvider()),
-        ChangeNotifierProvider(create: (context) => SettingsProvider()),
-        ChangeNotifierProvider(create: (context) => HiddenLibrariesProvider()),
+        ChangeNotifierProvider(
+          create: (context) => SettingsProvider(),
+          lazy: true,
+        ),
+        ChangeNotifierProvider(
+          create: (context) => HiddenLibrariesProvider(),
+          lazy: true,
+        ),
         ChangeNotifierProvider(create: (context) => PlaybackStateProvider()),
       ],
       child: Consumer<ThemeProvider>(
         builder: (context, themeProvider, child) {
           return TranslationProvider(
-            child: MaterialApp(
-              title: t.app.title,
-              debugShowCheckedModeBanner: false,
-              theme: themeProvider.lightTheme,
-              darkTheme: themeProvider.darkTheme,
-              themeMode: themeProvider.materialThemeMode,
-              navigatorObservers: [routeObserver],
-              home: const OrientationAwareSetup(),
+            child: InputModeTracker(
+              child: MaterialApp(
+                title: t.app.title,
+                debugShowCheckedModeBanner: false,
+                theme: themeProvider.lightTheme,
+                darkTheme: themeProvider.darkTheme,
+                themeMode: themeProvider.materialThemeMode,
+                navigatorObservers: [routeObserver],
+                home: const OrientationAwareSetup(),
+              ),
             ),
           );
         },
@@ -145,7 +289,7 @@ class _SetupScreenState extends State<SetupScreen> {
     _loadSavedCredentials();
   }
 
-  void _checkForUpdatesOnStartup() async {
+  Future<void> _checkForUpdatesOnStartup() async {
     // Delay slightly to allow UI to settle
     await Future.delayed(const Duration(milliseconds: 500));
 
@@ -219,86 +363,110 @@ class _SetupScreenState extends State<SetupScreen> {
 
   Future<void> _loadSavedCredentials() async {
     final storage = await StorageService.getInstance();
+    final registry = ServerRegistry(storage);
 
-    // Check if we have server data
-    final serverData = storage.getServerData();
-    final clientId = storage.getClientIdentifier();
-    final plexToken = storage.getPlexToken();
+    // Migrate from single-server to multi-server if needed
+    await registry.migrateFromSingleServer();
 
-    // Get current user's server token (prioritize over original server token)
-    final currentUserToken = storage.getToken();
+    // Load enabled servers
+    final servers = await registry.getEnabledServers();
 
-    if (serverData != null && clientId != null) {
-      try {
-        // Recreate PlexServer from stored data
-        final server = PlexServer.fromJson(serverData);
-
-        // Use current user's token if available, fallback to server's original token
-        final tokenToUse = currentUserToken ?? server.accessToken;
-
-        appLogger.d(
-          'App startup token selection: currentUserToken=${currentUserToken != null ? 'present' : 'null'}, using=${currentUserToken != null ? 'current user' : 'original server'} token',
+    if (servers.isEmpty) {
+      // No servers configured - show auth screen
+      if (mounted) {
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(builder: (context) => const AuthScreen()),
         );
-
-        // Create updated server with correct token for current user
-        final serverWithCurrentToken = PlexServer(
-          name: server.name,
-          clientIdentifier: server.clientIdentifier,
-          accessToken: tokenToUse,
-          connections: server.connections,
-          owned: server.owned,
-          product: server.product,
-          platform: server.platform,
-          lastSeenAt: server.lastSeenAt,
-          presence: server.presence,
-        );
-
-        // Connect using the optimized service with current user's token
-        final result = await ServerConnectionService.connectToServer(
-          serverWithCurrentToken,
-          clientIdentifier: clientId,
-          verifyServer: true,
-          fetchUserProfile: plexToken != null,
-          plexToken: plexToken,
-        );
-
-        // Handle result
-        if (result.isSuccess) {
-          // Success! Set client in provider
-          if (mounted) {
-            context.plexClient.setClient(result.client!);
-
-            // Check for updates BEFORE navigation to keep context valid
-            _checkForUpdatesOnStartup();
-
-            // Navigate to main screen after update check is initiated
-            if (mounted) {
-              Navigator.pushReplacement(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => MainScreen(client: result.client!),
-                ),
-              );
-            }
-          }
-          return;
-        } else {
-          // Connection failed, clear credentials
-          await storage.clearCredentials();
-        }
-      } catch (e) {
-        // Error loading or testing server
-        appLogger.e('Error during auto-login', error: e);
-        await storage.clearCredentials();
       }
+      return;
     }
 
-    // No saved credentials or auto-login failed - show auth screen
-    if (mounted) {
-      Navigator.pushReplacement(
-        context,
-        MaterialPageRoute(builder: (context) => const AuthScreen()),
+    // Get multi-server provider
+    if (!mounted) return;
+    final multiServerProvider = Provider.of<MultiServerProvider>(
+      context,
+      listen: false,
+    );
+
+    try {
+      appLogger.i('Connecting to ${servers.length} enabled servers...');
+
+      // Get or generate client identifier
+      final clientId = storage.getClientIdentifier();
+
+      // Connect to all servers in parallel
+      final connectedCount = await multiServerProvider.serverManager
+          .connectToAllServers(
+            servers,
+            clientIdentifier: clientId,
+            timeout: const Duration(seconds: 10),
+            onServerConnected: (serverId, client) {
+              // Set first connected client in legacy provider for backward compatibility
+              final legacyProvider = Provider.of<PlexClientProvider>(
+                context,
+                listen: false,
+              );
+              if (legacyProvider.client == null) {
+                legacyProvider.setClient(client);
+              }
+            },
+          );
+
+      if (connectedCount > 0) {
+        // At least one server connected successfully
+        appLogger.i('Successfully connected to $connectedCount servers');
+
+        if (mounted) {
+          // Now that Plex clients are available, trigger initial watch sync
+          context.read<OfflineWatchSyncService>().onServersConnected();
+
+          // Navigate to main screen immediately
+          // Get first connected client for backward compatibility
+          final firstClient =
+              multiServerProvider.serverManager.onlineClients.values.first;
+
+          Navigator.pushReplacement(
+            context,
+            MaterialPageRoute(
+              builder: (context) => MainScreen(client: firstClient),
+            ),
+          );
+
+          // Check for updates in background after navigation
+          _checkForUpdatesOnStartup();
+        }
+      } else {
+        // All connections failed - navigate to offline mode
+        appLogger.w('Failed to connect to any servers, entering offline mode');
+
+        if (mounted) {
+          // Navigate to MainScreen in offline mode
+          // User can still access Downloads and Settings
+          Navigator.pushReplacement(
+            context,
+            MaterialPageRoute(
+              builder: (context) => const MainScreen(isOfflineMode: true),
+            ),
+          );
+        }
+      }
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Error during multi-server connection',
+        error: e,
+        stackTrace: stackTrace,
       );
+
+      if (mounted) {
+        // Navigate to MainScreen in offline mode
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(
+            builder: (context) => const MainScreen(isOfflineMode: true),
+          ),
+        );
+      }
     }
   }
 
diff --git a/lib/mixins/item_updatable.dart b/lib/mixins/item_updatable.dart
index d26b3515..0fecdd2a 100644
--- a/lib/mixins/item_updatable.dart
+++ b/lib/mixins/item_updatable.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../models/plex_metadata.dart';
 
 /// Mixin for screens that need to update individual items after watch state changes
diff --git a/lib/mixins/library_tab_focus_mixin.dart b/lib/mixins/library_tab_focus_mixin.dart
new file mode 100644
index 00000000..341fe3d4
--- /dev/null
+++ b/lib/mixins/library_tab_focus_mixin.dart
@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+
+/// Mixin that provides focus management for library tabs.
+/// Handles the lifecycle of a focus node for the first item and provides
+/// a method to request focus on that item.
+mixin LibraryTabFocusMixin<T extends StatefulWidget> on State<T> {
+  /// Focus node for the first item (for programmatic focus)
+  late final FocusNode firstItemFocusNode;
+
+  /// Debug label for the focus node
+  String get focusNodeDebugLabel;
+
+  /// Number of items in the list/grid
+  int get itemCount;
+
+  @override
+  void initState() {
+    super.initState();
+    firstItemFocusNode = FocusNode(debugLabel: focusNodeDebugLabel);
+  }
+
+  @override
+  void dispose() {
+    firstItemFocusNode.dispose();
+    super.dispose();
+  }
+
+  /// Focus the first item in the grid/list (for tab activation)
+  void focusFirstItem() {
+    if (itemCount > 0) {
+      firstItemFocusNode.requestFocus();
+    }
+  }
+}
diff --git a/lib/mixins/library_tab_state.dart b/lib/mixins/library_tab_state.dart
new file mode 100644
index 00000000..a505e1c1
--- /dev/null
+++ b/lib/mixins/library_tab_state.dart
@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+import '../services/plex_client.dart';
+import '../models/plex_library.dart';
+import '../utils/provider_extensions.dart';
+
+/// Mixin providing common functionality for library tab screens
+/// Provides server-specific client resolution for multi-server support
+mixin LibraryTabStateMixin<T extends StatefulWidget> on State<T> {
+  /// The library being displayed
+  PlexLibrary get library;
+
+  /// Get the correct PlexClient for this library's server
+  /// Throws an exception if no client is available
+  PlexClient getClientForLibrary() => context.getClientForLibrary(library);
+}
diff --git a/lib/mixins/refreshable.dart b/lib/mixins/refreshable.dart
index 065e83e4..709d6039 100644
--- a/lib/mixins/refreshable.dart
+++ b/lib/mixins/refreshable.dart
@@ -1,3 +1,23 @@
 mixin Refreshable {
   void refresh();
 }
+
+/// Mixin for screens that support full refresh (clearing all cached data)
+mixin FullRefreshable {
+  void fullRefresh();
+}
+
+/// Mixin for screens with focusable tab content
+mixin FocusableTab {
+  void focusActiveTabIfReady();
+}
+
+/// Mixin for screens with focusable search input
+mixin SearchInputFocusable {
+  void focusSearchInput();
+}
+
+/// Mixin for screens that can load a specific library by key
+mixin LibraryLoadable {
+  void loadLibraryByKey(String libraryGlobalKey);
+}
diff --git a/lib/models/deletion_progress.dart b/lib/models/deletion_progress.dart
new file mode 100644
index 00000000..ac4d6c12
--- /dev/null
+++ b/lib/models/deletion_progress.dart
@@ -0,0 +1,45 @@
+class DeletionProgress {
+  final String globalKey;
+  final String itemTitle;
+  final int currentItem;
+  final int totalItems;
+  final String? currentOperation;
+
+  const DeletionProgress({
+    required this.globalKey,
+    required this.itemTitle,
+    required this.currentItem,
+    required this.totalItems,
+    this.currentOperation,
+  });
+
+  double get progressPercent =>
+      totalItems > 0 ? (currentItem / totalItems) : 0.0;
+
+  int get progressPercentInt => (progressPercent * 100).round();
+
+  bool get isComplete => currentItem >= totalItems;
+
+  DeletionProgress copyWith({
+    String? globalKey,
+    String? itemTitle,
+    int? currentItem,
+    int? totalItems,
+    String? currentOperation,
+  }) {
+    return DeletionProgress(
+      globalKey: globalKey ?? this.globalKey,
+      itemTitle: itemTitle ?? this.itemTitle,
+      currentItem: currentItem ?? this.currentItem,
+      totalItems: totalItems ?? this.totalItems,
+      currentOperation: currentOperation ?? this.currentOperation,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'DeletionProgress(globalKey: $globalKey, itemTitle: $itemTitle, '
+        'currentItem: $currentItem, totalItems: $totalItems, '
+        'progressPercent: $progressPercentInt%)';
+  }
+}
diff --git a/lib/models/download_progress.dart b/lib/models/download_progress.dart
new file mode 100644
index 00000000..82ffc7aa
--- /dev/null
+++ b/lib/models/download_progress.dart
@@ -0,0 +1,82 @@
+import 'download_status.dart';
+
+class DownloadProgress {
+  final String globalKey;
+  final DownloadStatus status;
+  final int progress; // 0-100
+  final int downloadedBytes;
+  final int totalBytes;
+  final double speed; // bytes per second
+  final String? errorMessage;
+  final String?
+  currentFile; // What's being downloaded (video, subtitles, artwork)
+
+  // Thumbnail path (populated after artwork download completes)
+  final String? thumbPath;
+
+  const DownloadProgress({
+    required this.globalKey,
+    required this.status,
+    this.progress = 0,
+    this.downloadedBytes = 0,
+    this.totalBytes = 0,
+    this.speed = 0,
+    this.errorMessage,
+    this.currentFile,
+    this.thumbPath,
+  });
+
+  double get progressPercent => progress / 100.0;
+
+  String get speedFormatted {
+    if (speed < 1024) return '${speed.toStringAsFixed(0)} B/s';
+    if (speed < 1024 * 1024) return '${(speed / 1024).toStringAsFixed(1)} KB/s';
+    return '${(speed / (1024 * 1024)).toStringAsFixed(1)} MB/s';
+  }
+
+  String get downloadedFormatted => _formatBytes(downloadedBytes);
+  String get totalFormatted => _formatBytes(totalBytes);
+
+  String _formatBytes(int bytes) {
+    if (bytes < 1024) return '$bytes B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB';
+    if (bytes < 1024 * 1024 * 1024) {
+      return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
+    }
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(2)} GB';
+  }
+
+  Duration? get estimatedTimeRemaining {
+    if (speed <= 0 || totalBytes <= 0) return null;
+    final remainingBytes = totalBytes - downloadedBytes;
+    if (remainingBytes <= 0) return Duration.zero;
+    return Duration(seconds: (remainingBytes / speed).round());
+  }
+
+  /// Check if this progress update includes artwork paths
+  bool get hasArtworkPaths => thumbPath != null;
+
+  DownloadProgress copyWith({
+    String? globalKey,
+    DownloadStatus? status,
+    int? progress,
+    int? downloadedBytes,
+    int? totalBytes,
+    double? speed,
+    String? errorMessage,
+    String? currentFile,
+    String? thumbPath,
+  }) {
+    return DownloadProgress(
+      globalKey: globalKey ?? this.globalKey,
+      status: status ?? this.status,
+      progress: progress ?? this.progress,
+      downloadedBytes: downloadedBytes ?? this.downloadedBytes,
+      totalBytes: totalBytes ?? this.totalBytes,
+      speed: speed ?? this.speed,
+      errorMessage: errorMessage ?? this.errorMessage,
+      currentFile: currentFile ?? this.currentFile,
+      thumbPath: thumbPath ?? this.thumbPath,
+    );
+  }
+}
diff --git a/lib/models/download_status.dart b/lib/models/download_status.dart
new file mode 100644
index 00000000..f763de72
--- /dev/null
+++ b/lib/models/download_status.dart
@@ -0,0 +1,9 @@
+enum DownloadStatus {
+  queued,
+  downloading,
+  paused,
+  completed,
+  failed,
+  cancelled,
+  partial, // Some episodes downloaded, but not all (for shows/seasons)
+}
diff --git a/lib/models/media_container.dart b/lib/models/media_container.dart
deleted file mode 100644
index f77a29fe..00000000
--- a/lib/models/media_container.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-import 'plex_metadata.dart';
-import 'plex_library.dart';
-
-part 'media_container.g.dart';
-
-@JsonSerializable()
-class MediaContainer<T> {
-  final int? size;
-  final int? totalSize;
-  final int? offset;
-  final String? identifier;
-  @JsonKey(name: 'Directory')
-  final List<PlexLibrary>? directories;
-  @JsonKey(name: 'Metadata')
-  final List<PlexMetadata>? metadata;
-
-  MediaContainer({
-    this.size,
-    this.totalSize,
-    this.offset,
-    this.identifier,
-    this.directories,
-    this.metadata,
-  });
-
-  factory MediaContainer.fromJson(Map<String, dynamic> json) =>
-      _$MediaContainerFromJson(json);
-
-  Map<String, dynamic> toJson() => _$MediaContainerToJson(this);
-}
diff --git a/lib/models/media_container.g.dart b/lib/models/media_container.g.dart
deleted file mode 100644
index 2ed4e9e0..00000000
--- a/lib/models/media_container.g.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'media_container.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-MediaContainer<T> _$MediaContainerFromJson<T>(Map<String, dynamic> json) =>
-    MediaContainer<T>(
-      size: (json['size'] as num?)?.toInt(),
-      totalSize: (json['totalSize'] as num?)?.toInt(),
-      offset: (json['offset'] as num?)?.toInt(),
-      identifier: json['identifier'] as String?,
-      directories: (json['Directory'] as List<dynamic>?)
-          ?.map((e) => PlexLibrary.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      metadata: (json['Metadata'] as List<dynamic>?)
-          ?.map((e) => PlexMetadata.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$MediaContainerToJson<T>(MediaContainer<T> instance) =>
-    <String, dynamic>{
-      'size': instance.size,
-      'totalSize': instance.totalSize,
-      'offset': instance.offset,
-      'identifier': instance.identifier,
-      'Directory': instance.directories,
-      'Metadata': instance.metadata,
-    };
diff --git a/lib/models/mixins/multi_server_fields.dart b/lib/models/mixins/multi_server_fields.dart
new file mode 100644
index 00000000..1ba3e4a8
--- /dev/null
+++ b/lib/models/mixins/multi_server_fields.dart
@@ -0,0 +1,15 @@
+import 'package:json_annotation/json_annotation.dart';
+
+/// Mixin that provides multi-server support fields for models.
+///
+/// This mixin adds serverId and serverName fields that are excluded from
+/// JSON serialization but can be used to track which server an item belongs to.
+mixin MultiServerFields {
+  /// Server machine identifier (not from API)
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get serverId;
+
+  /// Server display name (not from API)
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get serverName;
+}
diff --git a/lib/models/play_queue_response.dart b/lib/models/play_queue_response.dart
new file mode 100644
index 00000000..511989b1
--- /dev/null
+++ b/lib/models/play_queue_response.dart
@@ -0,0 +1,105 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'plex_metadata.dart';
+
+part 'play_queue_response.g.dart';
+
+/// Converter to handle both int (0/1) and bool values from Plex API
+class BoolOrIntConverter implements JsonConverter<bool, Object> {
+  const BoolOrIntConverter();
+
+  @override
+  bool fromJson(Object json) {
+    if (json is bool) return json;
+    if (json is int) return json != 0;
+    if (json is String) return json.toLowerCase() == 'true' || json == '1';
+    return false;
+  }
+
+  @override
+  Object toJson(bool object) => object;
+}
+
+/// Response from Plex play queue API
+/// Contains queue metadata and a window of items
+@JsonSerializable(createToJson: false)
+class PlayQueueResponse {
+  final int playQueueID;
+  final int? playQueueSelectedItemID;
+  final int? playQueueSelectedItemOffset;
+  final String? playQueueSelectedMetadataItemID;
+  @BoolOrIntConverter()
+  final bool playQueueShuffled;
+  final String? playQueueSourceURI;
+  final int? playQueueTotalCount;
+  final int playQueueVersion;
+  final int? size; // Number of items in this response window
+  @JsonKey(name: 'Metadata')
+  final List<PlexMetadata>? items;
+
+  PlayQueueResponse({
+    required this.playQueueID,
+    this.playQueueSelectedItemID,
+    this.playQueueSelectedItemOffset,
+    this.playQueueSelectedMetadataItemID,
+    required this.playQueueShuffled,
+    this.playQueueSourceURI,
+    required this.playQueueTotalCount,
+    required this.playQueueVersion,
+    this.size,
+    this.items,
+  });
+
+  factory PlayQueueResponse.fromJson(
+    Map<String, dynamic> json, {
+    String? serverId,
+    String? serverName,
+  }) {
+    // The API returns data wrapped in MediaContainer
+    final container = json['MediaContainer'] as Map<String, dynamic>? ?? json;
+    final response = _$PlayQueueResponseFromJson(container);
+
+    // Tag all items with server info
+    if (response.items != null && (serverId != null || serverName != null)) {
+      final taggedItems = response.items!
+          .map(
+            (item) => item.copyWith(serverId: serverId, serverName: serverName),
+          )
+          .toList();
+      return PlayQueueResponse(
+        playQueueID: response.playQueueID,
+        playQueueSelectedItemID: response.playQueueSelectedItemID,
+        playQueueSelectedItemOffset: response.playQueueSelectedItemOffset,
+        playQueueSelectedMetadataItemID:
+            response.playQueueSelectedMetadataItemID,
+        playQueueShuffled: response.playQueueShuffled,
+        playQueueSourceURI: response.playQueueSourceURI,
+        playQueueTotalCount: response.playQueueTotalCount,
+        playQueueVersion: response.playQueueVersion,
+        size: response.size,
+        items: taggedItems,
+      );
+    }
+
+    return response;
+  }
+
+  /// Get the current selected item from the queue
+  PlexMetadata? get selectedItem {
+    if (items == null || playQueueSelectedItemID == null) return null;
+    try {
+      return items!.firstWhere(
+        (item) => item.playQueueItemID == playQueueSelectedItemID,
+      );
+    } catch (e) {
+      return null;
+    }
+  }
+
+  /// Get the index of the selected item in the current window
+  int? get selectedItemIndex {
+    if (items == null || playQueueSelectedItemID == null) return null;
+    return items!.indexWhere(
+      (item) => item.playQueueItemID == playQueueSelectedItemID,
+    );
+  }
+}
diff --git a/lib/models/play_queue_response.g.dart b/lib/models/play_queue_response.g.dart
new file mode 100644
index 00000000..8f8e3aa9
--- /dev/null
+++ b/lib/models/play_queue_response.g.dart
@@ -0,0 +1,28 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'play_queue_response.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PlayQueueResponse _$PlayQueueResponseFromJson(Map<String, dynamic> json) =>
+    PlayQueueResponse(
+      playQueueID: (json['playQueueID'] as num).toInt(),
+      playQueueSelectedItemID: (json['playQueueSelectedItemID'] as num?)
+          ?.toInt(),
+      playQueueSelectedItemOffset: (json['playQueueSelectedItemOffset'] as num?)
+          ?.toInt(),
+      playQueueSelectedMetadataItemID:
+          json['playQueueSelectedMetadataItemID'] as String?,
+      playQueueShuffled: const BoolOrIntConverter().fromJson(
+        json['playQueueShuffled'] as Object,
+      ),
+      playQueueSourceURI: json['playQueueSourceURI'] as String?,
+      playQueueTotalCount: (json['playQueueTotalCount'] as num?)?.toInt(),
+      playQueueVersion: (json['playQueueVersion'] as num).toInt(),
+      size: (json['size'] as num?)?.toInt(),
+      items: (json['Metadata'] as List<dynamic>?)
+          ?.map((e) => PlexMetadata.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
diff --git a/lib/config/plex_config.dart b/lib/models/plex_config.dart
similarity index 89%
rename from lib/config/plex_config.dart
rename to lib/models/plex_config.dart
index 08675587..5d53b1a9 100644
--- a/lib/config/plex_config.dart
+++ b/lib/models/plex_config.dart
@@ -9,6 +9,7 @@ class PlexConfig {
   final String platform;
   final String? device;
   final bool acceptJson;
+  final String? machineIdentifier;
 
   PlexConfig({
     required this.baseUrl,
@@ -19,6 +20,7 @@ class PlexConfig {
     this.platform = 'Flutter',
     this.device,
     this.acceptJson = true,
+    this.machineIdentifier,
   });
 
   static Future<PlexConfig> create({
@@ -29,6 +31,7 @@ class PlexConfig {
     String? platform,
     String? device,
     bool acceptJson = true,
+    String? machineIdentifier,
   }) async {
     final packageInfo = await PackageInfo.fromPlatform();
     return PlexConfig(
@@ -40,6 +43,7 @@ class PlexConfig {
       platform: platform ?? 'Flutter',
       device: device,
       acceptJson: acceptJson,
+      machineIdentifier: machineIdentifier,
     );
   }
 
@@ -70,6 +74,7 @@ class PlexConfig {
     String? platform,
     String? device,
     bool? acceptJson,
+    String? machineIdentifier,
   }) {
     return PlexConfig(
       baseUrl: baseUrl ?? this.baseUrl,
@@ -80,6 +85,7 @@ class PlexConfig {
       platform: platform ?? this.platform,
       device: device ?? this.device,
       acceptJson: acceptJson ?? this.acceptJson,
+      machineIdentifier: machineIdentifier ?? this.machineIdentifier,
     );
   }
 }
diff --git a/lib/models/plex_hub.dart b/lib/models/plex_hub.dart
index e568718f..da7bd957 100644
--- a/lib/models/plex_hub.dart
+++ b/lib/models/plex_hub.dart
@@ -10,6 +10,10 @@ class PlexHub {
   final bool more;
   final List<PlexMetadata> items;
 
+  // Multi-server support fields
+  final String? serverId; // Server machine identifier
+  final String? serverName; // Server display name
+
   PlexHub({
     required this.hubKey,
     required this.title,
@@ -18,14 +22,17 @@ class PlexHub {
     required this.size,
     required this.more,
     required this.items,
+    this.serverId,
+    this.serverName,
   });
 
   factory PlexHub.fromJson(Map<String, dynamic> json) {
     final metadataList = <PlexMetadata>[];
 
-    // Hubs can contain either Metadata or Directory entries
-    if (json['Metadata'] != null) {
-      for (final item in json['Metadata'] as List) {
+    // Helper function to parse entries from a JSON list
+    void parseEntries(List? entries) {
+      if (entries == null) return;
+      for (final item in entries) {
         try {
           metadataList.add(PlexMetadata.fromJson(item));
         } catch (e) {
@@ -34,15 +41,9 @@ class PlexHub {
       }
     }
 
-    if (json['Directory'] != null) {
-      for (final item in json['Directory'] as List) {
-        try {
-          metadataList.add(PlexMetadata.fromJson(item));
-        } catch (e) {
-          // Skip items that fail to parse
-        }
-      }
-    }
+    // Hubs can contain either Metadata or Directory entries
+    parseEntries(json['Metadata'] as List?);
+    parseEntries(json['Directory'] as List?);
 
     return PlexHub(
       hubKey: json['key'] as String? ?? '',
diff --git a/lib/models/plex_library.dart b/lib/models/plex_library.dart
index 34db55b4..d5c5d088 100644
--- a/lib/models/plex_library.dart
+++ b/lib/models/plex_library.dart
@@ -1,9 +1,11 @@
 import 'package:json_annotation/json_annotation.dart';
 
+import 'mixins/multi_server_fields.dart';
+
 part 'plex_library.g.dart';
 
 @JsonSerializable()
-class PlexLibrary {
+class PlexLibrary with MultiServerFields {
   final String key;
   final String title;
   final String type;
@@ -15,6 +17,17 @@ class PlexLibrary {
   final int? createdAt;
   final int? hidden;
 
+  // Multi-server support fields (from MultiServerFields mixin)
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? serverId;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? serverName;
+
+  /// Global unique identifier across all servers (serverId:key)
+  String get globalKey => serverId != null ? '$serverId:$key' : key;
+
   PlexLibrary({
     required this.key,
     required this.title,
@@ -26,10 +39,43 @@ class PlexLibrary {
     this.updatedAt,
     this.createdAt,
     this.hidden,
+    this.serverId,
+    this.serverName,
   });
 
   factory PlexLibrary.fromJson(Map<String, dynamic> json) =>
       _$PlexLibraryFromJson(json);
 
   Map<String, dynamic> toJson() => _$PlexLibraryToJson(this);
+
+  /// Create a copy of this library with optional field overrides
+  PlexLibrary copyWith({
+    String? key,
+    String? title,
+    String? type,
+    String? agent,
+    String? scanner,
+    String? language,
+    String? uuid,
+    int? updatedAt,
+    int? createdAt,
+    int? hidden,
+    String? serverId,
+    String? serverName,
+  }) {
+    return PlexLibrary(
+      key: key ?? this.key,
+      title: title ?? this.title,
+      type: type ?? this.type,
+      agent: agent ?? this.agent,
+      scanner: scanner ?? this.scanner,
+      language: language ?? this.language,
+      uuid: uuid ?? this.uuid,
+      updatedAt: updatedAt ?? this.updatedAt,
+      createdAt: createdAt ?? this.createdAt,
+      hidden: hidden ?? this.hidden,
+      serverId: serverId ?? this.serverId,
+      serverName: serverName ?? this.serverName,
+    );
+  }
 }
diff --git a/lib/models/plex_media_info.dart b/lib/models/plex_media_info.dart
index a6c2bfa7..03b6d42d 100644
--- a/lib/models/plex_media_info.dart
+++ b/lib/models/plex_media_info.dart
@@ -3,22 +3,52 @@ class PlexMediaInfo {
   final List<PlexAudioTrack> audioTracks;
   final List<PlexSubtitleTrack> subtitleTracks;
   final List<PlexChapter> chapters;
+  final int? partId;
 
   PlexMediaInfo({
     required this.videoUrl,
     required this.audioTracks,
     required this.subtitleTracks,
     required this.chapters,
+    this.partId,
   });
+  int? getPartId() => partId;
 }
 
-class PlexAudioTrack {
+/// Mixin for building track labels with a consistent pattern
+mixin TrackLabelBuilder {
+  int get id;
+  int? get index;
+  String? get displayTitle;
+  String? get language;
+
+  /// Builds a label from the given parts
+  /// If displayTitle is present, returns it
+  /// Otherwise, combines language and additional parts
+  String buildLabel(List<String> additionalParts) {
+    if (displayTitle != null && displayTitle!.isNotEmpty) {
+      return displayTitle!;
+    }
+    final parts = <String>[];
+    if (language != null && language!.isNotEmpty) {
+      parts.add(language!);
+    }
+    parts.addAll(additionalParts);
+    return parts.isEmpty ? 'Track ${index ?? id}' : parts.join(' · ');
+  }
+}
+
+class PlexAudioTrack with TrackLabelBuilder {
+  @override
   final int id;
+  @override
   final int? index;
   final String? codec;
+  @override
   final String? language;
   final String? languageCode;
   final String? title;
+  @override
   final String? displayTitle;
   final int? channels;
   final bool selected;
@@ -36,22 +66,24 @@ class PlexAudioTrack {
   });
 
   String get label {
-    if (displayTitle != null) return displayTitle!;
-    final parts = <String>[];
-    if (language != null) parts.add(language!);
-    if (codec != null) parts.add(codec!.toUpperCase());
-    if (channels != null) parts.add('${channels!}ch');
-    return parts.isEmpty ? 'Track ${index ?? id}' : parts.join(' · ');
+    final additionalParts = <String>[];
+    if (codec != null) additionalParts.add(codec!.toUpperCase());
+    if (channels != null) additionalParts.add('${channels!}ch');
+    return buildLabel(additionalParts);
   }
 }
 
-class PlexSubtitleTrack {
+class PlexSubtitleTrack with TrackLabelBuilder {
+  @override
   final int id;
+  @override
   final int? index;
   final String? codec;
+  @override
   final String? language;
   final String? languageCode;
   final String? title;
+  @override
   final String? displayTitle;
   final bool selected;
   final bool forced;
@@ -71,11 +103,9 @@ class PlexSubtitleTrack {
   });
 
   String get label {
-    if (displayTitle != null) return displayTitle!;
-    final parts = <String>[];
-    if (language != null) parts.add(language!);
-    if (forced) parts.add('Forced');
-    return parts.isEmpty ? 'Track ${index ?? id}' : parts.join(' · ');
+    final additionalParts = <String>[];
+    if (forced) additionalParts.add('Forced');
+    return buildLabel(additionalParts);
   }
 
   /// Returns true if this subtitle track is an external file (sidecar subtitle)
@@ -171,3 +201,11 @@ class PlexMarker {
     return posMs >= startTimeOffset && posMs <= endTimeOffset;
   }
 }
+
+/// Combined chapters and markers fetched in a single API call
+class PlaybackExtras {
+  final List<PlexChapter> chapters;
+  final List<PlexMarker> markers;
+
+  PlaybackExtras({required this.chapters, required this.markers});
+}
diff --git a/lib/models/plex_metadata.dart b/lib/models/plex_metadata.dart
index 17f360f0..928b255c 100644
--- a/lib/models/plex_metadata.dart
+++ b/lib/models/plex_metadata.dart
@@ -1,11 +1,40 @@
 import 'package:json_annotation/json_annotation.dart';
 
+import 'mixins/multi_server_fields.dart';
 import 'plex_role.dart';
 
 part 'plex_metadata.g.dart';
 
+/// Media type enum for type-safe media type handling
+enum PlexMediaType {
+  movie,
+  show,
+  season,
+  episode,
+  artist,
+  album,
+  track,
+  collection,
+  playlist,
+  clip,
+  photo,
+  unknown;
+
+  /// Whether this type represents video content
+  bool get isVideo => this == movie || this == episode || this == clip;
+
+  /// Whether this type is part of a show hierarchy
+  bool get isShowRelated => this == show || this == season || this == episode;
+
+  /// Whether this type represents music content
+  bool get isMusic => this == artist || this == album || this == track;
+
+  /// Whether this type can be played directly
+  bool get isPlayable => isVideo || this == track;
+}
+
 @JsonSerializable()
-class PlexMetadata {
+class PlexMetadata with MultiServerFields {
   final String ratingKey;
   final String key;
   final String? guid;
@@ -22,6 +51,7 @@ class PlexMetadata {
   final int? duration;
   final int? addedAt;
   final int? updatedAt;
+  final int? lastViewedAt; // Timestamp when item was last viewed
   final String? grandparentTitle; // Show title for episodes
   final String? grandparentThumb; // Show poster for episodes
   final String? grandparentArt; // Show art for episodes
@@ -36,12 +66,46 @@ class PlexMetadata {
   final int? viewCount;
   final int? leafCount; // Total number of episodes in a series/season
   final int? viewedLeafCount; // Number of watched episodes in a series/season
+  final int? childCount; // Number of items in a collection or playlist
   @JsonKey(name: 'Role')
   final List<PlexRole>? role; // Cast members
+  final String? audioLanguage; // Per-media preferred audio language
+  final String? subtitleLanguage; // Per-media preferred subtitle language
+  final int? playlistItemID; // Playlist item ID (for dumb playlists only)
+  final int? playQueueItemID; // Play queue item ID (unique even for duplicates)
+  final int? librarySectionID; // Library section ID this item belongs to
 
-  // Transient field for clear logo (extracted from Image array)
-  String? _clearLogo;
-  String? get clearLogo => _clearLogo;
+  // Multi-server support fields (from MultiServerFields mixin)
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? serverId;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? serverName;
+
+  // Clear logo URL (extracted from Image array, but serialized for offline storage)
+  final String? clearLogo;
+
+  /// Global unique identifier across all servers (serverId:ratingKey)
+  String get globalKey => serverId != null ? '$serverId:$ratingKey' : ratingKey;
+
+  /// Parsed media type enum for type-safe comparisons
+  PlexMediaType get mediaType {
+    return switch (type.toLowerCase()) {
+      'movie' => PlexMediaType.movie,
+      'show' => PlexMediaType.show,
+      'season' => PlexMediaType.season,
+      'episode' => PlexMediaType.episode,
+      'artist' => PlexMediaType.artist,
+      'album' => PlexMediaType.album,
+      'track' => PlexMediaType.track,
+      'collection' => PlexMediaType.collection,
+      'playlist' => PlexMediaType.playlist,
+      'clip' => PlexMediaType.clip,
+      'photo' => PlexMediaType.photo,
+      _ => PlexMediaType.unknown,
+    };
+  }
 
   PlexMetadata({
     required this.ratingKey,
@@ -60,6 +124,7 @@ class PlexMetadata {
     this.duration,
     this.addedAt,
     this.updatedAt,
+    this.lastViewedAt,
     this.grandparentTitle,
     this.grandparentThumb,
     this.grandparentArt,
@@ -74,7 +139,16 @@ class PlexMetadata {
     this.viewCount,
     this.leafCount,
     this.viewedLeafCount,
+    this.childCount,
     this.role,
+    this.audioLanguage,
+    this.subtitleLanguage,
+    this.playlistItemID,
+    this.playQueueItemID,
+    this.librarySectionID,
+    this.serverId,
+    this.serverName,
+    this.clearLogo,
   });
 
   /// Create a copy of this metadata with optional field overrides
@@ -95,6 +169,7 @@ class PlexMetadata {
     int? duration,
     int? addedAt,
     int? updatedAt,
+    int? lastViewedAt,
     String? grandparentTitle,
     String? grandparentThumb,
     String? grandparentArt,
@@ -109,9 +184,18 @@ class PlexMetadata {
     int? viewCount,
     int? leafCount,
     int? viewedLeafCount,
+    int? childCount,
     List<PlexRole>? role,
+    String? audioLanguage,
+    String? subtitleLanguage,
+    int? playlistItemID,
+    int? playQueueItemID,
+    int? librarySectionID,
+    String? serverId,
+    String? serverName,
+    String? clearLogo,
   }) {
-    final copy = PlexMetadata(
+    return PlexMetadata(
       ratingKey: ratingKey ?? this.ratingKey,
       key: key ?? this.key,
       guid: guid ?? this.guid,
@@ -128,6 +212,7 @@ class PlexMetadata {
       duration: duration ?? this.duration,
       addedAt: addedAt ?? this.addedAt,
       updatedAt: updatedAt ?? this.updatedAt,
+      lastViewedAt: lastViewedAt ?? this.lastViewedAt,
       grandparentTitle: grandparentTitle ?? this.grandparentTitle,
       grandparentThumb: grandparentThumb ?? this.grandparentThumb,
       grandparentArt: grandparentArt ?? this.grandparentArt,
@@ -142,33 +227,43 @@ class PlexMetadata {
       viewCount: viewCount ?? this.viewCount,
       leafCount: leafCount ?? this.leafCount,
       viewedLeafCount: viewedLeafCount ?? this.viewedLeafCount,
+      childCount: childCount ?? this.childCount,
       role: role ?? this.role,
+      audioLanguage: audioLanguage ?? this.audioLanguage,
+      subtitleLanguage: subtitleLanguage ?? this.subtitleLanguage,
+      playlistItemID: playlistItemID ?? this.playlistItemID,
+      playQueueItemID: playQueueItemID ?? this.playQueueItemID,
+      librarySectionID: librarySectionID ?? this.librarySectionID,
+      serverId: serverId ?? this.serverId,
+      serverName: serverName ?? this.serverName,
+      clearLogo: clearLogo ?? this.clearLogo,
     );
-    // Preserve clearLogo
-    copy._clearLogo = _clearLogo;
-    return copy;
   }
 
-  // Extract clearLogo from Image array in raw JSON
-  void _extractClearLogo(Map<String, dynamic> json) {
-    if (!json.containsKey('Image')) return;
+  /// Extract clearLogo from Image array in raw JSON
+  static String? _extractClearLogoFromJson(Map<String, dynamic> json) {
+    if (!json.containsKey('Image')) return null;
 
     final images = json['Image'] as List?;
-    if (images == null) return;
+    if (images == null) return null;
 
     for (var image in images) {
       if (image is Map && image['type'] == 'clearLogo') {
-        _clearLogo = image['url'] as String?;
-        return;
+        return image['url'] as String?;
       }
     }
+    return null;
   }
 
-  // Custom factory that extracts clearLogo
+  /// Create from JSON with clearLogo extracted from Image array
   factory PlexMetadata.fromJsonWithImages(Map<String, dynamic> json) {
-    final metadata = PlexMetadata.fromJson(json);
-    metadata._extractClearLogo(json);
-    return metadata;
+    // Extract clearLogo before parsing
+    final clearLogoUrl = _extractClearLogoFromJson(json);
+    // Add it to the json so it gets parsed
+    if (clearLogoUrl != null) {
+      json['clearLogo'] = clearLogoUrl;
+    }
+    return PlexMetadata.fromJson(json);
   }
 
   // Helper to get the display title (show name for episodes/seasons, title otherwise)
diff --git a/lib/models/plex_metadata.g.dart b/lib/models/plex_metadata.g.dart
index 5cf19850..a4dbc4d8 100644
--- a/lib/models/plex_metadata.g.dart
+++ b/lib/models/plex_metadata.g.dart
@@ -23,6 +23,7 @@ PlexMetadata _$PlexMetadataFromJson(Map<String, dynamic> json) => PlexMetadata(
   duration: (json['duration'] as num?)?.toInt(),
   addedAt: (json['addedAt'] as num?)?.toInt(),
   updatedAt: (json['updatedAt'] as num?)?.toInt(),
+  lastViewedAt: (json['lastViewedAt'] as num?)?.toInt(),
   grandparentTitle: json['grandparentTitle'] as String?,
   grandparentThumb: json['grandparentThumb'] as String?,
   grandparentArt: json['grandparentArt'] as String?,
@@ -37,9 +38,16 @@ PlexMetadata _$PlexMetadataFromJson(Map<String, dynamic> json) => PlexMetadata(
   viewCount: (json['viewCount'] as num?)?.toInt(),
   leafCount: (json['leafCount'] as num?)?.toInt(),
   viewedLeafCount: (json['viewedLeafCount'] as num?)?.toInt(),
+  childCount: (json['childCount'] as num?)?.toInt(),
   role: (json['Role'] as List<dynamic>?)
       ?.map((e) => PlexRole.fromJson(e as Map<String, dynamic>))
       .toList(),
+  audioLanguage: json['audioLanguage'] as String?,
+  subtitleLanguage: json['subtitleLanguage'] as String?,
+  playlistItemID: (json['playlistItemID'] as num?)?.toInt(),
+  playQueueItemID: (json['playQueueItemID'] as num?)?.toInt(),
+  librarySectionID: (json['librarySectionID'] as num?)?.toInt(),
+  clearLogo: json['clearLogo'] as String?,
 );
 
 Map<String, dynamic> _$PlexMetadataToJson(PlexMetadata instance) =>
@@ -60,6 +68,7 @@ Map<String, dynamic> _$PlexMetadataToJson(PlexMetadata instance) =>
       'duration': instance.duration,
       'addedAt': instance.addedAt,
       'updatedAt': instance.updatedAt,
+      'lastViewedAt': instance.lastViewedAt,
       'grandparentTitle': instance.grandparentTitle,
       'grandparentThumb': instance.grandparentThumb,
       'grandparentArt': instance.grandparentArt,
@@ -74,5 +83,12 @@ Map<String, dynamic> _$PlexMetadataToJson(PlexMetadata instance) =>
       'viewCount': instance.viewCount,
       'leafCount': instance.leafCount,
       'viewedLeafCount': instance.viewedLeafCount,
+      'childCount': instance.childCount,
       'Role': instance.role,
+      'audioLanguage': instance.audioLanguage,
+      'subtitleLanguage': instance.subtitleLanguage,
+      'playlistItemID': instance.playlistItemID,
+      'playQueueItemID': instance.playQueueItemID,
+      'librarySectionID': instance.librarySectionID,
+      'clearLogo': instance.clearLogo,
     };
diff --git a/lib/models/plex_playlist.dart b/lib/models/plex_playlist.dart
new file mode 100644
index 00000000..e1aaaa18
--- /dev/null
+++ b/lib/models/plex_playlist.dart
@@ -0,0 +1,146 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import 'mixins/multi_server_fields.dart';
+
+part 'plex_playlist.g.dart';
+
+@JsonSerializable()
+class PlexPlaylist with MultiServerFields {
+  final String ratingKey;
+  final String key;
+  final String type; // "playlist"
+  final String title;
+  final String? summary;
+  final bool smart;
+  final String playlistType; // video, audio, photo
+  final int? duration;
+  final int? leafCount; // Number of items in playlist
+  final String? composite; // Composite thumbnail image
+  final int? addedAt;
+  final int? updatedAt;
+  final int? lastViewedAt;
+  final int? viewCount;
+  final String? content; // For smart playlists - generator URI
+  final String? guid;
+  final String? thumb;
+
+  // Multi-server support fields (from MultiServerFields mixin)
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? serverId;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? serverName;
+
+  PlexPlaylist({
+    required this.ratingKey,
+    required this.key,
+    required this.type,
+    required this.title,
+    this.summary,
+    required this.smart,
+    required this.playlistType,
+    this.duration,
+    this.leafCount,
+    this.composite,
+    this.addedAt,
+    this.updatedAt,
+    this.lastViewedAt,
+    this.viewCount,
+    this.content,
+    this.guid,
+    this.thumb,
+    this.serverId,
+    this.serverName,
+  });
+
+  /// Helper to get display image (composite or thumb)
+  String? get displayImage => composite ?? thumb;
+
+  /// Helper to get display title (consistent with PlexMetadata)
+  String get displayTitle => title;
+
+  /// Helper to determine if playlist is editable
+  bool get isEditable => !smart;
+
+  /// Get globally unique key across all servers
+  String get globalKey => serverId != null ? '$serverId:$ratingKey' : ratingKey;
+
+  // Properties for MediaCard compatibility with PlexMetadata interface
+
+  /// Playlists are not "watched" in the traditional sense
+  bool get isWatched => false;
+
+  /// Playlists don't have resume positions
+  int? get viewOffset => null;
+
+  /// Playlists don't have parent/episode indices
+  int? get parentIndex => null;
+  int? get index => null;
+
+  /// Playlists don't have parent titles or subtitles
+  String? get parentTitle => null;
+  String? get displaySubtitle => null;
+
+  /// Playlists don't have year, rating, or content metadata
+  int? get year => null;
+  String? get contentRating => null;
+  double? get rating => null;
+  String? get studio => null;
+
+  /// Use leafCount as the equivalent of childCount
+  int? get childCount => leafCount;
+
+  /// Playlists don't track viewed leaf count
+  int? get viewedLeafCount => null;
+
+  factory PlexPlaylist.fromJson(Map<String, dynamic> json) =>
+      _$PlexPlaylistFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PlexPlaylistToJson(this);
+
+  /// Create a copy with optional field updates
+  PlexPlaylist copyWith({
+    String? ratingKey,
+    String? key,
+    String? type,
+    String? title,
+    String? summary,
+    bool? smart,
+    String? playlistType,
+    int? duration,
+    int? leafCount,
+    String? composite,
+    int? addedAt,
+    int? updatedAt,
+    int? lastViewedAt,
+    int? viewCount,
+    String? content,
+    String? guid,
+    String? thumb,
+    String? serverId,
+    String? serverName,
+  }) {
+    return PlexPlaylist(
+      ratingKey: ratingKey ?? this.ratingKey,
+      key: key ?? this.key,
+      type: type ?? this.type,
+      title: title ?? this.title,
+      summary: summary ?? this.summary,
+      smart: smart ?? this.smart,
+      playlistType: playlistType ?? this.playlistType,
+      duration: duration ?? this.duration,
+      leafCount: leafCount ?? this.leafCount,
+      composite: composite ?? this.composite,
+      addedAt: addedAt ?? this.addedAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      lastViewedAt: lastViewedAt ?? this.lastViewedAt,
+      viewCount: viewCount ?? this.viewCount,
+      content: content ?? this.content,
+      guid: guid ?? this.guid,
+      thumb: thumb ?? this.thumb,
+      serverId: serverId ?? this.serverId,
+      serverName: serverName ?? this.serverName,
+    );
+  }
+}
diff --git a/lib/models/plex_playlist.g.dart b/lib/models/plex_playlist.g.dart
new file mode 100644
index 00000000..96647865
--- /dev/null
+++ b/lib/models/plex_playlist.g.dart
@@ -0,0 +1,48 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'plex_playlist.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PlexPlaylist _$PlexPlaylistFromJson(Map<String, dynamic> json) => PlexPlaylist(
+  ratingKey: json['ratingKey'] as String,
+  key: json['key'] as String,
+  type: json['type'] as String,
+  title: json['title'] as String,
+  summary: json['summary'] as String?,
+  smart: json['smart'] as bool,
+  playlistType: json['playlistType'] as String,
+  duration: (json['duration'] as num?)?.toInt(),
+  leafCount: (json['leafCount'] as num?)?.toInt(),
+  composite: json['composite'] as String?,
+  addedAt: (json['addedAt'] as num?)?.toInt(),
+  updatedAt: (json['updatedAt'] as num?)?.toInt(),
+  lastViewedAt: (json['lastViewedAt'] as num?)?.toInt(),
+  viewCount: (json['viewCount'] as num?)?.toInt(),
+  content: json['content'] as String?,
+  guid: json['guid'] as String?,
+  thumb: json['thumb'] as String?,
+);
+
+Map<String, dynamic> _$PlexPlaylistToJson(PlexPlaylist instance) =>
+    <String, dynamic>{
+      'ratingKey': instance.ratingKey,
+      'key': instance.key,
+      'type': instance.type,
+      'title': instance.title,
+      'summary': instance.summary,
+      'smart': instance.smart,
+      'playlistType': instance.playlistType,
+      'duration': instance.duration,
+      'leafCount': instance.leafCount,
+      'composite': instance.composite,
+      'addedAt': instance.addedAt,
+      'updatedAt': instance.updatedAt,
+      'lastViewedAt': instance.lastViewedAt,
+      'viewCount': instance.viewCount,
+      'content': instance.content,
+      'guid': instance.guid,
+      'thumb': instance.thumb,
+    };
diff --git a/lib/models/plex_server_info.dart b/lib/models/plex_server_info.dart
deleted file mode 100644
index 35b586db..00000000
--- a/lib/models/plex_server_info.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'plex_server_info.g.dart';
-
-@JsonSerializable()
-class PlexServerInfo {
-  final String name;
-  final String? host;
-  final int? port;
-  final String? machineIdentifier;
-  final String version;
-  final bool? owned;
-  final bool? https;
-
-  PlexServerInfo({
-    required this.name,
-    this.host,
-    this.port,
-    this.machineIdentifier,
-    required this.version,
-    this.owned,
-    this.https,
-  });
-
-  factory PlexServerInfo.fromJson(Map<String, dynamic> json) =>
-      _$PlexServerInfoFromJson(json);
-
-  Map<String, dynamic> toJson() => _$PlexServerInfoToJson(this);
-}
diff --git a/lib/models/plex_server_info.g.dart b/lib/models/plex_server_info.g.dart
deleted file mode 100644
index d36d3126..00000000
--- a/lib/models/plex_server_info.g.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'plex_server_info.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-PlexServerInfo _$PlexServerInfoFromJson(Map<String, dynamic> json) =>
-    PlexServerInfo(
-      name: json['name'] as String,
-      host: json['host'] as String?,
-      port: (json['port'] as num?)?.toInt(),
-      machineIdentifier: json['machineIdentifier'] as String?,
-      version: json['version'] as String,
-      owned: json['owned'] as bool?,
-      https: json['https'] as bool?,
-    );
-
-Map<String, dynamic> _$PlexServerInfoToJson(PlexServerInfo instance) =>
-    <String, dynamic>{
-      'name': instance.name,
-      'host': instance.host,
-      'port': instance.port,
-      'machineIdentifier': instance.machineIdentifier,
-      'version': instance.version,
-      'owned': instance.owned,
-      'https': instance.https,
-    };
diff --git a/lib/mpv/models/audio_device.dart b/lib/mpv/models/audio_device.dart
new file mode 100644
index 00000000..be5dca7d
--- /dev/null
+++ b/lib/mpv/models/audio_device.dart
@@ -0,0 +1,26 @@
+/// Represents an audio output device.
+class AudioDevice {
+  /// Unique identifier for the device.
+  final String name;
+
+  /// Human-readable description of the device.
+  final String description;
+
+  const AudioDevice({required this.name, this.description = ''});
+
+  /// Default/auto audio device.
+  static const auto = AudioDevice(name: 'auto', description: 'Auto');
+
+  @override
+  String toString() => 'AudioDevice($name, $description)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is AudioDevice &&
+          runtimeType == other.runtimeType &&
+          name == other.name;
+
+  @override
+  int get hashCode => name.hashCode;
+}
diff --git a/lib/mpv/models/audio_track.dart b/lib/mpv/models/audio_track.dart
new file mode 100644
index 00000000..11e2b565
--- /dev/null
+++ b/lib/mpv/models/audio_track.dart
@@ -0,0 +1,68 @@
+/// Represents an audio track in the media.
+class AudioTrack {
+  /// Unique identifier for the track.
+  final String id;
+
+  /// Human-readable title of the track.
+  final String? title;
+
+  /// Language code (e.g., 'eng', 'jpn').
+  final String? language;
+
+  /// Audio codec (e.g., 'aac', 'ac3', 'dts').
+  final String? codec;
+
+  /// Number of audio channels.
+  final int? channels;
+
+  /// Alias for channels (media_kit compatibility).
+  int? get channelsCount => channels;
+
+  /// Sample rate in Hz.
+  final int? sampleRate;
+
+  /// Bitrate in bits per second.
+  final int? bitrate;
+
+  /// Whether this is the default track.
+  final bool isDefault;
+
+  /// Whether this track is forced.
+  final bool isForced;
+
+  const AudioTrack({
+    required this.id,
+    this.title,
+    this.language,
+    this.codec,
+    this.channels,
+    this.sampleRate,
+    this.bitrate,
+    this.isDefault = false,
+    this.isForced = false,
+  });
+
+  /// Auto-select track.
+  static const auto = AudioTrack(id: 'auto', title: 'Auto');
+
+  /// Disable audio.
+  static const off = AudioTrack(id: 'no', title: 'Off');
+
+  /// Returns a display name for the track.
+  String get displayName {
+    if (title != null && title!.isNotEmpty) return title!;
+    if (language != null && language!.isNotEmpty) return language!;
+    return 'Track $id';
+  }
+
+  @override
+  String toString() => 'AudioTrack($id, $displayName)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is AudioTrack && runtimeType == other.runtimeType && id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
diff --git a/lib/mpv/models/media.dart b/lib/mpv/models/media.dart
new file mode 100644
index 00000000..569896bf
--- /dev/null
+++ b/lib/mpv/models/media.dart
@@ -0,0 +1,27 @@
+/// Represents a media source for the player.
+class Media {
+  /// The URI of the media (file path, HTTP URL, etc.).
+  final String uri;
+
+  /// Optional HTTP headers for network requests.
+  final Map<String, String>? headers;
+
+  /// Optional start position for playback.
+  final Duration? start;
+
+  const Media(this.uri, {this.headers, this.start});
+
+  @override
+  String toString() => 'Media($uri)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is Media &&
+          runtimeType == other.runtimeType &&
+          uri == other.uri &&
+          start == other.start;
+
+  @override
+  int get hashCode => uri.hashCode ^ start.hashCode;
+}
diff --git a/lib/mpv/models/player_log.dart b/lib/mpv/models/player_log.dart
new file mode 100644
index 00000000..1c084570
--- /dev/null
+++ b/lib/mpv/models/player_log.dart
@@ -0,0 +1,22 @@
+import 'player_log_level.dart';
+
+/// A log entry from the player.
+class PlayerLog {
+  /// The log level of this message.
+  final PlayerLogLevel level;
+
+  /// The prefix/category of the log message (e.g., 'cplayer', 'ffmpeg').
+  final String prefix;
+
+  /// The log message text.
+  final String text;
+
+  const PlayerLog({
+    required this.level,
+    required this.prefix,
+    required this.text,
+  });
+
+  @override
+  String toString() => '[$prefix] ${level.name}: $text';
+}
diff --git a/lib/mpv/models/player_log_level.dart b/lib/mpv/models/player_log_level.dart
new file mode 100644
index 00000000..3f60d694
--- /dev/null
+++ b/lib/mpv/models/player_log_level.dart
@@ -0,0 +1,26 @@
+/// Log level for player messages.
+enum PlayerLogLevel {
+  /// No logging.
+  none,
+
+  /// Fatal errors only.
+  fatal,
+
+  /// Errors.
+  error,
+
+  /// Warnings.
+  warn,
+
+  /// Informational messages.
+  info,
+
+  /// Verbose output.
+  verbose,
+
+  /// Debug messages.
+  debug,
+
+  /// Trace-level output (very verbose).
+  trace,
+}
diff --git a/lib/mpv/models/subtitle_track.dart b/lib/mpv/models/subtitle_track.dart
new file mode 100644
index 00000000..24e1fc52
--- /dev/null
+++ b/lib/mpv/models/subtitle_track.dart
@@ -0,0 +1,75 @@
+/// Represents a subtitle track in the media.
+class SubtitleTrack {
+  /// Unique identifier for the track.
+  final String id;
+
+  /// Human-readable title of the track.
+  final String? title;
+
+  /// Language code (e.g., 'eng', 'jpn').
+  final String? language;
+
+  /// Subtitle codec/format (e.g., 'subrip', 'ass', 'pgs').
+  final String? codec;
+
+  /// Whether this is the default track.
+  final bool isDefault;
+
+  /// Whether this track is forced (e.g., for foreign language segments).
+  final bool isForced;
+
+  /// Whether this is an external subtitle file.
+  final bool isExternal;
+
+  /// URI of external subtitle file (if isExternal is true).
+  final String? uri;
+
+  const SubtitleTrack({
+    required this.id,
+    this.title,
+    this.language,
+    this.codec,
+    this.isDefault = false,
+    this.isForced = false,
+    this.isExternal = false,
+    this.uri,
+  });
+
+  /// Create a subtitle track from an external URI.
+  factory SubtitleTrack.uri(String uri, {String? title, String? language}) {
+    return SubtitleTrack(
+      id: 'external:$uri',
+      title: title,
+      language: language,
+      isExternal: true,
+      uri: uri,
+    );
+  }
+
+  /// Auto-select track.
+  static const auto = SubtitleTrack(id: 'auto', title: 'Auto');
+
+  /// Disable subtitles.
+  static const off = SubtitleTrack(id: 'no', title: 'Off');
+
+  /// Returns a display name for the track.
+  String get displayName {
+    if (title != null && title!.isNotEmpty) return title!;
+    if (language != null && language!.isNotEmpty) return language!;
+    if (isExternal) return 'External';
+    return 'Track $id';
+  }
+
+  @override
+  String toString() => 'SubtitleTrack($id, $displayName)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is SubtitleTrack &&
+          runtimeType == other.runtimeType &&
+          id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}
diff --git a/lib/mpv/models/track_selection.dart b/lib/mpv/models/track_selection.dart
new file mode 100644
index 00000000..1a9cbe3e
--- /dev/null
+++ b/lib/mpv/models/track_selection.dart
@@ -0,0 +1,24 @@
+import 'audio_track.dart';
+import 'subtitle_track.dart';
+
+/// Represents the currently selected tracks.
+class TrackSelection {
+  /// Currently selected audio track.
+  final AudioTrack? audio;
+
+  /// Currently selected subtitle track.
+  final SubtitleTrack? subtitle;
+
+  const TrackSelection({this.audio, this.subtitle});
+
+  /// Creates a copy with the given fields replaced.
+  TrackSelection copyWith({AudioTrack? audio, SubtitleTrack? subtitle}) {
+    return TrackSelection(
+      audio: audio ?? this.audio,
+      subtitle: subtitle ?? this.subtitle,
+    );
+  }
+
+  @override
+  String toString() => 'TrackSelection(audio: $audio, subtitle: $subtitle)';
+}
diff --git a/lib/mpv/models/tracks.dart b/lib/mpv/models/tracks.dart
new file mode 100644
index 00000000..0892600b
--- /dev/null
+++ b/lib/mpv/models/tracks.dart
@@ -0,0 +1,25 @@
+import 'audio_track.dart';
+import 'subtitle_track.dart';
+
+/// Container for all available tracks in the media.
+class Tracks {
+  /// Available audio tracks.
+  final List<AudioTrack> audio;
+
+  /// Available subtitle tracks.
+  final List<SubtitleTrack> subtitle;
+
+  const Tracks({this.audio = const [], this.subtitle = const []});
+
+  /// Creates a copy with the given fields replaced.
+  Tracks copyWith({List<AudioTrack>? audio, List<SubtitleTrack>? subtitle}) {
+    return Tracks(
+      audio: audio ?? this.audio,
+      subtitle: subtitle ?? this.subtitle,
+    );
+  }
+
+  @override
+  String toString() =>
+      'Tracks(audio: ${audio.length}, subtitle: ${subtitle.length})';
+}
diff --git a/lib/mpv/mpv.dart b/lib/mpv/mpv.dart
new file mode 100644
index 00000000..2dc297d4
--- /dev/null
+++ b/lib/mpv/mpv.dart
@@ -0,0 +1,62 @@
+/// MPV Player library for Flutter.
+///
+/// This library provides a platform-agnostic interface for video playback
+/// using MPV as the underlying player engine.
+///
+/// ## Features
+///
+/// - Stream-based reactive state updates
+/// - Audio passthrough support for lossless audio
+/// - Subtitle rendering with libass
+/// - Hardware-accelerated decoding
+/// - Cross-platform support (macOS, iOS, Android, Windows, Linux)
+///
+/// ## Usage
+///
+/// ```dart
+/// import 'package:flutter_application_1/mpv/mpv.dart';
+///
+/// // Create a player
+/// final player = Player();
+///
+/// // Configure player properties
+/// await player.setProperty('hwdec', 'auto');
+/// await player.setProperty('demuxer-max-bytes', '150000000');
+/// await player.setAudioPassthrough(true);
+///
+/// // Open and play media
+/// await player.open(Media('https://example.com/video.mp4'));
+///
+/// // Listen to state changes
+/// player.streams.position.listen((position) {
+///   print('Position: $position');
+/// });
+///
+/// // Display video
+/// Video(
+///   player: player,
+///   controls: (context) => MyCustomControls(),
+/// )
+///
+/// // Clean up
+/// await player.dispose();
+/// ```
+library;
+
+// Player
+export 'player/player.dart';
+export 'player/player_state.dart';
+export 'player/player_streams.dart';
+
+// Models
+export 'models/media.dart';
+export 'models/audio_device.dart';
+export 'models/audio_track.dart';
+export 'models/subtitle_track.dart';
+export 'models/tracks.dart';
+export 'models/track_selection.dart';
+export 'models/player_log.dart';
+export 'models/player_log_level.dart';
+
+// Video
+export 'video/video.dart';
diff --git a/lib/mpv/player/platform/player_linux.dart b/lib/mpv/player/platform/player_linux.dart
new file mode 100644
index 00000000..a75e23c6
--- /dev/null
+++ b/lib/mpv/player/platform/player_linux.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/services.dart';
+
+import '../player_native.dart';
+
+/// Linux implementation of [Player].
+///
+/// Uses libmpv with OpenGL rendering via GtkGLArea.
+/// The mpv video is rendered to a GtkGLArea positioned behind
+/// the Flutter view using a GtkOverlay, with transparent regions
+/// in the Flutter UI allowing the video to show through.
+class PlayerLinux extends PlayerNative {
+  static const _methodChannel = MethodChannel('com.plezy/mpv_player');
+
+  @override
+  int? get textureId => null; // Uses GtkGLArea, not Flutter texture
+
+  /// Sets the visibility of the video controls overlay.
+  ///
+  /// On Linux, due to Flutter's lack of transparency support in GtkOverlay,
+  /// we hide the video layer when controls are visible and show it when
+  /// controls are hidden. This provides a workaround for the transparency
+  /// limitation.
+  @override
+  Future<void> setControlsVisible(bool visible) async {
+    await _methodChannel.invokeMethod('setControlsVisible', {
+      'visible': visible,
+    });
+  }
+}
diff --git a/lib/mpv/player/platform/player_windows.dart b/lib/mpv/player/platform/player_windows.dart
new file mode 100644
index 00000000..0832b298
--- /dev/null
+++ b/lib/mpv/player/platform/player_windows.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/services.dart';
+
+import '../player_native.dart';
+import '../video_rect_support.dart';
+
+/// Windows implementation of [Player].
+///
+/// Uses libmpv via platform channels with native window embedding.
+/// The mpv video window is positioned behind the Flutter window,
+/// with transparent regions allowing the video to show through.
+class PlayerWindows extends PlayerNative with VideoRectSupport {
+  static const _methodChannel = MethodChannel('com.plezy/mpv_player');
+
+  @override
+  int? get textureId => null; // Uses native window embedding, not Flutter texture
+
+  @override
+  Future<void> setVideoRect({
+    required int left,
+    required int top,
+    required int right,
+    required int bottom,
+    required double devicePixelRatio,
+  }) async {
+    await _methodChannel.invokeMethod('setVideoRect', {
+      'left': left,
+      'top': top,
+      'right': right,
+      'bottom': bottom,
+      'devicePixelRatio': devicePixelRatio,
+    });
+  }
+}
diff --git a/lib/mpv/player/player.dart b/lib/mpv/player/player.dart
new file mode 100644
index 00000000..e817ac86
--- /dev/null
+++ b/lib/mpv/player/player.dart
@@ -0,0 +1,219 @@
+import 'dart:io' show Platform;
+
+import '../models/audio_device.dart';
+import '../models/media.dart';
+import '../models/audio_track.dart';
+import '../models/subtitle_track.dart';
+import 'player_native.dart';
+import 'player_state.dart';
+import 'player_streams.dart';
+import 'platform/player_linux.dart';
+import 'platform/player_windows.dart';
+
+/// Abstract interface for the video player.
+///
+/// This interface defines all playback control methods, state access,
+/// and reactive streams for the video player.
+///
+/// Example usage:
+/// ```dart
+/// final player = Player();
+/// await player.open(Media('https://example.com/video.mp4'));
+/// await player.play();
+///
+/// // Configure player properties
+/// await player.setProperty('hwdec', 'auto');
+/// await player.setProperty('demuxer-max-bytes', '150000000');
+///
+/// // Listen to position updates
+/// player.streams.position.listen((position) {
+///   print('Position: $position');
+/// });
+///
+/// // Access current state
+/// print('Playing: ${player.state.playing}');
+/// ```
+abstract class Player {
+  /// Current synchronous state snapshot.
+  ///
+  /// Use this for immediate state access in UI.
+  PlayerState get state;
+
+  /// Reactive streams for state changes.
+  ///
+  /// Use these for reactive UI updates.
+  PlayerStreams get streams;
+
+  /// Texture ID for Flutter's Texture widget (video rendering).
+  ///
+  /// This is set by the platform implementation when video
+  /// rendering is initialized. Returns null if not ready.
+  int? get textureId;
+
+  // ============================================
+  // Playback Control
+  // ============================================
+
+  /// Open a media source for playback.
+  ///
+  /// [media] - The media source to open.
+  /// [play] - Whether to start playback immediately (default: true).
+  Future<void> open(Media media, {bool play = true});
+
+  /// Start or resume playback.
+  Future<void> play();
+
+  /// Pause playback.
+  Future<void> pause();
+
+  /// Toggle between play and pause.
+  Future<void> playOrPause();
+
+  /// Stop playback and reset position.
+  Future<void> stop();
+
+  /// Seek to a specific position.
+  Future<void> seek(Duration position);
+
+  // ============================================
+  // Track Selection
+  // ============================================
+
+  /// Select an audio track.
+  Future<void> selectAudioTrack(AudioTrack track);
+
+  /// Select a subtitle track.
+  ///
+  /// Pass [SubtitleTrack.off] to disable subtitles.
+  Future<void> selectSubtitleTrack(SubtitleTrack track);
+
+  /// Add an external subtitle track.
+  ///
+  /// [uri] - URL or path to the subtitle file.
+  /// [title] - Optional display title.
+  /// [language] - Optional language code.
+  /// [select] - Whether to select this track immediately.
+  Future<void> addSubtitleTrack({
+    required String uri,
+    String? title,
+    String? language,
+    bool select = false,
+  });
+
+  // ============================================
+  // Volume and Rate
+  // ============================================
+
+  /// Set the playback volume.
+  ///
+  /// [volume] - Volume level from 0.0 (muted) to 100.0 (max).
+  Future<void> setVolume(double volume);
+
+  /// Set the playback rate/speed.
+  ///
+  /// [rate] - Playback rate from 0.25 to 4.0 (1.0 = normal speed).
+  Future<void> setRate(double rate);
+
+  /// Set the audio output device.
+  ///
+  /// [device] - The audio device to use.
+  Future<void> setAudioDevice(AudioDevice device);
+
+  // ============================================
+  // MPV Properties (Advanced)
+  // ============================================
+
+  /// Set an MPV property by name.
+  ///
+  /// Common properties:
+  /// - 'hwdec': Hardware decoding mode ('auto', 'no', 'videotoolbox', etc.)
+  /// - 'demuxer-max-bytes': Buffer size in bytes
+  /// - 'audio-delay': Audio sync offset in seconds (e.g., '0.5')
+  /// - 'sub-delay': Subtitle sync offset in seconds
+  /// - 'sub-font': Subtitle font name
+  /// - 'sub-font-size': Subtitle font size
+  /// - 'sub-color': Subtitle text color
+  /// - 'sub-back-color': Subtitle background color
+  /// - 'sub-border-size': Subtitle border size
+  /// - 'sub-margin-y': Vertical subtitle margin
+  /// - 'sub-ass': Enable/disable ASS subtitle rendering ('yes'/'no')
+  /// - 'audio-exclusive': Exclusive audio mode ('yes'/'no')
+  /// - 'audio-spdif': Audio passthrough formats (e.g., 'ac3,eac3,dts,truehd')
+  Future<void> setProperty(String name, String value);
+
+  /// Get an MPV property value by name.
+  Future<String?> getProperty(String name);
+
+  /// Execute a raw MPV command.
+  ///
+  /// [args] - Command and arguments as a list of strings.
+  Future<void> command(List<String> args);
+
+  // ============================================
+  // Passthrough Mode (Audio)
+  // ============================================
+
+  /// Enable or disable audio passthrough mode.
+  ///
+  /// When enabled, supported audio codecs (AC3, DTS, etc.) will be
+  /// passed through to the audio device without decoding.
+  Future<void> setAudioPassthrough(bool enabled);
+
+  // ============================================
+  // Visibility (macOS Metal Layer)
+  // ============================================
+
+  /// Show or hide the video rendering layer.
+  ///
+  /// On macOS, this controls the Metal layer visibility.
+  /// On other platforms, this may have no effect.
+  ///
+  /// Returns true if the operation was successful.
+  Future<bool> setVisible(bool visible);
+
+  /// Notify the player about controls visibility.
+  ///
+  /// On Linux, due to Flutter's lack of transparency support in GtkOverlay,
+  /// the video layer is hidden when controls are visible and shown when
+  /// controls are hidden. On other platforms, this is a no-op.
+  Future<void> setControlsVisible(bool visible);
+
+  /// Update the video frame/surface dimensions.
+  ///
+  /// On iOS/macOS, this updates the Metal layer's frame to match the current
+  /// window size. Call this when the layout changes (e.g., device rotation).
+  /// On other platforms, this is a no-op.
+  Future<void> updateFrame();
+
+  // ============================================
+  // Lifecycle
+  // ============================================
+
+  /// Dispose of the player and release resources.
+  ///
+  /// After calling this, the player instance should not be used.
+  Future<void> dispose();
+
+  // ============================================
+  // Factory
+  // ============================================
+
+  /// Creates a new player instance.
+  ///
+  /// Returns a platform-specific implementation:
+  /// - macOS/iOS/Android: [PlayerNative] using MPVKit/libmpv with texture rendering
+  /// - Windows: [PlayerWindows] using libmpv with native window embedding
+  /// - Linux: [PlayerLinux] using libmpv with OpenGL rendering via GtkGLArea
+  factory Player() {
+    if (Platform.isMacOS || Platform.isIOS || Platform.isAndroid) {
+      return PlayerNative();
+    }
+    if (Platform.isWindows) {
+      return PlayerWindows();
+    }
+    if (Platform.isLinux) {
+      return PlayerLinux();
+    }
+    throw UnsupportedError('Player is not supported on this platform');
+  }
+}
diff --git a/lib/mpv/player/player_native.dart b/lib/mpv/player/player_native.dart
new file mode 100644
index 00000000..44ebb7cd
--- /dev/null
+++ b/lib/mpv/player/player_native.dart
@@ -0,0 +1,585 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io' show Platform;
+
+import 'package:flutter/services.dart';
+
+import '../utils/android_font_loader.dart';
+
+import '../models/audio_device.dart';
+import '../models/audio_track.dart';
+import '../models/player_log.dart';
+import '../models/media.dart';
+import '../models/subtitle_track.dart';
+import '../models/track_selection.dart';
+import '../models/tracks.dart';
+import 'player.dart';
+import 'player_state.dart';
+import 'player_streams.dart';
+
+/// Shared native implementation of [Player] for iOS and macOS.
+/// Uses MPVKit via platform channels with Metal rendering.
+class PlayerNative implements Player {
+  static const _methodChannel = MethodChannel('com.plezy/mpv_player');
+  static const _eventChannel = EventChannel('com.plezy/mpv_player/events');
+
+  PlayerState _state = const PlayerState();
+
+  @override
+  PlayerState get state => _state;
+
+  late final PlayerStreams _streams;
+
+  @override
+  PlayerStreams get streams => _streams;
+
+  @override
+  int? get textureId => null; // Uses direct Metal layer, not Flutter texture
+
+  // Stream controllers
+  final _playingController = StreamController<bool>.broadcast();
+  final _completedController = StreamController<bool>.broadcast();
+  final _bufferingController = StreamController<bool>.broadcast();
+  final _positionController = StreamController<Duration>.broadcast();
+  final _durationController = StreamController<Duration>.broadcast();
+  final _bufferController = StreamController<Duration>.broadcast();
+  final _volumeController = StreamController<double>.broadcast();
+  final _rateController = StreamController<double>.broadcast();
+  final _tracksController = StreamController<Tracks>.broadcast();
+  final _trackController = StreamController<TrackSelection>.broadcast();
+  final _logController = StreamController<PlayerLog>.broadcast();
+  final _errorController = StreamController<String>.broadcast();
+  final _audioDeviceController = StreamController<AudioDevice>.broadcast();
+  final _audioDevicesController =
+      StreamController<List<AudioDevice>>.broadcast();
+
+  StreamSubscription? _eventSubscription;
+  bool _disposed = false;
+  bool _initialized = false;
+
+  PlayerNative() {
+    _streams = PlayerStreams(
+      playing: _playingController.stream,
+      completed: _completedController.stream,
+      buffering: _bufferingController.stream,
+      position: _positionController.stream,
+      duration: _durationController.stream,
+      buffer: _bufferController.stream,
+      volume: _volumeController.stream,
+      rate: _rateController.stream,
+      tracks: _tracksController.stream,
+      track: _trackController.stream,
+      log: _logController.stream,
+      error: _errorController.stream,
+      audioDevice: _audioDeviceController.stream,
+      audioDevices: _audioDevicesController.stream,
+    );
+
+    _setupEventListener();
+  }
+
+  void _setupEventListener() {
+    _eventSubscription = _eventChannel.receiveBroadcastStream().listen(
+      _handleEvent,
+      onError: (error) {
+        _errorController.add(error.toString());
+      },
+    );
+  }
+
+  void _handleEvent(dynamic event) {
+    if (event is! Map) return;
+
+    final type = event['type'] as String?;
+    final name = event['name'] as String?;
+
+    if (type == 'property' && name != null) {
+      _handlePropertyChange(name, event['value']);
+    } else if (type == 'event' && name != null) {
+      _handleMpvEvent(name, event['data'] as Map?);
+    }
+  }
+
+  void _handlePropertyChange(String name, dynamic value) {
+    switch (name) {
+      case 'pause':
+        final playing = value == false;
+        _state = _state.copyWith(playing: playing);
+        _playingController.add(playing);
+        break;
+
+      case 'eof-reached':
+        final completed = value == true;
+        _state = _state.copyWith(completed: completed);
+        _completedController.add(completed);
+        break;
+
+      case 'paused-for-cache':
+        final buffering = value == true;
+        _state = _state.copyWith(buffering: buffering);
+        _bufferingController.add(buffering);
+        break;
+
+      case 'time-pos':
+        if (value is num) {
+          final position = Duration(milliseconds: (value * 1000).toInt());
+          _state = _state.copyWith(position: position);
+          _positionController.add(position);
+        }
+        break;
+
+      case 'duration':
+        if (value is num) {
+          final duration = Duration(milliseconds: (value * 1000).toInt());
+          _state = _state.copyWith(duration: duration);
+          _durationController.add(duration);
+        }
+        break;
+
+      case 'demuxer-cache-time':
+        if (value is num) {
+          final buffer = Duration(milliseconds: (value * 1000).toInt());
+          _state = _state.copyWith(buffer: buffer);
+          _bufferController.add(buffer);
+        }
+        break;
+
+      case 'volume':
+        if (value is num) {
+          final volume = value.toDouble();
+          _state = _state.copyWith(volume: volume);
+          _volumeController.add(volume);
+        }
+        break;
+
+      case 'speed':
+        if (value is num) {
+          final rate = value.toDouble();
+          _state = _state.copyWith(rate: rate);
+          _rateController.add(rate);
+        }
+        break;
+
+      case 'track-list':
+        List? trackList;
+        if (value is List) {
+          trackList = value;
+        } else if (value is String) {
+          // Android - JSON string that needs parsing
+          try {
+            final decoded = jsonDecode(value);
+            if (decoded is List) {
+              trackList = decoded;
+            }
+          } catch (e) {
+            // Invalid JSON, ignore
+            break;
+          }
+        }
+
+        if (trackList != null) {
+          final tracks = _parseTrackList(trackList);
+          _state = _state.copyWith(tracks: tracks);
+          _tracksController.add(tracks);
+        }
+        break;
+
+      case 'aid':
+        _updateSelectedAudioTrack(value);
+        break;
+
+      case 'sid':
+        _updateSelectedSubtitleTrack(value);
+        break;
+    }
+  }
+
+  void _handleMpvEvent(String name, Map? data) {
+    switch (name) {
+      case 'end-file':
+        final reason = data?['reason'] as String?;
+        if (reason == 'eof') {
+          _state = _state.copyWith(completed: true);
+          _completedController.add(true);
+        } else if (reason == 'error') {
+          _errorController.add('Playback error');
+        }
+        break;
+
+      case 'file-loaded':
+        // Reset completed state when new file is loaded
+        _state = _state.copyWith(completed: false);
+        _completedController.add(false);
+        break;
+    }
+  }
+
+  Tracks _parseTrackList(List trackList) {
+    final audioTracks = <AudioTrack>[];
+    final subtitleTracks = <SubtitleTrack>[];
+
+    for (final track in trackList) {
+      if (track is! Map) continue;
+
+      final type = track['type'] as String?;
+      final id = track['id']?.toString() ?? '';
+
+      if (type == 'audio') {
+        audioTracks.add(
+          AudioTrack(
+            id: id,
+            title: track['title'] as String?,
+            language: track['lang'] as String?,
+            codec: track['codec'] as String?,
+            channels: (track['demux-channel-count'] as num?)?.toInt(),
+            sampleRate: (track['demux-samplerate'] as num?)?.toInt(),
+            isDefault: track['default'] as bool? ?? false,
+          ),
+        );
+      } else if (type == 'sub') {
+        subtitleTracks.add(
+          SubtitleTrack(
+            id: id,
+            title: track['title'] as String?,
+            language: track['lang'] as String?,
+            codec: track['codec'] as String?,
+            isExternal: track['external'] as bool? ?? false,
+            uri: track['external-filename'] as String?,
+          ),
+        );
+      }
+    }
+
+    return Tracks(audio: audioTracks, subtitle: subtitleTracks);
+  }
+
+  void _updateSelectedAudioTrack(dynamic trackId) {
+    _updateSelectedTrack<AudioTrack>(
+      trackId,
+      _state.tracks.audio.cast<AudioTrack?>().toList(),
+      (selection, track) => selection.copyWith(audio: track),
+    );
+  }
+
+  void _updateSelectedSubtitleTrack(dynamic trackId) {
+    _updateSelectedTrack<SubtitleTrack>(
+      trackId,
+      _state.tracks.subtitle.cast<SubtitleTrack?>().toList(),
+      (selection, track) => selection.copyWith(subtitle: track),
+    );
+  }
+
+  void _updateSelectedTrack<T>(
+    dynamic trackId,
+    List<T?> tracks,
+    TrackSelection Function(TrackSelection, T?) selectionSetter,
+  ) {
+    final id = trackId?.toString();
+    T? selectedTrack;
+
+    if (id != null && id != 'no') {
+      selectedTrack = tracks.firstWhere(
+        (track) => _getTrackId(track) == id,
+        orElse: () => null,
+      );
+    }
+
+    _state = _state.copyWith(
+      track: selectionSetter(_state.track, selectedTrack),
+    );
+    _trackController.add(_state.track);
+  }
+
+  String? _getTrackId<T>(T? track) {
+    final dynamic t = track;
+    return t?.id?.toString();
+  }
+
+  Future<void> _ensureInitialized() async {
+    if (_initialized) return;
+
+    try {
+      final result = await _methodChannel.invokeMethod<bool>('initialize');
+      _initialized = result == true;
+      if (!_initialized) {
+        throw Exception('Failed to initialize player');
+      }
+
+      // Configure subtitle fonts for Android libass support
+      if (Platform.isAndroid) {
+        await _configureAndroidSubtitleFonts();
+      }
+
+      // Subscribe to MPV properties
+      await _observeProperty('time-pos', 'double');
+      await _observeProperty('duration', 'double');
+      await _observeProperty('pause', 'flag');
+      await _observeProperty('paused-for-cache', 'flag');
+      await _observeProperty(
+        'track-list',
+        (Platform.isAndroid || Platform.isWindows) ? 'string' : 'node',
+      );
+      await _observeProperty('eof-reached', 'flag');
+      await _observeProperty('volume', 'double');
+      await _observeProperty('aid', 'string');
+      await _observeProperty('sid', 'string');
+    } catch (e) {
+      _errorController.add('Initialization failed: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> _observeProperty(String name, String format) async {
+    await _methodChannel.invokeMethod('observeProperty', {
+      'name': name,
+      'format': format,
+    });
+  }
+
+  /// Configures subtitle fonts for Android libass support.
+  /// On Android, libass cannot access system fonts, so we need to provide
+  /// a font file from assets.
+  Future<void> _configureAndroidSubtitleFonts() async {
+    try {
+      final fontDir = await AndroidFontLoader.loadSubtitleFont();
+      if (fontDir != null) {
+        // Configure MPV to use the extracted font for libass
+        await setProperty('config', 'yes');
+        await setProperty('sub-fonts-dir', fontDir);
+        await setProperty('sub-font', AndroidFontLoader.fontName);
+      }
+    } catch (e) {
+      // Font configuration is not critical - continue without it
+      _errorController.add('Failed to configure subtitle fonts: $e');
+    }
+  }
+
+  void _checkDisposed() {
+    if (_disposed) {
+      throw StateError('Player has been disposed');
+    }
+  }
+
+  // ============================================
+  // Playback Control
+  // ============================================
+
+  @override
+  Future<void> open(Media media, {bool play = true}) async {
+    _checkDisposed();
+    await _ensureInitialized();
+
+    // Show the video layer
+    await _methodChannel.invokeMethod('setVisible', {'visible': true});
+
+    // Set start position if provided (must be set before loading file)
+    if (media.start != null && media.start!.inSeconds > 0) {
+      await setProperty('start', media.start!.inSeconds.toString());
+    } else {
+      // Reset start position if not resuming
+      await setProperty('start', 'none');
+    }
+
+    await command(['loadfile', media.uri, 'replace']);
+    if (!play) {
+      await setProperty('pause', 'yes');
+    }
+  }
+
+  @override
+  Future<void> play() async {
+    _checkDisposed();
+    await setProperty('pause', 'no');
+  }
+
+  @override
+  Future<void> pause() async {
+    _checkDisposed();
+    await setProperty('pause', 'yes');
+  }
+
+  @override
+  Future<void> playOrPause() async {
+    _checkDisposed();
+    if (_state.playing) {
+      await pause();
+    } else {
+      await play();
+    }
+  }
+
+  @override
+  Future<void> stop() async {
+    _checkDisposed();
+    await command(['stop']);
+    await _methodChannel.invokeMethod('setVisible', {'visible': false});
+  }
+
+  @override
+  Future<void> seek(Duration position) async {
+    _checkDisposed();
+    await command([
+      'seek',
+      (position.inMilliseconds / 1000.0).toString(),
+      'absolute',
+    ]);
+  }
+
+  // ============================================
+  // Track Selection
+  // ============================================
+
+  @override
+  Future<void> selectAudioTrack(AudioTrack track) async {
+    _checkDisposed();
+    await setProperty('aid', track.id);
+  }
+
+  @override
+  Future<void> selectSubtitleTrack(SubtitleTrack track) async {
+    _checkDisposed();
+    await setProperty('sid', track.id);
+  }
+
+  @override
+  Future<void> addSubtitleTrack({
+    required String uri,
+    String? title,
+    String? language,
+    bool select = false,
+  }) async {
+    _checkDisposed();
+    final args = ['sub-add', uri, select ? 'select' : 'auto'];
+    if (title != null) args.add('title=$title');
+    if (language != null) args.add('lang=$language');
+    await command(args);
+  }
+
+  // ============================================
+  // Volume and Rate
+  // ============================================
+
+  @override
+  Future<void> setVolume(double volume) async {
+    _checkDisposed();
+    await setProperty('volume', volume.toString());
+  }
+
+  @override
+  Future<void> setRate(double rate) async {
+    _checkDisposed();
+    await setProperty('speed', rate.toString());
+  }
+
+  @override
+  Future<void> setAudioDevice(AudioDevice device) async {
+    _checkDisposed();
+    await setProperty('audio-device', device.name);
+  }
+
+  // ============================================
+  // MPV Properties
+  // ============================================
+
+  @override
+  Future<void> setProperty(String name, String value) async {
+    _checkDisposed();
+    await _ensureInitialized();
+    await _methodChannel.invokeMethod('setProperty', {
+      'name': name,
+      'value': value,
+    });
+  }
+
+  @override
+  Future<String?> getProperty(String name) async {
+    _checkDisposed();
+    await _ensureInitialized();
+    return await _methodChannel.invokeMethod<String>('getProperty', {
+      'name': name,
+    });
+  }
+
+  @override
+  Future<void> command(List<String> args) async {
+    _checkDisposed();
+    await _ensureInitialized();
+    await _methodChannel.invokeMethod('command', {'args': args});
+  }
+
+  // ============================================
+  // Passthrough
+  // ============================================
+
+  @override
+  Future<void> setAudioPassthrough(bool enabled) async {
+    _checkDisposed();
+    if (enabled) {
+      await setProperty('audio-spdif', 'ac3,eac3,dts,dts-hd,truehd');
+      await setProperty('audio-exclusive', 'yes');
+    } else {
+      await setProperty('audio-spdif', '');
+      await setProperty('audio-exclusive', 'no');
+    }
+  }
+
+  // ============================================
+  // Visibility
+  // ============================================
+
+  @override
+  Future<bool> setVisible(bool visible) async {
+    _checkDisposed();
+
+    try {
+      await _methodChannel.invokeMethod('setVisible', {'visible': visible});
+      return true;
+    } catch (e) {
+      _errorController.add('Failed to set visibility: $e');
+      return false;
+    }
+  }
+
+  @override
+  Future<void> setControlsVisible(bool visible) async {
+    // No-op on most platforms. Override on Linux for transparency workaround.
+  }
+
+  @override
+  Future<void> updateFrame() async {
+    _checkDisposed();
+    if (!_initialized) return;
+    // Only iOS and macOS use Metal layer that needs frame updates
+    if (Platform.isIOS || Platform.isMacOS) {
+      await _methodChannel.invokeMethod('updateFrame');
+    }
+  }
+
+  // ============================================
+  // Lifecycle
+  // ============================================
+
+  @override
+  Future<void> dispose() async {
+    if (_disposed) return;
+    _disposed = true;
+
+    await _eventSubscription?.cancel();
+    await _methodChannel.invokeMethod('dispose');
+
+    await _playingController.close();
+    await _completedController.close();
+    await _bufferingController.close();
+    await _positionController.close();
+    await _durationController.close();
+    await _bufferController.close();
+    await _volumeController.close();
+    await _rateController.close();
+    await _tracksController.close();
+    await _trackController.close();
+    await _logController.close();
+    await _errorController.close();
+    await _audioDeviceController.close();
+    await _audioDevicesController.close();
+  }
+}
diff --git a/lib/mpv/player/player_state.dart b/lib/mpv/player/player_state.dart
new file mode 100644
index 00000000..475ee3f7
--- /dev/null
+++ b/lib/mpv/player/player_state.dart
@@ -0,0 +1,113 @@
+import '../models/audio_device.dart';
+import '../models/tracks.dart';
+import '../models/track_selection.dart';
+
+/// Immutable snapshot of the current player state.
+///
+/// This class provides synchronous access to the player's current state.
+/// For reactive updates, use [PlayerStreams].
+class PlayerState {
+  /// Whether playback is currently active.
+  final bool playing;
+
+  /// Whether the media has completed playback.
+  final bool completed;
+
+  /// Whether the player is currently buffering.
+  final bool buffering;
+
+  /// Current playback position.
+  final Duration position;
+
+  /// Total duration of the media.
+  final Duration duration;
+
+  /// Amount of media buffered ahead of current position.
+  final Duration buffer;
+
+  /// Current volume level (0.0 to 100.0).
+  final double volume;
+
+  /// Current playback rate (1.0 = normal speed).
+  final double rate;
+
+  /// Available tracks in the media.
+  final Tracks tracks;
+
+  /// Currently selected tracks.
+  final TrackSelection track;
+
+  /// Audio delay/sync offset in seconds.
+  final double audioDelay;
+
+  /// Subtitle delay/sync offset in seconds.
+  final double subtitleDelay;
+
+  /// Whether audio passthrough is currently enabled.
+  final bool audioPassthrough;
+
+  /// Current audio output device.
+  final AudioDevice audioDevice;
+
+  /// Available audio output devices.
+  final List<AudioDevice> audioDevices;
+
+  const PlayerState({
+    this.playing = false,
+    this.completed = false,
+    this.buffering = false,
+    this.position = Duration.zero,
+    this.duration = Duration.zero,
+    this.buffer = Duration.zero,
+    this.volume = 100.0,
+    this.rate = 1.0,
+    this.tracks = const Tracks(),
+    this.track = const TrackSelection(),
+    this.audioDelay = 0.0,
+    this.subtitleDelay = 0.0,
+    this.audioPassthrough = false,
+    this.audioDevice = AudioDevice.auto,
+    this.audioDevices = const [],
+  });
+
+  /// Creates a copy with the given fields replaced.
+  PlayerState copyWith({
+    bool? playing,
+    bool? completed,
+    bool? buffering,
+    Duration? position,
+    Duration? duration,
+    Duration? buffer,
+    double? volume,
+    double? rate,
+    Tracks? tracks,
+    TrackSelection? track,
+    double? audioDelay,
+    double? subtitleDelay,
+    bool? audioPassthrough,
+    AudioDevice? audioDevice,
+    List<AudioDevice>? audioDevices,
+  }) {
+    return PlayerState(
+      playing: playing ?? this.playing,
+      completed: completed ?? this.completed,
+      buffering: buffering ?? this.buffering,
+      position: position ?? this.position,
+      duration: duration ?? this.duration,
+      buffer: buffer ?? this.buffer,
+      volume: volume ?? this.volume,
+      rate: rate ?? this.rate,
+      tracks: tracks ?? this.tracks,
+      track: track ?? this.track,
+      audioDelay: audioDelay ?? this.audioDelay,
+      subtitleDelay: subtitleDelay ?? this.subtitleDelay,
+      audioPassthrough: audioPassthrough ?? this.audioPassthrough,
+      audioDevice: audioDevice ?? this.audioDevice,
+      audioDevices: audioDevices ?? this.audioDevices,
+    );
+  }
+
+  @override
+  String toString() =>
+      'PlayerState(playing: $playing, position: $position, duration: $duration)';
+}
diff --git a/lib/mpv/player/player_streams.dart b/lib/mpv/player/player_streams.dart
new file mode 100644
index 00000000..cda0ba9e
--- /dev/null
+++ b/lib/mpv/player/player_streams.dart
@@ -0,0 +1,69 @@
+import '../models/audio_device.dart';
+import '../models/player_log.dart';
+import '../models/tracks.dart';
+import '../models/track_selection.dart';
+
+/// Reactive streams for player state changes.
+///
+/// Subscribe to these streams to receive updates when the player state changes.
+/// For synchronous state access, use [PlayerState].
+class PlayerStreams {
+  /// Stream of playing state changes.
+  final Stream<bool> playing;
+
+  /// Stream of completion state changes.
+  final Stream<bool> completed;
+
+  /// Stream of buffering state changes.
+  final Stream<bool> buffering;
+
+  /// Stream of position updates.
+  final Stream<Duration> position;
+
+  /// Stream of duration changes (when media is loaded).
+  final Stream<Duration> duration;
+
+  /// Stream of buffer position updates.
+  final Stream<Duration> buffer;
+
+  /// Stream of volume changes.
+  final Stream<double> volume;
+
+  /// Stream of playback rate changes.
+  final Stream<double> rate;
+
+  /// Stream of available tracks updates.
+  final Stream<Tracks> tracks;
+
+  /// Stream of track selection changes.
+  final Stream<TrackSelection> track;
+
+  /// Stream of log messages from the player.
+  final Stream<PlayerLog> log;
+
+  /// Stream of error messages.
+  final Stream<String> error;
+
+  /// Stream of audio device changes.
+  final Stream<AudioDevice> audioDevice;
+
+  /// Stream of available audio devices.
+  final Stream<List<AudioDevice>> audioDevices;
+
+  const PlayerStreams({
+    required this.playing,
+    required this.completed,
+    required this.buffering,
+    required this.position,
+    required this.duration,
+    required this.buffer,
+    required this.volume,
+    required this.rate,
+    required this.tracks,
+    required this.track,
+    required this.log,
+    required this.error,
+    required this.audioDevice,
+    required this.audioDevices,
+  });
+}
diff --git a/lib/mpv/player/video_rect_support.dart b/lib/mpv/player/video_rect_support.dart
new file mode 100644
index 00000000..17770faa
--- /dev/null
+++ b/lib/mpv/player/video_rect_support.dart
@@ -0,0 +1,20 @@
+/// Mixin for players that support video rect positioning.
+///
+/// Players that render video behind the Flutter view (e.g., using
+/// native window embedding or GtkGLArea) implement this mixin to
+/// receive layout updates from the [Video] widget.
+mixin VideoRectSupport {
+  /// Updates the video rendering area.
+  ///
+  /// Called by the [Video] widget when the layout changes.
+  ///
+  /// [left], [top], [right], [bottom] define the rect in physical pixels.
+  /// [devicePixelRatio] is the device's pixel ratio for scaling.
+  Future<void> setVideoRect({
+    required int left,
+    required int top,
+    required int right,
+    required int bottom,
+    required double devicePixelRatio,
+  });
+}
diff --git a/lib/mpv/utils/android_font_loader.dart b/lib/mpv/utils/android_font_loader.dart
new file mode 100644
index 00000000..632eacdb
--- /dev/null
+++ b/lib/mpv/utils/android_font_loader.dart
@@ -0,0 +1,53 @@
+import 'dart:io';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:path/path.dart' as path;
+import 'package:path_provider/path_provider.dart';
+
+/// Utility class for loading font assets on Android for libass subtitle rendering.
+///
+/// On Android, libass cannot access system fonts through fontconfig, so we need
+/// to extract font files from Flutter assets to the app's cache directory.
+class AndroidFontLoader {
+  static const String _fontAssetPath = 'assets/go-noto-current-regular.ttf';
+  static const String _fontName = 'Go Noto Current-Regular';
+
+  /// Loads the subtitle font from assets to the Android cache directory.
+  /// Returns the directory path containing the font file.
+  static Future<String?> loadSubtitleFont() async {
+    try {
+      // Get the app's cache directory
+      final cacheDir = await getTemporaryDirectory();
+      final fontDir = Directory(path.join(cacheDir.path, 'subtitle_fonts'));
+
+      // Create fonts directory if it doesn't exist
+      if (!await fontDir.exists()) {
+        await fontDir.create(recursive: true);
+      }
+
+      final fontFile = File(
+        path.join(fontDir.path, 'go-noto-current-regular.ttf'),
+      );
+
+      // Load font from assets and write to cache if it doesn't exist
+      if (!await fontFile.exists()) {
+        final fontData = await rootBundle.load(_fontAssetPath);
+        await fontFile.writeAsBytes(fontData.buffer.asUint8List());
+      }
+
+      return fontDir.path;
+    } catch (e) {
+      // Return null if font loading fails - libass will fall back gracefully
+      if (kDebugMode) {
+        debugPrint('Failed to load subtitle font: $e');
+      }
+      return null;
+    }
+  }
+
+  /// Returns the font name to be used with libass.
+  static String get fontName => _fontName;
+
+  /// Returns the font asset path.
+  static String get fontAssetPath => _fontAssetPath;
+}
diff --git a/lib/mpv/video/video.dart b/lib/mpv/video/video.dart
new file mode 100644
index 00000000..f616a31e
--- /dev/null
+++ b/lib/mpv/video/video.dart
@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+
+import '../player/player.dart';
+import '../player/video_rect_support.dart';
+
+/// Video widget for displaying player output.
+///
+/// This widget displays the video output from a [Player] instance
+/// and optionally overlays custom controls.
+///
+/// Example usage:
+/// ```dart
+/// final player = Player();
+///
+/// Video(
+///   player: player,
+///   controls: (context) => MyCustomControls(),
+/// )
+/// ```
+class Video extends StatefulWidget {
+  /// The player instance.
+  final Player player;
+
+  /// Builder for custom video controls overlay.
+  final Widget Function(BuildContext context)? controls;
+
+  /// Background color shown behind the video.
+  final Color backgroundColor;
+
+  const Video({
+    super.key,
+    required this.player,
+    this.controls,
+    this.backgroundColor = Colors.black,
+  });
+
+  @override
+  State<Video> createState() => _VideoState();
+}
+
+class _VideoState extends State<Video> {
+  Rect? _lastRect;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      color: Colors.transparent,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          // Video rendering area
+          _buildVideoSurface(),
+
+          // Controls overlay
+          if (widget.controls != null) widget.controls!(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildVideoSurface() {
+    // For players that support video rect positioning (Windows, Linux),
+    // communicate layout changes to the native side.
+    if (widget.player is VideoRectSupport) {
+      return LayoutBuilder(
+        builder: (context, constraints) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            _updateVideoRect(context, constraints);
+          });
+          return const SizedBox.expand();
+        },
+      );
+    }
+    return const SizedBox.expand();
+  }
+
+  void _updateVideoRect(BuildContext context, BoxConstraints constraints) {
+    final renderBox = context.findRenderObject() as RenderBox?;
+    if (renderBox == null || !renderBox.hasSize) return;
+
+    final position = renderBox.localToGlobal(Offset.zero);
+    final size = renderBox.size;
+    final dpr = MediaQuery.of(context).devicePixelRatio;
+
+    final newRect = Rect.fromLTWH(
+      position.dx,
+      position.dy,
+      size.width,
+      size.height,
+    );
+
+    // Only update if the rect has changed significantly
+    if (_lastRect != null &&
+        (newRect.left - _lastRect!.left).abs() < 1 &&
+        (newRect.top - _lastRect!.top).abs() < 1 &&
+        (newRect.width - _lastRect!.width).abs() < 1 &&
+        (newRect.height - _lastRect!.height).abs() < 1) {
+      return;
+    }
+
+    _lastRect = newRect;
+
+    // Update the native video rect
+    (widget.player as VideoRectSupport).setVideoRect(
+      left: (position.dx * dpr).toInt(),
+      top: (position.dy * dpr).toInt(),
+      right: ((position.dx + size.width) * dpr).toInt(),
+      bottom: ((position.dy + size.height) * dpr).toInt(),
+      devicePixelRatio: dpr,
+    );
+  }
+}
diff --git a/lib/navigation/navigation_tabs.dart b/lib/navigation/navigation_tabs.dart
new file mode 100644
index 00000000..3ea61411
--- /dev/null
+++ b/lib/navigation/navigation_tabs.dart
@@ -0,0 +1,100 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../i18n/strings.g.dart';
+
+/// Navigation tab identifiers
+enum NavigationTabId {
+  discover,
+  libraries,
+  search,
+  downloads,
+  settings,
+}
+
+/// Represents a navigation tab with its configuration
+class NavigationTab {
+  final NavigationTabId id;
+  final bool onlineOnly;
+  final IconData icon;
+  final String Function() getLabel;
+
+  const NavigationTab({
+    required this.id,
+    required this.onlineOnly,
+    required this.icon,
+    required this.getLabel,
+  });
+
+  NavigationDestination toDestination() {
+    return NavigationDestination(
+      icon: AppIcon(icon, fill: 1),
+      selectedIcon: AppIcon(icon, fill: 1),
+      label: getLabel(),
+    );
+  }
+
+  /// Get the index for a tab ID in the visible tabs list
+  static int indexFor(NavigationTabId id, {required bool isOffline}) {
+    final tabs = getVisibleTabs(isOffline: isOffline);
+    return tabs.indexWhere((tab) => tab.id == id);
+  }
+
+  /// Get tabs filtered by offline mode
+  static List<NavigationTab> getVisibleTabs({required bool isOffline}) {
+    return allNavigationTabs
+        .where((tab) => !isOffline || !tab.onlineOnly)
+        .toList();
+  }
+
+  /// Check if a visual index corresponds to a specific tab ID
+  static bool isTabAtIndex(
+    NavigationTabId id,
+    int index, {
+    required bool isOffline,
+  }) {
+    return indexFor(id, isOffline: isOffline) == index;
+  }
+}
+
+// Label getters (must be top-level for const constructor)
+String _getHomeLabel() => t.navigation.home;
+String _getLibrariesLabel() => t.navigation.libraries;
+String _getSearchLabel() => t.navigation.search;
+String _getDownloadsLabel() => t.navigation.downloads;
+String _getSettingsLabel() => t.navigation.settings;
+
+/// All navigation tabs in display order
+const allNavigationTabs = [
+  NavigationTab(
+    id: NavigationTabId.discover,
+    onlineOnly: true,
+    icon: Symbols.home_rounded,
+    getLabel: _getHomeLabel,
+  ),
+  NavigationTab(
+    id: NavigationTabId.libraries,
+    onlineOnly: true,
+    icon: Symbols.video_library_rounded,
+    getLabel: _getLibrariesLabel,
+  ),
+  NavigationTab(
+    id: NavigationTabId.search,
+    onlineOnly: true,
+    icon: Symbols.search_rounded,
+    getLabel: _getSearchLabel,
+  ),
+  NavigationTab(
+    id: NavigationTabId.downloads,
+    onlineOnly: false,
+    icon: Symbols.download_rounded,
+    getLabel: _getDownloadsLabel,
+  ),
+  NavigationTab(
+    id: NavigationTabId.settings,
+    onlineOnly: false,
+    icon: Symbols.settings_rounded,
+    getLabel: _getSettingsLabel,
+  ),
+];
diff --git a/lib/providers/download_provider.dart b/lib/providers/download_provider.dart
new file mode 100644
index 00000000..2648a6b1
--- /dev/null
+++ b/lib/providers/download_provider.dart
@@ -0,0 +1,1277 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:collection';
+import 'package:flutter/foundation.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import '../models/download_status.dart';
+import '../models/download_progress.dart';
+import '../models/deletion_progress.dart';
+import '../models/plex_metadata.dart';
+import '../services/download_manager_service.dart';
+import '../services/download_storage_service.dart';
+import '../services/plex_api_cache.dart';
+import '../services/plex_client.dart';
+import '../utils/app_logger.dart';
+
+/// Holds Plex thumb path reference for downloaded artwork.
+/// The actual file path is computed from the hash of serverId + thumb path.
+class DownloadedArtwork {
+  /// The Plex thumb path (e.g., /library/metadata/12345/thumb/1234567890)
+  final String? thumbPath;
+
+  const DownloadedArtwork({this.thumbPath});
+
+  /// Get the local file path for this artwork
+  String? getLocalPath(DownloadStorageService storage, String serverId) {
+    if (thumbPath == null) return null;
+    return storage.getArtworkPathSync(serverId, thumbPath!);
+  }
+}
+
+/// Provider for managing download state and operations.
+class DownloadProvider extends ChangeNotifier {
+  final DownloadManagerService _downloadManager;
+  StreamSubscription<DownloadProgress>? _progressSubscription;
+  StreamSubscription<DeletionProgress>? _deletionProgressSubscription;
+
+  // Track download progress by globalKey (serverId:ratingKey)
+  final Map<String, DownloadProgress> _downloads = {};
+
+  // Store metadata for display
+  final Map<String, PlexMetadata> _metadata = {};
+
+  // Store Plex thumb paths for offline display (actual file path computed from hash)
+  final Map<String, DownloadedArtwork> _artworkPaths = {};
+
+  // Track items currently being queued (building download queue)
+  final Set<String> _queueing = {};
+
+  // Track items currently being deleted with progress
+  final Map<String, DeletionProgress> _deletionProgress = {};
+
+  // Track total episode counts for shows/seasons (for partial download detection)
+  // Key: globalKey (serverId:ratingKey), Value: total episode count
+  final Map<String, int> _totalEpisodeCounts = {};
+
+  DownloadProvider({required DownloadManagerService downloadManager})
+    : _downloadManager = downloadManager {
+    // Listen to progress updates from the download manager
+    _progressSubscription = _downloadManager.progressStream.listen(
+      _onProgressUpdate,
+    );
+
+    // Listen to deletion progress updates
+    _deletionProgressSubscription = _downloadManager.deletionProgressStream
+        .listen(_onDeletionProgressUpdate);
+
+    // Load persisted downloads from database
+    _loadPersistedDownloads();
+  }
+
+  /// Load all persisted downloads and metadata from the database/cache
+  Future<void> _loadPersistedDownloads() async {
+    try {
+      // Clear existing data to prevent stale entries after deletions
+      _downloads.clear();
+      _artworkPaths.clear();
+      _metadata.clear();
+      _totalEpisodeCounts.clear();
+
+      final storageService = DownloadStorageService.instance;
+      final apiCache = PlexApiCache.instance;
+
+      // Initialize artwork directory path for synchronous access
+      await storageService.getArtworkDirectory();
+
+      // Load all downloads from database
+      final downloads = await _downloadManager.getAllDownloads();
+      for (final item in downloads) {
+        _downloads[item.globalKey] = DownloadProgress(
+          globalKey: item.globalKey,
+          status: DownloadStatus.values[item.status],
+          progress: item.progress,
+          downloadedBytes: item.downloadedBytes,
+          totalBytes: item.totalBytes ?? 0,
+        );
+
+        // Store Plex thumb path reference (file path computed from hash when needed)
+        _artworkPaths[item.globalKey] = DownloadedArtwork(
+          thumbPath: item.thumbPath,
+        );
+
+        // Load metadata from API cache (base endpoint - chapters/markers included in data)
+        final cached = await apiCache.get(
+          item.serverId,
+          '/library/metadata/${item.ratingKey}',
+        );
+        if (cached != null) {
+          final metadataList = cached['MediaContainer']?['Metadata'] as List?;
+          if (metadataList != null && metadataList.isNotEmpty) {
+            final metadata = PlexMetadata.fromJson(
+              metadataList[0],
+            ).copyWith(serverId: item.serverId);
+            _metadata[item.globalKey] = metadata;
+
+            // For episodes, also load parent (show and season) metadata
+            if (metadata.type == 'episode') {
+              await _loadParentMetadataFromCache(metadata, apiCache);
+            }
+          }
+        }
+      }
+
+      // Load total episode counts from SharedPreferences
+      await _loadTotalEpisodeCounts();
+
+      appLogger.i(
+        'Loaded ${_downloads.length} downloads, ${_metadata.length} metadata entries, '
+        'and ${_totalEpisodeCounts.length} episode counts',
+      );
+      notifyListeners();
+    } catch (e) {
+      appLogger.e('Failed to load persisted downloads', error: e);
+    }
+  }
+
+  /// Load total episode counts from SharedPreferences
+  Future<void> _loadTotalEpisodeCounts() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final keys = prefs.getKeys().where((k) => k.startsWith('episode_count_'));
+
+      for (final key in keys) {
+        final globalKey = key.replaceFirst('episode_count_', '');
+        final count = prefs.getInt(key);
+        if (count != null) {
+          _totalEpisodeCounts[globalKey] = count;
+          appLogger.d(
+            '📂 Loaded episode count from SharedPrefs: $globalKey = $count',
+          );
+        }
+      }
+
+      appLogger.i(
+        '📚 Loaded ${_totalEpisodeCounts.length} episode counts from SharedPreferences',
+      );
+    } catch (e) {
+      appLogger.w('Failed to load episode counts', error: e);
+    }
+  }
+
+  /// Persist total episode count to SharedPreferences
+  Future<void> _persistTotalEpisodeCount(String globalKey, int count) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setInt('episode_count_$globalKey', count);
+      appLogger.d('Persisted episode count for $globalKey: $count');
+    } catch (e) {
+      appLogger.w('Failed to persist episode count for $globalKey', error: e);
+    }
+  }
+
+  /// Load parent (show and season) metadata from cache for an episode
+  Future<void> _loadParentMetadataFromCache(
+    PlexMetadata episode,
+    PlexApiCache apiCache,
+  ) async {
+    final serverId = episode.serverId;
+    if (serverId == null) return;
+
+    // Load show metadata (base endpoint)
+    final showRatingKey = episode.grandparentRatingKey;
+    if (showRatingKey != null) {
+      final showGlobalKey = '$serverId:$showRatingKey';
+      if (!_metadata.containsKey(showGlobalKey)) {
+        final cached = await apiCache.get(
+          serverId,
+          '/library/metadata/$showRatingKey',
+        );
+        if (cached != null) {
+          final metadataList = cached['MediaContainer']?['Metadata'] as List?;
+          if (metadataList != null && metadataList.isNotEmpty) {
+            final showMetadata = PlexMetadata.fromJson(
+              metadataList[0],
+            ).copyWith(serverId: serverId);
+            _metadata[showGlobalKey] = showMetadata;
+            // Store artwork reference for offline display
+            if (showMetadata.thumb != null) {
+              _artworkPaths[showGlobalKey] = DownloadedArtwork(
+                thumbPath: showMetadata.thumb,
+              );
+            }
+          }
+        }
+      }
+    }
+
+    // Load season metadata (base endpoint)
+    final seasonRatingKey = episode.parentRatingKey;
+    if (seasonRatingKey != null) {
+      final seasonGlobalKey = '$serverId:$seasonRatingKey';
+      if (!_metadata.containsKey(seasonGlobalKey)) {
+        final cached = await apiCache.get(
+          serverId,
+          '/library/metadata/$seasonRatingKey',
+        );
+        if (cached != null) {
+          final metadataList = cached['MediaContainer']?['Metadata'] as List?;
+          if (metadataList != null && metadataList.isNotEmpty) {
+            final seasonMetadata = PlexMetadata.fromJson(
+              metadataList[0],
+            ).copyWith(serverId: serverId);
+            _metadata[seasonGlobalKey] = seasonMetadata;
+            // Store artwork reference for offline display
+            if (seasonMetadata.thumb != null) {
+              _artworkPaths[seasonGlobalKey] = DownloadedArtwork(
+                thumbPath: seasonMetadata.thumb,
+              );
+            }
+          }
+        }
+      }
+    }
+  }
+
+  void _onProgressUpdate(DownloadProgress progress) {
+    appLogger.d(
+      'Progress update received: ${progress.globalKey} - ${progress.status} - ${progress.progress}%',
+    );
+
+    _downloads[progress.globalKey] = progress;
+
+    // Sync artwork paths when they are available
+    if (progress.hasArtworkPaths) {
+      _artworkPaths[progress.globalKey] = DownloadedArtwork(
+        thumbPath: progress.thumbPath,
+      );
+    }
+
+    appLogger.d('Notifying listeners for ${progress.globalKey}');
+    notifyListeners();
+  }
+
+  @override
+  @override
+  void dispose() {
+    _progressSubscription?.cancel();
+    _deletionProgressSubscription?.cancel();
+    super.dispose();
+  }
+
+  /// All current download progress entries
+  Map<String, DownloadProgress> get downloads => Map.unmodifiable(_downloads);
+
+  /// All metadata for downloads
+  Map<String, PlexMetadata> get metadata => Map.unmodifiable(_metadata);
+
+  /// Get all queued/downloading items (for Queue tab)
+  List<DownloadProgress> get queuedDownloads {
+    return _downloads.values
+        .where(
+          (p) =>
+              p.status == DownloadStatus.queued ||
+              p.status == DownloadStatus.downloading ||
+              p.status == DownloadStatus.paused,
+        )
+        .toList();
+  }
+
+  /// Get all completed downloads
+  List<DownloadProgress> get completedDownloads {
+    return _downloads.values
+        .where((p) => p.status == DownloadStatus.completed)
+        .toList();
+  }
+
+  /// Get completed TV episode downloads (individual episodes)
+  List<PlexMetadata> get downloadedEpisodes {
+    return _metadata.entries
+        .where((entry) {
+          final progress = _downloads[entry.key];
+          return progress?.status == DownloadStatus.completed &&
+              entry.value.type == 'episode';
+        })
+        .map((entry) => entry.value)
+        .toList();
+  }
+
+  /// Get unique TV shows that have downloaded episodes
+  /// Returns stored show metadata, or synthesizes from episode metadata as fallback
+  List<PlexMetadata> get downloadedShows {
+    final Map<String, PlexMetadata> shows = {};
+
+    for (final entry in _metadata.entries) {
+      final globalKey = entry.key;
+      final meta = entry.value;
+      final progress = _downloads[globalKey];
+
+      if (progress?.status == DownloadStatus.completed &&
+          meta.type == 'episode') {
+        final showRatingKey = meta.grandparentRatingKey;
+        if (showRatingKey != null && !shows.containsKey(showRatingKey)) {
+          // Try to get stored show metadata first
+          final showGlobalKey = '${meta.serverId}:$showRatingKey';
+          final storedShow = _metadata[showGlobalKey];
+
+          if (storedShow != null && storedShow.type == 'show') {
+            // Use stored show metadata (has year, summary, clearLogo)
+            shows[showRatingKey] = storedShow;
+          } else {
+            // Fallback: synthesize from episode metadata (missing year, summary)
+            shows[showRatingKey] = PlexMetadata(
+              ratingKey: showRatingKey,
+              key: '/library/metadata/$showRatingKey',
+              type: 'show',
+              title: meta.grandparentTitle ?? 'Unknown Show',
+              thumb: meta.grandparentThumb,
+              art: meta.grandparentArt,
+              serverId: meta.serverId,
+            );
+          }
+        }
+      }
+    }
+
+    return shows.values.toList();
+  }
+
+  /// Get completed movie downloads
+  List<PlexMetadata> get downloadedMovies {
+    return _metadata.entries
+        .where((entry) {
+          final progress = _downloads[entry.key];
+          return progress?.status == DownloadStatus.completed &&
+              entry.value.type == 'movie';
+        })
+        .map((entry) => entry.value)
+        .toList();
+  }
+
+  /// Get metadata for a specific download
+  PlexMetadata? getMetadata(String globalKey) => _metadata[globalKey];
+
+  /// Get artwork paths for a specific download (for offline display)
+  DownloadedArtwork? getArtworkPaths(String globalKey) =>
+      _artworkPaths[globalKey];
+
+  /// Get local file path for any artwork type (thumb, art, clearLogo, etc.)
+  /// Returns null if artwork directory isn't initialized or artworkPath is null
+  String? getArtworkLocalPath(String serverId, String? artworkPath) {
+    if (artworkPath == null) return null;
+    return DownloadStorageService.instance.getArtworkPathSync(
+      serverId,
+      artworkPath,
+    );
+  }
+
+  /// Get downloaded episodes for a specific show (by grandparentRatingKey)
+  List<PlexMetadata> getDownloadedEpisodesForShow(String showRatingKey) {
+    return _metadata.entries
+        .where((entry) {
+          final progress = _downloads[entry.key];
+          final meta = entry.value;
+          return progress?.status == DownloadStatus.completed &&
+              meta.type == 'episode' &&
+              meta.grandparentRatingKey == showRatingKey;
+        })
+        .map((entry) => entry.value)
+        .toList();
+  }
+
+  /// Get all episode downloads (any status) for a specific show
+  List<DownloadProgress> _getEpisodeDownloadsForShow(String showRatingKey) {
+    return _downloads.entries
+        .where((entry) {
+          final meta = _metadata[entry.key];
+          return meta?.type == 'episode' &&
+              meta?.grandparentRatingKey == showRatingKey;
+        })
+        .map((entry) => entry.value)
+        .toList();
+  }
+
+  /// Get all episode downloads (any status) for a specific season
+  List<DownloadProgress> _getEpisodeDownloadsForSeason(String seasonRatingKey) {
+    return _downloads.entries
+        .where((entry) {
+          final meta = _metadata[entry.key];
+          return meta?.type == 'episode' &&
+              meta?.parentRatingKey == seasonRatingKey;
+        })
+        .map((entry) => entry.value)
+        .toList();
+  }
+
+  /// Calculate aggregate progress for a show (based on all its episodes)
+  /// Returns synthetic DownloadProgress with aggregated values
+  DownloadProgress? getAggregateProgressForShow(
+    String serverId,
+    String showRatingKey,
+  ) {
+    final globalKey = '$serverId:$showRatingKey';
+    final episodes = _getEpisodeDownloadsForShow(showRatingKey);
+
+    // DIAGNOSTIC: Check all sources of episode count
+    final showMeta = _metadata[globalKey];
+    final metadataLeafCount = showMeta?.leafCount;
+    final storedCount = _totalEpisodeCounts[globalKey];
+    final downloadedCount = episodes.length;
+
+    appLogger.d(
+      '📊 Episode count sources for show $showRatingKey:\n'
+      '  - Metadata leafCount: $metadataLeafCount\n'
+      '  - Stored count: $storedCount\n'
+      '  - Downloaded episodes: $downloadedCount\n'
+      '  - Show metadata exists: ${showMeta != null}\n'
+      '  - Show type: ${showMeta?.type}\n'
+      '  - Show title: ${showMeta?.title}',
+    );
+
+    // Get total episode count - FIXED: Use metadata.leafCount as primary source
+    int totalEpisodes;
+    String countSource;
+
+    if (metadataLeafCount != null && metadataLeafCount > 0) {
+      totalEpisodes = metadataLeafCount;
+      countSource = 'metadata.leafCount';
+    } else if (storedCount != null && storedCount > 0) {
+      totalEpisodes = storedCount;
+      countSource = 'stored count (SharedPreferences)';
+    } else {
+      totalEpisodes = downloadedCount;
+      countSource = 'downloaded episodes (fallback)';
+    }
+
+    appLogger.d(
+      '✅ Using totalEpisodes=$totalEpisodes from [$countSource] for show $showRatingKey',
+    );
+
+    // If we have stored count but no downloads, check if it's a valid partial state
+    if (totalEpisodes == 0 || (episodes.isEmpty && totalEpisodes > 0)) {
+      // No episodes downloaded yet, but we have a count stored
+      // This means user hasn't downloaded anything or deleted all episodes
+      appLogger.d(
+        '⚠️  No valid downloads for show $showRatingKey, returning null',
+      );
+      return null;
+    }
+
+    // Calculate aggregate statistics
+    int completedCount = 0;
+    int downloadingCount = 0;
+    int queuedCount = 0;
+    int failedCount = 0;
+
+    for (final ep in episodes) {
+      switch (ep.status) {
+        case DownloadStatus.completed:
+          completedCount++;
+          break;
+        case DownloadStatus.downloading:
+          downloadingCount++;
+          break;
+        case DownloadStatus.queued:
+          queuedCount++;
+          break;
+        case DownloadStatus.failed:
+          failedCount++;
+          break;
+        default:
+          break;
+      }
+    }
+
+    // Determine overall status
+    final DownloadStatus overallStatus;
+    if (completedCount == totalEpisodes) {
+      // All episodes fully downloaded
+      overallStatus = DownloadStatus.completed;
+    } else if (completedCount > 0 &&
+        downloadingCount == 0 &&
+        queuedCount == 0 &&
+        completedCount < totalEpisodes) {
+      // Some episodes downloaded, but not all, and nothing actively downloading
+      overallStatus = DownloadStatus.partial;
+    } else if (downloadingCount > 0) {
+      overallStatus = DownloadStatus.downloading;
+    } else if (queuedCount > 0) {
+      overallStatus = DownloadStatus.queued;
+    } else if (failedCount > 0) {
+      overallStatus = DownloadStatus.failed;
+    } else {
+      return null;
+    }
+
+    // Calculate overall progress percentage based on TOTAL episodes
+    final int overallProgress = totalEpisodes > 0
+        ? ((completedCount * 100) / totalEpisodes).round()
+        : 0;
+
+    appLogger.d(
+      'Aggregate progress for show $showRatingKey: $overallProgress% '
+      '($completedCount completed, $downloadingCount downloading, '
+      '$queuedCount queued of $totalEpisodes total) - Status: $overallStatus',
+    );
+
+    return DownloadProgress(
+      globalKey: globalKey,
+      status: overallStatus,
+      progress: overallProgress,
+      downloadedBytes: 0, // Not tracked at show level
+      totalBytes: 0,
+      currentFile: '$completedCount/$totalEpisodes episodes',
+    );
+  }
+
+  /// Calculate aggregate progress for a season (based on all its episodes)
+  /// Returns synthetic DownloadProgress with aggregated values
+  DownloadProgress? getAggregateProgressForSeason(
+    String serverId,
+    String seasonRatingKey,
+  ) {
+    final globalKey = '$serverId:$seasonRatingKey';
+    final episodes = _getEpisodeDownloadsForSeason(seasonRatingKey);
+
+    // DIAGNOSTIC: Check all sources of episode count
+    final seasonMeta = _metadata[globalKey];
+    final metadataLeafCount = seasonMeta?.leafCount;
+    final storedCount = _totalEpisodeCounts[globalKey];
+    final downloadedCount = episodes.length;
+
+    appLogger.d(
+      '📊 Episode count sources for season $seasonRatingKey:\n'
+      '  - Metadata leafCount: $metadataLeafCount\n'
+      '  - Stored count: $storedCount\n'
+      '  - Downloaded episodes: $downloadedCount\n'
+      '  - Season metadata exists: ${seasonMeta != null}\n'
+      '  - Season type: ${seasonMeta?.type}\n'
+      '  - Season title: ${seasonMeta?.title}',
+    );
+
+    // Get total episode count - FIXED: Use metadata.leafCount as primary source
+    int totalEpisodes;
+    String countSource;
+
+    if (metadataLeafCount != null && metadataLeafCount > 0) {
+      totalEpisodes = metadataLeafCount;
+      countSource = 'metadata.leafCount';
+    } else if (storedCount != null && storedCount > 0) {
+      totalEpisodes = storedCount;
+      countSource = 'stored count (SharedPreferences)';
+    } else {
+      totalEpisodes = downloadedCount;
+      countSource = 'downloaded episodes (fallback)';
+    }
+
+    appLogger.d(
+      '✅ Using totalEpisodes=$totalEpisodes from [$countSource] for season $seasonRatingKey',
+    );
+
+    // If we have stored count but no downloads, check if it's a valid partial state
+    if (totalEpisodes == 0 || (episodes.isEmpty && totalEpisodes > 0)) {
+      appLogger.d(
+        '⚠️  No valid downloads for season $seasonRatingKey, returning null',
+      );
+      return null;
+    }
+
+    // Calculate aggregate statistics
+    int completedCount = 0;
+    int downloadingCount = 0;
+    int queuedCount = 0;
+    int failedCount = 0;
+
+    for (final ep in episodes) {
+      switch (ep.status) {
+        case DownloadStatus.completed:
+          completedCount++;
+          break;
+        case DownloadStatus.downloading:
+          downloadingCount++;
+          break;
+        case DownloadStatus.queued:
+          queuedCount++;
+          break;
+        case DownloadStatus.failed:
+          failedCount++;
+          break;
+        default:
+          break;
+      }
+    }
+
+    // Determine overall status
+    final DownloadStatus overallStatus;
+    if (completedCount == totalEpisodes) {
+      // All episodes fully downloaded
+      overallStatus = DownloadStatus.completed;
+    } else if (completedCount > 0 &&
+        downloadingCount == 0 &&
+        queuedCount == 0 &&
+        completedCount < totalEpisodes) {
+      // Some episodes downloaded, but not all, and nothing actively downloading
+      overallStatus = DownloadStatus.partial;
+    } else if (downloadingCount > 0) {
+      overallStatus = DownloadStatus.downloading;
+    } else if (queuedCount > 0) {
+      overallStatus = DownloadStatus.queued;
+    } else if (failedCount > 0) {
+      overallStatus = DownloadStatus.failed;
+    } else {
+      return null;
+    }
+
+    // Calculate overall progress percentage based on TOTAL episodes
+    final int overallProgress = totalEpisodes > 0
+        ? ((completedCount * 100) / totalEpisodes).round()
+        : 0;
+
+    appLogger.d(
+      'Aggregate progress for season $seasonRatingKey: $overallProgress% '
+      '($completedCount completed, $downloadingCount downloading, '
+      '$queuedCount queued of $totalEpisodes total) - Status: $overallStatus',
+    );
+
+    return DownloadProgress(
+      globalKey: globalKey,
+      status: overallStatus,
+      progress: overallProgress,
+      downloadedBytes: 0,
+      totalBytes: 0,
+      currentFile: '$completedCount/$totalEpisodes episodes',
+    );
+  }
+
+  /// Whether there are any downloads (active or completed)
+  bool get hasDownloads => _downloads.isNotEmpty;
+
+  /// Whether there are any active downloads
+  bool get hasActiveDownloads => _downloads.values.any(
+    (p) =>
+        p.status == DownloadStatus.downloading ||
+        p.status == DownloadStatus.queued,
+  );
+
+  /// Get download progress for a specific item
+  /// For shows/seasons, returns aggregate progress of all child episodes
+  /// For episodes/movies, returns direct progress
+  DownloadProgress? getProgress(String globalKey) {
+    // First check if we have direct progress (for episodes/movies)
+    final directProgress = _downloads[globalKey];
+    if (directProgress != null) {
+      return directProgress;
+    }
+
+    // If no direct progress, check if this is a show or season
+    // and calculate aggregate progress from episodes
+    final parts = globalKey.split(':');
+    if (parts.length != 2) return null;
+
+    final serverId = parts[0];
+    final ratingKey = parts[1];
+
+    // Try to get metadata to determine type
+    final meta = _metadata[globalKey];
+    if (meta == null) {
+      // No metadata stored yet, might be a show/season being queued
+      // Check if any episodes exist for this as a parent
+      final episodesAsShow = _getEpisodeDownloadsForShow(ratingKey);
+      if (episodesAsShow.isNotEmpty) {
+        return getAggregateProgressForShow(serverId, ratingKey);
+      }
+
+      final episodesAsSeason = _getEpisodeDownloadsForSeason(ratingKey);
+      if (episodesAsSeason.isNotEmpty) {
+        return getAggregateProgressForSeason(serverId, ratingKey);
+      }
+
+      return null;
+    }
+
+    // We have metadata, check type
+    final type = meta.type.toLowerCase();
+    if (type == 'show') {
+      return getAggregateProgressForShow(serverId, ratingKey);
+    } else if (type == 'season') {
+      return getAggregateProgressForSeason(serverId, ratingKey);
+    }
+
+    return null;
+  }
+
+  /// Check if an item is downloaded
+  /// For shows/seasons, checks if all episodes are downloaded
+  bool isDownloaded(String globalKey) {
+    final progress = getProgress(globalKey);
+    return progress?.status == DownloadStatus.completed;
+  }
+
+  /// Check if an item is currently downloading
+  /// For shows/seasons, checks if any episodes are downloading
+  bool isDownloading(String globalKey) {
+    final progress = getProgress(globalKey);
+    return progress?.status == DownloadStatus.downloading;
+  }
+
+  /// Check if an item is in the queue
+  /// For shows/seasons, checks if any episodes are queued
+  bool isQueued(String globalKey) {
+    final progress = getProgress(globalKey);
+    return progress?.status == DownloadStatus.queued;
+  }
+
+  /// Check if an item is currently being queued (building download queue)
+  bool isQueueing(String globalKey) => _queueing.contains(globalKey);
+
+  /// Get the local video file path for a downloaded item
+  /// Returns null if not downloaded or file doesn't exist
+  Future<String?> getVideoFilePath(String globalKey) async {
+    appLogger.d('getVideoFilePath called with globalKey: $globalKey');
+
+    final downloadedItem = await _downloadManager.getDownloadedMedia(globalKey);
+    if (downloadedItem == null) {
+      appLogger.w('No downloaded item found for globalKey: $globalKey');
+      return null;
+    }
+    if (downloadedItem.status != DownloadStatus.completed.index) {
+      appLogger.w('Download not complete. Status: ${downloadedItem.status}');
+      return null;
+    }
+    if (downloadedItem.videoFilePath == null) {
+      appLogger.w('Video file path is null for globalKey: $globalKey');
+      return null;
+    }
+
+    final storedPath = downloadedItem.videoFilePath!;
+    final storageService = DownloadStorageService.instance;
+
+    // SAF URIs (content://) are already valid - don't transform them
+    if (storageService.isSafUri(storedPath)) {
+      appLogger.d('Found SAF video path: $storedPath');
+      return storedPath;
+    }
+
+    // Convert stored path (may be relative) to absolute path
+    final absolutePath = await storageService.ensureAbsolutePath(storedPath);
+
+    // Verify file exists
+    final file = File(absolutePath);
+    if (!await file.exists()) {
+      appLogger.w('Offline video file not found: $absolutePath');
+      return null;
+    }
+    return absolutePath;
+  }
+
+  /// Queue a download for a media item.
+  /// For movies and episodes, queues directly.
+  /// For shows and seasons, fetches all child episodes and queues them.
+  /// Returns the number of items queued.
+  Future<int> queueDownload(PlexMetadata metadata, PlexClient client) async {
+    final globalKey = '${metadata.serverId}:${metadata.ratingKey}';
+
+    // Check if downloads are blocked on cellular
+    if (await DownloadManagerService.shouldBlockDownloadOnCellular()) {
+      throw CellularDownloadBlockedException();
+    }
+
+    try {
+      // Mark as queueing to show loading state in UI
+      _queueing.add(globalKey);
+      notifyListeners();
+
+      final type = metadata.type.toLowerCase();
+
+      if (type == 'movie' || type == 'episode') {
+        // Direct download of a single item
+        await _queueSingleDownload(metadata, client);
+        return 1;
+      } else if (type == 'show') {
+        // Store show metadata so getProgress() can identify it as a show
+        _metadata[globalKey] = metadata;
+
+        // Download all episodes from all seasons
+        return await _queueShowDownload(metadata, client);
+      } else if (type == 'season') {
+        // Store season metadata so getProgress() can identify it as a season
+        _metadata[globalKey] = metadata;
+
+        // Download all episodes in season
+        return await _queueSeasonDownload(metadata, client);
+      } else {
+        throw Exception('Cannot download ${metadata.type}');
+      }
+    } finally {
+      // Always remove from queueing set, even on error
+      _queueing.remove(globalKey);
+      notifyListeners();
+    }
+  }
+
+  /// Queue a single movie or episode for download
+  Future<void> _queueSingleDownload(
+    PlexMetadata metadata,
+    PlexClient client,
+  ) async {
+    final globalKey = '${metadata.serverId}:${metadata.ratingKey}';
+
+    // Don't re-queue if already downloading or completed
+    if (_downloads.containsKey(globalKey)) {
+      final existing = _downloads[globalKey]!;
+      if (existing.status == DownloadStatus.downloading ||
+          existing.status == DownloadStatus.completed) {
+        return;
+      }
+    }
+
+    // Fetch full metadata to get year, summary, clearLogo
+    // The metadata from getChildren() is summarized and missing these fields
+    PlexMetadata metadataToStore = metadata;
+    try {
+      final fullMetadata = await client.getMetadataWithImages(
+        metadata.ratingKey,
+      );
+      if (fullMetadata != null) {
+        metadataToStore = fullMetadata.copyWith(
+          serverId: metadata.serverId,
+          serverName: metadata.serverName,
+        );
+      }
+    } catch (e) {
+      appLogger.w(
+        'Failed to fetch full metadata for ${metadata.ratingKey}, using partial',
+        error: e,
+      );
+    }
+
+    // For episodes, also fetch and store show and season metadata for offline display
+    if (metadataToStore.type == 'episode') {
+      await _fetchAndStoreParentMetadata(metadataToStore, client);
+    }
+
+    // Store full metadata for display
+    _metadata[globalKey] = metadataToStore;
+
+    // Update local state immediately for UI feedback
+    _downloads[globalKey] = DownloadProgress(
+      globalKey: globalKey,
+      status: DownloadStatus.queued,
+    );
+    notifyListeners();
+
+    // Actually trigger download via DownloadManagerService
+    await _downloadManager.queueDownload(
+      metadata: metadataToStore,
+      client: client,
+    );
+  }
+
+  /// Fetch and store show and season metadata for an episode
+  /// Also downloads artwork for show and season
+  Future<void> _fetchAndStoreParentMetadata(
+    PlexMetadata episode,
+    PlexClient client,
+  ) async {
+    final serverId = episode.serverId;
+    if (serverId == null) return;
+    final storageService = DownloadStorageService.instance;
+
+    // Fetch and store show metadata if not already stored
+    final showRatingKey = episode.grandparentRatingKey;
+    if (showRatingKey != null) {
+      final showGlobalKey = '$serverId:$showRatingKey';
+
+      // Try to use existing metadata (set when queueing an entire show)
+      PlexMetadata? showMetadata = _metadata[showGlobalKey];
+
+      // If not already cached, fetch full metadata with images
+      if (showMetadata == null) {
+        try {
+          showMetadata = await client.getMetadataWithImages(showRatingKey);
+        } catch (e) {
+          appLogger.w(
+            'Failed to fetch show metadata for $showRatingKey',
+            error: e,
+          );
+        }
+      }
+
+      if (showMetadata != null) {
+        final showWithServer = showMetadata.copyWith(serverId: serverId);
+        _metadata[showGlobalKey] = showWithServer;
+
+        // Persist to database/API cache for offline usage
+        await _downloadManager.saveMetadata(showWithServer);
+
+        // Ensure show artwork is downloaded even if metadata already existed
+        final thumbPath = showWithServer.thumb;
+        final hasPoster =
+            thumbPath != null &&
+            await storageService.artworkExists(serverId, thumbPath);
+        if (!hasPoster) {
+          await _downloadManager.downloadArtworkForMetadata(
+            showWithServer,
+            client,
+          );
+          appLogger.d('Downloaded show artwork for $showGlobalKey');
+        }
+
+        // Store artwork reference in provider's map for offline display
+        _artworkPaths[showGlobalKey] = DownloadedArtwork(thumbPath: thumbPath);
+      }
+    }
+
+    // Fetch and store season metadata if not already stored
+    final seasonRatingKey = episode.parentRatingKey;
+    if (seasonRatingKey != null) {
+      final seasonGlobalKey = '$serverId:$seasonRatingKey';
+      PlexMetadata? seasonMetadata = _metadata[seasonGlobalKey];
+
+      if (seasonMetadata == null) {
+        try {
+          seasonMetadata = await client.getMetadataWithImages(seasonRatingKey);
+        } catch (e) {
+          appLogger.w(
+            'Failed to fetch season metadata for $seasonRatingKey',
+            error: e,
+          );
+        }
+      }
+
+      if (seasonMetadata != null) {
+        final seasonWithServer = seasonMetadata.copyWith(serverId: serverId);
+        _metadata[seasonGlobalKey] = seasonWithServer;
+
+        // Persist to database/API cache for offline usage
+        await _downloadManager.saveMetadata(seasonWithServer);
+
+        // Ensure season artwork is downloaded even if metadata already existed
+        final thumbPath = seasonWithServer.thumb;
+        final hasPoster =
+            thumbPath != null &&
+            await storageService.artworkExists(serverId, thumbPath);
+        if (!hasPoster) {
+          await _downloadManager.downloadArtworkForMetadata(
+            seasonWithServer,
+            client,
+          );
+          appLogger.d('Downloaded season artwork for $seasonGlobalKey');
+        }
+
+        // Store artwork reference in provider's map for offline display
+        _artworkPaths[seasonGlobalKey] = DownloadedArtwork(
+          thumbPath: thumbPath,
+        );
+      }
+    }
+  }
+
+  /// Queue all episodes from a TV show for download
+  Future<int> _queueShowDownload(PlexMetadata show, PlexClient client) async {
+    final globalKey = '${show.serverId}:${show.ratingKey}';
+    int count = 0;
+    final seasons = await client.getChildren(show.ratingKey);
+
+    // Store total episode count from show metadata (leafCount)
+    if (show.leafCount != null && show.leafCount! > 0) {
+      _totalEpisodeCounts[globalKey] = show.leafCount!;
+      await _persistTotalEpisodeCount(globalKey, show.leafCount!);
+      appLogger.i(
+        '💾 Stored episode count for show $globalKey: ${show.leafCount}\n'
+        '  - Show title: ${show.title}\n'
+        '  - Show type: ${show.type}\n'
+        '  - Total stored counts: ${_totalEpisodeCounts.length}',
+      );
+    } else {
+      appLogger.w(
+        '⚠️  Show $globalKey has no leafCount! Cannot store episode count.\n'
+        '  - Show title: ${show.title}\n'
+        '  - Show type: ${show.type}\n'
+        '  - leafCount value: ${show.leafCount}',
+      );
+    }
+
+    for (final season in seasons) {
+      if (season.type == 'season') {
+        // Ensure season has serverId from parent show
+        final seasonWithServer = season.serverId != null
+            ? season
+            : season.copyWith(serverId: show.serverId);
+        count += await _queueSeasonDownload(seasonWithServer, client);
+      }
+    }
+
+    return count;
+  }
+
+  /// Queue all episodes from a season for download
+  Future<int> _queueSeasonDownload(
+    PlexMetadata season,
+    PlexClient client,
+  ) async {
+    final globalKey = '${season.serverId}:${season.ratingKey}';
+    int count = 0;
+    final episodes = await client.getChildren(season.ratingKey);
+
+    // Store total episode count from season metadata (leafCount)
+    if (season.leafCount != null && season.leafCount! > 0) {
+      _totalEpisodeCounts[globalKey] = season.leafCount!;
+      await _persistTotalEpisodeCount(globalKey, season.leafCount!);
+      appLogger.i(
+        '💾 Stored episode count for season $globalKey: ${season.leafCount}\n'
+        '  - Season title: ${season.title}\n'
+        '  - Season type: ${season.type}\n'
+        '  - Total stored counts: ${_totalEpisodeCounts.length}',
+      );
+    } else {
+      appLogger.w(
+        '⚠️  Season $globalKey has no leafCount! Cannot store episode count.\n'
+        '  - Season title: ${season.title}\n'
+        '  - Season type: ${season.type}\n'
+        '  - leafCount value: ${season.leafCount}',
+      );
+    }
+
+    for (final episode in episodes) {
+      if (episode.type == 'episode') {
+        // Ensure episode has serverId from parent season
+        final episodeWithServer = episode.serverId != null
+            ? episode
+            : episode.copyWith(serverId: season.serverId);
+        await _queueSingleDownload(episodeWithServer, client);
+        count++;
+      }
+    }
+
+    return count;
+  }
+
+  /// Queue only the missing (not downloaded) episodes for a show/season
+  /// Used for resuming partial downloads
+  /// Returns the number of episodes queued
+  Future<int> queueMissingEpisodes(
+    PlexMetadata metadata,
+    PlexClient client,
+  ) async {
+    final type = metadata.type.toLowerCase();
+
+    if (type == 'show') {
+      return await _queueMissingShowEpisodes(metadata, client);
+    } else if (type == 'season') {
+      return await _queueMissingSeasonEpisodes(metadata, client);
+    } else {
+      throw Exception('queueMissingEpisodes only supports shows/seasons');
+    }
+  }
+
+  /// Queue missing episodes for a show
+  Future<int> _queueMissingShowEpisodes(
+    PlexMetadata show,
+    PlexClient client,
+  ) async {
+    int queuedCount = 0;
+
+    // Fetch all seasons
+    final seasons = await client.getChildren(show.ratingKey);
+
+    for (final season in seasons) {
+      if (season.type == 'season') {
+        final seasonWithServer = season.serverId != null
+            ? season
+            : season.copyWith(serverId: show.serverId);
+        queuedCount += await _queueMissingSeasonEpisodes(
+          seasonWithServer,
+          client,
+        );
+      }
+    }
+
+    appLogger.i('Queued $queuedCount missing episodes for show ${show.title}');
+    return queuedCount;
+  }
+
+  /// Queue missing episodes for a season
+  Future<int> _queueMissingSeasonEpisodes(
+    PlexMetadata season,
+    PlexClient client,
+  ) async {
+    int queuedCount = 0;
+
+    // Fetch all episodes
+    final episodes = await client.getChildren(season.ratingKey);
+
+    for (final episode in episodes) {
+      if (episode.type == 'episode') {
+        final episodeWithServer = episode.serverId != null
+            ? episode
+            : episode.copyWith(serverId: season.serverId);
+
+        final episodeGlobalKey =
+            '${episodeWithServer.serverId}:${episodeWithServer.ratingKey}';
+
+        // Only queue if NOT already downloaded or in progress
+        final progress = _downloads[episodeGlobalKey];
+        if (progress == null ||
+            (progress.status != DownloadStatus.completed &&
+                progress.status != DownloadStatus.downloading &&
+                progress.status != DownloadStatus.queued)) {
+          await _queueSingleDownload(episodeWithServer, client);
+          queuedCount++;
+          appLogger.d(
+            'Queued missing episode: ${episode.title} ($episodeGlobalKey)',
+          );
+        }
+      }
+    }
+
+    return queuedCount;
+  }
+
+  /// Pause a download (works for both downloading and queued items)
+  Future<void> pauseDownload(String globalKey) async {
+    final progress = _downloads[globalKey];
+    if (progress != null &&
+        (progress.status == DownloadStatus.downloading ||
+            progress.status == DownloadStatus.queued)) {
+      await _downloadManager.pauseDownload(globalKey);
+    }
+  }
+
+  /// Resume a paused download
+  Future<void> resumeDownload(String globalKey, PlexClient client) async {
+    final progress = _downloads[globalKey];
+    if (progress != null && progress.status == DownloadStatus.paused) {
+      await _downloadManager.resumeDownload(globalKey, client);
+    }
+  }
+
+  /// Retry a failed download
+  Future<void> retryDownload(String globalKey, PlexClient client) async {
+    final progress = _downloads[globalKey];
+    if (progress != null && progress.status == DownloadStatus.failed) {
+      await _downloadManager.retryDownload(globalKey, client);
+    }
+  }
+
+  /// Cancel a download
+  Future<void> cancelDownload(String globalKey) async {
+    final progress = _downloads[globalKey];
+    if (progress != null) {
+      await _downloadManager.cancelDownload(globalKey);
+      _downloads.remove(globalKey);
+      _metadata.remove(globalKey);
+      notifyListeners();
+    }
+  }
+
+  /// Delete a downloaded item
+  Future<void> deleteDownload(String globalKey) async {
+    try {
+      // Check if this is a show/season and clean up episode count
+      final meta = _metadata[globalKey];
+      if (meta?.type == 'show' || meta?.type == 'season') {
+        final removedCount = _totalEpisodeCounts.remove(globalKey);
+        final prefs = await SharedPreferences.getInstance();
+        await prefs.remove('episode_count_$globalKey');
+        appLogger.i(
+          '🗑️  Removed episode count for $globalKey\n'
+          '  - Removed count value: $removedCount\n'
+          '  - Metadata type: ${meta?.type}\n'
+          '  - Metadata title: ${meta?.title}\n'
+          '  - Remaining stored counts: ${_totalEpisodeCounts.length}',
+        );
+      }
+
+      // Start deletion (progress will be tracked via stream)
+      await _downloadManager.deleteDownload(globalKey);
+
+      // Remove from local state
+      _downloads.remove(globalKey);
+      _metadata.remove(globalKey);
+      _artworkPaths.remove(globalKey);
+
+      notifyListeners();
+    } catch (e) {
+      // Remove from deletion tracking on error
+      _deletionProgress.remove(globalKey);
+      notifyListeners();
+      rethrow;
+    }
+  }
+
+  /// Handle deletion progress updates
+  void _onDeletionProgressUpdate(DeletionProgress progress) {
+    if (progress.isComplete) {
+      // Deletion complete - remove from tracking
+      _deletionProgress.remove(progress.globalKey);
+    } else {
+      // Update progress
+      _deletionProgress[progress.globalKey] = progress;
+    }
+    notifyListeners();
+  }
+
+  /// Check if an item is being deleted
+  bool isDeleting(String globalKey) => _deletionProgress.containsKey(globalKey);
+
+  /// Get deletion progress for an item
+  DeletionProgress? getDeletionProgress(String globalKey) =>
+      _deletionProgress[globalKey];
+
+  /// Get all items currently being deleted
+  UnmodifiableMapView<String, DeletionProgress> get deletionProgress =>
+      UnmodifiableMapView(_deletionProgress);
+
+  /// Refresh the downloads list from database
+  Future<void> refresh() async {
+    await _loadPersistedDownloads();
+  }
+
+  /// Refresh only metadata from API cache (after watch state sync).
+  ///
+  /// This is more lightweight than full refresh() - only updates metadata
+  /// without reloading download progress from database.
+  Future<void> refreshMetadataFromCache() async {
+    final apiCache = PlexApiCache.instance;
+    int updatedCount = 0;
+
+    for (final globalKey in _metadata.keys.toList()) {
+      final parts = globalKey.split(':');
+      if (parts.length != 2) continue;
+
+      final serverId = parts[0];
+      final ratingKey = parts[1];
+
+      try {
+        final cached = await apiCache.get(
+          serverId,
+          '/library/metadata/$ratingKey',
+        );
+
+        if (cached != null) {
+          final metadataList = cached['MediaContainer']?['Metadata'] as List?;
+          if (metadataList != null && metadataList.isNotEmpty) {
+            final metadata = PlexMetadata.fromJson(metadataList.first);
+            _metadata[globalKey] = metadata.copyWith(serverId: serverId);
+            updatedCount++;
+          }
+        }
+      } catch (e) {
+        appLogger.d('Failed to refresh metadata for $globalKey: $e');
+      }
+    }
+
+    if (updatedCount > 0) {
+      appLogger.i('Refreshed metadata from cache for $updatedCount items');
+      notifyListeners();
+    }
+  }
+}
+
+/// Exception thrown when download is blocked due to cellular-only setting
+class CellularDownloadBlockedException implements Exception {
+  final String message = 'Downloads are disabled on cellular data';
+
+  @override
+  String toString() => message;
+}
diff --git a/lib/providers/hidden_libraries_provider.dart b/lib/providers/hidden_libraries_provider.dart
index 9f3eca99..0db4b3de 100644
--- a/lib/providers/hidden_libraries_provider.dart
+++ b/lib/providers/hidden_libraries_provider.dart
@@ -10,13 +10,17 @@ class HiddenLibrariesProvider extends ChangeNotifier {
   bool _isInitialized = false;
 
   /// Get an unmodifiable copy of hidden library keys
-  Set<String> get hiddenLibraryKeys => Set.unmodifiable(_hiddenLibraryKeys);
+  Set<String> get hiddenLibraryKeys {
+    if (!_isInitialized) _initialize();
+    return Set.unmodifiable(_hiddenLibraryKeys);
+  }
 
   /// Check if the provider has completed initialization
   bool get isInitialized => _isInitialized;
 
   HiddenLibrariesProvider() {
-    _initialize();
+    // Don't initialize immediately if lazy-loaded
+    // _initialize() will be called when first accessed
   }
 
   /// Initialize the provider by loading hidden libraries from storage
@@ -30,6 +34,7 @@ class HiddenLibrariesProvider extends ChangeNotifier {
   /// Hide a library by its key
   /// Updates both in-memory state and persistent storage
   Future<void> hideLibrary(String libraryKey) async {
+    if (!_isInitialized) await _initialize();
     if (!_hiddenLibraryKeys.contains(libraryKey)) {
       _hiddenLibraryKeys = Set.from(_hiddenLibraryKeys)..add(libraryKey);
       await _storageService.saveHiddenLibraries(_hiddenLibraryKeys);
@@ -40,6 +45,7 @@ class HiddenLibrariesProvider extends ChangeNotifier {
   /// Unhide a library by its key
   /// Updates both in-memory state and persistent storage
   Future<void> unhideLibrary(String libraryKey) async {
+    if (!_isInitialized) await _initialize();
     if (_hiddenLibraryKeys.contains(libraryKey)) {
       _hiddenLibraryKeys = Set.from(_hiddenLibraryKeys)..remove(libraryKey);
       await _storageService.saveHiddenLibraries(_hiddenLibraryKeys);
@@ -49,6 +55,7 @@ class HiddenLibrariesProvider extends ChangeNotifier {
 
   /// Check if a specific library is hidden
   bool isLibraryHidden(String libraryKey) {
+    if (!_isInitialized) _initialize();
     return _hiddenLibraryKeys.contains(libraryKey);
   }
 
diff --git a/lib/providers/multi_server_provider.dart b/lib/providers/multi_server_provider.dart
new file mode 100644
index 00000000..c9ce69d0
--- /dev/null
+++ b/lib/providers/multi_server_provider.dart
@@ -0,0 +1,112 @@
+import 'package:flutter/foundation.dart';
+
+import '../services/plex_client.dart';
+import '../services/data_aggregation_service.dart';
+import '../services/multi_server_manager.dart';
+import '../services/plex_auth_service.dart';
+import '../utils/app_logger.dart';
+
+/// Provider for multi-server Plex connections
+/// Manages multiple PlexClient instances and provides data aggregation
+class MultiServerProvider extends ChangeNotifier {
+  final MultiServerManager _serverManager;
+  final DataAggregationService _aggregationService;
+
+  MultiServerProvider(this._serverManager, this._aggregationService) {
+    // Listen to server status changes
+    _serverManager.statusStream.listen((_) {
+      notifyListeners();
+    });
+  }
+
+  /// Get the multi-server manager
+  MultiServerManager get serverManager => _serverManager;
+
+  /// Get the data aggregation service
+  DataAggregationService get aggregationService => _aggregationService;
+
+  /// Get client for specific server
+  PlexClient? getClientForServer(String serverId) {
+    return _serverManager.getClient(serverId);
+  }
+
+  /// Get all online server IDs
+  List<String> get onlineServerIds => _serverManager.onlineServerIds;
+
+  /// Get all server IDs
+  List<String> get serverIds => _serverManager.serverIds;
+
+  /// Check if a server is online
+  bool isServerOnline(String serverId) {
+    return _serverManager.isServerOnline(serverId);
+  }
+
+  /// Get number of online servers
+  int get onlineServerCount => _serverManager.onlineServerIds.length;
+
+  /// Get number of total servers
+  int get totalServerCount => _serverManager.serverIds.length;
+
+  /// Check if any servers are connected
+  bool get hasConnectedServers => onlineServerCount > 0;
+
+  /// Update token for a specific server
+  void updateTokenForServer(String serverId, String newToken) {
+    final client = _serverManager.getClient(serverId);
+    if (client != null) {
+      client.updateToken(newToken);
+      appLogger.d('MultiServerProvider: Token updated for server $serverId');
+      notifyListeners();
+    } else {
+      appLogger.w(
+        'MultiServerProvider: Cannot update token - server $serverId not found',
+      );
+    }
+  }
+
+  /// Clear all server connections
+  void clearAllConnections() {
+    _serverManager.disconnectAll();
+    _aggregationService.clearCache(); // Clear cached data when servers change
+    appLogger.d('MultiServerProvider: All connections cleared');
+    notifyListeners();
+  }
+
+  /// Reconnect all servers after a profile switch
+  /// Clears existing connections and connects to all provided servers
+  Future<int> reconnectWithServers(
+    List<PlexServer> servers, {
+    String? clientIdentifier,
+  }) async {
+    // Clear existing connections first
+    _serverManager.disconnectAll();
+    _aggregationService.clearCache(); // Clear cached data when servers change
+    appLogger.d(
+      'MultiServerProvider: Cleared connections, reconnecting to ${servers.length} servers',
+    );
+
+    // Connect with new server tokens
+    final connectedCount = await _serverManager.connectToAllServers(
+      servers,
+      clientIdentifier: clientIdentifier,
+    );
+
+    appLogger.i(
+      'MultiServerProvider: Reconnected to $connectedCount/${servers.length} servers after profile switch',
+    );
+    notifyListeners();
+    return connectedCount;
+  }
+
+  /// Check server health for all connected servers
+  Future<void> checkServerHealth() async {
+    await _serverManager.checkServerHealth();
+    // notifyListeners() will be called automatically via status stream
+  }
+
+  @override
+  void dispose() {
+    _serverManager.dispose();
+    super.dispose();
+  }
+}
diff --git a/lib/providers/offline_mode_provider.dart b/lib/providers/offline_mode_provider.dart
new file mode 100644
index 00000000..99aaa933
--- /dev/null
+++ b/lib/providers/offline_mode_provider.dart
@@ -0,0 +1,84 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
+import '../services/multi_server_manager.dart';
+
+/// Tracks offline mode status based on network connectivity and server reachability.
+class OfflineModeProvider extends ChangeNotifier {
+  final MultiServerManager _serverManager;
+
+  StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
+  StreamSubscription<Map<String, bool>>? _serverStatusSubscription;
+
+  bool _hasNetworkConnection = true;
+  late bool _hasServerConnection;
+  bool _isInitialized = false;
+
+  OfflineModeProvider(this._serverManager)
+      : _hasServerConnection = _serverManager.onlineServerIds.isNotEmpty;
+
+  /// Whether the app is currently in offline mode
+  /// Offline = no network OR no servers reachable
+  bool get isOffline => !_hasNetworkConnection || !_hasServerConnection;
+
+  /// Whether there is network connectivity (WiFi, mobile data, etc.)
+  bool get hasNetworkConnection => _hasNetworkConnection;
+
+  /// Whether at least one Plex server is reachable
+  bool get hasServerConnection => _hasServerConnection;
+
+  /// Updates network and server connection flags
+  Future<void> _updateConnectionFlags() async {
+    final connectivityResult = await Connectivity().checkConnectivity();
+    _hasNetworkConnection = !connectivityResult.contains(
+      ConnectivityResult.none,
+    );
+    _hasServerConnection = _serverManager.onlineServerIds.isNotEmpty;
+  }
+
+  /// Initialize the provider and start monitoring
+  Future<void> initialize() async {
+    if (_isInitialized) return;
+    _isInitialized = true;
+
+    // Check initial connectivity
+    await _updateConnectionFlags();
+
+    // Monitor connectivity changes
+    _connectivitySubscription = Connectivity().onConnectivityChanged.listen((
+      results,
+    ) {
+      final wasOffline = isOffline;
+      _hasNetworkConnection = !results.contains(ConnectivityResult.none);
+
+      if (wasOffline != isOffline) {
+        notifyListeners();
+      }
+    });
+
+    // Monitor server status from MultiServerManager
+    _serverStatusSubscription = _serverManager.statusStream.listen((statusMap) {
+      final wasOffline = isOffline;
+      _hasServerConnection = statusMap.values.any((isOnline) => isOnline);
+
+      if (wasOffline != isOffline) {
+        notifyListeners();
+      }
+    });
+
+    notifyListeners();
+  }
+
+  /// Force a refresh of connectivity status
+  Future<void> refresh() async {
+    await _updateConnectionFlags();
+    notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    _connectivitySubscription?.cancel();
+    _serverStatusSubscription?.cancel();
+    super.dispose();
+  }
+}
diff --git a/lib/providers/offline_watch_provider.dart b/lib/providers/offline_watch_provider.dart
new file mode 100644
index 00000000..213fbbe1
--- /dev/null
+++ b/lib/providers/offline_watch_provider.dart
@@ -0,0 +1,227 @@
+import 'package:flutter/foundation.dart';
+
+import '../models/plex_metadata.dart';
+import '../services/offline_watch_sync_service.dart';
+import '../services/plex_api_cache.dart';
+import 'download_provider.dart';
+
+/// Provider for offline watch status UI state.
+///
+/// Provides:
+/// - Effective watch status (local changes + cached server data)
+/// - Offline "OnDeck" calculation for shows
+/// - Manual mark watched/unwatched while offline
+class OfflineWatchProvider extends ChangeNotifier {
+  final OfflineWatchSyncService _syncService;
+  final DownloadProvider _downloadProvider;
+  // ignore: unused_field - reserved for future cached metadata lookup
+  final PlexApiCache _apiCache;
+
+  OfflineWatchProvider({
+    required OfflineWatchSyncService syncService,
+    required DownloadProvider downloadProvider,
+    required PlexApiCache apiCache,
+  }) : _syncService = syncService,
+       _downloadProvider = downloadProvider,
+       _apiCache = apiCache {
+    // Listen to sync service changes to update UI
+    _syncService.addListener(_onSyncServiceChanged);
+  }
+
+  void _onSyncServiceChanged() {
+    notifyListeners();
+  }
+
+  /// Whether a sync is in progress
+  bool get isSyncing => _syncService.isSyncing;
+
+  /// Get count of pending sync items
+  Future<int> getPendingSyncCount() => _syncService.getPendingSyncCount();
+
+  /// Get the effective watch status for a media item.
+  ///
+  /// Priority:
+  /// 1. Local offline action (if exists)
+  /// 2. Cached server data from API cache
+  /// 3. Metadata from download provider
+  ///
+  /// Returns true if watched, false otherwise.
+  Future<bool> isWatched(String globalKey) async {
+    // First check local offline action
+    final localStatus = await _syncService.getLocalWatchStatus(globalKey);
+    if (localStatus != null) {
+      return localStatus;
+    }
+
+    // Fall back to cached metadata
+    final metadata = _downloadProvider.getMetadata(globalKey);
+    if (metadata != null) {
+      return metadata.isWatched;
+    }
+
+    return false;
+  }
+
+  /// Check watch status synchronously using cached metadata.
+  ///
+  /// This is useful for UI that can't await, but may not reflect
+  /// the most recent local actions.
+  bool isWatchedSync(PlexMetadata metadata) {
+    // Note: This doesn't check local actions synchronously
+    // because that would require async database access.
+    // For real-time accuracy, use isWatched() instead.
+    return metadata.isWatched;
+  }
+
+  /// Get the effective view offset (resume position) for a media item.
+  ///
+  /// Priority:
+  /// 1. Local offline progress (if exists)
+  /// 2. Metadata from download provider
+  ///
+  /// Returns null if no position is available.
+  Future<int?> getViewOffset(String globalKey) async {
+    // First check local offline progress
+    final localOffset = await _syncService.getLocalViewOffset(globalKey);
+    if (localOffset != null) {
+      return localOffset;
+    }
+
+    // Fall back to cached metadata
+    final metadata = _downloadProvider.getMetadata(globalKey);
+    return metadata?.viewOffset;
+  }
+
+  /// Get sorted episodes for a show (by season, then episode number).
+  List<PlexMetadata> _getSortedEpisodes(String showRatingKey) {
+    final episodes = _downloadProvider.getDownloadedEpisodesForShow(
+      showRatingKey,
+    );
+    if (episodes.isEmpty) return episodes;
+
+    episodes.sort((a, b) {
+      final seasonCompare = (a.parentIndex ?? 0).compareTo(b.parentIndex ?? 0);
+      if (seasonCompare != 0) return seasonCompare;
+      return (a.index ?? 0).compareTo(b.index ?? 0);
+    });
+
+    return episodes;
+  }
+
+  /// Find the next unwatched downloaded episode for a show.
+  ///
+  /// This is the "offline OnDeck" calculation - finds the first
+  /// episode that hasn't been watched (or is in progress).
+  ///
+  /// Episodes are sorted by season number, then episode number.
+  ///
+  /// Returns the next unwatched episode, or the first episode if all watched.
+  Future<PlexMetadata?> getNextUnwatchedEpisode(String showRatingKey) async {
+    final episodes = _getSortedEpisodes(showRatingKey);
+    if (episodes.isEmpty) return null;
+
+    // Batch fetch all watch statuses in a single query
+    final globalKeys = episodes.map((e) => e.globalKey).toSet();
+    final localStatuses =
+        await _syncService.getLocalWatchStatusesBatched(globalKeys);
+
+    // Find first unwatched episode
+    for (final episode in episodes) {
+      final localStatus = localStatuses[episode.globalKey];
+      final watched =
+          localStatus ?? _downloadProvider.getMetadata(episode.globalKey)?.isWatched ?? false;
+      if (!watched) {
+        return episode;
+      }
+    }
+
+    // All episodes watched - return first episode for replay
+    return episodes.first;
+  }
+
+  /// Find the next unwatched downloaded episode synchronously.
+  ///
+  /// This uses cached metadata without checking local offline actions.
+  /// For real-time accuracy, use getNextUnwatchedEpisode() instead.
+  PlexMetadata? getNextUnwatchedEpisodeSync(String showRatingKey) {
+    final episodes = _getSortedEpisodes(showRatingKey);
+    if (episodes.isEmpty) return null;
+
+    // Find first unwatched episode (using metadata's isWatched)
+    for (final episode in episodes) {
+      if (!episode.isWatched) {
+        return episode;
+      }
+    }
+
+    // All episodes watched - return first episode for replay
+    return episodes.first;
+  }
+
+  /// Mark an item as watched while offline.
+  ///
+  /// This queues the action for sync when online.
+  Future<void> markAsWatched({
+    required String serverId,
+    required String ratingKey,
+  }) async {
+    await _syncService.queueMarkWatched(
+      serverId: serverId,
+      ratingKey: ratingKey,
+    );
+    notifyListeners();
+  }
+
+  /// Mark an item as unwatched while offline.
+  ///
+  /// This queues the action for sync when online.
+  Future<void> markAsUnwatched({
+    required String serverId,
+    required String ratingKey,
+  }) async {
+    await _syncService.queueMarkUnwatched(
+      serverId: serverId,
+      ratingKey: ratingKey,
+    );
+    notifyListeners();
+  }
+
+  /// Get downloaded episodes for a show with their watch status.
+  ///
+  /// Returns a list of (episode, isWatched) pairs.
+  /// Uses batched database query for efficiency.
+  Future<List<(PlexMetadata episode, bool isWatched)>>
+  getEpisodesWithWatchStatus(String showRatingKey) async {
+    final episodes = _downloadProvider.getDownloadedEpisodesForShow(
+      showRatingKey,
+    );
+
+    if (episodes.isEmpty) return [];
+
+    // Batch fetch all watch statuses in a single query
+    final globalKeys = episodes.map((e) => e.globalKey).toSet();
+    final localStatuses =
+        await _syncService.getLocalWatchStatusesBatched(globalKeys);
+
+    final results = <(PlexMetadata, bool)>[];
+    for (final episode in episodes) {
+      final localStatus = localStatuses[episode.globalKey];
+      final watched =
+          localStatus ?? _downloadProvider.getMetadata(episode.globalKey)?.isWatched ?? false;
+      results.add((episode, watched));
+    }
+
+    return results;
+  }
+
+  /// Trigger a manual sync of pending items.
+  Future<void> syncNow() async {
+    await _syncService.syncPendingItems();
+  }
+
+  @override
+  void dispose() {
+    _syncService.removeListener(_onSyncServiceChanged);
+    super.dispose();
+  }
+}
diff --git a/lib/providers/playback_state_provider.dart b/lib/providers/playback_state_provider.dart
index 721345af..ff409e89 100644
--- a/lib/providers/playback_state_provider.dart
+++ b/lib/providers/playback_state_provider.dart
@@ -1,99 +1,306 @@
 import 'package:flutter/foundation.dart';
 import '../models/plex_metadata.dart';
+import '../models/play_queue_response.dart';
+import '../services/plex_client.dart';
 
-/// Manages shuffle playback state for TV shows and seasons.
+/// Playback mode types
+///
+/// All playback now uses Plex play queues.
+enum PlaybackMode {
+  playQueue, // Play queue-based playback (sequential, shuffle, playlists, collections)
+}
+
+/// Result of trying to locate the current queue index.
+class _IndexLookupResult {
+  final int? index;
+  final bool attemptedLoad;
+  final bool loadFailed;
+
+  const _IndexLookupResult({
+    this.index,
+    this.attemptedLoad = false,
+    this.loadFailed = false,
+  });
+}
+
+/// Manages playback state using Plex's play queue API.
 /// This provider is session-only and does not persist across app restarts.
 class PlaybackStateProvider with ChangeNotifier {
-  List<PlexMetadata> _shuffleQueue = [];
-  String?
-  _shuffleContextKey; // The show/season ratingKey for this shuffle session
-  int _currentIndex = 0;
+  // Play queue state
+  int? _playQueueId;
+  int _playQueueTotalCount = 0;
+  bool _playQueueShuffled = false;
+  int? _currentPlayQueueItemID;
+
+  // Windowed items (loaded around current position)
+  List<PlexMetadata> _loadedItems = [];
+  final int _windowSize = 50; // Number of items to keep in memory
+
+  // Legacy state for backward compatibility
+  String? _contextKey; // The show/season/playlist ratingKey for this session
+  PlaybackMode? _playbackMode;
+
+  // Client reference for loading more items
+  PlexClient? _client;
+
+  /// Current playback mode (null if no queue active)
+  PlaybackMode? get playbackMode => _playbackMode;
 
   /// Whether shuffle mode is currently active
-  bool get isShuffleActive => _shuffleQueue.isNotEmpty;
+  bool get isShuffleActive => _playQueueShuffled;
 
-  /// The context key (show or season ratingKey) for the current shuffle session
-  String? get shuffleContextKey => _shuffleContextKey;
+  /// Whether playlist/collection mode is currently active
+  bool get isPlaylistActive => _playbackMode == PlaybackMode.playQueue;
 
-  /// Sets a new shuffle queue and starts shuffle mode
-  void setShuffleQueue(List<PlexMetadata> episodes, String contextKey) {
-    _shuffleQueue = List.from(episodes);
-    _shuffleContextKey = contextKey;
-    _currentIndex = 0;
+  /// Whether any queue-based playback is active
+  bool get isQueueActive =>
+      _playQueueId != null && _playbackMode == PlaybackMode.playQueue;
+
+  /// The context key (show/season/playlist ratingKey) for the current session
+  String? get shuffleContextKey => _contextKey;
+
+  /// Current play queue ID
+  int? get playQueueId => _playQueueId;
+
+  /// Total number of items in the play queue
+  int get queueLength => _playQueueTotalCount;
+
+  /// Gets the current position in the queue (1-indexed)
+  int get currentPosition {
+    if (_currentPlayQueueItemID == null || _loadedItems.isEmpty) return 0;
+    final index = _loadedItems.indexWhere(
+      (item) => item.playQueueItemID == _currentPlayQueueItemID,
+    );
+    return index != -1 ? index + 1 : 0;
+  }
+
+  /// Set the client reference for loading more items
+  void setClient(PlexClient client) {
+    _client = client;
+  }
+
+  /// Update the current play queue item when playing a new item
+  void setCurrentItem(PlexMetadata metadata) {
+    if (_playbackMode == PlaybackMode.playQueue &&
+        metadata.playQueueItemID != null) {
+      _currentPlayQueueItemID = metadata.playQueueItemID;
+      notifyListeners();
+    }
+  }
+
+  /// Initialize playback from a play queue
+  /// Call this after creating a play queue via the API
+  Future<void> setPlaybackFromPlayQueue(
+    PlayQueueResponse playQueue,
+    String? contextKey, {
+    String? serverId,
+    String? serverName,
+  }) async {
+    _playQueueId = playQueue.playQueueID;
+    // Use size or items length as fallback if totalCount is null
+    _playQueueTotalCount =
+        playQueue.playQueueTotalCount ??
+        playQueue.size ??
+        (playQueue.items?.length ?? 0);
+    _playQueueShuffled = playQueue.playQueueShuffled;
+    _currentPlayQueueItemID = playQueue.playQueueSelectedItemID;
+
+    // Items are already tagged with server info by PlexClient
+    _loadedItems = playQueue.items ?? [];
+
+    _contextKey = contextKey;
+    _playbackMode = PlaybackMode.playQueue;
     notifyListeners();
   }
 
-  /// Gets the next episode in the shuffle queue.
-  /// Returns null if queue is exhausted or current episode is not in queue.
-  /// [loopQueue] - If true, restart from beginning when queue is exhausted
-  PlexMetadata? getNextEpisode(
-    String currentEpisodeKey, {
-    bool loopQueue = false,
-  }) {
-    if (_shuffleQueue.isEmpty) return null;
+  /// Load more items from the play queue if needed
+  /// Returns true if more items were loaded
+  Future<bool> _ensureItemsLoaded(int targetPlayQueueItemID) async {
+    if (_client == null || _playQueueId == null) return false;
 
-    // Find current episode in queue
-    final currentIndex = _shuffleQueue.indexWhere(
-      (ep) => ep.ratingKey == currentEpisodeKey,
+    // Check if the target item is already loaded
+    final hasItem = _loadedItems.any(
+      (item) => item.playQueueItemID == targetPlayQueueItemID,
+    );
+
+    if (hasItem) return true;
+
+    // Load a window around the target item
+    try {
+      final response = await _client!.getPlayQueue(
+        _playQueueId!,
+        center: targetPlayQueueItemID.toString(),
+        window: _windowSize,
+      );
+
+      if (response != null && response.items != null) {
+        // Items are already tagged with server info by PlexClient
+        _loadedItems = response.items!;
+        // Use size or items length as fallback if totalCount is null
+        _playQueueTotalCount =
+            response.playQueueTotalCount ??
+            response.size ??
+            response.items!.length;
+        _playQueueShuffled = response.playQueueShuffled;
+        notifyListeners();
+        return true;
+      }
+    } catch (e) {
+      // Failed to load items
+      return false;
+    }
+
+    return false;
+  }
+
+  Future<_IndexLookupResult> _getCurrentIndex({
+    bool loadIfMissing = false,
+  }) async {
+    if (_playbackMode != PlaybackMode.playQueue ||
+        _loadedItems.isEmpty ||
+        _currentPlayQueueItemID == null) {
+      return const _IndexLookupResult();
+    }
+
+    var currentIndex = _loadedItems.indexWhere(
+      (item) => item.playQueueItemID == _currentPlayQueueItemID,
+    );
+
+    if (currentIndex != -1) {
+      return _IndexLookupResult(index: currentIndex);
+    }
+
+    if (!loadIfMissing || _client == null || _playQueueId == null) {
+      return const _IndexLookupResult();
+    }
+
+    final loaded = await _ensureItemsLoaded(_currentPlayQueueItemID!);
+    if (!loaded) {
+      return const _IndexLookupResult(attemptedLoad: true, loadFailed: true);
+    }
+
+    currentIndex = _loadedItems.indexWhere(
+      (item) => item.playQueueItemID == _currentPlayQueueItemID,
     );
 
     if (currentIndex == -1) {
-      // Current episode not in queue, clear shuffle
-      clearShuffle();
+      return const _IndexLookupResult(attemptedLoad: true, loadFailed: true);
+    }
+
+    return _IndexLookupResult(index: currentIndex, attemptedLoad: true);
+  }
+
+  /// Gets the next item in the playback queue.
+  /// Returns null if queue is exhausted or current item is not in queue.
+  /// [loopQueue] - If true, restart from beginning when queue is exhausted
+  Future<PlexMetadata?> getNextEpisode(
+    String currentItemKey, {
+    bool loopQueue = false,
+  }) async {
+    if (_playbackMode != PlaybackMode.playQueue) {
+      // For sequential mode, let the video player handle next episode
       return null;
     }
 
-    // Check if there's a next episode
-    if (currentIndex + 1 >= _shuffleQueue.length) {
-      // Queue exhausted
-      if (loopQueue && _shuffleQueue.isNotEmpty) {
-        // Loop back to beginning
-        _currentIndex = 0;
-        return _shuffleQueue[_currentIndex];
+    final indexResult = await _getCurrentIndex(loadIfMissing: true);
+    if (indexResult.index == null) {
+      if (indexResult.loadFailed) {
+        clearShuffle();
       }
       return null;
     }
+    final currentIndex = indexResult.index!;
 
-    _currentIndex = currentIndex + 1;
-    return _shuffleQueue[_currentIndex];
-  }
+    // Check if there's a next item in the loaded window
+    if (currentIndex + 1 < _loadedItems.length) {
+      final nextItem = _loadedItems[currentIndex + 1];
+      // Don't update _currentPlayQueueItemID here - let setCurrentItem do it when playback starts
+      return nextItem;
+    }
 
-  /// Gets the previous episode in the shuffle queue.
-  /// Returns null if at the beginning of the queue or current episode is not in queue.
-  PlexMetadata? getPreviousEpisode(String currentEpisodeKey) {
-    if (_shuffleQueue.isEmpty) return null;
-
-    // Find current episode in queue
-    final currentIndex = _shuffleQueue.indexWhere(
-      (ep) => ep.ratingKey == currentEpisodeKey,
-    );
-
-    if (currentIndex == -1) {
-      // Current episode not in queue
+    // Check if we're at the end of the entire queue
+    if (currentIndex + 1 >= _playQueueTotalCount) {
+      if (loopQueue && _playQueueTotalCount > 0) {
+        // Loop back to beginning - load first item
+        if (_client != null && _playQueueId != null) {
+          final response = await _client!.getPlayQueue(_playQueueId!);
+          if (response != null &&
+              response.items != null &&
+              response.items!.isNotEmpty) {
+            // Items are already tagged with server info by PlexClient
+            _loadedItems = response.items!;
+            final firstItem = _loadedItems.first;
+            // Don't update _currentPlayQueueItemID here - let setCurrentItem do it when playback starts
+            return firstItem;
+          }
+        }
+      }
+      // At end of queue - return null but keep queue active so user can still go back
       return null;
     }
 
-    // Check if there's a previous episode
-    if (currentIndex <= 0) {
-      // At the beginning of queue
+    // Need to load next window
+    if (_client != null && _playQueueId != null) {
+      // Load next window centered on the item after current
+      final nextItemID = _loadedItems.last.playQueueItemID;
+      if (nextItemID != null) {
+        final loaded = await _ensureItemsLoaded(nextItemID + 1);
+        if (loaded) {
+          // Try again with newly loaded items
+          return getNextEpisode(currentItemKey, loopQueue: loopQueue);
+        }
+      }
+    }
+
+    return null;
+  }
+
+  /// Gets the previous item in the playback queue.
+  /// Returns null if at the beginning of the queue or current item is not in queue.
+  Future<PlexMetadata?> getPreviousEpisode(String currentItemKey) async {
+    if (_playbackMode != PlaybackMode.playQueue) {
+      // For sequential mode, let the video player handle previous episode
       return null;
     }
 
-    _currentIndex = currentIndex - 1;
-    return _shuffleQueue[_currentIndex];
+    final currentIndex = (await _getCurrentIndex()).index;
+    if (currentIndex == null) return null;
+
+    // Check if there's a previous item in the loaded window
+    if (currentIndex > 0) {
+      final prevItem = _loadedItems[currentIndex - 1];
+      // Don't update _currentPlayQueueItemID here - let setCurrentItem do it when playback starts
+      return prevItem;
+    }
+
+    // Check if we're at the beginning of the entire queue
+    if (currentIndex == 0) {
+      return null;
+    }
+
+    // Need to load previous window
+    if (_client != null && _playQueueId != null) {
+      final prevItemID = _loadedItems.first.playQueueItemID;
+      if (prevItemID != null && prevItemID > 0) {
+        final loaded = await _ensureItemsLoaded(prevItemID - 1);
+        if (loaded) {
+          return getPreviousEpisode(currentItemKey);
+        }
+      }
+    }
+
+    return null;
   }
 
-  /// Clears the shuffle queue and exits shuffle mode
+  /// Clears the playback queue and exits queue mode
   void clearShuffle() {
-    _shuffleQueue = [];
-    _shuffleContextKey = null;
-    _currentIndex = 0;
+    _playQueueId = null;
+    _playQueueTotalCount = 0;
+    _playQueueShuffled = false;
+    _currentPlayQueueItemID = null;
+    _loadedItems = [];
+    _contextKey = null;
+    _playbackMode = null;
     notifyListeners();
   }
-
-  /// Gets the total number of episodes in the current shuffle queue
-  int get queueLength => _shuffleQueue.length;
-
-  /// Gets the current position in the queue (1-indexed)
-  int get currentPosition => _currentIndex + 1;
 }
diff --git a/lib/providers/plex_client_provider.dart b/lib/providers/plex_client_provider.dart
index 99c9aaa0..d395d26e 100644
--- a/lib/providers/plex_client_provider.dart
+++ b/lib/providers/plex_client_provider.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import '../client/plex_client.dart';
+import '../services/plex_client.dart';
 import '../utils/app_logger.dart';
 
 class PlexClientProvider extends ChangeNotifier {
diff --git a/lib/providers/server_state_provider.dart b/lib/providers/server_state_provider.dart
new file mode 100644
index 00000000..ace1e5ce
--- /dev/null
+++ b/lib/providers/server_state_provider.dart
@@ -0,0 +1,76 @@
+import 'package:flutter/foundation.dart';
+
+/// Provider for tracking server-specific UI state
+/// Manages which server is currently in context for detail views
+class ServerStateProvider extends ChangeNotifier {
+  String? _currentServerId;
+  final Map<String, bool> _serverConnectionStates = {};
+  final Map<String, String?> _serverErrors = {};
+
+  /// Get the currently selected server ID (for detail views)
+  String? get currentServerId => _currentServerId;
+
+  /// Set the current server context (e.g., when viewing a library from a specific server)
+  void setCurrentServer(String? serverId) {
+    if (_currentServerId != serverId) {
+      _currentServerId = serverId;
+      notifyListeners();
+    }
+  }
+
+  /// Clear the current server selection
+  void clearCurrentServer() {
+    if (_currentServerId != null) {
+      _currentServerId = null;
+      notifyListeners();
+    }
+  }
+
+  /// Get connection state for a server
+  bool isServerConnected(String serverId) {
+    return _serverConnectionStates[serverId] ?? false;
+  }
+
+  /// Update connection state for a server
+  void updateServerConnectionState(String serverId, bool isConnected) {
+    if (_serverConnectionStates[serverId] != isConnected) {
+      _serverConnectionStates[serverId] = isConnected;
+      notifyListeners();
+    }
+  }
+
+  /// Get error message for a server (null if no error)
+  String? getServerError(String serverId) {
+    return _serverErrors[serverId];
+  }
+
+  /// Set error for a server
+  void setServerError(String serverId, String? error) {
+    _serverErrors[serverId] = error;
+    notifyListeners();
+  }
+
+  /// Clear error for a server
+  void clearServerError(String serverId) {
+    if (_serverErrors.containsKey(serverId)) {
+      _serverErrors.remove(serverId);
+      notifyListeners();
+    }
+  }
+
+  /// Clear all server errors
+  void clearAllServerErrors() {
+    if (_serverErrors.isNotEmpty) {
+      _serverErrors.clear();
+      notifyListeners();
+    }
+  }
+
+  /// Reset all state
+  void reset() {
+    _currentServerId = null;
+    _serverConnectionStates.clear();
+    _serverErrors.clear();
+    notifyListeners();
+  }
+}
diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart
index 61e98b6a..2f81d46d 100644
--- a/lib/providers/settings_provider.dart
+++ b/lib/providers/settings_provider.dart
@@ -2,91 +2,82 @@ import 'package:flutter/material.dart';
 import '../services/settings_service.dart';
 
 class SettingsProvider extends ChangeNotifier {
-  late SettingsService _settingsService;
+  SettingsService? _settingsService;
   LibraryDensity _libraryDensity = LibraryDensity.normal;
   ViewMode _viewMode = ViewMode.grid;
   bool _useSeasonPoster = false;
   bool _showHeroSection = true;
-  bool _shuffleUnwatchedOnly = true;
-  bool _shuffleOrderNavigation = true;
-  bool _shuffleLoopQueue = false;
+  bool _isInitialized = false;
 
   SettingsProvider() {
-    _initializeSettings();
+    // Don't initialize immediately if lazy-loaded
+    // _initializeSettings() will be called when first accessed
   }
 
   Future<void> _initializeSettings() async {
+    if (_isInitialized) return;
+
     _settingsService = await SettingsService.getInstance();
-    _libraryDensity = _settingsService.getLibraryDensity();
-    _viewMode = _settingsService.getViewMode();
-    _useSeasonPoster = _settingsService.getUseSeasonPoster();
-    _showHeroSection = _settingsService.getShowHeroSection();
-    _shuffleUnwatchedOnly = _settingsService.getShuffleUnwatchedOnly();
-    _shuffleOrderNavigation = _settingsService.getShuffleOrderNavigation();
-    _shuffleLoopQueue = _settingsService.getShuffleLoopQueue();
+    _libraryDensity = _settingsService!.getLibraryDensity();
+    _viewMode = _settingsService!.getViewMode();
+    _useSeasonPoster = _settingsService!.getUseSeasonPoster();
+    _showHeroSection = _settingsService!.getShowHeroSection();
+    _isInitialized = true;
     notifyListeners();
   }
 
-  LibraryDensity get libraryDensity => _libraryDensity;
-  ViewMode get viewMode => _viewMode;
-  bool get useSeasonPoster => _useSeasonPoster;
-  bool get showHeroSection => _showHeroSection;
-  bool get shuffleUnwatchedOnly => _shuffleUnwatchedOnly;
-  bool get shuffleOrderNavigation => _shuffleOrderNavigation;
-  bool get shuffleLoopQueue => _shuffleLoopQueue;
+  LibraryDensity get libraryDensity {
+    if (!_isInitialized) _initializeSettings();
+    return _libraryDensity;
+  }
+
+  ViewMode get viewMode {
+    if (!_isInitialized) _initializeSettings();
+    return _viewMode;
+  }
+
+  bool get useSeasonPoster {
+    if (!_isInitialized) _initializeSettings();
+    return _useSeasonPoster;
+  }
+
+  bool get showHeroSection {
+    if (!_isInitialized) _initializeSettings();
+    return _showHeroSection;
+  }
 
   Future<void> setLibraryDensity(LibraryDensity density) async {
+    if (!_isInitialized) await _initializeSettings();
     if (_libraryDensity != density) {
       _libraryDensity = density;
-      await _settingsService.setLibraryDensity(density);
+      await _settingsService!.setLibraryDensity(density);
       notifyListeners();
     }
   }
 
   Future<void> setViewMode(ViewMode mode) async {
+    if (!_isInitialized) await _initializeSettings();
     if (_viewMode != mode) {
       _viewMode = mode;
-      await _settingsService.setViewMode(mode);
+      await _settingsService!.setViewMode(mode);
       notifyListeners();
     }
   }
 
   Future<void> setUseSeasonPoster(bool value) async {
+    if (!_isInitialized) await _initializeSettings();
     if (_useSeasonPoster != value) {
       _useSeasonPoster = value;
-      await _settingsService.setUseSeasonPoster(value);
+      await _settingsService!.setUseSeasonPoster(value);
       notifyListeners();
     }
   }
 
   Future<void> setShowHeroSection(bool value) async {
+    if (!_isInitialized) await _initializeSettings();
     if (_showHeroSection != value) {
       _showHeroSection = value;
-      await _settingsService.setShowHeroSection(value);
-      notifyListeners();
-    }
-  }
-
-  Future<void> setShuffleUnwatchedOnly(bool value) async {
-    if (_shuffleUnwatchedOnly != value) {
-      _shuffleUnwatchedOnly = value;
-      await _settingsService.setShuffleUnwatchedOnly(value);
-      notifyListeners();
-    }
-  }
-
-  Future<void> setShuffleOrderNavigation(bool value) async {
-    if (_shuffleOrderNavigation != value) {
-      _shuffleOrderNavigation = value;
-      await _settingsService.setShuffleOrderNavigation(value);
-      notifyListeners();
-    }
-  }
-
-  Future<void> setShuffleLoopQueue(bool value) async {
-    if (_shuffleLoopQueue != value) {
-      _shuffleLoopQueue = value;
-      await _settingsService.setShuffleLoopQueue(value);
+      await _settingsService!.setShowHeroSection(value);
       notifyListeners();
     }
   }
diff --git a/lib/providers/theme_provider.dart b/lib/providers/theme_provider.dart
index b166daf4..34504ee5 100644
--- a/lib/providers/theme_provider.dart
+++ b/lib/providers/theme_provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import '../services/settings_service.dart' as settings;
 import '../theme/mono_theme.dart';
 
@@ -78,11 +79,11 @@ class ThemeProvider extends ChangeNotifier {
   IconData get themeModeIcon {
     switch (_themeMode) {
       case settings.ThemeMode.light:
-        return Icons.light_mode;
+        return Symbols.light_mode_rounded;
       case settings.ThemeMode.dark:
-        return Icons.dark_mode;
+        return Symbols.dark_mode_rounded;
       case settings.ThemeMode.system:
-        return Icons.brightness_auto;
+        return Symbols.brightness_auto_rounded;
     }
   }
 
diff --git a/lib/providers/user_profile_provider.dart b/lib/providers/user_profile_provider.dart
index 03ddca58..893c9c78 100644
--- a/lib/providers/user_profile_provider.dart
+++ b/lib/providers/user_profile_provider.dart
@@ -7,7 +7,7 @@ import '../services/plex_auth_service.dart';
 import '../services/storage_service.dart';
 import '../utils/app_logger.dart';
 import '../utils/provider_extensions.dart';
-import '../widgets/pin_entry_dialog.dart';
+import '../screens/profile/pin_entry_dialog.dart';
 import 'plex_client_provider.dart';
 
 class UserProfileProvider extends ChangeNotifier {
@@ -16,6 +16,7 @@ class UserProfileProvider extends ChangeNotifier {
   PlexUserProfile? _profileSettings;
   bool _isLoading = false;
   String? _error;
+  bool _isInitialized = false;
 
   PlexHome? get home => _home;
   PlexHomeUser? get currentUser => _currentUser;
@@ -34,22 +35,34 @@ class UserProfileProvider extends ChangeNotifier {
   StorageService? _storageService;
 
   // Callback for data invalidation when switching profiles
-  VoidCallback? _onDataInvalidationRequested;
+  // Receives the list of servers with new profile tokens for reconnection
+  Future<void> Function(List<PlexServer>)? _onDataInvalidationRequested;
 
   /// Set a callback to be called when profile switching requires data invalidation
-  void setDataInvalidationCallback(VoidCallback? callback) {
+  /// The callback receives the list of servers with the new profile's access tokens
+  void setDataInvalidationCallback(
+    Future<void> Function(List<PlexServer>)? callback,
+  ) {
     _onDataInvalidationRequested = callback;
   }
 
-  /// Trigger data invalidation for all screens
-  void _invalidateAllData() {
+  /// Trigger data invalidation for all screens with the new profile's servers
+  Future<void> _invalidateAllData(List<PlexServer> servers) async {
     if (_onDataInvalidationRequested != null) {
-      _onDataInvalidationRequested!();
-      appLogger.d('Data invalidation triggered for profile switch');
+      await _onDataInvalidationRequested!(servers);
+      appLogger.d(
+        'Data invalidation triggered for profile switch with ${servers.length} servers',
+      );
     }
   }
 
   Future<void> initialize() async {
+    // Prevent duplicate initialization
+    if (_isInitialized) {
+      appLogger.d('UserProfileProvider: Already initialized, skipping');
+      return;
+    }
+
     appLogger.d('UserProfileProvider: Initializing...');
     try {
       _authService = await PlexAuthService.create();
@@ -84,6 +97,7 @@ class UserProfileProvider extends ChangeNotifier {
         // Don't set error here, cached profile (if any) was already loaded
       }
 
+      _isInitialized = true;
       appLogger.d('UserProfileProvider: Initialization complete');
     } catch (e) {
       appLogger.e(
@@ -94,6 +108,7 @@ class UserProfileProvider extends ChangeNotifier {
       // Ensure services are null on failure
       _authService = null;
       _storageService = null;
+      _isInitialized = false; // Allow retry on failure
     }
   }
 
@@ -294,7 +309,7 @@ class UserProfileProvider extends ChangeNotifier {
       );
 
       // switchResponse.authToken is the new user's Plex.tv token
-      // We need to fetch servers with this token to get the proper server access token
+      // Fetch servers with this token to get the proper server access tokens
       appLogger.d('Got new user Plex.tv token, fetching servers...');
 
       final servers = await _authService!.fetchServers(
@@ -304,38 +319,14 @@ class UserProfileProvider extends ChangeNotifier {
         throw Exception('No servers available for this user');
       }
 
-      // Find the current server from storage
-      final currentServerData = _storageService!.getServerData();
-      if (currentServerData == null) {
-        throw Exception('No current server data found');
-      }
+      appLogger.d('Fetched ${servers.length} servers for new profile');
 
-      // Find matching server by name or client identifier
-      final currentServerName = currentServerData['name'] as String?;
-      final currentServerClientId =
-          currentServerData['clientIdentifier'] as String?;
-
-      final matchingServer = servers.firstWhere(
-        (server) =>
-            server.name == currentServerName ||
-            server.clientIdentifier == currentServerClientId,
-        orElse: () => servers.first, // Fallback to first server
-      );
-
-      appLogger.d(
-        'Found matching server: ${matchingServer.name}, getting access token',
-      );
-
-      // Update storage with new tokens
-      await _storageService!.updateCurrentUser(
-        user.uuid,
-        matchingServer
-            .accessToken, // Use server access token, not Plex.tv token
-      );
-
-      // Also save the new Plex.tv token for future profile operations
+      // Save the new Plex.tv token for future profile operations
       await _storageService!.savePlexToken(switchResponse.authToken);
 
+      // Update current user UUID in storage
+      await _storageService!.saveCurrentUserUUID(user.uuid);
+
       // Update current user
       _currentUser = user;
 
@@ -351,26 +342,14 @@ class UserProfileProvider extends ChangeNotifier {
         },
       );
 
-      // Update PlexClient with proper server access token
-      if (clientProvider != null) {
-        try {
-          clientProvider.updateToken(matchingServer.accessToken);
-          appLogger.d(
-            'Updated PlexClient with server access token for user: ${user.displayName}',
-          );
-        } catch (e) {
-          appLogger.w('Failed to update PlexClient token', error: e);
-        }
-      }
-
       notifyListeners();
 
-      // Invalidate all cached data for the new profile
-      // This will cause screens to refresh and rebuild widgets with the new token
-      _invalidateAllData();
+      // Invalidate all cached data and reconnect to all servers with new tokens
+      // The callback will handle server reconnection using the servers list
+      await _invalidateAllData(servers);
 
       appLogger.d(
-        'Profile switch complete, all data and images should refresh with new token',
+        'Profile switch complete, all servers reconnected with new tokens',
       );
 
       appLogger.i('Successfully switched to user: ${user.displayName}');
diff --git a/lib/screens/about_screen.dart b/lib/screens/about_screen.dart
deleted file mode 100644
index 640e3531..00000000
--- a/lib/screens/about_screen.dart
+++ /dev/null
@@ -1,102 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import '../widgets/desktop_app_bar.dart';
-import '../i18n/strings.g.dart';
-import 'licenses_screen.dart';
-
-class AboutScreen extends StatefulWidget {
-  const AboutScreen({super.key});
-
-  @override
-  State<AboutScreen> createState() => _AboutScreenState();
-}
-
-class _AboutScreenState extends State<AboutScreen> {
-  String _appName = '';
-  String _appVersion = '';
-
-  @override
-  void initState() {
-    super.initState();
-    _loadPackageInfo();
-  }
-
-  Future<void> _loadPackageInfo() async {
-    final packageInfo = await PackageInfo.fromPlatform();
-    setState(() {
-      _appName = t.app.title;
-      _appVersion = packageInfo.version;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final appName = _appName;
-    final appVersion = _appVersion;
-
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          CustomAppBar(title: Text(t.about.title), pinned: true),
-          SliverPadding(
-            padding: const EdgeInsets.all(16),
-            sliver: SliverList(
-              delegate: SliverChildListDelegate([
-                // App Icon and Name
-                Center(
-                  child: Column(
-                    children: [
-                      const SizedBox(height: 24),
-                      Image.asset('assets/plezy.png', width: 80, height: 80),
-                      const SizedBox(height: 16),
-                      Text(
-                        appName,
-                        style: Theme.of(context).textTheme.headlineMedium
-                            ?.copyWith(fontWeight: FontWeight.bold),
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        t.about.versionLabel(version: appVersion),
-                        style: Theme.of(
-                          context,
-                        ).textTheme.bodyMedium?.copyWith(color: Colors.grey),
-                      ),
-                      const SizedBox(height: 24),
-                      Text(
-                        t.about.appDescription,
-                        style: Theme.of(context).textTheme.bodyLarge,
-                        textAlign: TextAlign.center,
-                      ),
-                    ],
-                  ),
-                ),
-
-                const SizedBox(height: 40),
-
-                // Open Source Licenses
-                Card(
-                  child: ListTile(
-                    leading: const Icon(Icons.description),
-                    title: Text(t.about.openSourceLicenses),
-                    subtitle: Text(t.about.viewLicensesDescription),
-                    trailing: const Icon(Icons.chevron_right),
-                    onTap: () {
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                          builder: (context) => const LicensesScreen(),
-                        ),
-                      );
-                    },
-                  ),
-                ),
-
-                const SizedBox(height: 24),
-              ]),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index 93c67716..f377bd98 100644
--- a/lib/screens/auth_screen.dart
+++ b/lib/screens/auth_screen.dart
@@ -1,12 +1,17 @@
 import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import '../services/plex_auth_service.dart';
 import '../services/storage_service.dart';
+import '../services/server_registry.dart';
+import '../providers/multi_server_provider.dart';
+import '../providers/plex_client_provider.dart';
 import '../i18n/strings.g.dart';
-import 'server_selection_screen.dart';
+import '../utils/app_logger.dart';
+import 'main_screen.dart';
 
 class AuthScreen extends StatefulWidget {
   const AuthScreen({super.key});
@@ -33,6 +38,84 @@ class _AuthScreenState extends State<AuthScreen> {
     _authService = await PlexAuthService.create();
   }
 
+  /// Connect to all available servers and navigate to main screen
+  Future<void> _connectToAllServersAndNavigate(String plexToken) async {
+    if (!mounted) return;
+
+    setState(() {
+      _isAuthenticating = true;
+      _errorMessage = null;
+    });
+
+    try {
+      // Fetch user info and servers for this user
+      final userInfo = await _authService.getUserInfo(plexToken);
+      final username = userInfo['username'] as String? ?? '';
+      final email = userInfo['email'] as String? ?? '';
+
+      final servers = await _authService.fetchServers(plexToken);
+      final storage = await StorageService.getInstance();
+
+      if (servers.isEmpty) {
+        await storage.clearCredentials();
+        setState(() {
+          _isAuthenticating = false;
+          _errorMessage = t.serverSelection.noServersFoundForAccount(
+            username: username,
+            email: email,
+          );
+        });
+        return;
+      }
+
+      // Save all servers to registry and enable them
+      final registry = ServerRegistry(storage);
+      await registry.saveServers(servers);
+
+      // Enable all servers
+      final serverIds = servers.map((s) => s.clientIdentifier).toSet();
+      await registry.saveEnabledServerIds(serverIds);
+
+      // Connect to all servers
+      if (!mounted) return;
+      final multiServerProvider = context.read<MultiServerProvider>();
+      final connectedCount = await multiServerProvider.serverManager
+          .connectToAllServers(servers);
+
+      if (connectedCount == 0) {
+        setState(() {
+          _isAuthenticating = false;
+          _errorMessage = t.serverSelection.allServerConnectionsFailed;
+        });
+        return;
+      }
+
+      // Get the first connected client for backward compatibility
+      if (!mounted) return;
+      final firstClient =
+          multiServerProvider.serverManager.onlineClients.values.first;
+
+      // Set it as the legacy client
+      final plexClientProvider = context.read<PlexClientProvider>();
+      plexClientProvider.setClient(firstClient);
+
+      // Navigate to main screen
+      if (!mounted) return;
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(
+          builder: (context) => MainScreen(client: firstClient),
+        ),
+      );
+    } catch (e) {
+      appLogger.e('Failed to connect to servers', error: e);
+      setState(() {
+        _isAuthenticating = false;
+        _errorMessage = t.serverSelection.failedToLoadServers(error: e);
+      });
+    }
+  }
+
   Future<void> _startAuthentication() async {
     setState(() {
       _isAuthenticating = true;
@@ -100,23 +183,16 @@ class _AuthScreenState extends State<AuthScreen> {
       final storage = await StorageService.getInstance();
       await storage.savePlexToken(token);
 
-      // Navigate to server selection
-      if (mounted) {
-        Navigator.pushReplacement(
-          context,
-          MaterialPageRoute(
-            builder: (context) => ServerSelectionScreen(
-              authService: _authService,
-              plexToken: token,
-            ),
-          ),
-        );
-      }
       // Clear QR URL after successful auth
       setState(() {
         _qrAuthUrl = null;
         _useQrFlow = false;
       });
+
+      // Connect to all servers and navigate to main screen
+      if (mounted) {
+        await _connectToAllServersAndNavigate(token);
+      }
     } catch (e) {
       setState(() {
         _isAuthenticating = false;
@@ -197,17 +273,10 @@ class _AuthScreenState extends State<AuthScreen> {
                       final storage = await StorageService.getInstance();
                       await storage.savePlexToken(token);
 
-                      // Close dialog and navigate
+                      // Close dialog and connect to all servers
                       if (mounted) {
                         navigator.pop();
-                        navigator.pushReplacement(
-                          MaterialPageRoute(
-                            builder: (context) => ServerSelectionScreen(
-                              authService: _authService,
-                              plexToken: token,
-                            ),
-                          ),
-                        );
+                        await _connectToAllServersAndNavigate(token);
                       }
                     } catch (e) {
                       setDialogState(() {
@@ -268,57 +337,10 @@ class _AuthScreenState extends State<AuthScreen> {
                         crossAxisAlignment: CrossAxisAlignment.stretch,
                         children: [
                           if (_isAuthenticating) ...[
-                            if (_useQrFlow && _qrAuthUrl != null) ...[
-                              // QR code flow - hint text above QR code
-                              Text(
-                                t.auth.scanQRCodeInstruction,
-                                textAlign: TextAlign.center,
-                                style: const TextStyle(color: Colors.grey),
-                              ),
-                              const SizedBox(height: 24),
-                              Center(
-                                child: ClipRRect(
-                                  borderRadius: BorderRadius.circular(12),
-                                  child: QrImageView(
-                                    data: _qrAuthUrl!,
-                                    size: 300,
-                                    version: QrVersions.auto,
-                                    backgroundColor: Colors.white,
-                                  ),
-                                ),
-                              ),
-                              const SizedBox(height: 24),
-                              OutlinedButton(
-                                onPressed: _retryAuthentication,
-                                style: OutlinedButton.styleFrom(
-                                  padding: const EdgeInsets.symmetric(
-                                    vertical: 12,
-                                    horizontal: 24,
-                                  ),
-                                ),
-                                child: Text(t.auth.retry),
-                              ),
-                            ] else ...[
-                              // Browser auth flow - show spinner and waiting message
-                              const Center(child: CircularProgressIndicator()),
-                              const SizedBox(height: 16),
-                              Text(
-                                t.auth.waitingForAuth,
-                                textAlign: TextAlign.center,
-                                style: const TextStyle(color: Colors.grey),
-                              ),
-                              const SizedBox(height: 24),
-                              OutlinedButton(
-                                onPressed: _retryAuthentication,
-                                style: OutlinedButton.styleFrom(
-                                  padding: const EdgeInsets.symmetric(
-                                    vertical: 12,
-                                    horizontal: 24,
-                                  ),
-                                ),
-                                child: Text(t.auth.retry),
-                              ),
-                            ],
+                            if (_useQrFlow && _qrAuthUrl != null)
+                              _buildQrAuthWidget(qrSize: 300)
+                            else
+                              _buildBrowserAuthWidget(),
                           ] else ...[
                             // Initial state buttons
                             ElevatedButton(
@@ -394,24 +416,10 @@ class _AuthScreenState extends State<AuthScreen> {
                     ),
                     const SizedBox(height: 48),
                     if (_isAuthenticating) ...[
-                      const Center(child: CircularProgressIndicator()),
-                      const SizedBox(height: 16),
-                      Text(
-                        t.auth.waitingForAuth,
-                        textAlign: TextAlign.center,
-                        style: const TextStyle(color: Colors.grey),
-                      ),
-                      const SizedBox(height: 24),
-                      OutlinedButton(
-                        onPressed: _retryAuthentication,
-                        style: OutlinedButton.styleFrom(
-                          padding: const EdgeInsets.symmetric(
-                            vertical: 12,
-                            horizontal: 24,
-                          ),
-                        ),
-                        child: Text(t.auth.retry),
-                      ),
+                      if (_useQrFlow && _qrAuthUrl != null)
+                        _buildQrAuthWidget(qrSize: 200)
+                      else
+                        _buildBrowserAuthWidget(),
                     ] else ...[
                       // add QR button here
                       ElevatedButton(
@@ -469,4 +477,64 @@ class _AuthScreenState extends State<AuthScreen> {
       ),
     );
   }
+
+  Widget _buildRetryButton() {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const SizedBox(height: 24),
+        OutlinedButton(
+          onPressed: _retryAuthentication,
+          style: OutlinedButton.styleFrom(
+            padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 24),
+          ),
+          child: Text(t.auth.retry),
+        ),
+      ],
+    );
+  }
+
+  /// Builds the QR code authentication widget
+  Widget _buildQrAuthWidget({required double qrSize}) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          t.auth.scanQRCodeInstruction,
+          textAlign: TextAlign.center,
+          style: const TextStyle(color: Colors.grey),
+        ),
+        const SizedBox(height: 24),
+        Center(
+          child: ClipRRect(
+            borderRadius: BorderRadius.circular(12),
+            child: QrImageView(
+              data: _qrAuthUrl!,
+              size: qrSize,
+              version: QrVersions.auto,
+              backgroundColor: Colors.white,
+            ),
+          ),
+        ),
+        _buildRetryButton(),
+      ],
+    );
+  }
+
+  /// Builds the browser authentication waiting widget
+  Widget _buildBrowserAuthWidget() {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const Center(child: CircularProgressIndicator()),
+        const SizedBox(height: 16),
+        Text(
+          t.auth.waitingForAuth,
+          textAlign: TextAlign.center,
+          style: const TextStyle(color: Colors.grey),
+        ),
+        _buildRetryButton(),
+      ],
+    );
+  }
 }
diff --git a/lib/screens/base_media_list_detail_screen.dart b/lib/screens/base_media_list_detail_screen.dart
new file mode 100644
index 00000000..8f3f4ae9
--- /dev/null
+++ b/lib/screens/base_media_list_detail_screen.dart
@@ -0,0 +1,288 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import '../../services/plex_client.dart';
+import '../models/plex_metadata.dart';
+import '../providers/multi_server_provider.dart';
+import '../utils/provider_extensions.dart';
+import '../services/play_queue_launcher.dart';
+import '../models/plex_playlist.dart';
+import '../utils/app_logger.dart';
+import '../mixins/refreshable.dart';
+import '../mixins/item_updatable.dart';
+import '../i18n/strings.g.dart';
+
+/// Abstract base class for screens displaying media lists (collections/playlists)
+/// Provides common state management and playback functionality
+abstract class BaseMediaListDetailScreen<T extends StatefulWidget>
+    extends State<T>
+    with Refreshable, ItemUpdatable {
+  // State properties - concrete implementations to avoid duplication
+  List<PlexMetadata> items = [];
+  bool isLoading = false;
+  String? errorMessage;
+
+  @override
+  PlexClient get client => _getClientForMediaItem();
+
+  /// The media item being displayed (collection or playlist)
+  dynamic get mediaItem;
+
+  /// Title to display in app bar
+  String get title;
+
+  /// Message to show when list is empty
+  String get emptyMessage;
+
+  /// Optional icon to show when list is empty
+  IconData? get emptyIcon => null;
+
+  /// Get the correct PlexClient for this media item's server
+  PlexClient _getClientForMediaItem() {
+    // Try to get serverId from the media item
+    String? serverId;
+
+    // Check if mediaItem has serverId property
+    if (mediaItem is PlexMetadata) {
+      serverId = (mediaItem as PlexMetadata).serverId;
+    } else if (mediaItem != null) {
+      // For playlists or other types, use dynamic access
+      try {
+        final dynamic item = mediaItem;
+        serverId = item.serverId as String?;
+      } catch (_) {
+        // Ignore if serverId is not available
+      }
+    }
+
+    // If serverId is null, fall back to first available server
+    if (serverId == null) {
+      final multiServerProvider = Provider.of<MultiServerProvider>(
+        context,
+        listen: false,
+      );
+      if (!multiServerProvider.hasConnectedServers) {
+        throw Exception(t.errors.noClientAvailable);
+      }
+      serverId = multiServerProvider.onlineServerIds.first;
+    }
+
+    return context.getClientForServer(serverId);
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    loadItems();
+  }
+
+  /// Load or reload the items (subclasses implement this)
+  Future<void> loadItems();
+
+  /// Play all items in the list
+  Future<void> playItems() => _playWithShuffle(false);
+
+  /// Shuffle play all items in the list
+  Future<void> shufflePlayItems() => _playWithShuffle(true);
+
+  /// Internal helper to play items with optional shuffle
+  Future<void> _playWithShuffle(bool shuffle) async {
+    if (items.isEmpty) {
+      if (mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(emptyMessage)));
+      }
+      return;
+    }
+
+    final client = _getClientForMediaItem();
+    final item = mediaItem;
+
+    final launcher = PlayQueueLauncher(
+      context: context,
+      client: client,
+      serverId: item is PlexMetadata
+          ? item.serverId
+          : (item as PlexPlaylist).serverId,
+      serverName: item is PlexMetadata
+          ? item.serverName
+          : (item as PlexPlaylist).serverName,
+    );
+
+    await launcher.launchFromCollectionOrPlaylist(
+      item: item,
+      shuffle: shuffle,
+      showLoadingIndicator: false,
+    );
+  }
+
+  @override
+  void updateItemInLists(String ratingKey, PlexMetadata updatedMetadata) {
+    if (mounted) {
+      setState(() {
+        final index = items.indexWhere((item) => item.ratingKey == ratingKey);
+        if (index != -1) {
+          items[index] = updatedMetadata;
+        }
+      });
+    }
+  }
+
+  @override
+  void refresh() {
+    loadItems();
+  }
+
+  /// Build common error/loading/empty state slivers
+  /// Returns a list of slivers to display based on current state
+  List<Widget> buildStateSlivers() {
+    if (errorMessage != null) {
+      return [
+        SliverFillRemaining(
+          child: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const AppIcon(
+                  Symbols.error_outline_rounded,
+                  fill: 1,
+                  size: 48,
+                  color: Colors.red,
+                ),
+                const SizedBox(height: 16),
+                Text(errorMessage!),
+                const SizedBox(height: 16),
+                ElevatedButton(
+                  onPressed: loadItems,
+                  child: Text(t.common.retry),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ];
+    }
+
+    if (items.isEmpty && isLoading) {
+      return [
+        const SliverFillRemaining(
+          child: Center(child: CircularProgressIndicator()),
+        ),
+      ];
+    }
+
+    if (items.isEmpty) {
+      final icon = emptyIcon;
+      return [
+        SliverFillRemaining(
+          child: Center(
+            child: icon != null
+                ? Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      AppIcon(icon, fill: 1, size: 64, color: Colors.grey),
+                      const SizedBox(height: 16),
+                      Text(
+                        emptyMessage,
+                        style: const TextStyle(
+                          fontSize: 16,
+                          color: Colors.grey,
+                        ),
+                      ),
+                    ],
+                  )
+                : Text(emptyMessage),
+          ),
+        ),
+      ];
+    }
+
+    return [];
+  }
+
+  /// Build standard app bar actions (play, shuffle, delete)
+  /// Subclasses can override to customize actions
+  List<Widget> buildAppBarActions({
+    VoidCallback? onDelete,
+    String? deleteTooltip,
+    Color? deleteColor,
+    bool showDelete = true,
+  }) {
+    return [
+      // Play button
+      if (items.isNotEmpty)
+        IconButton(
+          icon: const AppIcon(Symbols.play_arrow_rounded, fill: 1),
+          tooltip: t.discover.play,
+          onPressed: playItems,
+        ),
+      // Shuffle button
+      if (items.isNotEmpty)
+        IconButton(
+          icon: const AppIcon(Symbols.shuffle_rounded, fill: 1),
+          tooltip: t.common.shuffle,
+          onPressed: shufflePlayItems,
+        ),
+      // Delete button
+      if (showDelete && onDelete != null)
+        IconButton(
+          icon: const AppIcon(Symbols.delete_rounded, fill: 1),
+          tooltip: deleteTooltip ?? t.common.delete,
+          onPressed: onDelete,
+          color: deleteColor ?? Colors.red,
+        ),
+    ];
+  }
+}
+
+/// Mixin that provides standard loadItems implementation for media lists
+/// Handles the common pattern of fetching, tagging, and setting items
+mixin StandardItemLoader<T extends StatefulWidget>
+    on BaseMediaListDetailScreen<T> {
+  /// Fetch items from the API (must be implemented by subclass)
+  Future<List<PlexMetadata>> fetchItems();
+
+  /// Get error message for failed load (can be overridden)
+  String getLoadErrorMessage(Object error) {
+    return 'Failed to load items: ${error.toString()}';
+  }
+
+  /// Get log message for successful load (can be overridden)
+  String getLoadSuccessMessage(int itemCount) {
+    return 'Loaded $itemCount items';
+  }
+
+  @override
+  Future<void> loadItems() async {
+    if (mounted) {
+      setState(() {
+        isLoading = true;
+        errorMessage = null;
+      });
+    }
+
+    try {
+      // Items are automatically tagged with server info by PlexClient
+      final newItems = await fetchItems();
+
+      if (mounted) {
+        setState(() {
+          items = newItems;
+          isLoading = false;
+        });
+      }
+
+      appLogger.d(getLoadSuccessMessage(newItems.length));
+    } catch (e) {
+      appLogger.e('Failed to load items', error: e);
+      if (mounted) {
+        setState(() {
+          errorMessage = getLoadErrorMessage(e);
+          isLoading = false;
+        });
+      }
+    }
+  }
+}
diff --git a/lib/screens/collection_detail_screen.dart b/lib/screens/collection_detail_screen.dart
new file mode 100644
index 00000000..a1add47b
--- /dev/null
+++ b/lib/screens/collection_detail_screen.dart
@@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+import '../models/plex_metadata.dart';
+import '../widgets/media_grid_sliver.dart';
+import '../widgets/focused_scroll_scaffold.dart';
+import '../i18n/strings.g.dart';
+import '../utils/dialogs.dart';
+import '../utils/app_logger.dart';
+import 'base_media_list_detail_screen.dart';
+
+/// Screen to display the contents of a collection
+class CollectionDetailScreen extends StatefulWidget {
+  final PlexMetadata collection;
+
+  const CollectionDetailScreen({super.key, required this.collection});
+
+  @override
+  State<CollectionDetailScreen> createState() => _CollectionDetailScreenState();
+}
+
+class _CollectionDetailScreenState
+    extends BaseMediaListDetailScreen<CollectionDetailScreen>
+    with StandardItemLoader<CollectionDetailScreen> {
+  @override
+  PlexMetadata get mediaItem => widget.collection;
+
+  @override
+  String get title => widget.collection.title;
+
+  @override
+  String get emptyMessage => t.collections.empty;
+
+  @override
+  Future<List<PlexMetadata>> fetchItems() async {
+    return await client.getCollectionItems(widget.collection.ratingKey);
+  }
+
+  @override
+  String getLoadErrorMessage(Object error) {
+    return t.collections.failedToLoadItems(error: error.toString());
+  }
+
+  @override
+  String getLoadSuccessMessage(int itemCount) {
+    return 'Loaded $itemCount items for collection: ${widget.collection.title}';
+  }
+
+  Future<void> _deleteCollection() async {
+    // Get library section ID from the collection or its items
+    int? sectionId = widget.collection.librarySectionID;
+
+    // If collection doesn't have it, try to get it from loaded items
+    if (sectionId == null && items.isNotEmpty) {
+      sectionId = items.first.librarySectionID;
+    }
+
+    if (sectionId == null) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(t.collections.unknownLibrarySection)),
+        );
+      }
+      return;
+    }
+
+    // Show confirmation dialog
+    final confirmed = await showDeleteConfirmation(
+      context,
+      title: t.collections.deleteCollection,
+      message: t.collections.deleteConfirm(title: widget.collection.title),
+    );
+
+    if (confirmed != true) return;
+    if (!mounted) return;
+
+    try {
+      final success = await client.deleteCollection(
+        sectionId.toString(),
+        widget.collection.ratingKey,
+      );
+
+      if (!mounted) return;
+
+      if (mounted) {
+        if (success) {
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text(t.collections.deleted)));
+          Navigator.pop(
+            context,
+            true,
+          ); // Return true to indicate refresh needed
+        } else {
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text(t.collections.deleteFailed)));
+        }
+      }
+    } catch (e) {
+      appLogger.e('Failed to delete collection', error: e);
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              t.collections.deleteFailedWithError(error: e.toString()),
+            ),
+          ),
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusedScrollScaffold(
+      title: Text(widget.collection.title),
+      actions: buildAppBarActions(onDelete: _deleteCollection),
+      slivers: [
+        ...buildStateSlivers(),
+        if (items.isNotEmpty)
+          MediaGridSliver(
+            items: items,
+            onRefresh: updateItem,
+            collectionId: widget.collection.ratingKey,
+            onListRefresh: loadItems,
+            padding: const EdgeInsets.fromLTRB(8, 8, 8, 8),
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/screens/discover_screen.dart b/lib/screens/discover_screen.dart
index 051e1d79..18d58036 100644
--- a/lib/screens/discover_screen.dart
+++ b/lib/screens/discover_screen.dart
@@ -1,20 +1,22 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import '../../services/plex_client.dart';
+import '../utils/plex_image_helper.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_hub.dart';
-import '../providers/plex_client_provider.dart';
-import '../services/storage_service.dart';
-import '../services/plex_auth_service.dart';
-import '../widgets/media_card.dart';
+import '../providers/multi_server_provider.dart';
+import '../providers/server_state_provider.dart';
+import '../providers/hidden_libraries_provider.dart';
+import '../providers/playback_state_provider.dart';
 import '../widgets/desktop_app_bar.dart';
-import '../widgets/user_avatar_widget.dart';
-import '../widgets/horizontal_scroll_with_arrows.dart';
-import 'profile_switch_screen.dart';
-import 'server_selection_screen.dart';
-import 'hub_detail_screen.dart';
+import 'profile/user_avatar_widget.dart';
+import '../widgets/hub_section.dart';
+import 'profile/profile_switch_screen.dart';
 import '../providers/user_profile_provider.dart';
 import '../providers/settings_provider.dart';
 import '../mixins/refreshable.dart';
@@ -24,6 +26,8 @@ import '../utils/app_logger.dart';
 import '../utils/provider_extensions.dart';
 import '../utils/video_player_navigation.dart';
 import '../utils/content_rating_formatter.dart';
+import '../utils/layout_constants.dart';
+import '../focus/dpad_navigator.dart';
 import 'auth_screen.dart';
 
 class DiscoverScreen extends StatefulWidget {
@@ -36,15 +40,27 @@ class DiscoverScreen extends StatefulWidget {
 }
 
 class _DiscoverScreenState extends State<DiscoverScreen>
-    with Refreshable, ItemUpdatable, SingleTickerProviderStateMixin {
+    with Refreshable, FullRefreshable, ItemUpdatable, SingleTickerProviderStateMixin {
   static const Duration _heroAutoScrollDuration = Duration(seconds: 8);
 
   @override
-  PlexClient get client => context.clientSafe;
+  PlexClient get client {
+    final multiServerProvider = Provider.of<MultiServerProvider>(
+      context,
+      listen: false,
+    );
+    if (!multiServerProvider.hasConnectedServers) {
+      throw Exception('No servers available');
+    }
+    return context.getClientForServer(
+      multiServerProvider.onlineServerIds.first,
+    );
+  }
 
   List<PlexMetadata> _onDeck = [];
   List<PlexHub> _hubs = [];
   bool _isLoading = true;
+  bool _areHubsLoading = true;
   String? _errorMessage;
   final PageController _heroController = PageController();
   final ScrollController _scrollController = ScrollController();
@@ -53,6 +69,99 @@ class _DiscoverScreenState extends State<DiscoverScreen>
   late AnimationController _indicatorAnimationController;
   bool _isAutoScrollPaused = false;
 
+  // Hub navigation keys
+  GlobalKey<HubSectionState>? _continueWatchingHubKey;
+  final List<GlobalKey<HubSectionState>> _hubKeys = [];
+
+  // Hero and app bar focus
+  late FocusNode _heroFocusNode;
+  late FocusNode _refreshButtonFocusNode;
+  late FocusNode _userButtonFocusNode;
+  bool _isRefreshFocused = false;
+  bool _isUserFocused = false;
+
+  /// Get the correct PlexClient for an item's server
+  PlexClient _getClientForItem(PlexMetadata? item) {
+    // Items should always have a serverId, but if not, fall back to first available server
+    final serverId = item?.serverId;
+    if (serverId == null) {
+      final multiServerProvider = Provider.of<MultiServerProvider>(
+        context,
+        listen: false,
+      );
+      if (!multiServerProvider.hasConnectedServers) {
+        throw Exception('No servers available');
+      }
+      return context.getClientForServer(
+        multiServerProvider.onlineServerIds.first,
+      );
+    }
+    return context.getClientForServer(serverId);
+  }
+
+  /// Update hub keys when hubs list changes
+  void _updateHubKeys() {
+    _hubKeys.clear();
+    for (int i = 0; i < _hubs.length; i++) {
+      _hubKeys.add(GlobalKey<HubSectionState>());
+    }
+    // Create continue watching hub key if needed
+    if (_onDeck.isNotEmpty) {
+      _continueWatchingHubKey ??= GlobalKey<HubSectionState>();
+    }
+  }
+
+  /// Get all hub states (continue watching + other hubs)
+  List<GlobalKey<HubSectionState>> get _allHubKeys {
+    final keys = <GlobalKey<HubSectionState>>[];
+    if (_continueWatchingHubKey != null && _onDeck.isNotEmpty) {
+      keys.add(_continueWatchingHubKey!);
+    }
+    keys.addAll(_hubKeys);
+    return keys;
+  }
+
+  /// Handle vertical navigation between hubs
+  /// Returns true if the navigation was handled
+  bool _handleVerticalNavigation(int hubIndex, bool isUp) {
+    final keys = _allHubKeys;
+    if (keys.isEmpty) return false;
+
+    // UP from first hub: Navigate to hero section
+    if (isUp && hubIndex == 0) {
+      _heroFocusNode.requestFocus();
+      // Scroll to top to show hero fully
+      _scrollController.animateTo(
+        0,
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeOut,
+      );
+      return true;
+    }
+
+    int targetIndex;
+    if (isUp) {
+      targetIndex = hubIndex - 1;
+    } else {
+      targetIndex = hubIndex + 1;
+    }
+
+    // Check if target is valid
+    if (targetIndex < 0 || targetIndex >= keys.length) {
+      // At boundary, block navigation (return true to consume the event)
+      return true;
+    }
+
+    // Navigate to target hub, clamping to available items
+    final targetState = keys[targetIndex].currentState;
+    if (targetState != null) {
+      targetState.requestFocusFromMemory();
+      return true;
+    }
+
+    return false;
+  }
+
   @override
   void initState() {
     super.initState();
@@ -60,16 +169,167 @@ class _DiscoverScreenState extends State<DiscoverScreen>
       vsync: this,
       duration: _heroAutoScrollDuration,
     );
+    _heroFocusNode = FocusNode(debugLabel: 'hero_section');
+    _refreshButtonFocusNode = FocusNode(debugLabel: 'refresh_button');
+    _userButtonFocusNode = FocusNode(debugLabel: 'user_button');
+    _refreshButtonFocusNode.addListener(_onRefreshFocusChange);
+    _userButtonFocusNode.addListener(_onUserFocusChange);
     _loadContent();
     _startAutoScroll();
   }
 
+  void _onRefreshFocusChange() {
+    if (mounted) {
+      setState(() {
+        _isRefreshFocused = _refreshButtonFocusNode.hasFocus;
+      });
+    }
+  }
+
+  void _onUserFocusChange() {
+    if (mounted) {
+      setState(() {
+        _isUserFocused = _userButtonFocusNode.hasFocus;
+      });
+    }
+  }
+
+  /// Handle key events for the hero section
+  KeyEventResult _handleHeroKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    // DOWN: Move to first hub
+    if (key.isDownKey) {
+      final keys = _allHubKeys;
+      if (keys.isNotEmpty) {
+        keys.first.currentState?.requestFocusFromMemory();
+      }
+      return KeyEventResult.handled;
+    }
+
+    // UP: Move to app bar (refresh button)
+    if (key.isUpKey) {
+      _refreshButtonFocusNode.requestFocus();
+      return KeyEventResult.handled;
+    }
+
+    // LEFT: Navigate hero carousel to previous
+    if (key.isLeftKey) {
+      if (_currentHeroIndex > 0) {
+        _heroController.previousPage(
+          duration: const Duration(milliseconds: 300),
+          curve: Curves.easeInOut,
+        );
+      }
+      return KeyEventResult.handled;
+    }
+
+    // RIGHT: Navigate hero carousel to next
+    if (key.isRightKey) {
+      if (_currentHeroIndex < _onDeck.length - 1) {
+        _heroController.nextPage(
+          duration: const Duration(milliseconds: 300),
+          curve: Curves.easeInOut,
+        );
+      }
+      return KeyEventResult.handled;
+    }
+
+    // SELECT: Play current hero item
+    if (key.isSelectKey) {
+      if (_onDeck.isNotEmpty && _currentHeroIndex < _onDeck.length) {
+        navigateToVideoPlayer(context, metadata: _onDeck[_currentHeroIndex]);
+      }
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  /// Handle key events for the refresh button in app bar
+  KeyEventResult _handleRefreshKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    // DOWN: Return to hero
+    if (key.isDownKey) {
+      _heroFocusNode.requestFocus();
+      return KeyEventResult.handled;
+    }
+
+    // RIGHT: Move to user button
+    if (key.isRightKey) {
+      _userButtonFocusNode.requestFocus();
+      return KeyEventResult.handled;
+    }
+
+    // LEFT/UP: Block at boundary
+    if (key.isLeftKey || key.isUpKey) {
+      return KeyEventResult.handled;
+    }
+
+    // SELECT: Trigger refresh
+    if (key.isSelectKey) {
+      _loadContent();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  /// Handle key events for the user button in app bar
+  KeyEventResult _handleUserKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    // DOWN: Return to hero
+    if (key.isDownKey) {
+      _heroFocusNode.requestFocus();
+      return KeyEventResult.handled;
+    }
+
+    // LEFT: Move to refresh button
+    if (key.isLeftKey) {
+      _refreshButtonFocusNode.requestFocus();
+      return KeyEventResult.handled;
+    }
+
+    // RIGHT/UP: Block at boundary
+    if (key.isRightKey || key.isUpKey) {
+      return KeyEventResult.handled;
+    }
+
+    // SELECT: Show user menu
+    if (key.isSelectKey) {
+      final userProvider = context.read<UserProfileProvider>();
+      _showUserMenu(context, userProvider);
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
   @override
   void dispose() {
     _autoScrollTimer?.cancel();
     _heroController.dispose();
     _scrollController.dispose();
     _indicatorAnimationController.dispose();
+    _heroFocusNode.dispose();
+    _refreshButtonFocusNode.removeListener(_onRefreshFocusChange);
+    _refreshButtonFocusNode.dispose();
+    _userButtonFocusNode.removeListener(_onUserFocusChange);
+    _userButtonFocusNode.dispose();
     super.dispose();
   }
 
@@ -160,78 +420,97 @@ class _DiscoverScreenState extends State<DiscoverScreen>
   }
 
   Future<void> _loadContent() async {
-    appLogger.d('Loading discover content');
+    appLogger.d('Loading discover content from all servers');
     setState(() {
       _isLoading = true;
+      _areHubsLoading = true;
       _errorMessage = null;
     });
 
     try {
-      appLogger.d('Fetching onDeck and hubs from Plex');
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
-      }
-
-      final onDeck = await client.getOnDeck();
-
-      // Load hubs from all libraries
-      final libraries = await client.getLibraries();
-      final allHubs = <PlexHub>[];
-
-      for (final library in libraries) {
-        // Skip libraries that are not movie/show or are hidden
-        if (library.type != 'movie' && library.type != 'show') continue;
-        if (library.hidden != 0) continue;
-
-        try {
-          final libraryHubs = await client.getLibraryHubs(
-            library.key,
-            limit: 12,
-          );
-          // Filter out duplicate hubs that we already fetch separately
-          final filteredHubs = libraryHubs.where((hub) {
-            final hubId = hub.hubIdentifier?.toLowerCase() ?? '';
-            final title = hub.title.toLowerCase();
-            // Skip "Continue Watching" and "On Deck" hubs (we handle these separately)
-            return !hubId.contains('ondeck') &&
-                !hubId.contains('continue') &&
-                !title.contains('continue watching') &&
-                !title.contains('on deck');
-          }).toList();
-          allHubs.addAll(filteredHubs);
-        } catch (e) {
-          appLogger.w(
-            'Failed to load hubs for library ${library.title}',
-            error: e,
-          );
-        }
-      }
-
-      appLogger.d(
-        'Received ${onDeck.length} on deck items and ${allHubs.length} hubs',
+      appLogger.d('Fetching onDeck and hubs from all Plex servers');
+      final multiServerProvider = Provider.of<MultiServerProvider>(
+        context,
+        listen: false,
       );
+
+      if (!multiServerProvider.hasConnectedServers) {
+        throw Exception('No servers available');
+      }
+
+      // Start OnDeck and libraries fetch in parallel
+      final onDeckFuture = multiServerProvider.aggregationService
+          .getOnDeckFromAllServers(limit: 20);
+      final librariesFuture = multiServerProvider.aggregationService
+          .getLibrariesFromAllServersGrouped();
+
+      // Wait for OnDeck to complete and show it immediately
+      final onDeck = await onDeckFuture;
+
       setState(() {
         _onDeck = onDeck;
-        _hubs = allHubs;
-        _isLoading = false;
+        _isLoading = false; // Show content, but hubs still loading
 
         // Reset hero index to avoid sync issues
         _currentHeroIndex = 0;
+
+        // Create continue watching hub key if needed
+        if (_onDeck.isNotEmpty) {
+          _continueWatchingHubKey ??= GlobalKey<HubSectionState>();
+        }
       });
 
-      // Sync PageController to first page after data loads
+      // Sync PageController to first page after OnDeck loads
       if (_heroController.hasClients && onDeck.isNotEmpty) {
         _heroController.jumpToPage(0);
       }
 
+      // Wait for libraries and then fetch hubs
+      final librariesByServer = await librariesFuture;
+
+      if (!mounted) return;
+
+      // Get hidden libraries to filter from hubs
+      final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
+        context,
+        listen: false,
+      );
+
+      // Fetch hubs using the pre-fetched libraries and hidden keys
+      final allHubs = await multiServerProvider.aggregationService
+          .getHubsFromAllServers(
+            librariesByServer: librariesByServer,
+            hiddenLibraryKeys: hiddenLibrariesProvider.hiddenLibraryKeys,
+          );
+
+      // Filter out duplicate hubs that we already fetch separately
+      final filteredHubs = allHubs.where((hub) {
+        final hubId = hub.hubIdentifier?.toLowerCase() ?? '';
+        final title = hub.title.toLowerCase();
+        // Skip "Continue Watching" and "On Deck" hubs (we handle these separately)
+        return !hubId.contains('ondeck') &&
+            !hubId.contains('continue') &&
+            !title.contains('continue watching') &&
+            !title.contains('on deck');
+      }).toList();
+
+      appLogger.d(
+        'Received ${onDeck.length} on deck items and ${filteredHubs.length} hubs from all servers',
+      );
+      if (!mounted) return;
+      setState(() {
+        _hubs = filteredHubs;
+        _areHubsLoading = false;
+        _updateHubKeys();
+      });
+
       appLogger.d('Discover content loaded successfully');
     } catch (e) {
       appLogger.e('Failed to load discover content', error: e);
       setState(() {
         _errorMessage = 'Failed to load content: $e';
         _isLoading = false;
+        _areHubsLoading = false;
       });
     }
   }
@@ -239,17 +518,17 @@ class _DiscoverScreenState extends State<DiscoverScreen>
   /// Refresh only the Continue Watching section in the background
   /// This is called when returning to the home screen to avoid blocking UI
   Future<void> _refreshContinueWatching() async {
-    appLogger.d('Refreshing Continue Watching in background');
+    appLogger.d('Refreshing Continue Watching in background from all servers');
 
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        appLogger.w('No client available for background refresh');
+      final multiServerProvider = context.read<MultiServerProvider>();
+      if (!multiServerProvider.hasConnectedServers) {
+        appLogger.w('No servers available for background refresh');
         return;
       }
 
-      final onDeck = await client.getOnDeck();
+      final onDeck = await multiServerProvider.aggregationService
+          .getOnDeckFromAllServers(limit: 20);
 
       if (mounted) {
         setState(() {
@@ -279,6 +558,7 @@ class _DiscoverScreenState extends State<DiscoverScreen>
   }
 
   // Public method to fully reload all content (for profile switches)
+  @override
   void fullRefresh() {
     appLogger.d('DiscoverScreen.fullRefresh() called - reloading all content');
     // Reload all content including On Deck and content hubs
@@ -291,98 +571,98 @@ class _DiscoverScreenState extends State<DiscoverScreen>
 
     // Trending/Popular content
     if (lowerTitle.contains('trending')) {
-      return Icons.trending_up;
+      return Symbols.trending_up_rounded;
     }
     if (lowerTitle.contains('popular') || lowerTitle.contains('imdb')) {
-      return Icons.whatshot;
+      return Symbols.whatshot_rounded;
     }
 
     // Seasonal/Time-based
     if (lowerTitle.contains('seasonal')) {
-      return Icons.calendar_month;
+      return Symbols.calendar_month_rounded;
     }
     if (lowerTitle.contains('newly') || lowerTitle.contains('new release')) {
-      return Icons.new_releases;
+      return Symbols.new_releases_rounded;
     }
     if (lowerTitle.contains('recently released') ||
         lowerTitle.contains('recent')) {
-      return Icons.schedule;
+      return Symbols.schedule_rounded;
     }
 
     // Top/Rated content
     if (lowerTitle.contains('top rated') ||
         lowerTitle.contains('highest rated')) {
-      return Icons.star;
+      return Symbols.star_rounded;
     }
     if (lowerTitle.contains('top ')) {
-      return Icons.military_tech;
+      return Symbols.military_tech_rounded;
     }
 
     // Genre-specific
     if (lowerTitle.contains('thriller')) {
-      return Icons.warning_amber_rounded;
+      return Symbols.warning_amber_rounded;
     }
     if (lowerTitle.contains('comedy') || lowerTitle.contains('comedier')) {
-      return Icons.mood;
+      return Symbols.mood_rounded;
     }
     if (lowerTitle.contains('action')) {
-      return Icons.flash_on;
+      return Symbols.flash_on_rounded;
     }
     if (lowerTitle.contains('drama')) {
-      return Icons.theater_comedy;
+      return Symbols.theater_comedy_rounded;
     }
     if (lowerTitle.contains('fantasy')) {
-      return Icons.auto_fix_high;
+      return Symbols.auto_fix_high_rounded;
     }
     if (lowerTitle.contains('science') || lowerTitle.contains('sci-fi')) {
-      return Icons.rocket_launch;
+      return Symbols.rocket_launch_rounded;
     }
     if (lowerTitle.contains('horror') || lowerTitle.contains('skräck')) {
-      return Icons.nights_stay;
+      return Symbols.nights_stay_rounded;
     }
     if (lowerTitle.contains('romance') || lowerTitle.contains('romantic')) {
-      return Icons.favorite_border;
+      return Symbols.favorite_border_rounded;
     }
     if (lowerTitle.contains('adventure') || lowerTitle.contains('äventyr')) {
-      return Icons.explore;
+      return Symbols.explore_rounded;
     }
 
     // Watchlist/Playlists
     if (lowerTitle.contains('playlist') || lowerTitle.contains('watchlist')) {
-      return Icons.playlist_play;
+      return Symbols.playlist_play_rounded;
     }
     if (lowerTitle.contains('unwatched') || lowerTitle.contains('unplayed')) {
-      return Icons.visibility_off;
+      return Symbols.visibility_off_rounded;
     }
     if (lowerTitle.contains('watched') || lowerTitle.contains('played')) {
-      return Icons.visibility;
+      return Symbols.visibility_rounded;
     }
 
     // Network/Studio
     if (lowerTitle.contains('network') || lowerTitle.contains('more from')) {
-      return Icons.tv;
+      return Symbols.tv_rounded;
     }
 
     // Actor/Director
     if (lowerTitle.contains('actor') || lowerTitle.contains('director')) {
-      return Icons.person;
+      return Symbols.person_rounded;
     }
 
     // Year-based (80s, 90s, etc.)
     if (lowerTitle.contains('80') ||
         lowerTitle.contains('90') ||
         lowerTitle.contains('00')) {
-      return Icons.history;
+      return Symbols.history_rounded;
     }
 
     // Rediscover/Start Watching
     if (lowerTitle.contains('rediscover') ||
         lowerTitle.contains('start watching')) {
-      return Icons.play_arrow;
+      return Symbols.play_arrow_rounded;
     }
 
     // Default icon for other hubs
-    return Icons.auto_awesome;
+    return Symbols.auto_awesome_rounded;
   }
 
   @override
@@ -406,43 +686,6 @@ class _DiscoverScreenState extends State<DiscoverScreen>
     }
   }
 
-  Future<void> _handleSwitchServer() async {
-    final storage = await StorageService.getInstance();
-    final plexToken = storage.getPlexToken();
-
-    if (plexToken == null) {
-      if (mounted) {
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text(t.messages.noPlexToken)));
-      }
-      return;
-    }
-
-    try {
-      final authService = await PlexAuthService.create();
-
-      // Navigate to server selection screen
-      if (mounted) {
-        Navigator.push(
-          context,
-          MaterialPageRoute(
-            builder: (context) => ServerSelectionScreen(
-              authService: authService,
-              plexToken: plexToken,
-            ),
-          ),
-        );
-      }
-    } catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(t.messages.errorLoading(error: e.toString()))),
-        );
-      }
-    }
-  }
-
   Future<void> _handleLogout() async {
     final confirm = await showDialog<bool>(
       context: context,
@@ -468,14 +711,19 @@ class _DiscoverScreenState extends State<DiscoverScreen>
         context,
         listen: false,
       );
-      final plexClientProvider = Provider.of<PlexClientProvider>(
-        context,
-        listen: false,
-      );
+      final plexClientProvider = context.plexClient;
+      final multiServerProvider = context.read<MultiServerProvider>();
+      final serverStateProvider = context.read<ServerStateProvider>();
+      final hiddenLibrariesProvider = context.read<HiddenLibrariesProvider>();
+      final playbackStateProvider = context.read<PlaybackStateProvider>();
 
       // Clear all user data and provider states
       await userProfileProvider.logout();
       plexClientProvider.clearClient();
+      multiServerProvider.clearAllConnections();
+      serverStateProvider.reset();
+      await hiddenLibrariesProvider.refresh();
+      playbackStateProvider.clearShuffle();
 
       if (mounted) {
         Navigator.of(context).pushAndRemoveUntil(
@@ -493,6 +741,61 @@ class _DiscoverScreenState extends State<DiscoverScreen>
     );
   }
 
+  /// Show user menu programmatically (for D-pad select)
+  void _showUserMenu(BuildContext context, UserProfileProvider userProvider) {
+    final RenderBox? button =
+        _userButtonFocusNode.context?.findRenderObject() as RenderBox?;
+    if (button == null) return;
+
+    final RenderBox overlay =
+        Navigator.of(context).overlay!.context.findRenderObject() as RenderBox;
+    final position = RelativeRect.fromRect(
+      Rect.fromPoints(
+        button.localToGlobal(Offset.zero, ancestor: overlay),
+        button.localToGlobal(
+          button.size.bottomRight(Offset.zero),
+          ancestor: overlay,
+        ),
+      ),
+      Offset.zero & overlay.size,
+    );
+
+    showMenu<String>(
+      context: context,
+      position: position,
+      items: [
+        if (userProvider.hasMultipleUsers)
+          PopupMenuItem(
+            value: 'switch_profile',
+            child: Row(
+              children: [
+                AppIcon(Symbols.people_rounded, fill: 1),
+                SizedBox(width: 8),
+                Text(t.discover.switchProfile),
+              ],
+            ),
+          ),
+        PopupMenuItem(
+          value: 'logout',
+          child: Row(
+            children: [
+              AppIcon(Symbols.logout_rounded, fill: 1),
+              SizedBox(width: 8),
+              Text(t.discover.logout),
+            ],
+          ),
+        ),
+      ],
+    ).then((value) {
+      if (!context.mounted) return;
+      if (value == 'switch_profile') {
+        _handleSwitchProfile(context);
+      } else if (value == 'logout') {
+        _handleLogout();
+      }
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -509,63 +812,83 @@ class _DiscoverScreenState extends State<DiscoverScreen>
               shadowColor: Colors.transparent,
               scrolledUnderElevation: 0,
               actions: [
-                IconButton(
-                  icon: const Icon(Icons.refresh),
-                  onPressed: _loadContent,
+                Focus(
+                  focusNode: _refreshButtonFocusNode,
+                  onKeyEvent: _handleRefreshKeyEvent,
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: _isRefreshFocused
+                          ? Theme.of(
+                              context,
+                            ).colorScheme.onSurface.withValues(alpha: 0.08)
+                          : Colors.transparent,
+                      borderRadius: BorderRadius.circular(20),
+                    ),
+                    child: IconButton(
+                      icon: const AppIcon(Symbols.refresh_rounded, fill: 1),
+                      onPressed: _loadContent,
+                    ),
+                  ),
                 ),
                 Consumer<UserProfileProvider>(
                   builder: (context, userProvider, child) {
-                    return PopupMenuButton<String>(
-                      icon: userProvider.currentUser?.thumb != null
-                          ? UserAvatarWidget(
-                              user: userProvider.currentUser!,
-                              size: 32,
-                              showIndicators: false,
-                            )
-                          : const Icon(Icons.account_circle, size: 32),
-                      onSelected: (value) {
-                        if (value == 'switch_profile') {
-                          _handleSwitchProfile(context);
-                        } else if (value == 'switch_server') {
-                          _handleSwitchServer();
-                        } else if (value == 'logout') {
-                          _handleLogout();
-                        }
-                      },
-                      itemBuilder: (context) => [
-                        // Only show Switch Profile if multiple users available
-                        if (userProvider.hasMultipleUsers)
-                          PopupMenuItem(
-                            value: 'switch_profile',
-                            child: Row(
-                              children: [
-                                Icon(Icons.people),
-                                SizedBox(width: 8),
-                                Text(t.discover.switchProfile),
-                              ],
+                    return Focus(
+                      focusNode: _userButtonFocusNode,
+                      onKeyEvent: _handleUserKeyEvent,
+                      child: DecoratedBox(
+                        decoration: BoxDecoration(
+                          color: _isUserFocused
+                              ? Theme.of(
+                                  context,
+                                ).colorScheme.onSurface.withValues(alpha: 0.08)
+                              : Colors.transparent,
+                          borderRadius: BorderRadius.circular(20),
+                        ),
+                        child: PopupMenuButton<String>(
+                          icon: userProvider.currentUser?.thumb != null
+                              ? UserAvatarWidget(
+                                  user: userProvider.currentUser!,
+                                  size: 32,
+                                  showIndicators: false,
+                                )
+                              : const AppIcon(
+                                  Symbols.account_circle_rounded,
+                                  fill: 1,
+                                  size: 32,
+                                ),
+                          onSelected: (value) {
+                            if (value == 'switch_profile') {
+                              _handleSwitchProfile(context);
+                            } else if (value == 'logout') {
+                              _handleLogout();
+                            }
+                          },
+                          itemBuilder: (context) => [
+                            // Only show Switch Profile if multiple users available
+                            if (userProvider.hasMultipleUsers)
+                              PopupMenuItem(
+                                value: 'switch_profile',
+                                child: Row(
+                                  children: [
+                                    AppIcon(Symbols.people_rounded, fill: 1),
+                                    SizedBox(width: 8),
+                                    Text(t.discover.switchProfile),
+                                  ],
+                                ),
+                              ),
+                            PopupMenuItem(
+                              value: 'logout',
+                              child: Row(
+                                children: [
+                                  AppIcon(Symbols.logout_rounded, fill: 1),
+                                  SizedBox(width: 8),
+                                  Text(t.discover.logout),
+                                ],
+                              ),
                             ),
-                          ),
-                        PopupMenuItem(
-                          value: 'switch_server',
-                          child: Row(
-                            children: [
-                              Icon(Icons.swap_horiz),
-                              SizedBox(width: 8),
-                              Text(t.discover.switchServer),
-                            ],
-                          ),
+                          ],
                         ),
-                        PopupMenuItem(
-                          value: 'logout',
-                          child: Row(
-                            children: [
-                              Icon(Icons.logout),
-                              SizedBox(width: 8),
-                              Text(t.discover.logout),
-                            ],
-                          ),
-                        ),
-                      ],
+                      ),
                     );
                   },
                 ),
@@ -581,8 +904,9 @@ class _DiscoverScreenState extends State<DiscoverScreen>
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      const Icon(
-                        Icons.error_outline,
+                      const AppIcon(
+                        Symbols.error_outline_rounded,
+                        fill: 1,
                         size: 48,
                         color: Colors.red,
                       ),
@@ -609,76 +933,99 @@ class _DiscoverScreenState extends State<DiscoverScreen>
               ),
 
               // On Deck / Continue Watching
-              if (_onDeck.isNotEmpty) ...[
+              if (_onDeck.isNotEmpty)
                 SliverToBoxAdapter(
-                  child: Padding(
-                    padding: const EdgeInsets.fromLTRB(16, 24, 16, 8),
-                    child: Row(
-                      children: [
-                        const Icon(Icons.play_circle_outline),
-                        const SizedBox(width: 8),
-                        Text(
-                          t.discover.continueWatching,
-                          style: Theme.of(context).textTheme.titleLarge,
-                        ),
-                      ],
+                  child: HubSection(
+                    key: _continueWatchingHubKey,
+                    hub: PlexHub(
+                      hubKey: 'continue_watching',
+                      title: t.discover.continueWatching,
+                      type: 'mixed',
+                      hubIdentifier: '_continue_watching_',
+                      size: _onDeck.length,
+                      more: false,
+                      items: _onDeck,
+                    ),
+                    icon: Symbols.play_circle_rounded,
+                    onRefresh: updateItem,
+                    onRemoveFromContinueWatching: _refreshContinueWatching,
+                    isInContinueWatching: true,
+                    onVerticalNavigation: (isUp) =>
+                        _handleVerticalNavigation(0, isUp),
+                  ),
+                ),
+
+              // Recommendation Hubs (Trending, Top in Genre, etc.)
+              for (int i = 0; i < _hubs.length; i++)
+                SliverToBoxAdapter(
+                  child: HubSection(
+                    key: i < _hubKeys.length ? _hubKeys[i] : null,
+                    hub: _hubs[i],
+                    icon: _getHubIcon(_hubs[i].title),
+                    onRefresh: updateItem,
+                    // Hub index is i + 1 if continue watching exists, otherwise i
+                    onVerticalNavigation: (isUp) => _handleVerticalNavigation(
+                      _onDeck.isNotEmpty ? i + 1 : i,
+                      isUp,
                     ),
                   ),
                 ),
-                _buildHorizontalList(
-                  _onDeck,
-                  isLarge: false,
-                  isInContinueWatching: true,
-                ),
-              ],
 
-              // Recommendation Hubs (Trending, Top in Genre, etc.)
-              for (final hub in _hubs) ...[
-                SliverToBoxAdapter(
-                  child: Padding(
-                    padding: const EdgeInsets.fromLTRB(16, 24, 16, 8),
-                    child: InkWell(
-                      onTap: () {
-                        Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (context) => HubDetailScreen(hub: hub),
-                          ),
-                        );
-                      },
-                      borderRadius: BorderRadius.circular(8),
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 8,
-                          vertical: 4,
-                        ),
-                        child: Row(
-                          children: [
-                            Icon(_getHubIcon(hub.title)),
-                            const SizedBox(width: 8),
-                            Text(
-                              hub.title,
-                              style: Theme.of(context).textTheme.titleLarge,
+              // Show loading skeleton for hubs while they're loading
+              if (_areHubsLoading && _hubs.isEmpty)
+                for (int i = 0; i < 3; i++)
+                  SliverToBoxAdapter(
+                    child: Container(
+                      padding: const EdgeInsets.all(16),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          // Hub title skeleton
+                          Container(
+                            width: 200,
+                            height: 24,
+                            decoration: BoxDecoration(
+                              color: Theme.of(
+                                context,
+                              ).colorScheme.surfaceContainerHighest,
+                              borderRadius: BorderRadius.circular(4),
                             ),
-                            const SizedBox(width: 4),
-                            const Icon(Icons.chevron_right, size: 20),
-                          ],
-                        ),
+                          ),
+                          const SizedBox(height: 16),
+                          // Hub items skeleton
+                          SizedBox(
+                            height: 200,
+                            child: ListView.builder(
+                              scrollDirection: Axis.horizontal,
+                              itemCount: 5,
+                              itemBuilder: (context, index) {
+                                return Container(
+                                  margin: const EdgeInsets.only(right: 12),
+                                  width: 140,
+                                  decoration: BoxDecoration(
+                                    color: Theme.of(
+                                      context,
+                                    ).colorScheme.surfaceContainerHighest,
+                                    borderRadius: BorderRadius.circular(8),
+                                  ),
+                                );
+                              },
+                            ),
+                          ),
+                        ],
                       ),
                     ),
                   ),
-                ),
-                _buildHorizontalList(hub.items, isLarge: false),
-              ],
 
-              if (_onDeck.isEmpty && _hubs.isEmpty)
+              if (_onDeck.isEmpty && _hubs.isEmpty && !_areHubsLoading)
                 SliverFillRemaining(
                   child: Center(
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        Icon(
-                          Icons.movie_outlined,
+                        AppIcon(
+                          Symbols.movie_rounded,
+                          fill: 1,
                           size: 64,
                           color: Colors.grey,
                         ),
@@ -704,125 +1051,136 @@ class _DiscoverScreenState extends State<DiscoverScreen>
 
   Widget _buildHeroSection() {
     return SliverToBoxAdapter(
-      child: SizedBox(
-        height: 500,
-        child: Stack(
-          children: [
-            PageView.builder(
-              controller: _heroController,
-              itemCount: _onDeck.length,
-              onPageChanged: (index) {
-                // Validate index is within bounds before updating
-                if (index >= 0 && index < _onDeck.length) {
-                  setState(() {
-                    _currentHeroIndex = index;
-                  });
-                  _resetAutoScrollTimer();
-                }
-              },
-              itemBuilder: (context, index) {
-                return _buildHeroItem(_onDeck[index]);
-              },
-            ),
-            // Page indicators with animated progress and pause/play button
-            Positioned(
-              bottom: 16,
-              left: -26,
-              right: 0,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  // Pause/Play button
-                  GestureDetector(
-                    onTap: () {
-                      if (_isAutoScrollPaused) {
-                        _resumeAutoScroll();
-                      } else {
-                        _pauseAutoScroll();
-                      }
-                    },
-                    child: Icon(
-                      _isAutoScrollPaused ? Icons.play_arrow : Icons.pause,
-                      color: Colors.white,
-                      size: 18,
-                      semanticLabel:
-                          '${_isAutoScrollPaused ? t.discover.play : t.discover.pause} auto-scroll',
+      child: Focus(
+        focusNode: _heroFocusNode,
+        autofocus: true,
+        onKeyEvent: _handleHeroKeyEvent,
+        child: SizedBox(
+          height: 500,
+          child: Stack(
+            children: [
+              PageView.builder(
+                controller: _heroController,
+                itemCount: _onDeck.length,
+                onPageChanged: (index) {
+                  // Validate index is within bounds before updating
+                  if (index >= 0 && index < _onDeck.length) {
+                    setState(() {
+                      _currentHeroIndex = index;
+                    });
+                    _resetAutoScrollTimer();
+                  }
+                },
+                itemBuilder: (context, index) {
+                  return _buildHeroItem(_onDeck[index]);
+                },
+              ),
+              // Page indicators with animated progress and pause/play button
+              Positioned(
+                bottom: 16,
+                left: -26,
+                right: 0,
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    // Pause/Play button
+                    GestureDetector(
+                      onTap: () {
+                        if (_isAutoScrollPaused) {
+                          _resumeAutoScroll();
+                        } else {
+                          _pauseAutoScroll();
+                        }
+                      },
+                      child: AppIcon(
+                        _isAutoScrollPaused
+                            ? Symbols.play_arrow_rounded
+                            : Symbols.pause_rounded,
+                        fill: 1,
+                        color: Colors.white,
+                        size: 18,
+                        semanticLabel:
+                            '${_isAutoScrollPaused ? t.discover.play : t.discover.pause} auto-scroll',
+                      ),
                     ),
-                  ),
-                  // Spacer to separate indicators from button
-                  const SizedBox(width: 8),
-                  // Page indicators (limited to 5 dots)
-                  ...() {
-                    final range = _getVisibleDotRange();
-                    return List.generate(range.end - range.start + 1, (i) {
-                      final index = range.start + i;
-                      final isActive = _currentHeroIndex == index;
-                      final dotSize = _getDotSize(
-                        index,
-                        range.start,
-                        range.end,
-                      );
+                    // Spacer to separate indicators from button
+                    const SizedBox(width: 8),
+                    // Page indicators (limited to 5 dots)
+                    ...() {
+                      final range = _getVisibleDotRange();
+                      return List.generate(range.end - range.start + 1, (i) {
+                        final index = range.start + i;
+                        final isActive = _currentHeroIndex == index;
+                        final dotSize = _getDotSize(
+                          index,
+                          range.start,
+                          range.end,
+                        );
 
-                      if (isActive) {
-                        // Animated progress indicator for active page
-                        return AnimatedBuilder(
-                          animation: _indicatorAnimationController,
-                          builder: (context, child) {
-                            // Fill width animates based on dot size
-                            final maxWidth =
-                                dotSize * 3; // 24px for normal, 15px for small
-                            final fillWidth =
-                                dotSize +
-                                ((maxWidth - dotSize) *
-                                    _indicatorAnimationController.value);
-                            return AnimatedContainer(
-                              duration: const Duration(milliseconds: 300),
-                              curve: Curves.easeInOut,
-                              margin: const EdgeInsets.symmetric(horizontal: 4),
-                              width: maxWidth,
-                              height: dotSize,
-                              decoration: BoxDecoration(
-                                color: Colors.white.withValues(alpha: 0.4),
-                                borderRadius: BorderRadius.circular(
-                                  dotSize / 2,
+                        if (isActive) {
+                          // Animated progress indicator for active page
+                          return AnimatedBuilder(
+                            animation: _indicatorAnimationController,
+                            builder: (context, child) {
+                              // Fill width animates based on dot size
+                              final maxWidth =
+                                  dotSize *
+                                  3; // 24px for normal, 15px for small
+                              final fillWidth =
+                                  dotSize +
+                                  ((maxWidth - dotSize) *
+                                      _indicatorAnimationController.value);
+                              return AnimatedContainer(
+                                duration: const Duration(milliseconds: 300),
+                                curve: Curves.easeInOut,
+                                margin: const EdgeInsets.symmetric(
+                                  horizontal: 4,
                                 ),
-                              ),
-                              child: Align(
-                                alignment: Alignment.centerLeft,
-                                child: Container(
-                                  width: fillWidth,
-                                  height: dotSize,
-                                  decoration: BoxDecoration(
-                                    color: Colors.white,
-                                    borderRadius: BorderRadius.circular(
-                                      dotSize / 2,
+                                width: maxWidth,
+                                height: dotSize,
+                                decoration: BoxDecoration(
+                                  color: Colors.white.withValues(alpha: 0.4),
+                                  borderRadius: BorderRadius.circular(
+                                    dotSize / 2,
+                                  ),
+                                ),
+                                child: Align(
+                                  alignment: Alignment.centerLeft,
+                                  child: Container(
+                                    width: fillWidth,
+                                    height: dotSize,
+                                    decoration: BoxDecoration(
+                                      color: Colors.white,
+                                      borderRadius: BorderRadius.circular(
+                                        dotSize / 2,
+                                      ),
                                     ),
                                   ),
                                 ),
-                              ),
-                            );
-                          },
-                        );
-                      } else {
-                        // Static indicator for inactive pages
-                        return AnimatedContainer(
-                          duration: const Duration(milliseconds: 300),
-                          curve: Curves.easeInOut,
-                          margin: const EdgeInsets.symmetric(horizontal: 4),
-                          width: dotSize,
-                          height: dotSize,
-                          decoration: BoxDecoration(
-                            color: Colors.white.withValues(alpha: 0.4),
-                            borderRadius: BorderRadius.circular(dotSize / 2),
-                          ),
-                        );
-                      }
-                    });
-                  }(),
-                ],
+                              );
+                            },
+                          );
+                        } else {
+                          // Static indicator for inactive pages
+                          return AnimatedContainer(
+                            duration: const Duration(milliseconds: 300),
+                            curve: Curves.easeInOut,
+                            margin: const EdgeInsets.symmetric(horizontal: 4),
+                            width: dotSize,
+                            height: dotSize,
+                            decoration: BoxDecoration(
+                              color: Colors.white.withValues(alpha: 0.4),
+                              borderRadius: BorderRadius.circular(dotSize / 2),
+                            ),
+                          );
+                        }
+                      });
+                    }(),
+                  ],
+                ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );
@@ -832,24 +1190,24 @@ class _DiscoverScreenState extends State<DiscoverScreen>
     final isEpisode = heroItem.type.toLowerCase() == 'episode';
     final showName = heroItem.grandparentTitle ?? heroItem.title;
     final screenWidth = MediaQuery.of(context).size.width;
-    final isLargeScreen = screenWidth > 800;
+    final isLargeScreen = ScreenBreakpoints.isWideTabletOrLarger(screenWidth);
 
     // Determine content type label for chip
     final contentTypeLabel = heroItem.type.toLowerCase() == 'movie'
         ? t.discover.movie
         : t.discover.tvShow;
 
+    // Build semantic label for hero item
+    final heroLabel = isEpisode
+        ? "${heroItem.grandparentTitle}, ${heroItem.title}"
+        : heroItem.title;
+
     return Semantics(
-      label: "media-hero-${heroItem.ratingKey}",
-      identifier: "media-hero-${heroItem.ratingKey}",
+      label: heroLabel,
       button: true,
-      hint: "Tap to play ${heroItem.title}",
+      hint: t.accessibility.tapToPlay,
       child: GestureDetector(
         onTap: () {
-          final clientProvider = context.plexClient;
-          final client = clientProvider.client;
-          if (client == null) return;
-
           appLogger.d('Navigating to VideoPlayerScreen for: ${heroItem.title}');
           navigateToVideoPlayer(context, metadata: heroItem);
         },
@@ -893,20 +1251,21 @@ class _DiscoverScreenState extends State<DiscoverScreen>
                           child: Opacity(opacity: value, child: child),
                         );
                       },
-                      child: Consumer<PlexClientProvider>(
-                        builder: (context, clientProvider, child) {
-                          final client = clientProvider.client;
-                          if (client == null) {
-                            return Container(
-                              color: Theme.of(
-                                context,
-                              ).colorScheme.surfaceContainerHighest,
-                            );
-                          }
+                      child: Builder(
+                        builder: (context) {
+                          final client = _getClientForItem(heroItem);
+                          final mediaQuery = MediaQuery.of(context);
+                          final imageUrl = PlexImageHelper.getOptimizedImageUrl(
+                            client: client,
+                            thumbPath: heroItem.art ?? heroItem.grandparentArt,
+                            maxWidth: mediaQuery.size.width,
+                            maxHeight: mediaQuery.size.height * 0.7,
+                            devicePixelRatio: mediaQuery.devicePixelRatio,
+                            imageType: ImageType.art,
+                          );
+
                           return CachedNetworkImage(
-                            imageUrl: client.getThumbnailUrl(
-                              heroItem.art ?? heroItem.grandparentArt,
-                            ),
+                            imageUrl: imageUrl,
                             fit: BoxFit.cover,
                             placeholder: (context, url) => Container(
                               color: Theme.of(
@@ -966,18 +1325,29 @@ class _DiscoverScreenState extends State<DiscoverScreen>
                           SizedBox(
                             height: 120,
                             width: 400,
-                            child: Consumer<PlexClientProvider>(
-                              builder: (context, clientProvider, child) {
-                                final client = clientProvider.client;
-                                if (client == null) {
-                                  return Container();
-                                }
+                            child: Builder(
+                              builder: (context) {
+                                final client = _getClientForItem(heroItem);
+                                final dpr = MediaQuery.of(
+                                  context,
+                                ).devicePixelRatio;
+                                final logoUrl =
+                                    PlexImageHelper.getOptimizedImageUrl(
+                                      client: client,
+                                      thumbPath: heroItem.clearLogo,
+                                      maxWidth: 400,
+                                      maxHeight: 120,
+                                      devicePixelRatio: dpr,
+                                      imageType: ImageType.logo,
+                                    );
+
                                 return CachedNetworkImage(
-                                  imageUrl: client.getThumbnailUrl(
-                                    heroItem.clearLogo,
-                                  ),
+                                  imageUrl: logoUrl,
                                   filterQuality: FilterQuality.medium,
                                   fit: BoxFit.contain,
+                                  memCacheWidth: (400 * dpr)
+                                      .clamp(200, 800)
+                                      .round(),
                                   alignment: isLargeScreen
                                       ? Alignment.bottomLeft
                                       : Alignment.bottomCenter,
@@ -1171,10 +1541,6 @@ class _DiscoverScreenState extends State<DiscoverScreen>
 
     return InkWell(
       onTap: () {
-        final clientProvider = context.plexClient;
-        final client = clientProvider.client;
-        if (client == null) return;
-
         appLogger.d('Playing: ${heroItem.title}');
         navigateToVideoPlayer(context, metadata: heroItem);
       },
@@ -1188,7 +1554,12 @@ class _DiscoverScreenState extends State<DiscoverScreen>
         child: Row(
           mainAxisSize: MainAxisSize.min,
           children: [
-            const Icon(Icons.play_arrow, size: 20, color: Colors.black),
+            const AppIcon(
+              Symbols.play_arrow_rounded,
+              fill: 1,
+              size: 20,
+              color: Colors.black,
+            ),
             const SizedBox(width: 8),
             if (hasProgress) ...[
               // Progress bar
@@ -1233,66 +1604,4 @@ class _DiscoverScreenState extends State<DiscoverScreen>
       ),
     );
   }
-
-  Widget _buildHorizontalList(
-    List<PlexMetadata> items, {
-    bool isLarge = false,
-    bool isInContinueWatching = false,
-  }) {
-    return SliverToBoxAdapter(
-      child: LayoutBuilder(
-        builder: (context, constraints) {
-          // Responsive card width based on screen size
-          // Match Libraries screen sizing (190px baseline)
-          final screenWidth = constraints.maxWidth;
-          final cardWidth = screenWidth > 1600
-              ? 220.0
-              : screenWidth > 1200
-              ? 200.0
-              : screenWidth > 800
-              ? 190.0
-              : 160.0;
-
-          // MediaCard has 8px padding on all sides (16px total horizontally)
-          // So actual poster width is cardWidth - 16
-          final posterWidth = cardWidth - 16;
-          // 2:3 poster aspect ratio (height is 1.5x width)
-          final posterHeight = posterWidth * 1.5;
-          // Container height = poster + padding + spacing + text
-          // 8px top padding + posterHeight + 4px spacing + ~26px text + 8px bottom padding
-          final containerHeight = posterHeight + 46;
-
-          return SizedBox(
-            height: containerHeight,
-            child: HorizontalScrollWithArrows(
-              builder: (scrollController) => ListView.builder(
-                controller: scrollController,
-                scrollDirection: Axis.horizontal,
-                padding: const EdgeInsets.symmetric(horizontal: 12),
-                itemCount: items.length,
-                itemBuilder: (context, index) {
-                  final item = items[index];
-                  return Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 2),
-                    child: MediaCard(
-                      key: Key(item.ratingKey),
-                      item: item,
-                      width: cardWidth,
-                      height: posterHeight,
-                      onRefresh: updateItem,
-                      onRemoveFromContinueWatching: isInContinueWatching
-                          ? _refreshContinueWatching
-                          : null,
-                      forceGridMode: true,
-                      isInContinueWatching: isInContinueWatching,
-                    ),
-                  );
-                },
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
 }
diff --git a/lib/screens/downloads/downloads_screen.dart b/lib/screens/downloads/downloads_screen.dart
new file mode 100644
index 00000000..9bc2c565
--- /dev/null
+++ b/lib/screens/downloads/downloads_screen.dart
@@ -0,0 +1,376 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import '../../models/plex_metadata.dart';
+import '../../providers/download_provider.dart';
+import '../../providers/multi_server_provider.dart';
+import '../../providers/settings_provider.dart';
+import '../../services/gamepad_service.dart';
+import '../../utils/platform_detector.dart';
+import '../../widgets/desktop_app_bar.dart';
+import '../../widgets/focusable_tab_chip.dart';
+import '../../widgets/focusable_media_card.dart';
+import '../../widgets/media_grid_delegate.dart';
+import '../../widgets/download_tree_view.dart';
+import '../main_screen.dart';
+import '../../i18n/strings.g.dart';
+
+class DownloadsScreen extends StatefulWidget {
+  const DownloadsScreen({super.key});
+
+  @override
+  State<DownloadsScreen> createState() => DownloadsScreenState();
+}
+
+class DownloadsScreenState extends State<DownloadsScreen>
+    with SingleTickerProviderStateMixin {
+  late TabController _tabController;
+
+  // Focus nodes for tab chips
+  final _queueTabChipFocusNode = FocusNode(debugLabel: 'tab_chip_queue');
+  final _tvShowsTabChipFocusNode = FocusNode(debugLabel: 'tab_chip_tv_shows');
+  final _moviesTabChipFocusNode = FocusNode(debugLabel: 'tab_chip_movies');
+
+  /// When true, suppress auto-focus in tabs (used when navigating via tab bar)
+  bool _suppressAutoFocus = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _tabController = TabController(length: 3, vsync: this);
+    _tabController.addListener(_onTabChanged);
+
+    // Register L1/R1 callbacks for tab navigation
+    GamepadService.onL1Pressed = _goToPreviousTab;
+    GamepadService.onR1Pressed = _goToNextTab;
+  }
+
+  @override
+  void dispose() {
+    _tabController.removeListener(_onTabChanged);
+    _tabController.dispose();
+    _queueTabChipFocusNode.dispose();
+    _tvShowsTabChipFocusNode.dispose();
+    _moviesTabChipFocusNode.dispose();
+    // Clear L1/R1 callbacks
+    GamepadService.onL1Pressed = null;
+    GamepadService.onR1Pressed = null;
+    super.dispose();
+  }
+
+  void _goToPreviousTab() {
+    if (_tabController.index > 0) {
+      setState(() {
+        _suppressAutoFocus = true;
+        _tabController.index = _tabController.index - 1;
+      });
+      _getTabChipFocusNode(_tabController.index).requestFocus();
+    }
+  }
+
+  void _goToNextTab() {
+    if (_tabController.index < _tabController.length - 1) {
+      setState(() {
+        _suppressAutoFocus = true;
+        _tabController.index = _tabController.index + 1;
+      });
+      _getTabChipFocusNode(_tabController.index).requestFocus();
+    }
+  }
+
+  void _onTabChanged() {
+    if (!_tabController.indexIsChanging) {
+      // Rebuild to update chip selection state
+      setState(() {});
+    }
+  }
+
+  /// Get the focus node for a tab chip by index
+  FocusNode _getTabChipFocusNode(int index) {
+    switch (index) {
+      case 0:
+        return _queueTabChipFocusNode;
+      case 1:
+        return _tvShowsTabChipFocusNode;
+      case 2:
+        return _moviesTabChipFocusNode;
+      default:
+        return _queueTabChipFocusNode;
+    }
+  }
+
+  /// Focus the currently selected tab chip in the tab bar.
+  /// Called when BACK is pressed in tab content.
+  void focusTabBar() {
+    setState(() {
+      _suppressAutoFocus = true;
+    });
+    final focusNode = _getTabChipFocusNode(_tabController.index);
+    focusNode.requestFocus();
+  }
+
+  /// Handle BACK from tab bar - navigate to sidenav
+  void _onTabBarBack() {
+    final focusScope = MainScreenFocusScope.of(context);
+    focusScope?.focusSidebar();
+  }
+
+  /// Focus the first item in the currently active tab
+  void _focusCurrentTab() {
+    // Re-enable auto-focus since user is navigating into tab content
+    setState(() {
+      _suppressAutoFocus = false;
+    });
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      // Focus will be handled by the tab content
+    });
+  }
+
+  Widget _buildTabChip(String label, int index) {
+    final isSelected = _tabController.index == index;
+    const tabCount = 3; // Queue, TV Shows, Movies
+
+    return FocusableTabChip(
+      label: label,
+      isSelected: isSelected,
+      focusNode: _getTabChipFocusNode(index),
+      onSelect: () {
+        if (isSelected) {
+          // Already selected - navigate to tab content
+          _focusCurrentTab();
+        } else {
+          // Switch to this tab
+          setState(() {
+            _tabController.index = index;
+          });
+        }
+      },
+      onNavigateLeft: index > 0
+          ? () {
+              final newIndex = index - 1;
+              setState(() {
+                _suppressAutoFocus = true;
+                _tabController.index = newIndex;
+              });
+              _getTabChipFocusNode(newIndex).requestFocus();
+            }
+          : null,
+      onNavigateRight: index < tabCount - 1
+          ? () {
+              final newIndex = index + 1;
+              setState(() {
+                _suppressAutoFocus = true;
+                _tabController.index = newIndex;
+              });
+              _getTabChipFocusNode(newIndex).requestFocus();
+            }
+          : null,
+      onNavigateDown: _focusCurrentTab,
+      onBack: _onTabBarBack,
+    );
+  }
+
+  /// Build the app bar title - either tabs on desktop or simple title on mobile
+  Widget _buildAppBarTitle() {
+    // On desktop/TV with side nav, show tabs in app bar
+    if (PlatformDetector.shouldUseSideNavigation(context)) {
+      return Row(
+        children: [
+          _buildTabChip(t.downloads.manage, 0),
+          const SizedBox(width: 8),
+          _buildTabChip(t.downloads.tvShows, 1),
+          const SizedBox(width: 8),
+          _buildTabChip(t.downloads.movies, 2),
+        ],
+      );
+    }
+
+    // On mobile, show simple title
+    return Text(t.downloads.title);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          DesktopSliverAppBar(
+            title: _buildAppBarTitle(),
+            floating: true,
+            pinned: true,
+            backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+            surfaceTintColor: Colors.transparent,
+            shadowColor: Colors.transparent,
+            scrolledUnderElevation: 0,
+          ),
+          SliverFillRemaining(
+            child: Column(
+              children: [
+                // Tab selector chips (only on mobile - desktop has them in app bar)
+                if (!PlatformDetector.shouldUseSideNavigation(context))
+                  Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 8,
+                    ),
+                    alignment: Alignment.centerLeft,
+                    child: SingleChildScrollView(
+                      scrollDirection: Axis.horizontal,
+                      child: Row(
+                        children: [
+                          _buildTabChip(t.downloads.manage, 0),
+                          const SizedBox(width: 8),
+                          _buildTabChip(t.downloads.tvShows, 1),
+                          const SizedBox(width: 8),
+                          _buildTabChip(t.downloads.movies, 2),
+                        ],
+                      ),
+                    ),
+                  ),
+                // Tab content
+                Expanded(
+                  child: TabBarView(
+                    controller: _tabController,
+                    children: [
+                      Consumer2<DownloadProvider, MultiServerProvider>(
+                        builder: (context, downloadProvider, serverProvider, _) {
+                          // Helper to get client from globalKey (serverId:ratingKey)
+                          getClient(String globalKey) {
+                            final serverId = globalKey.split(':').first;
+                            return serverProvider.serverManager.getClient(
+                              serverId,
+                            );
+                          }
+
+                          return DownloadTreeView(
+                            downloads: downloadProvider.downloads,
+                            metadata: downloadProvider.metadata,
+                            onPause: downloadProvider.pauseDownload,
+                            onResume: (globalKey) {
+                              final client = getClient(globalKey);
+                              if (client != null) {
+                                downloadProvider.resumeDownload(
+                                  globalKey,
+                                  client,
+                                );
+                              }
+                            },
+                            onRetry: (globalKey) {
+                              final client = getClient(globalKey);
+                              if (client != null) {
+                                downloadProvider.retryDownload(
+                                  globalKey,
+                                  client,
+                                );
+                              }
+                            },
+                            onCancel: downloadProvider.cancelDownload,
+                            onDelete: downloadProvider.deleteDownload,
+                          );
+                        },
+                      ),
+                      _DownloadsGridContent(
+                        type: DownloadType.tvShows,
+                        suppressAutoFocus: _suppressAutoFocus,
+                        onBack: focusTabBar,
+                      ),
+                      _DownloadsGridContent(
+                        type: DownloadType.movies,
+                        suppressAutoFocus: _suppressAutoFocus,
+                        onBack: focusTabBar,
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+enum DownloadType { manage, tvShows, movies }
+
+/// Grid content for TV Shows and Movies tabs
+class _DownloadsGridContent extends StatelessWidget {
+  final DownloadType type;
+  final bool suppressAutoFocus;
+  final VoidCallback? onBack;
+
+  const _DownloadsGridContent({
+    required this.type,
+    required this.suppressAutoFocus,
+    this.onBack,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer2<DownloadProvider, SettingsProvider>(
+      builder: (context, downloadProvider, settingsProvider, _) {
+        final List<PlexMetadata> items = type == DownloadType.tvShows
+            ? downloadProvider.downloadedShows
+            : downloadProvider.downloadedMovies;
+
+        if (items.isEmpty) {
+          return _buildEmptyState(context);
+        }
+
+        return GridView.builder(
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          gridDelegate: MediaGridDelegate.createDelegate(
+            context: context,
+            density: settingsProvider.libraryDensity,
+          ),
+          itemCount: items.length,
+          itemBuilder: (context, index) {
+            final item = items[index];
+            return FocusableMediaCard(
+              item: item,
+              onBack: onBack,
+              isOffline: true, // Downloaded content works without server
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Widget _buildEmptyState(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(32),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            AppIcon(
+              Symbols.download_rounded,
+              fill: 1,
+              size: 80,
+              color: Theme.of(context).colorScheme.outline,
+            ),
+            const SizedBox(height: 24),
+            Text(
+              t.downloads.noDownloads,
+              style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                color: Theme.of(context).colorScheme.onSurface,
+              ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              t.downloads.noDownloadsDescription,
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
+              textAlign: TextAlign.center,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/hub_detail_screen.dart b/lib/screens/hub_detail_screen.dart
index 5e3fd5a4..61aa23b9 100644
--- a/lib/screens/hub_detail_screen.dart
+++ b/lib/screens/hub_detail_screen.dart
@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_hub.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_sort.dart';
-import '../providers/settings_provider.dart';
-import '../services/settings_service.dart';
 import '../utils/provider_extensions.dart';
 import '../utils/app_logger.dart';
-import '../widgets/media_card.dart';
-import '../widgets/desktop_app_bar.dart';
-import '../widgets/sort_bottom_sheet.dart';
+import '../widgets/media_grid_sliver.dart';
+import '../widgets/focused_scroll_scaffold.dart';
+import 'libraries/sort_bottom_sheet.dart';
 import '../mixins/refreshable.dart';
 import '../i18n/strings.g.dart';
 
@@ -25,7 +24,7 @@ class HubDetailScreen extends StatefulWidget {
 }
 
 class _HubDetailScreenState extends State<HubDetailScreen> with Refreshable {
-  PlexClient get client => context.clientSafe;
+  PlexClient get client => _getClientForHub();
 
   List<PlexMetadata> _items = [];
   List<PlexMetadata> _filteredItems = [];
@@ -35,6 +34,11 @@ class _HubDetailScreenState extends State<HubDetailScreen> with Refreshable {
   bool _isLoading = false;
   String? _errorMessage;
 
+  /// Get the correct PlexClient for this hub's server
+  PlexClient _getClientForHub() {
+    return context.getClientForServer(widget.hub.serverId!);
+  }
+
   @override
   void initState() {
     super.initState();
@@ -51,9 +55,7 @@ class _HubDetailScreenState extends State<HubDetailScreen> with Refreshable {
 
   Future<void> _loadSorts() async {
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) return;
+      final client = _getClientForHub();
 
       // Get the library key from the hub key
       // Hub keys can have various formats:
@@ -197,27 +199,21 @@ class _HubDetailScreenState extends State<HubDetailScreen> with Refreshable {
     });
 
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
-      }
+      final client = _getClientForHub();
 
-      // Fetch more items from the hub using the hubKey
-      final response = await client.getHubContent(widget.hub.hubKey);
+      // Fetch items from the hub, tagged with server info at the source
+      final items = await client.getHubContent(widget.hub.hubKey);
 
       setState(() {
-        _items = response;
-        _filteredItems = response;
+        _items = items;
+        _filteredItems = items;
         _isLoading = false;
       });
 
       // Apply any existing sort
       _applySort();
 
-      appLogger.d(
-        'Loaded ${response.length} items for hub: ${widget.hub.title}',
-      );
+      appLogger.d('Loaded ${items.length} items for hub: ${widget.hub.title}');
     } catch (e) {
       appLogger.e('Failed to load hub content', error: e);
       setState(() {
@@ -245,117 +241,58 @@ class _HubDetailScreenState extends State<HubDetailScreen> with Refreshable {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          CustomAppBar(
-            title: Text(widget.hub.title),
-            pinned: true,
-            actions: [
-              IconButton(
-                icon: Icon(Icons.swap_vert, semanticLabel: t.libraries.sort),
-                onPressed: _showSortBottomSheet,
-              ),
-            ],
+    return FocusedScrollScaffold(
+      title: Text(widget.hub.title),
+      actions: [
+        IconButton(
+          icon: AppIcon(
+            Symbols.swap_vert_rounded,
+            fill: 1,
+            semanticLabel: t.libraries.sort,
           ),
-          if (_errorMessage != null)
-            SliverFillRemaining(
-              child: Center(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    const Icon(
-                      Icons.error_outline,
-                      size: 48,
-                      color: Colors.red,
-                    ),
-                    const SizedBox(height: 16),
-                    Text(_errorMessage!),
-                    const SizedBox(height: 16),
-                    ElevatedButton(
-                      onPressed: _loadMoreItems,
-                      child: Text(t.common.retry),
-                    ),
-                  ],
-                ),
-              ),
-            )
-          else if (_filteredItems.isEmpty && _isLoading)
-            const SliverFillRemaining(
-              child: Center(child: CircularProgressIndicator()),
-            )
-          else if (_filteredItems.isEmpty)
-            SliverFillRemaining(
-              child: Center(child: Text(t.hubDetail.noItemsFound)),
-            )
-          else
-            SliverPadding(
-              padding: const EdgeInsets.fromLTRB(8, 0, 8, 8),
-              sliver: SliverGrid(
-                gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-                  maxCrossAxisExtent: _getMaxCrossAxisExtent(
-                    context,
-                    context.watch<SettingsProvider>().libraryDensity,
+          onPressed: _showSortBottomSheet,
+        ),
+      ],
+      slivers: [
+        if (_errorMessage != null)
+          SliverFillRemaining(
+            child: Center(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const AppIcon(
+                    Symbols.error_outline_rounded,
+                    fill: 1,
+                    size: 48,
+                    color: Colors.red,
                   ),
-                  childAspectRatio: 2 / 3.3,
-                  crossAxisSpacing: 0,
-                  mainAxisSpacing: 0,
-                ),
-                delegate: SliverChildBuilderDelegate((context, index) {
-                  return MediaCard(
-                    item: _filteredItems[index],
-                    onRefresh: _handleItemRefresh,
-                  );
-                }, childCount: _filteredItems.length),
+                  const SizedBox(height: 16),
+                  Text(_errorMessage!),
+                  const SizedBox(height: 16),
+                  ElevatedButton(
+                    onPressed: _loadMoreItems,
+                    child: Text(t.common.retry),
+                  ),
+                ],
               ),
             ),
-        ],
-      ),
+          )
+        else if (_filteredItems.isEmpty && _isLoading)
+          const SliverFillRemaining(
+            child: Center(child: CircularProgressIndicator()),
+          )
+        else if (_filteredItems.isEmpty)
+          SliverFillRemaining(
+            child: Center(child: Text(t.hubDetail.noItemsFound)),
+          )
+        else
+          MediaGridSliver(
+            items: _filteredItems,
+            onRefresh: _handleItemRefresh,
+            usePaddingAwareExtent: true,
+            horizontalPadding: 16,
+          ),
+      ],
     );
   }
-
-  double _getMaxCrossAxisExtent(BuildContext context, LibraryDensity density) {
-    final screenWidth = MediaQuery.of(context).size.width;
-    final padding = 16.0; // 8px left + 8px right
-    final availableWidth = screenWidth - padding;
-
-    if (screenWidth >= 900) {
-      // Wide screens (desktop/large tablet landscape): Responsive division
-      double divisor;
-      double maxItemWidth;
-
-      switch (density) {
-        case LibraryDensity.comfortable:
-          divisor = 6.5;
-          maxItemWidth = 280;
-          break;
-        case LibraryDensity.normal:
-          divisor = 8.0;
-          maxItemWidth = 200;
-          break;
-        case LibraryDensity.compact:
-          divisor = 10.0;
-          maxItemWidth = 160;
-          break;
-      }
-
-      return (availableWidth / divisor).clamp(0, maxItemWidth);
-    } else if (screenWidth >= 600) {
-      // Medium screens (tablets): Fixed 4-5-6 items
-      int targetItemCount = switch (density) {
-        LibraryDensity.comfortable => 4,
-        LibraryDensity.normal => 5,
-        LibraryDensity.compact => 6,
-      };
-      return availableWidth / targetItemCount;
-    } else {
-      // Small screens (phones): Fixed 2-3-4 items
-      int targetItemCount = switch (density) {
-        LibraryDensity.comfortable => 2,
-        LibraryDensity.normal => 3,
-        LibraryDensity.compact => 4,
-      };
-      return availableWidth / targetItemCount;
-    }
-  }
 }
diff --git a/lib/screens/libraries/adaptive_media_grid.dart b/lib/screens/libraries/adaptive_media_grid.dart
new file mode 100644
index 00000000..df2aaf22
--- /dev/null
+++ b/lib/screens/libraries/adaptive_media_grid.dart
@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../../providers/settings_provider.dart';
+import '../../services/settings_service.dart' show ViewMode, LibraryDensity;
+import '../../utils/grid_size_calculator.dart';
+import '../../utils/layout_constants.dart';
+
+/// A widget that automatically switches between grid and list view
+/// based on user settings, providing a consistent layout pattern
+/// across all library screens.
+///
+/// Generic type T: The type of items being displayed
+class AdaptiveMediaGrid<T> extends StatelessWidget {
+  /// The list of items to display
+  final List<T> items;
+
+  /// Builder function for each item in the grid/list
+  final Widget Function(BuildContext context, T item, int index) itemBuilder;
+
+  /// Callback when the list needs to be refreshed
+  final VoidCallback? onRefresh;
+
+  /// Optional padding around the grid/list
+  final EdgeInsets? padding;
+
+  /// Child aspect ratio for grid items (width / height)
+  final double? childAspectRatio;
+
+  /// Optional focus node for the first item (for programmatic focus)
+  final FocusNode? firstItemFocusNode;
+
+  /// Callback when back button is pressed (for hierarchical navigation)
+  final VoidCallback? onBack;
+
+  const AdaptiveMediaGrid({
+    super.key,
+    required this.items,
+    required this.itemBuilder,
+    this.onRefresh,
+    this.padding,
+    this.childAspectRatio,
+    this.firstItemFocusNode,
+    this.onBack,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<SettingsProvider>(
+      builder: (context, settingsProvider, child) {
+        return _buildItemsView(
+          context,
+          settingsProvider.viewMode,
+          settingsProvider.libraryDensity,
+        );
+      },
+    );
+  }
+
+  /// Builds either a list or grid view based on the view mode
+  Widget _buildItemsView(
+    BuildContext context,
+    ViewMode viewMode,
+    LibraryDensity density,
+  ) {
+    final effectivePadding = padding ?? GridLayoutConstants.gridPadding;
+    final effectiveAspectRatio =
+        childAspectRatio ?? GridLayoutConstants.posterAspectRatio;
+
+    if (viewMode == ViewMode.list) {
+      return ListView.builder(
+        padding: effectivePadding,
+        itemCount: items.length,
+        itemBuilder: (context, index) =>
+            itemBuilder(context, items[index], index),
+      );
+    } else {
+      return GridView.builder(
+        padding: effectivePadding,
+        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: GridSizeCalculator.getMaxCrossAxisExtent(
+            context,
+            density,
+          ),
+          childAspectRatio: effectiveAspectRatio,
+          crossAxisSpacing: GridLayoutConstants.crossAxisSpacing,
+          mainAxisSpacing: GridLayoutConstants.mainAxisSpacing,
+        ),
+        itemCount: items.length,
+        itemBuilder: (context, index) =>
+            itemBuilder(context, items[index], index),
+      );
+    }
+  }
+}
diff --git a/lib/screens/libraries/content_state_builder.dart b/lib/screens/libraries/content_state_builder.dart
new file mode 100644
index 00000000..48688793
--- /dev/null
+++ b/lib/screens/libraries/content_state_builder.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../i18n/strings.g.dart';
+import 'empty_state_widget.dart';
+import 'error_state_widget.dart';
+
+/// A widget that handles loading, error, empty, and content states
+/// Provides a consistent UI pattern across the app for data-driven screens
+class ContentStateBuilder<T> extends StatelessWidget {
+  /// Whether data is currently loading
+  final bool isLoading;
+
+  /// Error message to display (null if no error)
+  final String? errorMessage;
+
+  /// The list of items to display
+  final List<T> items;
+
+  /// Icon to display when the list is empty
+  final IconData emptyIcon;
+
+  /// Message to display when the list is empty
+  final String emptyMessage;
+
+  /// Callback when user taps retry button
+  final VoidCallback onRetry;
+
+  /// Builder for the content when items are available
+  final Widget Function(List<T> items) builder;
+
+  const ContentStateBuilder({
+    super.key,
+    required this.isLoading,
+    required this.errorMessage,
+    required this.items,
+    required this.emptyIcon,
+    required this.emptyMessage,
+    required this.onRetry,
+    required this.builder,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // Loading state (only show loading indicator if items list is empty)
+    if (isLoading && items.isEmpty) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
+    // Error state (only show error if items list is empty)
+    if (errorMessage != null && items.isEmpty) {
+      return ErrorStateWidget(
+        message: errorMessage!,
+        icon: Symbols.error_outline_rounded,
+        onRetry: onRetry,
+        retryLabel: t.common.retry,
+      );
+    }
+
+    // Empty state
+    if (items.isEmpty) {
+      return EmptyStateWidget(message: emptyMessage, icon: emptyIcon);
+    }
+
+    // Content state - delegate to builder
+    return builder(items);
+  }
+}
diff --git a/lib/screens/libraries/context_menu_wrapper.dart b/lib/screens/libraries/context_menu_wrapper.dart
new file mode 100644
index 00000000..c4f540a2
--- /dev/null
+++ b/lib/screens/libraries/context_menu_wrapper.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+/// A menu action item for context menus
+class ContextMenuItem {
+  final String value;
+  final IconData icon;
+  final String label;
+  final bool requiresConfirmation;
+  final String? confirmationTitle;
+  final String? confirmationMessage;
+  final bool isDestructive;
+
+  const ContextMenuItem({
+    required this.value,
+    required this.icon,
+    required this.label,
+    this.requiresConfirmation = false,
+    this.confirmationTitle,
+    this.confirmationMessage,
+    this.isDestructive = false,
+  });
+}
diff --git a/lib/screens/libraries/empty_state_widget.dart b/lib/screens/libraries/empty_state_widget.dart
new file mode 100644
index 00000000..8e33bbd9
--- /dev/null
+++ b/lib/screens/libraries/empty_state_widget.dart
@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'state_message_widget.dart';
+
+/// A reusable widget for displaying empty states throughout the app
+class EmptyStateWidget extends StatelessWidget {
+  /// The message to display
+  final String message;
+
+  /// Optional icon to display above the message
+  final IconData? icon;
+
+  /// Optional callback for action button
+  final VoidCallback? onAction;
+
+  /// Optional label for the action button
+  final String? actionLabel;
+
+  const EmptyStateWidget({
+    super.key,
+    required this.message,
+    this.icon,
+    this.onAction,
+    this.actionLabel,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return StateMessageWidget(
+      message: message,
+      icon: icon,
+      onAction: onAction,
+      actionLabel: actionLabel,
+      actionIcon: Symbols.add_rounded,
+    );
+  }
+}
diff --git a/lib/screens/libraries/error_state_widget.dart b/lib/screens/libraries/error_state_widget.dart
new file mode 100644
index 00000000..8d17d200
--- /dev/null
+++ b/lib/screens/libraries/error_state_widget.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'state_message_widget.dart';
+
+/// A reusable widget for displaying error states throughout the app
+class ErrorStateWidget extends StatelessWidget {
+  /// The error message to display
+  final String message;
+
+  /// Optional icon to display above the message
+  final IconData? icon;
+
+  /// Optional callback for retry action
+  final VoidCallback? onRetry;
+
+  /// Optional label for the retry button
+  final String? retryLabel;
+
+  const ErrorStateWidget({
+    super.key,
+    required this.message,
+    this.icon,
+    this.onRetry,
+    this.retryLabel,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return StateMessageWidget(
+      message: message,
+      icon: icon,
+      iconColor: Theme.of(context).colorScheme.error,
+      textColor: Theme.of(context).colorScheme.error,
+      onAction: onRetry,
+      actionLabel: retryLabel ?? 'Retry',
+      actionIcon: Symbols.refresh_rounded,
+    );
+  }
+}
diff --git a/lib/screens/libraries/filters_bottom_sheet.dart b/lib/screens/libraries/filters_bottom_sheet.dart
new file mode 100644
index 00000000..633bb840
--- /dev/null
+++ b/lib/screens/libraries/filters_bottom_sheet.dart
@@ -0,0 +1,294 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../models/plex_filter.dart';
+import '../../widgets/app_bar_back_button.dart';
+import '../../widgets/bottom_sheet_header.dart';
+import '../../widgets/focusable_bottom_sheet.dart';
+import '../../widgets/focusable_list_tile.dart';
+import '../../utils/provider_extensions.dart';
+import '../../i18n/strings.g.dart';
+
+class FiltersBottomSheet extends StatefulWidget {
+  final List<PlexFilter> filters;
+  final Map<String, String> selectedFilters;
+  final Function(Map<String, String>) onFiltersChanged;
+  final String serverId;
+
+  const FiltersBottomSheet({
+    super.key,
+    required this.filters,
+    required this.selectedFilters,
+    required this.onFiltersChanged,
+    required this.serverId,
+  });
+
+  @override
+  State<FiltersBottomSheet> createState() => _FiltersBottomSheetState();
+}
+
+class _FiltersBottomSheetState extends State<FiltersBottomSheet> {
+  PlexFilter? _currentFilter;
+  List<PlexFilterValue> _filterValues = [];
+  bool _isLoadingValues = false;
+  final Map<String, String> _tempSelectedFilters = {};
+  final Map<String, String> _filterDisplayNames = {}; // Cache for display names
+  late List<PlexFilter> _sortedFilters;
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _tempSelectedFilters.addAll(widget.selectedFilters);
+    _sortFilters();
+    _initialFocusNode = FocusNode(debugLabel: 'FiltersBottomSheetInitialFocus');
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  void _sortFilters() {
+    // Separate boolean filters (toggles) from regular filters
+    final booleanFilters = widget.filters
+        .where((f) => f.filterType == 'boolean')
+        .toList();
+    final regularFilters = widget.filters
+        .where((f) => f.filterType != 'boolean')
+        .toList();
+
+    // Combine with boolean filters first
+    _sortedFilters = [...booleanFilters, ...regularFilters];
+  }
+
+  bool _isBooleanFilter(PlexFilter filter) {
+    return filter.filterType == 'boolean';
+  }
+
+  Future<void> _loadFilterValues(PlexFilter filter) async {
+    setState(() {
+      _currentFilter = filter;
+      _isLoadingValues = true;
+    });
+
+    try {
+      final client = context.getClientForServer(widget.serverId);
+
+      final values = await client.getFilterValues(filter.key);
+      setState(() {
+        _filterValues = values;
+        _isLoadingValues = false;
+      });
+    } catch (e) {
+      setState(() {
+        _filterValues = [];
+        _isLoadingValues = false;
+      });
+    }
+  }
+
+  void _goBack() {
+    setState(() {
+      _currentFilter = null;
+      _filterValues = [];
+    });
+  }
+
+  void _applyFilters() {
+    widget.onFiltersChanged(_tempSelectedFilters);
+    Navigator.pop(context);
+  }
+
+  String _extractFilterValue(String key, String filterName) {
+    if (key.contains('?')) {
+      final queryStart = key.indexOf('?');
+      final queryString = key.substring(queryStart + 1);
+      final params = Uri.splitQueryString(queryString);
+      return params[filterName] ?? key;
+    } else if (key.startsWith('/')) {
+      return key.split('/').last;
+    }
+    return key;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusableBottomSheet(
+      initialFocusNode: _initialFocusNode,
+      child: DraggableScrollableSheet(
+        initialChildSize: 0.7,
+        minChildSize: 0.5,
+        maxChildSize: 0.95,
+        expand: false,
+        builder: (context, scrollController) {
+          if (_currentFilter != null) {
+            // Show filter options view
+            return Column(
+              children: [
+                // Header with back button
+                BottomSheetHeader(
+                  title: _currentFilter!.title,
+                  leading: AppBarBackButton(
+                    style: BackButtonStyle.plain,
+                    onPressed: _goBack,
+                  ),
+                ),
+
+                // Filter options list
+                if (_isLoadingValues)
+                  const Expanded(
+                    child: Center(child: CircularProgressIndicator()),
+                  )
+                else
+                  Expanded(
+                    child: ListView.builder(
+                      controller: scrollController,
+                      padding: const EdgeInsets.symmetric(vertical: 8),
+                      itemCount: _filterValues.length + 1,
+                      itemBuilder: (context, index) {
+                        if (index == 0) {
+                          final isSelected = !_tempSelectedFilters.containsKey(
+                            _currentFilter!.filter,
+                          );
+                          return FocusableListTile(
+                            focusNode: _initialFocusNode,
+                            title: Text(t.libraries.all),
+                            selected: isSelected,
+                            onTap: () {
+                              setState(() {
+                                _tempSelectedFilters.remove(
+                                  _currentFilter!.filter,
+                                );
+                              });
+                              _applyFilters();
+                            },
+                          );
+                        }
+
+                        final value = _filterValues[index - 1];
+                        final filterValue = _extractFilterValue(
+                          value.key,
+                          _currentFilter!.filter,
+                        );
+                        final isSelected =
+                            _tempSelectedFilters[_currentFilter!.filter] ==
+                            filterValue;
+
+                        return FocusableListTile(
+                          title: Text(value.title),
+                          selected: isSelected,
+                          onTap: () {
+                            setState(() {
+                              _tempSelectedFilters[_currentFilter!.filter] =
+                                  filterValue;
+                              // Cache the display name for this filter value
+                              _filterDisplayNames['${_currentFilter!.filter}:$filterValue'] =
+                                  value.title;
+                            });
+                            _applyFilters();
+                          },
+                        );
+                      },
+                    ),
+                  ),
+              ],
+            );
+          }
+
+          // Show main filters view
+          return Column(
+            children: [
+              // Header
+              BottomSheetHeader(
+                title: t.libraries.filters,
+                leading: const AppIcon(Symbols.filter_alt_rounded, fill: 1),
+                action: _tempSelectedFilters.isNotEmpty
+                    ? TextButton.icon(
+                        onPressed: () {
+                          setState(() {
+                            _tempSelectedFilters.clear();
+                          });
+                          _applyFilters();
+                        },
+                        icon: const AppIcon(Symbols.clear_all_rounded, fill: 1),
+                        label: Text(t.libraries.clearAll),
+                      )
+                    : null,
+              ),
+
+              // All Filters (boolean toggles first, then regular filters)
+              Expanded(
+                child: ListView.builder(
+                  controller: scrollController,
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  itemCount: _sortedFilters.length,
+                  itemBuilder: (context, index) {
+                    final filter = _sortedFilters[index];
+
+                    // Handle boolean filters as switches (unwatched, inProgress, unmatched, hdr, etc.)
+                    if (_isBooleanFilter(filter)) {
+                      final isActive =
+                          _tempSelectedFilters.containsKey(filter.filter) &&
+                          _tempSelectedFilters[filter.filter] == '1';
+                      return FocusableSwitchListTile(
+                        focusNode: index == 0 ? _initialFocusNode : null,
+                        value: isActive,
+                        onChanged: (value) {
+                          setState(() {
+                            if (value) {
+                              _tempSelectedFilters[filter.filter] = '1';
+                            } else {
+                              _tempSelectedFilters.remove(filter.filter);
+                            }
+                          });
+                          _applyFilters();
+                        },
+                        title: Text(filter.title),
+                      );
+                    }
+
+                    // Regular navigable filters - show selected value instead of checkmark
+                    final selectedValue = _tempSelectedFilters[filter.filter];
+                    String? displayValue;
+                    if (selectedValue != null) {
+                      // Try to get the cached display name, fall back to the value itself
+                      displayValue =
+                          _filterDisplayNames['${filter.filter}:$selectedValue'] ??
+                          selectedValue;
+                    }
+
+                    return FocusableListTile(
+                      focusNode: index == 0 ? _initialFocusNode : null,
+                      title: Text(filter.title),
+                      trailing: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          if (displayValue != null)
+                            Flexible(
+                              child: Text(
+                                displayValue,
+                                style: TextStyle(
+                                  color: Theme.of(context).colorScheme.primary,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                            ),
+                          if (displayValue != null) const SizedBox(width: 8),
+                          const AppIcon(Symbols.chevron_right_rounded, fill: 1),
+                        ],
+                      ),
+                      onTap: () => _loadFilterValues(filter),
+                    );
+                  },
+                ),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/screens/libraries/folder_tree_item.dart b/lib/screens/libraries/folder_tree_item.dart
new file mode 100644
index 00000000..b248c031
--- /dev/null
+++ b/lib/screens/libraries/folder_tree_item.dart
@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../models/plex_metadata.dart';
+
+/// Individual item in the folder tree
+/// Can be either a folder (expandable) or a file (tappable)
+class FolderTreeItem extends StatelessWidget {
+  final PlexMetadata item;
+  final int depth;
+  final bool isExpanded;
+  final bool isFolder;
+  final VoidCallback? onTap;
+  final VoidCallback? onExpand;
+  final bool isLoading;
+
+  const FolderTreeItem({
+    super.key,
+    required this.item,
+    required this.depth,
+    this.isExpanded = false,
+    this.isFolder = false,
+    this.onTap,
+    this.onExpand,
+    this.isLoading = false,
+  });
+
+  IconData _getIcon() {
+    if (isFolder) {
+      return Symbols.folder_rounded;
+    }
+
+    // File icons based on type
+    final type = item.type.toLowerCase();
+    switch (type) {
+      case 'movie':
+        return Symbols.movie_rounded;
+      case 'show':
+        return Symbols.tv_rounded;
+      case 'season':
+        return Symbols.video_library_rounded;
+      case 'episode':
+        return Symbols.play_circle_rounded;
+      case 'collection':
+        return Symbols.collections_rounded;
+      default:
+        return Symbols.insert_drive_file_rounded;
+    }
+  }
+
+  void _handleTap() {
+    if (isFolder) {
+      onExpand?.call();
+    } else {
+      onTap?.call();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final indentation = depth * 24.0;
+
+    return InkWell(
+      onTap: _handleTap,
+      child: Container(
+        padding: EdgeInsets.only(
+          left: 16.0 + indentation,
+          right: 16.0,
+          top: 12.0,
+          bottom: 12.0,
+        ),
+        child: Row(
+          children: [
+            // Expand/collapse icon for folders
+            if (isFolder)
+              SizedBox(
+                width: 24,
+                child: isLoading
+                    ? const SizedBox(
+                        width: 16,
+                        height: 16,
+                        child: CircularProgressIndicator(strokeWidth: 2),
+                      )
+                    : AppIcon(
+                        isExpanded
+                            ? Symbols.keyboard_arrow_down_rounded
+                            : Symbols.keyboard_arrow_right_rounded,
+                        fill: 1,
+                        size: 20,
+                      ),
+              )
+            else
+              const SizedBox(width: 24),
+
+            const SizedBox(width: 8),
+
+            // File/folder icon
+            AppIcon(
+              _getIcon(),
+              fill: 1,
+              size: 20,
+              color: isFolder
+                  ? Theme.of(context).colorScheme.primary
+                  : Theme.of(
+                      context,
+                    ).colorScheme.onSurface.withValues(alpha: 0.7),
+            ),
+
+            const SizedBox(width: 12),
+
+            // Item title
+            Expanded(
+              child: Text(
+                item.title,
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: isFolder ? FontWeight.w500 : FontWeight.w400,
+                ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+
+            // Additional metadata for files
+            if (!isFolder && item.year != null)
+              Text(
+                item.year.toString(),
+                style: TextStyle(
+                  fontSize: 12,
+                  color: Theme.of(
+                    context,
+                  ).colorScheme.onSurface.withValues(alpha: 0.6),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/libraries/folder_tree_view.dart b/lib/screens/libraries/folder_tree_view.dart
new file mode 100644
index 00000000..4feb39a2
--- /dev/null
+++ b/lib/screens/libraries/folder_tree_view.dart
@@ -0,0 +1,231 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../models/plex_metadata.dart';
+import '../../utils/app_logger.dart';
+import '../../utils/media_navigation_helper.dart';
+import '../../utils/provider_extensions.dart';
+import '../../i18n/strings.g.dart';
+import 'folder_tree_item.dart';
+import 'empty_state_widget.dart';
+import 'error_state_widget.dart';
+
+/// Expandable tree view for browsing library folders
+/// Shows a hierarchical file/folder structure
+class FolderTreeView extends StatefulWidget {
+  final String libraryKey;
+  final String? serverId; // Server this library belongs to
+  final void Function(String)? onRefresh;
+
+  const FolderTreeView({
+    super.key,
+    required this.libraryKey,
+    this.serverId,
+    this.onRefresh,
+  });
+
+  @override
+  State<FolderTreeView> createState() => _FolderTreeViewState();
+}
+
+class _FolderTreeViewState extends State<FolderTreeView> {
+  List<PlexMetadata> _rootFolders = [];
+  final Map<String, List<PlexMetadata>> _childrenCache = {};
+  final Set<String> _expandedFolders = {};
+  final Set<String> _loadingFolders = {};
+  bool _isLoadingRoot = false;
+  String? _errorMessage;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadRootFolders();
+  }
+
+  Future<void> _loadRootFolders() async {
+    setState(() {
+      _isLoadingRoot = true;
+      _errorMessage = null;
+    });
+
+    try {
+      final client = context.getClientForServer(widget.serverId!);
+
+      final folders = await client.getLibraryFolders(widget.libraryKey);
+
+      if (!mounted) return;
+
+      final taggedFolders = folders
+          .map(
+            (folder) => folder.copyWith(
+              serverId: widget.serverId!,
+              serverName: null, // server name not required for folders listing
+            ),
+          )
+          .toList();
+
+      setState(() {
+        _rootFolders = taggedFolders;
+        _isLoadingRoot = false;
+      });
+
+      appLogger.d('Loaded ${folders.length} root folders');
+    } catch (e) {
+      if (!mounted) return;
+
+      appLogger.e('Failed to load root folders', error: e);
+      setState(() {
+        _errorMessage = t.errors.failedToLoad(
+          context: t.libraries.folders,
+          error: e.toString(),
+        );
+        _isLoadingRoot = false;
+      });
+    }
+  }
+
+  Future<void> _loadFolderChildren(PlexMetadata folder) async {
+    // Already loading this folder
+    if (_loadingFolders.contains(folder.key)) return;
+
+    // Already loaded and cached
+    if (_childrenCache.containsKey(folder.key)) {
+      setState(() {
+        _expandedFolders.add(folder.key);
+      });
+      return;
+    }
+
+    setState(() {
+      _loadingFolders.add(folder.key);
+    });
+
+    try {
+      final client = context.getClientForServer(widget.serverId!);
+
+      // Items are automatically tagged with server info by PlexClient
+      final children = await client.getFolderChildren(folder.key);
+
+      if (!mounted) return;
+
+      setState(() {
+        _childrenCache[folder.key] = children;
+        _expandedFolders.add(folder.key);
+        _loadingFolders.remove(folder.key);
+      });
+
+      appLogger.d(
+        'Loaded ${children.length} children for folder: ${folder.title}',
+      );
+    } catch (e) {
+      if (!mounted) return;
+
+      appLogger.e('Failed to load folder children', error: e);
+      setState(() {
+        _loadingFolders.remove(folder.key);
+      });
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              t.errors.failedToLoad(
+                context: t.libraries.folders,
+                error: e.toString(),
+              ),
+            ),
+          ),
+        );
+      }
+    }
+  }
+
+  void _toggleFolder(PlexMetadata folder) {
+    if (_expandedFolders.contains(folder.key)) {
+      setState(() {
+        _expandedFolders.remove(folder.key);
+      });
+    } else {
+      _loadFolderChildren(folder);
+    }
+  }
+
+  Future<void> _handleItemTap(PlexMetadata item) async {
+    await navigateToMediaItem(context, item, onRefresh: widget.onRefresh);
+  }
+
+  bool _isFolder(PlexMetadata item) {
+    // Folders typically don't have a specific type or might have special indicators
+    // Check for common folder indicators
+    return item.key.contains('/folder') ||
+        item.type.isEmpty ||
+        item.type.toLowerCase() == 'folder';
+  }
+
+  List<Widget> _buildTreeItems(
+    List<PlexMetadata> items,
+    int depth, [
+    String parentPath = '',
+  ]) {
+    final List<Widget> widgets = [];
+
+    for (int i = 0; i < items.length; i++) {
+      final item = items[i];
+      final isFolder = _isFolder(item);
+      final isExpanded = _expandedFolders.contains(item.key);
+      final isLoading = _loadingFolders.contains(item.key);
+
+      // Create a unique key path that includes parent hierarchy and index
+      final itemPath = parentPath.isEmpty ? '$i' : '$parentPath-$i';
+
+      // Add the item itself
+      widgets.add(
+        FolderTreeItem(
+          key: ValueKey(itemPath),
+          item: item,
+          depth: depth,
+          isFolder: isFolder,
+          isExpanded: isExpanded,
+          isLoading: isLoading,
+          onExpand: isFolder ? () => _toggleFolder(item) : null,
+          onTap: !isFolder ? () => _handleItemTap(item) : null,
+        ),
+      );
+
+      // Add children if folder is expanded
+      if (isFolder && isExpanded && _childrenCache.containsKey(item.key)) {
+        final children = _childrenCache[item.key]!;
+        widgets.addAll(_buildTreeItems(children, depth + 1, itemPath));
+      }
+    }
+
+    return widgets;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_isLoadingRoot) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
+    if (_errorMessage != null) {
+      return ErrorStateWidget(
+        message: _errorMessage!,
+        icon: Symbols.error_outline_rounded,
+        onRetry: _loadRootFolders,
+        retryLabel: t.common.retry,
+      );
+    }
+
+    if (_rootFolders.isEmpty) {
+      return EmptyStateWidget(
+        message: t.libraries.noFoldersFound,
+        icon: Symbols.folder_open_rounded,
+      );
+    }
+
+    return RefreshIndicator(
+      onRefresh: _loadRootFolders,
+      child: ListView(children: _buildTreeItems(_rootFolders, 0)),
+    );
+  }
+}
diff --git a/lib/screens/libraries/libraries_screen.dart b/lib/screens/libraries/libraries_screen.dart
new file mode 100644
index 00000000..eb7dfc82
--- /dev/null
+++ b/lib/screens/libraries/libraries_screen.dart
@@ -0,0 +1,1774 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+import 'package:dio/dio.dart';
+import '../../focus/dpad_navigator.dart';
+import '../../focus/input_mode_tracker.dart';
+import '../../services/gamepad_service.dart';
+import '../../../services/plex_client.dart';
+import '../../models/plex_library.dart';
+import '../../models/plex_metadata.dart';
+import '../../models/plex_sort.dart';
+import '../../providers/hidden_libraries_provider.dart';
+import '../../providers/multi_server_provider.dart';
+import '../../utils/app_logger.dart';
+import '../../utils/platform_detector.dart';
+import '../../utils/provider_extensions.dart';
+import '../../widgets/desktop_app_bar.dart';
+import '../../widgets/focusable_tab_chip.dart';
+import '../main_screen.dart';
+import 'context_menu_wrapper.dart';
+import '../../services/storage_service.dart';
+import '../../mixins/refreshable.dart';
+import '../../mixins/item_updatable.dart';
+import '../../i18n/strings.g.dart';
+import '../../utils/error_message_utils.dart';
+import 'tabs/library_browse_tab.dart';
+import 'tabs/library_recommended_tab.dart';
+import 'tabs/library_collections_tab.dart';
+import 'tabs/library_playlists_tab.dart';
+
+class LibrariesScreen extends StatefulWidget {
+  final VoidCallback? onLibraryOrderChanged;
+
+  const LibrariesScreen({super.key, this.onLibraryOrderChanged});
+
+  @override
+  State<LibrariesScreen> createState() => _LibrariesScreenState();
+}
+
+class _LibrariesScreenState extends State<LibrariesScreen>
+    with Refreshable, FullRefreshable, FocusableTab, LibraryLoadable, ItemUpdatable, SingleTickerProviderStateMixin {
+  @override
+  PlexClient get client {
+    final multiServerProvider = Provider.of<MultiServerProvider>(
+      context,
+      listen: false,
+    );
+    if (!multiServerProvider.hasConnectedServers) {
+      throw Exception(t.errors.noClientAvailable);
+    }
+    return context.getClientForServer(
+      multiServerProvider.onlineServerIds.first,
+    );
+  }
+
+  late TabController _tabController;
+
+  // GlobalKeys for tabs to enable refresh
+  final _recommendedTabKey = GlobalKey<State<LibraryRecommendedTab>>();
+  final _browseTabKey = GlobalKey<State<LibraryBrowseTab>>();
+  final _collectionsTabKey = GlobalKey<State<LibraryCollectionsTab>>();
+  final _playlistsTabKey = GlobalKey<State<LibraryPlaylistsTab>>();
+
+  List<PlexLibrary> _allLibraries = []; // All libraries from API (unfiltered)
+  bool _isLoadingLibraries = true;
+  String? _errorMessage;
+  String? _selectedLibraryGlobalKey;
+  bool _isInitialLoad = true;
+
+  /// When true, suppress auto-focus in tabs (used when navigating via tab bar)
+  bool _suppressAutoFocus = false;
+
+  Map<String, String> _selectedFilters = {};
+  PlexSort? _selectedSort;
+  bool _isSortDescending = false;
+  List<PlexMetadata> _items = [];
+  int _currentPage = 0;
+  bool _hasMoreItems = true;
+  CancelToken? _cancelToken;
+  int _requestId = 0;
+  static const int _pageSize = 1000;
+
+  /// Flag to prevent _onTabChanged from focusing when we're programmatically changing tabs
+  bool _isRestoringTab = false;
+
+  /// Track which tabs have loaded data (used to trigger focus after tab restore)
+  final Set<int> _loadedTabs = {};
+
+  /// Key for the library dropdown popup menu button
+  final _libraryDropdownKey = GlobalKey<PopupMenuButtonState<String>>();
+
+  // Focus nodes for tab chips
+  final _recommendedTabChipFocusNode = FocusNode(
+    debugLabel: 'tab_chip_recommended',
+  );
+  final _browseTabChipFocusNode = FocusNode(debugLabel: 'tab_chip_browse');
+  final _collectionsTabChipFocusNode = FocusNode(
+    debugLabel: 'tab_chip_collections',
+  );
+  final _playlistsTabChipFocusNode = FocusNode(
+    debugLabel: 'tab_chip_playlists',
+  );
+
+  @override
+  void initState() {
+    super.initState();
+    _tabController = TabController(length: 4, vsync: this);
+    _tabController.addListener(_onTabChanged);
+    _loadLibraries();
+
+    // Register L1/R1 callbacks for tab navigation
+    GamepadService.onL1Pressed = _goToPreviousTab;
+    GamepadService.onR1Pressed = _goToNextTab;
+  }
+
+  void _goToPreviousTab() {
+    if (_tabController.index > 0) {
+      setState(() {
+        _suppressAutoFocus = true;
+        _tabController.index = _tabController.index - 1;
+      });
+      _getTabChipFocusNode(_tabController.index).requestFocus();
+    }
+  }
+
+  void _goToNextTab() {
+    if (_tabController.index < _tabController.length - 1) {
+      setState(() {
+        _suppressAutoFocus = true;
+        _tabController.index = _tabController.index + 1;
+      });
+      _getTabChipFocusNode(_tabController.index).requestFocus();
+    }
+  }
+
+  void _onTabChanged() {
+    // Save tab index when changed (but not when restoring from storage)
+    if (_selectedLibraryGlobalKey != null && !_tabController.indexIsChanging) {
+      // Only save if this was a user-initiated tab change, not a restore
+      if (!_isRestoringTab) {
+        StorageService.getInstance().then((storage) {
+          storage.saveLibraryTab(
+            _selectedLibraryGlobalKey!,
+            _tabController.index,
+          );
+        });
+
+        // Focus first item in the current tab (only for user-initiated changes)
+        // But not when navigating via tab bar (suppressAutoFocus is true)
+        if (!_suppressAutoFocus) {
+          _focusCurrentTab();
+        }
+      }
+    }
+    // Rebuild to update chip selection state
+    setState(() {});
+  }
+
+  /// Focus the first item in the currently active tab
+  void _focusCurrentTab() {
+    // Re-enable auto-focus since user is navigating into tab content
+    setState(() {
+      _suppressAutoFocus = false;
+    });
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+
+      State? tabState;
+      switch (_tabController.index) {
+        case 0:
+          tabState = _recommendedTabKey.currentState;
+          break;
+        case 1:
+          tabState = _browseTabKey.currentState;
+          break;
+        case 2:
+          tabState = _collectionsTabKey.currentState;
+          break;
+        case 3:
+          tabState = _playlistsTabKey.currentState;
+          break;
+      }
+
+      if (tabState != null) {
+        (tabState as dynamic).focusFirstItem();
+      } else {
+        // State not available yet, retry after another frame
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (!mounted) return;
+          _focusCurrentTabImmediate();
+        });
+      }
+    });
+  }
+
+  /// Focus without additional frame delay (used for retry)
+  void _focusCurrentTabImmediate() {
+    State? tabState;
+    switch (_tabController.index) {
+      case 0:
+        tabState = _recommendedTabKey.currentState;
+        break;
+      case 1:
+        tabState = _browseTabKey.currentState;
+        break;
+      case 2:
+        tabState = _collectionsTabKey.currentState;
+        break;
+      case 3:
+        tabState = _playlistsTabKey.currentState;
+        break;
+    }
+
+    if (tabState != null) {
+      (tabState as dynamic).focusFirstItem();
+    }
+  }
+
+  /// Handle when a tab's data has finished loading
+  void _handleTabDataLoaded(int tabIndex) {
+    // Track that this tab has loaded
+    _loadedTabs.add(tabIndex);
+
+    // Don't auto-focus if suppressed (e.g., when navigating via tab bar)
+    if (_suppressAutoFocus) return;
+
+    // Only focus if this is the currently active tab
+    if (_tabController.index == tabIndex && mounted) {
+      // Use post-frame callback to ensure the widget tree is fully built
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted &&
+            _tabController.index == tabIndex &&
+            !_suppressAutoFocus) {
+          _focusCurrentTab();
+        }
+      });
+    }
+  }
+
+  /// Called by parent when the Libraries screen becomes visible.
+  /// If the active tab has already loaded data (often the case after preloading
+  /// while on another main tab), re-request focus so the first item is focused
+  /// once the screen is actually shown.
+  @override
+  void focusActiveTabIfReady() {
+    if (_selectedLibraryGlobalKey == null) return;
+    _focusCurrentTab();
+  }
+
+  /// Focus the currently selected tab chip in the tab bar.
+  /// Called when BACK is pressed in tab content.
+  void focusTabBar() {
+    setState(() {
+      _suppressAutoFocus = true;
+    });
+    final focusNode = _getTabChipFocusNode(_tabController.index);
+    focusNode.requestFocus();
+  }
+
+  /// Get the focus node for a tab chip by index
+  FocusNode _getTabChipFocusNode(int index) {
+    switch (index) {
+      case 0:
+        return _recommendedTabChipFocusNode;
+      case 1:
+        return _browseTabChipFocusNode;
+      case 2:
+        return _collectionsTabChipFocusNode;
+      case 3:
+        return _playlistsTabChipFocusNode;
+      default:
+        return _recommendedTabChipFocusNode;
+    }
+  }
+
+  /// Handle BACK from tab bar - navigate to sidenav
+  void _onTabBarBack() {
+    final focusScope = MainScreenFocusScope.of(context);
+    focusScope?.focusSidebar();
+  }
+
+  @override
+  void dispose() {
+    _tabController.removeListener(_onTabChanged);
+    _tabController.dispose();
+    _cancelToken?.cancel();
+    _recommendedTabChipFocusNode.dispose();
+    _browseTabChipFocusNode.dispose();
+    _collectionsTabChipFocusNode.dispose();
+    _playlistsTabChipFocusNode.dispose();
+    // Clear L1/R1 callbacks
+    GamepadService.onL1Pressed = null;
+    GamepadService.onR1Pressed = null;
+    super.dispose();
+  }
+
+  void _updateState(VoidCallback fn) {
+    if (!mounted) return;
+    setState(fn);
+  }
+
+  /// Helper method to get user-friendly error message from exception
+  String _getErrorMessage(dynamic error, String context) {
+    if (error is DioException) {
+      return mapDioErrorToMessage(error, context: context);
+    }
+
+    return mapUnexpectedErrorToMessage(error, context: context);
+  }
+
+  /// Check if libraries come from multiple servers
+  bool get _hasMultipleServers {
+    final uniqueServerIds = _allLibraries
+        .where((lib) => lib.serverId != null)
+        .map((lib) => lib.serverId)
+        .toSet();
+    return uniqueServerIds.length > 1;
+  }
+
+  Future<void> _loadLibraries() async {
+    // Extract context dependencies before async gap
+    final multiServerProvider = Provider.of<MultiServerProvider>(
+      context,
+      listen: false,
+    );
+    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
+      context,
+      listen: false,
+    );
+
+    setState(() {
+      _isLoadingLibraries = true;
+      _errorMessage = null;
+    });
+
+    try {
+      // Check if we have any connected servers
+      if (!multiServerProvider.hasConnectedServers) {
+        throw Exception(t.errors.noClientAvailable);
+      }
+
+      final storage = await StorageService.getInstance();
+
+      // Fetch libraries from all servers
+      final allLibraries = await multiServerProvider.aggregationService
+          .getLibrariesFromAllServers();
+
+      // Filter out music libraries (type: 'artist') since music playback is not yet supported
+      // Only show movie and TV show libraries
+      final filteredLibraries = allLibraries
+          .where((lib) => lib.type.toLowerCase() != 'artist')
+          .toList();
+
+      // Load saved library order and apply it
+      final savedOrder = storage.getLibraryOrder();
+      final orderedLibraries = _applyLibraryOrder(
+        filteredLibraries,
+        savedOrder,
+      );
+
+      _updateState(() {
+        _allLibraries =
+            orderedLibraries; // Store all libraries with ordering applied
+        _isLoadingLibraries = false;
+      });
+
+      if (allLibraries.isNotEmpty) {
+        // Compute visible libraries for initial load
+        final hiddenKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
+        final visibleLibraries = allLibraries
+            .where((lib) => !hiddenKeys.contains(lib.globalKey))
+            .toList();
+
+        // Load saved preferences
+        final savedLibraryKey = storage.getSelectedLibraryKey();
+
+        // Find the library by key in visible libraries
+        String? libraryGlobalKeyToLoad;
+        if (savedLibraryKey != null) {
+          // Check if saved library exists and is visible
+          final libraryExists = visibleLibraries.any(
+            (lib) => lib.globalKey == savedLibraryKey,
+          );
+          if (libraryExists) {
+            libraryGlobalKeyToLoad = savedLibraryKey;
+          }
+        }
+
+        // Fallback to first visible library if saved key not found
+        if (libraryGlobalKeyToLoad == null && visibleLibraries.isNotEmpty) {
+          libraryGlobalKeyToLoad = visibleLibraries.first.globalKey;
+        }
+
+        if (libraryGlobalKeyToLoad != null && mounted) {
+          final savedFilters = storage.getLibraryFilters(
+            sectionId: libraryGlobalKeyToLoad,
+          );
+          if (savedFilters.isNotEmpty) {
+            _selectedFilters = Map.from(savedFilters);
+          }
+          _loadLibraryContent(libraryGlobalKeyToLoad);
+        }
+      }
+    } catch (e) {
+      _updateState(() {
+        _errorMessage = _getErrorMessage(e, 'libraries');
+        _isLoadingLibraries = false;
+      });
+    }
+  }
+
+  List<PlexLibrary> _applyLibraryOrder(
+    List<PlexLibrary> libraries,
+    List<String>? savedOrder,
+  ) {
+    if (savedOrder == null || savedOrder.isEmpty) {
+      return libraries;
+    }
+
+    // Create a map for quick lookup
+    final libraryMap = {for (var lib in libraries) lib.globalKey: lib};
+
+    // Build ordered list based on saved order
+    final orderedLibraries = <PlexLibrary>[];
+    final addedKeys = <String>{};
+
+    // Add libraries in saved order
+    for (final key in savedOrder) {
+      if (libraryMap.containsKey(key)) {
+        orderedLibraries.add(libraryMap[key]!);
+        addedKeys.add(key);
+      }
+    }
+
+    // Add any new libraries that weren't in the saved order
+    for (final library in libraries) {
+      if (!addedKeys.contains(library.globalKey)) {
+        orderedLibraries.add(library);
+      }
+    }
+
+    return orderedLibraries;
+  }
+
+  Future<void> _saveLibraryOrder() async {
+    final storage = await StorageService.getInstance();
+    final libraryKeys = _allLibraries.map((lib) => lib.globalKey).toList();
+    await storage.saveLibraryOrder(libraryKeys);
+    widget.onLibraryOrderChanged?.call();
+  }
+
+  /// Public method to load a library by key (called from MainScreen side nav)
+  @override
+  void loadLibraryByKey(String libraryGlobalKey) {
+    _loadLibraryContent(libraryGlobalKey);
+  }
+
+  Future<void> _loadLibraryContent(String libraryGlobalKey) async {
+    // Compute visible libraries based on current provider state
+    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
+      context,
+      listen: false,
+    );
+    final hiddenKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
+    final visibleLibraries = _allLibraries
+        .where((lib) => !hiddenKeys.contains(lib.globalKey))
+        .toList();
+
+    // Find the library by key
+    final libraryIndex = visibleLibraries.indexWhere(
+      (lib) => lib.globalKey == libraryGlobalKey,
+    );
+    if (libraryIndex == -1) return; // Library not found or hidden
+
+    final library = visibleLibraries[libraryIndex];
+
+    final isChangingLibrary =
+        !_isInitialLoad && _selectedLibraryGlobalKey != libraryGlobalKey;
+
+    // Get the correct client for this library's server
+    final client = context.getClientForLibrary(library);
+
+    _updateState(() {
+      _selectedLibraryGlobalKey = libraryGlobalKey;
+      _errorMessage = null;
+      // Clear loaded tabs tracking for new library
+      _loadedTabs.clear();
+      // Only clear filters when explicitly changing library (not on initial load)
+      if (isChangingLibrary) {
+        _selectedFilters.clear();
+      }
+    });
+
+    // Mark that initial load is complete
+    if (_isInitialLoad) {
+      _isInitialLoad = false;
+    }
+
+    // Save selected library key and restore saved tab
+    final storage = await StorageService.getInstance();
+    await storage.saveSelectedLibraryKey(libraryGlobalKey);
+
+    // Restore saved tab index for this library
+    final savedTabIndex = storage.getLibraryTab(libraryGlobalKey);
+    if (savedTabIndex != null && savedTabIndex >= 0 && savedTabIndex < 4) {
+      // Set flag to prevent _onTabChanged from triggering focus
+      _isRestoringTab = true;
+      _updateState(() {
+        _tabController.index = savedTabIndex;
+      });
+      // Clear flag after the tab change has been processed
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _isRestoringTab = false;
+      });
+    }
+
+    // Focus is handled by onDataLoaded callbacks from each tab.
+    // However, on first load the tab might finish loading before the tab index
+    // is restored. Check if the current tab has already loaded and focus if so.
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted &&
+          _selectedLibraryGlobalKey == libraryGlobalKey &&
+          _loadedTabs.contains(_tabController.index)) {
+        _focusCurrentTab();
+      }
+    });
+
+    // Clear filters in storage when changing library
+    if (isChangingLibrary) {
+      await storage.saveLibraryFilters({}, sectionId: libraryGlobalKey);
+    }
+
+    // Cancel any existing requests
+    _cancelToken?.cancel();
+    _cancelToken = CancelToken();
+    final currentRequestId = ++_requestId;
+
+    // Reset pagination state
+    _updateState(() {
+      _currentPage = 0;
+      _hasMoreItems = true;
+      _items = [];
+    });
+
+    try {
+      // Load sort options for the new library
+      await _loadSortOptions(library);
+
+      final filtersWithSort = _buildFiltersWithSort();
+
+      // Load pages sequentially
+      await _loadAllPagesSequentially(
+        library,
+        filtersWithSort,
+        currentRequestId,
+        client,
+      );
+    } catch (e) {
+      // Ignore cancellation errors
+      if (e is DioException && e.type == DioExceptionType.cancel) {
+        return;
+      }
+
+      _updateState(() {
+        _errorMessage = _getErrorMessage(e, 'library content');
+      });
+    }
+  }
+
+  /// Load all pages sequentially until all items are fetched
+  Future<void> _loadAllPagesSequentially(
+    PlexLibrary library,
+    Map<String, String> filtersWithSort,
+    int requestId,
+    PlexClient client,
+  ) async {
+    while (_hasMoreItems && requestId == _requestId) {
+      try {
+        final items = await client.getLibraryContent(
+          library.key,
+          start: _currentPage * _pageSize,
+          size: _pageSize,
+          filters: filtersWithSort,
+          cancelToken: _cancelToken,
+        );
+
+        // Tag items with server info for multi-server support
+        final taggedItems = items
+            .map(
+              (item) => item.copyWith(
+                serverId: library.serverId,
+                serverName: library.serverName,
+              ),
+            )
+            .toList();
+
+        // Check if request is still valid
+        if (requestId != _requestId) {
+          return; // Request was superseded
+        }
+
+        _updateState(() {
+          _items.addAll(taggedItems);
+          _currentPage++;
+          _hasMoreItems = taggedItems.length >= _pageSize;
+        });
+      } catch (e) {
+        // Check if it's a cancellation
+        if (e is DioException && e.type == DioExceptionType.cancel) {
+          return;
+        }
+
+        // For other errors, update state and rethrow
+        _updateState(() {
+          _hasMoreItems = false;
+        });
+        rethrow;
+      }
+    }
+  }
+
+  Future<void> _loadSortOptions(PlexLibrary library) async {
+    try {
+      final client = context.getClientForLibrary(library);
+
+      final sortOptions = await client.getLibrarySorts(library.key);
+
+      // Load saved sort preference for this library
+      final storage = await StorageService.getInstance();
+      final savedSortData = storage.getLibrarySort(library.globalKey);
+
+      // Find the saved sort in the options
+      PlexSort? savedSort;
+      bool descending = false;
+
+      if (savedSortData != null) {
+        final sortKey = savedSortData['key'] as String?;
+        if (sortKey != null) {
+          savedSort = sortOptions.firstWhere(
+            (s) => s.key == sortKey,
+            orElse: () => sortOptions.first,
+          );
+          descending = (savedSortData['descending'] as bool?) ?? false;
+        } else {
+          savedSort = sortOptions.first;
+        }
+      } else {
+        savedSort = sortOptions.first;
+      }
+
+      _updateState(() {
+        _selectedSort = savedSort;
+        _isSortDescending = descending;
+      });
+    } catch (e) {
+      _updateState(() {
+        _selectedSort = null;
+        _isSortDescending = false;
+      });
+    }
+  }
+
+  Map<String, String> _buildFiltersWithSort() {
+    final filtersWithSort = Map<String, String>.from(_selectedFilters);
+    if (_selectedSort != null) {
+      filtersWithSort['sort'] = _selectedSort!.getSortKey(
+        descending: _isSortDescending,
+      );
+    }
+    return filtersWithSort;
+  }
+
+  @override
+  void updateItemInLists(String ratingKey, PlexMetadata updatedMetadata) {
+    final index = _items.indexWhere((item) => item.ratingKey == ratingKey);
+    if (index != -1) {
+      _items[index] = updatedMetadata;
+    }
+  }
+
+  // Public method to refresh content (for normal navigation)
+  @override
+  void refresh() {
+    _loadLibraries();
+  }
+
+  // Refresh the currently active tab
+  void _refreshCurrentTab() {
+    switch (_tabController.index) {
+      case 0: // Recommended tab
+        final refreshable = _recommendedTabKey.currentState;
+        if (refreshable is Refreshable) {
+          (refreshable as Refreshable).refresh();
+        }
+        break;
+      case 1: // Browse tab
+        final refreshable = _browseTabKey.currentState;
+        if (refreshable is Refreshable) {
+          (refreshable as Refreshable).refresh();
+        }
+        break;
+      case 2: // Collections tab
+        final refreshable = _collectionsTabKey.currentState;
+        if (refreshable is Refreshable) {
+          (refreshable as Refreshable).refresh();
+        }
+        break;
+      case 3: // Playlists tab
+        final refreshable = _playlistsTabKey.currentState;
+        if (refreshable is Refreshable) {
+          (refreshable as Refreshable).refresh();
+        }
+        break;
+    }
+  }
+
+  // Public method to fully reload all content (for profile switches)
+  @override
+  void fullRefresh() {
+    appLogger.d('LibrariesScreen.fullRefresh() called - reloading all content');
+    // Reload libraries and clear any selected library/filters
+    _selectedLibraryGlobalKey = null;
+    _selectedFilters.clear();
+    _items.clear();
+    _loadLibraries();
+  }
+
+  Future<void> _toggleLibraryVisibility(PlexLibrary library) async {
+    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
+      context,
+      listen: false,
+    );
+    final isHidden = hiddenLibrariesProvider.hiddenLibraryKeys.contains(
+      library.globalKey,
+    );
+
+    if (isHidden) {
+      await hiddenLibrariesProvider.unhideLibrary(library.globalKey);
+    } else {
+      // Check if we're hiding the currently selected library
+      final isCurrentlySelected =
+          _selectedLibraryGlobalKey == library.globalKey;
+
+      await hiddenLibrariesProvider.hideLibrary(library.globalKey);
+
+      // If we just hid the selected library, select the first visible one
+      if (isCurrentlySelected) {
+        // Compute visible libraries after hiding
+        final visibleLibraries = _allLibraries
+            .where(
+              (lib) => !hiddenLibrariesProvider.hiddenLibraryKeys.contains(
+                lib.globalKey,
+              ),
+            )
+            .toList();
+
+        if (visibleLibraries.isNotEmpty) {
+          _loadLibraryContent(visibleLibraries.first.globalKey);
+        }
+      }
+    }
+  }
+
+  List<ContextMenuItem> _getLibraryMenuItems(PlexLibrary library) {
+    return [
+      ContextMenuItem(
+        value: 'scan',
+        icon: Symbols.refresh_rounded,
+        label: t.libraries.scanLibraryFiles,
+        requiresConfirmation: true,
+        confirmationTitle: t.libraries.scanLibrary,
+        confirmationMessage: t.libraries.scanLibraryConfirm(
+          title: library.title,
+        ),
+      ),
+      ContextMenuItem(
+        value: 'analyze',
+        icon: Symbols.analytics_rounded,
+        label: t.libraries.analyze,
+        requiresConfirmation: true,
+        confirmationTitle: t.libraries.analyzeLibrary,
+        confirmationMessage: t.libraries.analyzeLibraryConfirm(
+          title: library.title,
+        ),
+      ),
+      ContextMenuItem(
+        value: 'refresh',
+        icon: Symbols.sync_rounded,
+        label: t.libraries.refreshMetadata,
+        requiresConfirmation: true,
+        confirmationTitle: t.libraries.refreshMetadata,
+        confirmationMessage: t.libraries.refreshMetadataConfirm(
+          title: library.title,
+        ),
+        isDestructive: true,
+      ),
+      ContextMenuItem(
+        value: 'empty_trash',
+        icon: Symbols.delete_outline_rounded,
+        label: t.libraries.emptyTrash,
+        requiresConfirmation: true,
+        confirmationTitle: t.libraries.emptyTrash,
+        confirmationMessage: t.libraries.emptyTrashConfirm(
+          title: library.title,
+        ),
+        isDestructive: true,
+      ),
+    ];
+  }
+
+  void _handleLibraryMenuAction(String action, PlexLibrary library) {
+    switch (action) {
+      case 'scan':
+        _scanLibrary(library);
+        break;
+      case 'analyze':
+        _analyzeLibrary(library);
+        break;
+      case 'refresh':
+        _refreshLibraryMetadata(library);
+        break;
+      case 'empty_trash':
+        _emptyLibraryTrash(library);
+        break;
+    }
+  }
+
+  void _showLibraryManagementSheet() {
+    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
+      context,
+      listen: false,
+    );
+
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => _LibraryManagementSheet(
+        allLibraries: List.from(_allLibraries),
+        hiddenLibraryKeys: hiddenLibrariesProvider.hiddenLibraryKeys,
+        onReorder: (reorderedLibraries) {
+          setState(() {
+            _allLibraries = reorderedLibraries;
+          });
+          _saveLibraryOrder();
+        },
+        onToggleVisibility: _toggleLibraryVisibility,
+        getLibraryMenuItems: _getLibraryMenuItems,
+        onLibraryMenuAction: _handleLibraryMenuAction,
+      ),
+    );
+  }
+
+  Future<void> _performLibraryAction({
+    required PlexLibrary library,
+    required Future<void> Function(PlexClient client) action,
+    required String progressMessage,
+    required String successMessage,
+    required String Function(Object error) failureMessage,
+  }) async {
+    try {
+      final client = context.getClientForLibrary(library);
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(progressMessage),
+            duration: const Duration(seconds: 2),
+          ),
+        );
+      }
+
+      await action(client);
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(successMessage),
+            duration: const Duration(seconds: 3),
+          ),
+        );
+      }
+    } catch (e) {
+      appLogger.e('Library action failed', error: e);
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(failureMessage(e)),
+            backgroundColor: Colors.red,
+            duration: const Duration(seconds: 3),
+          ),
+        );
+      }
+    }
+  }
+
+  Future<void> _scanLibrary(PlexLibrary library) async {
+    return _performLibraryAction(
+      library: library,
+      action: (client) => client.scanLibrary(library.key),
+      progressMessage: t.messages.libraryScanning(title: library.title),
+      successMessage: t.messages.libraryScanStarted(title: library.title),
+      failureMessage: (error) =>
+          t.messages.libraryScanFailed(error: error.toString()),
+    );
+  }
+
+  Future<void> _refreshLibraryMetadata(PlexLibrary library) async {
+    return _performLibraryAction(
+      library: library,
+      action: (client) => client.refreshLibraryMetadata(library.key),
+      progressMessage: t.messages.metadataRefreshing(title: library.title),
+      successMessage: t.messages.metadataRefreshStarted(title: library.title),
+      failureMessage: (error) =>
+          t.messages.metadataRefreshFailed(error: error.toString()),
+    );
+  }
+
+  Future<void> _emptyLibraryTrash(PlexLibrary library) async {
+    return _performLibraryAction(
+      library: library,
+      action: (client) => client.emptyLibraryTrash(library.key),
+      progressMessage: t.libraries.emptyingTrash(title: library.title),
+      successMessage: t.libraries.trashEmptied(title: library.title),
+      failureMessage: (error) => t.libraries.failedToEmptyTrash(error: error),
+    );
+  }
+
+  Future<void> _analyzeLibrary(PlexLibrary library) async {
+    return _performLibraryAction(
+      library: library,
+      action: (client) => client.analyzeLibrary(library.key),
+      progressMessage: t.libraries.analyzing(title: library.title),
+      successMessage: t.libraries.analysisStarted(title: library.title),
+      failureMessage: (error) => t.libraries.failedToAnalyze(error: error),
+    );
+  }
+
+  /// Get set of library names that appear more than once (not globally unique)
+  Set<String> _getNonUniqueLibraryNames(List<PlexLibrary> libraries) {
+    final nameCounts = <String, int>{};
+    for (final lib in libraries) {
+      nameCounts[lib.title] = (nameCounts[lib.title] ?? 0) + 1;
+    }
+    return nameCounts.entries
+        .where((e) => e.value > 1)
+        .map((e) => e.key)
+        .toSet();
+  }
+
+  /// Build dropdown menu items with server subtitle for non-unique names
+  List<PopupMenuEntry<String>> _buildGroupedLibraryMenuItems(
+    List<PlexLibrary> visibleLibraries,
+  ) {
+    // Find which library names are not unique
+    final nonUniqueNames = _getNonUniqueLibraryNames(visibleLibraries);
+
+    return visibleLibraries.map((library) {
+      final isSelected = library.globalKey == _selectedLibraryGlobalKey;
+      final showServerName =
+          nonUniqueNames.contains(library.title) && library.serverName != null;
+
+      return PopupMenuItem<String>(
+        value: library.globalKey,
+        child: Row(
+          children: [
+            AppIcon(
+              _getLibraryIcon(library.type),
+              fill: 1,
+              size: 20,
+              color: isSelected ? Theme.of(context).colorScheme.primary : null,
+            ),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    library.title,
+                    style: TextStyle(
+                      fontWeight: isSelected
+                          ? FontWeight.w600
+                          : FontWeight.w400,
+                      color: isSelected
+                          ? Theme.of(context).colorScheme.primary
+                          : null,
+                    ),
+                  ),
+                  if (showServerName)
+                    Text(
+                      library.serverName!,
+                      style: TextStyle(
+                        fontSize: 11,
+                        color: Theme.of(
+                          context,
+                        ).textTheme.bodySmall?.color?.withValues(alpha: 0.6),
+                      ),
+                    ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      );
+    }).toList();
+  }
+
+  Widget _buildTabChip(String label, int index) {
+    final isSelected = _tabController.index == index;
+    const tabCount = 4; // Recommended, Browse, Collections, Playlists
+
+    return FocusableTabChip(
+      label: label,
+      isSelected: isSelected,
+      focusNode: _getTabChipFocusNode(index),
+      onSelect: () {
+        if (isSelected) {
+          // Already selected - navigate to tab content
+          _focusCurrentTab();
+        } else {
+          // Switch to this tab
+          setState(() {
+            _tabController.index = index;
+          });
+        }
+      },
+      onNavigateLeft: index > 0
+          ? () {
+              final newIndex = index - 1;
+              setState(() {
+                _suppressAutoFocus = true;
+                _tabController.index = newIndex;
+              });
+              _getTabChipFocusNode(newIndex).requestFocus();
+            }
+          : null,
+      onNavigateRight: index < tabCount - 1
+          ? () {
+              final newIndex = index + 1;
+              setState(() {
+                _suppressAutoFocus = true;
+                _tabController.index = newIndex;
+              });
+              _getTabChipFocusNode(newIndex).requestFocus();
+            }
+          : null,
+      onNavigateDown: _focusCurrentTab,
+      onBack: _onTabBarBack,
+    );
+  }
+
+  /// Build the app bar title - either dropdown on mobile or simple title on desktop
+  Widget _buildAppBarTitle(List<PlexLibrary> visibleLibraries) {
+    // No libraries or no selection
+    if (visibleLibraries.isEmpty || _selectedLibraryGlobalKey == null) {
+      return Text(t.libraries.title);
+    }
+
+    // On desktop/TV with side nav, show tabs in app bar (library name is in side nav)
+    if (PlatformDetector.shouldUseSideNavigation(context)) {
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          _buildTabChip(t.libraries.tabs.recommended, 0),
+          const SizedBox(width: 8),
+          _buildTabChip(t.libraries.tabs.browse, 1),
+          const SizedBox(width: 8),
+          _buildTabChip(t.libraries.tabs.collections, 2),
+          const SizedBox(width: 8),
+          _buildTabChip(t.libraries.tabs.playlists, 3),
+        ],
+      );
+    }
+
+    // On mobile, show the dropdown
+    return _buildLibraryDropdownTitle(visibleLibraries);
+  }
+
+  Widget _buildLibraryDropdownTitle(List<PlexLibrary> visibleLibraries) {
+    final selectedLibrary = visibleLibraries.firstWhere(
+      (lib) => lib.globalKey == _selectedLibraryGlobalKey,
+      orElse: () => visibleLibraries.first,
+    );
+
+    return PopupMenuButton<String>(
+      key: _libraryDropdownKey,
+      offset: const Offset(0, 48),
+      tooltip: t.libraries.selectLibrary,
+      onSelected: (libraryGlobalKey) {
+        _loadLibraryContent(libraryGlobalKey);
+      },
+      itemBuilder: (context) => _buildGroupedLibraryMenuItems(visibleLibraries),
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            AppIcon(_getLibraryIcon(selectedLibrary.type), fill: 1, size: 20),
+            const SizedBox(width: 8),
+            if (_hasMultipleServers && selectedLibrary.serverName != null)
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    selectedLibrary.title,
+                    style: Theme.of(context).textTheme.titleMedium,
+                  ),
+                  Text(
+                    selectedLibrary.serverName!,
+                    style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                      color: Theme.of(
+                        context,
+                      ).textTheme.bodySmall?.color?.withValues(alpha: 0.6),
+                    ),
+                  ),
+                ],
+              )
+            else
+              Text(
+                selectedLibrary.title,
+                style: Theme.of(context).textTheme.titleLarge,
+              ),
+            const SizedBox(width: 4),
+            const AppIcon(Symbols.arrow_drop_down_rounded, fill: 1, size: 24),
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Watch for hidden libraries changes to trigger rebuild
+    final hiddenLibrariesProvider = context.watch<HiddenLibrariesProvider>();
+    final hiddenKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
+
+    // Compute visible libraries (filtered from all libraries)
+    final visibleLibraries = _allLibraries
+        .where((lib) => !hiddenKeys.contains(lib.globalKey))
+        .toList();
+
+    return Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          DesktopSliverAppBar(
+            title: _buildAppBarTitle(visibleLibraries),
+            floating: true,
+            pinned: true,
+            backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+            surfaceTintColor: Colors.transparent,
+            shadowColor: Colors.transparent,
+            scrolledUnderElevation: 0,
+            actions: [
+              if (_allLibraries.isNotEmpty)
+                IconButton(
+                  icon: const AppIcon(Symbols.edit_rounded, fill: 1),
+                  tooltip: t.libraries.manageLibraries,
+                  onPressed: _showLibraryManagementSheet,
+                ),
+              IconButton(
+                icon: const AppIcon(Symbols.refresh_rounded, fill: 1),
+                tooltip: t.common.refresh,
+                onPressed: _refreshCurrentTab,
+              ),
+            ],
+          ),
+          if (_isLoadingLibraries)
+            const SliverFillRemaining(
+              child: Center(child: CircularProgressIndicator()),
+            )
+          else if (_errorMessage != null && visibleLibraries.isEmpty)
+            SliverFillRemaining(
+              child: Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    const AppIcon(
+                      Symbols.error_outline_rounded,
+                      fill: 1,
+                      size: 48,
+                      color: Colors.red,
+                    ),
+                    const SizedBox(height: 16),
+                    Text(_errorMessage!),
+                    const SizedBox(height: 16),
+                    ElevatedButton(
+                      onPressed: _loadLibraries,
+                      child: Text(t.common.retry),
+                    ),
+                  ],
+                ),
+              ),
+            )
+          else if (visibleLibraries.isEmpty)
+            SliverFillRemaining(
+              child: Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    const AppIcon(
+                      Symbols.video_library_rounded,
+                      fill: 1,
+                      size: 64,
+                      color: Colors.grey,
+                    ),
+                    const SizedBox(height: 16),
+                    Text(t.libraries.noLibrariesFound),
+                  ],
+                ),
+              ),
+            )
+          else ...[
+            // Tab selector chips (only on mobile - desktop has them in app bar)
+            if (_selectedLibraryGlobalKey != null &&
+                !PlatformDetector.shouldUseSideNavigation(context))
+              SliverToBoxAdapter(
+                child: Container(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 8,
+                  ),
+                  child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
+                    child: Row(
+                      children: [
+                        _buildTabChip(t.libraries.tabs.recommended, 0),
+                        const SizedBox(width: 8),
+                        _buildTabChip(t.libraries.tabs.browse, 1),
+                        const SizedBox(width: 8),
+                        _buildTabChip(t.libraries.tabs.collections, 2),
+                        const SizedBox(width: 8),
+                        _buildTabChip(t.libraries.tabs.playlists, 3),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+
+            // Tab content
+            if (_selectedLibraryGlobalKey != null)
+              SliverFillRemaining(
+                child: TabBarView(
+                  key: ValueKey(_selectedLibraryGlobalKey),
+                  controller: _tabController,
+                  children: [
+                    LibraryRecommendedTab(
+                      key: _recommendedTabKey,
+                      library: _allLibraries.firstWhere(
+                        (lib) => lib.globalKey == _selectedLibraryGlobalKey,
+                      ),
+                      isActive: _tabController.index == 0,
+                      suppressAutoFocus: _suppressAutoFocus,
+                      onDataLoaded: () => _handleTabDataLoaded(0),
+                      onBack: focusTabBar,
+                    ),
+                    LibraryBrowseTab(
+                      key: _browseTabKey,
+                      library: _allLibraries.firstWhere(
+                        (lib) => lib.globalKey == _selectedLibraryGlobalKey,
+                      ),
+                      isActive: _tabController.index == 1,
+                      suppressAutoFocus: _suppressAutoFocus,
+                      onDataLoaded: () => _handleTabDataLoaded(1),
+                      onBack: focusTabBar,
+                    ),
+                    LibraryCollectionsTab(
+                      key: _collectionsTabKey,
+                      library: _allLibraries.firstWhere(
+                        (lib) => lib.globalKey == _selectedLibraryGlobalKey,
+                      ),
+                      isActive: _tabController.index == 2,
+                      suppressAutoFocus: _suppressAutoFocus,
+                      onDataLoaded: () => _handleTabDataLoaded(2),
+                      onBack: focusTabBar,
+                    ),
+                    LibraryPlaylistsTab(
+                      key: _playlistsTabKey,
+                      library: _allLibraries.firstWhere(
+                        (lib) => lib.globalKey == _selectedLibraryGlobalKey,
+                      ),
+                      isActive: _tabController.index == 3,
+                      suppressAutoFocus: _suppressAutoFocus,
+                      onDataLoaded: () => _handleTabDataLoaded(3),
+                      onBack: focusTabBar,
+                    ),
+                  ],
+                ),
+              ),
+          ],
+        ],
+      ),
+    );
+  }
+
+  IconData _getLibraryIcon(String type) {
+    switch (type.toLowerCase()) {
+      case 'movie':
+        return Symbols.movie_rounded;
+      case 'show':
+        return Symbols.tv_rounded;
+      case 'artist':
+        return Symbols.music_note_rounded;
+      case 'photo':
+        return Symbols.photo_rounded;
+      default:
+        return Symbols.folder_rounded;
+    }
+  }
+}
+
+class _LibraryManagementSheet extends StatefulWidget {
+  final List<PlexLibrary> allLibraries;
+  final Set<String> hiddenLibraryKeys;
+  final Function(List<PlexLibrary>) onReorder;
+  final Function(PlexLibrary) onToggleVisibility;
+  final List<ContextMenuItem> Function(PlexLibrary) getLibraryMenuItems;
+  final void Function(String action, PlexLibrary library) onLibraryMenuAction;
+
+  const _LibraryManagementSheet({
+    required this.allLibraries,
+    required this.hiddenLibraryKeys,
+    required this.onReorder,
+    required this.onToggleVisibility,
+    required this.getLibraryMenuItems,
+    required this.onLibraryMenuAction,
+  });
+
+  @override
+  State<_LibraryManagementSheet> createState() =>
+      _LibraryManagementSheetState();
+}
+
+class _LibraryManagementSheetState extends State<_LibraryManagementSheet> {
+  late List<PlexLibrary> _tempLibraries;
+
+  // Keyboard navigation state
+  int _focusedIndex = 0;
+  int _focusedColumn = 0; // 0 = row, 1 = visibility button, 2 = options button
+  int? _movingIndex; // Non-null when in move mode
+  int? _originalIndex; // Original position before move (for cancel)
+  List<PlexLibrary>? _originalOrder; // Original order before move (for cancel)
+  final FocusNode _listFocusNode = FocusNode();
+
+  @override
+  void initState() {
+    super.initState();
+    _tempLibraries = List.from(widget.allLibraries);
+  }
+
+  @override
+  void dispose() {
+    _listFocusNode.dispose();
+    super.dispose();
+  }
+
+  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent) return KeyEventResult.ignored;
+
+    final key = event.logicalKey;
+
+    if (_movingIndex != null) {
+      // Move mode - arrows reorder the item
+      if (key.isUpKey && _movingIndex! > 0) {
+        setState(() {
+          final item = _tempLibraries.removeAt(_movingIndex!);
+          _tempLibraries.insert(_movingIndex! - 1, item);
+          _movingIndex = _movingIndex! - 1;
+          _focusedIndex = _movingIndex!;
+        });
+        return KeyEventResult.handled;
+      }
+      if (key.isDownKey && _movingIndex! < _tempLibraries.length - 1) {
+        setState(() {
+          final item = _tempLibraries.removeAt(_movingIndex!);
+          _tempLibraries.insert(_movingIndex! + 1, item);
+          _movingIndex = _movingIndex! + 1;
+          _focusedIndex = _movingIndex!;
+        });
+        return KeyEventResult.handled;
+      }
+      if (key.isSelectKey) {
+        // Confirm move - apply the reorder
+        widget.onReorder(_tempLibraries);
+        setState(() {
+          _movingIndex = null;
+          _originalIndex = null;
+          _originalOrder = null;
+        });
+        return KeyEventResult.handled;
+      }
+      if (key.isBackKey) {
+        // Cancel move - restore original position
+        setState(() {
+          if (_originalOrder != null) {
+            _tempLibraries = List.from(_originalOrder!);
+          }
+          _focusedIndex = _originalIndex ?? 0;
+          _movingIndex = null;
+          _originalIndex = null;
+          _originalOrder = null;
+        });
+        return KeyEventResult.handled;
+      }
+    } else {
+      // Navigation mode
+      if (key.isUpKey && _focusedIndex > 0) {
+        setState(() {
+          _focusedIndex--;
+          _focusedColumn = 0; // Reset to row when changing rows
+        });
+        return KeyEventResult.handled;
+      }
+      if (key.isDownKey && _focusedIndex < _tempLibraries.length - 1) {
+        setState(() {
+          _focusedIndex++;
+          _focusedColumn = 0; // Reset to row when changing rows
+        });
+        return KeyEventResult.handled;
+      }
+      if (key.isLeftKey && _focusedColumn > 0) {
+        setState(() => _focusedColumn--);
+        return KeyEventResult.handled;
+      }
+      if (key.isRightKey && _focusedColumn < 2) {
+        setState(() => _focusedColumn++);
+        return KeyEventResult.handled;
+      }
+      if (key.isSelectKey) {
+        if (_focusedColumn == 0) {
+          // Enter move mode
+          setState(() {
+            _movingIndex = _focusedIndex;
+            _originalIndex = _focusedIndex;
+            _originalOrder = List.from(_tempLibraries);
+          });
+        } else if (_focusedColumn == 1) {
+          // Toggle visibility
+          final library = _tempLibraries[_focusedIndex];
+          widget.onToggleVisibility(library);
+        } else if (_focusedColumn == 2) {
+          // Show options menu
+          final library = _tempLibraries[_focusedIndex];
+          _showLibraryMenuBottomSheet(context, library);
+        }
+        return KeyEventResult.handled;
+      }
+      if (key.isBackKey) {
+        Navigator.pop(context);
+        return KeyEventResult.handled;
+      }
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  void _reorderLibraries(int oldIndex, int newIndex) {
+    setState(() {
+      if (newIndex > oldIndex) {
+        newIndex -= 1;
+      }
+      final library = _tempLibraries.removeAt(oldIndex);
+      _tempLibraries.insert(newIndex, library);
+    });
+    // Apply immediately
+    widget.onReorder(_tempLibraries);
+  }
+
+  Future<void> _showLibraryMenuBottomSheet(
+    BuildContext outerContext,
+    PlexLibrary library,
+  ) async {
+    final menuItems = widget.getLibraryMenuItems(library);
+    final selected = await showModalBottomSheet<String>(
+      context: outerContext,
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(16),
+              child: Text(
+                library.title,
+                style: const TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ),
+            ...menuItems.indexed.map(
+              (entry) => ListTile(
+                leading: AppIcon(entry.$2.icon, fill: 1),
+                title: Text(entry.$2.label),
+                onTap: () => Navigator.pop(context, entry.$2.value),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+
+    if (selected != null && mounted) {
+      // Find the selected item to check if confirmation is needed
+      final selectedItem = menuItems.firstWhere(
+        (item) => item.value == selected,
+      );
+
+      if (selectedItem.requiresConfirmation) {
+        if (!mounted || !context.mounted) return;
+        final confirmed = await showDialog<bool>(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: Text(
+              selectedItem.confirmationTitle ?? t.dialog.confirmAction,
+            ),
+            content: Text(
+              selectedItem.confirmationMessage ??
+                  t.libraries.confirmActionMessage,
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.pop(context, false),
+                child: Text(t.common.cancel),
+              ),
+              TextButton(
+                onPressed: () => Navigator.pop(context, true),
+                style: selectedItem.isDestructive
+                    ? TextButton.styleFrom(foregroundColor: Colors.red)
+                    : null,
+                child: Text(t.common.confirm),
+              ),
+            ],
+          ),
+        );
+
+        if (confirmed != true) return;
+      }
+
+      widget.onLibraryMenuAction(selected, library);
+    }
+  }
+
+  IconData _getLibraryIcon(String type) {
+    switch (type.toLowerCase()) {
+      case 'movie':
+        return Symbols.movie_rounded;
+      case 'show':
+        return Symbols.tv_rounded;
+      case 'artist':
+        return Symbols.music_note_rounded;
+      case 'photo':
+        return Symbols.photo_rounded;
+      default:
+        return Symbols.folder_rounded;
+    }
+  }
+
+  /// Get set of library names that appear more than once (not globally unique)
+  Set<String> _getNonUniqueLibraryNames() {
+    final nameCounts = <String, int>{};
+    for (final lib in _tempLibraries) {
+      nameCounts[lib.title] = (nameCounts[lib.title] ?? 0) + 1;
+    }
+    return nameCounts.entries
+        .where((e) => e.value > 1)
+        .map((e) => e.key)
+        .toSet();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Watch provider to rebuild when hidden libraries change
+    final hiddenLibrariesProvider = context.watch<HiddenLibrariesProvider>();
+    final hiddenLibraryKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
+
+    return DraggableScrollableSheet(
+      initialChildSize: 0.7,
+      minChildSize: 0.5,
+      maxChildSize: 0.95,
+      expand: false,
+      builder: (context, scrollController) {
+        return Column(
+          children: [
+            // Header
+            Container(
+              padding: const EdgeInsets.all(16),
+              decoration: BoxDecoration(
+                border: Border(
+                  bottom: BorderSide(color: Theme.of(context).dividerColor),
+                ),
+              ),
+              child: Row(
+                children: [
+                  const AppIcon(Symbols.edit_rounded, fill: 1),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: Text(
+                      t.libraries.manageLibraries,
+                      style: const TextStyle(
+                        fontSize: 20,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  IconButton(
+                    icon: const AppIcon(Symbols.close_rounded, fill: 1),
+                    onPressed: () => Navigator.pop(context),
+                  ),
+                ],
+              ),
+            ),
+
+            // Library list (grouped by server if multiple servers)
+            Expanded(
+              child: Focus(
+                focusNode: _listFocusNode,
+                autofocus: InputModeTracker.isKeyboardMode(context),
+                onKeyEvent: _handleKeyEvent,
+                child: _buildFlatLibraryList(
+                  scrollController,
+                  hiddenLibraryKeys,
+                ),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  /// Build flat library list with server subtitle for non-unique names
+  Widget _buildFlatLibraryList(
+    ScrollController scrollController,
+    Set<String> hiddenLibraryKeys,
+  ) {
+    final nonUniqueNames = _getNonUniqueLibraryNames();
+    final isKeyboardMode = InputModeTracker.isKeyboardMode(context);
+
+    return ReorderableListView.builder(
+      scrollController: scrollController,
+      onReorder: _reorderLibraries,
+      itemCount: _tempLibraries.length,
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      buildDefaultDragHandles: false,
+      itemBuilder: (context, index) {
+        final library = _tempLibraries[index];
+        final showServerName =
+            nonUniqueNames.contains(library.title) &&
+            library.serverName != null;
+        final isFocused = isKeyboardMode && index == _focusedIndex;
+        final isMoving = index == _movingIndex;
+        return _buildLibraryTile(
+          library,
+          index,
+          hiddenLibraryKeys,
+          showServerName: showServerName,
+          isFocused: isFocused,
+          isMoving: isMoving,
+          focusedColumn: isFocused ? _focusedColumn : null,
+        );
+      },
+    );
+  }
+
+  /// Build a single library tile
+  Widget _buildLibraryTile(
+    PlexLibrary library,
+    int index,
+    Set<String> hiddenLibraryKeys, {
+    bool showServerName = false,
+    bool isFocused = false,
+    bool isMoving = false,
+    int? focusedColumn,
+  }) {
+    final isHidden = hiddenLibraryKeys.contains(library.globalKey);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    // Determine background color based on state
+    Color? tileColor;
+    if (isMoving) {
+      tileColor = colorScheme.primaryContainer;
+    } else if (isFocused && focusedColumn == 0) {
+      // Only highlight row when row itself is focused (column 0)
+      tileColor = colorScheme.surfaceContainerHighest;
+    }
+
+    // Button focus states
+    final isVisibilityButtonFocused = isFocused && focusedColumn == 1;
+    final isOptionsButtonFocused = isFocused && focusedColumn == 2;
+
+    return Opacity(
+      key: ValueKey(library.globalKey),
+      opacity: isHidden ? 0.5 : 1.0,
+      child: Container(
+        decoration: BoxDecoration(color: tileColor),
+        child: ListTile(
+          leading: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ReorderableDragStartListener(
+                index: index,
+                child: AppIcon(
+                  isMoving
+                      ? Symbols.swap_vert_rounded
+                      : Symbols.drag_indicator_rounded,
+                  fill: 1,
+                  color: isMoving
+                      ? colorScheme.primary
+                      : IconTheme.of(context).color?.withValues(alpha: 0.5),
+                ),
+              ),
+              const SizedBox(width: 8),
+              AppIcon(_getLibraryIcon(library.type), fill: 1),
+            ],
+          ),
+          title: Text(library.title),
+          subtitle: showServerName
+              ? Text(
+                  library.serverName!,
+                  style: TextStyle(
+                    fontSize: 11,
+                    color: Theme.of(
+                      context,
+                    ).textTheme.bodySmall?.color?.withValues(alpha: 0.6),
+                  ),
+                )
+              : null,
+          trailing: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Container(
+                decoration: isVisibilityButtonFocused
+                    ? BoxDecoration(
+                        color: colorScheme.surfaceContainerHighest,
+                        borderRadius: BorderRadius.circular(20),
+                      )
+                    : null,
+                child: IconButton(
+                  icon: AppIcon(
+                    isHidden
+                        ? Symbols.visibility_off_rounded
+                        : Symbols.visibility_rounded,
+                    fill: 1,
+                  ),
+                  tooltip: isHidden
+                      ? t.libraries.showLibrary
+                      : t.libraries.hideLibrary,
+                  onPressed: () => widget.onToggleVisibility(library),
+                ),
+              ),
+              Container(
+                decoration: isOptionsButtonFocused
+                    ? BoxDecoration(
+                        color: colorScheme.surfaceContainerHighest,
+                        borderRadius: BorderRadius.circular(20),
+                      )
+                    : null,
+                child: IconButton(
+                  icon: const AppIcon(Symbols.more_vert_rounded, fill: 1),
+                  tooltip: t.libraries.libraryOptions,
+                  onPressed: () =>
+                      _showLibraryMenuBottomSheet(context, library),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/libraries/sort_bottom_sheet.dart b/lib/screens/libraries/sort_bottom_sheet.dart
new file mode 100644
index 00000000..70928087
--- /dev/null
+++ b/lib/screens/libraries/sort_bottom_sheet.dart
@@ -0,0 +1,146 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../models/plex_sort.dart';
+import '../../widgets/bottom_sheet_header.dart';
+import '../../widgets/focusable_bottom_sheet.dart';
+import '../../widgets/focusable_list_tile.dart';
+import '../../i18n/strings.g.dart';
+
+class SortBottomSheet extends StatefulWidget {
+  final List<PlexSort> sortOptions;
+  final PlexSort? selectedSort;
+  final bool isSortDescending;
+  final Function(PlexSort, bool) onSortChanged;
+  final VoidCallback? onClear;
+
+  const SortBottomSheet({
+    super.key,
+    required this.sortOptions,
+    required this.selectedSort,
+    required this.isSortDescending,
+    required this.onSortChanged,
+    this.onClear,
+  });
+
+  @override
+  State<SortBottomSheet> createState() => _SortBottomSheetState();
+}
+
+class _SortBottomSheetState extends State<SortBottomSheet> {
+  late PlexSort? _currentSort;
+  late bool _currentDescending;
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _currentSort = widget.selectedSort;
+    _currentDescending = widget.isSortDescending;
+    _initialFocusNode = FocusNode(debugLabel: 'SortBottomSheetInitialFocus');
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  void _handleSortChange(PlexSort sort, bool descending) {
+    setState(() {
+      _currentSort = sort;
+      _currentDescending = descending;
+    });
+    widget.onSortChanged(sort, descending);
+    Navigator.pop(context);
+  }
+
+  void _handleClear() {
+    setState(() {
+      _currentSort = null;
+      _currentDescending = false;
+    });
+    widget.onClear?.call();
+    Navigator.pop(context);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusableBottomSheet(
+      initialFocusNode: _initialFocusNode,
+      child: DraggableScrollableSheet(
+        initialChildSize: 0.6,
+        minChildSize: 0.4,
+        maxChildSize: 0.9,
+        expand: false,
+        builder: (context, scrollController) {
+          return Column(
+            children: [
+              BottomSheetHeader(
+                title: t.libraries.sortBy,
+                action: widget.onClear != null
+                    ? TextButton(
+                        onPressed: _handleClear,
+                        child: Text(t.common.clear),
+                      )
+                    : null,
+              ),
+              Expanded(
+                child: RadioGroup<PlexSort>(
+                  groupValue: _currentSort,
+                  onChanged: (value) {
+                    if (value != null) {
+                      _handleSortChange(value, value.isDefaultDescending);
+                    }
+                  },
+                  child: ListView.builder(
+                    controller: scrollController,
+                    padding: const EdgeInsets.symmetric(vertical: 8),
+                    itemCount: widget.sortOptions.length,
+                    itemBuilder: (context, index) {
+                      final sort = widget.sortOptions[index];
+                      final isSelected = _currentSort?.key == sort.key;
+
+                      return FocusableRadioListTile<PlexSort>(
+                        focusNode: index == 0 ? _initialFocusNode : null,
+                        title: Text(sort.title),
+                        value: sort,
+                        secondary: isSelected
+                            ? SegmentedButton<bool>(
+                                showSelectedIcon: false,
+                                segments: const [
+                                  ButtonSegment(
+                                    value: false,
+                                    icon: AppIcon(
+                                      Symbols.arrow_upward_rounded,
+                                      fill: 1,
+                                      size: 16,
+                                    ),
+                                  ),
+                                  ButtonSegment(
+                                    value: true,
+                                    icon: AppIcon(
+                                      Symbols.arrow_downward_rounded,
+                                      fill: 1,
+                                      size: 16,
+                                    ),
+                                  ),
+                                ],
+                                selected: {_currentDescending},
+                                onSelectionChanged: (Set<bool> newSelection) {
+                                  _handleSortChange(sort, newSelection.first);
+                                },
+                              )
+                            : null,
+                      );
+                    },
+                  ),
+                ),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/screens/libraries/state_message_widget.dart b/lib/screens/libraries/state_message_widget.dart
new file mode 100644
index 00000000..2309279c
--- /dev/null
+++ b/lib/screens/libraries/state_message_widget.dart
@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+/// Base widget for displaying state messages (empty, error, etc.)
+/// Provides a consistent UI pattern for showing icons, messages, and actions
+class StateMessageWidget extends StatelessWidget {
+  /// The message to display
+  final String message;
+
+  /// Optional icon to display above the message
+  final IconData? icon;
+
+  /// Optional color for the icon
+  final Color? iconColor;
+
+  /// Optional color for the message text
+  final Color? textColor;
+
+  /// Optional callback for action button
+  final VoidCallback? onAction;
+
+  /// Optional label for the action button
+  final String? actionLabel;
+
+  /// Optional icon for the action button
+  final IconData? actionIcon;
+
+  const StateMessageWidget({
+    super.key,
+    required this.message,
+    this.icon,
+    this.iconColor,
+    this.textColor,
+    this.onAction,
+    this.actionLabel,
+    this.actionIcon,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(24.0),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            if (icon != null) ...[
+              AppIcon(
+                icon,
+                fill: 1,
+                size: 64,
+                color:
+                    iconColor ??
+                    Theme.of(
+                      context,
+                    ).colorScheme.onSurface.withValues(alpha: 0.4),
+              ),
+              const SizedBox(height: 16),
+            ],
+            Text(
+              message,
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                color:
+                    textColor ??
+                    Theme.of(
+                      context,
+                    ).colorScheme.onSurface.withValues(alpha: 0.6),
+              ),
+            ),
+            if (onAction != null && actionLabel != null) ...[
+              const SizedBox(height: 24),
+              FilledButton.icon(
+                onPressed: onAction,
+                icon: AppIcon(actionIcon ?? Symbols.refresh_rounded, fill: 1),
+                label: Text(actionLabel!),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/libraries/tabs/base_library_tab.dart b/lib/screens/libraries/tabs/base_library_tab.dart
new file mode 100644
index 00000000..7b2bd03a
--- /dev/null
+++ b/lib/screens/libraries/tabs/base_library_tab.dart
@@ -0,0 +1,242 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import '../../../models/plex_library.dart';
+import '../../../utils/app_logger.dart';
+import '../../../mixins/library_tab_state.dart';
+import '../../../mixins/refreshable.dart';
+import '../content_state_builder.dart';
+
+/// Base class for library tab screens that provides common state management
+/// and lifecycle handling for tabs that display library content.
+///
+/// Type parameter T: The type of items this tab displays
+///
+/// Subclasses must implement:
+/// - [loadData]: Load data from the Plex API
+/// - [buildContent]: Build the UI for displaying loaded items
+///
+/// Optional overrides:
+/// - [emptyIcon]: Icon to show when there are no items
+/// - [emptyMessage]: Message to show when there are no items
+/// - [errorContext]: Context for error messages (defaults to "content")
+/// - [getRefreshStream]: Stream to listen for refresh events
+abstract class BaseLibraryTab<T> extends StatefulWidget {
+  final PlexLibrary library;
+  final String? viewMode;
+  final String? density;
+
+  /// Callback invoked when data has finished loading successfully.
+  /// Used by parent to trigger focus on the first item.
+  final VoidCallback? onDataLoaded;
+
+  /// Whether this tab is currently the active/visible tab.
+  /// Used for internal focus management.
+  final bool isActive;
+
+  /// Whether to suppress auto-focus when tab becomes active.
+  /// Used when navigating via tab bar to keep focus on the tab chips.
+  final bool suppressAutoFocus;
+
+  /// Called when the user presses BACK in the tab content.
+  /// Used to navigate focus back to the tab bar.
+  final VoidCallback? onBack;
+
+  const BaseLibraryTab({
+    super.key,
+    required this.library,
+    this.viewMode,
+    this.density,
+    this.onDataLoaded,
+    this.isActive = false,
+    this.suppressAutoFocus = false,
+    this.onBack,
+  });
+}
+
+/// State mixin that provides the common implementation for library tabs
+/// This preserves AutomaticKeepAliveClientMixin functionality
+abstract class BaseLibraryTabState<T, W extends BaseLibraryTab<T>>
+    extends State<W>
+    with AutomaticKeepAliveClientMixin, Refreshable, LibraryTabStateMixin {
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  PlexLibrary get library => widget.library;
+
+  @override
+  void refresh() {
+    loadItems();
+  }
+
+  // State management
+  List<T> _items = [];
+  bool _isLoading = false;
+  String? _errorMessage;
+  StreamSubscription<void>? _refreshSubscription;
+
+  // Focus management
+  bool _hasLoadedData = false;
+  bool _hasFocused = false;
+
+  // Getters for subclasses
+  List<T> get items => _items;
+  bool get isLoading => _isLoading;
+  String? get errorMessage => _errorMessage;
+  bool get hasLoadedData => _hasLoadedData;
+
+  // Setters for subclasses that override loadItems with custom logic
+  @protected
+  set items(List<T> value) => _items = value;
+  @protected
+  set isLoading(bool value) => _isLoading = value;
+  @protected
+  set errorMessage(String? value) => _errorMessage = value;
+  @protected
+  set hasLoadedData(bool value) => _hasLoadedData = value;
+
+  @override
+  void initState() {
+    super.initState();
+    loadItems();
+
+    // Subscribe to refresh stream if provided
+    final refreshStream = getRefreshStream();
+    if (refreshStream != null) {
+      _refreshSubscription = refreshStream.listen((_) {
+        if (mounted) {
+          loadItems();
+        }
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _refreshSubscription?.cancel();
+    super.dispose();
+  }
+
+  @override
+  void didUpdateWidget(W oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // Reload if library changed
+    if (oldWidget.library.globalKey != widget.library.globalKey) {
+      // Reset focus state for new library
+      _hasFocused = false;
+      _hasLoadedData = false;
+      // Immediately clear stale data before async load
+      setState(() {
+        _items = [];
+        _isLoading = true;
+        _errorMessage = null;
+      });
+      loadItems();
+    }
+
+    // Check if we should focus (became active after data loaded)
+    if (widget.isActive && !oldWidget.isActive) {
+      tryFocus();
+    }
+  }
+
+  /// Load items from the API
+  /// This is the main data loading function that subclasses must implement
+  Future<List<T>> loadData();
+
+  /// Build the content widget given the loaded items
+  /// This is called by ContentStateBuilder when items are available
+  Widget buildContent(List<T> items);
+
+  /// Icon to display when there are no items (empty state)
+  IconData get emptyIcon;
+
+  /// Message to display when there are no items (empty state)
+  String get emptyMessage;
+
+  /// Context string for error messages (e.g., "playlists", "collections")
+  String get errorContext;
+
+  /// Optional refresh stream to listen for external refresh events
+  /// Return null if no refresh stream is needed
+  Stream<void>? getRefreshStream() => null;
+
+  /// Try to focus the first item if conditions are met (active + loaded + not yet focused)
+  @protected
+  void tryFocus() {
+    // Don't auto-focus if suppressed (e.g., when navigating via tab bar)
+    if (widget.suppressAutoFocus) return;
+
+    if (widget.isActive &&
+        _hasLoadedData &&
+        !_hasFocused &&
+        _items.isNotEmpty) {
+      _hasFocused = true;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          focusFirstItem();
+        }
+      });
+    }
+  }
+
+  /// Focus the first item in the tab. Subclasses should override this.
+  void focusFirstItem() {
+    // Default implementation - subclasses should override
+  }
+
+  /// Load items with error handling and state management
+  Future<void> loadItems() async {
+    setState(() {
+      _isLoading = true;
+      _errorMessage = null;
+      _items = []; // Clear items to prevent showing stale data during load
+    });
+
+    try {
+      final loadedItems = await loadData();
+
+      if (!mounted) return;
+
+      setState(() {
+        _items = loadedItems;
+        _isLoading = false;
+      });
+
+      // Mark data as loaded and try to focus
+      _hasLoadedData = true;
+      tryFocus();
+
+      // Notify parent that data has loaded
+      if (widget.onDataLoaded != null) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          widget.onDataLoaded!();
+        });
+      }
+    } catch (e) {
+      if (!mounted) return;
+
+      appLogger.e('Error loading $errorContext', error: e);
+      setState(() {
+        _errorMessage = 'Failed to load $errorContext: ${e.toString()}';
+        _isLoading = false;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context); // Required for AutomaticKeepAliveClientMixin
+
+    return ContentStateBuilder<T>(
+      isLoading: _isLoading,
+      errorMessage: _errorMessage,
+      items: _items,
+      emptyIcon: emptyIcon,
+      emptyMessage: emptyMessage,
+      onRetry: loadItems,
+      builder: (items) =>
+          RefreshIndicator(onRefresh: loadItems, child: buildContent(items)),
+    );
+  }
+}
diff --git a/lib/screens/libraries/tabs/library_browse_tab.dart b/lib/screens/libraries/tabs/library_browse_tab.dart
new file mode 100644
index 00000000..ace75f75
--- /dev/null
+++ b/lib/screens/libraries/tabs/library_browse_tab.dart
@@ -0,0 +1,652 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import 'package:dio/dio.dart';
+import '../../../../services/plex_client.dart';
+import '../../../models/plex_metadata.dart';
+import '../../../models/plex_filter.dart';
+import '../../../models/plex_sort.dart';
+import '../../../providers/settings_provider.dart';
+import '../../../utils/error_message_utils.dart';
+import '../../../utils/grid_size_calculator.dart';
+import '../../../widgets/focusable_media_card.dart';
+import '../../../widgets/focusable_filter_chip.dart';
+import '../../../widgets/media_grid_delegate.dart';
+import '../../../mixins/library_tab_focus_mixin.dart';
+import '../folder_tree_view.dart';
+import '../filters_bottom_sheet.dart';
+import '../sort_bottom_sheet.dart';
+import '../empty_state_widget.dart';
+import '../error_state_widget.dart';
+import '../../../services/storage_service.dart';
+import '../../../services/settings_service.dart' show ViewMode;
+import '../../../mixins/item_updatable.dart';
+import '../../../i18n/strings.g.dart';
+import 'base_library_tab.dart';
+
+/// Browse tab for library screen
+/// Shows library items with grouping, filtering, and sorting
+class LibraryBrowseTab extends BaseLibraryTab<PlexMetadata> {
+  const LibraryBrowseTab({
+    super.key,
+    required super.library,
+    super.viewMode,
+    super.density,
+    super.onDataLoaded,
+    super.isActive,
+    super.suppressAutoFocus,
+    super.onBack,
+  });
+
+  @override
+  State<LibraryBrowseTab> createState() => _LibraryBrowseTabState();
+}
+
+class _LibraryBrowseTabState
+    extends BaseLibraryTabState<PlexMetadata, LibraryBrowseTab>
+    with ItemUpdatable, LibraryTabFocusMixin {
+  @override
+  PlexClient get client => getClientForLibrary();
+
+  @override
+  String get focusNodeDebugLabel => 'browse_first_item';
+
+  @override
+  int get itemCount => items.length;
+
+  @override
+  void updateItemInLists(String ratingKey, PlexMetadata updatedMetadata) {
+    setState(() {
+      final index = items.indexWhere((item) => item.ratingKey == ratingKey);
+      if (index != -1) {
+        items[index] = updatedMetadata;
+      }
+    });
+  }
+
+  // Browse-specific state (not in base class)
+  List<PlexFilter> _filters = [];
+  List<PlexSort> _sortOptions = [];
+  Map<String, String> _selectedFilters = {};
+  PlexSort? _selectedSort;
+  bool _isSortDescending = false;
+  String _selectedGrouping = 'all'; // all, seasons, episodes, folders
+
+  // Pagination state
+  int _currentPage = 0;
+  bool _hasMoreItems = true;
+  CancelToken? _cancelToken;
+  int _requestId = 0;
+  static const int _pageSize = 500;
+
+  // Focus nodes for filter chips
+  final FocusNode _groupingChipFocusNode = FocusNode(
+    debugLabel: 'grouping_chip',
+  );
+  final FocusNode _filtersChipFocusNode = FocusNode(debugLabel: 'filters_chip');
+  final FocusNode _sortChipFocusNode = FocusNode(debugLabel: 'sort_chip');
+
+  @override
+  void dispose() {
+    _cancelToken?.cancel();
+    _groupingChipFocusNode.dispose();
+    _filtersChipFocusNode.dispose();
+    _sortChipFocusNode.dispose();
+    super.dispose();
+  }
+
+  // Override loadData to use our custom _loadContent
+  @override
+  Future<List<PlexMetadata>> loadData() async {
+    // This is called by base class loadItems(), but we override loadItems() entirely
+    // So this just returns empty - actual loading is done in _loadContent
+    return [];
+  }
+
+  // Override loadItems to use our custom loading with pagination
+  @override
+  Future<void> loadItems() async {
+    await _loadContent();
+  }
+
+  // Required abstract implementations from base class
+  @override
+  IconData get emptyIcon => Symbols.folder_open_rounded;
+
+  @override
+  String get emptyMessage => t.libraries.thisLibraryIsEmpty;
+
+  @override
+  String get errorContext => t.libraries.content;
+
+  // Override buildContent - not used since we override build()
+  @override
+  Widget buildContent(List<PlexMetadata> items) => const SizedBox.shrink();
+
+  /// Focus the first item in the grid/list (for tab activation)
+  @override
+  void focusFirstItem() {
+    if (items.isNotEmpty) {
+      // Request immediately, then once more on the next frame to handle cases
+      // where the grid/list attaches after the initial focus attempt.
+      void request() {
+        if (mounted && items.isNotEmpty && !firstItemFocusNode.hasFocus) {
+          firstItemFocusNode.requestFocus();
+        }
+      }
+
+      request();
+      WidgetsBinding.instance.addPostFrameCallback((_) => request());
+    }
+  }
+
+  Future<void> _loadContent() async {
+    // Cancel any pending request
+    _cancelToken?.cancel();
+    _cancelToken = CancelToken();
+    final currentRequestId = ++_requestId;
+
+    // Extract context dependencies before async gap - use server-specific client
+    final client = getClientForLibrary();
+
+    setState(() {
+      isLoading = true;
+      errorMessage = null;
+      items = [];
+      _currentPage = 0;
+      _hasMoreItems = true;
+      // Clear filter/sort state while loading to prevent showing stale options
+      _filters = [];
+      _sortOptions = [];
+      _selectedFilters = {};
+      _selectedSort = null;
+      _isSortDescending = false;
+      _selectedGrouping = _getDefaultGrouping();
+    });
+
+    try {
+      final storage = await StorageService.getInstance();
+
+      // Load filters and sorts for this library
+      final filters = await client.getLibraryFilters(widget.library.key);
+      final sorts = await client.getLibrarySorts(widget.library.key);
+
+      // Load saved preferences
+      final savedFilters = storage.getLibraryFilters(
+        sectionId: widget.library.globalKey,
+      );
+      final savedSort = storage.getLibrarySort(widget.library.globalKey);
+      final savedGrouping = storage.getLibraryGrouping(
+        widget.library.globalKey,
+      );
+
+      // Check if request was cancelled
+      if (currentRequestId != _requestId) return;
+
+      setState(() {
+        _filters = filters;
+        _sortOptions = sorts;
+        _selectedFilters = Map.from(savedFilters);
+        _selectedGrouping = savedGrouping ?? _getDefaultGrouping();
+
+        // Restore sort
+        if (savedSort != null) {
+          final sortKey = savedSort['key'] as String?;
+          if (sortKey != null) {
+            final sort = sorts.where((s) => s.key == sortKey).firstOrNull;
+            if (sort != null) {
+              _selectedSort = sort;
+              _isSortDescending = (savedSort['descending'] as bool?) ?? false;
+            }
+          }
+        }
+      });
+
+      // Load items
+      await _loadItems();
+    } catch (e) {
+      _handleLoadError(e, currentRequestId);
+    }
+  }
+
+  Future<void> _loadItems({bool loadMore = false}) async {
+    if (loadMore && isLoading) return;
+
+    if (!loadMore) {
+      _currentPage = 0;
+      _hasMoreItems = true;
+    }
+
+    if (!_hasMoreItems) return;
+
+    final currentRequestId = _requestId;
+    _cancelToken?.cancel();
+    _cancelToken = CancelToken();
+
+    setState(() {
+      isLoading = true;
+      if (!loadMore) {
+        items = [];
+      }
+    });
+
+    try {
+      // Use server-specific client for this library
+      final client = getClientForLibrary();
+
+      // Build filter params
+      final filterParams = Map<String, String>.from(_selectedFilters);
+
+      // Add grouping type filter (but not for 'all' or 'folders')
+      if (_selectedGrouping != 'all' && _selectedGrouping != 'folders') {
+        final typeId = _getGroupingTypeId();
+        if (typeId.isNotEmpty) {
+          filterParams['type'] = typeId;
+        }
+      }
+
+      // Add sort
+      if (_selectedSort != null) {
+        filterParams['sort'] = _selectedSort!.getSortKey(
+          descending: _isSortDescending,
+        );
+      }
+
+      // Items are automatically tagged with server info by PlexClient
+      final loadedItems = await client.getLibraryContent(
+        widget.library.key,
+        start: _currentPage * _pageSize,
+        size: _pageSize,
+        filters: filterParams,
+        cancelToken: _cancelToken,
+      );
+
+      if (currentRequestId != _requestId) return;
+
+      setState(() {
+        if (loadMore) {
+          items.addAll(loadedItems);
+        } else {
+          items = loadedItems;
+        }
+        _hasMoreItems = loadedItems.length >= _pageSize;
+        _currentPage++;
+        isLoading = false;
+      });
+
+      // On initial load (not pagination), mark data as loaded and try to focus
+      if (!loadMore) {
+        hasLoadedData = true;
+        tryFocus();
+
+        // Notify parent
+        if (widget.onDataLoaded != null) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            widget.onDataLoaded!();
+          });
+        }
+      }
+    } catch (e) {
+      _handleLoadError(e, currentRequestId);
+    }
+  }
+
+  void _handleLoadError(dynamic error, int currentRequestId) {
+    if (currentRequestId != _requestId) return;
+
+    setState(() {
+      errorMessage = _getErrorMessage(error);
+      isLoading = false;
+    });
+  }
+
+  String _getDefaultGrouping() {
+    final type = widget.library.type.toLowerCase();
+    if (type == 'show') {
+      return 'shows';
+    } else if (type == 'movie') {
+      return 'movies';
+    }
+    return 'all';
+  }
+
+  String _getGroupingTypeId() {
+    switch (_selectedGrouping) {
+      case 'movies':
+        return '1';
+      case 'shows':
+        return '2';
+      case 'seasons':
+        return '3';
+      case 'episodes':
+        return '4';
+      default:
+        return '';
+    }
+  }
+
+  List<String> _getGroupingOptions() {
+    final type = widget.library.type.toLowerCase();
+    if (type == 'show') {
+      return ['shows', 'seasons', 'episodes', 'folders'];
+    } else if (type == 'movie') {
+      return ['movies', 'folders'];
+    }
+    // All library types support folder browsing
+    return ['all', 'folders'];
+  }
+
+  String _getGroupingLabel(String grouping) {
+    switch (grouping) {
+      case 'movies':
+        return t.libraries.groupings.movies;
+      case 'shows':
+        return t.libraries.groupings.shows;
+      case 'seasons':
+        return t.libraries.groupings.seasons;
+      case 'episodes':
+        return t.libraries.groupings.episodes;
+      case 'folders':
+        return t.libraries.groupings.folders;
+      default:
+        return t.libraries.groupings.all;
+    }
+  }
+
+  String _getErrorMessage(dynamic error) {
+    if (error is DioException) {
+      return mapDioErrorToMessage(error, context: t.libraries.content);
+    }
+    return mapUnexpectedErrorToMessage(error, context: t.libraries.content);
+  }
+
+  void _showGroupingBottomSheet() {
+    showModalBottomSheet(
+      context: context,
+      builder: (sheetContext) {
+        final options = _getGroupingOptions();
+        return RadioGroup<String>(
+          groupValue: _selectedGrouping,
+          onChanged: (value) async {
+            if (value == null) return;
+            setState(() {
+              _selectedGrouping = value;
+            });
+
+            final storage = await StorageService.getInstance();
+            await storage.saveLibraryGrouping(
+              widget.library.globalKey,
+              value,
+            );
+
+            if (!sheetContext.mounted || !mounted) return;
+
+            Navigator.pop(sheetContext);
+            _loadItems();
+          },
+          child: ListView.builder(
+            shrinkWrap: true,
+            itemCount: options.length,
+            itemBuilder: (context, index) {
+              final grouping = options[index];
+              return RadioListTile<String>(
+                title: Text(_getGroupingLabel(grouping)),
+                value: grouping,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+
+  void _showFiltersBottomSheet() {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => FiltersBottomSheet(
+        filters: _filters,
+        selectedFilters: _selectedFilters,
+        serverId: widget.library.serverId!,
+        onFiltersChanged: (filters) async {
+          setState(() {
+            _selectedFilters.clear();
+            _selectedFilters.addAll(filters);
+          });
+
+          // Save filters to storage
+          final storage = await StorageService.getInstance();
+          await storage.saveLibraryFilters(
+            filters,
+            sectionId: widget.library.globalKey,
+          );
+
+          _loadItems();
+        },
+      ),
+    );
+  }
+
+  void _showSortBottomSheet() {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => SortBottomSheet(
+        sortOptions: _sortOptions,
+        selectedSort: _selectedSort,
+        isSortDescending: _isSortDescending,
+        onSortChanged: (sort, descending) {
+          setState(() {
+            _selectedSort = sort;
+            _isSortDescending = descending;
+          });
+
+          StorageService.getInstance().then((storage) {
+            storage.saveLibrarySort(
+              widget.library.globalKey,
+              sort.key,
+              descending: descending,
+            );
+          });
+
+          _loadItems();
+        },
+      ),
+    );
+  }
+
+  /// Navigate focus from chips down to the first grid item
+  void _navigateToGrid() {
+    if (items.isNotEmpty) {
+      firstItemFocusNode.requestFocus();
+    }
+  }
+
+  /// Navigate focus from grid up to the grouping chip
+  void _navigateToChips() {
+    _groupingChipFocusNode.requestFocus();
+  }
+
+  /// Calculate the number of columns in the current grid based on screen width
+  int _getGridColumnCount(
+    BuildContext context,
+    SettingsProvider settingsProvider,
+  ) {
+    final screenWidth =
+        MediaQuery.of(context).size.width - 16; // Subtract padding
+    final maxCrossAxisExtent = GridSizeCalculator.getMaxCrossAxisExtent(
+      context,
+      settingsProvider.libraryDensity,
+    );
+    return (screenWidth / maxCrossAxisExtent).floor().clamp(1, 100);
+  }
+
+  /// Check if the given index is in the first row of the grid
+  bool _isFirstRow(int index, int columnCount) {
+    return index < columnCount;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context); // Required for AutomaticKeepAliveClientMixin
+
+    return Column(
+      children: [
+        // Filter bar with chips
+        Container(
+          padding: const EdgeInsets.fromLTRB(16, 8, 16, 8),
+          alignment: Alignment.centerLeft,
+          child: SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                // Grouping chip
+                FocusableFilterChip(
+                  focusNode: _groupingChipFocusNode,
+                  icon: Symbols.category_rounded,
+                  label: _getGroupingLabel(_selectedGrouping),
+                  onPressed: _showGroupingBottomSheet,
+                  onNavigateDown: _navigateToGrid,
+                  onNavigateUp: widget.onBack,
+                  onBack: widget.onBack,
+                ),
+                const SizedBox(width: 8),
+                // Filters chip
+                if (_filters.isNotEmpty && _selectedGrouping != 'folders')
+                  FocusableFilterChip(
+                    focusNode: _filtersChipFocusNode,
+                    icon: Symbols.filter_alt_rounded,
+                    label: _selectedFilters.isEmpty
+                        ? t.libraries.filters
+                        : t.libraries.filtersWithCount(
+                            count: _selectedFilters.length,
+                          ),
+                    onPressed: _showFiltersBottomSheet,
+                    onNavigateDown: _navigateToGrid,
+                    onNavigateUp: widget.onBack,
+                    onBack: widget.onBack,
+                  ),
+                if (_filters.isNotEmpty && _selectedGrouping != 'folders')
+                  const SizedBox(width: 8),
+                // Sort chip
+                if (_sortOptions.isNotEmpty && _selectedGrouping != 'folders')
+                  FocusableFilterChip(
+                    focusNode: _sortChipFocusNode,
+                    icon: Symbols.sort_rounded,
+                    label: _selectedSort?.title ?? t.libraries.sort,
+                    onPressed: _showSortBottomSheet,
+                    onNavigateDown: _navigateToGrid,
+                    onNavigateUp: widget.onBack,
+                    onBack: widget.onBack,
+                  ),
+              ],
+            ),
+          ),
+        ),
+
+        // Content
+        Expanded(child: _buildContent()),
+      ],
+    );
+  }
+
+  Widget _buildContent() {
+    // Show folder tree view when in folders mode
+    if (_selectedGrouping == 'folders') {
+      return FolderTreeView(
+        libraryKey: widget.library.key,
+        serverId: widget.library.serverId,
+        onRefresh: updateItem,
+      );
+    }
+
+    if (isLoading && items.isEmpty) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
+    if (errorMessage != null && items.isEmpty) {
+      return ErrorStateWidget(
+        message: errorMessage!,
+        icon: Symbols.error_outline_rounded,
+        onRetry: _loadContent,
+        retryLabel: t.common.retry,
+      );
+    }
+
+    if (items.isEmpty) {
+      return EmptyStateWidget(
+        message: t.libraries.thisLibraryIsEmpty,
+        icon: Symbols.folder_open_rounded,
+      );
+    }
+
+    return NotificationListener<ScrollNotification>(
+      onNotification: (notification) {
+        if (notification.metrics.pixels >=
+                notification.metrics.maxScrollExtent - 300 &&
+            _hasMoreItems &&
+            !isLoading) {
+          _loadItems(loadMore: true);
+        }
+        return false;
+      },
+      child: Consumer<SettingsProvider>(
+        builder: (context, settingsProvider, child) {
+          return _buildItemsView(context, settingsProvider);
+        },
+      ),
+    );
+  }
+
+  /// Builds either a list or grid view based on the view mode
+  Widget _buildItemsView(
+    BuildContext context,
+    SettingsProvider settingsProvider,
+  ) {
+    final itemCount = items.length + (_hasMoreItems && isLoading ? 1 : 0);
+
+    if (settingsProvider.viewMode == ViewMode.list) {
+      // In list view, only the first item can navigate up to chips
+      return ListView.builder(
+        padding: const EdgeInsets.all(8),
+        itemCount: itemCount,
+        itemBuilder: (context, index) =>
+            _buildMediaCardItem(index, isFirstRow: index == 0),
+      );
+    } else {
+      // In grid view, calculate columns and pass to item builder
+      final columnCount = _getGridColumnCount(context, settingsProvider);
+      return GridView.builder(
+        padding: const EdgeInsets.all(8),
+        gridDelegate: MediaGridDelegate.createDelegate(
+          context: context,
+          density: settingsProvider.libraryDensity,
+        ),
+        itemCount: itemCount,
+        itemBuilder: (context, index) => _buildMediaCardItem(
+          index,
+          isFirstRow: _isFirstRow(index, columnCount),
+        ),
+      );
+    }
+  }
+
+  Widget _buildMediaCardItem(int index, {required bool isFirstRow}) {
+    if (index >= items.length) {
+      return const Padding(
+        padding: EdgeInsets.all(16.0),
+        child: Center(child: CircularProgressIndicator()),
+      );
+    }
+    final item = items[index];
+    return FocusableMediaCard(
+      key: Key(item.ratingKey),
+      item: item,
+      focusNode: index == 0 ? firstItemFocusNode : null,
+      onRefresh: updateItem,
+      onNavigateUp: isFirstRow ? _navigateToChips : null,
+      onBack: widget.onBack,
+    );
+  }
+}
diff --git a/lib/screens/libraries/tabs/library_collections_tab.dart b/lib/screens/libraries/tabs/library_collections_tab.dart
new file mode 100644
index 00000000..1ce088a1
--- /dev/null
+++ b/lib/screens/libraries/tabs/library_collections_tab.dart
@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../../models/plex_metadata.dart';
+import '../../../utils/library_refresh_notifier.dart';
+import '../../../widgets/focusable_media_card.dart';
+import '../../../i18n/strings.g.dart';
+import 'base_library_tab.dart';
+import 'library_grid_tab_state.dart';
+
+/// Collections tab for library screen
+/// Shows collections for the current library
+class LibraryCollectionsTab extends BaseLibraryTab<PlexMetadata> {
+  const LibraryCollectionsTab({
+    super.key,
+    required super.library,
+    super.viewMode,
+    super.density,
+    super.onDataLoaded,
+    super.isActive,
+    super.suppressAutoFocus,
+    super.onBack,
+  });
+
+  @override
+  State<LibraryCollectionsTab> createState() => _LibraryCollectionsTabState();
+}
+
+class _LibraryCollectionsTabState
+    extends LibraryGridTabState<PlexMetadata, LibraryCollectionsTab> {
+  @override
+  String get focusNodeDebugLabel => 'collections_first_item';
+
+  @override
+  IconData get emptyIcon => Symbols.collections_rounded;
+
+  @override
+  String get emptyMessage => t.libraries.noCollections;
+
+  @override
+  String get errorContext => t.collections.title;
+
+  @override
+  Stream<void>? getRefreshStream() =>
+      LibraryRefreshNotifier().collectionsStream;
+
+  @override
+  Future<List<PlexMetadata>> loadData() async {
+    // Use server-specific client for this library
+    final client = getClientForLibrary();
+
+    // Collections are automatically tagged with server info by PlexClient
+    return await client.getLibraryCollections(widget.library.key);
+  }
+
+  @override
+  @override
+  Widget buildGridItem(BuildContext context, PlexMetadata item, int index) {
+    return FocusableMediaCard(
+      key: Key(item.ratingKey),
+      item: item,
+      focusNode: index == 0 ? firstItemFocusNode : null,
+      onListRefresh: loadItems,
+      onBack: widget.onBack,
+    );
+  }
+}
diff --git a/lib/screens/libraries/tabs/library_grid_tab_state.dart b/lib/screens/libraries/tabs/library_grid_tab_state.dart
new file mode 100644
index 00000000..602527b8
--- /dev/null
+++ b/lib/screens/libraries/tabs/library_grid_tab_state.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+
+import '../adaptive_media_grid.dart';
+import '../../../mixins/library_tab_focus_mixin.dart';
+import 'base_library_tab.dart';
+
+/// Shared state implementation for simple grid-based library tabs.
+///
+/// Handles focus, item counting, and grid wiring so individual tabs only
+/// implement data loading and per-item rendering.
+abstract class LibraryGridTabState<T, W extends BaseLibraryTab<T>>
+    extends BaseLibraryTabState<T, W>
+    with LibraryTabFocusMixin {
+  /// Build a single grid item.
+  Widget buildGridItem(BuildContext context, T item, int index);
+
+  @override
+  int get itemCount => items.length;
+
+  @override
+  Widget buildContent(List<T> items) {
+    return AdaptiveMediaGrid<T>(
+      items: items,
+      itemBuilder: (context, item, index) =>
+          buildGridItem(context, item, index),
+      onRefresh: loadItems,
+      firstItemFocusNode: firstItemFocusNode,
+      onBack: widget.onBack,
+    );
+  }
+}
diff --git a/lib/screens/libraries/tabs/library_playlists_tab.dart b/lib/screens/libraries/tabs/library_playlists_tab.dart
new file mode 100644
index 00000000..61466926
--- /dev/null
+++ b/lib/screens/libraries/tabs/library_playlists_tab.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../../models/plex_playlist.dart';
+import '../../../utils/library_refresh_notifier.dart';
+import '../../../widgets/focusable_media_card.dart';
+import '../../../i18n/strings.g.dart';
+import 'base_library_tab.dart';
+import 'library_grid_tab_state.dart';
+
+/// Playlists tab for library screen
+/// Shows playlists that contain items from the current library
+class LibraryPlaylistsTab extends BaseLibraryTab<PlexPlaylist> {
+  const LibraryPlaylistsTab({
+    super.key,
+    required super.library,
+    super.viewMode,
+    super.density,
+    super.onDataLoaded,
+    super.isActive,
+    super.suppressAutoFocus,
+    super.onBack,
+  });
+
+  @override
+  State<LibraryPlaylistsTab> createState() => _LibraryPlaylistsTabState();
+}
+
+class _LibraryPlaylistsTabState
+    extends LibraryGridTabState<PlexPlaylist, LibraryPlaylistsTab> {
+  @override
+  String get focusNodeDebugLabel => 'playlists_first_item';
+
+  @override
+  IconData get emptyIcon => Symbols.playlist_play_rounded;
+
+  @override
+  String get emptyMessage => t.playlists.noPlaylists;
+
+  @override
+  String get errorContext => t.playlists.title;
+
+  @override
+  Stream<void>? getRefreshStream() => LibraryRefreshNotifier().playlistsStream;
+
+  @override
+  Future<List<PlexPlaylist>> loadData() async {
+    // Use server-specific client for this library
+    final client = getClientForLibrary();
+
+    // Playlists are automatically tagged with server info by PlexClient
+    return await client.getLibraryPlaylists(
+      sectionId: widget.library.key,
+      playlistType: 'video',
+    );
+  }
+
+  @override
+  Widget buildGridItem(BuildContext context, PlexPlaylist playlist, int index) {
+    return FocusableMediaCard(
+      key: Key(playlist.ratingKey),
+      item: playlist,
+      focusNode: index == 0 ? firstItemFocusNode : null,
+      onListRefresh: loadItems,
+      onBack: widget.onBack,
+    );
+  }
+}
diff --git a/lib/screens/libraries/tabs/library_recommended_tab.dart b/lib/screens/libraries/tabs/library_recommended_tab.dart
new file mode 100644
index 00000000..76db4bef
--- /dev/null
+++ b/lib/screens/libraries/tabs/library_recommended_tab.dart
@@ -0,0 +1,199 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../../../services/plex_client.dart';
+import '../../../i18n/strings.g.dart';
+import '../../../mixins/item_updatable.dart';
+import '../../../models/plex_hub.dart';
+import '../../../models/plex_metadata.dart';
+import '../../../widgets/hub_section.dart';
+import 'base_library_tab.dart';
+
+/// Recommended tab for library screen
+/// Shows library-specific hubs and recommendations, including dedicated Continue Watching
+class LibraryRecommendedTab extends BaseLibraryTab<PlexHub> {
+  const LibraryRecommendedTab({
+    super.key,
+    required super.library,
+    super.onDataLoaded,
+    super.isActive,
+    super.suppressAutoFocus,
+    super.onBack,
+  });
+
+  @override
+  State<LibraryRecommendedTab> createState() => _LibraryRecommendedTabState();
+}
+
+class _LibraryRecommendedTabState
+    extends BaseLibraryTabState<PlexHub, LibraryRecommendedTab>
+    with ItemUpdatable {
+  /// GlobalKeys for each hub section to enable vertical navigation
+  final List<GlobalKey<HubSectionState>> _hubKeys = [];
+
+  @override
+  PlexClient get client => getClientForLibrary();
+
+  @override
+  void updateItemInLists(String ratingKey, PlexMetadata updatedMetadata) {
+    // Update the item in any hub that contains it
+    for (final hub in items) {
+      final itemIndex = hub.items.indexWhere(
+        (item) => item.ratingKey == ratingKey,
+      );
+      if (itemIndex != -1) {
+        hub.items[itemIndex] = updatedMetadata;
+      }
+    }
+  }
+
+  @override
+  IconData get emptyIcon => Symbols.recommend_rounded;
+
+  @override
+  String get emptyMessage => t.libraries.noRecommendations;
+
+  @override
+  String get errorContext => t.libraries.tabs.recommended;
+
+  @override
+  Future<List<PlexHub>> loadData() async {
+    // Clear hub keys before loading new hubs to prevent stale references
+    _hubKeys.clear();
+
+    // Use server-specific client for this library
+    final client = getClientForLibrary();
+
+    // Load both continue watching items and regular hubs in parallel
+    final results = await Future.wait([
+      client.getOnDeckForLibrary(widget.library.key),
+      client.getLibraryHubs(widget.library.key, limit: 12),
+    ]);
+
+    final continueWatchingItems = results[0] as List<PlexMetadata>;
+    final hubs = results[1] as List<PlexHub>;
+
+    // Filter out any existing Continue Watching hubs since we're adding our own
+    final filteredHubs = hubs.where((hub) {
+      final title = hub.title.toLowerCase();
+      final hubId = hub.hubIdentifier?.toLowerCase() ?? '';
+      return !title.contains('continue watching') &&
+          !title.contains('on deck') &&
+          !hubId.contains('ondeck') &&
+          !hubId.contains('continue');
+    }).toList();
+
+    final finalHubs = <PlexHub>[];
+
+    // Add Continue Watching as the first hub if there are items
+    if (continueWatchingItems.isNotEmpty) {
+      final continueWatchingHub = PlexHub(
+        hubKey: 'library_continue_watching_${widget.library.key}',
+        title: t.discover.continueWatching,
+        type: 'mixed',
+        hubIdentifier: '_library_continue_watching_',
+        size: continueWatchingItems.length,
+        more: false,
+        items: continueWatchingItems,
+        serverId: widget.library.serverId,
+        serverName: widget.library.serverName,
+      );
+      finalHubs.add(continueWatchingHub);
+    }
+
+    // Add the filtered regular hubs
+    finalHubs.addAll(filteredHubs);
+
+    return finalHubs;
+  }
+
+  /// Ensure we have enough GlobalKeys for all hubs
+  void _ensureHubKeys(int count) {
+    while (_hubKeys.length < count) {
+      _hubKeys.add(GlobalKey<HubSectionState>());
+    }
+  }
+
+  /// Handle vertical navigation between hubs
+  bool _handleVerticalNavigation(int hubIndex, bool isUp) {
+    final targetIndex = isUp ? hubIndex - 1 : hubIndex + 1;
+
+    // Check if target is valid
+    if (targetIndex < 0 || targetIndex >= _hubKeys.length) {
+      // At boundary, block navigation
+      return true;
+    }
+
+    // Navigate to target hub with column memory
+    final targetState = _hubKeys[targetIndex].currentState;
+    if (targetState != null) {
+      targetState.requestFocusFromMemory();
+      return true;
+    }
+
+    return false;
+  }
+
+  /// Focus the first item in the first hub (for tab activation)
+  @override
+  void focusFirstItem() {
+    if (_hubKeys.isNotEmpty && items.isNotEmpty) {
+      _hubKeys[0].currentState?.requestFocusAt(0);
+    }
+  }
+
+  @override
+  Widget buildContent(List<PlexHub> items) {
+    _ensureHubKeys(items.length);
+
+    return ListView.builder(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      itemCount: items.length,
+      itemBuilder: (context, index) {
+        final hub = items[index];
+        final isContinueWatching =
+            hub.hubIdentifier == '_library_continue_watching_';
+
+        return HubSection(
+          key: index < _hubKeys.length ? _hubKeys[index] : null,
+          hub: hub,
+          icon: _getHubIcon(hub),
+          isInContinueWatching: isContinueWatching,
+          onRefresh: updateItem,
+          onRemoveFromContinueWatching: isContinueWatching
+              ? _refreshContinueWatching
+              : null,
+          onVerticalNavigation: (isUp) =>
+              _handleVerticalNavigation(index, isUp),
+          onBack: widget.onBack,
+        );
+      },
+    );
+  }
+
+  /// Refresh the Continue Watching section
+  void _refreshContinueWatching() {
+    // Reload all data to refresh the continue watching section
+    loadItems();
+  }
+
+  IconData _getHubIcon(PlexHub hub) {
+    final title = hub.title.toLowerCase();
+    if (title.contains('continue watching') || title.contains('on deck')) {
+      return Symbols.play_circle_rounded;
+    } else if (title.contains('recently') || title.contains('new')) {
+      return Symbols.fiber_new_rounded;
+    } else if (title.contains('popular') || title.contains('trending')) {
+      return Symbols.trending_up_rounded;
+    } else if (title.contains('top') || title.contains('rated')) {
+      return Symbols.star_rounded;
+    } else if (title.contains('recommended')) {
+      return Symbols.thumb_up_rounded;
+    } else if (title.contains('unwatched')) {
+      return Symbols.visibility_off_rounded;
+    } else if (title.contains('genre')) {
+      return Symbols.category_rounded;
+    }
+    return Symbols.movie_rounded;
+  }
+}
diff --git a/lib/screens/libraries_screen.dart b/lib/screens/libraries_screen.dart
deleted file mode 100644
index b7a65fd2..00000000
--- a/lib/screens/libraries_screen.dart
+++ /dev/null
@@ -1,1899 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:dio/dio.dart';
-import '../client/plex_client.dart';
-import '../models/plex_library.dart';
-import '../models/plex_metadata.dart';
-import '../models/plex_filter.dart';
-import '../models/plex_sort.dart';
-import '../providers/plex_client_provider.dart';
-import '../providers/settings_provider.dart';
-import '../providers/hidden_libraries_provider.dart';
-import '../utils/provider_extensions.dart';
-import '../utils/app_logger.dart';
-import '../widgets/media_card.dart';
-import '../widgets/desktop_app_bar.dart';
-import '../widgets/app_bar_back_button.dart';
-import '../widgets/context_menu_wrapper.dart';
-import '../services/storage_service.dart';
-import '../services/settings_service.dart';
-import '../mixins/refreshable.dart';
-import '../mixins/item_updatable.dart';
-import '../theme/theme_helper.dart';
-import '../i18n/strings.g.dart';
-
-class LibrariesScreen extends StatefulWidget {
-  const LibrariesScreen({super.key});
-
-  @override
-  State<LibrariesScreen> createState() => _LibrariesScreenState();
-}
-
-class _LibrariesScreenState extends State<LibrariesScreen>
-    with Refreshable, ItemUpdatable {
-  @override
-  PlexClient get client => context.clientSafe;
-
-  List<PlexLibrary> _allLibraries = []; // All libraries from API (unfiltered)
-  List<PlexMetadata> _items = [];
-  List<PlexFilter> _filters = [];
-  List<PlexSort> _sortOptions = [];
-  bool _isLoadingLibraries = true;
-  bool _isLoadingItems = false;
-  String? _errorMessage;
-  String? _selectedLibraryKey;
-  Map<String, String> _selectedFilters = {};
-  PlexSort? _selectedSort;
-  bool _isSortDescending = false;
-  bool _isInitialLoad = true;
-
-  // Pagination state
-  int _currentPage = 0;
-  bool _hasMoreItems = true;
-  CancelToken? _cancelToken;
-  int _requestId = 0;
-  static const int _pageSize = 1000;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadLibraries();
-  }
-
-  /// Helper method to get user-friendly error message from exception
-  String _getErrorMessage(dynamic error, String context) {
-    if (error is DioException) {
-      // Other Dio errors
-      switch (error.type) {
-        case DioExceptionType.connectionTimeout:
-        case DioExceptionType.receiveTimeout:
-          return t.errors.connectionTimeout(context: context);
-        case DioExceptionType.connectionError:
-          return t.errors.connectionFailed;
-        default:
-          appLogger.e('Error loading $context', error: error);
-          return t.errors.failedToLoad(
-            context: context,
-            error: error.message ?? 'Unknown error',
-          );
-      }
-    }
-
-    // Generic error
-    appLogger.e('Unexpected error in $context', error: error);
-    return t.errors.failedToLoad(context: context, error: error.toString());
-  }
-
-  Future<void> _loadLibraries() async {
-    // Extract context dependencies before async gap
-    final clientProvider = Provider.of<PlexClientProvider>(
-      context,
-      listen: false,
-    );
-    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
-      context,
-      listen: false,
-    );
-
-    setState(() {
-      _isLoadingLibraries = true;
-      _errorMessage = null;
-    });
-
-    try {
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      final storage = await StorageService.getInstance();
-      final allLibraries = await client.getLibraries();
-
-      // Filter out music libraries (type: 'artist') since music playback is not yet supported
-      // Only show movie and TV show libraries
-      final filteredLibraries = allLibraries
-          .where((lib) => lib.type.toLowerCase() != 'artist')
-          .toList();
-
-      // Load saved library order and apply it
-      final savedOrder = storage.getLibraryOrder();
-      final orderedLibraries = _applyLibraryOrder(
-        filteredLibraries,
-        savedOrder,
-      );
-
-      setState(() {
-        _allLibraries =
-            orderedLibraries; // Store all libraries with ordering applied
-        _isLoadingLibraries = false;
-      });
-
-      if (allLibraries.isNotEmpty) {
-        // Compute visible libraries for initial load
-        final hiddenKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
-        final visibleLibraries = allLibraries
-            .where((lib) => !hiddenKeys.contains(lib.key))
-            .toList();
-
-        // Load saved preferences
-        final savedLibraryKey = storage.getSelectedLibraryKey();
-        final savedFilters = storage.getLibraryFilters();
-
-        // Find the library by key in visible libraries
-        String? libraryKeyToLoad;
-        if (savedLibraryKey != null) {
-          // Check if saved library exists and is visible
-          final libraryExists = visibleLibraries.any(
-            (lib) => lib.key == savedLibraryKey,
-          );
-          if (libraryExists) {
-            libraryKeyToLoad = savedLibraryKey;
-          }
-        }
-
-        // Fallback to first visible library if saved key not found
-        if (libraryKeyToLoad == null && visibleLibraries.isNotEmpty) {
-          libraryKeyToLoad = visibleLibraries.first.key;
-        }
-
-        // Restore filters BEFORE loading content
-        if (savedFilters.isNotEmpty) {
-          _selectedFilters = Map.from(savedFilters);
-        }
-
-        if (libraryKeyToLoad != null) {
-          _loadLibraryContent(libraryKeyToLoad);
-        }
-      }
-    } catch (e) {
-      setState(() {
-        _errorMessage = _getErrorMessage(e, 'libraries');
-        _isLoadingLibraries = false;
-      });
-    }
-  }
-
-  List<PlexLibrary> _applyLibraryOrder(
-    List<PlexLibrary> libraries,
-    List<String>? savedOrder,
-  ) {
-    if (savedOrder == null || savedOrder.isEmpty) {
-      return libraries;
-    }
-
-    // Create a map for quick lookup
-    final libraryMap = {for (var lib in libraries) lib.key: lib};
-
-    // Build ordered list based on saved order
-    final orderedLibraries = <PlexLibrary>[];
-    final addedKeys = <String>{};
-
-    // Add libraries in saved order
-    for (final key in savedOrder) {
-      if (libraryMap.containsKey(key)) {
-        orderedLibraries.add(libraryMap[key]!);
-        addedKeys.add(key);
-      }
-    }
-
-    // Add any new libraries that weren't in the saved order
-    for (final library in libraries) {
-      if (!addedKeys.contains(library.key)) {
-        orderedLibraries.add(library);
-      }
-    }
-
-    return orderedLibraries;
-  }
-
-  Future<void> _saveLibraryOrder() async {
-    final storage = await StorageService.getInstance();
-    final libraryKeys = _allLibraries.map((lib) => lib.key).toList();
-    await storage.saveLibraryOrder(libraryKeys);
-  }
-
-  Future<void> _loadLibraryContent(String libraryKey) async {
-    // Compute visible libraries based on current provider state
-    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
-      context,
-      listen: false,
-    );
-    final hiddenKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
-    final visibleLibraries = _allLibraries
-        .where((lib) => !hiddenKeys.contains(lib.key))
-        .toList();
-
-    // Find the library by key
-    final libraryIndex = visibleLibraries.indexWhere(
-      (lib) => lib.key == libraryKey,
-    );
-    if (libraryIndex == -1) return; // Library not found or hidden
-
-    final isChangingLibrary =
-        !_isInitialLoad && _selectedLibraryKey != libraryKey;
-
-    // Extract context dependencies before async operations
-    final clientProvider = context.plexClient;
-    final client = clientProvider.client;
-    if (client == null) {
-      setState(() {
-        _errorMessage = t.errors.noClientAvailable;
-        _isLoadingItems = false;
-      });
-      return;
-    }
-
-    setState(() {
-      _selectedLibraryKey = libraryKey;
-      _isLoadingItems = true;
-      _errorMessage = null;
-      // Only clear filters when explicitly changing library (not on initial load)
-      if (isChangingLibrary) {
-        _selectedFilters.clear();
-      }
-    });
-
-    // Mark that initial load is complete
-    if (_isInitialLoad) {
-      _isInitialLoad = false;
-    }
-
-    // Save selected library key
-    final storage = await StorageService.getInstance();
-    await storage.saveSelectedLibraryKey(libraryKey);
-
-    // Clear filters in storage when changing library
-    if (isChangingLibrary) {
-      await storage.saveLibraryFilters({});
-    }
-
-    // Cancel any existing requests
-    _cancelToken?.cancel();
-    _cancelToken = CancelToken();
-    final currentRequestId = ++_requestId;
-
-    // Reset pagination state
-    setState(() {
-      _currentPage = 0;
-      _hasMoreItems = true;
-      _items = [];
-    });
-
-    try {
-      // Load filters and sort options for the new library
-      _loadFilters(libraryKey);
-      await _loadSortOptions(libraryKey);
-
-      // Add sort parameter to filters if selected
-      final filtersWithSort = Map<String, String>.from(_selectedFilters);
-      if (_selectedSort != null) {
-        filtersWithSort['sort'] = _selectedSort!.getSortKey(
-          descending: _isSortDescending,
-        );
-      }
-
-      // Load pages sequentially
-      await _loadAllPagesSequentially(
-        libraryKey,
-        filtersWithSort,
-        currentRequestId,
-        client,
-      );
-    } catch (e) {
-      // Ignore cancellation errors
-      if (e is DioException && e.type == DioExceptionType.cancel) {
-        return;
-      }
-
-      setState(() {
-        _errorMessage = _getErrorMessage(e, 'library content');
-        _isLoadingItems = false;
-      });
-    }
-  }
-
-  /// Load all pages sequentially until all items are fetched
-  Future<void> _loadAllPagesSequentially(
-    String libraryKey,
-    Map<String, String> filtersWithSort,
-    int requestId,
-    PlexClient client,
-  ) async {
-    while (_hasMoreItems && requestId == _requestId) {
-      try {
-        final items = await client.getLibraryContent(
-          libraryKey,
-          start: _currentPage * _pageSize,
-          size: _pageSize,
-          filters: filtersWithSort,
-          cancelToken: _cancelToken,
-        );
-
-        // Check if request is still valid
-        if (requestId != _requestId) {
-          return; // Request was superseded
-        }
-
-        setState(() {
-          _items.addAll(items);
-          _currentPage++;
-          _hasMoreItems = items.length >= _pageSize;
-
-          // Mark as not loading if this is the last page
-          if (!_hasMoreItems) {
-            _isLoadingItems = false;
-          }
-        });
-      } catch (e) {
-        // Check if it's a cancellation
-        if (e is DioException && e.type == DioExceptionType.cancel) {
-          return;
-        }
-
-        // For other errors, update state and rethrow
-        setState(() {
-          _isLoadingItems = false;
-          _hasMoreItems = false;
-        });
-        rethrow;
-      }
-    }
-  }
-
-  Future<void> _loadFilters(String libraryKey) async {
-    try {
-      final clientProvider = Provider.of<PlexClientProvider>(
-        context,
-        listen: false,
-      );
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      final filters = await client.getLibraryFilters(libraryKey);
-      setState(() {
-        _filters = filters;
-      });
-    } catch (e) {
-      appLogger.w('Failed to load filters', error: e);
-      setState(() {
-        _filters = [];
-      });
-    }
-  }
-
-  Future<void> _loadSortOptions(String libraryKey) async {
-    try {
-      final clientProvider = Provider.of<PlexClientProvider>(
-        context,
-        listen: false,
-      );
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      final sortOptions = await client.getLibrarySorts(libraryKey);
-
-      // Load saved sort preference for this library
-      final storage = await StorageService.getInstance();
-      final savedSortKey = storage.getLibrarySort(libraryKey);
-
-      // Find the saved sort in the options
-      PlexSort? savedSort;
-      bool descending = false;
-
-      if (savedSortKey.endsWith(':desc')) {
-        descending = true;
-        final baseKey = savedSortKey.replaceAll(':desc', '');
-        savedSort = sortOptions.firstWhere(
-          (s) => s.key == baseKey,
-          orElse: () => sortOptions.first,
-        );
-      } else {
-        savedSort = sortOptions.firstWhere(
-          (s) => s.key == savedSortKey,
-          orElse: () => sortOptions.first,
-        );
-      }
-
-      setState(() {
-        _sortOptions = sortOptions;
-        _selectedSort = savedSort;
-        _isSortDescending = descending;
-      });
-    } catch (e) {
-      setState(() {
-        _sortOptions = [];
-        _selectedSort = null;
-        _isSortDescending = false;
-      });
-    }
-  }
-
-  Future<void> _applyFilters() async {
-    // Cancel any existing requests
-    _cancelToken?.cancel();
-    _cancelToken = CancelToken();
-    final currentRequestId = ++_requestId;
-
-    setState(() {
-      _isLoadingItems = true;
-      _errorMessage = null;
-      _currentPage = 0;
-      _hasMoreItems = true;
-      _items = [];
-    });
-
-    try {
-      final clientProvider = Provider.of<PlexClientProvider>(
-        context,
-        listen: false,
-      );
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      // Add sort parameter to filters if selected
-      final filtersWithSort = Map<String, String>.from(_selectedFilters);
-      if (_selectedSort != null) {
-        filtersWithSort['sort'] = _selectedSort!.getSortKey(
-          descending: _isSortDescending,
-        );
-      }
-
-      // Load pages sequentially
-      await _loadAllPagesSequentially(
-        _selectedLibraryKey!,
-        filtersWithSort,
-        currentRequestId,
-        client,
-      );
-    } catch (e) {
-      // Ignore cancellation errors
-      if (e is DioException && e.type == DioExceptionType.cancel) {
-        return;
-      }
-
-      setState(() {
-        _errorMessage = t.messages.errorLoading(error: e.toString());
-        _isLoadingItems = false;
-      });
-    }
-  }
-
-  Future<void> _applySort(PlexSort sort, bool descending) async {
-    setState(() {
-      _selectedSort = sort;
-      _isSortDescending = descending;
-    });
-
-    // Save sort preference for this library
-    final storage = await StorageService.getInstance();
-    final sortKey = sort.getSortKey(descending: descending);
-    await storage.saveLibrarySort(_selectedLibraryKey!, sortKey);
-
-    // Reload content with new sort
-    _applyFilters();
-  }
-
-  @override
-  void updateItemInLists(String ratingKey, PlexMetadata updatedMetadata) {
-    final index = _items.indexWhere((item) => item.ratingKey == ratingKey);
-    if (index != -1) {
-      _items[index] = updatedMetadata;
-    }
-  }
-
-  // Public method to refresh content (for normal navigation)
-  @override
-  void refresh() {
-    _loadLibraries();
-  }
-
-  // Public method to fully reload all content (for profile switches)
-  void fullRefresh() {
-    appLogger.d('LibrariesScreen.fullRefresh() called - reloading all content');
-    // Reload libraries and clear any selected library/filters
-    _selectedLibraryKey = null;
-    _selectedFilters.clear();
-    _items.clear();
-    _loadLibraries();
-  }
-
-  Future<void> _toggleLibraryVisibility(PlexLibrary library) async {
-    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
-      context,
-      listen: false,
-    );
-    final isHidden = hiddenLibrariesProvider.hiddenLibraryKeys.contains(
-      library.key,
-    );
-
-    if (isHidden) {
-      await hiddenLibrariesProvider.unhideLibrary(library.key);
-    } else {
-      // Check if we're hiding the currently selected library
-      final isCurrentlySelected = _selectedLibraryKey == library.key;
-
-      await hiddenLibrariesProvider.hideLibrary(library.key);
-
-      // If we just hid the selected library, select the first visible one
-      if (isCurrentlySelected) {
-        // Compute visible libraries after hiding
-        final visibleLibraries = _allLibraries
-            .where(
-              (lib) =>
-                  !hiddenLibrariesProvider.hiddenLibraryKeys.contains(lib.key),
-            )
-            .toList();
-
-        if (visibleLibraries.isNotEmpty) {
-          _loadLibraryContent(visibleLibraries.first.key);
-        }
-      }
-    }
-  }
-
-  void _showFiltersBottomSheet() {
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      builder: (context) => _FiltersBottomSheet(
-        filters: _filters,
-        selectedFilters: _selectedFilters,
-        onFiltersChanged: (filters) async {
-          setState(() {
-            _selectedFilters.clear();
-            _selectedFilters.addAll(filters);
-          });
-
-          // Save filters to storage
-          final storage = await StorageService.getInstance();
-          await storage.saveLibraryFilters(filters);
-
-          _applyFilters();
-        },
-      ),
-    );
-  }
-
-  void _showSortBottomSheet() {
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      builder: (context) => _SortBottomSheet(
-        sortOptions: _sortOptions,
-        selectedSort: _selectedSort,
-        isSortDescending: _isSortDescending,
-        onSortChanged: (sort, descending) {
-          Navigator.pop(context);
-          _applySort(sort, descending);
-        },
-      ),
-    );
-  }
-
-  List<ContextMenuItem> _getLibraryMenuItems(PlexLibrary library) {
-    return [
-      ContextMenuItem(
-        value: 'scan',
-        icon: Icons.refresh,
-        label: t.libraries.scanLibraryFiles,
-        requiresConfirmation: true,
-        confirmationTitle: t.libraries.scanLibrary,
-        confirmationMessage: t.libraries.scanLibraryConfirm(
-          title: library.title,
-        ),
-      ),
-      ContextMenuItem(
-        value: 'analyze',
-        icon: Icons.analytics_outlined,
-        label: t.libraries.analyze,
-        requiresConfirmation: true,
-        confirmationTitle: t.libraries.analyzeLibrary,
-        confirmationMessage: t.libraries.analyzeLibraryConfirm(
-          title: library.title,
-        ),
-      ),
-      ContextMenuItem(
-        value: 'refresh',
-        icon: Icons.sync,
-        label: t.libraries.refreshMetadata,
-        requiresConfirmation: true,
-        confirmationTitle: t.libraries.refreshMetadata,
-        confirmationMessage: t.libraries.refreshMetadataConfirm(
-          title: library.title,
-        ),
-        isDestructive: true,
-      ),
-      ContextMenuItem(
-        value: 'empty_trash',
-        icon: Icons.delete_outline,
-        label: t.libraries.emptyTrash,
-        requiresConfirmation: true,
-        confirmationTitle: t.libraries.emptyTrash,
-        confirmationMessage: t.libraries.emptyTrashConfirm(
-          title: library.title,
-        ),
-        isDestructive: true,
-      ),
-    ];
-  }
-
-  void _handleLibraryMenuAction(String action, PlexLibrary library) {
-    switch (action) {
-      case 'scan':
-        _scanLibrary(library);
-        break;
-      case 'analyze':
-        _analyzeLibrary(library);
-        break;
-      case 'refresh':
-        _refreshLibraryMetadata(library);
-        break;
-      case 'empty_trash':
-        _emptyLibraryTrash(library);
-        break;
-    }
-  }
-
-  void _showLibraryManagementSheet() {
-    final hiddenLibrariesProvider = Provider.of<HiddenLibrariesProvider>(
-      context,
-      listen: false,
-    );
-
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      builder: (context) => _LibraryManagementSheet(
-        allLibraries: List.from(_allLibraries),
-        hiddenLibraryKeys: hiddenLibrariesProvider.hiddenLibraryKeys,
-        onReorder: (reorderedLibraries) {
-          setState(() {
-            _allLibraries = reorderedLibraries;
-          });
-          _saveLibraryOrder();
-        },
-        onToggleVisibility: _toggleLibraryVisibility,
-        getLibraryMenuItems: _getLibraryMenuItems,
-        onLibraryMenuAction: _handleLibraryMenuAction,
-      ),
-    );
-  }
-
-  Future<void> _scanLibrary(PlexLibrary library) async {
-    try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      // Show progress indicator
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.messages.libraryScanning(title: library.title)),
-            duration: const Duration(seconds: 2),
-          ),
-        );
-      }
-
-      await client.scanLibrary(library.key);
-
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.messages.libraryScanStarted(title: library.title)),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    } catch (e) {
-      appLogger.e('Failed to scan library', error: e);
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.messages.libraryScanFailed(error: e.toString())),
-            backgroundColor: Colors.red,
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    }
-  }
-
-  Future<void> _refreshLibraryMetadata(PlexLibrary library) async {
-    try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      // Show progress indicator
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.messages.metadataRefreshing(title: library.title)),
-            duration: const Duration(seconds: 2),
-          ),
-        );
-      }
-
-      await client.refreshLibraryMetadata(library.key);
-
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(
-              t.messages.metadataRefreshStarted(title: library.title),
-            ),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    } catch (e) {
-      appLogger.e('Failed to refresh library metadata', error: e);
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(
-              t.messages.metadataRefreshFailed(error: e.toString()),
-            ),
-            backgroundColor: Colors.red,
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    }
-  }
-
-  Future<void> _emptyLibraryTrash(PlexLibrary library) async {
-    try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      // Show progress indicator
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.libraries.emptyingTrash(title: library.title)),
-            duration: const Duration(seconds: 2),
-          ),
-        );
-      }
-
-      await client.emptyLibraryTrash(library.key);
-
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.libraries.trashEmptied(title: library.title)),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    } catch (e) {
-      appLogger.e('Failed to empty library trash', error: e);
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.libraries.failedToEmptyTrash(error: e)),
-            backgroundColor: Colors.red,
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    }
-  }
-
-  Future<void> _analyzeLibrary(PlexLibrary library) async {
-    try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      // Show progress indicator
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.libraries.analyzing(title: library.title)),
-            duration: const Duration(seconds: 2),
-          ),
-        );
-      }
-
-      await client.analyzeLibrary(library.key);
-
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.libraries.analysisStarted(title: library.title)),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    } catch (e) {
-      appLogger.e('Failed to analyze library', error: e);
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(t.libraries.failedToAnalyze(error: e)),
-            backgroundColor: Colors.red,
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    // Watch for hidden libraries changes to trigger rebuild
-    final hiddenLibrariesProvider = context.watch<HiddenLibrariesProvider>();
-    final hiddenKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
-
-    // Compute visible libraries (filtered from all libraries)
-    final visibleLibraries = _allLibraries
-        .where((lib) => !hiddenKeys.contains(lib.key))
-        .toList();
-
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          DesktopSliverAppBar(
-            title: Text(t.libraries.title),
-            floating: true,
-            pinned: true,
-            backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-            surfaceTintColor: Colors.transparent,
-            shadowColor: Colors.transparent,
-            scrolledUnderElevation: 0,
-            actions: [
-              if (_allLibraries.isNotEmpty)
-                IconButton(
-                  icon: Icon(
-                    Icons.edit,
-                    semanticLabel: t.libraries.manageLibraries,
-                  ),
-                  onPressed: _showLibraryManagementSheet,
-                ),
-              if (_sortOptions.isNotEmpty)
-                IconButton(
-                  icon: Icon(Icons.swap_vert, semanticLabel: t.libraries.sort),
-                  onPressed: _showSortBottomSheet,
-                ),
-              if (_filters.isNotEmpty)
-                IconButton(
-                  icon: Badge(
-                    label: Text('${_selectedFilters.length}'),
-                    isLabelVisible: _selectedFilters.isNotEmpty,
-                    child: Icon(
-                      Icons.filter_list,
-                      semanticLabel: t.libraries.filters,
-                    ),
-                  ),
-                  onPressed: _showFiltersBottomSheet,
-                ),
-              IconButton(
-                icon: Icon(Icons.refresh, semanticLabel: t.common.refresh),
-                onPressed: () => _loadLibraryContent(_selectedLibraryKey!),
-              ),
-            ],
-          ),
-          if (_isLoadingLibraries)
-            const SliverFillRemaining(
-              child: Center(child: CircularProgressIndicator()),
-            )
-          else if (_errorMessage != null && visibleLibraries.isEmpty)
-            SliverFillRemaining(
-              child: Center(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    const Icon(
-                      Icons.error_outline,
-                      size: 48,
-                      color: Colors.red,
-                    ),
-                    const SizedBox(height: 16),
-                    Text(_errorMessage!),
-                    const SizedBox(height: 16),
-                    ElevatedButton(
-                      onPressed: _loadLibraries,
-                      child: Text(t.common.retry),
-                    ),
-                  ],
-                ),
-              ),
-            )
-          else if (visibleLibraries.isEmpty)
-            SliverFillRemaining(
-              child: Center(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    const Icon(
-                      Icons.video_library_outlined,
-                      size: 64,
-                      color: Colors.grey,
-                    ),
-                    const SizedBox(height: 16),
-                    Text(t.libraries.noLibrariesFound),
-                  ],
-                ),
-              ),
-            )
-          else ...[
-            // Library selector chips
-            SliverToBoxAdapter(
-              child: Container(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 8,
-                ),
-                child: SingleChildScrollView(
-                  scrollDirection: Axis.horizontal,
-                  child: Row(
-                    children: List.generate(visibleLibraries.length, (index) {
-                      final library = visibleLibraries[index];
-                      final isSelected = library.key == _selectedLibraryKey;
-                      final t = tokens(context);
-                      return Padding(
-                        padding: const EdgeInsets.only(right: 8),
-                        child: ContextMenuWrapper(
-                          menuItems: _getLibraryMenuItems(library),
-                          onMenuItemSelected: (value) =>
-                              _handleLibraryMenuAction(value, library),
-                          onTap: () => _loadLibraryContent(library.key),
-                          child: ChoiceChip(
-                            label: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                Icon(
-                                  _getLibraryIcon(library.type),
-                                  size: 16,
-                                  color: isSelected ? t.bg : t.text,
-                                ),
-                                const SizedBox(width: 6),
-                                Text(library.title),
-                              ],
-                            ),
-                            selected: isSelected,
-                            onSelected: (selected) {
-                              if (selected) {
-                                _loadLibraryContent(library.key);
-                              }
-                            },
-                            backgroundColor: t.surface,
-                            selectedColor: t.text,
-                            side: BorderSide(color: t.outline),
-                            labelStyle: TextStyle(
-                              color: isSelected ? t.bg : t.text,
-                              fontWeight: isSelected
-                                  ? FontWeight.w600
-                                  : FontWeight.w400,
-                            ),
-                            showCheckmark: false,
-                          ),
-                        ),
-                      );
-                    }),
-                  ),
-                ),
-              ),
-            ),
-
-            // Content grid
-            if (_isLoadingItems && _items.isEmpty)
-              const SliverFillRemaining(
-                child: Center(child: CircularProgressIndicator()),
-              )
-            else if (_errorMessage != null)
-              SliverFillRemaining(
-                child: Center(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Icon(
-                        Icons.error_outline,
-                        size: 48,
-                        color: Colors.red,
-                      ),
-                      const SizedBox(height: 16),
-                      Text(_errorMessage!),
-                      const SizedBox(height: 16),
-                      ElevatedButton(
-                        onPressed: () =>
-                            _loadLibraryContent(_selectedLibraryKey!),
-                        child: Text(t.common.retry),
-                      ),
-                    ],
-                  ),
-                ),
-              )
-            else if (_items.isEmpty)
-              SliverFillRemaining(
-                child: Center(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Icon(
-                        Icons.folder_open,
-                        size: 64,
-                        color: Colors.grey,
-                      ),
-                      const SizedBox(height: 16),
-                      Text(t.libraries.thisLibraryIsEmpty),
-                    ],
-                  ),
-                ),
-              )
-            else ...[
-              Consumer<SettingsProvider>(
-                builder: (context, settingsProvider, child) {
-                  if (settingsProvider.viewMode == ViewMode.list) {
-                    return SliverPadding(
-                      padding: const EdgeInsets.fromLTRB(8, 0, 8, 8),
-                      sliver: SliverList(
-                        delegate: SliverChildBuilderDelegate((context, index) {
-                          final item = _items[index];
-                          return MediaCard(
-                            key: Key(item.ratingKey),
-                            item: item,
-                            onRefresh: updateItem,
-                          );
-                        }, childCount: _items.length),
-                      ),
-                    );
-                  } else {
-                    return SliverPadding(
-                      padding: const EdgeInsets.fromLTRB(8, 0, 8, 8),
-                      sliver: SliverGrid(
-                        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-                          maxCrossAxisExtent: _getMaxCrossAxisExtent(
-                            context,
-                            settingsProvider.libraryDensity,
-                          ),
-                          childAspectRatio: 2 / 3.3,
-                          crossAxisSpacing: 0,
-                          mainAxisSpacing: 0,
-                        ),
-                        delegate: SliverChildBuilderDelegate((context, index) {
-                          final item = _items[index];
-                          return MediaCard(
-                            key: Key(item.ratingKey),
-                            item: item,
-                            onRefresh: updateItem,
-                          );
-                        }, childCount: _items.length),
-                      ),
-                    );
-                  }
-                },
-              ),
-              // Show loading indicator if there are more items to load
-              if (_hasMoreItems && _isLoadingItems)
-                SliverToBoxAdapter(
-                  child: Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Column(
-                      children: [
-                        const CircularProgressIndicator(),
-                        const SizedBox(height: 8),
-                        Text(
-                          t.libraries.loadingLibraryWithCount(
-                            count: _items.length,
-                          ),
-                          style: Theme.of(context).textTheme.bodySmall,
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-            ],
-          ],
-        ],
-      ),
-    );
-  }
-
-  IconData _getLibraryIcon(String type) {
-    switch (type.toLowerCase()) {
-      case 'movie':
-        return Icons.movie;
-      case 'show':
-        return Icons.tv;
-      case 'artist':
-        return Icons.music_note;
-      case 'photo':
-        return Icons.photo;
-      default:
-        return Icons.folder;
-    }
-  }
-
-  double _getMaxCrossAxisExtent(BuildContext context, LibraryDensity density) {
-    final screenWidth = MediaQuery.of(context).size.width;
-    final padding = 16.0; // 8px left + 8px right
-    final availableWidth = screenWidth - padding;
-
-    if (screenWidth >= 900) {
-      // Wide screens (desktop/large tablet landscape): Responsive division
-      double divisor;
-      double maxItemWidth;
-
-      switch (density) {
-        case LibraryDensity.comfortable:
-          divisor = 6.5;
-          maxItemWidth = 280;
-          break;
-        case LibraryDensity.normal:
-          divisor = 8.0;
-          maxItemWidth = 200;
-          break;
-        case LibraryDensity.compact:
-          divisor = 10.0;
-          maxItemWidth = 160;
-          break;
-      }
-
-      return (availableWidth / divisor).clamp(0, maxItemWidth);
-    } else if (screenWidth >= 600) {
-      // Medium screens (tablets): Fixed 4-5-6 items
-      int targetItemCount = switch (density) {
-        LibraryDensity.comfortable => 4,
-        LibraryDensity.normal => 5,
-        LibraryDensity.compact => 6,
-      };
-      return availableWidth / targetItemCount;
-    } else {
-      // Small screens (phones): Fixed 2-3-4 items
-      int targetItemCount = switch (density) {
-        LibraryDensity.comfortable => 2,
-        LibraryDensity.normal => 3,
-        LibraryDensity.compact => 4,
-      };
-      return availableWidth / targetItemCount;
-    }
-  }
-}
-
-class _FiltersBottomSheet extends StatefulWidget {
-  final List<PlexFilter> filters;
-  final Map<String, String> selectedFilters;
-  final Function(Map<String, String>) onFiltersChanged;
-
-  const _FiltersBottomSheet({
-    required this.filters,
-    required this.selectedFilters,
-    required this.onFiltersChanged,
-  });
-
-  @override
-  State<_FiltersBottomSheet> createState() => _FiltersBottomSheetState();
-}
-
-class _FiltersBottomSheetState extends State<_FiltersBottomSheet> {
-  PlexFilter? _currentFilter;
-  List<PlexFilterValue> _filterValues = [];
-  bool _isLoadingValues = false;
-  final Map<String, String> _tempSelectedFilters = {};
-  final Map<String, String> _filterDisplayNames = {}; // Cache for display names
-  late List<PlexFilter> _sortedFilters;
-
-  @override
-  void initState() {
-    super.initState();
-    _tempSelectedFilters.addAll(widget.selectedFilters);
-    _sortFilters();
-  }
-
-  void _sortFilters() {
-    // Separate boolean filters (toggles) from regular filters
-    final booleanFilters = widget.filters
-        .where((f) => f.filterType == 'boolean')
-        .toList();
-    final regularFilters = widget.filters
-        .where((f) => f.filterType != 'boolean')
-        .toList();
-
-    // Combine with boolean filters first
-    _sortedFilters = [...booleanFilters, ...regularFilters];
-  }
-
-  bool _isBooleanFilter(PlexFilter filter) {
-    return filter.filterType == 'boolean';
-  }
-
-  Future<void> _loadFilterValues(PlexFilter filter) async {
-    setState(() {
-      _currentFilter = filter;
-      _isLoadingValues = true;
-    });
-
-    try {
-      final clientProvider = Provider.of<PlexClientProvider>(
-        context,
-        listen: false,
-      );
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception(t.errors.noClientAvailable);
-      }
-
-      final values = await client.getFilterValues(filter.key);
-      setState(() {
-        _filterValues = values;
-        _isLoadingValues = false;
-      });
-    } catch (e) {
-      setState(() {
-        _filterValues = [];
-        _isLoadingValues = false;
-      });
-    }
-  }
-
-  void _goBack() {
-    setState(() {
-      _currentFilter = null;
-      _filterValues = [];
-    });
-  }
-
-  void _applyFilters() {
-    widget.onFiltersChanged(_tempSelectedFilters);
-    Navigator.pop(context);
-  }
-
-  String _extractFilterValue(String key, String filterName) {
-    if (key.contains('?')) {
-      final queryStart = key.indexOf('?');
-      final queryString = key.substring(queryStart + 1);
-      final params = Uri.splitQueryString(queryString);
-      return params[filterName] ?? key;
-    } else if (key.startsWith('/')) {
-      return key.split('/').last;
-    }
-    return key;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return DraggableScrollableSheet(
-      initialChildSize: 0.7,
-      minChildSize: 0.5,
-      maxChildSize: 0.95,
-      expand: false,
-      builder: (context, scrollController) {
-        if (_currentFilter != null) {
-          // Show filter options view
-          return Column(
-            children: [
-              // Header with back button
-              Container(
-                padding: const EdgeInsets.all(16),
-                decoration: BoxDecoration(
-                  border: Border(
-                    bottom: BorderSide(color: Theme.of(context).dividerColor),
-                  ),
-                ),
-                child: Row(
-                  children: [
-                    AppBarBackButton(
-                      style: BackButtonStyle.plain,
-                      onPressed: _goBack,
-                    ),
-                    const SizedBox(width: 8),
-                    Expanded(
-                      child: Text(
-                        _currentFilter!.title,
-                        style: const TextStyle(
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                    IconButton(
-                      icon: const Icon(Icons.close),
-                      onPressed: () => Navigator.pop(context),
-                    ),
-                  ],
-                ),
-              ),
-
-              // Filter options list
-              if (_isLoadingValues)
-                const Expanded(
-                  child: Center(child: CircularProgressIndicator()),
-                )
-              else
-                Expanded(
-                  child: ListView.builder(
-                    controller: scrollController,
-                    padding: const EdgeInsets.symmetric(vertical: 8),
-                    itemCount: _filterValues.length + 1,
-                    itemBuilder: (context, index) {
-                      if (index == 0) {
-                        final isSelected = !_tempSelectedFilters.containsKey(
-                          _currentFilter!.filter,
-                        );
-                        return ListTile(
-                          title: Text(t.libraries.all),
-                          selected: isSelected,
-                          onTap: () {
-                            setState(() {
-                              _tempSelectedFilters.remove(
-                                _currentFilter!.filter,
-                              );
-                            });
-                            _applyFilters();
-                          },
-                        );
-                      }
-
-                      final value = _filterValues[index - 1];
-                      final filterValue = _extractFilterValue(
-                        value.key,
-                        _currentFilter!.filter,
-                      );
-                      final isSelected =
-                          _tempSelectedFilters[_currentFilter!.filter] ==
-                          filterValue;
-
-                      return ListTile(
-                        title: Text(value.title),
-                        selected: isSelected,
-                        onTap: () {
-                          setState(() {
-                            _tempSelectedFilters[_currentFilter!.filter] =
-                                filterValue;
-                            // Cache the display name for this filter value
-                            _filterDisplayNames['${_currentFilter!.filter}:$filterValue'] =
-                                value.title;
-                          });
-                          _applyFilters();
-                        },
-                      );
-                    },
-                  ),
-                ),
-            ],
-          );
-        }
-
-        // Show main filters view
-        return Column(
-          children: [
-            // Header
-            Container(
-              padding: const EdgeInsets.all(16),
-              decoration: BoxDecoration(
-                border: Border(
-                  bottom: BorderSide(color: Theme.of(context).dividerColor),
-                ),
-              ),
-              child: Row(
-                children: [
-                  const Icon(Icons.filter_list),
-                  const SizedBox(width: 12),
-                  Text(
-                    t.libraries.filters,
-                    style: const TextStyle(
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const Spacer(),
-                  if (_tempSelectedFilters.isNotEmpty)
-                    TextButton.icon(
-                      onPressed: () {
-                        setState(() {
-                          _tempSelectedFilters.clear();
-                        });
-                        _applyFilters();
-                      },
-                      icon: const Icon(Icons.clear_all),
-                      label: Text(t.libraries.clearAll),
-                    ),
-                  IconButton(
-                    icon: const Icon(Icons.close),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                ],
-              ),
-            ),
-
-            // All Filters (boolean toggles first, then regular filters)
-            Expanded(
-              child: ListView.builder(
-                controller: scrollController,
-                padding: const EdgeInsets.symmetric(vertical: 8),
-                itemCount: _sortedFilters.length,
-                itemBuilder: (context, index) {
-                  final filter = _sortedFilters[index];
-
-                  // Handle boolean filters as switches (unwatched, inProgress, unmatched, hdr, etc.)
-                  if (_isBooleanFilter(filter)) {
-                    final isActive =
-                        _tempSelectedFilters.containsKey(filter.filter) &&
-                        _tempSelectedFilters[filter.filter] == '1';
-                    return SwitchListTile(
-                      value: isActive,
-                      onChanged: (value) {
-                        setState(() {
-                          if (value) {
-                            _tempSelectedFilters[filter.filter] = '1';
-                          } else {
-                            _tempSelectedFilters.remove(filter.filter);
-                          }
-                        });
-                        _applyFilters();
-                      },
-                      title: Text(filter.title),
-                    );
-                  }
-
-                  // Regular navigable filters - show selected value instead of checkmark
-                  final selectedValue = _tempSelectedFilters[filter.filter];
-                  String? displayValue;
-                  if (selectedValue != null) {
-                    // Try to get the cached display name, fall back to the value itself
-                    displayValue =
-                        _filterDisplayNames['${filter.filter}:$selectedValue'] ??
-                        selectedValue;
-                  }
-
-                  return ListTile(
-                    title: Text(filter.title),
-                    trailing: Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        if (displayValue != null)
-                          Flexible(
-                            child: Text(
-                              displayValue,
-                              style: TextStyle(
-                                color: Theme.of(context).colorScheme.primary,
-                                fontWeight: FontWeight.w500,
-                              ),
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          ),
-                        if (displayValue != null) const SizedBox(width: 8),
-                        const Icon(Icons.chevron_right),
-                      ],
-                    ),
-                    onTap: () => _loadFilterValues(filter),
-                  );
-                },
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
-
-class _SortBottomSheet extends StatefulWidget {
-  final List<PlexSort> sortOptions;
-  final PlexSort? selectedSort;
-  final bool isSortDescending;
-  final Function(PlexSort, bool) onSortChanged;
-
-  const _SortBottomSheet({
-    required this.sortOptions,
-    required this.selectedSort,
-    required this.isSortDescending,
-    required this.onSortChanged,
-  });
-
-  @override
-  State<_SortBottomSheet> createState() => _SortBottomSheetState();
-}
-
-class _SortBottomSheetState extends State<_SortBottomSheet> {
-  late PlexSort? _tempSelectedSort;
-  late bool _tempDescending;
-
-  @override
-  void initState() {
-    super.initState();
-    _tempSelectedSort = widget.selectedSort;
-    _tempDescending = widget.isSortDescending;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return DraggableScrollableSheet(
-      initialChildSize: 0.6,
-      minChildSize: 0.4,
-      maxChildSize: 0.9,
-      expand: false,
-      builder: (context, scrollController) {
-        return Column(
-          children: [
-            // Header
-            Container(
-              padding: const EdgeInsets.all(16),
-              decoration: BoxDecoration(
-                border: Border(
-                  bottom: BorderSide(color: Theme.of(context).dividerColor),
-                ),
-              ),
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Text(
-                      t.libraries.sortBy,
-                      style: const TextStyle(
-                        fontSize: 20,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  IconButton(
-                    icon: const Icon(Icons.close),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                ],
-              ),
-            ),
-
-            // Sort options list
-            Expanded(
-              child: RadioGroup<String>(
-                groupValue: _tempSelectedSort?.key,
-                onChanged: (value) {
-                  final sort = widget.sortOptions.firstWhere(
-                    (s) => s.key == value,
-                  );
-                  setState(() {
-                    _tempSelectedSort = sort;
-                    // Use default direction for newly selected sort
-                    _tempDescending = sort.isDefaultDescending;
-                  });
-                  // Apply sort immediately with default direction
-                  widget.onSortChanged(sort, sort.isDefaultDescending);
-                },
-                child: ListView.builder(
-                  controller: scrollController,
-                  padding: const EdgeInsets.symmetric(vertical: 8),
-                  itemCount: widget.sortOptions.length,
-                  itemBuilder: (context, index) {
-                    final sort = widget.sortOptions[index];
-                    final isSelected = _tempSelectedSort?.key == sort.key;
-
-                    return ListTile(
-                      title: Text(sort.title),
-                      trailing: isSelected
-                          ? Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                // Direction toggle buttons
-                                SegmentedButton<bool>(
-                                  showSelectedIcon: false,
-                                  segments: const [
-                                    ButtonSegment(
-                                      value: false,
-                                      icon: Icon(Icons.arrow_upward, size: 16),
-                                    ),
-                                    ButtonSegment(
-                                      value: true,
-                                      icon: Icon(
-                                        Icons.arrow_downward,
-                                        size: 16,
-                                      ),
-                                    ),
-                                  ],
-                                  selected: {_tempDescending},
-                                  onSelectionChanged: (Set<bool> selected) {
-                                    widget.onSortChanged(sort, selected.first);
-                                  },
-                                ),
-                              ],
-                            )
-                          : null,
-                      leading: Radio<String>(
-                        value: sort.key,
-                        toggleable: false,
-                      ),
-                      onTap: () {
-                        setState(() {
-                          _tempSelectedSort = sort;
-                          // Use default direction for newly selected sort
-                          _tempDescending = sort.isDefaultDescending;
-                        });
-                        // Apply sort immediately with default direction
-                        widget.onSortChanged(sort, sort.isDefaultDescending);
-                      },
-                    );
-                  },
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
-
-class _LibraryManagementSheet extends StatefulWidget {
-  final List<PlexLibrary> allLibraries;
-  final Set<String> hiddenLibraryKeys;
-  final Function(List<PlexLibrary>) onReorder;
-  final Function(PlexLibrary) onToggleVisibility;
-  final List<ContextMenuItem> Function(PlexLibrary) getLibraryMenuItems;
-  final void Function(String action, PlexLibrary library) onLibraryMenuAction;
-
-  const _LibraryManagementSheet({
-    required this.allLibraries,
-    required this.hiddenLibraryKeys,
-    required this.onReorder,
-    required this.onToggleVisibility,
-    required this.getLibraryMenuItems,
-    required this.onLibraryMenuAction,
-  });
-
-  @override
-  State<_LibraryManagementSheet> createState() =>
-      _LibraryManagementSheetState();
-}
-
-class _LibraryManagementSheetState extends State<_LibraryManagementSheet> {
-  late List<PlexLibrary> _tempLibraries;
-
-  @override
-  void initState() {
-    super.initState();
-    _tempLibraries = List.from(widget.allLibraries);
-  }
-
-  void _reorderLibraries(int oldIndex, int newIndex) {
-    setState(() {
-      if (newIndex > oldIndex) {
-        newIndex -= 1;
-      }
-      final library = _tempLibraries.removeAt(oldIndex);
-      _tempLibraries.insert(newIndex, library);
-    });
-    // Apply immediately
-    widget.onReorder(_tempLibraries);
-  }
-
-  Future<void> _showLibraryMenuBottomSheet(
-    BuildContext context,
-    PlexLibrary library,
-  ) async {
-    final menuItems = widget.getLibraryMenuItems(library);
-    final selected = await showModalBottomSheet<String>(
-      context: context,
-      builder: (context) => SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: Text(
-                library.title,
-                style: const TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-            ),
-            ...menuItems.map(
-              (item) => ListTile(
-                leading: Icon(item.icon),
-                title: Text(item.label),
-                onTap: () => Navigator.pop(context, item.value),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-
-    if (selected != null && mounted) {
-      // Find the selected item to check if confirmation is needed
-      final selectedItem = menuItems.firstWhere(
-        (item) => item.value == selected,
-      );
-
-      if (selectedItem.requiresConfirmation) {
-        if (!mounted || !context.mounted) return;
-        final confirmed = await showDialog<bool>(
-          context: context,
-          builder: (context) => AlertDialog(
-            title: Text(
-              selectedItem.confirmationTitle ?? t.dialog.confirmAction,
-            ),
-            content: Text(
-              selectedItem.confirmationMessage ??
-                  t.libraries.confirmActionMessage,
-            ),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.pop(context, false),
-                child: Text(t.common.cancel),
-              ),
-              TextButton(
-                onPressed: () => Navigator.pop(context, true),
-                style: selectedItem.isDestructive
-                    ? TextButton.styleFrom(foregroundColor: Colors.red)
-                    : null,
-                child: Text(t.common.confirm),
-              ),
-            ],
-          ),
-        );
-
-        if (confirmed != true) return;
-      }
-
-      widget.onLibraryMenuAction(selected, library);
-    }
-  }
-
-  IconData _getLibraryIcon(String type) {
-    switch (type.toLowerCase()) {
-      case 'movie':
-        return Icons.movie;
-      case 'show':
-        return Icons.tv;
-      case 'artist':
-        return Icons.music_note;
-      case 'photo':
-        return Icons.photo;
-      default:
-        return Icons.folder;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    // Watch provider to rebuild when hidden libraries change
-    final hiddenLibrariesProvider = context.watch<HiddenLibrariesProvider>();
-    final hiddenLibraryKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
-
-    return DraggableScrollableSheet(
-      initialChildSize: 0.7,
-      minChildSize: 0.5,
-      maxChildSize: 0.95,
-      expand: false,
-      builder: (context, scrollController) {
-        return Column(
-          children: [
-            // Header
-            Container(
-              padding: const EdgeInsets.all(16),
-              decoration: BoxDecoration(
-                border: Border(
-                  bottom: BorderSide(color: Theme.of(context).dividerColor),
-                ),
-              ),
-              child: Row(
-                children: [
-                  const Icon(Icons.edit),
-                  const SizedBox(width: 12),
-                  Expanded(
-                    child: Text(
-                      t.libraries.manageLibraries,
-                      style: const TextStyle(
-                        fontSize: 20,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  IconButton(
-                    icon: const Icon(Icons.close),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                ],
-              ),
-            ),
-
-            // Reorderable library list
-            Expanded(
-              child: ReorderableListView.builder(
-                scrollController: scrollController,
-                onReorder: _reorderLibraries,
-                itemCount: _tempLibraries.length,
-                padding: const EdgeInsets.symmetric(vertical: 8),
-                buildDefaultDragHandles: false,
-                itemBuilder: (context, index) {
-                  final library = _tempLibraries[index];
-                  final isHidden = hiddenLibraryKeys.contains(library.key);
-
-                  return Opacity(
-                    key: ValueKey(library.key),
-                    opacity: isHidden ? 0.5 : 1.0,
-                    child: ListTile(
-                      leading: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          ReorderableDragStartListener(
-                            index: index,
-                            child: Padding(
-                              padding: const EdgeInsets.only(right: 12),
-                              child: Icon(
-                                Icons.drag_indicator,
-                                color: Theme.of(context)
-                                    .textTheme
-                                    .bodyMedium
-                                    ?.color
-                                    ?.withValues(alpha: 0.5),
-                              ),
-                            ),
-                          ),
-                          const SizedBox(width: 8),
-                          Icon(_getLibraryIcon(library.type)),
-                        ],
-                      ),
-                      title: Text(library.title),
-                      trailing: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          IconButton(
-                            icon: Icon(
-                              isHidden
-                                  ? Icons.visibility_off
-                                  : Icons.visibility,
-                            ),
-                            onPressed: () => widget.onToggleVisibility(library),
-                            tooltip: isHidden
-                                ? t.libraries.showLibrary
-                                : t.libraries.hideLibrary,
-                          ),
-                          IconButton(
-                            icon: const Icon(Icons.more_vert),
-                            onPressed: () =>
-                                _showLibraryMenuBottomSheet(context, library),
-                            tooltip: t.libraries.libraryOptions,
-                          ),
-                        ],
-                      ),
-                    ),
-                  );
-                },
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
diff --git a/lib/screens/licenses_screen.dart b/lib/screens/licenses_screen.dart
deleted file mode 100644
index 042123f6..00000000
--- a/lib/screens/licenses_screen.dart
+++ /dev/null
@@ -1,221 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import '../widgets/desktop_app_bar.dart';
-import '../i18n/strings.g.dart';
-
-class MergedLicenseEntry {
-  final String packageName;
-  final List<LicenseEntry> licenseEntries;
-  final Set<String> allPackageNames;
-
-  MergedLicenseEntry({
-    required this.packageName,
-    required this.licenseEntries,
-    required this.allPackageNames,
-  });
-}
-
-class LicensesScreen extends StatefulWidget {
-  const LicensesScreen({super.key});
-
-  @override
-  State<LicensesScreen> createState() => _LicensesScreenState();
-}
-
-class _LicensesScreenState extends State<LicensesScreen> {
-  List<MergedLicenseEntry> _mergedLicenses = [];
-  bool _isLoading = true;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadLicenses();
-  }
-
-  Future<void> _loadLicenses() async {
-    final licenseMap = <String, List<LicenseEntry>>{};
-    final allPackageNames = <String, Set<String>>{};
-
-    await for (final license in LicenseRegistry.licenses) {
-      for (final packageName in license.packages) {
-        if (!licenseMap.containsKey(packageName)) {
-          licenseMap[packageName] = [];
-          allPackageNames[packageName] = <String>{};
-        }
-        licenseMap[packageName]!.add(license);
-        allPackageNames[packageName]!.addAll(license.packages);
-      }
-    }
-
-    final mergedLicenses = licenseMap.entries.map((entry) {
-      return MergedLicenseEntry(
-        packageName: entry.key,
-        licenseEntries: entry.value,
-        allPackageNames: allPackageNames[entry.key]!,
-      );
-    }).toList();
-
-    mergedLicenses.sort((a, b) => a.packageName.compareTo(b.packageName));
-
-    if (mounted) {
-      setState(() {
-        _mergedLicenses = mergedLicenses;
-        _isLoading = false;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (_isLoading) {
-      return const Scaffold(body: Center(child: CircularProgressIndicator()));
-    }
-
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          CustomAppBar(title: Text(t.screens.licenses), pinned: true),
-          SliverPadding(
-            padding: const EdgeInsets.all(16),
-            sliver: SliverList(
-              delegate: SliverChildBuilderDelegate((context, index) {
-                final mergedLicense = _mergedLicenses[index];
-                final packageName = mergedLicense.packageName;
-
-                return Card(
-                  margin: const EdgeInsets.only(bottom: 8),
-                  child: ListTile(
-                    title: Text(
-                      packageName,
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    subtitle: mergedLicense.licenseEntries.length > 1
-                        ? Text(
-                            t.licenses.licensesCount(
-                              count: mergedLicense.licenseEntries.length,
-                            ),
-                          )
-                        : null,
-                    trailing: const Icon(Icons.chevron_right),
-                    onTap: () => _showLicenseDetail(mergedLicense),
-                  ),
-                );
-              }, childCount: _mergedLicenses.length),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  void _showLicenseDetail(MergedLicenseEntry mergedLicense) {
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) =>
-            _LicenseDetailScreen(mergedLicense: mergedLicense),
-      ),
-    );
-  }
-}
-
-class _LicenseDetailScreen extends StatelessWidget {
-  final MergedLicenseEntry mergedLicense;
-
-  const _LicenseDetailScreen({required this.mergedLicense});
-
-  @override
-  Widget build(BuildContext context) {
-    final packageName = mergedLicense.packageName;
-    final licenseEntries = mergedLicense.licenseEntries;
-
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          CustomAppBar(title: Text(packageName), pinned: true),
-          SliverPadding(
-            padding: const EdgeInsets.all(16),
-            sliver: SliverList(
-              delegate: SliverChildListDelegate([
-                // Package info card
-                if (mergedLicense.allPackageNames.length > 1)
-                  Card(
-                    child: Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            t.licenses.relatedPackages,
-                            style: Theme.of(context).textTheme.titleMedium
-                                ?.copyWith(fontWeight: FontWeight.bold),
-                          ),
-                          const SizedBox(height: 8),
-                          Text(
-                            mergedLicense.allPackageNames.join(', '),
-                            style: Theme.of(context).textTheme.bodyMedium,
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                if (mergedLicense.allPackageNames.length > 1)
-                  const SizedBox(height: 16),
-
-                // License cards
-                ...licenseEntries.asMap().entries.map((entry) {
-                  final index = entry.key;
-                  final license = entry.value;
-                  final isMultipleLicenses = licenseEntries.length > 1;
-
-                  return Column(
-                    children: [
-                      Card(
-                        child: Padding(
-                          padding: const EdgeInsets.all(16),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(
-                                isMultipleLicenses
-                                    ? t.licenses.licenseNumber(
-                                        number: index + 1,
-                                      )
-                                    : t.licenses.license,
-                                style: Theme.of(context).textTheme.titleMedium
-                                    ?.copyWith(fontWeight: FontWeight.bold),
-                              ),
-                              const SizedBox(height: 16),
-                              ...license.paragraphs.map((paragraph) {
-                                return Padding(
-                                  padding: const EdgeInsets.only(bottom: 16),
-                                  child: SelectableText(
-                                    paragraph.text,
-                                    style: TextStyle(
-                                      fontFamily: paragraph.indent > 0
-                                          ? 'monospace'
-                                          : null,
-                                      fontSize: 14,
-                                    ),
-                                  ),
-                                );
-                              }),
-                            ],
-                          ),
-                        ),
-                      ),
-                      if (index < licenseEntries.length - 1)
-                        const SizedBox(height: 16),
-                    ],
-                  );
-                }),
-              ]),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/screens/main_screen.dart b/lib/screens/main_screen.dart
index 79918672..1a1552d1 100644
--- a/lib/screens/main_screen.dart
+++ b/lib/screens/main_screen.dart
@@ -1,74 +1,302 @@
 import 'package:flutter/material.dart';
-import '../client/plex_client.dart';
-import '../i18n/strings.g.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+import '../../services/plex_client.dart';
 import '../utils/app_logger.dart';
 import '../utils/provider_extensions.dart';
+import '../utils/platform_detector.dart';
 import '../main.dart';
 import '../mixins/refreshable.dart';
+import '../navigation/navigation_tabs.dart';
+import '../providers/multi_server_provider.dart';
+import '../providers/server_state_provider.dart';
+import '../providers/hidden_libraries_provider.dart';
+import '../providers/playback_state_provider.dart';
+import '../services/offline_watch_sync_service.dart';
+import '../providers/offline_mode_provider.dart';
+import '../services/plex_auth_service.dart';
+import '../services/storage_service.dart';
+import '../utils/desktop_window_padding.dart';
+import '../widgets/side_navigation_rail.dart';
 import 'discover_screen.dart';
-import 'libraries_screen.dart';
+import 'libraries/libraries_screen.dart';
 import 'search_screen.dart';
-import 'settings_screen.dart';
+import 'downloads/downloads_screen.dart';
+import 'settings/settings_screen.dart';
+
+/// Provides access to the main screen's focus control.
+class MainScreenFocusScope extends InheritedWidget {
+  final VoidCallback focusSidebar;
+  final VoidCallback focusContent;
+  final bool isSidebarFocused;
+
+  const MainScreenFocusScope({
+    super.key,
+    required this.focusSidebar,
+    required this.focusContent,
+    required this.isSidebarFocused,
+    required super.child,
+  });
+
+  static MainScreenFocusScope? of(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<MainScreenFocusScope>();
+  }
+
+  @override
+  bool updateShouldNotify(MainScreenFocusScope oldWidget) {
+    return isSidebarFocused != oldWidget.isSidebarFocused;
+  }
+}
 
 class MainScreen extends StatefulWidget {
-  final PlexClient client;
+  final PlexClient? client;
+  final bool isOfflineMode;
 
-  const MainScreen({super.key, required this.client});
+  const MainScreen({super.key, this.client, this.isOfflineMode = false});
 
   @override
   State<MainScreen> createState() => _MainScreenState();
 }
 
 class _MainScreenState extends State<MainScreen> with RouteAware {
-  int _currentIndex = 0;
+  late int _currentIndex;
+  String? _selectedLibraryGlobalKey;
 
-  late final List<Widget> _screens;
+  /// Whether the app is in offline mode (no server connection)
+  bool _isOffline = false;
+
+  /// Last selected online tab (restored when coming back online after an offline fallback)
+  NavigationTabId? _lastOnlineTabId;
+
+  /// Whether we auto-switched to Downloads because the previous tab was unavailable offline
+  bool _autoSwitchedToDownloads = false;
+
+  OfflineModeProvider? _offlineModeProvider;
+
+  late List<Widget> _screens;
   final GlobalKey<State<DiscoverScreen>> _discoverKey = GlobalKey();
   final GlobalKey<State<LibrariesScreen>> _librariesKey = GlobalKey();
   final GlobalKey<State<SearchScreen>> _searchKey = GlobalKey();
+  final GlobalKey<State<DownloadsScreen>> _downloadsKey = GlobalKey();
   final GlobalKey<State<SettingsScreen>> _settingsKey = GlobalKey();
+  final GlobalKey<SideNavigationRailState> _sideNavKey = GlobalKey();
+
+  // Focus management for sidebar/content switching
+  final FocusScopeNode _sidebarFocusScope = FocusScopeNode(
+    debugLabel: 'Sidebar',
+  );
+  final FocusScopeNode _contentFocusScope = FocusScopeNode(
+    debugLabel: 'Content',
+  );
+  bool _isSidebarFocused = false;
 
   @override
   void initState() {
     super.initState();
+    _isOffline = widget.isOfflineMode;
 
-    _screens = [
-      DiscoverScreen(
-        key: _discoverKey,
-        onBecameVisible: _onDiscoverBecameVisible,
-      ),
-      LibrariesScreen(key: _librariesKey),
-      SearchScreen(key: _searchKey),
-      SettingsScreen(key: _settingsKey),
-    ];
+    // Start on Downloads tab when in offline mode
+    // In offline mode: visual index 0 = Downloads (screen 3), 1 = Settings (screen 4)
+    // In online mode: indices match directly
+    _currentIndex = _isOffline ? 0 : 0;
+    _lastOnlineTabId = _isOffline ? null : NavigationTabId.discover;
+    _autoSwitchedToDownloads = _isOffline;
 
-    // Set up data invalidation callback for profile switching
+    _screens = _buildScreens(_isOffline);
+
+    // Set up data invalidation callback for profile switching (skip in offline mode)
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      // Initialize UserProfileProvider to ensure it's ready after sign-in
-      final userProfileProvider = context.userProfile;
-      await userProfileProvider.initialize();
+      if (!_isOffline) {
+        // Initialize UserProfileProvider to ensure it's ready after sign-in
+        final userProfileProvider = context.userProfile;
+        await userProfileProvider.initialize();
 
-      // Set up data invalidation callback for profile switching
-      userProfileProvider.setDataInvalidationCallback(_invalidateAllScreens);
+        // Set up data invalidation callback for profile switching
+        userProfileProvider.setDataInvalidationCallback(_invalidateAllScreens);
+      }
+
+      // Focus content initially (replaces autofocus which caused focus stealing issues)
+      if (!_isSidebarFocused) {
+        _contentFocusScope.requestFocus();
+      }
     });
   }
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
+
+    // Listen for offline/online transitions to refresh navigation & screens
+    // Note: We don't call _handleOfflineStatusChanged() immediately because
+    // widget.isOfflineMode (from SetupScreen navigation) is authoritative for
+    // initial state. The provider may not yet have received the server status
+    // update due to initialization timing. The listener handles runtime changes.
+    final provider = context.read<OfflineModeProvider?>();
+    if (provider != null && provider != _offlineModeProvider) {
+      _offlineModeProvider?.removeListener(_handleOfflineStatusChanged);
+      _offlineModeProvider = provider;
+      _offlineModeProvider!.addListener(_handleOfflineStatusChanged);
+    }
+
     routeObserver.subscribe(this, ModalRoute.of(context) as PageRoute);
   }
 
   @override
   void dispose() {
     routeObserver.unsubscribe(this);
+    _offlineModeProvider?.removeListener(_handleOfflineStatusChanged);
+    _sidebarFocusScope.dispose();
+    _contentFocusScope.dispose();
     super.dispose();
   }
 
+  List<Widget> _buildScreens(bool offline) {
+    // In offline mode, only show Downloads and Settings
+    // In online mode, show all 5 screens
+    if (offline) {
+      return [
+        DownloadsScreen(key: _downloadsKey),
+        SettingsScreen(key: _settingsKey),
+      ];
+    }
+
+    return [
+      DiscoverScreen(
+        key: _discoverKey,
+        onBecameVisible: _onDiscoverBecameVisible,
+      ),
+      LibrariesScreen(
+        key: _librariesKey,
+        onLibraryOrderChanged: _onLibraryOrderChanged,
+      ),
+      SearchScreen(key: _searchKey),
+      DownloadsScreen(key: _downloadsKey),
+      SettingsScreen(key: _settingsKey),
+    ];
+  }
+
+  /// Normalize tab index when switching between offline/online modes.
+  /// Preserves the current tab if it exists in the new mode, otherwise defaults to first tab.
+  int _normalizeIndexForMode(int currentIndex, bool wasOffline, bool isOffline) {
+    if (wasOffline == isOffline) return currentIndex;
+
+    final oldTabs = _getVisibleTabs(wasOffline);
+    final newTabs = _getVisibleTabs(isOffline);
+
+    // Get the tab ID at the current index (or first tab if out of bounds)
+    final currentTabId = currentIndex >= 0 && currentIndex < oldTabs.length
+        ? oldTabs[currentIndex].id
+        : oldTabs.first.id;
+
+    // Find the same tab in the new mode's tab list
+    final newIndex = newTabs.indexWhere((tab) => tab.id == currentTabId);
+    return newIndex >= 0 ? newIndex : 0;
+  }
+
+  void _handleOfflineStatusChanged() {
+    final newOffline = _offlineModeProvider?.isOffline ?? widget.isOfflineMode;
+
+    if (newOffline == _isOffline) return;
+
+    final previousTabId = _tabIdForIndex(_isOffline, _currentIndex);
+    final wasOffline = _isOffline;
+    setState(() {
+      _isOffline = newOffline;
+      _screens = _buildScreens(_isOffline);
+      _selectedLibraryGlobalKey = _isOffline ? null : _selectedLibraryGlobalKey;
+
+      if (_isOffline) {
+        // Remember the online tab so we can restore it when reconnecting.
+        if (!wasOffline) {
+          _lastOnlineTabId = previousTabId;
+        }
+
+        _currentIndex =
+            _normalizeIndexForMode(_currentIndex, wasOffline, _isOffline);
+
+        // Track if we auto-switched to Downloads because the previous tab was unavailable.
+        _autoSwitchedToDownloads =
+            previousTabId != NavigationTabId.downloads &&
+            _tabIdForIndex(true, _currentIndex) == NavigationTabId.downloads;
+      } else {
+        // Coming back online: restore the last online tab if we forced a switch to Downloads.
+        if (_autoSwitchedToDownloads) {
+          final restoredTab = _lastOnlineTabId ?? NavigationTabId.discover;
+          final restoredIndex = NavigationTab.indexFor(
+            restoredTab,
+            isOffline: _isOffline,
+          );
+          _currentIndex = restoredIndex >= 0 ? restoredIndex : 0;
+        } else {
+          _currentIndex =
+              _normalizeIndexForMode(_currentIndex, wasOffline, _isOffline);
+        }
+        _autoSwitchedToDownloads = false;
+      }
+    });
+
+    // Refresh sidebar focus after rebuilding navigation
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _sideNavKey.currentState?.focusActiveItem();
+    });
+
+    // Ensure profile provider is initialized when coming back online
+    if (!_isOffline) {
+      final userProfileProvider = context.userProfile;
+      userProfileProvider.initialize().then((_) {
+        userProfileProvider.setDataInvalidationCallback(_invalidateAllScreens);
+      });
+    }
+  }
+
+  void _focusSidebar() {
+    setState(() => _isSidebarFocused = true);
+    _sidebarFocusScope.requestFocus();
+    // Focus the active item after the focus scope has focus
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _sideNavKey.currentState?.focusActiveItem();
+    });
+  }
+
+  void _focusContent() {
+    setState(() => _isSidebarFocused = false);
+    _contentFocusScope.requestFocus();
+    // When content regains focus while on Libraries, retry focusing the active tab
+    if (_currentIndex == 1) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (_librariesKey.currentState case final FocusableTab focusable) {
+          focusable.focusActiveTabIfReady();
+        }
+      });
+    }
+  }
+
+  KeyEventResult _handleBackKey(KeyEvent event) {
+    if (event is! KeyDownEvent) return KeyEventResult.ignored;
+
+    // Handle all back keys - this handler is only reached if lower widgets
+    // (e.g., LibrariesScreen tab content/chips) don't handle the back key first
+    final isBackKey =
+        event.logicalKey == LogicalKeyboardKey.escape ||
+        event.logicalKey == LogicalKeyboardKey.goBack ||
+        event.logicalKey == LogicalKeyboardKey.browserBack ||
+        event.logicalKey == LogicalKeyboardKey.gameButtonB;
+
+    if (!isBackKey) return KeyEventResult.ignored;
+
+    // Toggle focus between sidebar and content
+    if (_isSidebarFocused) {
+      _focusContent();
+    } else {
+      _focusSidebar();
+    }
+    return KeyEventResult.handled;
+  }
+
   @override
   void didPush() {
     // Called when this route has been pushed (initial navigation)
-    if (_currentIndex == 0) {
+    if (_currentIndex == 0 && !_isOffline) {
       _onDiscoverBecameVisible();
     }
   }
@@ -76,7 +304,7 @@ class _MainScreenState extends State<MainScreen> with RouteAware {
   @override
   void didPopNext() {
     // Called when returning to this route from a child route (e.g., from video player)
-    if (_currentIndex == 0) {
+    if (_currentIndex == 0 && !_isOffline) {
       _onDiscoverBecameVisible();
     }
   }
@@ -90,66 +318,199 @@ class _MainScreenState extends State<MainScreen> with RouteAware {
     }
   }
 
+  void _onLibraryOrderChanged() {
+    // Refresh side navigation when library order changes
+    _sideNavKey.currentState?.reloadLibraries();
+  }
+
   /// Invalidate all cached data across all screens when profile is switched
-  void _invalidateAllScreens() {
-    appLogger.d('Invalidating all screen data due to profile switch');
+  /// Receives the list of servers with new profile tokens for reconnection
+  Future<void> _invalidateAllScreens(List<PlexServer> servers) async {
+    appLogger.d(
+      'Invalidating all screen data due to profile switch with ${servers.length} servers',
+    );
+
+    // Get all providers
+    final multiServerProvider = context.read<MultiServerProvider>();
+    final serverStateProvider = context.read<ServerStateProvider>();
+    final hiddenLibrariesProvider = context.read<HiddenLibrariesProvider>();
+    final playbackStateProvider = context.read<PlaybackStateProvider>();
+
+    // Reconnect to all servers with new profile tokens
+    if (servers.isNotEmpty) {
+      final storage = await StorageService.getInstance();
+      final clientId = storage.getClientIdentifier();
+
+      final connectedCount = await multiServerProvider.reconnectWithServers(
+        servers,
+        clientIdentifier: clientId,
+      );
+      appLogger.d(
+        'Reconnected to $connectedCount/${servers.length} servers after profile switch',
+      );
+
+      // Trigger watch state sync now that servers are connected
+      if (connectedCount > 0) {
+        if (!mounted) return;
+        context.read<OfflineWatchSyncService>().onServersConnected();
+      }
+    }
+
+    // Reset other provider states
+    serverStateProvider.reset();
+    hiddenLibrariesProvider.refresh();
+    playbackStateProvider.clearShuffle();
+
+    appLogger.d('Cleared all provider states for profile switch');
 
     // Full refresh discover screen (reload all content for new profile)
-    final discoverState = _discoverKey.currentState;
-    if (discoverState != null) {
-      (discoverState as dynamic).fullRefresh();
+    if (_discoverKey.currentState case final FullRefreshable refreshable) {
+      refreshable.fullRefresh();
     }
 
     // Full refresh libraries screen (clear filters and reload for new profile)
-    final librariesState = _librariesKey.currentState;
-    if (librariesState != null) {
-      (librariesState as dynamic).fullRefresh();
+    if (_librariesKey.currentState case final FullRefreshable refreshable) {
+      refreshable.fullRefresh();
     }
 
     // Full refresh search screen (clear search for new profile)
-    final searchState = _searchKey.currentState;
-    if (searchState != null) {
-      (searchState as dynamic).fullRefresh();
+    if (_searchKey.currentState case final FullRefreshable refreshable) {
+      refreshable.fullRefresh();
     }
   }
 
+  void _selectTab(int index) {
+    final previousIndex = _currentIndex;
+    setState(() {
+      _currentIndex = index;
+      if (!_isOffline) {
+        _lastOnlineTabId = _tabIdForIndex(false, index);
+      } else if (previousIndex != index) {
+        // User made an explicit offline selection, so don't auto-restore later.
+        _autoSwitchedToDownloads = false;
+      }
+    });
+
+    // Skip screen-specific logic in offline mode (only Downloads and Settings available)
+    if (_isOffline) return;
+
+    // Notify discover screen when it becomes visible via tab switch
+    if (index == 0) {
+      _onDiscoverBecameVisible();
+    }
+    // Ensure the libraries screen applies focus when brought into view
+    if (index == 1 && previousIndex != 1) {
+      if (_librariesKey.currentState case final FocusableTab focusable) {
+        focusable.focusActiveTabIfReady();
+      }
+    }
+    // Focus search input when selecting Search tab
+    if (index == 2) {
+      if (_searchKey.currentState case final SearchInputFocusable searchable) {
+        searchable.focusSearchInput();
+      }
+    }
+  }
+
+  /// Handle library selection from side navigation rail
+  void _selectLibrary(String libraryGlobalKey) {
+    setState(() {
+      _selectedLibraryGlobalKey = libraryGlobalKey;
+      _currentIndex = 1; // Switch to Libraries tab
+      if (!_isOffline) {
+        _lastOnlineTabId = NavigationTabId.libraries;
+      }
+    });
+    // Tell LibrariesScreen to load this library
+    if (_librariesKey.currentState case final LibraryLoadable loadable) {
+      loadable.loadLibraryByKey(libraryGlobalKey);
+    }
+    if (_librariesKey.currentState case final FocusableTab focusable) {
+      focusable.focusActiveTabIfReady();
+    }
+  }
+
+  /// Get navigation tabs filtered by offline mode
+  List<NavigationTab> _getVisibleTabs(bool isOffline) {
+    return NavigationTab.getVisibleTabs(isOffline: isOffline);
+  }
+
+  /// Get the tab ID for a given index, clamping to the available range.
+  NavigationTabId _tabIdForIndex(bool isOffline, int index) {
+    final tabs = _getVisibleTabs(isOffline);
+    if (tabs.isEmpty) return NavigationTabId.discover;
+    final safeIndex = index.clamp(0, tabs.length - 1).toInt();
+    return tabs[safeIndex].id;
+  }
+
+  /// Build navigation destinations for bottom navigation bar.
+  List<NavigationDestination> _buildNavDestinations(bool isOffline) {
+    return _getVisibleTabs(isOffline).map((tab) => tab.toDestination()).toList();
+  }
+
   @override
   Widget build(BuildContext context) {
+    final useSideNav = PlatformDetector.shouldUseSideNavigation(context);
+
+    if (useSideNav) {
+      return PopScope(
+        canPop: false, // Prevent system back from popping on Android TV
+        onPopInvokedWithResult: (didPop, result) {
+          // No-op: back key events bubble through widget tree and are handled
+          // by content screens (e.g., LibrariesScreen) or MainScreen's _handleBackKey.
+          // We only use PopScope to prevent the system from popping the route.
+        },
+        child: Focus(
+          onKeyEvent: (node, event) => _handleBackKey(event),
+          child: MainScreenFocusScope(
+            focusSidebar: _focusSidebar,
+            focusContent: _focusContent,
+            isSidebarFocused: _isSidebarFocused,
+            child: SideNavigationScope(
+              child: Row(
+                children: [
+                  FocusScope(
+                    node: _sidebarFocusScope,
+                    child: SideNavigationRail(
+                      key: _sideNavKey,
+                      selectedIndex: _currentIndex,
+                      selectedLibraryKey: _selectedLibraryGlobalKey,
+                      isOfflineMode: _isOffline,
+                      onDestinationSelected: (index) {
+                        _selectTab(index);
+                        _focusContent();
+                      },
+                      onLibrarySelected: (key) {
+                        _selectLibrary(key);
+                        _focusContent();
+                      },
+                    ),
+                  ),
+                  Expanded(
+                    child: FocusScope(
+                      node: _contentFocusScope,
+                      // No autofocus - we control focus programmatically to prevent
+                      // autofocus from stealing focus back after setState() rebuilds
+                      child: IndexedStack(
+                        index: _currentIndex,
+                        children: _screens,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
     return Scaffold(
       body: IndexedStack(index: _currentIndex, children: _screens),
       bottomNavigationBar: NavigationBar(
         selectedIndex: _currentIndex,
-        onDestinationSelected: (index) {
-          setState(() {
-            _currentIndex = index;
-          });
-          // Notify discover screen when it becomes visible via tab switch
-          if (index == 0) {
-            _onDiscoverBecameVisible();
-          }
-        },
-        destinations: [
-          NavigationDestination(
-            icon: const Icon(Icons.home_outlined),
-            selectedIcon: const Icon(Icons.home),
-            label: t.navigation.home,
-          ),
-          NavigationDestination(
-            icon: const Icon(Icons.video_library_outlined),
-            selectedIcon: const Icon(Icons.video_library),
-            label: t.navigation.libraries,
-          ),
-          NavigationDestination(
-            icon: const Icon(Icons.search),
-            selectedIcon: const Icon(Icons.search),
-            label: t.navigation.search,
-          ),
-          NavigationDestination(
-            icon: const Icon(Icons.settings_outlined),
-            selectedIcon: const Icon(Icons.settings),
-            label: t.navigation.settings,
-          ),
-        ],
+        onDestinationSelected: _selectTab,
+        destinations: _buildNavDestinations(_isOffline),
       ),
     );
   }
diff --git a/lib/screens/media_detail_screen.dart b/lib/screens/media_detail_screen.dart
index 9831062e..7b619d2b 100644
--- a/lib/screens/media_detail_screen.dart
+++ b/lib/screens/media_detail_screen.dart
@@ -1,26 +1,44 @@
+import 'dart:io';
+
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 
+import '../focus/key_event_utils.dart';
+import '../focus/input_mode_tracker.dart';
 import '../i18n/strings.g.dart';
+import '../widgets/plex_optimized_image.dart';
+import '../utils/plex_image_helper.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_metadata.dart';
-import '../providers/plex_client_provider.dart';
+import '../models/download_status.dart';
+import '../providers/playback_state_provider.dart';
+import '../providers/download_provider.dart';
+import '../providers/offline_watch_provider.dart';
 import '../theme/theme_helper.dart';
 import '../utils/app_logger.dart';
 import '../utils/content_rating_formatter.dart';
+import '../utils/duration_formatter.dart';
 import '../utils/provider_extensions.dart';
-import '../utils/shuffle_play_helper.dart';
 import '../utils/video_player_navigation.dart';
 import '../widgets/app_bar_back_button.dart';
-import '../widgets/desktop_app_bar.dart';
+import '../utils/desktop_window_padding.dart';
 import '../widgets/horizontal_scroll_with_arrows.dart';
+import '../widgets/media_card.dart';
 import '../widgets/media_context_menu.dart';
 import 'season_detail_screen.dart';
 
 class MediaDetailScreen extends StatefulWidget {
   final PlexMetadata metadata;
+  final bool isOffline;
 
-  const MediaDetailScreen({super.key, required this.metadata});
+  const MediaDetailScreen({
+    super.key,
+    required this.metadata,
+    this.isOffline = false,
+  });
 
   @override
   State<MediaDetailScreen> createState() => _MediaDetailScreenState();
@@ -33,31 +51,775 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
   PlexMetadata? _onDeckEpisode;
   bool _isLoadingMetadata = true;
   late final ScrollController _scrollController;
+  final ScrollController _seasonsScrollController = ScrollController();
   bool _watchStateChanged = false;
+  double _scrollOffset = 0;
 
   @override
   void initState() {
     super.initState();
     _scrollController = ScrollController();
+    _scrollController.addListener(_onScroll);
     _loadFullMetadata();
   }
 
+  void _onScroll() {
+    setState(() {
+      _scrollOffset = _scrollController.offset;
+    });
+  }
+
   @override
   void dispose() {
     _scrollController.dispose();
+    _seasonsScrollController.dispose();
     super.dispose();
   }
 
+  /// Build title text widget for clear logo fallback
+  Widget _buildTitleText(BuildContext context, String title) {
+    return Align(
+      alignment: Alignment.centerLeft,
+      child: Text(
+        title,
+        style: Theme.of(context).textTheme.displaySmall?.copyWith(
+          color: Colors.white,
+          fontWeight: FontWeight.bold,
+          shadows: [
+            Shadow(color: Colors.black.withValues(alpha: 0.5), blurRadius: 8),
+          ],
+        ),
+        maxLines: 2,
+        overflow: TextOverflow.ellipsis,
+      ),
+    );
+  }
+
+  /// Build radial progress indicator for download button
+  /// If progressPercent is null or 0, shows indeterminate spinner
+  Widget _buildRadialProgress(double? progressPercent) {
+    return SizedBox(
+      width: 20,
+      height: 20,
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          // Background circle (only show if we have determinate progress)
+          if (progressPercent != null && progressPercent > 0)
+            CircularProgressIndicator(
+              value: 1.0,
+              strokeWidth: 2.0,
+              valueColor: AlwaysStoppedAnimation<Color>(
+                Theme.of(context).colorScheme.primary.withValues(alpha: 0.2),
+              ),
+            ),
+          // Progress circle (indeterminate if no progress, determinate otherwise)
+          CircularProgressIndicator(
+            value: (progressPercent != null && progressPercent > 0)
+                ? progressPercent
+                : null, // null = indeterminate
+            strokeWidth: 2.0,
+            valueColor: AlwaysStoppedAnimation<Color>(
+              Theme.of(context).colorScheme.primary,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// Build action buttons row (play, shuffle, download, mark watched)
+  Widget _buildActionButtons(PlexMetadata metadata) {
+    return Row(
+      children: [
+        SizedBox(
+          height: 48,
+          child: FilledButton.icon(
+            autofocus: InputModeTracker.isKeyboardMode(context),
+            onPressed: () async {
+              // For TV shows, play the OnDeck episode if available
+              // Otherwise, play the first episode of the first season
+              if (metadata.type.toLowerCase() == 'show') {
+                if (_onDeckEpisode != null) {
+                  appLogger.d(
+                    'Playing on deck episode: ${_onDeckEpisode!.title}',
+                  );
+                  await navigateToVideoPlayer(
+                    context,
+                    metadata: _onDeckEpisode!,
+                    isOffline: widget.isOffline,
+                  );
+                  appLogger.d(
+                    'Returned from playback, refreshing metadata',
+                  );
+                  // Refresh metadata when returning from video player
+                  if (!widget.isOffline) {
+                    _loadFullMetadata();
+                  }
+                } else {
+                  // No on deck episode, fetch first episode of first season
+                  await _playFirstEpisode();
+                }
+              } else {
+                appLogger.d('Playing: ${metadata.title}');
+                // For movies or episodes, play directly
+                await navigateToVideoPlayer(
+                  context,
+                  metadata: metadata,
+                  isOffline: widget.isOffline,
+                );
+                appLogger.d(
+                  'Returned from playback, refreshing metadata',
+                );
+                // Refresh metadata when returning from video player
+                if (!widget.isOffline) {
+                  _loadFullMetadata();
+                }
+              }
+            },
+            icon: AppIcon(
+              _getPlayButtonIcon(metadata),
+              fill: 1,
+              size: 20,
+            ),
+            label: Text(
+              _getPlayButtonLabel(metadata),
+              style: const TextStyle(fontSize: 16),
+            ),
+            style: FilledButton.styleFrom(
+              padding: const EdgeInsets.symmetric(
+                horizontal: 16,
+              ),
+            ),
+          ),
+        ),
+        const SizedBox(width: 12),
+        // Shuffle button (only for shows and seasons)
+        if (metadata.type.toLowerCase() == 'show' ||
+            metadata.type.toLowerCase() == 'season') ...[
+          IconButton.filledTonal(
+            onPressed: () async {
+              await _handleShufflePlayWithQueue(
+                context,
+                metadata,
+              );
+            },
+            icon: const AppIcon(
+              Symbols.shuffle_rounded,
+              fill: 1,
+            ),
+            tooltip: t.tooltips.shufflePlay,
+            iconSize: 20,
+            style: IconButton.styleFrom(
+              minimumSize: const Size(48, 48),
+              maximumSize: const Size(48, 48),
+            ),
+          ),
+          const SizedBox(width: 12),
+        ],
+        // Download button (hide in offline mode - already downloaded)
+        if (!widget.isOffline)
+          Consumer<DownloadProvider>(
+            builder: (context, downloadProvider, _) {
+              final globalKey =
+                  '${metadata.serverId}:${metadata.ratingKey}';
+              final progress = downloadProvider.getProgress(
+                globalKey,
+              );
+              final isQueueing = downloadProvider.isQueueing(
+                globalKey,
+              );
+
+              // Debug logging
+              if (progress != null) {
+                appLogger.d(
+                  'UI rebuilding for $globalKey: status=${progress.status}, progress=${progress.progress}%',
+                );
+              }
+
+              // State 1: Queueing (building download queue)
+              if (isQueueing) {
+                return IconButton.filledTonal(
+                  onPressed: null,
+                  icon: const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(
+                      strokeWidth: 2,
+                    ),
+                  ),
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                  ),
+                );
+              }
+
+              // State 2: Queued (waiting to download)
+              if (progress?.status == DownloadStatus.queued) {
+                final currentFile = progress?.currentFile;
+                final tooltip =
+                    currentFile != null &&
+                        currentFile.contains('episodes')
+                    ? 'Queued $currentFile'
+                    : 'Queued';
+
+                return IconButton.filledTonal(
+                  onPressed: null,
+                  tooltip: tooltip,
+                  icon: const AppIcon(
+                    Symbols.schedule_rounded,
+                    fill: 1,
+                  ),
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                  ),
+                );
+              }
+
+              // State 3: Downloading (active download)
+              if (progress?.status ==
+                  DownloadStatus.downloading) {
+                // Show episode count in tooltip for shows/seasons
+                final currentFile = progress?.currentFile;
+                final tooltip =
+                    currentFile != null &&
+                        currentFile.contains('episodes')
+                    ? 'Downloading $currentFile'
+                    : 'Downloading...';
+
+                return IconButton.filledTonal(
+                  onPressed: null,
+                  tooltip: tooltip,
+                  icon: _buildRadialProgress(
+                    progress?.progressPercent,
+                  ),
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                  ),
+                );
+              }
+
+              // State 4: Paused (can resume)
+              if (progress?.status == DownloadStatus.paused) {
+                return IconButton.filledTonal(
+                  onPressed: () async {
+                    final client = _getClientForMetadata(
+                      context,
+                    );
+                    if (client == null) return;
+                    await downloadProvider.resumeDownload(
+                      globalKey,
+                      client,
+                    );
+                    if (context.mounted) {
+                      ScaffoldMessenger.of(
+                        context,
+                      ).showSnackBar(
+                        const SnackBar(
+                          content: Text('Download resumed'),
+                        ),
+                      );
+                    }
+                  },
+                  icon: const AppIcon(
+                    Symbols.pause_circle_outline_rounded,
+                    fill: 1,
+                  ),
+                  tooltip: 'Resume download',
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                    foregroundColor: Colors.amber,
+                  ),
+                );
+              }
+
+              // State 5: Failed (can retry)
+              if (progress?.status == DownloadStatus.failed) {
+                return IconButton.filledTonal(
+                  onPressed: () async {
+                    final client = _getClientForMetadata(
+                      context,
+                    );
+                    if (client == null) return;
+
+                    // Delete failed download and retry
+                    await downloadProvider.deleteDownload(
+                      globalKey,
+                    );
+                    try {
+                      await downloadProvider.queueDownload(
+                        metadata,
+                        client,
+                      );
+
+                      if (context.mounted) {
+                        ScaffoldMessenger.of(
+                          context,
+                        ).showSnackBar(
+                          SnackBar(
+                            content: Text(
+                              t.downloads.downloadQueued,
+                            ),
+                          ),
+                        );
+                      }
+                    } on CellularDownloadBlockedException {
+                      if (context.mounted) {
+                        ScaffoldMessenger.of(
+                          context,
+                        ).showSnackBar(
+                          SnackBar(
+                            content: Text(
+                              t
+                                  .settings
+                                  .cellularDownloadBlocked,
+                            ),
+                          ),
+                        );
+                      }
+                    }
+                  },
+                  icon: const AppIcon(
+                    Symbols.error_outline_rounded,
+                    fill: 1,
+                  ),
+                  tooltip: 'Retry download',
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                    foregroundColor: Colors.red,
+                  ),
+                );
+              }
+
+              // State 6: Cancelled (can delete or retry)
+              if (progress?.status ==
+                  DownloadStatus.cancelled) {
+                return IconButton.filledTonal(
+                  onPressed: () async {
+                    // Show options: Delete or Retry
+                    final action = await showDialog<String>(
+                      context: context,
+                      builder: (context) => AlertDialog(
+                        title: const Text('Cancelled Download'),
+                        content: const Text(
+                          'This download was cancelled. What would you like to do?',
+                        ),
+                        actions: [
+                          TextButton(
+                            onPressed: () => Navigator.pop(
+                              context,
+                              'delete',
+                            ),
+                            child: Text(t.common.delete),
+                          ),
+                          TextButton(
+                            onPressed: () =>
+                                Navigator.pop(context, 'retry'),
+                            child: const Text('Retry'),
+                          ),
+                        ],
+                      ),
+                    );
+
+                    if (action == 'delete' && context.mounted) {
+                      await downloadProvider.deleteDownload(
+                        globalKey,
+                      );
+                      if (context.mounted) {
+                        ScaffoldMessenger.of(
+                          context,
+                        ).showSnackBar(
+                          SnackBar(
+                            content: Text(
+                              t.downloads.downloadDeleted,
+                            ),
+                          ),
+                        );
+                      }
+                    } else if (action == 'retry' &&
+                        context.mounted) {
+                      final client = _getClientForMetadata(
+                        context,
+                      );
+                      if (client == null) return;
+                      await downloadProvider.deleteDownload(
+                        globalKey,
+                      );
+                      try {
+                        await downloadProvider.queueDownload(
+                          metadata,
+                          client,
+                        );
+                        if (context.mounted) {
+                          ScaffoldMessenger.of(
+                            context,
+                          ).showSnackBar(
+                            SnackBar(
+                              content: Text(
+                                t.downloads.downloadQueued,
+                              ),
+                            ),
+                          );
+                        }
+                      } on CellularDownloadBlockedException {
+                        if (context.mounted) {
+                          ScaffoldMessenger.of(
+                            context,
+                          ).showSnackBar(
+                            SnackBar(
+                              content: Text(
+                                t
+                                    .settings
+                                    .cellularDownloadBlocked,
+                              ),
+                            ),
+                          );
+                        }
+                      }
+                    }
+                  },
+                  icon: const AppIcon(
+                    Symbols.cancel_rounded,
+                    fill: 1,
+                  ),
+                  tooltip: 'Cancelled download',
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                    foregroundColor: Colors.grey,
+                  ),
+                );
+              }
+
+              // State 7: Partial Download (some episodes downloaded, not all)
+              if (progress?.status == DownloadStatus.partial) {
+                final currentFile = progress?.currentFile;
+                final tooltip = currentFile != null
+                    ? 'Downloaded $currentFile - Click to complete'
+                    : 'Partially downloaded - Click to complete';
+
+                return IconButton.filledTonal(
+                  onPressed: () async {
+                    final client = _getClientForMetadata(
+                      context,
+                    );
+                    if (client == null) return;
+
+                    // Queue only the missing episodes
+                    final count = await downloadProvider
+                        .queueMissingEpisodes(metadata, client);
+
+                    if (context.mounted) {
+                      final message = count > 0
+                          ? t.downloads.episodesQueued(
+                              count: count,
+                            )
+                          : 'All episodes already downloaded';
+                      ScaffoldMessenger.of(
+                        context,
+                      ).showSnackBar(
+                        SnackBar(content: Text(message)),
+                      );
+                    }
+                  },
+                  tooltip: tooltip,
+                  icon: const AppIcon(
+                    Symbols.downloading_rounded,
+                    fill: 1,
+                  ),
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                    foregroundColor: Colors.orange,
+                  ),
+                );
+              }
+
+              // State 8: Downloaded/Completed (can delete)
+              if (downloadProvider.isDownloaded(globalKey)) {
+                return IconButton.filledTonal(
+                  onPressed: () async {
+                    // Show delete download confirmation
+                    final confirmed = await showDialog<bool>(
+                      context: context,
+                      builder: (context) => AlertDialog(
+                        title: Text(t.downloads.deleteDownload),
+                        content: Text(
+                          t.downloads.deleteConfirm(
+                            title: metadata.title,
+                          ),
+                        ),
+                        actions: [
+                          TextButton(
+                            onPressed: () =>
+                                Navigator.pop(context, false),
+                            child: Text(t.common.cancel),
+                          ),
+                          TextButton(
+                            onPressed: () =>
+                                Navigator.pop(context, true),
+                            style: TextButton.styleFrom(
+                              foregroundColor: Colors.red,
+                            ),
+                            child: Text(t.common.delete),
+                          ),
+                        ],
+                      ),
+                    );
+
+                    if (confirmed == true && context.mounted) {
+                      await downloadProvider.deleteDownload(
+                        globalKey,
+                      );
+                      if (context.mounted) {
+                        ScaffoldMessenger.of(
+                          context,
+                        ).showSnackBar(
+                          SnackBar(
+                            content: Text(
+                              t.downloads.downloadDeleted,
+                            ),
+                          ),
+                        );
+                      }
+                    }
+                  },
+                  icon: const AppIcon(
+                    Symbols.file_download_done_rounded,
+                    fill: 1,
+                  ),
+                  tooltip: t.downloads.deleteDownload,
+                  iconSize: 20,
+                  style: IconButton.styleFrom(
+                    minimumSize: const Size(48, 48),
+                    maximumSize: const Size(48, 48),
+                    foregroundColor: Colors.green,
+                  ),
+                );
+              }
+
+              // State 9: Not downloaded (default - can download)
+              return IconButton.filledTonal(
+                onPressed: () async {
+                  final client = _getClientForMetadata(context);
+                  if (client == null) return;
+                  final count = await downloadProvider
+                      .queueDownload(metadata, client);
+                  if (context.mounted) {
+                    final message = count > 1
+                        ? t.downloads.episodesQueued(
+                            count: count,
+                          )
+                        : t.downloads.downloadQueued;
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(content: Text(message)),
+                    );
+                  }
+                },
+                icon: const AppIcon(
+                  Symbols.download_rounded,
+                  fill: 1,
+                ),
+                tooltip: t.downloads.downloadNow,
+                iconSize: 20,
+                style: IconButton.styleFrom(
+                  minimumSize: const Size(48, 48),
+                  maximumSize: const Size(48, 48),
+                ),
+              );
+            },
+          ),
+        const SizedBox(width: 12),
+        // Mark as watched/unwatched toggle (works offline too)
+        IconButton.filledTonal(
+          onPressed: () async {
+            try {
+              final isWatched = metadata.isWatched;
+              if (widget.isOffline) {
+                // Offline mode: queue action for later sync
+                final offlineWatch = context
+                    .read<OfflineWatchProvider>();
+                if (isWatched) {
+                  await offlineWatch.markAsUnwatched(
+                    serverId: metadata.serverId!,
+                    ratingKey: metadata.ratingKey,
+                  );
+                } else {
+                  await offlineWatch.markAsWatched(
+                    serverId: metadata.serverId!,
+                    ratingKey: metadata.ratingKey,
+                  );
+                }
+                if (context.mounted) {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(
+                        isWatched
+                            ? t
+                                  .messages
+                                  .markedAsUnwatchedOffline
+                            : t.messages.markedAsWatchedOffline,
+                      ),
+                    ),
+                  );
+                  // Refresh offline OnDeck
+                  _loadOfflineOnDeckEpisode();
+                }
+              } else {
+                // Online mode: send to server
+                final client = _getClientForMetadata(context);
+                if (client == null) return;
+
+                if (isWatched) {
+                  await client.markAsUnwatched(
+                    metadata.ratingKey,
+                  );
+                } else {
+                  await client.markAsWatched(
+                    metadata.ratingKey,
+                  );
+                }
+                if (context.mounted) {
+                  _watchStateChanged = true;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(
+                        isWatched
+                            ? t.messages.markedAsUnwatched
+                            : t.messages.markedAsWatched,
+                      ),
+                    ),
+                  );
+                  // Update watch state without full rebuild
+                  _updateWatchState();
+                }
+              }
+            } catch (e) {
+              if (context.mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      t.messages.errorLoading(
+                        error: e.toString(),
+                      ),
+                    ),
+                  ),
+                );
+              }
+            }
+          },
+          icon: AppIcon(
+            metadata.isWatched
+                ? Symbols.remove_done_rounded
+                : Symbols.check_rounded,
+            fill: 1,
+          ),
+          tooltip: metadata.isWatched
+              ? t.tooltips.markAsUnwatched
+              : t.tooltips.markAsWatched,
+          iconSize: 20,
+          style: IconButton.styleFrom(
+            minimumSize: const Size(48, 48),
+            maximumSize: const Size(48, 48),
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// Build a metadata chip with optional leading icon
+  Widget _buildMetadataChip(String text, {IconData? icon}) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.secondaryContainer.withValues(alpha: 0.8),
+        borderRadius: BorderRadius.circular(100),
+      ),
+      child: icon != null
+          ? Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                AppIcon(
+                  icon,
+                  fill: 1,
+                  color: Theme.of(context).colorScheme.onSecondaryContainer,
+                  size: 16,
+                ),
+                const SizedBox(width: 4),
+                Text(
+                  text,
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.onSecondaryContainer,
+                    fontSize: 13,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ],
+            )
+          : Text(
+              text,
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.onSecondaryContainer,
+                fontSize: 13,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+    );
+  }
+
+  /// Get the correct PlexClient for this metadata's server
+  /// Returns null in offline mode or if serverId is null
+  PlexClient? _getClientForMetadata(BuildContext context) {
+    if (widget.isOffline || widget.metadata.serverId == null) {
+      return null;
+    }
+    return context.getClientForServer(widget.metadata.serverId!);
+  }
+
   Future<void> _loadFullMetadata() async {
     setState(() {
       _isLoadingMetadata = true;
     });
 
+    // Offline mode: use passed metadata directly, load seasons from downloads
+    if (widget.isOffline) {
+      final type = widget.metadata.type.toLowerCase();
+
+      setState(() {
+        _fullMetadata = widget.metadata;
+        _isLoadingMetadata = false;
+      });
+
+      if (type == 'show') {
+        _loadSeasonsFromDownloads();
+        // Get offline OnDeck episode
+        _loadOfflineOnDeckEpisode();
+      }
+      return;
+    }
+
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
+      // Use server-specific client for this metadata
+      final client = _getClientForMetadata(context);
       if (client == null) {
-        throw Exception('No client available');
+        // No client available, use passed metadata
+        setState(() {
+          _fullMetadata = widget.metadata;
+          _isLoadingMetadata = false;
+        });
+        return;
       }
 
       // Fetch full metadata with clearLogo and OnDeck episode
@@ -68,9 +830,19 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
       final onDeckEpisode = result['onDeckEpisode'] as PlexMetadata?;
 
       if (metadata != null) {
+        // Preserve serverId from original metadata
+        final metadataWithServerId = metadata.copyWith(
+          serverId: widget.metadata.serverId,
+          serverName: widget.metadata.serverName,
+        );
+        final onDeckWithServerId = onDeckEpisode?.copyWith(
+          serverId: widget.metadata.serverId,
+          serverName: widget.metadata.serverName,
+        );
+
         setState(() {
-          _fullMetadata = metadata;
-          _onDeckEpisode = onDeckEpisode;
+          _fullMetadata = metadataWithServerId;
+          _onDeckEpisode = onDeckWithServerId;
           _isLoadingMetadata = false;
         });
 
@@ -109,15 +881,22 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
     });
 
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
-      }
+      // Use server-specific client for this metadata
+      final client = _getClientForMetadata(context);
 
-      final seasons = await client.getChildren(widget.metadata.ratingKey);
+      final seasons =
+          await client?.getChildren(widget.metadata.ratingKey) ?? [];
+      // Preserve serverId for each season
+      final seasonsWithServerId = seasons
+          .map(
+            (season) => season.copyWith(
+              serverId: widget.metadata.serverId,
+              serverName: widget.metadata.serverName,
+            ),
+          )
+          .toList();
       setState(() {
-        _seasons = seasons;
+        _seasons = seasonsWithServerId;
         _isLoadingSeasons = false;
       });
     } catch (e) {
@@ -127,30 +906,199 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
     }
   }
 
+  /// Load seasons from downloaded episodes (offline mode)
+  void _loadSeasonsFromDownloads() {
+    setState(() {
+      _isLoadingSeasons = true;
+    });
+
+    final downloadProvider = context.read<DownloadProvider>();
+    final episodes = downloadProvider.getDownloadedEpisodesForShow(
+      widget.metadata.ratingKey,
+    );
+
+    // Group episodes by season
+    final Map<int, List<PlexMetadata>> seasonMap = {};
+    for (final episode in episodes) {
+      final seasonNum = episode.parentIndex ?? 0;
+      seasonMap.putIfAbsent(seasonNum, () => []).add(episode);
+    }
+
+    // Create season metadata from episodes
+    final seasons = seasonMap.entries.map((entry) {
+      final firstEp = entry.value.first;
+      return PlexMetadata(
+        ratingKey: firstEp.parentRatingKey ?? '',
+        key: '/library/metadata/${firstEp.parentRatingKey}',
+        type: 'season',
+        title: firstEp.parentTitle ?? 'Season ${entry.key}',
+        index: entry.key,
+        thumb: firstEp.parentThumb,
+        parentRatingKey: firstEp.grandparentRatingKey,
+        serverId: widget.metadata.serverId,
+        serverName: widget.metadata.serverName,
+      );
+    }).toList()..sort((a, b) => (a.index ?? 0).compareTo(b.index ?? 0));
+
+    setState(() {
+      _seasons = seasons;
+      _isLoadingSeasons = false;
+    });
+  }
+
+  /// Navigate to a season detail screen
+  Future<void> _navigateToSeason(PlexMetadata season) async {
+    final watchStateChanged = await Navigator.push<bool>(
+      context,
+      MaterialPageRoute(
+        builder: (context) => SeasonDetailScreen(
+          season: season,
+          isOffline: widget.isOffline,
+        ),
+      ),
+    );
+    if (watchStateChanged == true) {
+      _watchStateChanged = true;
+      _updateWatchState();
+    }
+  }
+
+  /// Build horizontal seasons list for larger screens (>=600px)
+  Widget _buildHorizontalSeasons() {
+    final screenWidth = MediaQuery.of(context).size.width;
+    final cardWidth = screenWidth >= 1400
+        ? 220.0
+        : screenWidth >= 900
+            ? 200.0
+            : screenWidth >= 700
+                ? 190.0
+                : 160.0;
+    final posterHeight = (cardWidth - 16) * 1.5;
+    final containerHeight = posterHeight + 66;
+
+    return SizedBox(
+      height: containerHeight,
+      child: HorizontalScrollWithArrows(
+        controller: _seasonsScrollController,
+        builder: (scrollController) => ListView.builder(
+          controller: scrollController,
+          scrollDirection: Axis.horizontal,
+          padding: const EdgeInsets.symmetric(vertical: 5),
+          itemCount: _seasons.length,
+          itemBuilder: (context, index) {
+            final season = _seasons[index];
+            return Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 2),
+              child: MediaCard(
+                item: season,
+                width: cardWidth,
+                height: posterHeight,
+                forceGridMode: true,
+                isOffline: widget.isOffline,
+                onRefresh: (_) {
+                  _watchStateChanged = true;
+                  _updateWatchState();
+                },
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  /// Build vertical seasons list for smaller screens (<600px)
+  Widget _buildVerticalSeasons() {
+    return ListView.separated(
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      padding: EdgeInsets.zero,
+      itemCount: _seasons.length,
+      separatorBuilder: (context, index) => const SizedBox(height: 12),
+      itemBuilder: (context, index) {
+        final season = _seasons[index];
+        // Look up each season's artwork, not the show's
+        String? seasonPosterPath;
+        if (widget.isOffline && season.serverId != null) {
+          seasonPosterPath = context
+              .read<DownloadProvider>()
+              .getArtworkLocalPath(
+                season.serverId!,
+                season.thumb,
+              );
+        }
+        return _SeasonCard(
+          season: season,
+          client: _getClientForMetadata(context),
+          isOffline: widget.isOffline,
+          localPosterPath: seasonPosterPath,
+          onTap: () => _navigateToSeason(season),
+          onRefresh: () {
+            _watchStateChanged = true;
+            _updateWatchState();
+          },
+        );
+      },
+    );
+  }
+
+  /// Load the next unwatched episode for offline mode (offline OnDeck)
+  Future<void> _loadOfflineOnDeckEpisode() async {
+    final offlineWatchProvider = context.read<OfflineWatchProvider>();
+    final nextEpisode = await offlineWatchProvider.getNextUnwatchedEpisode(
+      widget.metadata.ratingKey,
+    );
+
+    if (nextEpisode != null && mounted) {
+      setState(() {
+        _onDeckEpisode = nextEpisode;
+      });
+      appLogger.d(
+        'Offline OnDeck: S${nextEpisode.parentIndex}E${nextEpisode.index} - ${nextEpisode.title}',
+      );
+    }
+  }
+
   /// Update watch state without full screen rebuild
   /// This preserves scroll position and only updates watch-related data
   Future<void> _updateWatchState() async {
+    // Skip in offline mode
+    if (widget.isOffline) return;
+
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
-      }
+      // Use server-specific client for this metadata
+      final client = _getClientForMetadata(context);
+      if (client == null) return;
 
       final metadata = await client.getMetadataWithImages(
         widget.metadata.ratingKey,
       );
 
       if (metadata != null) {
+        // Preserve serverId from original metadata
+        final metadataWithServerId = metadata.copyWith(
+          serverId: widget.metadata.serverId,
+          serverName: widget.metadata.serverName,
+        );
+
         // For shows, also refetch seasons to update their watch counts
         List<PlexMetadata>? updatedSeasons;
         if (metadata.type.toLowerCase() == 'show') {
-          updatedSeasons = await client.getChildren(widget.metadata.ratingKey);
+          final seasons = await client.getChildren(widget.metadata.ratingKey);
+          // Preserve serverId for each season
+          updatedSeasons = seasons
+              .map(
+                (season) => season.copyWith(
+                  serverId: widget.metadata.serverId,
+                  serverName: widget.metadata.serverName,
+                ),
+              )
+              .toList();
         }
 
         // Single setState to minimize rebuilds - scroll position is preserved by controller
         setState(() {
-          _fullMetadata = metadata;
+          _fullMetadata = metadataWithServerId;
           if (updatedSeasons != null) {
             _seasons = updatedSeasons;
           }
@@ -164,16 +1112,13 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
 
   Future<void> _playFirstEpisode() async {
     try {
-      // Extract context dependencies before async operations
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
-      }
-
       // If seasons aren't loaded yet, wait for them or load them
       if (_seasons.isEmpty && !_isLoadingSeasons) {
-        await _loadSeasons();
+        if (widget.isOffline) {
+          _loadSeasonsFromDownloads();
+        } else {
+          await _loadSeasons();
+        }
       }
 
       // Wait for seasons to finish loading if they're currently loading
@@ -181,6 +1126,8 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
         await Future.delayed(const Duration(milliseconds: 100));
       }
 
+      if (!mounted) return;
+
       if (_seasons.isEmpty) {
         if (mounted) {
           ScaffoldMessenger.of(
@@ -194,7 +1141,25 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
       final firstSeason = _seasons.first;
 
       // Get episodes of the first season
-      final episodes = await client.getChildren(firstSeason.ratingKey);
+      List<PlexMetadata> episodes;
+      if (!mounted) return;
+      if (widget.isOffline) {
+        // In offline mode, get episodes from downloads
+        final downloadProvider = context.read<DownloadProvider>();
+        final allEpisodes = downloadProvider.getDownloadedEpisodesForShow(
+          widget.metadata.ratingKey,
+        );
+        // Filter to episodes of this season
+        episodes =
+            allEpisodes
+                .where((ep) => ep.parentIndex == firstSeason.index)
+                .toList()
+              ..sort((a, b) => (a.index ?? 0).compareTo(b.index ?? 0));
+      } else {
+        final client = _getClientForMetadata(context);
+        if (client == null) return;
+        episodes = await client.getChildren(firstSeason.ratingKey);
+      }
 
       if (episodes.isEmpty) {
         if (mounted) {
@@ -207,19 +1172,132 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
 
       // Play the first episode
       final firstEpisode = episodes.first;
+      // Preserve serverId for the episode
+      final episodeWithServerId = firstEpisode.copyWith(
+        serverId: widget.metadata.serverId,
+        serverName: widget.metadata.serverName,
+      );
       if (mounted) {
-        final clientProvider = context.plexClient;
-        final client = clientProvider.client;
-        if (client == null) return;
-
-        appLogger.d('Playing first episode: ${firstEpisode.title}');
-        await navigateToVideoPlayer(context, metadata: firstEpisode);
+        appLogger.d('Playing first episode: ${episodeWithServerId.title}');
+        await navigateToVideoPlayer(
+          context,
+          metadata: episodeWithServerId,
+          isOffline: widget.isOffline,
+        );
         appLogger.d('Returned from playback, refreshing metadata');
+        // Refresh metadata when returning from video player (skip if offline)
+        if (!widget.isOffline) {
+          _loadFullMetadata();
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(t.messages.errorLoading(error: e.toString()))),
+        );
+      }
+    }
+  }
+
+  /// Handle shuffle play using play queues
+  /// Note: Shuffle requires server connectivity (play queue API)
+  Future<void> _handleShufflePlayWithQueue(
+    BuildContext context,
+    PlexMetadata metadata,
+  ) async {
+    // Shuffle requires server connectivity
+    if (widget.isOffline) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Shuffle not available offline')),
+        );
+      }
+      return;
+    }
+
+    final client = _getClientForMetadata(context);
+    if (client == null) return;
+
+    final playbackState = context.read<PlaybackStateProvider>();
+    final itemType = metadata.type.toLowerCase();
+
+    try {
+      // Show loading indicator
+      if (context.mounted) {
+        showDialog(
+          context: context,
+          barrierDismissible: false,
+          builder: (context) =>
+              const Center(child: CircularProgressIndicator()),
+        );
+      }
+
+      // Determine the rating key for the play queue
+      String showRatingKey;
+      if (itemType == 'show') {
+        showRatingKey = metadata.ratingKey;
+      } else if (itemType == 'season') {
+        // For seasons, we need the show's rating key
+        // The season's parentRatingKey should point to the show
+        if (metadata.parentRatingKey == null) {
+          throw Exception('Season is missing parentRatingKey');
+        }
+        showRatingKey = metadata.parentRatingKey!;
+      } else {
+        throw Exception('Shuffle play only works for shows and seasons');
+      }
+
+      // Create a shuffled play queue for the show
+      final playQueue = await client.createShowPlayQueue(
+        showRatingKey: showRatingKey,
+        shuffle: 1,
+      );
+
+      // Close loading indicator
+      if (context.mounted) {
+        Navigator.pop(context);
+      }
+
+      if (playQueue == null ||
+          playQueue.items == null ||
+          playQueue.items!.isEmpty) {
+        if (context.mounted) {
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text(t.messages.noEpisodesFound)));
+        }
+        return;
+      }
+
+      // Initialize playback state with the play queue
+      await playbackState.setPlaybackFromPlayQueue(
+        playQueue,
+        showRatingKey,
+        serverId: metadata.serverId,
+        serverName: metadata.serverName,
+      );
+
+      // Set the client for the playback state provider
+      playbackState.setClient(client);
+
+      // Navigate to the first episode in the shuffled queue
+      final firstEpisode = playQueue.items!.first.copyWith(
+        serverId: metadata.serverId,
+        serverName: metadata.serverName,
+      );
+
+      if (context.mounted) {
+        await navigateToVideoPlayer(context, metadata: firstEpisode);
         // Refresh metadata when returning from video player
         _loadFullMetadata();
       }
     } catch (e) {
-      if (mounted) {
+      // Close loading indicator if it's still open
+      if (context.mounted && Navigator.canPop(context)) {
+        Navigator.pop(context);
+      }
+
+      if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text(t.messages.errorLoading(error: e.toString()))),
         );
@@ -233,11 +1311,17 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
     final metadata = _fullMetadata ?? widget.metadata;
     final isShow = metadata.type.toLowerCase() == 'show';
 
+    KeyEventResult handleBack(FocusNode _, KeyEvent event) =>
+        handleBackKeyNavigation(context, event, result: _watchStateChanged);
+
     // Show loading state while fetching full metadata
     if (_isLoadingMetadata) {
-      return Scaffold(
-        appBar: AppBar(),
-        body: const Center(child: CircularProgressIndicator()),
+      return Focus(
+        onKeyEvent: handleBack,
+        child: Scaffold(
+          appBar: AppBar(),
+          body: const Center(child: CircularProgressIndicator()),
+        ),
       );
     }
 
@@ -246,70 +1330,117 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
     final isDesktop = size.width > 600;
     final headerHeight = isDesktop ? size.height * 0.6 : size.height * 0.4;
 
-    return Scaffold(
-      body: CustomScrollView(
-        controller: _scrollController,
-        slivers: [
-          // Hero header with background art
-          DesktopSliverAppBar(
-            expandedHeight: headerHeight,
-            pinned: true,
-            leading: AppBarBackButton(
-              style: BackButtonStyle.circular,
-              onPressed: () => Navigator.pop(context, _watchStateChanged),
-            ),
-            flexibleSpace: FlexibleSpaceBar(
-              background: Stack(
-                fit: StackFit.expand,
+    return Focus(
+      onKeyEvent: handleBack,
+      child: Scaffold(
+        body: Stack(
+          children: [
+            CustomScrollView(
+              controller: _scrollController,
+              slivers: [
+            // Hero header with background art
+            SliverToBoxAdapter(
+              child: Stack(
                 children: [
-                  // Background Art
-                  if (metadata.art != null)
-                    Consumer<PlexClientProvider>(
-                      builder: (context, clientProvider, child) {
-                        final client = clientProvider.client;
-                        if (client == null) {
-                          return Container(
-                            color: Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainerHighest,
-                          );
-                        }
-                        return CachedNetworkImage(
-                          imageUrl: client.getThumbnailUrl(metadata.art),
-                          fit: BoxFit.cover,
-                          placeholder: (context, url) => Container(
+                  // Background Art (fixed height, no parallax)
+                  SizedBox(
+                    height: headerHeight,
+                    width: double.infinity,
+                    child: metadata.art != null
+                        ? Builder(
+                            builder: (context) {
+                              // Check for offline local file first
+                              if (widget.isOffline &&
+                                  widget.metadata.serverId != null) {
+                                final localPath = context
+                                    .read<DownloadProvider>()
+                                    .getArtworkLocalPath(
+                                      widget.metadata.serverId!,
+                                      metadata.art,
+                                    );
+                                if (localPath != null &&
+                                    File(localPath).existsSync()) {
+                                  return Image.file(
+                                    File(localPath),
+                                    fit: BoxFit.cover,
+                                    errorBuilder:
+                                        (context, error, stackTrace) =>
+                                            Container(
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .surfaceContainerHighest,
+                                            ),
+                                  );
+                                }
+                                // Offline but no local file - show placeholder
+                                return Container(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.surfaceContainerHighest,
+                                );
+                              }
+
+                              // Online - use network image
+                              final client = _getClientForMetadata(context);
+                              final mediaQuery = MediaQuery.of(context);
+                              final imageUrl =
+                                  PlexImageHelper.getOptimizedImageUrl(
+                                    client: client,
+                                    thumbPath: metadata.art,
+                                    maxWidth: mediaQuery.size.width,
+                                    maxHeight: mediaQuery.size.height * 0.6,
+                                    devicePixelRatio:
+                                        mediaQuery.devicePixelRatio,
+                                    imageType: ImageType.art,
+                                  );
+
+                              return CachedNetworkImage(
+                                imageUrl: imageUrl,
+                                fit: BoxFit.cover,
+                                placeholder: (context, url) => Container(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.surfaceContainerHighest,
+                                ),
+                                errorWidget: (context, url, error) => Container(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.surfaceContainerHighest,
+                                ),
+                              );
+                            },
+                          )
+                        : Container(
                             color: Theme.of(
                               context,
                             ).colorScheme.surfaceContainerHighest,
                           ),
-                          errorWidget: (context, url, error) => Container(
-                            color: Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainerHighest,
+                  ),
+
+                  // Gradient overlay
+                  Positioned(
+                    top: 0,
+                    left: 0,
+                    right: 0,
+                    bottom: -1, // Extend 1px past to prevent subpixel gap
+                    child: Builder(
+                      builder: (context) {
+                        final bgColor = Theme.of(context).scaffoldBackgroundColor;
+                        return Container(
+                          decoration: BoxDecoration(
+                            gradient: LinearGradient(
+                              begin: Alignment.topCenter,
+                              end: Alignment.bottomCenter,
+                              colors: [
+                                Colors.transparent,
+                                bgColor.withValues(alpha: 0.9),
+                                bgColor,
+                              ],
+                              stops: const [0.3, 0.8, 1.0],
+                            ),
                           ),
                         );
                       },
-                    )
-                  else
-                    Container(
-                      color: Theme.of(
-                        context,
-                      ).colorScheme.surfaceContainerHighest,
-                    ),
-
-                  // Gradient overlay
-                  Container(
-                    decoration: BoxDecoration(
-                      gradient: LinearGradient(
-                        begin: Alignment.topCenter,
-                        end: Alignment.bottomCenter,
-                        colors: [
-                          Colors.transparent,
-                          Colors.black.withValues(alpha: 0.7),
-                          Colors.black.withValues(alpha: 0.95),
-                        ],
-                        stops: const [0.3, 0.7, 1.0],
-                      ),
                     ),
                   ),
 
@@ -330,28 +1461,63 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
                               SizedBox(
                                 height: 120,
                                 width: 400,
-                                child: Consumer<PlexClientProvider>(
-                                  builder: (context, clientProvider, child) {
-                                    final client = clientProvider.client;
-                                    if (client == null) {
-                                      return Text(
+                                child: Builder(
+                                  builder: (context) {
+                                    // Check for offline local file first
+                                    if (widget.isOffline &&
+                                        widget.metadata.serverId != null) {
+                                      final localPath = context
+                                          .read<DownloadProvider>()
+                                          .getArtworkLocalPath(
+                                            widget.metadata.serverId!,
+                                            metadata.clearLogo,
+                                          );
+                                      if (localPath != null &&
+                                          File(localPath).existsSync()) {
+                                        return Image.file(
+                                          File(localPath),
+                                          fit: BoxFit.contain,
+                                          alignment: Alignment.centerLeft,
+                                          errorBuilder:
+                                              (context, error, stackTrace) =>
+                                                  _buildTitleText(
+                                                    context,
+                                                    metadata.title,
+                                                  ),
+                                        );
+                                      }
+                                      // Offline but no local file - show title text
+                                      return _buildTitleText(
+                                        context,
                                         metadata.title,
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .displaySmall
-                                            ?.copyWith(
-                                              color: Colors.white,
-                                              fontWeight: FontWeight.bold,
-                                            ),
                                       );
                                     }
+
+                                    // Online - use network image
+                                    final client = _getClientForMetadata(
+                                      context,
+                                    );
+                                    final dpr = MediaQuery.of(
+                                      context,
+                                    ).devicePixelRatio;
+                                    final logoUrl =
+                                        PlexImageHelper.getOptimizedImageUrl(
+                                          client: client,
+                                          thumbPath: metadata.clearLogo,
+                                          maxWidth: 400,
+                                          maxHeight: 120,
+                                          devicePixelRatio: dpr,
+                                          imageType: ImageType.logo,
+                                        );
+
                                     return CachedNetworkImage(
-                                      imageUrl: client.getThumbnailUrl(
-                                        metadata.clearLogo,
-                                      ),
+                                      imageUrl: logoUrl,
                                       filterQuality: FilterQuality.medium,
                                       fit: BoxFit.contain,
                                       alignment: Alignment.centerLeft,
+                                      memCacheWidth: (400 * dpr)
+                                          .clamp(200, 800)
+                                          .round(),
                                       placeholder: (context, url) => Align(
                                         alignment: Alignment.centerLeft,
                                         child: Text(
@@ -377,29 +1543,9 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
                                         ),
                                       ),
                                       errorWidget: (context, url, error) {
-                                        return Align(
-                                          alignment: Alignment.centerLeft,
-                                          child: Text(
-                                            metadata.title,
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .displaySmall
-                                                ?.copyWith(
-                                                  color: Colors.white,
-                                                  fontWeight: FontWeight.bold,
-                                                  shadows: [
-                                                    Shadow(
-                                                      color: Colors.black
-                                                          .withValues(
-                                                            alpha: 0.5,
-                                                          ),
-                                                      blurRadius: 8,
-                                                    ),
-                                                  ],
-                                                ),
-                                            maxLines: 2,
-                                            overflow: TextOverflow.ellipsis,
-                                          ),
+                                        return _buildTitleText(
+                                          context,
+                                          metadata.title,
                                         );
                                       },
                                     );
@@ -433,136 +1579,30 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
                               runSpacing: 8,
                               children: [
                                 if (metadata.year != null)
-                                  Container(
-                                    padding: const EdgeInsets.symmetric(
-                                      horizontal: 12,
-                                      vertical: 6,
-                                    ),
-                                    decoration: BoxDecoration(
-                                      color: Colors.black.withValues(
-                                        alpha: 0.4,
-                                      ),
-                                      borderRadius: BorderRadius.circular(6),
-                                    ),
-                                    child: Text(
-                                      '${metadata.year}',
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 13,
-                                        fontWeight: FontWeight.w500,
-                                      ),
-                                    ),
-                                  ),
+                                  _buildMetadataChip('${metadata.year}'),
                                 if (metadata.contentRating != null)
-                                  Container(
-                                    padding: const EdgeInsets.symmetric(
-                                      horizontal: 12,
-                                      vertical: 6,
-                                    ),
-                                    decoration: BoxDecoration(
-                                      color: Colors.black.withValues(
-                                        alpha: 0.4,
-                                      ),
-                                      borderRadius: BorderRadius.circular(6),
-                                    ),
-                                    child: Text(
-                                      formatContentRating(
-                                        metadata.contentRating!,
-                                      ),
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 13,
-                                        fontWeight: FontWeight.w500,
-                                      ),
-                                    ),
+                                  _buildMetadataChip(
+                                    formatContentRating(metadata.contentRating!),
                                   ),
                                 if (metadata.duration != null)
-                                  Container(
-                                    padding: const EdgeInsets.symmetric(
-                                      horizontal: 12,
-                                      vertical: 6,
-                                    ),
-                                    decoration: BoxDecoration(
-                                      color: Colors.black.withValues(
-                                        alpha: 0.4,
-                                      ),
-                                      borderRadius: BorderRadius.circular(6),
-                                    ),
-                                    child: Text(
-                                      _formatDuration(metadata.duration!),
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 13,
-                                        fontWeight: FontWeight.w500,
-                                      ),
-                                    ),
+                                  _buildMetadataChip(
+                                    formatDurationTextual(metadata.duration!),
                                   ),
                                 if (metadata.rating != null)
-                                  Container(
-                                    padding: const EdgeInsets.symmetric(
-                                      horizontal: 12,
-                                      vertical: 6,
-                                    ),
-                                    decoration: BoxDecoration(
-                                      color: Colors.black.withValues(
-                                        alpha: 0.4,
-                                      ),
-                                      borderRadius: BorderRadius.circular(6),
-                                    ),
-                                    child: Row(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        const Icon(
-                                          Icons.star,
-                                          color: Colors.white,
-                                          size: 16,
-                                        ),
-                                        const SizedBox(width: 4),
-                                        Text(
-                                          '${(metadata.rating! * 10).toStringAsFixed(0)}%',
-                                          style: const TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 13,
-                                            fontWeight: FontWeight.w500,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
+                                  _buildMetadataChip(
+                                    '${(metadata.rating! * 10).toStringAsFixed(0)}%',
+                                    icon: Symbols.star_rounded,
                                   ),
                                 if (metadata.audienceRating != null)
-                                  Container(
-                                    padding: const EdgeInsets.symmetric(
-                                      horizontal: 12,
-                                      vertical: 6,
-                                    ),
-                                    decoration: BoxDecoration(
-                                      color: Colors.black.withValues(
-                                        alpha: 0.4,
-                                      ),
-                                      borderRadius: BorderRadius.circular(6),
-                                    ),
-                                    child: Row(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        const Icon(
-                                          Icons.people,
-                                          color: Colors.white,
-                                          size: 16,
-                                        ),
-                                        const SizedBox(width: 4),
-                                        Text(
-                                          '${(metadata.audienceRating! * 10).toStringAsFixed(0)}%',
-                                          style: const TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 13,
-                                            fontWeight: FontWeight.w500,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
+                                  _buildMetadataChip(
+                                    '${(metadata.audienceRating! * 10).toStringAsFixed(0)}%',
+                                    icon: Symbols.people_rounded,
                                   ),
                               ],
                             ),
+                            const SizedBox(height: 16),
+                            // Action buttons
+                            _buildActionButtons(metadata),
                           ],
                         ),
                       ),
@@ -571,531 +1611,253 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
                 ],
               ),
             ),
-          ),
 
-          // Main content
-          SliverToBoxAdapter(
-            child: Padding(
-              padding: const EdgeInsets.all(24),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  // Action buttons
-                  Row(
-                    children: [
-                      Expanded(
-                        child: SizedBox(
-                          height: 48,
-                          child: FilledButton.icon(
-                            onPressed: () async {
-                              // For TV shows, play the OnDeck episode if available
-                              // Otherwise, play the first episode of the first season
-                              if (metadata.type.toLowerCase() == 'show') {
-                                if (_onDeckEpisode != null) {
-                                  final clientProvider = context.plexClient;
-                                  final client = clientProvider.client;
-                                  if (client == null) return;
-
-                                  appLogger.d(
-                                    'Playing on deck episode: ${_onDeckEpisode!.title}',
-                                  );
-                                  await navigateToVideoPlayer(
-                                    context,
-                                    metadata: _onDeckEpisode!,
-                                  );
-                                  appLogger.d(
-                                    'Returned from playback, refreshing metadata',
-                                  );
-                                  // Refresh metadata when returning from video player
-                                  _loadFullMetadata();
-                                } else {
-                                  // No on deck episode, fetch first episode of first season
-                                  await _playFirstEpisode();
-                                }
-                              } else {
-                                final clientProvider = context.plexClient;
-                                final client = clientProvider.client;
-                                if (client == null) return;
-
-                                appLogger.d('Playing: ${metadata.title}');
-                                // For movies or episodes, play directly
-                                await navigateToVideoPlayer(
-                                  context,
-                                  metadata: metadata,
-                                );
-                                appLogger.d(
-                                  'Returned from playback, refreshing metadata',
-                                );
-                                // Refresh metadata when returning from video player
-                                _loadFullMetadata();
-                              }
-                            },
-                            icon: const Icon(Icons.play_arrow, size: 20),
-                            label: Text(
-                              _getPlayButtonLabel(metadata),
-                              style: const TextStyle(fontSize: 16),
-                            ),
-                            style: FilledButton.styleFrom(
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: 16,
-                              ),
-                            ),
-                          ),
+            // Main content
+            SliverToBoxAdapter(
+              child: Padding(
+                padding: const EdgeInsets.all(24),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    // Summary
+                    if (metadata.summary != null) ...[
+                      Text(
+                        t.discover.overview,
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                          fontWeight: FontWeight.bold,
                         ),
                       ),
-                      const SizedBox(width: 12),
-                      // Shuffle button (only for shows and seasons)
-                      if (metadata.type.toLowerCase() == 'show' ||
-                          metadata.type.toLowerCase() == 'season') ...[
-                        IconButton.filledTonal(
-                          onPressed: () async {
-                            await handleShufflePlay(context, metadata);
-                          },
-                          icon: const Icon(Icons.shuffle),
-                          tooltip: t.tooltips.shufflePlay,
-                          iconSize: 20,
-                          style: IconButton.styleFrom(
-                            minimumSize: const Size(48, 48),
-                            maximumSize: const Size(48, 48),
-                          ),
-                        ),
-                        const SizedBox(width: 12),
-                      ],
-                      IconButton.filledTonal(
-                        onPressed: () async {
-                          try {
-                            final clientProvider = context.plexClient;
-                            final client = clientProvider.client;
-                            if (client == null) return;
-
-                            await client.markAsWatched(metadata.ratingKey);
-                            if (context.mounted) {
-                              _watchStateChanged = true;
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(t.messages.markedAsWatched),
-                                ),
-                              );
-                              // Update watch state without full rebuild
-                              _updateWatchState();
-                            }
-                          } catch (e) {
-                            if (context.mounted) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(
-                                    t.messages.errorLoading(
-                                      error: e.toString(),
-                                    ),
-                                  ),
-                                ),
-                              );
-                            }
-                          }
-                        },
-                        icon: const Icon(Icons.check),
-                        tooltip: t.tooltips.markAsWatched,
-                        iconSize: 20,
-                        style: IconButton.styleFrom(
-                          minimumSize: const Size(48, 48),
-                          maximumSize: const Size(48, 48),
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      IconButton.filledTonal(
-                        onPressed: () async {
-                          try {
-                            final clientProvider = context.plexClient;
-                            final client = clientProvider.client;
-                            if (client == null) return;
-
-                            await client.markAsUnwatched(metadata.ratingKey);
-                            if (context.mounted) {
-                              _watchStateChanged = true;
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(t.messages.markedAsUnwatched),
-                                ),
-                              );
-                              // Update watch state without full rebuild
-                              _updateWatchState();
-                            }
-                          } catch (e) {
-                            if (context.mounted) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(
-                                    t.messages.errorLoading(
-                                      error: e.toString(),
-                                    ),
-                                  ),
-                                ),
-                              );
-                            }
-                          }
-                        },
-                        icon: const Icon(Icons.remove_done),
-                        tooltip: t.tooltips.markAsUnwatched,
-                        iconSize: 20,
-                        style: IconButton.styleFrom(
-                          minimumSize: const Size(48, 48),
-                          maximumSize: const Size(48, 48),
-                        ),
+                      const SizedBox(height: 12),
+                      Text(
+                        metadata.summary!,
+                        style: Theme.of(
+                          context,
+                        ).textTheme.bodyLarge?.copyWith(height: 1.6),
                       ),
+                      const SizedBox(height: 24),
                     ],
-                  ),
 
-                  const SizedBox(height: 24),
-
-                  // Summary
-                  if (metadata.summary != null) ...[
-                    Text(
-                      t.discover.overview,
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const SizedBox(height: 12),
-                    Text(
-                      metadata.summary!,
-                      style: Theme.of(
-                        context,
-                      ).textTheme.bodyLarge?.copyWith(height: 1.6),
-                    ),
-                    const SizedBox(height: 24),
-                  ],
-
-                  // Seasons (for TV shows)
-                  if (isShow) ...[
-                    Text(
-                      'Seasons',
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const SizedBox(height: 12),
-                    if (_isLoadingSeasons)
-                      const Center(
-                        child: Padding(
-                          padding: EdgeInsets.all(32),
-                          child: CircularProgressIndicator(),
+                    // Seasons (for TV shows)
+                    if (isShow) ...[
+                      Text(
+                        t.discover.seasons,
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                          fontWeight: FontWeight.bold,
                         ),
-                      )
-                    else if (_seasons.isEmpty)
-                      Padding(
-                        padding: const EdgeInsets.all(32),
-                        child: Center(
-                          child: Text(
-                            t.messages.noSeasonsFound,
-                            style: Theme.of(
-                              context,
-                            ).textTheme.bodyLarge?.copyWith(color: Colors.grey),
+                      ),
+                      const SizedBox(height: 12),
+                      if (_isLoadingSeasons)
+                        const Center(
+                          child: Padding(
+                            padding: EdgeInsets.all(32),
+                            child: CircularProgressIndicator(),
                           ),
-                        ),
-                      )
-                    else
-                      ListView.separated(
-                        shrinkWrap: true,
-                        physics: const NeverScrollableScrollPhysics(),
-                        padding: EdgeInsets.zero,
-                        itemCount: _seasons.length,
-                        separatorBuilder: (context, index) =>
-                            const SizedBox(height: 12),
-                        itemBuilder: (context, index) {
-                          final season = _seasons[index];
-                          return _buildSeasonCard(season);
-                        },
-                      ),
-                    const SizedBox(height: 24),
-                  ],
+                        )
+                      else if (_seasons.isEmpty)
+                        Padding(
+                          padding: const EdgeInsets.all(32),
+                          child: Center(
+                            child: Text(
+                              t.messages.noSeasonsFound,
+                              style: Theme.of(context).textTheme.bodyLarge
+                                  ?.copyWith(color: Colors.grey),
+                            ),
+                          ),
+                        )
+                      else if (size.width >= 600)
+                        _buildHorizontalSeasons()
+                      else
+                        _buildVerticalSeasons(),
+                      const SizedBox(height: 24),
+                    ],
 
-                  // Cast
-                  if (metadata.role != null && metadata.role!.isNotEmpty) ...[
-                    Text(
-                      t.discover.cast,
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
+                    // Cast
+                    if (metadata.role != null && metadata.role!.isNotEmpty) ...[
+                      Text(
+                        t.discover.cast,
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                          fontWeight: FontWeight.bold,
+                        ),
                       ),
-                    ),
-                    const SizedBox(height: 12),
-                    SizedBox(
-                      height: 220,
-                      child: HorizontalScrollWithArrows(
-                        builder: (scrollController) => ListView.separated(
-                          controller: scrollController,
-                          scrollDirection: Axis.horizontal,
-                          padding: const EdgeInsets.symmetric(horizontal: 12),
-                          itemCount: metadata.role!.length,
-                          separatorBuilder: (context, index) =>
-                              const SizedBox(width: 12),
-                          itemBuilder: (context, index) {
-                            final actor = metadata.role![index];
-                            return SizedBox(
-                              width: 120,
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  ClipRRect(
-                                    borderRadius: BorderRadius.circular(8),
-                                    child: actor.thumb != null
-                                        ? CachedNetworkImage(
-                                            imageUrl: actor.thumb!,
-                                            width: 120,
-                                            height: 120,
-                                            fit: BoxFit.cover,
-                                            placeholder: (context, url) =>
-                                                Container(
-                                                  width: 120,
-                                                  height: 120,
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .surfaceContainerHighest,
-                                                  child: const Center(
-                                                    child: Icon(Icons.person),
+                      const SizedBox(height: 12),
+                      SizedBox(
+                        height: 220,
+                        child: HorizontalScrollWithArrows(
+                          builder: (scrollController) => ListView.separated(
+                            controller: scrollController,
+                            scrollDirection: Axis.horizontal,
+                            padding: const EdgeInsets.symmetric(horizontal: 12),
+                            itemCount: metadata.role!.length,
+                            separatorBuilder: (context, index) =>
+                                const SizedBox(width: 12),
+                            itemBuilder: (context, index) {
+                              final actor = metadata.role![index];
+                              return SizedBox(
+                                width: 120,
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    ClipRRect(
+                                      borderRadius: BorderRadius.circular(8),
+                                      child: actor.thumb != null
+                                          ? CachedNetworkImage(
+                                              imageUrl: actor.thumb!,
+                                              width: 120,
+                                              height: 120,
+                                              fit: BoxFit.cover,
+                                              placeholder: (context, url) =>
+                                                  Container(
+                                                    width: 120,
+                                                    height: 120,
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .surfaceContainerHighest,
+                                                    child: const Center(
+                                                      child: AppIcon(
+                                                        Symbols.person_rounded,
+                                                        fill: 1,
+                                                      ),
+                                                    ),
                                                   ),
-                                                ),
-                                            errorWidget:
-                                                (
-                                                  context,
-                                                  url,
-                                                  error,
-                                                ) => Container(
-                                                  width: 120,
-                                                  height: 120,
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .surfaceContainerHighest,
-                                                  child: const Center(
-                                                    child: Icon(Icons.person),
+                                              errorWidget:
+                                                  (
+                                                    context,
+                                                    url,
+                                                    error,
+                                                  ) => Container(
+                                                    width: 120,
+                                                    height: 120,
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .surfaceContainerHighest,
+                                                    child: const Center(
+                                                      child: AppIcon(
+                                                        Symbols.person_rounded,
+                                                        fill: 1,
+                                                      ),
+                                                    ),
                                                   ),
+                                            )
+                                          : Container(
+                                              width: 120,
+                                              height: 120,
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .surfaceContainerHighest,
+                                              child: const Center(
+                                                child: AppIcon(
+                                                  Symbols.person_rounded,
+                                                  fill: 1,
                                                 ),
-                                          )
-                                        : Container(
-                                            width: 120,
-                                            height: 120,
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .surfaceContainerHighest,
-                                            child: const Center(
-                                              child: Icon(Icons.person),
-                                            ),
-                                          ),
-                                  ),
-                                  const SizedBox(height: 8),
-                                  SizedBox(
-                                    height: 84,
-                                    child: Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        Text(
-                                          actor.tag,
-                                          style: Theme.of(context)
-                                              .textTheme
-                                              .bodyMedium
-                                              ?.copyWith(
-                                                fontWeight: FontWeight.w600,
                                               ),
-                                          maxLines: 2,
-                                          overflow: TextOverflow.ellipsis,
-                                        ),
-                                        if (actor.role != null) ...[
-                                          const SizedBox(height: 2),
+                                            ),
+                                    ),
+                                    const SizedBox(height: 8),
+                                    SizedBox(
+                                      height: 84,
+                                      child: Column(
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.start,
+                                        children: [
                                           Text(
-                                            actor.role!,
+                                            actor.tag,
                                             style: Theme.of(context)
                                                 .textTheme
-                                                .bodySmall
+                                                .bodyMedium
                                                 ?.copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .onSurfaceVariant,
+                                                  fontWeight: FontWeight.w600,
                                                 ),
                                             maxLines: 2,
                                             overflow: TextOverflow.ellipsis,
                                           ),
+                                          if (actor.role != null) ...[
+                                            const SizedBox(height: 2),
+                                            Text(
+                                              actor.role!,
+                                              style: Theme.of(context)
+                                                  .textTheme
+                                                  .bodySmall
+                                                  ?.copyWith(
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .onSurfaceVariant,
+                                                  ),
+                                              maxLines: 2,
+                                              overflow: TextOverflow.ellipsis,
+                                            ),
+                                          ],
                                         ],
-                                      ],
+                                      ),
                                     ),
-                                  ),
-                                ],
-                              ),
-                            );
-                          },
+                                  ],
+                                ),
+                              );
+                            },
+                          ),
                         ),
                       ),
-                    ),
-                    const SizedBox(height: 24),
-                  ],
+                      const SizedBox(height: 24),
+                    ],
 
-                  // Additional info
-                  if (metadata.studio != null) ...[
-                    _buildInfoRow('Studio', metadata.studio!),
-                    const SizedBox(height: 12),
+                    // Additional info
+                    if (metadata.studio != null) ...[
+                      _buildInfoRow(t.discover.studio, metadata.studio!),
+                      const SizedBox(height: 12),
+                    ],
+                    if (metadata.contentRating != null) ...[
+                      _buildInfoRow(
+                        t.discover.rating,
+                        formatContentRating(metadata.contentRating!),
+                      ),
+                      const SizedBox(height: 12),
+                    ],
                   ],
-                  if (metadata.contentRating != null) ...[
-                    _buildInfoRow(
-                      'Rating',
-                      formatContentRating(metadata.contentRating!),
-                    ),
-                    const SizedBox(height: 12),
-                  ],
-                ],
+                ),
               ),
             ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildSeasonCard(PlexMetadata season) {
-    return Card(
-      clipBehavior: Clip.antiAlias,
-      child: MediaContextMenu(
-        metadata: season,
-        onRefresh: (ratingKey) {
-          _watchStateChanged = true;
-          _updateWatchState();
-        },
-        onTap: () async {
-          final watchStateChanged = await Navigator.push<bool>(
-            context,
-            MaterialPageRoute(
-              builder: (context) => SeasonDetailScreen(season: season),
+              ],
             ),
-          );
-          if (watchStateChanged == true) {
-            _watchStateChanged = true;
-            _updateWatchState();
-          }
-        },
-        child: Semantics(
-          label: "media-season-${season.ratingKey}",
-          identifier: "media-season-${season.ratingKey}",
-          button: true,
-          hint: "Tap to view ${season.title}",
-          child: InkWell(
-            child: Padding(
-              padding: const EdgeInsets.all(12),
-              child: Row(
-                children: [
-                  // Season poster
-                  if (season.thumb != null)
-                    ClipRRect(
-                      borderRadius: BorderRadius.circular(6),
-                      child: Consumer<PlexClientProvider>(
-                        builder: (context, clientProvider, child) {
-                          final client = clientProvider.client;
-                          if (client == null) {
-                            return Container(
-                              width: 80,
-                              height: 120,
-                              color: Theme.of(
-                                context,
-                              ).colorScheme.surfaceContainerHighest,
-                              child: const Icon(Icons.movie, size: 32),
-                            );
-                          }
-                          return CachedNetworkImage(
-                            imageUrl: client.getThumbnailUrl(season.thumb),
-                            width: 80,
-                            height: 120,
-                            fit: BoxFit.cover,
-                            placeholder: (context, url) => Container(
-                              width: 80,
-                              height: 120,
-                              color: Theme.of(
-                                context,
-                              ).colorScheme.surfaceContainerHighest,
-                            ),
-                            errorWidget: (context, url, error) => Container(
-                              width: 80,
-                              height: 120,
-                              color: Theme.of(
-                                context,
-                              ).colorScheme.surfaceContainerHighest,
-                              child: const Icon(Icons.movie, size: 32),
-                            ),
-                          );
-                        },
+            // Sticky top bar with fading background
+            Positioned(
+              top: 0,
+              left: 0,
+              right: 0,
+              child: IgnorePointer(
+                ignoring: _scrollOffset < 50,
+                child: AnimatedOpacity(
+                  opacity: (_scrollOffset / 100).clamp(0.0, 1.0),
+                  duration: const Duration(milliseconds: 150),
+                  child: Container(
+                    height: MediaQuery.of(context).padding.top + 58,
+                    decoration: BoxDecoration(
+                      gradient: LinearGradient(
+                        begin: Alignment.topCenter,
+                        end: Alignment.bottomCenter,
+                        colors: [
+                          Theme.of(context).scaffoldBackgroundColor.withValues(alpha: 0.8),
+                          Theme.of(context).scaffoldBackgroundColor.withValues(alpha: 0.5),
+                          Theme.of(context).scaffoldBackgroundColor.withValues(alpha: 0),
+                        ],
+                        stops: const [0.0, 0.3, 1.0],
                       ),
-                    )
-                  else
-                    Container(
-                      width: 80,
-                      height: 120,
-                      decoration: BoxDecoration(
-                        color: Theme.of(
-                          context,
-                        ).colorScheme.surfaceContainerHighest,
-                        borderRadius: BorderRadius.circular(6),
-                      ),
-                      child: const Icon(Icons.movie, size: 32),
-                    ),
-                  const SizedBox(width: 16),
-
-                  // Season info
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          season.title,
-                          style: Theme.of(context).textTheme.titleMedium
-                              ?.copyWith(fontWeight: FontWeight.bold),
-                        ),
-                        const SizedBox(height: 4),
-                        if (season.leafCount != null)
-                          Text(
-                            t.discover.episodeCount(
-                              count: season.leafCount.toString(),
-                            ),
-                            style: Theme.of(context).textTheme.bodyMedium
-                                ?.copyWith(color: Colors.grey),
-                          ),
-                        const SizedBox(height: 8),
-                        if (season.viewedLeafCount != null &&
-                            season.leafCount != null)
-                          Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              SizedBox(
-                                width: 200,
-                                child: ClipRRect(
-                                  borderRadius: BorderRadius.circular(4),
-                                  child: LinearProgressIndicator(
-                                    value:
-                                        season.viewedLeafCount! /
-                                        season.leafCount!,
-                                    backgroundColor: tokens(context).outline,
-                                    valueColor: AlwaysStoppedAnimation<Color>(
-                                      Theme.of(context).colorScheme.primary,
-                                    ),
-                                    minHeight: 6,
-                                  ),
-                                ),
-                              ),
-                              const SizedBox(height: 4),
-                              Text(
-                                t.discover.watchedProgress(
-                                  watched: season.viewedLeafCount.toString(),
-                                  total: season.leafCount.toString(),
-                                ),
-                                style: Theme.of(context).textTheme.bodySmall
-                                    ?.copyWith(color: Colors.grey),
-                              ),
-                            ],
-                          ),
-                      ],
                     ),
                   ),
-
-                  const Icon(Icons.chevron_right),
-                ],
+                ),
               ),
             ),
-          ),
+            // Back button (always visible)
+            Positioned(
+              top: MediaQuery.of(context).padding.top,
+              left: 0,
+              child: DesktopAppBarHelper.buildAdjustedLeading(
+                AppBarBackButton(
+                  style: BackButtonStyle.circular,
+                  onPressed: () => Navigator.pop(context, _watchStateChanged),
+                ),
+                context: context,
+              )!,
+            ),
+          ],
         ),
       ),
     );
@@ -1122,49 +1884,219 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
     );
   }
 
-  String _formatDuration(int milliseconds) {
-    final duration = Duration(milliseconds: milliseconds);
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-
-    if (hours > 0) {
-      return '${hours}h ${minutes}m';
-    } else {
-      return '${minutes}m';
-    }
-  }
-
   String _getPlayButtonLabel(PlexMetadata metadata) {
-    // For TV shows
+    // For TV shows - use compact S1E1 format
     if (metadata.type.toLowerCase() == 'show') {
       if (_onDeckEpisode != null) {
         final episode = _onDeckEpisode!;
         final seasonNum = episode.parentIndex ?? 0;
         final episodeNum = episode.index ?? 0;
 
-        // Check if episode has been partially watched (viewOffset > 0)
-        if (episode.viewOffset != null && episode.viewOffset! > 0) {
-          return t.discover.resumeEpisode(
-            season: seasonNum.toString(),
-            episode: episodeNum.toString(),
-          );
-        } else {
-          return t.discover.playEpisode(
-            season: seasonNum.toString(),
-            episode: episodeNum.toString(),
-          );
-        }
+        // Use the same format for both play and resume
+        // (icon will indicate the difference)
+        return t.discover.playEpisode(
+          season: seasonNum.toString(),
+          episode: episodeNum.toString(),
+        );
       } else {
         // No on deck episode, will play first episode
         return t.discover.playEpisode(season: '1', episode: '1');
       }
     }
 
-    // For movies or episodes, check if partially watched
-    if (metadata.viewOffset != null && metadata.viewOffset! > 0) {
-      return t.discover.resume;
+    // For movies or episodes - NO TEXT, just icon
+    return '';
+  }
+
+  IconData _getPlayButtonIcon(PlexMetadata metadata) {
+    // For TV shows
+    if (metadata.type.toLowerCase() == 'show') {
+      if (_onDeckEpisode != null) {
+        final episode = _onDeckEpisode!;
+        // Check if episode has been partially watched
+        if (episode.viewOffset != null && episode.viewOffset! > 0) {
+          return Symbols.resume_rounded; // Resume icon
+        }
+      }
+    } else {
+      // For movies or episodes
+      if (metadata.viewOffset != null && metadata.viewOffset! > 0) {
+        return Symbols.resume_rounded; // Resume icon
+      }
     }
 
-    return t.discover.play;
+    return Symbols.play_arrow_rounded; // Default play icon
+  }
+}
+
+/// Season card widget
+class _SeasonCard extends StatelessWidget {
+  final PlexMetadata season;
+  final PlexClient? client;
+  final VoidCallback onTap;
+  final VoidCallback onRefresh;
+  final bool isOffline;
+  final String? localPosterPath;
+
+  const _SeasonCard({
+    required this.season,
+    this.client,
+    required this.onTap,
+    required this.onRefresh,
+    this.isOffline = false,
+    this.localPosterPath,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: MediaContextMenu(
+        item: season,
+        onRefresh: (ratingKey) => onRefresh(),
+        onTap: onTap,
+        child: Semantics(
+          label: "media-season-${season.ratingKey}",
+          identifier: "media-season-${season.ratingKey}",
+          button: true,
+          hint: "Tap to view ${season.title}",
+          child: InkWell(
+            onTap: onTap,
+            child: Padding(
+              padding: const EdgeInsets.all(12),
+              child: Row(
+                children: [
+                  // Season poster
+                  ClipRRect(
+                    borderRadius: BorderRadius.circular(6),
+                    child: isOffline && localPosterPath != null
+                        ? Image.file(
+                            File(localPosterPath!),
+                            width: 80,
+                            height: 120,
+                            fit: BoxFit.cover,
+                            errorBuilder: (context, error, stackTrace) =>
+                                Container(
+                                  width: 80,
+                                  height: 120,
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.surfaceContainerHighest,
+                                  child: const AppIcon(
+                                    Symbols.movie_rounded,
+                                    fill: 1,
+                                    size: 32,
+                                  ),
+                                ),
+                          )
+                        : season.thumb != null
+                        ? PlexOptimizedImage.poster(
+                            client: client,
+                            imagePath: season.thumb,
+                            width: 80,
+                            height: 120,
+                            fit: BoxFit.cover,
+                            placeholder: (context, url) => Container(
+                              width: 80,
+                              height: 120,
+                              color: Theme.of(
+                                context,
+                              ).colorScheme.surfaceContainerHighest,
+                            ),
+                            errorWidget: (context, url, error) => Container(
+                              width: 80,
+                              height: 120,
+                              color: Theme.of(
+                                context,
+                              ).colorScheme.surfaceContainerHighest,
+                              child: const AppIcon(
+                                Symbols.movie_rounded,
+                                fill: 1,
+                                size: 32,
+                              ),
+                            ),
+                          )
+                        : Container(
+                            width: 80,
+                            height: 120,
+                            color: Theme.of(
+                              context,
+                            ).colorScheme.surfaceContainerHighest,
+                            child: const AppIcon(
+                              Symbols.movie_rounded,
+                              fill: 1,
+                              size: 32,
+                            ),
+                          ),
+                  ),
+                  const SizedBox(width: 16),
+
+                  // Season info
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          season.title,
+                          style: Theme.of(context).textTheme.titleMedium
+                              ?.copyWith(fontWeight: FontWeight.bold),
+                        ),
+                        const SizedBox(height: 4),
+                        if (season.leafCount != null)
+                          Text(
+                            t.discover.episodeCount(
+                              count: season.leafCount.toString(),
+                            ),
+                            style: Theme.of(context).textTheme.bodyMedium
+                                ?.copyWith(color: Colors.grey),
+                          ),
+                        // Hide watch progress when offline (not tracked)
+                        if (!isOffline) ...[
+                          const SizedBox(height: 8),
+                          if (season.viewedLeafCount != null &&
+                              season.leafCount != null)
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                SizedBox(
+                                  width: 200,
+                                  child: ClipRRect(
+                                    borderRadius: BorderRadius.circular(4),
+                                    child: LinearProgressIndicator(
+                                      value:
+                                          season.viewedLeafCount! /
+                                          season.leafCount!,
+                                      backgroundColor: tokens(context).outline,
+                                      valueColor: AlwaysStoppedAnimation<Color>(
+                                        Theme.of(context).colorScheme.primary,
+                                      ),
+                                      minHeight: 6,
+                                    ),
+                                  ),
+                                ),
+                                const SizedBox(height: 4),
+                                Text(
+                                  t.discover.watchedProgress(
+                                    watched: season.viewedLeafCount.toString(),
+                                    total: season.leafCount.toString(),
+                                  ),
+                                  style: Theme.of(context).textTheme.bodySmall
+                                      ?.copyWith(color: Colors.grey),
+                                ),
+                              ],
+                            ),
+                        ],
+                      ],
+                    ),
+                  ),
+
+                  const AppIcon(Symbols.chevron_right_rounded, fill: 1),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
   }
 }
diff --git a/lib/screens/playlist/playlist_detail_screen.dart b/lib/screens/playlist/playlist_detail_screen.dart
new file mode 100644
index 00000000..b0225422
--- /dev/null
+++ b/lib/screens/playlist/playlist_detail_screen.dart
@@ -0,0 +1,287 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../services/plex_client.dart';
+import '../../services/play_queue_launcher.dart';
+import '../../models/plex_playlist.dart';
+import '../../models/plex_metadata.dart';
+import '../../utils/app_logger.dart';
+import '../../utils/provider_extensions.dart';
+import '../../widgets/media_grid_sliver.dart';
+import 'playlist_item_card.dart';
+import '../../widgets/focused_scroll_scaffold.dart';
+import '../../i18n/strings.g.dart';
+import '../../utils/dialogs.dart';
+import '../base_media_list_detail_screen.dart';
+
+/// Screen to display the contents of a playlist
+class PlaylistDetailScreen extends StatefulWidget {
+  final PlexPlaylist playlist;
+
+  const PlaylistDetailScreen({super.key, required this.playlist});
+
+  @override
+  State<PlaylistDetailScreen> createState() => _PlaylistDetailScreenState();
+}
+
+class _PlaylistDetailScreenState
+    extends BaseMediaListDetailScreen<PlaylistDetailScreen>
+    with StandardItemLoader<PlaylistDetailScreen> {
+  @override
+  dynamic get mediaItem => widget.playlist;
+
+  @override
+  String get title => widget.playlist.title;
+
+  @override
+  String get emptyMessage => t.playlists.emptyPlaylist;
+
+  @override
+  IconData get emptyIcon => Symbols.playlist_play_rounded;
+
+  @override
+  Future<List<PlexMetadata>> fetchItems() async {
+    return await client.getPlaylist(widget.playlist.ratingKey);
+  }
+
+  @override
+  String getLoadSuccessMessage(int itemCount) {
+    return 'Loaded $itemCount items for playlist: ${widget.playlist.title}';
+  }
+
+  /// Get the correct PlexClient for this playlist's server
+  PlexClient _getClientForPlaylist() {
+    return context.getClientForServer(widget.playlist.serverId!);
+  }
+
+  Future<void> _deletePlaylist() async {
+    final confirmed = await showDeleteConfirmation(
+      context,
+      title: t.playlists.deleteConfirm,
+      message: t.playlists.deleteMessage(name: widget.playlist.title),
+    );
+
+    if (confirmed == true && mounted) {
+      final success = await client.deletePlaylist(widget.playlist.ratingKey);
+
+      if (mounted) {
+        if (success) {
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text(t.playlists.deleted)));
+          Navigator.pop(context); // Return to playlists screen
+        } else {
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text(t.playlists.errorDeleting)));
+        }
+      }
+    }
+  }
+
+  Future<void> _onReorder(int oldIndex, int newIndex) async {
+    // Adjust newIndex if moving down in the list
+    if (newIndex > oldIndex) {
+      newIndex--;
+    }
+
+    // Can't reorder if indices are the same
+    if (oldIndex == newIndex) return;
+
+    final movedItem = items[oldIndex];
+
+    // Check if item has playlistItemID (required for reordering)
+    if (movedItem.playlistItemID == null) {
+      appLogger.e('Cannot reorder: item missing playlistItemID');
+      if (mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(t.playlists.errorReordering)));
+      }
+      return;
+    }
+
+    // Determine the "after" item ID
+    // If moving to position 0, afterPlaylistItemId should be 0 (move to top)
+    // Otherwise, use the playlistItemID of the item before the new position
+    final int afterPlaylistItemId;
+    if (newIndex == 0) {
+      afterPlaylistItemId = 0; // Move to top
+    } else {
+      final afterItem = items[newIndex - 1];
+      if (afterItem.playlistItemID == null) {
+        appLogger.e('Cannot reorder: after item missing playlistItemID');
+        if (mounted) {
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text(t.playlists.errorReordering)));
+        }
+        return;
+      }
+      afterPlaylistItemId = afterItem.playlistItemID!;
+    }
+
+    appLogger.d(
+      'Reordering item from $oldIndex to $newIndex (after ID: $afterPlaylistItemId)',
+    );
+
+    // Optimistically update UI
+    setState(() {
+      final item = items.removeAt(oldIndex);
+      items.insert(newIndex, item);
+    });
+
+    // Call API to persist the change
+    final success = await client.movePlaylistItem(
+      playlistId: widget.playlist.ratingKey,
+      playlistItemId: movedItem.playlistItemID!,
+      afterPlaylistItemId: afterPlaylistItemId,
+    );
+
+    if (!success) {
+      // Revert on failure
+      appLogger.e('Failed to reorder playlist item, reverting UI');
+      if (mounted) {
+        setState(() {
+          final item = items.removeAt(newIndex);
+          items.insert(oldIndex, item);
+        });
+
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(t.playlists.errorReordering)));
+      }
+    }
+  }
+
+  Future<void> _removeItem(int index) async {
+    final item = items[index];
+
+    // Check if item has playlistItemID (required for removal)
+    if (item.playlistItemID == null) {
+      appLogger.e('Cannot remove: item missing playlistItemID');
+      if (mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(t.playlists.errorRemoving)));
+      }
+      return;
+    }
+
+    appLogger.d(
+      'Removing item ${item.title} (playlistItemID: ${item.playlistItemID}) from playlist',
+    );
+
+    // Optimistically update UI
+    setState(() {
+      items.removeAt(index);
+    });
+
+    // Call API to persist the change
+    final success = await client.removeFromPlaylist(
+      playlistId: widget.playlist.ratingKey,
+      playlistItemId: item.playlistItemID.toString(),
+    );
+
+    if (mounted) {
+      if (success) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(t.playlists.itemRemoved)));
+      } else {
+        // Revert on failure
+        appLogger.e('Failed to remove playlist item, reverting UI');
+        setState(() {
+          items.insert(index, item);
+        });
+
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(t.playlists.errorRemoving)));
+      }
+    }
+  }
+
+  Future<void> _playFromItem(int index) async {
+    if (items.isEmpty || index < 0 || index >= items.length) return;
+
+    final plexClient = _getClientForPlaylist();
+    final selectedItem = items[index];
+
+    final launcher = PlayQueueLauncher(
+      context: context,
+      client: plexClient,
+      serverId: widget.playlist.serverId,
+      serverName: widget.playlist.serverName,
+    );
+
+    await launcher.launchFromPlaylistItem(
+      playlist: widget.playlist,
+      selectedItem: selectedItem,
+      showLoadingIndicator: true,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusedScrollScaffold(
+      title: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(widget.playlist.title, style: const TextStyle(fontSize: 16)),
+          if (widget.playlist.smart)
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                AppIcon(
+                  Symbols.auto_awesome_rounded,
+                  fill: 1,
+                  size: 12,
+                  color: Colors.blue[300],
+                ),
+                const SizedBox(width: 4),
+                Text(
+                  t.playlists.smartPlaylist,
+                  style: TextStyle(
+                    fontSize: 11,
+                    color: Colors.blue[300],
+                    fontWeight: FontWeight.normal,
+                  ),
+                ),
+              ],
+            ),
+        ],
+      ),
+      actions: buildAppBarActions(
+        onDelete: widget.playlist.smart ? null : _deletePlaylist,
+        deleteTooltip: t.playlists.delete,
+        showDelete: !widget.playlist.smart,
+      ),
+      slivers: [
+        ...buildStateSlivers(),
+        if (items.isNotEmpty)
+          if (widget.playlist.smart)
+            // Smart playlists: Use grid view (cannot be reordered)
+            MediaGridSliver(items: items, onRefresh: updateItem)
+          else
+            // Regular playlists: Use reorderable list view
+            SliverReorderableList(
+              itemBuilder: (context, index) {
+                final item = items[index];
+                return PlaylistItemCard(
+                  key: ValueKey(item.playlistItemID ?? item.ratingKey),
+                  item: item,
+                  index: index,
+                  onRemove: () => _removeItem(index),
+                  onTap: () => _playFromItem(index),
+                  onRefresh: updateItem,
+                  canReorder: !widget.playlist.smart,
+                );
+              },
+              itemCount: items.length,
+              onReorder: _onReorder,
+            ),
+      ],
+    );
+  }
+}
diff --git a/lib/screens/playlist/playlist_item_card.dart b/lib/screens/playlist/playlist_item_card.dart
new file mode 100644
index 00000000..1429b8f4
--- /dev/null
+++ b/lib/screens/playlist/playlist_item_card.dart
@@ -0,0 +1,202 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../services/plex_client.dart';
+import '../../models/plex_metadata.dart';
+import '../../utils/duration_formatter.dart';
+import '../../utils/provider_extensions.dart';
+import '../../i18n/strings.g.dart';
+import '../../widgets/media_context_menu.dart';
+import '../../widgets/plex_optimized_image.dart';
+
+/// Custom list item widget for playlist items
+/// Shows drag handle, poster, title/metadata, duration, and remove button
+class PlaylistItemCard extends StatefulWidget {
+  final PlexMetadata item;
+  final int index;
+  final VoidCallback onRemove;
+  final VoidCallback? onTap;
+  final void Function(String ratingKey)? onRefresh;
+  final bool canReorder; // Whether drag handle should be shown
+
+  const PlaylistItemCard({
+    super.key,
+    required this.item,
+    required this.index,
+    required this.onRemove,
+    this.onTap,
+    this.onRefresh,
+    this.canReorder = true,
+  });
+
+  @override
+  State<PlaylistItemCard> createState() => _PlaylistItemCardState();
+}
+
+class _PlaylistItemCardState extends State<PlaylistItemCard> {
+  final _contextMenuKey = GlobalKey<MediaContextMenuState>();
+
+  @override
+  Widget build(BuildContext context) {
+    final item = widget.item;
+    return MediaContextMenu(
+      key: _contextMenuKey,
+      item: item,
+      onRefresh: widget.onRefresh,
+      onTap: widget.onTap,
+      child: Card(
+        margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+        child: InkWell(
+          onTap: widget.onTap,
+          child: Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Row(
+              children: [
+                // Drag handle (if reorderable)
+                if (widget.canReorder)
+                  ReorderableDragStartListener(
+                    index: widget.index,
+                    child: const Padding(
+                      padding: EdgeInsets.only(right: 12),
+                      child: AppIcon(
+                        Symbols.drag_indicator_rounded,
+                        fill: 1,
+                        color: Colors.grey,
+                      ),
+                    ),
+                  ),
+
+                // Poster thumbnail
+                _buildPosterImage(context),
+
+                const SizedBox(width: 12),
+
+                // Title and metadata
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      // Title
+                      Text(
+                        item.displayTitle,
+                        style: const TextStyle(
+                          fontSize: 15,
+                          fontWeight: FontWeight.w500,
+                        ),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+
+                      const SizedBox(height: 4),
+
+                      // Subtitle (episode info or type)
+                      Text(
+                        _buildSubtitle(),
+                        style: TextStyle(fontSize: 13, color: Colors.grey[400]),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+
+                      // Progress indicator if partially watched
+                      if (item.viewOffset != null && item.duration != null)
+                        Padding(
+                          padding: const EdgeInsets.only(top: 6),
+                          child: LinearProgressIndicator(
+                            value: item.viewOffset! / item.duration!,
+                            backgroundColor: Colors.grey[800],
+                            valueColor: AlwaysStoppedAnimation<Color>(
+                              Theme.of(context).colorScheme.primary,
+                            ),
+                            minHeight: 3,
+                          ),
+                        ),
+                    ],
+                  ),
+                ),
+
+                const SizedBox(width: 12),
+
+                // Duration
+                if (item.duration != null)
+                  Text(
+                    formatDurationTextual(item.duration!),
+                    style: TextStyle(fontSize: 13, color: Colors.grey[400]),
+                  ),
+
+                const SizedBox(width: 8),
+
+                // Remove button
+                IconButton(
+                  icon: const AppIcon(Symbols.close_rounded, fill: 1, size: 20),
+                  onPressed: widget.onRemove,
+                  tooltip: t.playlists.removeItem,
+                  color: Colors.grey[400],
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  /// Get the correct PlexClient for this item's server
+  PlexClient _getClientForItem(BuildContext context) {
+    return context.getClientForServer(widget.item.serverId!);
+  }
+
+  Widget _buildPosterImage(BuildContext context) {
+    final posterUrl = widget.item.posterThumb();
+    return ClipRRect(
+      borderRadius: BorderRadius.circular(6),
+      child: PlexOptimizedImage.poster(
+        client: _getClientForItem(context),
+        imagePath: posterUrl,
+        width: 60,
+        height: 90,
+        fit: BoxFit.cover,
+        placeholder: (context, url) => _buildPlaceholder(),
+        errorWidget: (context, url, error) => _buildPlaceholder(),
+      ),
+    );
+  }
+
+  Widget _buildPlaceholder() {
+    return Container(
+      width: 60,
+      height: 90,
+      decoration: BoxDecoration(
+        color: Colors.grey[850],
+        borderRadius: BorderRadius.circular(6),
+      ),
+      child: const AppIcon(
+        Symbols.movie_rounded,
+        fill: 1,
+        color: Colors.grey,
+        size: 24,
+      ),
+    );
+  }
+
+  String _buildSubtitle() {
+    final item = widget.item;
+    final itemType = item.type.toLowerCase();
+
+    if (itemType == 'episode') {
+      // For episodes, show "S#E# - Episode Title"
+      final season = item.parentIndex;
+      final episode = item.index;
+      if (season != null && episode != null) {
+        return 'S${season}E$episode${item.displaySubtitle != null ? ' - ${item.displaySubtitle}' : ''}';
+      }
+      return item.displaySubtitle ?? t.discover.tvShow;
+    } else if (itemType == 'movie') {
+      // For movies, show year
+      return item.year?.toString() ?? t.discover.movie;
+    }
+
+    // Default to type
+    return item.type;
+  }
+}
diff --git a/lib/widgets/pin_entry_dialog.dart b/lib/screens/profile/pin_entry_dialog.dart
similarity index 91%
rename from lib/widgets/pin_entry_dialog.dart
rename to lib/screens/profile/pin_entry_dialog.dart
index c66e9167..7bc66a24 100644
--- a/lib/widgets/pin_entry_dialog.dart
+++ b/lib/screens/profile/pin_entry_dialog.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:flutter/services.dart';
-import '../i18n/strings.g.dart';
+import '../../i18n/strings.g.dart';
 
 /// Dialog for entering a PIN to access a protected profile
 class PinEntryDialog extends StatefulWidget {
@@ -86,8 +88,9 @@ class _PinEntryDialogState extends State<PinEntryDialog>
       child: AlertDialog(
         title: Row(
           children: [
-            Icon(
-              Icons.lock_outline,
+            AppIcon(
+              Symbols.lock_outline_rounded,
+              fill: 1,
               size: 24,
               color: theme.colorScheme.primary,
             ),
@@ -116,8 +119,11 @@ class _PinEntryDialogState extends State<PinEntryDialog>
                 errorText: widget.errorMessage,
                 errorMaxLines: 2,
                 suffixIcon: IconButton(
-                  icon: Icon(
-                    _obscureText ? Icons.visibility_off : Icons.visibility,
+                  icon: AppIcon(
+                    _obscureText
+                        ? Symbols.visibility_off_rounded
+                        : Symbols.visibility_rounded,
+                    fill: 1,
                     size: 20,
                   ),
                   onPressed: () {
diff --git a/lib/widgets/profile_list_tile.dart b/lib/screens/profile/profile_list_tile.dart
similarity index 65%
rename from lib/widgets/profile_list_tile.dart
rename to lib/screens/profile/profile_list_tile.dart
index ca806763..932b2172 100644
--- a/lib/widgets/profile_list_tile.dart
+++ b/lib/screens/profile/profile_list_tile.dart
@@ -1,7 +1,12 @@
 import 'package:flutter/material.dart';
-import '../models/plex_home_user.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../i18n/strings.g.dart';
+import '../../models/plex_home_user.dart';
 import 'user_avatar_widget.dart';
 
+enum UserAttribute { admin, restricted, protected }
+
 class ProfileListTile extends StatelessWidget {
   final PlexHomeUser user;
   final VoidCallback onTap;
@@ -34,7 +39,7 @@ class ProfileListTile extends StatelessWidget {
                 borderRadius: BorderRadius.circular(12),
               ),
               child: Text(
-                'CURRENT',
+                t.userStatus.current,
                 style: TextStyle(
                   fontSize: 10,
                   color: theme.colorScheme.onPrimary,
@@ -43,7 +48,9 @@ class ProfileListTile extends StatelessWidget {
                 ),
               ),
             )
-          : (showTrailingIcon ? const Icon(Icons.chevron_right) : null),
+          : (showTrailingIcon
+                ? const AppIcon(Symbols.chevron_right_rounded, fill: 1)
+                : null),
       onTap: isCurrentUser ? null : onTap,
       enabled: !isCurrentUser,
     );
@@ -55,21 +62,21 @@ class ProfileListTile extends StatelessWidget {
 
   List<Widget> _buildUserAttributes(ThemeData theme) {
     final attributes = <Widget>[];
-    final labels = <String>[];
+    final List<UserAttribute> userAttributes = [];
 
     if (user.isAdminUser) {
-      labels.add('Admin');
+      userAttributes.add(UserAttribute.admin);
     }
 
     if (user.isRestrictedUser && !user.isAdminUser) {
-      labels.add('Restricted');
+      userAttributes.add(UserAttribute.restricted);
     }
 
     if (user.requiresPassword) {
-      labels.add('Protected');
+      userAttributes.add(UserAttribute.protected);
     }
 
-    for (int i = 0; i < labels.length; i++) {
+    for (int i = 0; i < userAttributes.length; i++) {
       if (i > 0) {
         attributes.addAll([
           const SizedBox(width: 8),
@@ -84,12 +91,14 @@ class ProfileListTile extends StatelessWidget {
         ]);
       }
 
+      final attribute = userAttributes[i];
+
       attributes.add(
         Text(
-          labels[i],
+          _getAttributeLabel(attribute),
           style: TextStyle(
             fontSize: 12,
-            color: _getAttributeColor(labels[i], theme),
+            color: _getAttributeColor(attribute, theme),
             fontWeight: FontWeight.w500,
           ),
         ),
@@ -99,16 +108,25 @@ class ProfileListTile extends StatelessWidget {
     return attributes;
   }
 
-  Color _getAttributeColor(String attribute, ThemeData theme) {
+  String _getAttributeLabel(UserAttribute attribute) {
     switch (attribute) {
-      case 'Admin':
+      case UserAttribute.admin:
+        return t.userStatus.admin;
+      case UserAttribute.restricted:
+        return t.userStatus.restricted;
+      case UserAttribute.protected:
+        return t.userStatus.protected;
+    }
+  }
+
+  Color _getAttributeColor(UserAttribute attribute, ThemeData theme) {
+    switch (attribute) {
+      case UserAttribute.admin:
         return theme.colorScheme.primary;
-      case 'Restricted':
+      case UserAttribute.restricted:
         return theme.colorScheme.warning ?? Colors.orange;
-      case 'Protected':
+      case UserAttribute.protected:
         return theme.colorScheme.secondary;
-      default:
-        return theme.colorScheme.onSurface;
     }
   }
 }
diff --git a/lib/screens/profile_switch_screen.dart b/lib/screens/profile/profile_switch_screen.dart
similarity index 89%
rename from lib/screens/profile_switch_screen.dart
rename to lib/screens/profile/profile_switch_screen.dart
index 42f84707..42f0999d 100644
--- a/lib/screens/profile_switch_screen.dart
+++ b/lib/screens/profile/profile_switch_screen.dart
@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
-import '../models/plex_home_user.dart';
-import '../providers/user_profile_provider.dart';
-import '../utils/provider_extensions.dart';
-import '../widgets/profile_list_tile.dart';
-import '../widgets/desktop_app_bar.dart';
-import '../i18n/strings.g.dart';
+import '../../models/plex_home_user.dart';
+import '../../providers/user_profile_provider.dart';
+import '../../utils/provider_extensions.dart';
+import 'profile_list_tile.dart';
+import '../../widgets/desktop_app_bar.dart';
+import '../../i18n/strings.g.dart';
 
 class ProfileSwitchScreen extends StatelessWidget {
   const ProfileSwitchScreen({super.key});
@@ -54,8 +56,9 @@ class ProfileSwitchScreen extends StatelessWidget {
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        Icon(
-                          Icons.person_off,
+                        AppIcon(
+                          Symbols.person_off_rounded,
+                          fill: 1,
                           size: 64,
                           color: theme.colorScheme.onSurfaceVariant,
                         ),
diff --git a/lib/screens/profile/user_avatar_widget.dart b/lib/screens/profile/user_avatar_widget.dart
new file mode 100644
index 00000000..44118309
--- /dev/null
+++ b/lib/screens/profile/user_avatar_widget.dart
@@ -0,0 +1,242 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import '../../models/plex_home_user.dart';
+import '../../i18n/strings.g.dart';
+
+class UserAvatarWidget extends StatelessWidget {
+  final PlexHomeUser user;
+  final double size;
+  final bool showIndicators;
+  final bool useTextLabels;
+  final VoidCallback? onTap;
+
+  const UserAvatarWidget({
+    super.key,
+    required this.user,
+    this.size = 40,
+    this.showIndicators = true,
+    this.useTextLabels = false,
+    this.onTap,
+  });
+
+  Widget _buildPlaceholderAvatar(ThemeData theme) {
+    return Container(
+      width: size,
+      height: size,
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerHighest,
+        shape: BoxShape.circle,
+      ),
+      child: AppIcon(
+        Symbols.person_rounded,
+        fill: 1,
+        size: size * 0.6,
+        color: theme.colorScheme.onSurfaceVariant,
+      ),
+    );
+  }
+
+  /// Helper method to build a circular badge with an icon
+  ///
+  /// [icon] - The icon to display in the badge
+  /// [color] - The background color of the badge
+  /// [iconColor] - The color of the icon
+  /// [position] - The position of the badge ('topRight' or 'bottomRight')
+  /// [sizeRatio] - The size ratio relative to the avatar size (default 0.3)
+  Widget _buildBadge({
+    required BuildContext context,
+    required IconData icon,
+    required Color color,
+    required Color iconColor,
+    required String position,
+    double sizeRatio = 0.3,
+  }) {
+    final badgeSize = size * sizeRatio;
+    final iconSize =
+        size * (sizeRatio * 0.67); // Approximately 2/3 of badge size
+
+    return Positioned(
+      top: position == 'topRight' ? 0 : null,
+      bottom: position == 'bottomRight' ? 0 : null,
+      right: 0,
+      child: Container(
+        width: badgeSize,
+        height: badgeSize,
+        decoration: BoxDecoration(
+          color: color,
+          shape: BoxShape.circle,
+          border: Border.all(
+            color: Theme.of(context).colorScheme.surface,
+            width: 1,
+          ),
+        ),
+        child: AppIcon(icon, fill: 1, size: iconSize, color: iconColor),
+      ),
+    );
+  }
+
+  /// Helper method to build a text label chip
+  ///
+  /// [text] - The text to display in the chip
+  /// [backgroundColor] - The background color of the chip
+  /// [textColor] - The color of the text
+  Widget _buildLabelChip({
+    required BuildContext context,
+    required String text,
+    required Color backgroundColor,
+    required Color textColor,
+  }) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+      decoration: BoxDecoration(
+        color: backgroundColor,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Text(
+        text,
+        style: Theme.of(context).textTheme.labelSmall?.copyWith(
+          color: textColor,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+    );
+  }
+
+  List<Widget> _buildTextLabels(BuildContext context, ThemeData theme) {
+    if (!useTextLabels || !showIndicators) return [];
+
+    final labels = <Widget>[];
+
+    if (user.isAdminUser) {
+      labels.add(
+        _buildLabelChip(
+          context: context,
+          text: t.userStatus.admin,
+          backgroundColor: theme.colorScheme.primary,
+          textColor: theme.colorScheme.onPrimary,
+        ),
+      );
+    }
+
+    if (user.isRestrictedUser && !user.isAdminUser) {
+      labels.add(
+        _buildLabelChip(
+          context: context,
+          text: t.userStatus.restricted,
+          backgroundColor: theme.colorScheme.warning ?? Colors.orange,
+          textColor: theme.colorScheme.onPrimary,
+        ),
+      );
+    }
+
+    if (user.requiresPassword) {
+      labels.add(
+        _buildLabelChip(
+          context: context,
+          text: t.userStatus.protected,
+          backgroundColor: theme.colorScheme.secondary,
+          textColor: theme.colorScheme.onSecondary,
+        ),
+      );
+    }
+
+    if (labels.isEmpty) return [];
+
+    return [
+      const SizedBox(height: 4),
+      Wrap(
+        spacing: 4,
+        runSpacing: 2,
+        alignment: WrapAlignment.center,
+        children: labels,
+      ),
+    ];
+  }
+
+  Widget _buildAvatar(BuildContext context, ThemeData theme) {
+    return SizedBox(
+      width: size,
+      height: size,
+      child: Stack(
+        children: [
+          // Avatar image
+          ClipOval(
+            child: CachedNetworkImage(
+              imageUrl: user.thumb,
+              width: size,
+              height: size,
+              fit: BoxFit.cover,
+              placeholder: (ctx, url) => _buildPlaceholderAvatar(theme),
+              errorWidget: (ctx, url, error) => _buildPlaceholderAvatar(theme),
+            ),
+          ),
+
+          // Indicators (only show icon indicators when not using text labels)
+          if (showIndicators && !useTextLabels) ...[
+            // Admin badge
+            if (user.isAdminUser)
+              _buildBadge(
+                context: context,
+                icon: Symbols.admin_panel_settings_rounded,
+                color: theme.colorScheme.primary,
+                iconColor: theme.colorScheme.onPrimary,
+                position: 'topRight',
+              ),
+
+            // Restricted badge
+            if (user.isRestrictedUser && !user.isAdminUser)
+              _buildBadge(
+                context: context,
+                icon: Symbols.security_rounded,
+                color: theme.colorScheme.warning ?? Colors.orange,
+                iconColor: theme.colorScheme.onPrimary,
+                position: 'topRight',
+              ),
+
+            // Password indicator
+            if (user.requiresPassword)
+              _buildBadge(
+                context: context,
+                icon: Symbols.lock_rounded,
+                color: theme.colorScheme.secondary,
+                iconColor: theme.colorScheme.onSecondary,
+                position: 'bottomRight',
+                sizeRatio: 0.25,
+              ),
+          ],
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    if (useTextLabels) {
+      // Return avatar with text labels below
+      return GestureDetector(
+        onTap: onTap,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            _buildAvatar(context, theme),
+            ..._buildTextLabels(context, theme),
+          ],
+        ),
+      );
+    } else {
+      // Return just the avatar (original behavior)
+      return GestureDetector(onTap: onTap, child: _buildAvatar(context, theme));
+    }
+  }
+}
+
+// Extension to add warning color to ColorScheme if not available
+extension ColorSchemeExtension on ColorScheme {
+  Color? get warning => brightness == Brightness.light
+      ? Colors.orange.shade600
+      : Colors.orange.shade400;
+}
diff --git a/lib/screens/search_screen.dart b/lib/screens/search_screen.dart
index 2764664e..0462147e 100644
--- a/lib/screens/search_screen.dart
+++ b/lib/screens/search_screen.dart
@@ -1,17 +1,16 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
+import 'package:rate_limiter/rate_limiter.dart';
 
-import '../client/plex_client.dart';
 import '../i18n/strings.g.dart';
-import '../mixins/item_updatable.dart';
 import '../mixins/refreshable.dart';
 import '../models/plex_metadata.dart';
+import '../providers/multi_server_provider.dart';
 import '../providers/settings_provider.dart';
-import '../services/settings_service.dart';
 import '../utils/app_logger.dart';
-import '../utils/provider_extensions.dart';
+import '../utils/sliver_adaptive_media_builder.dart';
 import '../widgets/desktop_app_bar.dart';
 import '../widgets/media_card.dart';
 
@@ -23,38 +22,43 @@ class SearchScreen extends StatefulWidget {
 }
 
 class _SearchScreenState extends State<SearchScreen>
-    with Refreshable, ItemUpdatable {
-  @override
-  PlexClient get client => context.clientSafe;
-
+    with Refreshable, FullRefreshable, SearchInputFocusable {
   final _searchController = TextEditingController();
+  final _searchFocusNode = FocusNode(debugLabel: 'SearchInput');
   List<PlexMetadata> _searchResults = [];
   bool _isSearching = false;
   bool _hasSearched = false;
-  Timer? _debounceTimer;
+  late final Debounce _searchDebounce;
   String _lastSearchedQuery = '';
 
   @override
   void initState() {
     super.initState();
+    _searchDebounce = debounce(
+      _performSearch,
+      const Duration(milliseconds: 500),
+    );
     _searchController.addListener(_onSearchChanged);
+    // Focus the search input when the screen is shown
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _searchFocusNode.requestFocus();
+    });
   }
 
   @override
   void dispose() {
-    _debounceTimer?.cancel();
+    _searchDebounce.cancel();
     _searchController.removeListener(_onSearchChanged);
     _searchController.dispose();
+    _searchFocusNode.dispose();
     super.dispose();
   }
 
   void _onSearchChanged() {
-    // Cancel previous timer
-    _debounceTimer?.cancel();
-
     final query = _searchController.text;
 
     if (query.trim().isEmpty) {
+      _searchDebounce.cancel();
       setState(() {
         _searchResults = [];
         _hasSearched = false;
@@ -69,10 +73,7 @@ class _SearchScreenState extends State<SearchScreen>
       return;
     }
 
-    // Start new timer
-    _debounceTimer = Timer(const Duration(milliseconds: 500), () {
-      _performSearch(query);
-    });
+    _searchDebounce([query]);
   }
 
   Future<void> _performSearch(String query) async {
@@ -90,13 +91,18 @@ class _SearchScreenState extends State<SearchScreen>
     });
 
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
+      final multiServerProvider = Provider.of<MultiServerProvider>(
+        context,
+        listen: false,
+      );
+
+      if (!multiServerProvider.hasConnectedServers) {
+        throw Exception('No servers available');
       }
 
-      final results = await client.search(query);
+      // Search across all connected servers
+      final results = await multiServerProvider.aggregationService
+          .searchAcrossServers(query);
       if (mounted) {
         setState(() {
           _searchResults = results;
@@ -124,7 +130,16 @@ class _SearchScreenState extends State<SearchScreen>
     }
   }
 
+  /// Focus the search input field
+  @override
+  void focusSearchInput() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _searchFocusNode.requestFocus();
+    });
+  }
+
   // Public method to fully reload all content (for profile switches)
+  @override
   void fullRefresh() {
     appLogger.d(
       'SearchScreen.fullRefresh() called - clearing search and reloading',
@@ -139,13 +154,10 @@ class _SearchScreenState extends State<SearchScreen>
     });
   }
 
-  @override
-  void updateItemInLists(String ratingKey, PlexMetadata updatedMetadata) {
-    final index = _searchResults.indexWhere(
-      (item) => item.ratingKey == ratingKey,
-    );
-    if (index != -1) {
-      _searchResults[index] = updatedMetadata;
+  void updateItem(String ratingKey) {
+    // Trigger a refresh of the search to get updated metadata
+    if (_searchController.text.isNotEmpty) {
+      _performSearch(_searchController.text);
     }
   }
 
@@ -158,22 +170,43 @@ class _SearchScreenState extends State<SearchScreen>
             DesktopSliverAppBar(title: Text(t.screens.search), floating: true),
             SliverToBoxAdapter(
               child: Padding(
-                padding: const EdgeInsets.all(16),
-                child: SearchBar(
+                padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+                child: TextField(
                   controller: _searchController,
-                  hintText: t.search.hint,
-                  leading: const Icon(Icons.search),
-                  trailing: [
-                    if (_searchController.text.isNotEmpty)
-                      IconButton(
-                        icon: const Icon(Icons.clear),
-                        onPressed: () {
-                          _searchController.clear();
-                          // State update handled by listener
-                        },
-                      ),
-                  ],
-                  autoFocus: false,
+                  focusNode: _searchFocusNode,
+                  decoration: InputDecoration(
+                    hintText: t.search.hint,
+                    prefixIcon: const AppIcon(Symbols.search_rounded, fill: 1),
+                    suffixIcon: _searchController.text.isNotEmpty
+                        ? IconButton(
+                            icon: const AppIcon(Symbols.clear_rounded, fill: 1),
+                            onPressed: () {
+                              _searchController.clear();
+                              // State update handled by listener
+                            },
+                          )
+                        : null,
+                    filled: true,
+                    fillColor: Theme.of(
+                      context,
+                    ).colorScheme.surfaceContainerHighest,
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(100),
+                      borderSide: BorderSide.none,
+                    ),
+                    enabledBorder: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(100),
+                      borderSide: BorderSide.none,
+                    ),
+                    focusedBorder: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(100),
+                      borderSide: BorderSide.none,
+                    ),
+                    contentPadding: const EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 12,
+                    ),
+                  ),
                 ),
               ),
             ),
@@ -182,96 +215,37 @@ class _SearchScreenState extends State<SearchScreen>
                 child: Center(child: CircularProgressIndicator()),
               )
             else if (!_hasSearched)
-              SliverFillRemaining(
-                child: Center(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Icon(Icons.search, size: 80, color: Colors.grey.shade400),
-                      const SizedBox(height: 16),
-                      Text(
-                        t.search.searchYourMedia,
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          color: Colors.grey.shade600,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        t.search.enterTitleActorOrKeyword,
-                        style: TextStyle(color: Colors.grey.shade600),
-                      ),
-                    ],
-                  ),
-                ),
+              _SearchEmptyState(
+                icon: Symbols.search_rounded,
+                title: t.search.searchYourMedia,
+                subtitle: t.search.enterTitleActorOrKeyword,
               )
             else if (_searchResults.isEmpty)
-              SliverFillRemaining(
-                child: Center(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Icon(
-                        Icons.search_off,
-                        size: 80,
-                        color: Colors.grey.shade400,
-                      ),
-                      const SizedBox(height: 16),
-                      Text(
-                        t.messages.noResultsFound,
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          color: Colors.grey.shade600,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      Text(
-                        t.search.tryDifferentTerm,
-                        style: TextStyle(color: Colors.grey.shade600),
-                      ),
-                    ],
-                  ),
-                ),
+              _SearchEmptyState(
+                icon: Symbols.search_off_rounded,
+                title: t.messages.noResultsFound,
+                subtitle: t.search.tryDifferentTerm,
               )
             else
               Consumer<SettingsProvider>(
                 builder: (context, settingsProvider, child) {
-                  if (settingsProvider.viewMode == ViewMode.list) {
-                    return SliverPadding(
-                      padding: const EdgeInsets.all(16),
-                      sliver: SliverList(
-                        delegate: SliverChildBuilderDelegate((context, index) {
-                          final item = _searchResults[index];
-                          return MediaCard(
-                            key: Key(item.ratingKey),
-                            item: item,
-                            onRefresh: updateItem,
-                          );
-                        }, childCount: _searchResults.length),
-                      ),
-                    );
-                  } else {
-                    return SliverPadding(
-                      padding: const EdgeInsets.all(16),
-                      sliver: SliverGrid(
-                        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-                          maxCrossAxisExtent: _getMaxCrossAxisExtent(
-                            context,
-                            settingsProvider.libraryDensity,
-                          ),
-                          childAspectRatio: 2 / 3.3,
-                          crossAxisSpacing: 8,
-                          mainAxisSpacing: 8,
-                        ),
-                        delegate: SliverChildBuilderDelegate((context, index) {
-                          final item = _searchResults[index];
-                          return MediaCard(
-                            key: Key(item.ratingKey),
-                            item: item,
-                            onRefresh: updateItem,
-                          );
-                        }, childCount: _searchResults.length),
-                      ),
-                    );
-                  }
+                  return buildAdaptiveMediaSliverBuilder<PlexMetadata>(
+                    context: context,
+                    items: _searchResults,
+                    itemBuilder: (context, item, index) {
+                      return MediaCard(
+                        key: Key(item.ratingKey),
+                        item: item,
+                        onRefresh: updateItem,
+                      );
+                    },
+                    viewMode: settingsProvider.viewMode,
+                    density: settingsProvider.libraryDensity,
+                    padding: const EdgeInsets.all(16),
+                    childAspectRatio: 2 / 3.3,
+                    crossAxisSpacing: 8,
+                    mainAxisSpacing: 8,
+                  );
                 },
               ),
           ],
@@ -279,49 +253,40 @@ class _SearchScreenState extends State<SearchScreen>
       ),
     );
   }
+}
 
-  double _getMaxCrossAxisExtent(BuildContext context, LibraryDensity density) {
-    final screenWidth = MediaQuery.of(context).size.width;
-    final padding = 32.0; // 16px left + 16px right from SliverPadding
-    final availableWidth = screenWidth - padding;
+/// Empty state widget for search screen with icon, title, and subtitle.
+class _SearchEmptyState extends StatelessWidget {
+  final IconData icon;
+  final String title;
+  final String subtitle;
 
-    if (screenWidth >= 900) {
-      // Wide screens (desktop/large tablet landscape): Responsive division
-      double divisor;
-      double maxItemWidth;
+  const _SearchEmptyState({
+    required this.icon,
+    required this.title,
+    required this.subtitle,
+  });
 
-      switch (density) {
-        case LibraryDensity.comfortable:
-          divisor = 6.5;
-          maxItemWidth = 280;
-          break;
-        case LibraryDensity.normal:
-          divisor = 8.0;
-          maxItemWidth = 200;
-          break;
-        case LibraryDensity.compact:
-          divisor = 10.0;
-          maxItemWidth = 160;
-          break;
-      }
-
-      return (availableWidth / divisor).clamp(0, maxItemWidth);
-    } else if (screenWidth >= 600) {
-      // Medium screens (tablets): Fixed 4-5-6 items
-      int targetItemCount = switch (density) {
-        LibraryDensity.comfortable => 4,
-        LibraryDensity.normal => 5,
-        LibraryDensity.compact => 6,
-      };
-      return availableWidth / targetItemCount;
-    } else {
-      // Small screens (phones): Fixed 2-3-4 items
-      int targetItemCount = switch (density) {
-        LibraryDensity.comfortable => 2,
-        LibraryDensity.normal => 3,
-        LibraryDensity.compact => 4,
-      };
-      return availableWidth / targetItemCount;
-    }
+  @override
+  Widget build(BuildContext context) {
+    return SliverFillRemaining(
+      child: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            AppIcon(icon, fill: 1, size: 80, color: Colors.grey.shade400),
+            const SizedBox(height: 16),
+            Text(
+              title,
+              style: Theme.of(
+                context,
+              ).textTheme.titleLarge?.copyWith(color: Colors.grey.shade600),
+            ),
+            const SizedBox(height: 8),
+            Text(subtitle, style: TextStyle(color: Colors.grey.shade600)),
+          ],
+        ),
+      ),
+    );
   }
 }
diff --git a/lib/screens/season_detail_screen.dart b/lib/screens/season_detail_screen.dart
index 24995170..78897efc 100644
--- a/lib/screens/season_detail_screen.dart
+++ b/lib/screens/season_detail_screen.dart
@@ -1,11 +1,20 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
-import '../client/plex_client.dart';
+import '../../services/plex_client.dart';
+import '../focus/key_event_utils.dart';
+import '../focus/input_mode_tracker.dart';
+import '../models/download_status.dart';
+import '../providers/download_provider.dart';
+import '../services/download_storage_service.dart';
+import '../widgets/plex_optimized_image.dart';
 import '../models/plex_metadata.dart';
-import '../providers/plex_client_provider.dart';
 import '../utils/provider_extensions.dart';
 import '../utils/video_player_navigation.dart';
+import '../utils/duration_formatter.dart';
 import '../widgets/desktop_app_bar.dart';
 import '../widgets/media_context_menu.dart';
 import '../mixins/item_updatable.dart';
@@ -14,8 +23,13 @@ import '../i18n/strings.g.dart';
 
 class SeasonDetailScreen extends StatefulWidget {
   final PlexMetadata season;
+  final bool isOffline;
 
-  const SeasonDetailScreen({super.key, required this.season});
+  const SeasonDetailScreen({
+    super.key,
+    required this.season,
+    this.isOffline = false,
+  });
 
   @override
   State<SeasonDetailScreen> createState() => _SeasonDetailScreenState();
@@ -23,17 +37,31 @@ class SeasonDetailScreen extends StatefulWidget {
 
 class _SeasonDetailScreenState extends State<SeasonDetailScreen>
     with ItemUpdatable {
+  PlexClient? _client;
+
   @override
-  PlexClient get client => context.clientSafe;
+  PlexClient get client => _client!;
 
   List<PlexMetadata> _episodes = [];
   bool _isLoadingEpisodes = false;
   bool _watchStateChanged = false;
 
+  /// Get the correct PlexClient for this season's server
+  PlexClient? _getClientForSeason(BuildContext context) {
+    if (widget.isOffline || widget.season.serverId == null) {
+      return null;
+    }
+    return context.getClientForServer(widget.season.serverId!);
+  }
+
   @override
   void initState() {
     super.initState();
-    _loadEpisodes();
+    // Initialize the client once in initState
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _client = _getClientForSeason(context);
+      _loadEpisodes();
+    });
   }
 
   Future<void> _loadEpisodes() async {
@@ -41,14 +69,16 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
       _isLoadingEpisodes = true;
     });
 
+    if (widget.isOffline) {
+      // Load episodes from downloads
+      _loadEpisodesFromDownloads();
+      return;
+    }
+
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
-      }
+      // Episodes are automatically tagged with server info by PlexClient
+      final episodes = await _client!.getChildren(widget.season.ratingKey);
 
-      final episodes = await client.getChildren(widget.season.ratingKey);
       setState(() {
         _episodes = episodes;
         _isLoadingEpisodes = false;
@@ -60,6 +90,28 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
     }
   }
 
+  /// Load episodes from downloaded content
+  void _loadEpisodesFromDownloads() {
+    final downloadProvider = context.read<DownloadProvider>();
+
+    // Get all downloaded episodes for the show (grandparentRatingKey)
+    final allEpisodes = downloadProvider.getDownloadedEpisodesForShow(
+      widget.season.parentRatingKey ?? '',
+    );
+
+    // Filter to only this season's episodes
+    final seasonEpisodes =
+        allEpisodes
+            .where((ep) => ep.parentIndex == widget.season.index)
+            .toList()
+          ..sort((a, b) => (a.index ?? 0).compareTo(b.index ?? 0));
+
+    setState(() {
+      _episodes = seasonEpisodes;
+      _isLoadingEpisodes = false;
+    });
+  }
+
   @override
   Future<void> updateItem(String ratingKey) async {
     _watchStateChanged = true;
@@ -76,54 +128,152 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          CustomAppBar(
-            title: Text(widget.season.title),
-            pinned: true,
-            onBackPressed: () => Navigator.pop(context, _watchStateChanged),
-          ),
-          if (_isLoadingEpisodes)
-            const SliverFillRemaining(
-              child: Center(child: CircularProgressIndicator()),
-            )
-          else if (_episodes.isEmpty)
-            SliverFillRemaining(
-              child: Center(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Icon(
-                      Icons.movie_outlined,
-                      size: 64,
-                      color: tokens(context).textMuted,
-                    ),
-                    const SizedBox(height: 16),
-                    Text(
-                      t.messages.noEpisodesFoundGeneral,
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
+    return Focus(
+      onKeyEvent: (_, event) =>
+          handleBackKeyNavigation(context, event, result: _watchStateChanged),
+      child: Scaffold(
+        body: CustomScrollView(
+          slivers: [
+            CustomAppBar(
+              title: Text(widget.season.title),
+              pinned: true,
+              onBackPressed: () => Navigator.pop(context, _watchStateChanged),
+            ),
+            if (_isLoadingEpisodes)
+              const SliverFillRemaining(
+                child: Center(child: CircularProgressIndicator()),
+              )
+            else if (_episodes.isEmpty)
+              SliverFillRemaining(
+                child: Center(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      AppIcon(
+                        Symbols.movie_rounded,
+                        fill: 1,
+                        size: 64,
                         color: tokens(context).textMuted,
                       ),
-                    ),
-                  ],
+                      const SizedBox(height: 16),
+                      Text(
+                        t.messages.noEpisodesFoundGeneral,
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                          color: tokens(context).textMuted,
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
+              )
+            else
+              SliverList(
+                delegate: SliverChildBuilderDelegate((context, index) {
+                  final episode = _episodes[index];
+                  // Get local poster path for offline mode
+                  String? localPosterPath;
+                  if (widget.isOffline && episode.serverId != null) {
+                    final downloadProvider = context.read<DownloadProvider>();
+                    final globalKey =
+                        '${episode.serverId}:${episode.ratingKey}';
+                    // Get the artwork reference and convert to local file path
+                    final artworkRef = downloadProvider.getArtworkPaths(
+                      globalKey,
+                    );
+                    localPosterPath = artworkRef?.getLocalPath(
+                      DownloadStorageService.instance,
+                      episode.serverId!,
+                    );
+                  }
+                  return _EpisodeCard(
+                    episode: episode,
+                    client: _client,
+                    isOffline: widget.isOffline,
+                    localPosterPath: localPosterPath,
+                    autofocus:
+                        index == 0 && InputModeTracker.isKeyboardMode(context),
+                    onTap: () async {
+                      await navigateToVideoPlayer(
+                        context,
+                        metadata: episode,
+                        isOffline: widget.isOffline,
+                      );
+                      // Refresh episodes when returning from video player (skip if offline)
+                      if (!widget.isOffline) {
+                        _loadEpisodes();
+                      }
+                    },
+                    onRefresh: widget.isOffline ? null : updateItem,
+                  );
+                }, childCount: _episodes.length),
               ),
-            )
-          else
-            SliverList(
-              delegate: SliverChildBuilderDelegate((context, index) {
-                final episode = _episodes[index];
-                return _buildEpisodeCard(episode);
-              }, childCount: _episodes.length),
-            ),
-        ],
+          ],
+        ),
       ),
     );
   }
+}
 
-  Widget _buildEpisodeCard(PlexMetadata episode) {
+/// Episode card widget
+class _EpisodeCard extends StatelessWidget {
+  final PlexMetadata episode;
+  final PlexClient? client;
+  final VoidCallback onTap;
+  final Future<void> Function(String)? onRefresh;
+  final bool autofocus;
+  final bool isOffline;
+  final String? localPosterPath;
+
+  const _EpisodeCard({
+    required this.episode,
+    this.client,
+    required this.onTap,
+    this.onRefresh,
+    this.autofocus = false,
+    this.isOffline = false,
+    this.localPosterPath,
+  });
+
+  Widget _buildEpisodeMetaRow(BuildContext context) {
+    return Row(
+      children: [
+        if (episode.duration != null)
+          Text(
+            formatDurationTimestamp(Duration(milliseconds: episode.duration!)),
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: tokens(context).textMuted,
+              fontSize: 12,
+            ),
+          ),
+        // Hide watch status when offline (not tracked)
+        if (!isOffline && episode.duration != null && episode.isWatched) ...[
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 6),
+            child: Text(
+              '•',
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: tokens(context).textMuted,
+                fontSize: 12,
+              ),
+            ),
+          ),
+          Text(
+            '${t.discover.watched} ✓',
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: tokens(context).textMuted,
+              fontSize: 12,
+            ),
+          ),
+        ],
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Hide progress when offline (not tracked)
     final hasProgress =
+        !isOffline &&
         episode.viewOffset != null &&
         episode.duration != null &&
         episode.viewOffset! > 0;
@@ -132,15 +282,13 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
         : 0.0;
 
     return MediaContextMenu(
-      metadata: episode,
-      onRefresh: updateItem,
-      onTap: () async {
-        await navigateToVideoPlayer(context, metadata: episode);
-        // Refresh episodes when returning from video player
-        _loadEpisodes();
-      },
+      item: episode,
+      onRefresh: onRefresh,
+      onTap: onTap,
       child: InkWell(
         key: Key(episode.ratingKey),
+        autofocus: autofocus,
+        onTap: onTap,
         hoverColor: Theme.of(
           context,
         ).colorScheme.surface.withValues(alpha: 0.05),
@@ -163,49 +311,53 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
                       borderRadius: BorderRadius.circular(6),
                       child: AspectRatio(
                         aspectRatio: 16 / 9,
-                        child: episode.thumb != null
-                            ? Consumer<PlexClientProvider>(
-                                builder: (context, clientProvider, child) {
-                                  final client = clientProvider.client;
-                                  if (client == null) {
-                                    return Container(
+                        child: isOffline && localPosterPath != null
+                            ? Image.file(
+                                File(localPosterPath!),
+                                fit: BoxFit.cover,
+                                errorBuilder: (context, error, stackTrace) =>
+                                    Container(
                                       color: Theme.of(
                                         context,
                                       ).colorScheme.surfaceContainerHighest,
-                                      child: const Center(
-                                        child: Icon(Icons.movie, size: 40),
+                                      child: const AppIcon(
+                                        Symbols.movie_rounded,
+                                        fill: 1,
+                                        size: 32,
                                       ),
-                                    );
-                                  }
-                                  return CachedNetworkImage(
-                                    imageUrl: client.getThumbnailUrl(
-                                      episode.thumb,
                                     ),
-                                    filterQuality: FilterQuality.medium,
-                                    fit: BoxFit.cover,
-                                    placeholder: (context, url) => Container(
-                                      color: Theme.of(
-                                        context,
-                                      ).colorScheme.surfaceContainerHighest,
-                                    ),
-                                    errorWidget: (context, url, error) =>
-                                        Container(
-                                          color: Theme.of(
-                                            context,
-                                          ).colorScheme.surfaceContainerHighest,
-                                          child: const Icon(
-                                            Icons.movie,
-                                            size: 32,
-                                          ),
-                                        ),
-                                  );
-                                },
+                              )
+                            : episode.thumb != null
+                            ? PlexOptimizedImage.thumb(
+                                client: client,
+                                imagePath: episode.thumb,
+                                filterQuality: FilterQuality.medium,
+                                fit: BoxFit.cover,
+                                placeholder: (context, url) => Container(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.surfaceContainerHighest,
+                                ),
+                                errorWidget: (context, url, error) => Container(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.surfaceContainerHighest,
+                                  child: const AppIcon(
+                                    Symbols.movie_rounded,
+                                    fill: 1,
+                                    size: 32,
+                                  ),
+                                ),
                               )
                             : Container(
                                 color: Theme.of(
                                   context,
                                 ).colorScheme.surfaceContainerHighest,
-                                child: const Icon(Icons.movie, size: 32),
+                                child: const AppIcon(
+                                  Symbols.movie_rounded,
+                                  fill: 1,
+                                  size: 32,
+                                ),
                               ),
                       ),
                     ),
@@ -231,8 +383,9 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
                               color: Colors.black.withValues(alpha: 0.6),
                               shape: BoxShape.circle,
                             ),
-                            child: const Icon(
-                              Icons.play_arrow,
+                            child: const AppIcon(
+                              Symbols.play_arrow_rounded,
+                              fill: 1,
                               color: Colors.white,
                               size: 20,
                             ),
@@ -270,43 +423,166 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    // Episode number and title
-                    Row(
-                      children: [
-                        if (episode.index != null)
-                          Container(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 6,
-                              vertical: 3,
-                            ),
-                            decoration: BoxDecoration(
-                              color: Theme.of(
-                                context,
-                              ).colorScheme.primaryContainer,
-                              borderRadius: BorderRadius.circular(3),
-                            ),
-                            child: Text(
-                              'E${episode.index}',
-                              style: TextStyle(
-                                color: Theme.of(
-                                  context,
-                                ).colorScheme.onPrimaryContainer,
-                                fontSize: 11,
-                                fontWeight: FontWeight.w600,
+                    // Episode number and title with download status
+                    Consumer<DownloadProvider>(
+                      builder: (context, downloadProvider, _) {
+                        // Build download status icon based on state
+                        Widget? downloadStatusIcon;
+
+                        // Only show download status in online mode
+                        if (!isOffline && episode.serverId != null) {
+                          final globalKey =
+                              '${episode.serverId}:${episode.ratingKey}';
+                          final progress = downloadProvider.getProgress(
+                            globalKey,
+                          );
+                          final isQueueing = downloadProvider.isQueueing(
+                            globalKey,
+                          );
+
+                          // Helper to get status-specific muted color
+                          Color getMutedColor(Color baseColor) {
+                            return Color.lerp(
+                              tokens(context).textMuted,
+                              baseColor,
+                              0.3, // 30% of the status color, 70% muted
+                            )!;
+                          }
+
+                          if (isQueueing) {
+                            // Queueing state - building queue
+                            downloadStatusIcon = SizedBox(
+                              width: 12,
+                              height: 12,
+                              child: CircularProgressIndicator(
+                                strokeWidth: 1.5,
+                                color: tokens(context).textMuted,
+                              ),
+                            );
+                          } else if (progress?.status ==
+                              DownloadStatus.queued) {
+                            // Queued state - waiting to download
+                            downloadStatusIcon = AppIcon(
+                              Symbols.schedule_rounded,
+                              fill: 1,
+                              size: 12,
+                              color: getMutedColor(Colors.orange),
+                            );
+                          } else if (progress?.status ==
+                              DownloadStatus.downloading) {
+                            // Downloading state - active download with radial progress
+                            downloadStatusIcon = SizedBox(
+                              width: 14,
+                              height: 14,
+                              child: Stack(
+                                alignment: Alignment.center,
+                                children: [
+                                  // Background circle
+                                  CircularProgressIndicator(
+                                  value: 1.0,
+                                  strokeWidth: 1.5,
+                                  valueColor: AlwaysStoppedAnimation<Color>(
+                                    getMutedColor(
+                                      Colors.blue,
+                                    ).withValues(alpha: 0.3),
+                                  ),
+                                ),
+                                  // Progress circle
+                                  CircularProgressIndicator(
+                                    value: progress?.progressPercent,
+                                    strokeWidth: 1.5,
+                                    valueColor: AlwaysStoppedAnimation<Color>(
+                                      getMutedColor(Colors.blue),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            );
+                          } else if (progress?.status ==
+                              DownloadStatus.paused) {
+                            // Paused state - download paused
+                            downloadStatusIcon = AppIcon(
+                              Symbols.pause_circle_outline_rounded,
+                              fill: 1,
+                              size: 12,
+                              color: getMutedColor(Colors.amber),
+                            );
+                          } else if (progress?.status ==
+                              DownloadStatus.failed) {
+                            // Failed state - download failed
+                            downloadStatusIcon = AppIcon(
+                              Symbols.error_outline_rounded,
+                              fill: 1,
+                              size: 12,
+                              color: getMutedColor(Colors.red),
+                            );
+                          } else if (progress?.status ==
+                              DownloadStatus.cancelled) {
+                            // Cancelled state - download cancelled
+                            downloadStatusIcon = AppIcon(
+                              Symbols.cancel_rounded,
+                              fill: 1,
+                              size: 12,
+                              color: getMutedColor(Colors.grey),
+                            );
+                          } else if (progress?.status ==
+                              DownloadStatus.completed) {
+                            // Completed state - download complete
+                            downloadStatusIcon = AppIcon(
+                              Symbols.file_download_done_rounded,
+                              fill: 1,
+                              size: 12,
+                              color: getMutedColor(Colors.green),
+                            );
+                          }
+                          // Note: No icon shown if not downloaded (null)
+                        }
+
+                        return Row(
+                          children: [
+                            // Episode number badge
+                            if (episode.index != null)
+                              Container(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 6,
+                                  vertical: 3,
+                                ),
+                                decoration: BoxDecoration(
+                                  color: Theme.of(
+                                    context,
+                                  ).colorScheme.primaryContainer,
+                                  borderRadius: BorderRadius.circular(3),
+                                ),
+                                child: Text(
+                                  'E${episode.index}',
+                                  style: TextStyle(
+                                    color: Theme.of(
+                                      context,
+                                    ).colorScheme.onPrimaryContainer,
+                                    fontSize: 11,
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                              ),
+                            // Download status icon (if present)
+                            if (downloadStatusIcon != null) ...[
+                              const SizedBox(width: 6),
+                              downloadStatusIcon,
+                            ],
+                            const SizedBox(width: 8),
+                            // Episode title
+                            Expanded(
+                              child: Text(
+                                episode.title,
+                                style: Theme.of(context).textTheme.titleSmall
+                                    ?.copyWith(fontWeight: FontWeight.bold),
+                                maxLines: 2,
+                                overflow: TextOverflow.ellipsis,
                               ),
                             ),
-                          ),
-                        const SizedBox(width: 8),
-                        Expanded(
-                          child: Text(
-                            episode.title,
-                            style: Theme.of(context).textTheme.titleSmall
-                                ?.copyWith(fontWeight: FontWeight.bold),
-                            maxLines: 2,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                      ],
+                          ],
+                        );
+                      },
                     ),
 
                     // Summary
@@ -326,40 +602,7 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
 
                     // Metadata row (duration, watched status)
                     const SizedBox(height: 8),
-                    Row(
-                      children: [
-                        if (episode.duration != null)
-                          Text(
-                            _formatDuration(episode.duration!),
-                            style: Theme.of(context).textTheme.bodySmall
-                                ?.copyWith(
-                                  color: tokens(context).textMuted,
-                                  fontSize: 12,
-                                ),
-                          ),
-                        if (episode.duration != null && episode.isWatched) ...[
-                          Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 6),
-                            child: Text(
-                              '•',
-                              style: Theme.of(context).textTheme.bodySmall
-                                  ?.copyWith(
-                                    color: tokens(context).textMuted,
-                                    fontSize: 12,
-                                  ),
-                            ),
-                          ),
-                          Text(
-                            'Watched ✓',
-                            style: Theme.of(context).textTheme.bodySmall
-                                ?.copyWith(
-                                  color: tokens(context).textMuted,
-                                  fontSize: 12,
-                                ),
-                          ),
-                        ],
-                      ],
-                    ),
+                    _buildEpisodeMetaRow(context),
                   ],
                 ),
               ),
@@ -369,17 +612,4 @@ class _SeasonDetailScreenState extends State<SeasonDetailScreen>
       ),
     );
   }
-
-  String _formatDuration(int milliseconds) {
-    final duration = Duration(milliseconds: milliseconds);
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-    final seconds = duration.inSeconds.remainder(60);
-
-    if (hours > 0) {
-      return '$hours:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-    } else {
-      return '$minutes:${seconds.toString().padLeft(2, '0')}';
-    }
-  }
 }
diff --git a/lib/screens/server_selection_screen.dart b/lib/screens/server_selection_screen.dart
deleted file mode 100644
index 8f142ca2..00000000
--- a/lib/screens/server_selection_screen.dart
+++ /dev/null
@@ -1,321 +0,0 @@
-import 'dart:convert';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import '../i18n/strings.g.dart';
-import '../services/plex_auth_service.dart';
-import '../services/storage_service.dart';
-import '../services/server_connection_service.dart';
-import '../widgets/server_list_tile.dart';
-import '../widgets/desktop_app_bar.dart';
-import '../utils/app_logger.dart';
-import '../utils/provider_extensions.dart';
-import 'main_screen.dart';
-
-class ServerSelectionScreen extends StatefulWidget {
-  final PlexAuthService authService;
-  final String plexToken;
-
-  const ServerSelectionScreen({
-    super.key,
-    required this.authService,
-    required this.plexToken,
-  });
-
-  @override
-  State<ServerSelectionScreen> createState() => _ServerSelectionScreenState();
-}
-
-class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
-  List<PlexServer>? _servers;
-  bool _isLoading = true;
-  String? _errorMessage;
-  String? _currentServerUrl;
-  List<Map<String, dynamic>>? _debugServerData;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadCurrentServerUrl();
-    _loadServers();
-  }
-
-  Future<void> _loadCurrentServerUrl() async {
-    try {
-      final storage = await StorageService.getInstance();
-      setState(() {
-        _currentServerUrl = storage.getServerUrl();
-      });
-    } catch (e) {
-      appLogger.w('Failed to load current server URL', error: e);
-    }
-  }
-
-  Future<void> _loadServers() async {
-    try {
-      final servers = await widget.authService.fetchServers(widget.plexToken);
-      setState(() {
-        _servers = servers;
-        _isLoading = false;
-        _debugServerData = null; // Clear any previous debug data
-      });
-    } catch (e) {
-      setState(() {
-        _errorMessage = _getErrorMessage(e);
-        _isLoading = false;
-        // Store debug data if it's a parsing exception
-        if (e is ServerParsingException) {
-          _debugServerData = e.invalidServerData;
-        } else {
-          _debugServerData = null;
-        }
-      });
-      appLogger.e('Failed to load servers', error: e);
-    }
-  }
-
-  String _getErrorMessage(dynamic error) {
-    if (error is ServerParsingException) {
-      return t.serverSelection.malformedServerData(
-        count: error.invalidServerData.length,
-      );
-    } else if (error is FormatException) {
-      // Handle JSON parsing errors with more user-friendly messages
-      if (error.message.contains('Invalid server data')) {
-        return t.serverSelection.incompleteServerInfo;
-      } else if (error.message.contains('Invalid connection data')) {
-        return t.serverSelection.incompleteConnectionInfo;
-      }
-      return t.serverSelection.malformedServerInfo(message: error.message);
-    } else if (error.toString().contains('SocketException') ||
-        error.toString().contains('TimeoutException')) {
-      return t.serverSelection.networkConnectionFailed;
-    } else if (error.toString().contains('401') ||
-        error.toString().contains('Unauthorized')) {
-      return t.serverSelection.authenticationFailed;
-    } else if (error.toString().contains('404') ||
-        error.toString().contains('Not Found')) {
-      return t.serverSelection.plexServiceUnavailable;
-    }
-
-    return t.serverSelection.failedToLoadServers(error: error.toString());
-  }
-
-  Future<void> _copyDebugDataToClipboard() async {
-    if (_debugServerData == null) return;
-
-    final jsonString = const JsonEncoder.withIndent(
-      '  ',
-    ).convert(_debugServerData);
-    await Clipboard.setData(ClipboardData(text: jsonString));
-
-    if (mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(t.serverSelection.serverDebugCopied)),
-      );
-    }
-  }
-
-  Future<void> _selectServer(PlexServer server) async {
-    // Show loading dialog
-    if (mounted) {
-      showDialog(
-        context: context,
-        barrierDismissible: false,
-        builder: (context) => AlertDialog(
-          content: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              CircularProgressIndicator(),
-              SizedBox(height: 16),
-              Text(t.serverSelection.connectingToServer),
-            ],
-          ),
-        ),
-      );
-    }
-
-    try {
-      // Get client identifier and storage
-      final storage = await StorageService.getInstance();
-      final clientId =
-          storage.getClientIdentifier() ?? widget.authService.clientIdentifier;
-
-      // Get current profile context to maintain profile across server switch
-      final currentUserUUID = storage.getCurrentUserUUID();
-
-      PlexServer serverWithCorrectToken = server;
-
-      // If we have a current profile, get a profile-specific token for this server
-      if (currentUserUUID != null) {
-        try {
-          // Switch to the current profile on the new server to get the correct token
-          final switchResponse = await widget.authService.switchToUser(
-            currentUserUUID,
-            widget.plexToken,
-          );
-
-          // Get servers with the profile's Plex.tv token to get profile-specific server tokens
-          final servers = await widget.authService.fetchServers(
-            switchResponse.authToken,
-          );
-
-          // Find the matching server with the profile-specific token
-          final matchingServer = servers.firstWhere(
-            (s) =>
-                s.name == server.name ||
-                s.clientIdentifier == server.clientIdentifier,
-            orElse: () => server, // Fallback to original server
-          );
-
-          serverWithCorrectToken = matchingServer;
-          appLogger.d(
-            'Got profile-specific token for server ${server.name} and user UUID $currentUserUUID',
-          );
-        } catch (e) {
-          appLogger.w(
-            'Failed to get profile-specific token, using default server token',
-            error: e,
-          );
-          // Continue with original server token as fallback
-        }
-      }
-
-      // Connect using the server with the correct token
-      final result = await ServerConnectionService.connectToServer(
-        serverWithCorrectToken,
-        clientIdentifier: clientId,
-        plexToken: widget.plexToken,
-      );
-
-      // Close loading dialog
-      if (mounted) {
-        Navigator.pop(context);
-      }
-
-      // Handle result
-      if (result.isSuccess) {
-        // Set client in provider before navigation (same pattern as auto-login)
-        if (mounted) {
-          context.plexClient.setClient(result.client!);
-
-          // Navigate to main app and clear navigation stack
-          Navigator.pushAndRemoveUntil(
-            context,
-            MaterialPageRoute(
-              builder: (context) => MainScreen(client: result.client!),
-            ),
-            (route) => false, // Remove all routes
-          );
-        }
-      } else {
-        // Show error
-        if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(result.error ?? t.errors.connectionFailedGeneric),
-            ),
-          );
-        }
-      }
-    } catch (e) {
-      // Close loading dialog on error
-      if (mounted) {
-        Navigator.pop(context);
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(t.messages.errorLoading(error: e.toString()))),
-        );
-      }
-      appLogger.e('Server selection failed', error: e);
-    }
-  }
-
-  bool _isCurrentServer(PlexServer server) {
-    if (_currentServerUrl == null) return false;
-
-    // Check all server connections to see if any match the current server URL
-    for (final connection in server.connections) {
-      if (connection.uri == _currentServerUrl) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          CustomAppBar(title: Text(t.screens.selectServer)),
-          SliverFillRemaining(
-            child: _isLoading
-                ? const Center(child: CircularProgressIndicator())
-                : _errorMessage != null
-                ? Center(
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 24),
-                          child: Text(
-                            _errorMessage!,
-                            style: TextStyle(
-                              color: Theme.of(context).colorScheme.error,
-                            ),
-                            textAlign: TextAlign.center,
-                          ),
-                        ),
-                        const SizedBox(height: 16),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            ElevatedButton(
-                              onPressed: _loadServers,
-                              child: Text(t.common.retry),
-                            ),
-                            if (_debugServerData != null) ...[
-                              const SizedBox(width: 16),
-                              OutlinedButton.icon(
-                                onPressed: _copyDebugDataToClipboard,
-                                icon: const Icon(Icons.copy),
-                                label: Text(t.serverSelection.copyDebugData),
-                              ),
-                            ],
-                          ],
-                        ),
-                        if (_debugServerData != null) ...[
-                          const SizedBox(height: 12),
-                          Text(
-                            'Debug data available for ${_debugServerData!.length} server(s)',
-                            style: Theme.of(context).textTheme.bodySmall,
-                          ),
-                        ],
-                      ],
-                    ),
-                  )
-                : _servers == null || _servers!.isEmpty
-                ? Center(child: Text(t.serverSelection.noServersFound))
-                : ListView.builder(
-                    itemCount: _servers!.length,
-                    padding: const EdgeInsets.all(16),
-                    itemBuilder: (context, index) {
-                      final server = _servers![index];
-                      final isCurrentServer = _isCurrentServer(server);
-                      return Padding(
-                        padding: const EdgeInsets.only(bottom: 8),
-                        child: Card(
-                          child: ServerListTile(
-                            server: server,
-                            isCurrentServer: isCurrentServer,
-                            onTap: () => _selectServer(server),
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/screens/settings/about_screen.dart b/lib/screens/settings/about_screen.dart
new file mode 100644
index 00000000..854f8068
--- /dev/null
+++ b/lib/screens/settings/about_screen.dart
@@ -0,0 +1,105 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import '../../widgets/focused_scroll_scaffold.dart';
+import '../../i18n/strings.g.dart';
+import 'licenses_screen.dart';
+
+class AboutScreen extends StatefulWidget {
+  const AboutScreen({super.key});
+
+  @override
+  State<AboutScreen> createState() => _AboutScreenState();
+}
+
+class _AboutScreenState extends State<AboutScreen> {
+  String _appName = '';
+  String _appVersion = '';
+
+  @override
+  void initState() {
+    super.initState();
+    _loadPackageInfo();
+  }
+
+  Future<void> _loadPackageInfo() async {
+    final packageInfo = await PackageInfo.fromPlatform();
+    setState(() {
+      _appName = t.app.title;
+      _appVersion = packageInfo.version;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final appName = _appName;
+    final appVersion = _appVersion;
+
+    return FocusedScrollScaffold(
+      title: Text(t.about.title),
+      slivers: [
+        SliverPadding(
+          padding: const EdgeInsets.all(16),
+          sliver: SliverList(
+            delegate: SliverChildListDelegate([
+              // App Icon and Name
+              Center(
+                child: Column(
+                  children: [
+                    const SizedBox(height: 24),
+                    Image.asset('assets/plezy.png', width: 80, height: 80),
+                    const SizedBox(height: 16),
+                    Text(
+                      appName,
+                      style: Theme.of(context).textTheme.headlineMedium
+                          ?.copyWith(fontWeight: FontWeight.bold),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      t.about.versionLabel(version: appVersion),
+                      style: Theme.of(
+                        context,
+                      ).textTheme.bodyMedium?.copyWith(color: Colors.grey),
+                    ),
+                    const SizedBox(height: 24),
+                    Text(
+                      t.about.appDescription,
+                      style: Theme.of(context).textTheme.bodyLarge,
+                      textAlign: TextAlign.center,
+                    ),
+                  ],
+                ),
+              ),
+
+              const SizedBox(height: 40),
+
+              // Open Source Licenses
+              Card(
+                child: ListTile(
+                  leading: const AppIcon(Symbols.description_rounded, fill: 1),
+                  title: Text(t.about.openSourceLicenses),
+                  subtitle: Text(t.about.viewLicensesDescription),
+                  trailing: const AppIcon(
+                    Symbols.chevron_right_rounded,
+                    fill: 1,
+                  ),
+                  onTap: () {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => const LicensesScreen(),
+                      ),
+                    );
+                  },
+                ),
+              ),
+
+              const SizedBox(height: 24),
+            ]),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/hotkey_recorder_widget.dart b/lib/screens/settings/hotkey_recorder_widget.dart
similarity index 91%
rename from lib/widgets/hotkey_recorder_widget.dart
rename to lib/screens/settings/hotkey_recorder_widget.dart
index b9029099..ca31d047 100644
--- a/lib/widgets/hotkey_recorder_widget.dart
+++ b/lib/screens/settings/hotkey_recorder_widget.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
-import '../i18n/strings.g.dart';
+import '../../i18n/strings.g.dart';
 
 class HotKeyRecorderWidget extends StatefulWidget {
   final String actionName;
@@ -71,7 +73,11 @@ class _HotKeyRecorderWidgetState extends State<HotKeyRecorderWidget> {
                     ),
                     if (_recordedHotKey != null)
                       IconButton(
-                        icon: const Icon(Icons.backspace, size: 18),
+                        icon: const AppIcon(
+                          Symbols.backspace_rounded,
+                          fill: 1,
+                          size: 18,
+                        ),
                         onPressed: () {
                           setState(() {
                             _recordedHotKey = null;
diff --git a/lib/screens/settings/licenses_screen.dart b/lib/screens/settings/licenses_screen.dart
new file mode 100644
index 00000000..1a4c4047
--- /dev/null
+++ b/lib/screens/settings/licenses_screen.dart
@@ -0,0 +1,227 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../widgets/focused_scroll_scaffold.dart';
+import '../../i18n/strings.g.dart';
+
+class MergedLicenseEntry {
+  final String packageName;
+  final List<LicenseEntry> licenseEntries;
+  final Set<String> allPackageNames;
+
+  MergedLicenseEntry({
+    required this.packageName,
+    required this.licenseEntries,
+    required this.allPackageNames,
+  });
+}
+
+class LicensesScreen extends StatefulWidget {
+  const LicensesScreen({super.key});
+
+  @override
+  State<LicensesScreen> createState() => _LicensesScreenState();
+}
+
+class _LicensesScreenState extends State<LicensesScreen> {
+  List<MergedLicenseEntry> _mergedLicenses = [];
+  bool _isLoading = true;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadLicenses();
+  }
+
+  Future<void> _loadLicenses() async {
+    final licenseMap = <String, List<LicenseEntry>>{};
+    final allPackageNames = <String, Set<String>>{};
+
+    await for (final license in LicenseRegistry.licenses) {
+      for (final packageName in license.packages) {
+        if (!licenseMap.containsKey(packageName)) {
+          licenseMap[packageName] = [];
+          allPackageNames[packageName] = <String>{};
+        }
+        licenseMap[packageName]!.add(license);
+        allPackageNames[packageName]!.addAll(license.packages);
+      }
+    }
+
+    final mergedLicenses = licenseMap.entries.map((entry) {
+      return MergedLicenseEntry(
+        packageName: entry.key,
+        licenseEntries: entry.value,
+        allPackageNames: allPackageNames[entry.key]!,
+      );
+    }).toList();
+
+    mergedLicenses.sort((a, b) => a.packageName.compareTo(b.packageName));
+
+    if (mounted) {
+      setState(() {
+        _mergedLicenses = mergedLicenses;
+        _isLoading = false;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_isLoading) {
+      return FocusedScrollScaffold(
+        title: Text(t.screens.licenses),
+        slivers: const [
+          SliverFillRemaining(
+            child: Center(child: CircularProgressIndicator()),
+          ),
+        ],
+      );
+    }
+
+    return FocusedScrollScaffold(
+      title: Text(t.screens.licenses),
+      slivers: [
+        SliverPadding(
+          padding: const EdgeInsets.all(16),
+          sliver: SliverList(
+            delegate: SliverChildBuilderDelegate((context, index) {
+              final mergedLicense = _mergedLicenses[index];
+              final packageName = mergedLicense.packageName;
+
+              return Card(
+                margin: const EdgeInsets.only(bottom: 8),
+                child: ListTile(
+                  title: Text(
+                    packageName,
+                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  subtitle: mergedLicense.licenseEntries.length > 1
+                      ? Text(
+                          t.licenses.licensesCount(
+                            count: mergedLicense.licenseEntries.length,
+                          ),
+                        )
+                      : null,
+                  trailing: const AppIcon(
+                    Symbols.chevron_right_rounded,
+                    fill: 1,
+                  ),
+                  onTap: () => _showLicenseDetail(mergedLicense),
+                ),
+              );
+            }, childCount: _mergedLicenses.length),
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _showLicenseDetail(MergedLicenseEntry mergedLicense) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) =>
+            _LicenseDetailScreen(mergedLicense: mergedLicense),
+      ),
+    );
+  }
+}
+
+class _LicenseDetailScreen extends StatelessWidget {
+  final MergedLicenseEntry mergedLicense;
+
+  const _LicenseDetailScreen({required this.mergedLicense});
+
+  @override
+  Widget build(BuildContext context) {
+    final packageName = mergedLicense.packageName;
+    final licenseEntries = mergedLicense.licenseEntries;
+
+    return FocusedScrollScaffold(
+      title: Text(packageName),
+      slivers: [
+        SliverPadding(
+          padding: const EdgeInsets.all(16),
+          sliver: SliverList(
+            delegate: SliverChildListDelegate([
+              // Package info card
+              if (mergedLicense.allPackageNames.length > 1)
+                Card(
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          t.licenses.relatedPackages,
+                          style: Theme.of(context).textTheme.titleMedium
+                              ?.copyWith(fontWeight: FontWeight.bold),
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          mergedLicense.allPackageNames.join(', '),
+                          style: Theme.of(context).textTheme.bodyMedium,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              if (mergedLicense.allPackageNames.length > 1)
+                const SizedBox(height: 16),
+
+              // License cards
+              ...licenseEntries.asMap().entries.map((entry) {
+                final index = entry.key;
+                final license = entry.value;
+                final isMultipleLicenses = licenseEntries.length > 1;
+
+                return Column(
+                  children: [
+                    Card(
+                      child: Padding(
+                        padding: const EdgeInsets.all(16),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              isMultipleLicenses
+                                  ? t.licenses.licenseNumber(number: index + 1)
+                                  : t.licenses.license,
+                              style: Theme.of(context).textTheme.titleMedium
+                                  ?.copyWith(fontWeight: FontWeight.bold),
+                            ),
+                            const SizedBox(height: 16),
+                            ...license.paragraphs.map((paragraph) {
+                              return Padding(
+                                padding: const EdgeInsets.only(bottom: 16),
+                                child: SelectableText(
+                                  paragraph.text,
+                                  style: TextStyle(
+                                    fontFamily: paragraph.indent > 0
+                                        ? 'monospace'
+                                        : null,
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              );
+                            }),
+                          ],
+                        ),
+                      ),
+                    ),
+                    if (index < licenseEntries.length - 1)
+                      const SizedBox(height: 16),
+                  ],
+                );
+              }),
+            ]),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/screens/logs_screen.dart b/lib/screens/settings/logs_screen.dart
similarity index 74%
rename from lib/screens/logs_screen.dart
rename to lib/screens/settings/logs_screen.dart
index 6b91e738..47249113 100644
--- a/lib/screens/logs_screen.dart
+++ b/lib/screens/settings/logs_screen.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:flutter/services.dart';
 import 'package:logger/logger.dart';
-import '../i18n/strings.g.dart';
-import '../utils/app_logger.dart';
-import '../widgets/desktop_app_bar.dart';
+import '../../i18n/strings.g.dart';
+import '../../utils/app_logger.dart';
+import '../../widgets/desktop_app_bar.dart';
 
 class LogsScreen extends StatefulWidget {
   const LogsScreen({super.key});
@@ -91,16 +93,16 @@ class _LogsScreenState extends State<LogsScreen> {
     switch (level) {
       case Level.error:
       case Level.fatal:
-        return Icons.error;
+        return Symbols.error_rounded;
       case Level.warning:
-        return Icons.warning;
+        return Symbols.warning_rounded;
       case Level.info:
-        return Icons.info;
+        return Symbols.info_rounded;
       case Level.debug:
       case Level.trace:
-        return Icons.bug_report;
+        return Symbols.bug_report_rounded;
       default:
-        return Icons.circle;
+        return Symbols.circle_rounded;
     }
   }
 
@@ -114,17 +116,17 @@ class _LogsScreenState extends State<LogsScreen> {
             pinned: true,
             actions: [
               IconButton(
-                icon: const Icon(Icons.refresh),
+                icon: const AppIcon(Symbols.refresh_rounded, fill: 1),
                 onPressed: _loadLogs,
                 tooltip: t.common.refresh,
               ),
               IconButton(
-                icon: const Icon(Icons.copy),
+                icon: const AppIcon(Symbols.content_copy_rounded, fill: 1),
                 onPressed: _logs.isNotEmpty ? _copyAllLogs : null,
                 tooltip: t.logs.copyLogs,
               ),
               IconButton(
-                icon: const Icon(Icons.delete_outline),
+                icon: const AppIcon(Symbols.delete_outline_rounded, fill: 1),
                 onPressed: _logs.isNotEmpty ? _clearLogs : null,
                 tooltip: t.logs.clearLogs,
               ),
@@ -194,7 +196,12 @@ class _LogEntryCardState extends State<_LogEntryCard> {
               Row(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Icon(widget.levelIcon, color: widget.levelColor, size: 20),
+                  AppIcon(
+                    widget.levelIcon,
+                    fill: 1,
+                    color: widget.levelColor,
+                    size: 20,
+                  ),
                   const SizedBox(width: 8),
                   Expanded(
                     child: Column(
@@ -233,8 +240,11 @@ class _LogEntryCardState extends State<_LogEntryCard> {
                     ),
                   ),
                   if (hasErrorOrStackTrace)
-                    Icon(
-                      _isExpanded ? Icons.expand_less : Icons.expand_more,
+                    AppIcon(
+                      _isExpanded
+                          ? Symbols.expand_less_rounded
+                          : Symbols.expand_more_rounded,
+                      fill: 1,
                       color: Theme.of(
                         context,
                       ).iconTheme.color?.withValues(alpha: 0.6),
@@ -245,55 +255,16 @@ class _LogEntryCardState extends State<_LogEntryCard> {
                 const SizedBox(height: 12),
                 const Divider(),
                 const SizedBox(height: 8),
-                if (widget.log.error != null) ...[
-                  Text(
-                    t.logs.error,
-                    style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                      color: widget.levelColor,
-                      fontWeight: FontWeight.bold,
-                    ),
+                if (widget.log.error != null)
+                  _buildDetailSection(
+                    title: t.logs.error,
+                    content: widget.log.error.toString(),
                   ),
-                  const SizedBox(height: 4),
-                  Container(
-                    padding: const EdgeInsets.all(8),
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).brightness == Brightness.dark
-                          ? Colors.grey[900]
-                          : Colors.grey[200],
-                      borderRadius: BorderRadius.circular(4),
-                    ),
-                    child: SelectableText(
-                      widget.log.error.toString(),
-                      style: Theme.of(
-                        context,
-                      ).textTheme.bodySmall?.copyWith(fontFamily: 'monospace'),
-                    ),
-                  ),
-                ],
                 if (widget.log.stackTrace != null) ...[
                   const SizedBox(height: 12),
-                  Text(
-                    t.logs.stackTrace,
-                    style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                      color: widget.levelColor,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const SizedBox(height: 4),
-                  Container(
-                    padding: const EdgeInsets.all(8),
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).brightness == Brightness.dark
-                          ? Colors.grey[900]
-                          : Colors.grey[200],
-                      borderRadius: BorderRadius.circular(4),
-                    ),
-                    child: SelectableText(
-                      widget.log.stackTrace.toString(),
-                      style: Theme.of(
-                        context,
-                      ).textTheme.bodySmall?.copyWith(fontFamily: 'monospace'),
-                    ),
+                  _buildDetailSection(
+                    title: t.logs.stackTrace,
+                    content: widget.log.stackTrace.toString(),
                   ),
                 ],
               ],
@@ -303,4 +274,35 @@ class _LogEntryCardState extends State<_LogEntryCard> {
       ),
     );
   }
+
+  Widget _buildDetailSection({required String title, required String content}) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          title,
+          style: Theme.of(context).textTheme.titleSmall?.copyWith(
+            color: widget.levelColor,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Container(
+          padding: const EdgeInsets.all(8),
+          decoration: BoxDecoration(
+            color: Theme.of(context).brightness == Brightness.dark
+                ? Colors.grey[900]
+                : Colors.grey[200],
+            borderRadius: BorderRadius.circular(4),
+          ),
+          child: SelectableText(
+            content,
+            style: Theme.of(
+              context,
+            ).textTheme.bodySmall?.copyWith(fontFamily: 'monospace'),
+          ),
+        ),
+      ],
+    );
+  }
 }
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings/settings_screen.dart
similarity index 69%
rename from lib/screens/settings_screen.dart
rename to lib/screens/settings/settings_screen.dart
index 20b08546..d50fdcdc 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings/settings_screen.dart
@@ -1,16 +1,23 @@
+import 'dart:io';
+
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../i18n/strings.g.dart';
-import '../providers/settings_provider.dart';
-import '../providers/theme_provider.dart';
-import '../services/keyboard_shortcuts_service.dart';
-import '../services/settings_service.dart' as settings;
-import '../services/update_service.dart';
-import '../widgets/desktop_app_bar.dart';
-import '../widgets/hotkey_recorder_widget.dart';
+import '../../i18n/strings.g.dart';
+import '../../services/download_storage_service.dart';
+import '../../services/saf_storage_service.dart';
+import '../../providers/settings_provider.dart';
+import '../../providers/theme_provider.dart';
+import '../../services/keyboard_shortcuts_service.dart';
+import '../../services/settings_service.dart' as settings;
+import '../../services/update_service.dart';
+import '../../widgets/desktop_app_bar.dart';
+import 'hotkey_recorder_widget.dart';
 import 'about_screen.dart';
 import 'logs_screen.dart';
 import 'subtitle_styling_screen.dart';
@@ -33,6 +40,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
   int _seekTimeSmall = 10;
   int _seekTimeLarge = 30;
   int _sleepTimerDuration = 30;
+  bool _rememberTrackSelections = true;
+  bool _autoSkipIntro = true;
+  bool _autoSkipCredits = true;
+  int _autoSkipDelay = 5;
+  bool _downloadOnWifiOnly = false;
+  bool _videoPlayerNavigationEnabled = false;
 
   // Update checking state
   bool _isCheckingForUpdate = false;
@@ -55,6 +68,13 @@ class _SettingsScreenState extends State<SettingsScreen> {
       _seekTimeSmall = _settingsService.getSeekTimeSmall();
       _seekTimeLarge = _settingsService.getSeekTimeLarge();
       _sleepTimerDuration = _settingsService.getSleepTimerDuration();
+      _rememberTrackSelections = _settingsService.getRememberTrackSelections();
+      _autoSkipIntro = _settingsService.getAutoSkipIntro();
+      _autoSkipCredits = _settingsService.getAutoSkipCredits();
+      _autoSkipDelay = _settingsService.getAutoSkipDelay();
+      _downloadOnWifiOnly = _settingsService.getDownloadOnWifiOnly();
+      _videoPlayerNavigationEnabled = _settingsService
+          .getVideoPlayerNavigationEnabled();
       _isLoading = false;
     });
   }
@@ -77,7 +97,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 const SizedBox(height: 24),
                 _buildVideoPlaybackSection(),
                 const SizedBox(height: 24),
-                _buildShufflePlaySection(),
+                _buildDownloadsSection(),
                 const SizedBox(height: 24),
                 _buildKeyboardShortcutsSection(),
                 const SizedBox(height: 24),
@@ -114,30 +134,30 @@ class _SettingsScreenState extends State<SettingsScreen> {
           Consumer<ThemeProvider>(
             builder: (context, themeProvider, child) {
               return ListTile(
-                leading: Icon(themeProvider.themeModeIcon),
+                leading: AppIcon(themeProvider.themeModeIcon, fill: 1),
                 title: Text(t.settings.theme),
                 subtitle: Text(themeProvider.themeModeDisplayName),
-                trailing: const Icon(Icons.chevron_right),
+                trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
                 onTap: () => _showThemeDialog(themeProvider),
               );
             },
           ),
           ListTile(
-            leading: const Icon(Icons.language),
+            leading: const AppIcon(Symbols.language_rounded, fill: 1),
             title: Text(t.settings.language),
             subtitle: Text(
               _getLanguageDisplayName(LocaleSettings.currentLocale),
             ),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showLanguageDialog(),
           ),
           Consumer<SettingsProvider>(
             builder: (context, settingsProvider, child) {
               return ListTile(
-                leading: const Icon(Icons.grid_view),
+                leading: const AppIcon(Symbols.grid_view_rounded, fill: 1),
                 title: Text(t.settings.libraryDensity),
                 subtitle: Text(settingsProvider.libraryDensityDisplayName),
-                trailing: const Icon(Icons.chevron_right),
+                trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
                 onTap: () => _showLibraryDensityDialog(),
               );
             },
@@ -145,14 +165,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
           Consumer<SettingsProvider>(
             builder: (context, settingsProvider, child) {
               return ListTile(
-                leading: const Icon(Icons.view_list),
+                leading: const AppIcon(Symbols.view_list_rounded, fill: 1),
                 title: Text(t.settings.viewMode),
                 subtitle: Text(
                   settingsProvider.viewMode == settings.ViewMode.grid
                       ? t.settings.gridView
                       : t.settings.listView,
                 ),
-                trailing: const Icon(Icons.chevron_right),
+                trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
                 onTap: () => _showViewModeDialog(),
               );
             },
@@ -160,7 +180,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           Consumer<SettingsProvider>(
             builder: (context, settingsProvider, child) {
               return SwitchListTile(
-                secondary: const Icon(Icons.image),
+                secondary: const AppIcon(Symbols.image_rounded, fill: 1),
                 title: Text(t.settings.useSeasonPosters),
                 subtitle: Text(t.settings.useSeasonPostersDescription),
                 value: settingsProvider.useSeasonPoster,
@@ -173,7 +193,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
           Consumer<SettingsProvider>(
             builder: (context, settingsProvider, child) {
               return SwitchListTile(
-                secondary: const Icon(Icons.featured_play_list),
+                secondary: const AppIcon(
+                  Symbols.featured_play_list_rounded,
+                  fill: 1,
+                ),
                 title: Text(t.settings.showHeroSection),
                 subtitle: Text(t.settings.showHeroSectionDescription),
                 value: settingsProvider.showHeroSection,
@@ -203,7 +226,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             ),
           ),
           SwitchListTile(
-            secondary: const Icon(Icons.hardware),
+            secondary: const AppIcon(Symbols.hardware_rounded, fill: 1),
             title: Text(t.settings.hardwareDecoding),
             subtitle: Text(t.settings.hardwareDecodingDescription),
             value: _enableHardwareDecoding,
@@ -215,19 +238,19 @@ class _SettingsScreenState extends State<SettingsScreen> {
             },
           ),
           ListTile(
-            leading: const Icon(Icons.memory),
+            leading: const AppIcon(Symbols.memory_rounded, fill: 1),
             title: Text(t.settings.bufferSize),
             subtitle: Text(
               t.settings.bufferSizeMB(size: _bufferSize.toString()),
             ),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showBufferSizeDialog(),
           ),
           ListTile(
-            leading: const Icon(Icons.subtitles),
+            leading: const AppIcon(Symbols.subtitles_rounded, fill: 1),
             title: Text(t.settings.subtitleStyling),
             subtitle: Text(t.settings.subtitleStylingDescription),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () {
               Navigator.push(
                 context,
@@ -238,38 +261,99 @@ class _SettingsScreenState extends State<SettingsScreen> {
             },
           ),
           ListTile(
-            leading: const Icon(Icons.replay_10),
+            leading: const AppIcon(Symbols.replay_10_rounded, fill: 1),
             title: Text(t.settings.smallSkipDuration),
             subtitle: Text(
               t.settings.secondsUnit(seconds: _seekTimeSmall.toString()),
             ),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showSeekTimeSmallDialog(),
           ),
           ListTile(
-            leading: const Icon(Icons.replay_30),
+            leading: const AppIcon(Symbols.replay_30_rounded, fill: 1),
             title: Text(t.settings.largeSkipDuration),
             subtitle: Text(
               t.settings.secondsUnit(seconds: _seekTimeLarge.toString()),
             ),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showSeekTimeLargeDialog(),
           ),
           ListTile(
-            leading: const Icon(Icons.bedtime),
+            leading: const AppIcon(Symbols.bedtime_rounded, fill: 1),
             title: Text(t.settings.defaultSleepTimer),
             subtitle: Text(
               t.settings.minutesUnit(minutes: _sleepTimerDuration.toString()),
             ),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showSleepTimerDurationDialog(),
           ),
+          SwitchListTile(
+            secondary: const AppIcon(Symbols.bookmark_rounded, fill: 1),
+            title: Text(t.settings.rememberTrackSelections),
+            subtitle: Text(t.settings.rememberTrackSelectionsDescription),
+            value: _rememberTrackSelections,
+            onChanged: (value) async {
+              setState(() {
+                _rememberTrackSelections = value;
+              });
+              await _settingsService.setRememberTrackSelections(value);
+            },
+          ),
+          const Divider(),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
+            child: Text(
+              t.settings.autoSkip,
+              style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).colorScheme.primary,
+              ),
+            ),
+          ),
+          SwitchListTile(
+            secondary: const AppIcon(Symbols.fast_forward_rounded, fill: 1),
+            title: Text(t.settings.autoSkipIntro),
+            subtitle: Text(t.settings.autoSkipIntroDescription),
+            value: _autoSkipIntro,
+            onChanged: (value) async {
+              setState(() {
+                _autoSkipIntro = value;
+              });
+              await _settingsService.setAutoSkipIntro(value);
+            },
+          ),
+          SwitchListTile(
+            secondary: const AppIcon(Symbols.skip_next_rounded, fill: 1),
+            title: Text(t.settings.autoSkipCredits),
+            subtitle: Text(t.settings.autoSkipCreditsDescription),
+            value: _autoSkipCredits,
+            onChanged: (value) async {
+              setState(() {
+                _autoSkipCredits = value;
+              });
+              await _settingsService.setAutoSkipCredits(value);
+            },
+          ),
+          ListTile(
+            leading: const AppIcon(Symbols.timer_rounded, fill: 1),
+            title: Text(t.settings.autoSkipDelay),
+            subtitle: Text(
+              t.settings.autoSkipDelayDescription(
+                seconds: _autoSkipDelay.toString(),
+              ),
+            ),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
+            onTap: () => _showAutoSkipDelayDialog(),
+          ),
         ],
       ),
     );
   }
 
-  Widget _buildShufflePlaySection() {
+  Widget _buildDownloadsSection() {
+    final storageService = DownloadStorageService.instance;
+    final isCustom = storageService.isUsingCustomPath();
+
     return Card(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -277,49 +361,47 @@ class _SettingsScreenState extends State<SettingsScreen> {
           Padding(
             padding: const EdgeInsets.all(16),
             child: Text(
-              t.settings.shufflePlay,
+              t.settings.downloads,
               style: Theme.of(
                 context,
               ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
             ),
           ),
-          Consumer<SettingsProvider>(
-            builder: (context, settingsProvider, child) {
-              return SwitchListTile(
-                secondary: const Icon(Icons.visibility_off),
-                title: Text(t.settings.unwatchedOnly),
-                subtitle: Text(t.settings.unwatchedOnlyDescription),
-                value: settingsProvider.shuffleUnwatchedOnly,
-                onChanged: (value) async {
-                  await settingsProvider.setShuffleUnwatchedOnly(value);
-                },
-              );
-            },
-          ),
-          Consumer<SettingsProvider>(
-            builder: (context, settingsProvider, child) {
-              return SwitchListTile(
-                secondary: const Icon(Icons.shuffle),
-                title: Text(t.settings.shuffleOrderNavigation),
-                subtitle: Text(t.settings.shuffleOrderNavigationDescription),
-                value: settingsProvider.shuffleOrderNavigation,
-                onChanged: (value) async {
-                  await settingsProvider.setShuffleOrderNavigation(value);
-                },
-              );
-            },
-          ),
-          Consumer<SettingsProvider>(
-            builder: (context, settingsProvider, child) {
-              return SwitchListTile(
-                secondary: const Icon(Icons.loop),
-                title: Text(t.settings.loopShuffleQueue),
-                subtitle: Text(t.settings.loopShuffleQueueDescription),
-                value: settingsProvider.shuffleLoopQueue,
-                onChanged: (value) async {
-                  await settingsProvider.setShuffleLoopQueue(value);
-                },
-              );
+          // Download location picker - not available on iOS
+          if (!Platform.isIOS)
+            FutureBuilder<String>(
+              future: storageService.getCurrentDownloadPathDisplay(),
+              builder: (context, snapshot) {
+                final currentPath = snapshot.data ?? '...';
+
+                return ListTile(
+                  leading: const AppIcon(Symbols.folder_rounded, fill: 1),
+                  title: Text(
+                    isCustom
+                        ? t.settings.downloadLocationCustom
+                        : t.settings.downloadLocationDefault,
+                  ),
+                  subtitle: Text(
+                    currentPath,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  trailing: const AppIcon(
+                    Symbols.chevron_right_rounded,
+                    fill: 1,
+                  ),
+                  onTap: () => _showDownloadLocationDialog(),
+                );
+              },
+            ),
+          SwitchListTile(
+            secondary: const AppIcon(Symbols.wifi_rounded, fill: 1),
+            title: Text(t.settings.downloadOnWifiOnly),
+            subtitle: Text(t.settings.downloadOnWifiOnlyDescription),
+            value: _downloadOnWifiOnly,
+            onChanged: (value) async {
+              setState(() => _downloadOnWifiOnly = value);
+              await _settingsService.setDownloadOnWifiOnly(value);
             },
           ),
         ],
@@ -327,6 +409,127 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
+  Future<void> _showDownloadLocationDialog() async {
+    final storageService = DownloadStorageService.instance;
+    final isCustom = storageService.isUsingCustomPath();
+
+    showDialog(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: Text(t.settings.downloads),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(t.settings.downloadLocationDescription),
+            const SizedBox(height: 16),
+            FutureBuilder<String>(
+              future: storageService.getCurrentDownloadPathDisplay(),
+              builder: (context, snapshot) {
+                return Text(
+                  t.settings.currentPath(path: snapshot.data ?? '...'),
+                  style: Theme.of(context).textTheme.bodySmall,
+                );
+              },
+            ),
+          ],
+        ),
+        actions: [
+          if (isCustom)
+            TextButton(
+              onPressed: () async {
+                Navigator.pop(dialogContext);
+                await _resetDownloadLocation();
+              },
+              child: Text(t.settings.resetToDefault),
+            ),
+          TextButton(
+            onPressed: () => Navigator.pop(dialogContext),
+            child: Text(t.common.cancel),
+          ),
+          FilledButton(
+            onPressed: () async {
+              Navigator.pop(dialogContext);
+              await _selectDownloadLocation();
+            },
+            child: Text(t.settings.selectFolder),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _selectDownloadLocation() async {
+    try {
+      String? selectedPath;
+      String pathType = 'file';
+
+      if (Platform.isAndroid) {
+        // Use SAF on Android
+        final safService = SafStorageService.instance;
+        selectedPath = await safService.pickDirectory();
+        if (selectedPath != null) {
+          pathType = 'saf';
+        }
+      } else {
+        // Use file_picker on desktop
+        final result = await FilePicker.platform.getDirectoryPath(
+          dialogTitle: t.settings.selectFolder,
+        );
+        selectedPath = result;
+      }
+
+      if (selectedPath != null) {
+        // Validate the path is writable (for non-SAF paths)
+        if (pathType == 'file') {
+          final dir = Directory(selectedPath);
+          final isWritable = await DownloadStorageService.instance
+              .isDirectoryWritable(dir);
+          if (!isWritable) {
+            if (mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text(t.settings.downloadLocationInvalid)),
+              );
+            }
+            return;
+          }
+        }
+
+        // Save the setting
+        await _settingsService.setCustomDownloadPath(
+          selectedPath,
+          type: pathType,
+        );
+        await DownloadStorageService.instance.refreshCustomPath();
+
+        if (mounted) {
+          setState(() {});
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(t.settings.downloadLocationChanged)),
+          );
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(t.settings.downloadLocationSelectError)),
+        );
+      }
+    }
+  }
+
+  Future<void> _resetDownloadLocation() async {
+    await _settingsService.setCustomDownloadPath(null);
+    await DownloadStorageService.instance.refreshCustomPath();
+
+    if (mounted) {
+      setState(() {});
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text(t.settings.downloadLocationReset)));
+    }
+  }
+
   Widget _buildKeyboardShortcutsSection() {
     return Card(
       child: Column(
@@ -342,12 +545,24 @@ class _SettingsScreenState extends State<SettingsScreen> {
             ),
           ),
           ListTile(
-            leading: const Icon(Icons.keyboard),
+            leading: const AppIcon(Symbols.keyboard_rounded, fill: 1),
             title: Text(t.settings.videoPlayerControls),
             subtitle: Text(t.settings.keyboardShortcutsDescription),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showKeyboardShortcutsDialog(),
           ),
+          SwitchListTile(
+            secondary: const AppIcon(Symbols.gamepad_rounded, fill: 1),
+            title: Text(t.settings.videoPlayerNavigation),
+            subtitle: Text(t.settings.videoPlayerNavigationDescription),
+            value: _videoPlayerNavigationEnabled,
+            onChanged: (value) async {
+              setState(() {
+                _videoPlayerNavigationEnabled = value;
+              });
+              await _settingsService.setVideoPlayerNavigationEnabled(value);
+            },
+          ),
         ],
       ),
     );
@@ -368,7 +583,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             ),
           ),
           SwitchListTile(
-            secondary: const Icon(Icons.bug_report),
+            secondary: const AppIcon(Symbols.bug_report_rounded, fill: 1),
             title: Text(t.settings.debugLogging),
             subtitle: Text(t.settings.debugLoggingDescription),
             value: _enableDebugLogging,
@@ -380,10 +595,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
             },
           ),
           ListTile(
-            leading: const Icon(Icons.article),
+            leading: const AppIcon(Symbols.article_rounded, fill: 1),
             title: Text(t.settings.viewLogs),
             subtitle: Text(t.settings.viewLogsDescription),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () {
               Navigator.push(
                 context,
@@ -392,17 +607,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
             },
           ),
           ListTile(
-            leading: const Icon(Icons.cleaning_services),
+            leading: const AppIcon(Symbols.cleaning_services_rounded, fill: 1),
             title: Text(t.settings.clearCache),
             subtitle: Text(t.settings.clearCacheDescription),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showClearCacheDialog(),
           ),
           ListTile(
-            leading: const Icon(Icons.restore),
+            leading: const AppIcon(Symbols.restore_rounded, fill: 1),
             title: Text(t.settings.resetSettings),
             subtitle: Text(t.settings.resetSettingsDescription),
-            trailing: const Icon(Icons.chevron_right),
+            trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: () => _showResetSettingsDialog(),
           ),
         ],
@@ -427,8 +642,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
             ),
           ),
           ListTile(
-            leading: Icon(
-              hasUpdate ? Icons.system_update : Icons.check_circle,
+            leading: AppIcon(
+              hasUpdate
+                  ? Symbols.system_update_rounded
+                  : Symbols.check_circle_rounded,
+              fill: 1,
               color: hasUpdate ? Colors.orange : null,
             ),
             title: Text(
@@ -449,7 +667,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     height: 24,
                     child: CircularProgressIndicator(strokeWidth: 2),
                   )
-                : const Icon(Icons.chevron_right),
+                : const AppIcon(Symbols.chevron_right_rounded, fill: 1),
             onTap: _isCheckingForUpdate
                 ? null
                 : () {
@@ -468,10 +686,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
   Widget _buildAboutSection() {
     return Card(
       child: ListTile(
-        leading: const Icon(Icons.info),
+        leading: const AppIcon(Symbols.info_rounded, fill: 1),
         title: Text(t.settings.about),
         subtitle: Text(t.settings.aboutDescription),
-        trailing: const Icon(Icons.chevron_right),
+        trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
         onTap: () {
           Navigator.push(
             context,
@@ -492,10 +710,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
             mainAxisSize: MainAxisSize.min,
             children: [
               ListTile(
-                leading: Icon(
+                leading: AppIcon(
                   themeProvider.themeMode == settings.ThemeMode.system
-                      ? Icons.radio_button_checked
-                      : Icons.radio_button_unchecked,
+                      ? Symbols.radio_button_checked_rounded
+                      : Symbols.radio_button_unchecked_rounded,
+                  fill: 1,
                 ),
                 title: Text(t.settings.systemTheme),
                 subtitle: Text(t.settings.systemThemeDescription),
@@ -505,10 +724,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 },
               ),
               ListTile(
-                leading: Icon(
+                leading: AppIcon(
                   themeProvider.themeMode == settings.ThemeMode.light
-                      ? Icons.radio_button_checked
-                      : Icons.radio_button_unchecked,
+                      ? Symbols.radio_button_checked_rounded
+                      : Symbols.radio_button_unchecked_rounded,
+                  fill: 1,
                 ),
                 title: Text(t.settings.lightTheme),
                 onTap: () {
@@ -517,10 +737,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 },
               ),
               ListTile(
-                leading: Icon(
+                leading: AppIcon(
                   themeProvider.themeMode == settings.ThemeMode.dark
-                      ? Icons.radio_button_checked
-                      : Icons.radio_button_unchecked,
+                      ? Symbols.radio_button_checked_rounded
+                      : Symbols.radio_button_unchecked_rounded,
+                  fill: 1,
                 ),
                 title: Text(t.settings.darkTheme),
                 onTap: () {
@@ -553,10 +774,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
             mainAxisSize: MainAxisSize.min,
             children: options.map((size) {
               return ListTile(
-                leading: Icon(
+                leading: AppIcon(
                   _bufferSize == size
-                      ? Icons.radio_button_checked
-                      : Icons.radio_button_unchecked,
+                      ? Symbols.radio_button_checked_rounded
+                      : Symbols.radio_button_unchecked_rounded,
+                  fill: 1,
                 ),
                 title: Text('${size}MB'),
                 onTap: () {
@@ -734,7 +956,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 keyboardType: TextInputType.number,
                 decoration: InputDecoration(
                   labelText: t.settings.minutesLabel,
-                  hintText: t.settings.durationHint(min: 5, max: 180),
+                  hintText: t.settings.durationHint(min: 5, max: 240),
                   errorText: errorText,
                   suffixText: t.settings.minutesShort,
                 ),
@@ -744,10 +966,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
                   setDialogState(() {
                     if (parsed == null) {
                       errorText = t.settings.validationErrorEnterNumber;
-                    } else if (parsed < 5 || parsed > 180) {
+                    } else if (parsed < 5 || parsed > 240) {
                       errorText = t.settings.validationErrorDuration(
                         min: 5,
-                        max: 180,
+                        max: 240,
                         unit: t.settings.minutesLabel.toLowerCase(),
                       );
                     } else {
@@ -764,11 +986,77 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 TextButton(
                   onPressed: () async {
                     final parsed = int.tryParse(controller.text);
-                    if (parsed != null && parsed >= 5 && parsed <= 180) {
+                    if (parsed != null && parsed >= 5 && parsed <= 240) {
                       setState(() {
                         _sleepTimerDuration = parsed;
-                        _settingsService.setSleepTimerDuration(parsed);
                       });
+                      await _settingsService.setSleepTimerDuration(parsed);
+                      if (dialogContext.mounted) {
+                        Navigator.pop(dialogContext);
+                      }
+                    }
+                  },
+                  child: Text(t.common.save),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+  }
+
+  void _showAutoSkipDelayDialog() {
+    final controller = TextEditingController(text: _autoSkipDelay.toString());
+    String? errorText;
+
+    showDialog(
+      context: context,
+      builder: (BuildContext dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setDialogState) {
+            return AlertDialog(
+              title: Text(t.settings.autoSkipDelay),
+              content: TextField(
+                controller: controller,
+                keyboardType: TextInputType.number,
+                decoration: InputDecoration(
+                  labelText: t.settings.secondsLabel,
+                  hintText: t.settings.durationHint(min: 1, max: 30),
+                  errorText: errorText,
+                  suffixText: t.settings.secondsShort,
+                ),
+                autofocus: true,
+                onChanged: (value) {
+                  final parsed = int.tryParse(value);
+                  setDialogState(() {
+                    if (parsed == null) {
+                      errorText = t.settings.validationErrorEnterNumber;
+                    } else if (parsed < 1 || parsed > 30) {
+                      errorText = t.settings.validationErrorDuration(
+                        min: 1,
+                        max: 30,
+                        unit: t.settings.secondsLabel.toLowerCase(),
+                      );
+                    } else {
+                      errorText = null;
+                    }
+                  });
+                },
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.pop(dialogContext),
+                  child: Text(t.common.cancel),
+                ),
+                TextButton(
+                  onPressed: () async {
+                    final parsed = int.tryParse(controller.text);
+                    if (parsed != null && parsed >= 1 && parsed <= 30) {
+                      setState(() {
+                        _autoSkipDelay = parsed;
+                      });
+                      await _settingsService.setAutoSkipDelay(parsed);
                       if (dialogContext.mounted) {
                         Navigator.pop(dialogContext);
                       }
@@ -871,6 +1159,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
         return 'Italiano';
       case AppLocale.nl:
         return 'Nederlands';
+      case AppLocale.de:
+        return 'Deutsch';
+      case AppLocale.zh:
+        return '中文';
     }
   }
 
@@ -886,10 +1178,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
               final isSelected = LocaleSettings.currentLocale == locale;
               return ListTile(
                 title: Text(_getLanguageDisplayName(locale)),
-                leading: Icon(
+                leading: AppIcon(
                   isSelected
-                      ? Icons.radio_button_checked
-                      : Icons.radio_button_unchecked,
+                      ? Symbols.radio_button_checked_rounded
+                      : Symbols.radio_button_unchecked_rounded,
+                  fill: 1,
                   color: isSelected
                       ? Theme.of(context).colorScheme.primary
                       : null,
@@ -1036,10 +1329,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   ListTile(
-                    leading: Icon(
+                    leading: AppIcon(
                       provider.libraryDensity == settings.LibraryDensity.compact
-                          ? Icons.radio_button_checked
-                          : Icons.radio_button_unchecked,
+                          ? Symbols.radio_button_checked_rounded
+                          : Symbols.radio_button_unchecked_rounded,
+                      fill: 1,
                     ),
                     title: Text(t.settings.compact),
                     subtitle: Text(t.settings.compactDescription),
@@ -1051,10 +1345,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     },
                   ),
                   ListTile(
-                    leading: Icon(
+                    leading: AppIcon(
                       provider.libraryDensity == settings.LibraryDensity.normal
-                          ? Icons.radio_button_checked
-                          : Icons.radio_button_unchecked,
+                          ? Symbols.radio_button_checked_rounded
+                          : Symbols.radio_button_unchecked_rounded,
+                      fill: 1,
                     ),
                     title: Text(t.settings.normal),
                     subtitle: Text(t.settings.normalDescription),
@@ -1066,11 +1361,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     },
                   ),
                   ListTile(
-                    leading: Icon(
+                    leading: AppIcon(
                       provider.libraryDensity ==
                               settings.LibraryDensity.comfortable
-                          ? Icons.radio_button_checked
-                          : Icons.radio_button_unchecked,
+                          ? Symbols.radio_button_checked_rounded
+                          : Symbols.radio_button_unchecked_rounded,
+                      fill: 1,
                     ),
                     title: Text(t.settings.comfortable),
                     subtitle: Text(t.settings.comfortableDescription),
@@ -1109,10 +1405,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   ListTile(
-                    leading: Icon(
+                    leading: AppIcon(
                       provider.viewMode == settings.ViewMode.grid
-                          ? Icons.radio_button_checked
-                          : Icons.radio_button_unchecked,
+                          ? Symbols.radio_button_checked_rounded
+                          : Symbols.radio_button_unchecked_rounded,
+                      fill: 1,
                     ),
                     title: Text(t.settings.gridView),
                     subtitle: Text(t.settings.gridViewDescription),
@@ -1124,10 +1421,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     },
                   ),
                   ListTile(
-                    leading: Icon(
+                    leading: AppIcon(
                       provider.viewMode == settings.ViewMode.list
-                          ? Icons.radio_button_checked
-                          : Icons.radio_button_unchecked,
+                          ? Symbols.radio_button_checked_rounded
+                          : Symbols.radio_button_unchecked_rounded,
+                      fill: 1,
                     ),
                     title: Text(t.settings.listView),
                     subtitle: Text(t.settings.listViewDescription),
diff --git a/lib/screens/settings/subtitle_styling_screen.dart b/lib/screens/settings/subtitle_styling_screen.dart
new file mode 100644
index 00000000..b2bb019d
--- /dev/null
+++ b/lib/screens/settings/subtitle_styling_screen.dart
@@ -0,0 +1,342 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flex_color_picker/flex_color_picker.dart';
+import '../../i18n/strings.g.dart';
+import '../../services/settings_service.dart';
+import '../../widgets/desktop_app_bar.dart';
+
+class SubtitleStylingScreen extends StatefulWidget {
+  const SubtitleStylingScreen({super.key});
+
+  @override
+  State<SubtitleStylingScreen> createState() => _SubtitleStylingScreenState();
+}
+
+// Composable widget for slider sections
+class _StylingSliderSection extends StatelessWidget {
+  final String label;
+  final int value;
+  final double min;
+  final double max;
+  final int divisions;
+  final ValueChanged<double> onChanged;
+  final ValueChanged<double>? onChangeEnd;
+  final String Function(int)? valueFormatter;
+
+  const _StylingSliderSection({
+    required this.label,
+    required this.value,
+    required this.min,
+    required this.max,
+    required this.divisions,
+    required this.onChanged,
+    this.onChangeEnd,
+    this.valueFormatter,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final formattedValue = valueFormatter?.call(value) ?? value.toString();
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [Text(label), Text(formattedValue)],
+          ),
+          const SizedBox(height: 8),
+          Row(
+            children: [
+              Text(
+                valueFormatter?.call(min.toInt()) ?? min.toInt().toString(),
+                style: const TextStyle(fontSize: 12, color: Colors.grey),
+              ),
+              Expanded(
+                child: Slider(
+                  value: value.toDouble(),
+                  min: min,
+                  max: max,
+                  divisions: divisions,
+                  label: formattedValue,
+                  onChanged: onChanged,
+                  onChangeEnd: onChangeEnd,
+                ),
+              ),
+              Text(
+                valueFormatter?.call(max.toInt()) ?? max.toInt().toString(),
+                style: const TextStyle(fontSize: 12, color: Colors.grey),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+// Composable widget for color picker tiles
+class _ColorSettingTile extends StatelessWidget {
+  final String label;
+  final String currentColor;
+  final VoidCallback onTap;
+  final Color Function(String) hexToColor;
+
+  const _ColorSettingTile({
+    required this.label,
+    required this.currentColor,
+    required this.onTap,
+    required this.hexToColor,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: Container(
+        width: 40,
+        height: 40,
+        decoration: BoxDecoration(
+          color: hexToColor(currentColor),
+          border: Border.all(color: Colors.grey),
+          borderRadius: BorderRadius.circular(4),
+        ),
+      ),
+      title: Text(label),
+      subtitle: Text(currentColor),
+      trailing: const AppIcon(Symbols.chevron_right_rounded, fill: 1),
+      onTap: onTap,
+    );
+  }
+}
+
+class _SubtitleStylingScreenState extends State<SubtitleStylingScreen> {
+  late SettingsService _settingsService;
+  bool _isLoading = true;
+
+  int _fontSize = 55;
+  String _textColor = '#FFFFFF';
+  int _borderSize = 3;
+  String _borderColor = '#000000';
+  String _backgroundColor = '#000000';
+  int _backgroundOpacity = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadSettings();
+  }
+
+  Future<void> _loadSettings() async {
+    _settingsService = await SettingsService.getInstance();
+
+    setState(() {
+      _fontSize = _settingsService.getSubtitleFontSize();
+      _textColor = _settingsService.getSubtitleTextColor();
+      _borderSize = _settingsService.getSubtitleBorderSize();
+      _borderColor = _settingsService.getSubtitleBorderColor();
+      _backgroundColor = _settingsService.getSubtitleBackgroundColor();
+      _backgroundOpacity = _settingsService.getSubtitleBackgroundOpacity();
+      _isLoading = false;
+    });
+  }
+
+  Color _hexToColor(String hexString) {
+    final buffer = StringBuffer();
+    if (hexString.length == 7) buffer.write('ff');
+    buffer.write(hexString.replaceFirst('#', ''));
+    return Color(int.parse(buffer.toString(), radix: 16));
+  }
+
+  String _colorToHex(Color color) {
+    return '#${((color.r * 255.0).round() & 0xff).toRadixString(16).padLeft(2, '0')}${((color.g * 255.0).round() & 0xff).toRadixString(16).padLeft(2, '0')}${((color.b * 255.0).round() & 0xff).toRadixString(16).padLeft(2, '0')}'
+        .toUpperCase();
+  }
+
+  Future<void> _showColorPicker(
+    String title,
+    String currentColor,
+    Function(String) onColorSelected,
+  ) async {
+    Color initialColor = _hexToColor(currentColor);
+
+    final Color selectedColor = await showColorPickerDialog(
+      context,
+      initialColor,
+      title: Text(title),
+      barrierColor: Colors.black54,
+      width: 40,
+      height: 40,
+      spacing: 0,
+      runSpacing: 0,
+      borderRadius: 4,
+      wheelDiameter: 165,
+      enableOpacity: false,
+      showColorCode: true,
+      colorCodeHasColor: true,
+      pickersEnabled: const <ColorPickerType, bool>{
+        ColorPickerType.both: false,
+        ColorPickerType.primary: true,
+        ColorPickerType.accent: false,
+        ColorPickerType.wheel: true,
+        ColorPickerType.custom: false,
+      },
+      actionButtons: const ColorPickerActionButtons(
+        okButton: true,
+        closeButton: true,
+        dialogActionButtons: false,
+      ),
+    );
+
+    final hexColor = _colorToHex(selectedColor);
+    onColorSelected(hexColor);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_isLoading) {
+      return const Scaffold(body: Center(child: CircularProgressIndicator()));
+    }
+
+    return Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          CustomAppBar(title: Text(t.screens.subtitleStyling), pinned: true),
+          SliverPadding(
+            padding: const EdgeInsets.all(16),
+            sliver: SliverList(
+              delegate: SliverChildListDelegate([
+                _buildStylingCard(),
+                const SizedBox(height: 24),
+              ]),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildStylingCard() {
+    return Card(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(16),
+            child: Text(
+              t.subtitlingStyling.stylingOptions,
+              style: Theme.of(
+                context,
+              ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+            ),
+          ),
+          // Font Size Slider
+          _StylingSliderSection(
+            label: t.subtitlingStyling.fontSize,
+            value: _fontSize,
+            min: 30,
+            max: 80,
+            divisions: 50,
+            onChanged: (value) {
+              setState(() {
+                _fontSize = value.toInt();
+              });
+            },
+            onChangeEnd: (value) {
+              _settingsService.setSubtitleFontSize(_fontSize);
+            },
+          ),
+          const Divider(),
+          // Text Color
+          _ColorSettingTile(
+            label: t.subtitlingStyling.textColor,
+            currentColor: _textColor,
+            hexToColor: _hexToColor,
+            onTap: () {
+              _showColorPicker(t.subtitlingStyling.textColor, _textColor, (
+                color,
+              ) {
+                setState(() {
+                  _textColor = color;
+                });
+                _settingsService.setSubtitleTextColor(color);
+              });
+            },
+          ),
+          const Divider(),
+          // Border Size Slider
+          _StylingSliderSection(
+            label: t.subtitlingStyling.borderSize,
+            value: _borderSize,
+            min: 0,
+            max: 5,
+            divisions: 5,
+            onChanged: (value) {
+              setState(() {
+                _borderSize = value.toInt();
+              });
+            },
+            onChangeEnd: (value) {
+              _settingsService.setSubtitleBorderSize(_borderSize);
+            },
+          ),
+          const Divider(),
+          // Border Color
+          _ColorSettingTile(
+            label: t.subtitlingStyling.borderColor,
+            currentColor: _borderColor,
+            hexToColor: _hexToColor,
+            onTap: () {
+              _showColorPicker(t.subtitlingStyling.borderColor, _borderColor, (
+                color,
+              ) {
+                setState(() {
+                  _borderColor = color;
+                });
+                _settingsService.setSubtitleBorderColor(color);
+              });
+            },
+          ),
+          const Divider(),
+          // Background Opacity Slider
+          _StylingSliderSection(
+            label: t.subtitlingStyling.backgroundOpacity,
+            value: _backgroundOpacity,
+            min: 0,
+            max: 100,
+            divisions: 20,
+            valueFormatter: (value) => '$value%',
+            onChanged: (value) {
+              setState(() {
+                _backgroundOpacity = value.toInt();
+              });
+            },
+            onChangeEnd: (value) {
+              _settingsService.setSubtitleBackgroundOpacity(_backgroundOpacity);
+            },
+          ),
+          const Divider(),
+          // Background Color
+          _ColorSettingTile(
+            label: t.subtitlingStyling.backgroundColor,
+            currentColor: _backgroundColor,
+            hexToColor: _hexToColor,
+            onTap: () {
+              _showColorPicker(
+                t.subtitlingStyling.backgroundColor,
+                _backgroundColor,
+                (color) {
+                  setState(() {
+                    _backgroundColor = color;
+                  });
+                  _settingsService.setSubtitleBackgroundColor(color);
+                },
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/screens/subtitle_styling_screen.dart b/lib/screens/subtitle_styling_screen.dart
deleted file mode 100644
index 4c10c7a1..00000000
--- a/lib/screens/subtitle_styling_screen.dart
+++ /dev/null
@@ -1,362 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flex_color_picker/flex_color_picker.dart';
-import '../i18n/strings.g.dart';
-import '../services/settings_service.dart';
-import '../widgets/desktop_app_bar.dart';
-
-class SubtitleStylingScreen extends StatefulWidget {
-  const SubtitleStylingScreen({super.key});
-
-  @override
-  State<SubtitleStylingScreen> createState() => _SubtitleStylingScreenState();
-}
-
-class _SubtitleStylingScreenState extends State<SubtitleStylingScreen> {
-  static const EdgeInsets _sliderPadding = EdgeInsets.fromLTRB(16, 16, 16, 8);
-
-  late SettingsService _settingsService;
-  bool _isLoading = true;
-
-  int _fontSize = 55;
-  String _textColor = '#FFFFFF';
-  int _borderSize = 3;
-  String _borderColor = '#000000';
-  String _backgroundColor = '#000000';
-  int _backgroundOpacity = 0;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadSettings();
-  }
-
-  Future<void> _loadSettings() async {
-    _settingsService = await SettingsService.getInstance();
-
-    setState(() {
-      _fontSize = _settingsService.getSubtitleFontSize();
-      _textColor = _settingsService.getSubtitleTextColor();
-      _borderSize = _settingsService.getSubtitleBorderSize();
-      _borderColor = _settingsService.getSubtitleBorderColor();
-      _backgroundColor = _settingsService.getSubtitleBackgroundColor();
-      _backgroundOpacity = _settingsService.getSubtitleBackgroundOpacity();
-      _isLoading = false;
-    });
-  }
-
-  Color _hexToColor(String hexString) {
-    final buffer = StringBuffer();
-    if (hexString.length == 7) buffer.write('ff');
-    buffer.write(hexString.replaceFirst('#', ''));
-    return Color(int.parse(buffer.toString(), radix: 16));
-  }
-
-  String _colorToHex(Color color) {
-    return '#${((color.r * 255.0).round() & 0xff).toRadixString(16).padLeft(2, '0')}${((color.g * 255.0).round() & 0xff).toRadixString(16).padLeft(2, '0')}${((color.b * 255.0).round() & 0xff).toRadixString(16).padLeft(2, '0')}'
-        .toUpperCase();
-  }
-
-  Future<void> _showColorPicker(
-    String title,
-    String currentColor,
-    Function(String) onColorSelected,
-  ) async {
-    Color initialColor = _hexToColor(currentColor);
-
-    final Color selectedColor = await showColorPickerDialog(
-      context,
-      initialColor,
-      title: Text(title),
-      barrierColor: Colors.black54,
-      width: 40,
-      height: 40,
-      spacing: 0,
-      runSpacing: 0,
-      borderRadius: 4,
-      wheelDiameter: 165,
-      enableOpacity: false,
-      showColorCode: true,
-      colorCodeHasColor: true,
-      pickersEnabled: const <ColorPickerType, bool>{
-        ColorPickerType.both: false,
-        ColorPickerType.primary: true,
-        ColorPickerType.accent: false,
-        ColorPickerType.wheel: true,
-        ColorPickerType.custom: false,
-      },
-      actionButtons: const ColorPickerActionButtons(
-        okButton: true,
-        closeButton: true,
-        dialogActionButtons: false,
-      ),
-    );
-
-    final hexColor = _colorToHex(selectedColor);
-    onColorSelected(hexColor);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (_isLoading) {
-      return const Scaffold(body: Center(child: CircularProgressIndicator()));
-    }
-
-    return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          CustomAppBar(title: Text(t.screens.subtitleStyling), pinned: true),
-          SliverPadding(
-            padding: const EdgeInsets.all(16),
-            sliver: SliverList(
-              delegate: SliverChildListDelegate([
-                _buildStylingCard(),
-                const SizedBox(height: 24),
-              ]),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildStylingCard() {
-    return Card(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(16),
-            child: Text(
-              t.subtitlingStyling.stylingOptions,
-              style: Theme.of(
-                context,
-              ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
-            ),
-          ),
-          // Font Size Slider
-          Padding(
-            padding: _sliderPadding,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(t.subtitlingStyling.fontSize),
-                    Text('$_fontSize'),
-                  ],
-                ),
-                const SizedBox(height: 8),
-                Row(
-                  children: [
-                    const Text(
-                      '30',
-                      style: TextStyle(fontSize: 12, color: Colors.grey),
-                    ),
-                    Expanded(
-                      child: Slider(
-                        value: _fontSize.toDouble(),
-                        min: 30,
-                        max: 80,
-                        divisions: 50,
-                        label: _fontSize.toString(),
-                        onChanged: (value) {
-                          setState(() {
-                            _fontSize = value.toInt();
-                          });
-                        },
-                        onChangeEnd: (value) {
-                          _settingsService.setSubtitleFontSize(_fontSize);
-                        },
-                      ),
-                    ),
-                    const Text(
-                      '80',
-                      style: TextStyle(fontSize: 12, color: Colors.grey),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-          const Divider(),
-          // Text Color
-          ListTile(
-            leading: Container(
-              width: 40,
-              height: 40,
-              decoration: BoxDecoration(
-                color: _hexToColor(_textColor),
-                border: Border.all(color: Colors.grey),
-                borderRadius: BorderRadius.circular(4),
-              ),
-            ),
-            title: Text(t.subtitlingStyling.textColor),
-            subtitle: Text(_textColor),
-            trailing: const Icon(Icons.chevron_right),
-            onTap: () {
-              _showColorPicker(t.subtitlingStyling.textColor, _textColor, (
-                color,
-              ) {
-                setState(() {
-                  _textColor = color;
-                });
-                _settingsService.setSubtitleTextColor(color);
-              });
-            },
-          ),
-          const Divider(),
-          // Border Size Slider
-          Padding(
-            padding: _sliderPadding,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(t.subtitlingStyling.borderSize),
-                    Text('$_borderSize'),
-                  ],
-                ),
-                const SizedBox(height: 8),
-                Row(
-                  children: [
-                    const Text(
-                      '0',
-                      style: TextStyle(fontSize: 12, color: Colors.grey),
-                    ),
-                    Expanded(
-                      child: Slider(
-                        value: _borderSize.toDouble(),
-                        min: 0,
-                        max: 5,
-                        divisions: 5,
-                        label: _borderSize.toString(),
-                        onChanged: (value) {
-                          setState(() {
-                            _borderSize = value.toInt();
-                          });
-                        },
-                        onChangeEnd: (value) {
-                          _settingsService.setSubtitleBorderSize(_borderSize);
-                        },
-                      ),
-                    ),
-                    const Text(
-                      '5',
-                      style: TextStyle(fontSize: 12, color: Colors.grey),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-          const Divider(),
-          // Border Color
-          ListTile(
-            leading: Container(
-              width: 40,
-              height: 40,
-              decoration: BoxDecoration(
-                color: _hexToColor(_borderColor),
-                border: Border.all(color: Colors.grey),
-                borderRadius: BorderRadius.circular(4),
-              ),
-            ),
-            title: Text(t.subtitlingStyling.borderColor),
-            subtitle: Text(_borderColor),
-            trailing: const Icon(Icons.chevron_right),
-            onTap: () {
-              _showColorPicker(t.subtitlingStyling.borderColor, _borderColor, (
-                color,
-              ) {
-                setState(() {
-                  _borderColor = color;
-                });
-                _settingsService.setSubtitleBorderColor(color);
-              });
-            },
-          ),
-          const Divider(),
-          // Background Opacity Slider
-          Padding(
-            padding: _sliderPadding,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(t.subtitlingStyling.backgroundOpacity),
-                    Text('$_backgroundOpacity%'),
-                  ],
-                ),
-                const SizedBox(height: 8),
-                Row(
-                  children: [
-                    const Text(
-                      '0%',
-                      style: TextStyle(fontSize: 12, color: Colors.grey),
-                    ),
-                    Expanded(
-                      child: Slider(
-                        value: _backgroundOpacity.toDouble(),
-                        min: 0,
-                        max: 100,
-                        divisions: 20,
-                        label: '$_backgroundOpacity%',
-                        onChanged: (value) {
-                          setState(() {
-                            _backgroundOpacity = value.toInt();
-                          });
-                        },
-                        onChangeEnd: (value) {
-                          _settingsService.setSubtitleBackgroundOpacity(
-                            _backgroundOpacity,
-                          );
-                        },
-                      ),
-                    ),
-                    const Text(
-                      '100%',
-                      style: TextStyle(fontSize: 12, color: Colors.grey),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-          const Divider(),
-          // Background Color
-          ListTile(
-            leading: Container(
-              width: 40,
-              height: 40,
-              decoration: BoxDecoration(
-                color: _hexToColor(_backgroundColor),
-                border: Border.all(color: Colors.grey),
-                borderRadius: BorderRadius.circular(4),
-              ),
-            ),
-            title: Text(t.subtitlingStyling.backgroundColor),
-            subtitle: Text(_backgroundColor),
-            trailing: const Icon(Icons.chevron_right),
-            onTap: () {
-              _showColorPicker(
-                t.subtitlingStyling.backgroundColor,
-                _backgroundColor,
-                (color) {
-                  setState(() {
-                    _backgroundColor = color;
-                  });
-                  _settingsService.setSubtitleBackgroundColor(color);
-                },
-              );
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/screens/video_player_screen.dart b/lib/screens/video_player_screen.dart
index 7d5a5826..1f9a4803 100644
--- a/lib/screens/video_player_screen.dart
+++ b/lib/screens/video_player_screen.dart
@@ -1,24 +1,37 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:flutter/services.dart';
-import 'package:media_kit/media_kit.dart';
-import 'package:media_kit_video/media_kit_video.dart';
 import 'package:os_media_controls/os_media_controls.dart';
 import 'package:provider/provider.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
+import '../mpv/mpv.dart';
+
+import '../../services/plex_client.dart';
+import '../services/plex_api_cache.dart';
 import '../models/plex_media_version.dart';
 import '../models/plex_metadata.dart';
-import '../models/plex_user_profile.dart';
+import '../models/plex_media_info.dart';
+import '../providers/download_provider.dart';
 import '../providers/playback_state_provider.dart';
-import '../providers/plex_client_provider.dart';
-import '../providers/settings_provider.dart';
+import '../services/episode_navigation_service.dart';
+import '../services/media_controls_manager.dart';
+import '../services/playback_initialization_service.dart';
+import '../services/playback_progress_tracker.dart';
+import '../services/offline_watch_sync_service.dart';
 import '../services/settings_service.dart';
+import '../services/track_selection_service.dart';
+import '../services/video_filter_manager.dart';
+import '../providers/user_profile_provider.dart';
 import '../utils/app_logger.dart';
-import '../utils/language_codes.dart';
 import '../utils/orientation_helper.dart';
 import '../utils/platform_detector.dart';
 import '../utils/provider_extensions.dart';
+import '../utils/language_codes.dart';
 import '../utils/video_player_navigation.dart';
 import '../widgets/video_controls/video_controls.dart';
 import '../i18n/strings.g.dart';
@@ -29,6 +42,7 @@ class VideoPlayerScreen extends StatefulWidget {
   final SubtitleTrack? preferredSubtitleTrack;
   final double? preferredPlaybackRate;
   final int selectedMediaIndex;
+  final bool isOffline;
 
   const VideoPlayerScreen({
     super.key,
@@ -37,36 +51,53 @@ class VideoPlayerScreen extends StatefulWidget {
     this.preferredSubtitleTrack,
     this.preferredPlaybackRate,
     this.selectedMediaIndex = 0,
+    this.isOffline = false,
   });
 
   @override
   State<VideoPlayerScreen> createState() => VideoPlayerScreenState();
 }
 
-class VideoPlayerScreenState extends State<VideoPlayerScreen> {
+class VideoPlayerScreenState extends State<VideoPlayerScreen>
+    with WidgetsBindingObserver {
   Player? player;
-  VideoController? controller;
   bool _isPlayerInitialized = false;
-  Timer? _progressTimer;
   PlexMetadata? _nextEpisode;
   PlexMetadata? _previousEpisode;
   bool _isLoadingNext = false;
   bool _showPlayNextDialog = false;
-  PlexClientProvider? _cachedClientProvider;
   bool _isPhone = false;
   List<PlexMediaVersion> _availableVersions = [];
+  PlexMediaInfo? _currentMediaInfo;
   StreamSubscription<PlayerLog>? _logSubscription;
   StreamSubscription<String>? _errorSubscription;
   StreamSubscription<bool>? _playingSubscription;
   StreamSubscription<bool>? _completedSubscription;
-  StreamSubscription<Duration>? _positionSubscription;
   StreamSubscription<dynamic>? _mediaControlSubscription;
+  StreamSubscription<bool>? _bufferingSubscription;
+  StreamSubscription<Tracks>? _trackLoadingSubscription;
   bool _isReplacingWithVideo =
       false; // Flag to skip orientation restoration during video-to-video navigation
+  bool _isDisposingForNavigation = false;
 
-  // BoxFit mode state: 0=contain (letterbox), 1=cover (fill screen), 2=fill (stretch)
-  int _boxFitMode = 0;
-  bool _isPinching = false; // Track if a pinch gesture is occurring
+  // App lifecycle state tracking
+  bool _wasPlayingBeforeInactive = false;
+
+  // Services
+  MediaControlsManager? _mediaControlsManager;
+  PlaybackProgressTracker? _progressTracker;
+  VideoFilterManager? _videoFilterManager;
+  final EpisodeNavigationService _episodeNavigation =
+      EpisodeNavigationService();
+
+  /// Get the correct PlexClient for this metadata's server
+  PlexClient _getClientForMetadata(BuildContext context) {
+    return context.getClientForServer(widget.metadata.serverId!);
+  }
+
+  final ValueNotifier<bool> _isBuffering = ValueNotifier<bool>(
+    false,
+  ); // Track if video is currently buffering
 
   @override
   void initState() {
@@ -85,6 +116,32 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
       appLogger.d('Preferred subtitle track: $subtitleDesc');
     }
 
+    // Update current item in playback state provider
+    try {
+      final playbackState = context.read<PlaybackStateProvider>();
+
+      // Defer both operations until after the first frame to avoid calling
+      // notifyListeners() during build
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        // If this item doesn't have a playQueueItemID, it's a standalone item
+        // Clear any existing queue so next/previous work correctly for this content
+        if (widget.metadata.playQueueItemID == null) {
+          playbackState.clearShuffle();
+        } else {
+          playbackState.setCurrentItem(widget.metadata);
+        }
+      });
+    } catch (e) {
+      // Provider might not be available yet during initialization
+      appLogger.d(
+        'Deferred playback state update (provider not ready)',
+        error: e,
+      );
+    }
+
+    // Register app lifecycle observer
+    WidgetsBinding.instance.addObserver(this);
+
     // Initialize player asynchronously with buffer size from settings
     _initializePlayer();
   }
@@ -93,14 +150,6 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
   void didChangeDependencies() {
     super.didChangeDependencies();
 
-    // Cache provider reference for safe access in dispose()
-    try {
-      _cachedClientProvider = context.plexClient;
-    } catch (e) {
-      appLogger.w('Failed to cache PlexClientProvider', error: e);
-      _cachedClientProvider = null;
-    }
-
     // Cache device type for safe access in dispose()
     try {
       _isPhone = PlatformDetector.isPhone(context);
@@ -108,6 +157,102 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
       appLogger.w('Failed to determine device type', error: e);
       _isPhone = false; // Default to tablet/desktop (all orientations)
     }
+
+    // Update video filter when dependencies change (orientation, screen size, etc.)
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _videoFilterManager?.debouncedUpdateVideoFilter();
+    });
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+
+    switch (state) {
+      case AppLifecycleState.inactive:
+        // App is inactive (Control Center, Notification Screen, etc.)
+        // Pause video but keep media controls for quick resume (mobile only)
+        if (PlatformDetector.isMobile(context)) {
+          if (player != null && _isPlayerInitialized) {
+            _wasPlayingBeforeInactive = player!.state.playing;
+            if (_wasPlayingBeforeInactive) {
+              player!.pause();
+              appLogger.d('Video paused due to app becoming inactive (mobile)');
+            }
+            // Keep media controls active on mobile for quick resume
+            _updateMediaControlsPlaybackState();
+          }
+        }
+        break;
+      case AppLifecycleState.paused:
+        // Clear media controls when app truly goes to background
+        // (we don't support background playback)
+        OsMediaControls.clear();
+        // Disable wakelock when app goes to background
+        WakelockPlus.disable();
+        appLogger.d(
+          'Media controls cleared and wakelock disabled due to app being paused/backgrounded',
+        );
+        break;
+      case AppLifecycleState.resumed:
+        // Restore media controls and wakelock when app is resumed
+        if (_isPlayerInitialized && mounted) {
+          // Re-enable wakelock since we're back in the video player
+          WakelockPlus.enable();
+
+          // Restore media metadata (only in online mode - requires client for artwork URLs)
+          if (!widget.isOffline && _mediaControlsManager != null) {
+            final client = _getClientForMetadata(context);
+            _mediaControlsManager!.updateMetadata(
+              metadata: widget.metadata,
+              client: client,
+              duration: widget.metadata.duration != null
+                  ? Duration(milliseconds: widget.metadata.duration!)
+                  : null,
+            );
+          }
+
+          // Resume playback if it was playing before going inactive
+          if (_wasPlayingBeforeInactive && player != null) {
+            player!.play();
+            _wasPlayingBeforeInactive = false;
+            appLogger.d('Video resumed after returning from inactive state');
+          }
+
+          _updateMediaControlsPlaybackState();
+          appLogger.d(
+            'Media controls restored and wakelock re-enabled on app resume',
+          );
+        }
+        break;
+      case AppLifecycleState.detached:
+      case AppLifecycleState.hidden:
+        // No action needed for these states
+        break;
+    }
+  }
+
+  /// Converts a 2-letter code like "fr", "nl", "ca" to a Plex 3-letter code, or returns null if unknown
+  String? _iso6391ToPlex6392(String? code) {
+    if (code == null || code.isEmpty) return null;
+    // Takes the base "fr" from "fr-FR"
+    final lang = code.split('-').first.toLowerCase();
+
+    // Use LanguageCodes utility to get variations and find the 639-2 code
+    try {
+      final variations = LanguageCodes.getVariations(lang);
+      // The getVariations method returns all variations including 639-2 codes
+      // We need to find the 3-letter code from the variations
+      for (final variation in variations) {
+        if (variation.length == 3) {
+          return variation;
+        }
+      }
+      return null;
+    } catch (e) {
+      // If LanguageCodes is not initialized or fails, return null
+      return null;
+    }
   }
 
   Future<void> _initializePlayer() async {
@@ -120,51 +265,75 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
           .getEnableHardwareDecoding();
       final debugLoggingEnabled = settingsService.getEnableDebugLogging();
 
-      // Create player with configuration
-      player = Player(
-        configuration: PlayerConfiguration(
-          libass: true,
-          libassAndroidFont: 'assets/droid-sans.ttf',
-          libassAndroidFontName: 'Droid Sans Fallback',
-          bufferSize: bufferSizeBytes,
-          logLevel: debugLoggingEnabled ? MPVLogLevel.debug : MPVLogLevel.error,
-          mpvConfiguration: {
-            'sub-font-size': settingsService.getSubtitleFontSize().toString(),
-            'sub-color': settingsService.getSubtitleTextColor(),
-            'sub-border-size': settingsService
-                .getSubtitleBorderSize()
-                .toString(),
-            'sub-border-color': settingsService.getSubtitleBorderColor(),
-            'sub-back-color':
-                '#${(settingsService.getSubtitleBackgroundOpacity() * 255 / 100).toInt().toRadixString(16).padLeft(2, '0').toUpperCase()}${settingsService.getSubtitleBackgroundColor().replaceFirst('#', '')}',
-          },
-        ),
+      // Create player
+      player = Player();
+
+      await player!.setProperty('sub-ass', 'yes'); // Enable libass
+      await player!.setProperty(
+        'demuxer-max-bytes',
+        bufferSizeBytes.toString(),
       );
-      controller = VideoController(
-        player!,
-        configuration: VideoControllerConfiguration(
-          enableHardwareAcceleration: enableHardwareDecoding,
-        ),
+      await player!.setProperty(
+        'msg-level',
+        debugLoggingEnabled ? 'all=debug' : 'all=error',
       );
+      await player!.setProperty(
+        'hwdec',
+        _getHwdecValue(enableHardwareDecoding),
+      );
+
+      // Subtitle styling
+      await player!.setProperty(
+        'sub-font-size',
+        settingsService.getSubtitleFontSize().toString(),
+      );
+      await player!.setProperty(
+        'sub-color',
+        settingsService.getSubtitleTextColor(),
+      );
+      await player!.setProperty(
+        'sub-border-size',
+        settingsService.getSubtitleBorderSize().toString(),
+      );
+      await player!.setProperty(
+        'sub-border-color',
+        settingsService.getSubtitleBorderColor(),
+      );
+      final bgOpacity =
+          (settingsService.getSubtitleBackgroundOpacity() * 255 / 100).toInt();
+      final bgColor = settingsService.getSubtitleBackgroundColor().replaceFirst(
+        '#',
+        '',
+      );
+      await player!.setProperty(
+        'sub-back-color',
+        '#${bgOpacity.toRadixString(16).padLeft(2, '0').toUpperCase()}$bgColor',
+      );
+      await player!.setProperty('sub-ass-override', 'no');
+
+      // Platform-specific settings
+      if (Platform.isIOS) {
+        await player!.setProperty('audio-exclusive', 'yes');
+      }
+
+      // HDR is controlled via custom hdr-enabled property on iOS/macOS/Windows
+      if (Platform.isIOS || Platform.isMacOS || Platform.isWindows) {
+        final enableHDR = settingsService.getEnableHDR();
+        await player!.setProperty('hdr-enabled', enableHDR ? 'yes' : 'no');
+      }
 
       // Apply audio sync offset
       final audioSyncOffset = settingsService.getAudioSyncOffset();
       if (audioSyncOffset != 0) {
         final offsetSeconds = audioSyncOffset / 1000.0;
-        await (player!.platform as dynamic).setProperty(
-          'audio-delay',
-          offsetSeconds.toString(),
-        );
+        await player!.setProperty('audio-delay', offsetSeconds.toString());
       }
 
       // Apply subtitle sync offset
       final subtitleSyncOffset = settingsService.getSubtitleSyncOffset();
       if (subtitleSyncOffset != 0) {
         final offsetSeconds = subtitleSyncOffset / 1000.0;
-        await (player!.platform as dynamic).setProperty(
-          'sub-delay',
-          offsetSeconds.toString(),
-        );
+        await player!.setProperty('sub-delay', offsetSeconds.toString());
       }
 
       // Apply saved volume
@@ -176,10 +345,14 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
         setState(() {
           _isPlayerInitialized = true;
         });
+
+        // Enable wakelock to prevent screen from turning off during playback
+        WakelockPlus.enable();
+        appLogger.d('Wakelock enabled for video playback');
       }
 
       // Get the video URL and start playback
-      _startPlayback();
+      await _startPlayback();
 
       // Set fullscreen mode and orientation based on rotation lock setting
       if (mounted) {
@@ -202,31 +375,31 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
       }
 
       // Listen to playback state changes
-      _playingSubscription = player!.stream.playing.listen(
+      _playingSubscription = player!.streams.playing.listen(
         _onPlayingStateChanged,
       );
 
       // Listen to completion
-      _completedSubscription = player!.stream.completed.listen(
+      _completedSubscription = player!.streams.completed.listen(
         _onVideoCompleted,
       );
 
       // Listen to MPV logs
-      _logSubscription = player!.stream.log.listen(_onPlayerLog);
+      _logSubscription = player!.streams.log.listen(_onPlayerLog);
 
       // Listen to MPV errors
-      _errorSubscription = player!.stream.error.listen(_onPlayerError);
+      _errorSubscription = player!.streams.error.listen(_onPlayerError);
 
-      // Listen to position updates for media controls
-      _positionSubscription = player!.stream.position.listen((_) {
-        _updateMediaControlsPosition();
+      // Listen to buffering state
+      _bufferingSubscription = player!.streams.buffering.listen((isBuffering) {
+        _isBuffering.value = isBuffering;
       });
 
-      // Initialize OS media controls
-      _initializeMediaControls();
+      // Initialize services
+      await _initializeServices();
 
-      // Start periodic progress updates
-      _startProgressTracking();
+      // Ensure play queue exists for sequential playback
+      await _ensurePlayQueue();
 
       // Load next/previous episodes
       _loadAdjacentEpisodes();
@@ -240,191 +413,338 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     }
   }
 
-  Future<void> _loadAdjacentEpisodes() async {
+  /// Add external subtitle tracks to the player
+  Future<void> _addExternalSubtitles(
+    List<SubtitleTrack> externalSubtitles,
+  ) async {
+    if (player == null || externalSubtitles.isEmpty) return;
+
+    appLogger.d(
+      'Adding ${externalSubtitles.length} external subtitle(s) to player',
+    );
+
+    // Wait for media to be ready
+    await _waitForMediaReady();
+
+    for (final subtitleTrack in externalSubtitles) {
+      if (subtitleTrack.uri == null) continue;
+
+      try {
+        await player!.addSubtitleTrack(
+          uri: subtitleTrack.uri!,
+          title: subtitleTrack.title,
+          language: subtitleTrack.language,
+          select: false, // Don't auto-select
+        );
+        appLogger.d(
+          'Added external subtitle: ${subtitleTrack.title ?? subtitleTrack.uri}',
+        );
+      } catch (e) {
+        appLogger.w(
+          'Failed to add external subtitle: ${subtitleTrack.title ?? subtitleTrack.uri}',
+          error: e,
+        );
+      }
+    }
+  }
+
+  /// Wait for media to be ready (duration > 0)
+  Future<void> _waitForMediaReady() async {
+    if (player == null) return;
+
+    int attempts = 0;
+    while (player!.state.duration.inMilliseconds == 0 && attempts < 100) {
+      await Future.delayed(const Duration(milliseconds: 100));
+      attempts++;
+    }
+
+    if (attempts >= 100) {
+      appLogger.w('Media ready timeout - proceeding anyway');
+    }
+  }
+
+  /// Initialize the service layer
+  Future<void> _initializeServices() async {
+    if (!mounted || player == null) return;
+
+    // Get client (null in offline mode)
+    final client = widget.isOffline ? null : _getClientForMetadata(context);
+
+    // Initialize progress tracker
+    if (widget.isOffline) {
+      // Offline mode: queue progress updates for later sync
+      final offlineWatchService = context.read<OfflineWatchSyncService>();
+      _progressTracker = PlaybackProgressTracker(
+        client: null,
+        metadata: widget.metadata,
+        player: player!,
+        isOffline: true,
+        offlineWatchService: offlineWatchService,
+      );
+      _progressTracker!.startTracking();
+    } else if (client != null) {
+      // Online mode: send progress to server
+      _progressTracker = PlaybackProgressTracker(
+        client: client,
+        metadata: widget.metadata,
+        player: player!,
+      );
+      _progressTracker!.startTracking();
+    }
+
+    // Initialize media controls manager
+    _mediaControlsManager = MediaControlsManager();
+
+    // Set up media control event handling
+    _mediaControlSubscription = _mediaControlsManager!.controlEvents.listen((
+      event,
+    ) {
+      if (event is PlayEvent) {
+        appLogger.d('Media control: Play event received');
+        if (player != null) {
+          player!.play();
+          _wasPlayingBeforeInactive = false;
+          appLogger.d(
+            'Cleared _wasPlayingBeforeInactive due to manual play via media controls',
+          );
+          _updateMediaControlsPlaybackState();
+        }
+      } else if (event is PauseEvent) {
+        appLogger.d('Media control: Pause event received');
+        if (player != null) {
+          player!.pause();
+          appLogger.d('Video paused via media controls');
+          _updateMediaControlsPlaybackState();
+        }
+      } else if (event is SeekEvent) {
+        appLogger.d('Media control: Seek event received to ${event.position}');
+        player?.seek(event.position);
+      } else if (event is NextTrackEvent) {
+        appLogger.d('Media control: Next track event received');
+        if (_nextEpisode != null) {
+          _playNext();
+        }
+      } else if (event is PreviousTrackEvent) {
+        appLogger.d('Media control: Previous track event received');
+        if (_previousEpisode != null) {
+          _playPrevious();
+        }
+      }
+    });
+
+    // Update media metadata (client can be null in offline mode - artwork won't be shown)
+    await _mediaControlsManager!.updateMetadata(
+      metadata: widget.metadata,
+      client: client,
+      duration: widget.metadata.duration != null
+          ? Duration(milliseconds: widget.metadata.duration!)
+          : null,
+    );
+
+    if (!mounted) return;
+
+    // Set controls enabled based on content type
+    final playbackState = context.read<PlaybackStateProvider>();
+    final isEpisode = widget.metadata.type.toLowerCase() == 'episode';
+    final isInPlaylist = playbackState.isPlaylistActive;
+
+    await _mediaControlsManager!.setControlsEnabled(
+      canGoNext: isEpisode || isInPlaylist,
+      canGoPrevious: isEpisode || isInPlaylist,
+    );
+
+    // Listen to playing state and update media controls
+    player!.streams.playing.listen((isPlaying) {
+      _updateMediaControlsPlaybackState();
+    });
+
+    // Listen to position updates for media controls
+    player!.streams.position.listen((position) {
+      _mediaControlsManager?.updatePlaybackState(
+        isPlaying: player!.state.playing,
+        position: position,
+        speed: player!.state.rate,
+      );
+    });
+  }
+
+  /// Ensure a play queue exists for sequential episode playback
+  Future<void> _ensurePlayQueue() async {
+    if (!mounted) return;
+
+    // Skip play queue in offline mode (requires server connection)
+    if (widget.isOffline) return;
+
+    // Only create play queues for episodes
     if (widget.metadata.type.toLowerCase() != 'episode') {
       return;
     }
 
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) return;
+      final client = _getClientForMetadata(context);
 
       final playbackState = context.read<PlaybackStateProvider>();
-      final settingsProvider = context.read<SettingsProvider>();
 
-      PlexMetadata? next;
-      PlexMetadata? previous;
-
-      // Check if shuffle mode is active
-      if (playbackState.isShuffleActive) {
-        // Get settings
-        final shuffleOrderNavigation = settingsProvider.shuffleOrderNavigation;
-        final loopQueue = settingsProvider.shuffleLoopQueue;
-
-        if (shuffleOrderNavigation) {
-          // Use shuffled order for next/previous
-          next = playbackState.getNextEpisode(
-            widget.metadata.ratingKey,
-            loopQueue: loopQueue,
-          );
-          previous = playbackState.getPreviousEpisode(
-            widget.metadata.ratingKey,
-          );
-        } else {
-          // Use chronological order even in shuffle mode
-          next = await client.findAdjacentEpisode(widget.metadata, 1);
-          previous = await client.findAdjacentEpisode(widget.metadata, -1);
-        }
-      } else {
-        // Use normal sequential episode loading
-        next = await client.findAdjacentEpisode(widget.metadata, 1);
-        previous = await client.findAdjacentEpisode(widget.metadata, -1);
+      // Determine the show's rating key
+      // For episodes, grandparentRatingKey points to the show
+      final showRatingKey = widget.metadata.grandparentRatingKey;
+      if (showRatingKey == null) {
+        appLogger.d(
+          'Episode missing grandparentRatingKey, skipping play queue creation',
+        );
+        return;
       }
 
+      // Check if there's already an active queue
+      final existingContextKey = playbackState.shuffleContextKey;
+      final isQueueActive = playbackState.isQueueActive;
+
+      if (isQueueActive) {
+        // A queue already exists (could be shuffle, playlist, or sequential)
+        // Just update the current item, don't create a new queue
+        playbackState.setCurrentItem(widget.metadata);
+        appLogger.d('Using existing play queue (context: $existingContextKey)');
+        return;
+      }
+
+      // Create a new sequential play queue for the show
+      appLogger.d('Creating sequential play queue for show $showRatingKey');
+      final playQueue = await client.createShowPlayQueue(
+        showRatingKey: showRatingKey,
+        shuffle: 0, // Sequential order
+        startingEpisodeKey: widget.metadata.ratingKey,
+      );
+
+      if (playQueue != null &&
+          playQueue.items != null &&
+          playQueue.items!.isNotEmpty) {
+        // Initialize playback state with the play queue
+        await playbackState.setPlaybackFromPlayQueue(
+          playQueue,
+          showRatingKey,
+          serverId: widget.metadata.serverId,
+          serverName: widget.metadata.serverName,
+        );
+
+        // Set the client for loading more items
+        playbackState.setClient(client);
+
+        appLogger.d(
+          'Sequential play queue created with ${playQueue.items!.length} items',
+        );
+      }
+    } catch (e) {
+      // Non-critical: Sequential playback will fall back to non-queue navigation
+      appLogger.d(
+        'Could not create play queue for sequential playback',
+        error: e,
+      );
+    }
+  }
+
+  Future<void> _loadAdjacentEpisodes() async {
+    if (!mounted) return;
+
+    // Skip loading adjacent episodes in offline mode (requires server connection)
+    if (widget.isOffline) return;
+
+    try {
+      // Use server-specific client for this metadata
+      final client = _getClientForMetadata(context);
+
+      // Load adjacent episodes using the service
+      final adjacentEpisodes = await _episodeNavigation.loadAdjacentEpisodes(
+        context: context,
+        client: client,
+        metadata: widget.metadata,
+      );
+
       if (mounted) {
         setState(() {
-          _nextEpisode = next;
-          _previousEpisode = previous;
+          _nextEpisode = adjacentEpisodes.next;
+          _previousEpisode = adjacentEpisodes.previous;
         });
       }
     } catch (e) {
-      // Silently handle errors
+      // Non-critical: Failed to load next/previous episode metadata
+      appLogger.d('Could not load adjacent episodes', error: e);
     }
   }
 
   Future<void> _startPlayback() async {
+    if (!mounted) return;
+
     try {
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) {
-        throw Exception('No client available');
+      PlaybackInitializationResult result;
+
+      if (widget.isOffline) {
+        // Offline mode: get video path from downloads without requiring server
+        result = await _startOfflinePlayback();
+      } else {
+        // Online mode: use server-specific client
+        final client = _getClientForMetadata(context);
+        final playbackService = PlaybackInitializationService(
+          client: client,
+          database: PlexApiCache.instance.database,
+        );
+        result = await playbackService.getPlaybackData(
+          metadata: widget.metadata,
+          selectedMediaIndex: widget.selectedMediaIndex,
+          preferOffline: true, // Use downloaded file if available
+        );
       }
 
-      // Get consolidated playback data (URL, media info, and versions) in a single API call
-      final playbackData = await client.getVideoPlaybackData(
-        widget.metadata.ratingKey,
-        mediaIndex: widget.selectedMediaIndex,
-      );
+      // Open video through Player
+      if (result.videoUrl != null) {
+        // Pass resume position if available
+        final resumePosition = widget.metadata.viewOffset != null
+            ? Duration(milliseconds: widget.metadata.viewOffset!)
+            : null;
+        await player!.open(Media(result.videoUrl!, start: resumePosition));
+      }
 
-      if (playbackData.hasValidVideoUrl) {
-        final videoUrl = playbackData.videoUrl!;
-        final mediaInfo = playbackData.mediaInfo;
+      // Update available versions from the playback data
+      if (mounted) {
+        setState(() {
+          _availableVersions = result.availableVersions.cast();
+          _currentMediaInfo = result.mediaInfo;
+        });
 
-        // Update available versions from the playback data
-        if (mounted) {
-          setState(() {
-            _availableVersions = playbackData.availableVersions;
-          });
-        }
-
-        // Build list of external subtitle tracks for media_kit
-        final externalSubtitles = <SubtitleTrack>[];
-        if (mediaInfo != null) {
-          final externalTracks = mediaInfo.subtitleTracks
-              .where((track) => track.isExternal)
-              .toList();
-
-          if (externalTracks.isNotEmpty) {
-            appLogger.d(
-              'Found ${externalTracks.length} external subtitle track(s)',
-            );
-          }
-
-          for (final plexTrack in externalTracks) {
-            try {
-              // Skip if no auth token is available
-              final token = client.config.token;
-              if (token == null) {
-                appLogger.w('No auth token available for external subtitles');
-                continue;
-              }
-
-              final url = plexTrack.getSubtitleUrl(
-                client.config.baseUrl,
-                token,
-              );
-
-              // Skip if URL couldn't be constructed
-              if (url == null) continue;
-
-              externalSubtitles.add(
-                SubtitleTrack.uri(
-                  url,
-                  title:
-                      plexTrack.displayTitle ??
-                      plexTrack.language ??
-                      'Track ${plexTrack.id}',
-                  language: plexTrack.languageCode,
-                ),
-              );
-            } catch (e) {
-              // Silent fallback - log error but continue with other subtitles
-              appLogger.w(
-                'Failed to add external subtitle track ${plexTrack.id}',
-                error: e,
-              );
-            }
-          }
-        }
-
-        // Open video (without external subtitles in Media constructor)
-        await player!.open(Media(videoUrl), play: false);
-
-        // Wait for media to be ready (duration > 0)
-        int attempts = 0;
-        while (player!.state.duration.inMilliseconds == 0 && attempts < 100) {
-          await Future.delayed(const Duration(milliseconds: 100));
-          attempts++;
-        }
-
-        // Add external subtitle tracks without auto-selecting them
-        if (externalSubtitles.isNotEmpty) {
-          appLogger.d(
-            'Adding ${externalSubtitles.length} external subtitle(s) to player',
+        // Initialize video filter manager with player and available versions
+        if (player != null) {
+          _videoFilterManager = VideoFilterManager(
+            player: player!,
+            availableVersions: _availableVersions,
+            selectedMediaIndex: widget.selectedMediaIndex,
           );
-
-          final nativePlayer = player!.platform as dynamic;
-
-          for (final subtitleTrack in externalSubtitles) {
-            try {
-              // Use mpv's sub-add with 'auto' flag to avoid auto-selection
-              await nativePlayer.command([
-                'sub-add',
-                subtitleTrack.id,
-                'auto',
-                subtitleTrack.title ?? 'external',
-                subtitleTrack.language ?? 'auto',
-              ]);
-            } catch (e) {
-              appLogger.w(
-                'Failed to add external subtitle: ${subtitleTrack.title}',
-                error: e,
-              );
-            }
-          }
+          // Update video filter once dimensions are available
+          _videoFilterManager!.updateVideoFilter();
         }
 
-        // Set up playback position if resuming
-        if (widget.metadata.viewOffset != null &&
-            widget.metadata.viewOffset! > 0) {
-          final resumePosition = Duration(
-            milliseconds: widget.metadata.viewOffset!,
-          );
-          await player!.seek(resumePosition);
+        // Add external subtitles to the player
+        if (result.externalSubtitles.isNotEmpty) {
+          await _addExternalSubtitles(result.externalSubtitles);
         }
+      }
 
-        // Start playback after seeking
-        await player!.play();
+      // Set up track loading subscription to apply track selection when tracks are loaded
+      _trackLoadingSubscription?.cancel();
+      _trackLoadingSubscription = player!.streams.tracks.listen((tracks) {
+        // Only process when we have actual tracks loaded
+        if (tracks.audio.isEmpty && tracks.subtitle.isEmpty) return;
 
-        // Wait for tracks to be loaded, then apply preferred tracks
-        _waitForTracksAndApply();
-      } else {
-        if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(t.messages.fileInfoNotAvailable)),
-          );
-        }
+        // Cancel subscription after first load to avoid re-applying on every track change
+        _trackLoadingSubscription?.cancel();
+        _trackLoadingSubscription = null;
+
+        // Apply track selection using the service
+        _applyTrackSelection();
+      });
+    } on PlaybackException catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(e.message)));
       }
     } catch (e) {
       if (mounted) {
@@ -435,52 +755,82 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     }
   }
 
+  /// Start playback for offline/downloaded content
+  Future<PlaybackInitializationResult> _startOfflinePlayback() async {
+    final downloadProvider = context.read<DownloadProvider>();
+
+    // Debug: log metadata info
+    appLogger.d(
+      'Offline playback - serverId: ${widget.metadata.serverId}, ratingKey: ${widget.metadata.ratingKey}',
+    );
+
+    final globalKey =
+        '${widget.metadata.serverId}:${widget.metadata.ratingKey}';
+    appLogger.d('Looking up video with globalKey: $globalKey');
+
+    final videoPath = await downloadProvider.getVideoFilePath(globalKey);
+    if (videoPath == null) {
+      appLogger.e('Video file path not found for globalKey: $globalKey');
+      throw PlaybackException(t.messages.fileInfoNotAvailable);
+    }
+
+    appLogger.d('Starting offline playback: $videoPath');
+
+    return PlaybackInitializationResult(
+      availableVersions: [],
+      videoUrl: 'file://$videoPath',
+      mediaInfo: null,
+      externalSubtitles: const [],
+      isOffline: true,
+    );
+  }
+
   /// Cycle through BoxFit modes: contain → cover → fill → contain (for button)
   void _cycleBoxFitMode() {
     setState(() {
-      _boxFitMode = (_boxFitMode + 1) % 3;
+      _videoFilterManager?.cycleBoxFitMode();
     });
   }
 
   /// Toggle between contain and cover modes only (for pinch gesture)
   void _toggleContainCover() {
     setState(() {
-      _boxFitMode = _boxFitMode == 0 ? 1 : 0;
+      _videoFilterManager?.toggleContainCover();
     });
   }
 
-  /// Get current BoxFit based on mode
-  BoxFit get _getCurrentBoxFit {
-    switch (_boxFitMode) {
-      case 0:
-        return BoxFit.contain;
-      case 1:
-        return BoxFit.cover;
-      case 2:
-        return BoxFit.fill;
-      default:
-        return BoxFit.contain;
-    }
-  }
-
   @override
   void dispose() {
-    // Stop progress tracking
-    _progressTimer?.cancel();
+    // Unregister app lifecycle observer
+    WidgetsBinding.instance.removeObserver(this);
+
+    // Dispose value notifiers
+    _isBuffering.dispose();
+
+    // Stop progress tracking and send final state
+    _progressTracker?.sendProgress('stopped');
+    _progressTracker?.stopTracking();
+    _progressTracker?.dispose();
+
+    // Dispose video filter manager
+    _videoFilterManager?.dispose();
 
     // Cancel stream subscriptions
     _playingSubscription?.cancel();
     _completedSubscription?.cancel();
     _logSubscription?.cancel();
     _errorSubscription?.cancel();
-    _positionSubscription?.cancel();
     _mediaControlSubscription?.cancel();
+    _bufferingSubscription?.cancel();
+    _trackLoadingSubscription?.cancel();
 
-    // Clear OS media controls completely
-    OsMediaControls.clear();
+    // Clear media controls and dispose manager
+    _mediaControlsManager?.clear();
+    _mediaControlsManager?.dispose();
 
-    // Send final stopped state
-    _sendProgress('stopped');
+    // Disable wakelock when leaving the video player
+    WakelockPlus.disable();
+    appLogger.d('Wakelock disabled');
 
     // Restore system UI and orientation preferences (skip if navigating to another video)
     if (!_isReplacingWithVideo) {
@@ -512,595 +862,14 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     super.dispose();
   }
 
-  void _startProgressTracking() {
-    // Send progress update every 10 seconds
-    _progressTimer = Timer.periodic(const Duration(seconds: 10), (timer) {
-      if (player?.state.playing ?? false) {
-        _sendProgress('playing');
-      }
-    });
-  }
-
-  /// Generic track matching for audio and subtitle tracks
-  /// Returns the best matching track based on hierarchical criteria:
-  /// 1. Exact match (id + title + language)
-  /// 2. Partial match (title + language)
-  /// 3. Language-only match
-  T? _findBestTrackMatch<T>(
-    List<T> availableTracks,
-    T preferred,
-    String Function(T) getId,
-    String? Function(T) getTitle,
-    String? Function(T) getLanguage,
-  ) {
-    if (availableTracks.isEmpty) return null;
-
-    // Filter out auto and no tracks
-    final validTracks = availableTracks
-        .where((t) => getId(t) != 'auto' && getId(t) != 'no')
-        .toList();
-    if (validTracks.isEmpty) return null;
-
-    final preferredId = getId(preferred);
-    final preferredTitle = getTitle(preferred);
-    final preferredLanguage = getLanguage(preferred);
-
-    // Try to match: id, title, and language
-    for (var track in validTracks) {
-      if (getId(track) == preferredId &&
-          getTitle(track) == preferredTitle &&
-          getLanguage(track) == preferredLanguage) {
-        return track;
-      }
-    }
-
-    // Try to match: title and language
-    for (var track in validTracks) {
-      if (getTitle(track) == preferredTitle &&
-          getLanguage(track) == preferredLanguage) {
-        return track;
-      }
-    }
-
-    // Try to match: language only
-    for (var track in validTracks) {
-      if (getLanguage(track) == preferredLanguage) {
-        return track;
-      }
-    }
-
-    return null;
-  }
-
-  AudioTrack? _findBestAudioMatch(
-    List<AudioTrack> availableTracks,
-    AudioTrack preferred,
-  ) {
-    return _findBestTrackMatch<AudioTrack>(
-      availableTracks,
-      preferred,
-      (t) => t.id,
-      (t) => t.title,
-      (t) => t.language,
-    );
-  }
-
-  AudioTrack? _findAudioTrackByProfile(
-    List<AudioTrack> availableTracks,
-    PlexUserProfile profile,
-  ) {
-    appLogger.d('Audio track selection using user profile');
-    appLogger.d(
-      'Profile settings - autoSelectAudio: ${profile.autoSelectAudio}, defaultAudioLanguage: ${profile.defaultAudioLanguage}, defaultAudioLanguages: ${profile.defaultAudioLanguages}',
-    );
-
-    if (availableTracks.isEmpty || !profile.autoSelectAudio) {
-      appLogger.d(
-        'Cannot use profile: ${availableTracks.isEmpty ? "No tracks available" : "autoSelectAudio is false"}',
-      );
-      return null;
-    }
-
-    // Build list of preferred languages
-    final preferredLanguages = <String>[];
-    if (profile.defaultAudioLanguage != null &&
-        profile.defaultAudioLanguage!.isNotEmpty) {
-      preferredLanguages.add(profile.defaultAudioLanguage!);
-    }
-    if (profile.defaultAudioLanguages != null) {
-      preferredLanguages.addAll(profile.defaultAudioLanguages!);
-    }
-
-    if (preferredLanguages.isEmpty) {
-      appLogger.d('Cannot use profile: No defaultAudioLanguage(s) specified');
-      return null;
-    }
-
-    appLogger.d('Preferred languages: ${preferredLanguages.join(", ")}');
-
-    // Try to find track matching any preferred language
-    for (final preferredLanguage in preferredLanguages) {
-      // Get all possible language code variations (e.g., "en" → ["en", "eng"])
-      final languageVariations = LanguageCodes.getVariations(preferredLanguage);
-      appLogger.d(
-        'Checking language variations for "$preferredLanguage": ${languageVariations.join(", ")}',
-      );
-
-      for (var track in availableTracks) {
-        final trackLang = track.language?.toLowerCase();
-        if (trackLang != null && languageVariations.contains(trackLang)) {
-          appLogger.d(
-            'Found audio track matching profile language "$preferredLanguage" (matched: "$trackLang"): ${track.title ?? "Track ${track.id}"}',
-          );
-          return track;
-        }
-      }
-    }
-
-    appLogger.d(
-      'No audio track found matching profile languages or their variations',
-    );
-    return null;
-  }
-
-  SubtitleTrack? _findBestSubtitleMatch(
-    List<SubtitleTrack> availableTracks,
-    SubtitleTrack preferred,
-  ) {
-    // Handle special "no subtitles" case
-    if (preferred.id == 'no') {
-      return SubtitleTrack.no();
-    }
-
-    return _findBestTrackMatch<SubtitleTrack>(
-      availableTracks,
-      preferred,
-      (t) => t.id,
-      (t) => t.title,
-      (t) => t.language,
-    );
-  }
-
-  SubtitleTrack? _findSubtitleTrackByProfile(
-    List<SubtitleTrack> availableTracks,
-    PlexUserProfile profile, {
-    AudioTrack? selectedAudioTrack,
-  }) {
-    appLogger.d('Subtitle track selection using user profile');
-    appLogger.d(
-      'Profile settings - autoSelectSubtitle: ${profile.autoSelectSubtitle}, defaultSubtitleLanguage: ${profile.defaultSubtitleLanguage}, defaultSubtitleLanguages: ${profile.defaultSubtitleLanguages}, defaultSubtitleForced: ${profile.defaultSubtitleForced}, defaultSubtitleAccessibility: ${profile.defaultSubtitleAccessibility}',
-    );
-
-    if (availableTracks.isEmpty) {
-      appLogger.d('Cannot use profile: No subtitle tracks available');
-      return null;
-    }
-
-    // Mode 0: Manually selected - return OFF
-    if (profile.autoSelectSubtitle == 0) {
-      appLogger.d(
-        'Profile specifies manual mode (autoSelectSubtitle=0) - Subtitles OFF',
-      );
-      return SubtitleTrack.no();
-    }
-
-    // Mode 1: Shown with foreign audio
-    if (profile.autoSelectSubtitle == 1) {
-      appLogger.d(
-        'Profile specifies foreign audio mode (autoSelectSubtitle=1)',
-      );
-
-      // Check if audio language matches user's preferred subtitle language
-      if (selectedAudioTrack != null &&
-          profile.defaultSubtitleLanguage != null) {
-        final audioLang = selectedAudioTrack.language?.toLowerCase();
-        final prefLang = profile.defaultSubtitleLanguage!.toLowerCase();
-        final languageVariations = LanguageCodes.getVariations(prefLang);
-
-        appLogger.d(
-          'Checking if audio is foreign - audio: $audioLang, preferred subtitle lang: $prefLang',
-        );
-
-        // If audio matches preferred language, no subtitles needed
-        if (audioLang != null && languageVariations.contains(audioLang)) {
-          appLogger.d('Audio matches preferred language - Subtitles OFF');
-          return SubtitleTrack.no();
-        }
-        appLogger.d('Foreign audio detected - enabling subtitles');
-      }
-      // Foreign audio detected or cannot determine, enable subtitles
-    }
-
-    // Mode 2: Always enabled (or continuing from mode 1 with foreign audio)
-    appLogger.d('Selecting subtitle track based on preferences');
-
-    // Build list of preferred languages
-    final preferredLanguages = <String>[];
-    if (profile.defaultSubtitleLanguage != null &&
-        profile.defaultSubtitleLanguage!.isNotEmpty) {
-      preferredLanguages.add(profile.defaultSubtitleLanguage!);
-    }
-    if (profile.defaultSubtitleLanguages != null) {
-      preferredLanguages.addAll(profile.defaultSubtitleLanguages!);
-    }
-
-    if (preferredLanguages.isEmpty) {
-      appLogger.d(
-        'Cannot use profile: No defaultSubtitleLanguage(s) specified',
-      );
-      return null;
-    }
-
-    appLogger.d('Preferred languages: ${preferredLanguages.join(", ")}');
-
-    // Apply filtering based on preferences
-    var candidateTracks = availableTracks;
-
-    // Filter by SDH (defaultSubtitleAccessibility: 0-3)
-    candidateTracks = _filterSubtitlesBySDH(
-      candidateTracks,
-      profile.defaultSubtitleAccessibility,
-    );
-
-    // Filter by forced subtitle preference (defaultSubtitleForced: 0-3)
-    candidateTracks = _filterSubtitlesByForced(
-      candidateTracks,
-      profile.defaultSubtitleForced,
-    );
-
-    // If no candidates after filtering, relax filters
-    if (candidateTracks.isEmpty) {
-      appLogger.d('No tracks match strict filters, relaxing filters');
-      candidateTracks = availableTracks;
-    }
-
-    // Try to find track matching any preferred language
-    for (final preferredLanguage in preferredLanguages) {
-      final languageVariations = LanguageCodes.getVariations(preferredLanguage);
-      appLogger.d(
-        'Checking language variations for "$preferredLanguage": ${languageVariations.join(", ")}',
-      );
-
-      for (var track in candidateTracks) {
-        final trackLang = track.language?.toLowerCase();
-        if (trackLang != null && languageVariations.contains(trackLang)) {
-          appLogger.d(
-            'Found subtitle matching profile language "$preferredLanguage" (matched: "$trackLang"): ${track.title ?? "Track ${track.id}"}',
-          );
-          return track;
-        }
-      }
-    }
-
-    appLogger.d(
-      'No subtitle track found matching profile languages or their variations',
-    );
-    return null;
-  }
-
-  /// Filters subtitle tracks based on SDH (Subtitles for Deaf or Hard-of-Hearing) preference
-  ///
-  /// Values:
-  /// - 0: Prefer non-SDH subtitles
-  /// - 1: Prefer SDH subtitles
-  /// - 2: Only show SDH subtitles
-  /// - 3: Only show non-SDH subtitles
-  List<SubtitleTrack> _filterSubtitlesBySDH(
-    List<SubtitleTrack> tracks,
-    int preference,
-  ) {
-    if (preference == 0 || preference == 1) {
-      // Prefer but don't require
-      final preferSDH = preference == 1;
-      final preferred = tracks.where((t) => _isSDH(t) == preferSDH).toList();
-      if (preferred.isNotEmpty) {
-        appLogger.d(
-          'Applying SDH preference: ${preferSDH ? "prefer SDH" : "prefer non-SDH"} (${preferred.length} tracks)',
-        );
-        return preferred;
-      }
-      appLogger.d('No tracks match SDH preference, using all tracks');
-      return tracks;
-    } else if (preference == 2) {
-      // Only SDH
-      final filtered = tracks.where(_isSDH).toList();
-      appLogger.d('Filtering to SDH only (${filtered.length} tracks)');
-      return filtered;
-    } else if (preference == 3) {
-      // Only non-SDH
-      final filtered = tracks.where((t) => !_isSDH(t)).toList();
-      appLogger.d('Filtering to non-SDH only (${filtered.length} tracks)');
-      return filtered;
-    }
-    return tracks;
-  }
-
-  /// Filters subtitle tracks based on forced subtitle preference
-  ///
-  /// Values:
-  /// - 0: Prefer non-forced subtitles
-  /// - 1: Prefer forced subtitles
-  /// - 2: Only show forced subtitles
-  /// - 3: Only show non-forced subtitles
-  List<SubtitleTrack> _filterSubtitlesByForced(
-    List<SubtitleTrack> tracks,
-    int preference,
-  ) {
-    if (preference == 0 || preference == 1) {
-      // Prefer but don't require
-      final preferForced = preference == 1;
-      final preferred = tracks
-          .where((t) => _isForced(t) == preferForced)
-          .toList();
-      if (preferred.isNotEmpty) {
-        appLogger.d(
-          'Applying forced preference: ${preferForced ? "prefer forced" : "prefer non-forced"} (${preferred.length} tracks)',
-        );
-        return preferred;
-      }
-      appLogger.d('No tracks match forced preference, using all tracks');
-      return tracks;
-    } else if (preference == 2) {
-      // Only forced
-      final filtered = tracks.where(_isForced).toList();
-      appLogger.d('Filtering to forced only (${filtered.length} tracks)');
-      return filtered;
-    } else if (preference == 3) {
-      // Only non-forced
-      final filtered = tracks.where((t) => !_isForced(t)).toList();
-      appLogger.d('Filtering to non-forced only (${filtered.length} tracks)');
-      return filtered;
-    }
-    return tracks;
-  }
-
-  /// Checks if a subtitle track is SDH (Subtitles for Deaf or Hard-of-Hearing)
-  ///
-  /// Since media_kit may not expose this directly, we infer from the title
-  bool _isSDH(SubtitleTrack track) {
-    final title = track.title?.toLowerCase() ?? '';
-
-    // Look for common SDH indicators
-    return title.contains('sdh') ||
-        title.contains('cc') ||
-        title.contains('hearing impaired') ||
-        title.contains('deaf');
-  }
-
-  /// Checks if a subtitle track is forced
-  bool _isForced(SubtitleTrack track) {
-    final title = track.title?.toLowerCase() ?? '';
-    return title.contains('forced');
-  }
-
-  void _waitForTracksAndApply() async {
-    // Helper function to process tracks
-    Future<void> processTracks(Tracks tracks) async {
-      appLogger.d('Starting track selection process');
-
-      // Get profile settings for track selection
-      final profileSettings = context.profileSettings;
-
-      // Get real tracks (excluding auto and no)
-      final realAudioTracks = tracks.audio
-          .where((t) => t.id != 'auto' && t.id != 'no')
-          .toList();
-      final realSubtitleTracks = tracks.subtitle
-          .where((t) => t.id != 'auto' && t.id != 'no')
-          .toList();
-
-      appLogger.d('Available audio tracks: ${realAudioTracks.length}');
-      for (var track in realAudioTracks) {
-        appLogger.d(
-          '  - ${track.title ?? "Track ${track.id}"} (${track.language ?? "unknown"}) ${track.isDefault == true ? "[DEFAULT]" : ""}',
-        );
-      }
-      appLogger.d('Available subtitle tracks: ${realSubtitleTracks.length}');
-      for (var track in realSubtitleTracks) {
-        appLogger.d(
-          '  - ${track.title ?? "Track ${track.id}"} (${track.language ?? "unknown"}) ${track.isDefault == true ? "[DEFAULT]" : ""}',
-        );
-      }
-
-      // Select audio track with priority: preferred > user profile > default > first
-      appLogger.d('Audio track selection');
-      if (realAudioTracks.isNotEmpty) {
-        AudioTrack? trackToSelect;
-
-        // Priority 1: Try to match preferred track from navigation
-        if (widget.preferredAudioTrack != null) {
-          appLogger.d('Priority 1: Checking preferred track from navigation');
-          appLogger.d(
-            '  Preferred: ${widget.preferredAudioTrack!.title ?? "Track ${widget.preferredAudioTrack!.id}"} (${widget.preferredAudioTrack!.language ?? "unknown"})',
-          );
-          trackToSelect = _findBestAudioMatch(
-            realAudioTracks,
-            widget.preferredAudioTrack!,
-          );
-          if (trackToSelect != null) {
-            appLogger.d('  Matched preferred track');
-          } else {
-            appLogger.d('  No match found for preferred track');
-          }
-        } else {
-          appLogger.d('Priority 1: No preferred track from navigation');
-        }
-
-        // Priority 2: If no preferred track matched, try user profile preferences
-        if (trackToSelect == null && profileSettings != null) {
-          appLogger.d('Priority 2: Checking user profile preferences');
-          trackToSelect = _findAudioTrackByProfile(
-            realAudioTracks,
-            profileSettings,
-          );
-        } else if (trackToSelect == null) {
-          appLogger.d('Priority 2: No user profile available');
-        }
-
-        // Priority 3: If no match, use default or first track
-        if (trackToSelect == null) {
-          appLogger.d('Priority 3: Using default or first available track');
-          trackToSelect = realAudioTracks.firstWhere(
-            (t) => t.isDefault == true,
-            orElse: () => realAudioTracks.first,
-          );
-          final isDefault = trackToSelect.isDefault == true;
-          appLogger.d(
-            '  Selected ${isDefault ? "default" : "first"} track: ${trackToSelect.title ?? "Track ${trackToSelect.id}"} (${trackToSelect.language ?? "unknown"})',
-          );
-        }
-
-        appLogger.i(
-          'Final audio selection: ${trackToSelect.title ?? "Track ${trackToSelect.id}"} (${trackToSelect.language ?? "unknown"})',
-        );
-        player!.setAudioTrack(trackToSelect);
-      } else {
-        appLogger.d('No audio tracks available');
-      }
-
-      // Select subtitle track with priority: preferred > user profile > default > off
-      appLogger.d('Subtitle track selection');
-      SubtitleTrack? subtitleToSelect;
-
-      // Priority 1: Try preferred track from navigation (always wins)
-      if (widget.preferredSubtitleTrack != null) {
-        appLogger.d('Priority 1: Checking preferred track from navigation');
-        if (widget.preferredSubtitleTrack!.id == 'no') {
-          appLogger.d('  Preferred: OFF');
-          subtitleToSelect = SubtitleTrack.no();
-          appLogger.d('  Using preferred setting: Subtitles OFF');
-        } else if (realSubtitleTracks.isNotEmpty) {
-          appLogger.d(
-            '  Preferred: ${widget.preferredSubtitleTrack!.title ?? "Track ${widget.preferredSubtitleTrack!.id}"} (${widget.preferredSubtitleTrack!.language ?? "unknown"})',
-          );
-          subtitleToSelect = _findBestSubtitleMatch(
-            realSubtitleTracks,
-            widget.preferredSubtitleTrack!,
-          );
-          if (subtitleToSelect != null) {
-            appLogger.d('  Matched preferred track');
-          } else {
-            appLogger.d('  No match found for preferred track');
-          }
-        }
-      } else {
-        appLogger.d('Priority 1: No preferred track from navigation');
-      }
-
-      // Priority 2: If no preferred match, apply user profile preferences
-      if (subtitleToSelect == null &&
-          profileSettings != null &&
-          realSubtitleTracks.isNotEmpty) {
-        appLogger.d('Priority 2: Checking user profile preferences');
-        // Get the currently selected audio track
-        final currentAudioTrack = realAudioTracks.firstWhere(
-          (t) => t.id == player!.state.track.audio.id,
-          orElse: () => realAudioTracks.first,
-        );
-        subtitleToSelect = _findSubtitleTrackByProfile(
-          realSubtitleTracks,
-          profileSettings,
-          selectedAudioTrack: currentAudioTrack,
-        );
-      } else if (subtitleToSelect == null && realSubtitleTracks.isNotEmpty) {
-        appLogger.d('Priority 2: No user profile available');
-      }
-
-      // Priority 3: If no profile match, check for default subtitle
-      if (subtitleToSelect == null && realSubtitleTracks.isNotEmpty) {
-        appLogger.d('Priority 3: Checking for default subtitle track');
-        final defaultTrackIndex = realSubtitleTracks.indexWhere(
-          (t) => t.isDefault == true,
-        );
-        if (defaultTrackIndex != -1) {
-          subtitleToSelect = realSubtitleTracks[defaultTrackIndex];
-          appLogger.d(
-            '  Found default track: ${subtitleToSelect.title ?? "Track ${subtitleToSelect.id}"} (${subtitleToSelect.language ?? "unknown"})',
-          );
-        } else {
-          appLogger.d('  No default subtitle track found');
-        }
-      }
-
-      // If still no subtitle selected, turn off
-      if (subtitleToSelect == null) {
-        appLogger.d('Priority 4: No subtitle selected - Subtitles OFF');
-        subtitleToSelect = SubtitleTrack.no();
-      }
-
-      final finalSubtitle = subtitleToSelect.id == 'no'
-          ? 'OFF'
-          : '${subtitleToSelect.title ?? "Track ${subtitleToSelect.id}"} (${subtitleToSelect.language ?? "unknown"})';
-      appLogger.i('Final subtitle selection: $finalSubtitle');
-      player!.setSubtitleTrack(subtitleToSelect);
-
-      // Set playback rate if preferred rate was provided
-      if (widget.preferredPlaybackRate != null) {
-        appLogger.d(
-          'Setting preferred playback rate: ${widget.preferredPlaybackRate}x',
-        );
-        player!.setRate(widget.preferredPlaybackRate!);
-      }
-
-      appLogger.d('Track selection complete');
-    }
-
-    // Check if tracks are already available in current state
-    final currentTracks = player!.state.tracks;
-    if (currentTracks.audio.isNotEmpty || currentTracks.subtitle.isNotEmpty) {
-      await processTracks(currentTracks);
-      return;
-    }
-
-    // If not, listen to tracks stream for when they become available
-    bool applied = false;
-    final subscription = player!.stream.tracks.listen((tracks) async {
-      // Check if tracks are loaded (have at least one track) and not yet applied
-      if (!applied && (tracks.audio.isNotEmpty || tracks.subtitle.isNotEmpty)) {
-        applied = true;
-        await processTracks(tracks);
-      }
-    });
-
-    // Cancel subscription after timeout
-    Future.delayed(const Duration(seconds: 5), () {
-      subscription.cancel();
-    });
-  }
-
   void _onPlayingStateChanged(bool isPlaying) {
     // Send timeline update when playback state changes
-    _sendProgress(isPlaying ? 'playing' : 'paused');
+    _progressTracker?.sendProgress(isPlaying ? 'playing' : 'paused');
 
     // Update OS media controls playback state
     _updateMediaControlsPlaybackState();
   }
 
-  void _sendProgress(String state) {
-    // Don't send misleading data if player isn't available
-    if (player == null) return;
-
-    final position = player!.state.position.inMilliseconds;
-    final duration = player!.state.duration.inMilliseconds;
-
-    if (duration > 0) {
-      final clientProvider = _cachedClientProvider;
-      final client = clientProvider?.client;
-      if (client == null) return;
-
-      client
-          .updateProgress(
-            widget.metadata.ratingKey,
-            time: position,
-            state: state,
-            duration: duration,
-          )
-          .catchError((error) {
-            // Silently handle errors - don't interrupt playback
-          });
-    }
-  }
-
   void _onVideoCompleted(bool completed) {
     if (completed && _nextEpisode != null && !_showPlayNextDialog) {
       setState(() {
@@ -1111,24 +880,24 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
 
   void _onPlayerLog(PlayerLog log) {
     // Map MPV log levels to app logger levels
-    switch (log.level.toLowerCase()) {
-      case 'fatal':
-      case 'error':
+    switch (log.level) {
+      case PlayerLogLevel.fatal:
+      case PlayerLogLevel.error:
         appLogger.e('[MPV:${log.prefix}] ${log.text}');
         break;
-      case 'warn':
+      case PlayerLogLevel.warn:
         appLogger.w('[MPV:${log.prefix}] ${log.text}');
         break;
-      case 'info':
+      case PlayerLogLevel.info:
         appLogger.i('[MPV:${log.prefix}] ${log.text}');
         break;
-      case 'debug':
-      case 'trace':
-      case 'v':
+      case PlayerLogLevel.debug:
+      case PlayerLogLevel.trace:
+      case PlayerLogLevel.verbose:
         appLogger.d('[MPV:${log.prefix}] ${log.text}');
         break;
       default:
-        appLogger.d('[MPV:${log.prefix}:${log.level}] ${log.text}');
+        appLogger.d('[MPV:${log.prefix}:${log.level.name}] ${log.text}');
     }
   }
 
@@ -1138,137 +907,18 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
 
   // OS Media Controls Integration
 
-  void _initializeMediaControls() async {
-    // Listen to media control events
-    _mediaControlSubscription = OsMediaControls.controlEvents.listen((event) {
-      if (event is PlayEvent) {
-        player?.play();
-      } else if (event is PauseEvent) {
-        player?.pause();
-      } else if (event is SeekEvent) {
-        player?.seek(event.position);
-      } else if (event is NextTrackEvent) {
-        if (_nextEpisode != null) {
-          _playNext();
-        }
-      } else if (event is PreviousTrackEvent) {
-        if (_previousEpisode != null) {
-          _playPrevious();
-        }
-      }
-    });
-
-    // Enable/disable next/previous track controls based on content type
-    final isEpisode = widget.metadata.type.toLowerCase() == 'episode';
-    if (isEpisode) {
-      // Enable next/previous track controls for episodes
-      await OsMediaControls.enableControls([
-        MediaControl.next,
-        MediaControl.previous,
-      ]);
-    } else {
-      // Disable next/previous track controls for movies
-      await OsMediaControls.disableControls([
-        MediaControl.next,
-        MediaControl.previous,
-      ]);
-    }
-
-    // Set initial metadata
-    await _updateMediaMetadata();
-  }
-
-  Future<void> _updateMediaMetadata() async {
-    if (!mounted) {
-      appLogger.w('Cannot update media metadata: widget not mounted');
-      return;
-    }
-
-    final metadata = widget.metadata;
-    final clientProvider = context.plexClient;
-    final client = clientProvider.client;
-
-    // Get artwork URL
-    String? artworkUrl;
-    if (client == null) {
-      appLogger.w(
-        'Cannot get artwork URL for media controls: Plex client is null',
-      );
-    } else {
-      final thumbUrl = metadata.type.toLowerCase() == 'episode'
-          ? metadata.grandparentThumb ?? metadata.thumb
-          : metadata.thumb;
-
-      if (thumbUrl != null) {
-        try {
-          artworkUrl = client.getThumbnailUrl(thumbUrl);
-          appLogger.d('Artwork URL for media controls: $artworkUrl');
-        } catch (e) {
-          appLogger.w('Failed to get artwork URL for media controls', error: e);
-        }
-      } else {
-        appLogger.d('No thumbnail URL available for media controls');
-      }
-    }
-
-    // Build title/artist based on content type
-    String title = metadata.title;
-    String? artist;
-    String? album;
-
-    if (metadata.type.toLowerCase() == 'episode') {
-      title = metadata.title;
-      artist = metadata.grandparentTitle; // Show name
-      if (metadata.parentIndex != null) {
-        album = 'Season ${metadata.parentIndex}';
-      }
-    }
-
-    await OsMediaControls.setMetadata(
-      MediaMetadata(
-        title: title,
-        artist: artist,
-        album: album,
-        duration: metadata.duration != null
-            ? Duration(milliseconds: metadata.duration!)
-            : null,
-        artworkUrl: artworkUrl,
-      ),
-    );
-
-    // Set initial playback state
-    _updateMediaControlsPlaybackState();
-  }
-
+  /// Wrapper method to update media controls playback state
   void _updateMediaControlsPlaybackState() {
     if (player == null) return;
 
-    OsMediaControls.setPlaybackState(
-      MediaPlaybackState(
-        state: player!.state.playing
-            ? PlaybackState.playing
-            : PlaybackState.paused,
-        position: player!.state.position,
-        speed: player!.state.rate,
-      ),
+    _mediaControlsManager?.updatePlaybackState(
+      isPlaying: player!.state.playing,
+      position: player!.state.position,
+      speed: player!.state.rate,
+      force: true, // Force update since this is an explicit state change
     );
   }
 
-  void _updateMediaControlsPosition() {
-    if (player == null) return;
-
-    // Only update if playing to avoid excessive updates
-    if (player!.state.playing) {
-      OsMediaControls.setPlaybackState(
-        MediaPlaybackState(
-          state: PlaybackState.playing,
-          position: player!.state.position,
-          speed: player!.state.rate,
-        ),
-      );
-    }
-  }
-
   Future<void> _playNext() async {
     if (_nextEpisode == null || _isLoadingNext) return;
 
@@ -1285,6 +935,260 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     await _navigateToEpisode(_previousEpisode!);
   }
 
+  /// Apply track selection using the TrackSelectionService
+  Future<void> _applyTrackSelection() async {
+    if (!mounted || player == null) return;
+
+    final profileSettings = context.read<UserProfileProvider>().profileSettings;
+
+    final trackService = TrackSelectionService(
+      player: player!,
+      profileSettings: profileSettings,
+      metadata: widget.metadata,
+    );
+
+    await trackService.selectAndApplyTracks(
+      preferredAudioTrack: widget.preferredAudioTrack,
+      preferredSubtitleTrack: widget.preferredSubtitleTrack,
+      preferredPlaybackRate: widget.preferredPlaybackRate,
+    );
+  }
+
+  /// Handle audio track changes from the user - save both stream selection and language preference
+  Future<void> _onAudioTrackChanged(AudioTrack track) async {
+    final settings = await SettingsService.getInstance();
+
+    // Only save if remember track selections is enabled
+    if (!settings.getRememberTrackSelections()) {
+      return;
+    }
+    if (_currentMediaInfo == null) {
+      appLogger.w('No media info available, cannot save stream selection');
+      return;
+    }
+    final partId = _currentMediaInfo!.getPartId();
+    if (partId == null) {
+      appLogger.w('No part ID available, cannot save stream selection');
+      return;
+    }
+
+    final languageCode = track.language;
+    int? streamID;
+
+    // === Matching by attributes ===
+    PlexAudioTrack? matched;
+    final normalizedTrackLang = _iso6391ToPlex6392(track.language);
+
+    appLogger.d(
+      'Normalized media_kit language: ${track.language} -> $normalizedTrackLang',
+    );
+
+    for (final plexTrack in _currentMediaInfo!.audioTracks) {
+      final matchLang = plexTrack.languageCode == normalizedTrackLang;
+      final matchTitle = (track.title == null || track.title!.isEmpty)
+          ? true
+          : (plexTrack.displayTitle == track.title ||
+                plexTrack.title == track.title);
+
+      if (matchLang && matchTitle) {
+        matched = plexTrack;
+        appLogger.d('Matched audio by lang/title: streamID ${matched.id}');
+        break;
+      }
+    }
+
+    if (matched != null) {
+      streamID = matched.id;
+      appLogger.d('Matched audio by lang/title: streamID $streamID');
+    } else {
+      appLogger.w('Could not match audio track, using fallback index');
+      // Fallback - normally no offset for audio
+      try {
+        final trackIndex = int.parse(track.id);
+
+        if (trackIndex >= 0 &&
+            trackIndex < _currentMediaInfo!.audioTracks.length) {
+          streamID = _currentMediaInfo!.audioTracks[trackIndex].id;
+          appLogger.d(
+            'Using fallback: audio index $trackIndex -> streamID $streamID',
+          );
+        } else {
+          appLogger.e(
+            'Fallback index $trackIndex out of bounds (total: ${_currentMediaInfo!.audioTracks.length})',
+          );
+        }
+      } catch (e) {
+        appLogger.e('Failed to parse track index', error: e);
+      }
+    }
+
+    final isEpisode = widget.metadata.type.toLowerCase() == 'episode';
+    final languagePrefRatingKey = isEpisode
+        ? (widget.metadata.grandparentRatingKey ?? widget.metadata.ratingKey)
+        : widget.metadata.ratingKey;
+
+    try {
+      if (!mounted) return;
+      final client = _getClientForMetadata(context);
+
+      final futures = <Future>[];
+
+      // 1. Language preference (series/movie level)
+      if (languageCode != null && languageCode.isNotEmpty) {
+        futures.add(
+          client.setMetadataPreferences(
+            languagePrefRatingKey,
+            audioLanguage: languageCode,
+          ),
+        );
+      }
+      // 2. Exact stream selection (part level)
+      if (streamID != null) {
+        futures.add(
+          client.selectStreams(partId, audioStreamID: streamID, allParts: true),
+        );
+      }
+
+      await Future.wait(futures);
+      appLogger.d('Successfully saved audio preferences (language + stream)');
+    } catch (e) {
+      appLogger.e('Failed to save audio preferences', error: e);
+    }
+  }
+
+  /// Handle subtitle track changes from the user - save both stream selection and language preference
+  Future<void> _onSubtitleTrackChanged(SubtitleTrack track) async {
+    final settings = await SettingsService.getInstance();
+
+    // Only save if remember track selections is enabled
+    if (!settings.getRememberTrackSelections()) {
+      return;
+    }
+
+    if (_currentMediaInfo == null) {
+      appLogger.w('No media info available, cannot save stream selection');
+      return;
+    }
+
+    final partId = _currentMediaInfo!.getPartId();
+    if (partId == null) {
+      appLogger.w('No part ID available, cannot save stream selection');
+      return;
+    }
+
+    String? languageCode;
+    int? streamID;
+
+    if (track.id == 'no') {
+      languageCode = 'none';
+      streamID = 0;
+      appLogger.i('User turned subtitles off, saving preference');
+    } else {
+      languageCode = track.language;
+
+      // === Matching by attributes ===
+      PlexSubtitleTrack? matched;
+      final normalizedTrackLang = _iso6391ToPlex6392(track.language);
+
+      appLogger.d(
+        'Normalized media_kit language: ${track.language} -> $normalizedTrackLang',
+      );
+
+      for (final plexTrack in _currentMediaInfo!.subtitleTracks) {
+        final matchLang = plexTrack.languageCode == normalizedTrackLang;
+        final matchTitle = (track.title == null || track.title!.isEmpty)
+            ? true
+            : (plexTrack.displayTitle == track.title ||
+                  plexTrack.title == track.title);
+
+        appLogger.d('Comparing with streamID ${plexTrack.id}:');
+        appLogger.d(
+          '  matchLang: $matchLang (${plexTrack.languageCode} == $normalizedTrackLang)',
+        );
+        appLogger.d('  matchTitle: $matchTitle');
+
+        if (matchLang && matchTitle) {
+          matched = plexTrack;
+          appLogger.d('  ✅ MATCHED!');
+          break;
+        }
+      }
+
+      if (matched != null) {
+        streamID = matched.id;
+        appLogger.d('Matched subtitle by lang/title: streamID $streamID');
+      } else {
+        appLogger.w('Could not match subtitle track, using fallback index');
+        // Fallback with offset correction
+        try {
+          final trackIndex = int.parse(track.id);
+
+          // media kit has a "no" (off) at index 0, so real subtitles start at 1
+          // We need to subtract 1 to get the actual index in PlexMediaInfo
+          final plexIndex = trackIndex > 0 ? trackIndex - 1 : 0;
+
+          if (plexIndex >= 0 &&
+              plexIndex < _currentMediaInfo!.subtitleTracks.length) {
+            streamID = _currentMediaInfo!.subtitleTracks[plexIndex].id;
+            appLogger.d(
+              'Using fallback: media_kit index $trackIndex -> Plex index $plexIndex -> streamID $streamID',
+            );
+          } else {
+            appLogger.e(
+              'Fallback index $plexIndex out of bounds (total: ${_currentMediaInfo!.subtitleTracks.length})',
+            );
+          }
+        } catch (e) {
+          appLogger.e('Failed to parse track index', error: e);
+        }
+      }
+    }
+
+    // Determine ratingKeys
+    final isEpisode = widget.metadata.type.toLowerCase() == 'episode';
+    final languagePrefRatingKey = isEpisode
+        ? (widget.metadata.grandparentRatingKey ?? widget.metadata.ratingKey)
+        : widget.metadata.ratingKey;
+
+    appLogger.i(
+      'Saving subtitle preference: language=$languageCode (ratingKey: $languagePrefRatingKey), streamID=$streamID (partId: $partId)',
+    );
+
+    try {
+      if (!mounted) return;
+      final client = _getClientForMetadata(context);
+
+      final futures = <Future>[];
+
+      // 1. Save language preference at series/movie level
+      if (languageCode != null) {
+        futures.add(
+          client.setMetadataPreferences(
+            languagePrefRatingKey,
+            subtitleLanguage: languageCode,
+          ),
+        );
+      }
+      // 2. Save exact stream selection using part ID
+      if (streamID != null) {
+        futures.add(
+          client.selectStreams(
+            partId,
+            subtitleStreamID: streamID,
+            allParts: true,
+          ),
+        );
+      }
+
+      await Future.wait(futures);
+      appLogger.d(
+        'Successfully saved subtitle preferences (language + stream)',
+      );
+    } catch (e) {
+      appLogger.e('Failed to save subtitle preferences', error: e);
+    }
+  }
+
   /// Set flag to skip orientation restoration when replacing with another video
   void setReplacingWithVideo() {
     _isReplacingWithVideo = true;
@@ -1307,18 +1211,34 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
       return;
     }
 
-    // Capture current track selection BEFORE pausing
-    final currentAudioTrack = player!.state.track.audio;
-    final currentSubtitleTrack = player!.state.track.subtitle;
+    // Capture current state atomically to avoid race conditions
+    final currentPlayer = player;
+    if (currentPlayer == null) {
+      // Player already disposed, navigate without preserving settings
+      if (mounted) {
+        navigateToVideoPlayer(
+          context,
+          metadata: episodeMetadata,
+          usePushReplacement: true,
+        );
+      }
+      return;
+    }
+
+    final currentAudioTrack = currentPlayer.state.track.audio;
+    final currentSubtitleTrack = currentPlayer.state.track.subtitle;
+    final currentRate = currentPlayer.state.rate;
 
     // Pause and stop current playback
-    player!.pause();
-    _progressTimer?.cancel();
-    _sendProgress('stopped');
+    currentPlayer.pause();
+    _progressTracker?.sendProgress('stopped');
+    _progressTracker?.stopTracking();
+
+    // Ensure the native player is fully disposed before creating the next one
+    await disposePlayerForNavigation();
 
     // Navigate to the episode using pushReplacement to destroy current player
     if (mounted) {
-      final currentRate = player!.state.rate;
       navigateToVideoPlayer(
         context,
         metadata: episodeMetadata,
@@ -1330,16 +1250,36 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     }
   }
 
+  /// Dispose the player before replacing the video to avoid race conditions
+  Future<void> disposePlayerForNavigation() async {
+    if (_isDisposingForNavigation) return;
+    _isDisposingForNavigation = true;
+
+    try {
+      _progressTracker?.sendProgress('stopped');
+      _progressTracker?.stopTracking();
+      await player?.dispose();
+    } catch (e) {
+      appLogger.d('Error disposing player before navigation', error: e);
+    } finally {
+      player = null;
+      _isPlayerInitialized = false;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     // Show loading indicator while player initializes
-    if (!_isPlayerInitialized || controller == null || player == null) {
+    if (!_isPlayerInitialized || player == null) {
       return const Scaffold(
         backgroundColor: Colors.black,
         body: Center(child: CircularProgressIndicator(color: Colors.white)),
       );
     }
 
+    // Cache platform detection to avoid multiple calls
+    final isMobile = PlatformDetector.isMobile(context);
+
     return PopScope(
       canPop:
           false, // Disable swipe-back gesture to prevent interference with timeline scrubbing
@@ -1350,47 +1290,73 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
         }
       },
       child: Scaffold(
-        backgroundColor: Colors.black,
+        // Use transparent background on macOS when native video layer is active
+        backgroundColor: Colors.transparent,
         body: GestureDetector(
           behavior: HitTestBehavior
               .translucent, // Allow taps to pass through to controls
           onScaleStart: (details) {
             // Initialize pinch gesture tracking (mobile only)
-            if (!PlatformDetector.isMobile(context)) return;
-            _isPinching = false;
+            if (!isMobile) return;
+            if (_videoFilterManager != null) {
+              _videoFilterManager!.isPinching = false;
+            }
           },
           onScaleUpdate: (details) {
             // Track if this is a pinch gesture (2+ fingers) on mobile
-            if (!PlatformDetector.isMobile(context)) return;
-            if (details.pointerCount >= 2) {
-              _isPinching = true;
+            if (!isMobile) return;
+            if (details.pointerCount >= 2 && _videoFilterManager != null) {
+              _videoFilterManager!.isPinching = true;
             }
           },
           onScaleEnd: (details) {
             // Only toggle if we detected a pinch gesture on mobile
-            if (!PlatformDetector.isMobile(context)) return;
-            if (_isPinching) {
+            if (!isMobile) return;
+            if (_videoFilterManager != null &&
+                _videoFilterManager!.isPinching) {
               _toggleContainCover();
-              _isPinching = false;
+              _videoFilterManager!.isPinching = false;
             }
           },
           child: Stack(
             children: [
               // Video player
               Center(
-                child: Video(
-                  controller: controller!,
-                  fit: _getCurrentBoxFit,
-                  controls: (state) => plexVideoControlsBuilder(
-                    player!,
-                    widget.metadata,
-                    onNext: _nextEpisode != null ? _playNext : null,
-                    onPrevious: _previousEpisode != null ? _playPrevious : null,
-                    availableVersions: _availableVersions,
-                    selectedMediaIndex: widget.selectedMediaIndex,
-                    boxFitMode: _boxFitMode,
-                    onCycleBoxFitMode: _cycleBoxFitMode,
-                  ),
+                child: LayoutBuilder(
+                  builder: (context, constraints) {
+                    // Update player size when layout changes
+                    final newSize = Size(
+                      constraints.maxWidth,
+                      constraints.maxHeight,
+                    );
+
+                    // Update player size in video filter manager and native layer
+                    WidgetsBinding.instance.addPostFrameCallback((_) {
+                      if (mounted && player != null) {
+                        _videoFilterManager?.updatePlayerSize(newSize);
+                        // Update Metal layer frame on iOS/macOS for rotation
+                        player!.updateFrame();
+                      }
+                    });
+
+                    return Video(
+                      player: player!,
+                      controls: (context) => plexVideoControlsBuilder(
+                        player!,
+                        widget.metadata,
+                        onNext: _nextEpisode != null ? _playNext : null,
+                        onPrevious: _previousEpisode != null
+                            ? _playPrevious
+                            : null,
+                        availableVersions: _availableVersions,
+                        selectedMediaIndex: widget.selectedMediaIndex,
+                        boxFitMode: _videoFilterManager?.boxFitMode ?? 0,
+                        onCycleBoxFitMode: _cycleBoxFitMode,
+                        onAudioTrackChanged: _onAudioTrackChanged,
+                        onSubtitleTrackChanged: _onSubtitleTrackChanged,
+                      ),
+                    );
+                  },
                 ),
               ),
               // Play Next Dialog
@@ -1409,8 +1375,9 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
                         child: Column(
                           mainAxisSize: MainAxisSize.min,
                           children: [
-                            const Icon(
-                              Icons.play_circle_outline,
+                            const AppIcon(
+                              Symbols.play_circle_rounded,
+                              fill: 1,
                               size: 64,
                               color: Colors.white,
                             ),
@@ -1432,8 +1399,9 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
                                     ),
                                     if (isShuffleActive) ...[
                                       const SizedBox(width: 8),
-                                      const Icon(
-                                        Icons.shuffle,
+                                      const AppIcon(
+                                        Symbols.shuffle_rounded,
+                                        fill: 1,
                                         size: 20,
                                         color: Colors.white70,
                                       ),
@@ -1504,6 +1472,28 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
                     ),
                   ),
                 ),
+              // Buffering indicator
+              ValueListenableBuilder<bool>(
+                valueListenable: _isBuffering,
+                builder: (context, isBuffering, child) {
+                  if (!isBuffering) return const SizedBox.shrink();
+                  return Positioned.fill(
+                    child: Center(
+                      child: Container(
+                        padding: const EdgeInsets.all(20),
+                        decoration: BoxDecoration(
+                          color: Colors.black.withValues(alpha: 0.5),
+                          shape: BoxShape.circle,
+                        ),
+                        child: const CircularProgressIndicator(
+                          color: Colors.white,
+                          strokeWidth: 3,
+                        ),
+                      ),
+                    ),
+                  );
+                },
+              ),
             ],
           ),
         ),
@@ -1511,3 +1501,16 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     );
   }
 }
+
+/// Returns the appropriate hwdec value based on platform and user preference.
+String _getHwdecValue(bool enabled) {
+  if (!enabled) return 'no';
+
+  if (Platform.isMacOS || Platform.isIOS) {
+    return 'videotoolbox';
+  } else if (Platform.isAndroid) {
+    return 'auto-safe';
+  } else {
+    return 'auto'; // Windows, Linux
+  }
+}
diff --git a/lib/services/base_shared_preferences_service.dart b/lib/services/base_shared_preferences_service.dart
new file mode 100644
index 00000000..99106b21
--- /dev/null
+++ b/lib/services/base_shared_preferences_service.dart
@@ -0,0 +1,45 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Base class for services that use SharedPreferences singleton pattern.
+///
+/// This class handles the boilerplate for singleton initialization and
+/// SharedPreferences lifecycle management. Subclasses should:
+/// 1. Create a private named constructor (e.g., SettingsService._())
+/// 2. Implement their own getInstance() method that calls BaseSharedPreferencesService.initializeInstance()
+/// 3. Optionally override onInit() for post-initialization setup
+abstract class BaseSharedPreferencesService {
+  static final Map<Type, BaseSharedPreferencesService> _instances = {};
+  late SharedPreferences _prefs;
+
+  /// Protected constructor for subclasses
+  BaseSharedPreferencesService();
+
+  /// Access to SharedPreferences instance
+  SharedPreferences get prefs => _prefs;
+
+  /// Initialize the SharedPreferences instance
+  ///
+  /// This method handles:
+  /// - Singleton instance management
+  /// - SharedPreferences initialization
+  /// - Calling onInit() hook for subclass-specific setup
+  static Future<T> initializeInstance<T extends BaseSharedPreferencesService>(
+    T Function() constructor,
+  ) async {
+    if (_instances[T] == null) {
+      final instance = constructor();
+      _instances[T] = instance;
+      instance._prefs = await SharedPreferences.getInstance();
+      await instance.onInit();
+    }
+    return _instances[T] as T;
+  }
+
+  /// Hook for subclass-specific initialization after SharedPreferences is ready.
+  ///
+  /// Override this method to perform any setup that requires access to
+  /// SharedPreferences (e.g., registering values with other services).
+  Future<void> onInit() async {
+    // Default implementation does nothing
+  }
+}
diff --git a/lib/services/data_aggregation_service.dart b/lib/services/data_aggregation_service.dart
new file mode 100644
index 00000000..c6c7bc02
--- /dev/null
+++ b/lib/services/data_aggregation_service.dart
@@ -0,0 +1,406 @@
+import 'dart:async';
+
+import 'plex_client.dart';
+import '../models/plex_hub.dart';
+import '../models/plex_library.dart';
+import '../models/plex_metadata.dart';
+import '../utils/app_logger.dart';
+import 'multi_server_manager.dart';
+import 'plex_auth_service.dart';
+
+/// Service for aggregating data from multiple Plex servers
+class DataAggregationService {
+  final MultiServerManager _serverManager;
+
+  // Cache for libraries with TTL
+  Map<String, List<PlexLibrary>>? _cachedLibrariesByServer;
+  DateTime? _librariesCacheTime;
+  static const Duration _librariesCacheTTL = Duration(hours: 1);
+
+  DataAggregationService(this._serverManager);
+
+  /// Clear the libraries cache (useful for server changes or logout)
+  void clearCache() {
+    _cachedLibrariesByServer = null;
+    _librariesCacheTime = null;
+  }
+
+  /// Check if libraries cache is still valid
+  bool get _isLibrariesCacheValid {
+    if (_cachedLibrariesByServer == null || _librariesCacheTime == null) {
+      return false;
+    }
+
+    final cacheAge = DateTime.now().difference(_librariesCacheTime!);
+    return cacheAge < _librariesCacheTTL;
+  }
+
+  /// Fetch libraries from all online servers
+  /// Libraries are automatically tagged with server info by PlexClient
+  Future<List<PlexLibrary>> getLibrariesFromAllServers() async {
+    return _perServer<PlexLibrary>(
+      operationName: 'fetching libraries',
+      operation: (serverId, client, server) async {
+        return await client.getLibraries();
+      },
+    );
+  }
+
+  /// Fetch "On Deck" (Continue Watching) from all servers and merge by recency
+  /// Items are automatically tagged with server info by PlexClient
+  Future<List<PlexMetadata>> getOnDeckFromAllServers({int? limit}) async {
+    final allOnDeck = await _perServer<PlexMetadata>(
+      operationName: 'fetching on deck',
+      operation: (serverId, client, server) async {
+        return await client.getOnDeck();
+      },
+    );
+
+    // Sort by most recently viewed
+    // Use lastViewedAt (when item was last viewed), falling back to updatedAt/addedAt if not available
+    allOnDeck.sort((a, b) {
+      final aTime = a.lastViewedAt ?? a.updatedAt ?? a.addedAt ?? 0;
+      final bTime = b.lastViewedAt ?? b.updatedAt ?? b.addedAt ?? 0;
+      return bTime.compareTo(aTime); // Descending (most recent first)
+    });
+
+    // Apply limit if specified
+    final result = limit != null && limit < allOnDeck.length
+        ? allOnDeck.sublist(0, limit)
+        : allOnDeck;
+
+    appLogger.i('Fetched ${result.length} on deck items from all servers');
+
+    return result;
+  }
+
+  /// Fetch libraries from all servers and cache them for hub fetching
+  /// This allows libraries to be fetched in parallel with other operations
+  Future<Map<String, List<PlexLibrary>>> getLibrariesFromAllServersGrouped({
+    bool forceRefresh = false,
+  }) async {
+    // Return cached libraries if still valid and not forcing refresh
+    if (!forceRefresh && _isLibrariesCacheValid) {
+      appLogger.d('Using cached libraries data');
+      return _cachedLibrariesByServer!;
+    }
+
+    final librariesByServer = await _perServerGrouped<PlexLibrary>(
+      operationName: 'fetching libraries',
+      operation: (serverId, client, server) async {
+        return await client.getLibraries();
+      },
+    );
+
+    // Cache the results
+    _cachedLibrariesByServer = librariesByServer;
+    _librariesCacheTime = DateTime.now();
+
+    final totalLibraries = librariesByServer.values.fold<int>(
+      0,
+      (sum, libs) => sum + libs.length,
+    );
+    appLogger.d(
+      'Fetched $totalLibraries libraries from ${librariesByServer.length} servers',
+    );
+
+    return librariesByServer;
+  }
+
+  /// Fetch recommendation hubs from all servers using pre-fetched libraries
+  Future<List<PlexHub>> getHubsFromAllServers({
+    int? limit,
+    Map<String, List<PlexLibrary>>? librariesByServer,
+    Set<String>? hiddenLibraryKeys,
+  }) async {
+    final clients = _serverManager.onlineClients;
+
+    if (clients.isEmpty) {
+      appLogger.w('No online servers available for fetching hubs');
+      return [];
+    }
+
+    // Use pre-fetched libraries or fetch them if not provided
+    final libraries =
+        librariesByServer ?? await getLibrariesFromAllServersGrouped();
+
+    appLogger.d('Fetching hubs from ${clients.length} servers');
+
+    final allHubs = <PlexHub>[];
+
+    // Fetch from all servers in parallel using cached libraries
+    final hubFutures = clients.entries.map((entry) async {
+      final serverId = entry.key;
+      final client = entry.value;
+
+      try {
+        // Use pre-fetched libraries for this server
+        final serverLibraries = libraries[serverId] ?? <PlexLibrary>[];
+        if (serverLibraries.isEmpty) {
+          appLogger.w('No libraries available for server $serverId');
+          return <PlexHub>[];
+        }
+
+        // Filter to only visible movie/show libraries
+        final visibleLibraries = serverLibraries.where((library) {
+          if (library.type != 'movie' && library.type != 'show') {
+            return false;
+          }
+          if (library.hidden != null && library.hidden != 0) {
+            return false;
+          }
+          // Check app-level hidden libraries
+          if (hiddenLibraryKeys != null &&
+              hiddenLibraryKeys.contains(library.globalKey)) {
+            return false;
+          }
+          return true;
+        }).toList();
+
+        // Fetch hubs from all libraries in parallel
+        final libraryHubFutures = visibleLibraries.map((library) async {
+          try {
+            // Hubs are now tagged with server info at the source
+            final hubs = await client.getLibraryHubs(library.key);
+            appLogger.d(
+              'Fetched ${hubs.length} hubs for ${library.title} on $serverId',
+            );
+            return hubs;
+          } catch (e) {
+            appLogger.w(
+              'Failed to fetch hubs for library ${library.title}: $e',
+            );
+            return <PlexHub>[];
+          }
+        });
+
+        final libraryHubResults = await Future.wait(libraryHubFutures);
+
+        // Flatten all library hubs
+        final serverHubs = <PlexHub>[];
+        for (final hubs in libraryHubResults) {
+          serverHubs.addAll(hubs);
+        }
+
+        return serverHubs;
+      } catch (e, stackTrace) {
+        appLogger.e(
+          'Failed to fetch hubs from server $serverId',
+          error: e,
+          stackTrace: stackTrace,
+        );
+        _serverManager.updateServerStatus(serverId, false);
+        return <PlexHub>[];
+      }
+    });
+
+    final results = await Future.wait(hubFutures);
+
+    // Flatten results
+    for (final hubs in results) {
+      allHubs.addAll(hubs);
+    }
+
+    // Apply limit if specified
+    final result = limit != null && limit < allHubs.length
+        ? allHubs.sublist(0, limit)
+        : allHubs;
+
+    appLogger.i('Fetched ${result.length} hubs from all servers');
+
+    return result;
+  }
+
+  /// Search across all online servers
+  /// Results are automatically tagged with server info by PlexClient
+  Future<List<PlexMetadata>> searchAcrossServers(
+    String query, {
+    int? limit,
+  }) async {
+    if (query.trim().isEmpty) {
+      return [];
+    }
+
+    final allResults = await _perServer<PlexMetadata>(
+      operationName: 'searching for "$query"',
+      operation: (serverId, client, server) async {
+        return await client.search(query);
+      },
+    );
+
+    // Apply limit if specified
+    final result = limit != null && limit < allResults.length
+        ? allResults.sublist(0, limit)
+        : allResults;
+
+    appLogger.i('Found ${result.length} search results across all servers');
+
+    return result;
+  }
+
+  /// Get libraries for a specific server
+  Future<List<PlexLibrary>> getLibrariesForServer(String serverId) async {
+    final client = _serverManager.getClient(serverId);
+
+    if (client == null) {
+      appLogger.w('No client found for server $serverId');
+      return [];
+    }
+
+    try {
+      // Libraries are automatically tagged with server info by PlexClient
+      return await client.getLibraries();
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Failed to fetch libraries for server $serverId',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      _serverManager.updateServerStatus(serverId, false);
+      return [];
+    }
+  }
+
+  /// Group libraries by server
+  Map<String, List<PlexLibrary>> groupLibrariesByServer(
+    List<PlexLibrary> libraries,
+  ) {
+    final grouped = <String, List<PlexLibrary>>{};
+
+    for (final library in libraries) {
+      final serverId = library.serverId;
+      if (serverId != null) {
+        grouped.putIfAbsent(serverId, () => []).add(library);
+      }
+    }
+
+    return grouped;
+  }
+
+  // Private helper methods
+
+  /// Higher-order helper for per-server fan-out operations
+  ///
+  /// Iterates over all online clients, executes the operation for each server,
+  /// handles errors, updates server status, and aggregates results.
+  ///
+  /// Type parameter `T` is the item type returned by the operation
+  /// [operationName] is used for logging (e.g., "fetching libraries")
+  /// [operation] is the async function to run per server, returning `List<T>`
+  Future<List<T>> _perServer<T>({
+    required String operationName,
+    required Future<List<T>> Function(
+      String serverId,
+      PlexClient client,
+      PlexServer? server,
+    )
+    operation,
+  }) async {
+    final clients = _serverManager.onlineClients;
+
+    if (clients.isEmpty) {
+      appLogger.w('No online servers available for $operationName');
+      return [];
+    }
+
+    appLogger.d('$operationName from ${clients.length} servers');
+
+    final allResults = <T>[];
+
+    // Execute operation on all servers in parallel
+    final Iterable<Future<List<T>>> futures = clients.entries.map((
+      entry,
+    ) async {
+      final serverId = entry.key;
+      final client = entry.value;
+      final server = _serverManager.getServer(serverId);
+      final sw = Stopwatch()..start();
+
+      try {
+        final result = await operation(serverId, client, server);
+        appLogger.d(
+          '$operationName for server $serverId completed in ${sw.elapsedMilliseconds}ms with ${result.length} items',
+        );
+        return result;
+      } catch (e, stackTrace) {
+        appLogger.e(
+          'Failed $operationName from server $serverId',
+          error: e,
+          stackTrace: stackTrace,
+        );
+        _serverManager.updateServerStatus(serverId, false);
+        appLogger.d(
+          '$operationName for server $serverId failed after ${sw.elapsedMilliseconds}ms',
+        );
+        return <T>[];
+      }
+    });
+
+    final List<List<T>> results = await Future.wait<List<T>>(futures);
+
+    // Flatten results
+    for (final items in results) {
+      allResults.addAll(items);
+    }
+
+    return allResults;
+  }
+
+  /// Higher-order helper for per-server fan-out operations that groups results by server
+  ///
+  /// Similar to [_perServer] but returns a Map with results grouped by serverId
+  /// instead of flattening into a single list.
+  ///
+  /// Type parameter `T` is the item type returned by the operation
+  /// [operationName] is used for logging (e.g., "fetching libraries")
+  /// [operation] is the async function to run per server, returning `List<T>`
+  Future<Map<String, List<T>>> _perServerGrouped<T>({
+    required String operationName,
+    required Future<List<T>> Function(
+      String serverId,
+      PlexClient client,
+      PlexServer? server,
+    )
+    operation,
+  }) async {
+    final clients = _serverManager.onlineClients;
+
+    if (clients.isEmpty) {
+      appLogger.w('No online servers available for $operationName');
+      return {};
+    }
+
+    appLogger.d('$operationName from ${clients.length} servers');
+
+    // Execute operation on all servers in parallel
+    final futures = clients.entries.map((entry) async {
+      final serverId = entry.key;
+      final client = entry.value;
+      final server = _serverManager.getServer(serverId);
+      final sw = Stopwatch()..start();
+
+      try {
+        final result = await operation(serverId, client, server);
+        appLogger.d(
+          '$operationName for server $serverId completed in ${sw.elapsedMilliseconds}ms with ${result.length} items',
+        );
+        return MapEntry(serverId, result);
+      } catch (e, stackTrace) {
+        appLogger.e(
+          'Failed $operationName from server $serverId',
+          error: e,
+          stackTrace: stackTrace,
+        );
+        _serverManager.updateServerStatus(serverId, false);
+        appLogger.d(
+          '$operationName for server $serverId failed after ${sw.elapsedMilliseconds}ms',
+        );
+        return MapEntry(serverId, <T>[]);
+      }
+    });
+
+    final results = await Future.wait(futures);
+
+    return Map.fromEntries(results);
+  }
+}
diff --git a/lib/services/download_manager_service.dart b/lib/services/download_manager_service.dart
new file mode 100644
index 00000000..0adb0d06
--- /dev/null
+++ b/lib/services/download_manager_service.dart
@@ -0,0 +1,1720 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:dio/dio.dart';
+import 'package:drift/drift.dart';
+import 'package:path/path.dart' as path;
+import '../database/app_database.dart';
+import 'settings_service.dart';
+import '../models/download_status.dart';
+import '../models/download_progress.dart';
+import '../models/deletion_progress.dart';
+import '../models/plex_metadata.dart';
+import '../models/plex_media_info.dart';
+import '../services/plex_client.dart';
+import '../services/download_storage_service.dart';
+import '../services/plex_api_cache.dart';
+import '../utils/app_logger.dart';
+
+/// Extension methods on AppDatabase for download operations
+extension DownloadDatabaseOperations on AppDatabase {
+  /// Insert a new download into the database
+  Future<void> insertDownload({
+    required String serverId,
+    required String ratingKey,
+    required String globalKey,
+    required String type,
+    String? parentRatingKey,
+    String? grandparentRatingKey,
+    required int status,
+  }) async {
+    await into(downloadedMedia).insert(
+      DownloadedMediaCompanion.insert(
+        serverId: serverId,
+        ratingKey: ratingKey,
+        globalKey: globalKey,
+        type: type,
+        parentRatingKey: Value(parentRatingKey),
+        grandparentRatingKey: Value(grandparentRatingKey),
+        status: status,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+  }
+
+  /// Add item to download queue
+  Future<void> addToQueue({
+    required String mediaGlobalKey,
+    int priority = 0,
+    bool downloadSubtitles = true,
+    bool downloadArtwork = true,
+  }) async {
+    await into(downloadQueue).insert(
+      DownloadQueueCompanion.insert(
+        mediaGlobalKey: mediaGlobalKey,
+        priority: Value(priority),
+        addedAt: DateTime.now().millisecondsSinceEpoch,
+        downloadSubtitles: Value(downloadSubtitles),
+        downloadArtwork: Value(downloadArtwork),
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+  }
+
+  /// Get next item from queue (highest priority, oldest first)
+  /// Only returns items that are not paused
+  Future<DownloadQueueItem?> getNextQueueItem() async {
+    // Join with downloadedMedia to check status and filter out paused items
+    final query = select(downloadQueue).join([
+      innerJoin(
+        downloadedMedia,
+        downloadedMedia.globalKey.equalsExp(downloadQueue.mediaGlobalKey),
+      ),
+    ]);
+
+    query
+      ..where(downloadedMedia.status.equals(DownloadStatus.paused.index).not())
+      ..orderBy([
+        OrderingTerm(
+          expression: downloadQueue.priority,
+          mode: OrderingMode.desc,
+        ),
+        OrderingTerm(expression: downloadQueue.addedAt),
+      ])
+      ..limit(1);
+
+    final result = await query.getSingleOrNull();
+    return result?.readTable(downloadQueue);
+  }
+
+  /// Update download status
+  Future<void> updateDownloadStatus(String globalKey, int status) async {
+    await (update(downloadedMedia)..where((t) => t.globalKey.equals(globalKey)))
+        .write(DownloadedMediaCompanion(status: Value(status)));
+  }
+
+  /// Update download progress
+  Future<void> updateDownloadProgress(
+    String globalKey,
+    int progress,
+    int downloadedBytes,
+    int totalBytes,
+  ) async {
+    await (update(
+      downloadedMedia,
+    )..where((t) => t.globalKey.equals(globalKey))).write(
+      DownloadedMediaCompanion(
+        progress: Value(progress),
+        downloadedBytes: Value(downloadedBytes),
+        totalBytes: Value(totalBytes),
+      ),
+    );
+  }
+
+  /// Update video file path
+  Future<void> updateVideoFilePath(String globalKey, String filePath) async {
+    await (update(
+      downloadedMedia,
+    )..where((t) => t.globalKey.equals(globalKey))).write(
+      DownloadedMediaCompanion(
+        videoFilePath: Value(filePath),
+        downloadedAt: Value(DateTime.now().millisecondsSinceEpoch),
+      ),
+    );
+  }
+
+  /// Update artwork paths
+  Future<void> updateArtworkPaths({
+    required String globalKey,
+    String? thumbPath,
+  }) async {
+    await (update(downloadedMedia)..where((t) => t.globalKey.equals(globalKey)))
+        .write(DownloadedMediaCompanion(thumbPath: Value(thumbPath)));
+  }
+
+  /// Update download error and increment retry count
+  Future<void> updateDownloadError(
+    String globalKey,
+    String errorMessage,
+  ) async {
+    // Get current retry count to increment it
+    final existing = await getDownloadedMedia(globalKey);
+    final currentCount = existing?.retryCount ?? 0;
+
+    await (update(
+      downloadedMedia,
+    )..where((t) => t.globalKey.equals(globalKey))).write(
+      DownloadedMediaCompanion(
+        errorMessage: Value(errorMessage),
+        retryCount: Value(currentCount + 1),
+      ),
+    );
+  }
+
+  /// Clear download error and reset retry count (for retry)
+  Future<void> clearDownloadError(String globalKey) async {
+    await (update(
+      downloadedMedia,
+    )..where((t) => t.globalKey.equals(globalKey))).write(
+      const DownloadedMediaCompanion(
+        errorMessage: Value(null),
+        retryCount: Value(0),
+      ),
+    );
+  }
+
+  /// Remove item from queue
+  Future<void> removeFromQueue(String mediaGlobalKey) async {
+    await (delete(
+      downloadQueue,
+    )..where((t) => t.mediaGlobalKey.equals(mediaGlobalKey))).go();
+  }
+
+  /// Get downloaded media item
+  Future<DownloadedMediaItem?> getDownloadedMedia(String globalKey) async {
+    return (select(
+      downloadedMedia,
+    )..where((t) => t.globalKey.equals(globalKey))).getSingleOrNull();
+  }
+
+  /// Delete a download
+  Future<void> deleteDownload(String globalKey) async {
+    await (delete(
+      downloadedMedia,
+    )..where((t) => t.globalKey.equals(globalKey))).go();
+    await (delete(
+      downloadQueue,
+    )..where((t) => t.mediaGlobalKey.equals(globalKey))).go();
+  }
+}
+
+class DownloadManagerService {
+  final AppDatabase _database;
+  final DownloadStorageService _storageService;
+  final PlexApiCache _apiCache = PlexApiCache.instance;
+  final Dio _dio;
+
+  // Stream controller for download progress updates
+  final _progressController = StreamController<DownloadProgress>.broadcast();
+  Stream<DownloadProgress> get progressStream => _progressController.stream;
+
+  // Stream controller for deletion progress updates
+  final _deletionProgressController =
+      StreamController<DeletionProgress>.broadcast();
+  Stream<DeletionProgress> get deletionProgressStream =>
+      _deletionProgressController.stream;
+
+  // Active downloads with cancel tokens
+  final Map<String, CancelToken> _activeDownloads = {};
+
+  // Flag to prevent multiple queue processing
+  bool _isProcessingQueue = false;
+
+  // Connectivity listener for auto-resume
+  StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
+
+  // Cached client for auto-resume
+  PlexClient? _lastClient;
+
+  /// Check if downloads should be blocked due to cellular-only setting
+  Future<bool> _shouldBlockDownload() async {
+    return shouldBlockDownloadOnCellular();
+  }
+
+  /// Public method to check if downloads should be blocked due to cellular-only setting
+  /// Can be used by DownloadProvider to show user-friendly error
+  static Future<bool> shouldBlockDownloadOnCellular() async {
+    final settings = await SettingsService.getInstance();
+    if (!settings.getDownloadOnWifiOnly()) return false;
+
+    final connectivity = await Connectivity().checkConnectivity();
+    // Block if on cellular and NOT on WiFi (allow if both are available)
+    return connectivity.contains(ConnectivityResult.mobile) &&
+        !connectivity.contains(ConnectivityResult.wifi) &&
+        !connectivity.contains(ConnectivityResult.ethernet);
+  }
+
+  DownloadManagerService({
+    required AppDatabase database,
+    required DownloadStorageService storageService,
+    Dio? dio,
+  }) : _database = database,
+       _storageService = storageService,
+       _dio = dio ?? Dio();
+
+  /// Queue a download for a media item
+  Future<void> queueDownload({
+    required PlexMetadata metadata,
+    required PlexClient client,
+    int priority = 0,
+    bool downloadSubtitles = true,
+    bool downloadArtwork = true,
+  }) async {
+    final globalKey = '${metadata.serverId}:${metadata.ratingKey}';
+
+    // Check if already downloading or completed
+    final existing = await _database.getDownloadedMedia(globalKey);
+    if (existing != null &&
+        (existing.status == DownloadStatus.downloading.index ||
+            existing.status == DownloadStatus.completed.index)) {
+      appLogger.i(
+        'Download already exists for $globalKey with status ${existing.status}',
+      );
+      return;
+    }
+
+    // Insert into database
+    await _database.insertDownload(
+      serverId: metadata.serverId!,
+      ratingKey: metadata.ratingKey,
+      globalKey: globalKey,
+      type: metadata.type,
+      parentRatingKey: metadata.parentRatingKey,
+      grandparentRatingKey: metadata.grandparentRatingKey,
+      status: DownloadStatus.queued.index,
+    );
+
+    // Pin the already-cached API response for offline use
+    // (getMetadataWithImages was already called by download_provider, which cached with chapters/markers)
+    await _apiCache.pinForOffline(metadata.serverId!, metadata.ratingKey);
+
+    // Add to queue
+    await _database.addToQueue(
+      mediaGlobalKey: globalKey,
+      priority: priority,
+      downloadSubtitles: downloadSubtitles,
+      downloadArtwork: downloadArtwork,
+    );
+
+    _emitProgress(globalKey, DownloadStatus.queued, 0);
+
+    // Start processing if not already
+    _processQueue(client);
+  }
+
+  /// Start processing the download queue - processes one item at a time
+  Future<void> _processQueue(PlexClient client) async {
+    if (_isProcessingQueue) {
+      appLogger.d('Queue processing already in progress');
+      return;
+    }
+
+    _isProcessingQueue = true;
+    _lastClient = client; // Cache for auto-resume
+    _setupConnectivityListener(); // Setup listener for auto-resume
+
+    try {
+      while (true) {
+        // Check if we should pause due to cellular
+        if (await _shouldBlockDownload()) {
+          appLogger.i(
+            'Pausing downloads - on cellular data with WiFi-only enabled',
+          );
+          break;
+        }
+
+        // Get next item from queue
+        final nextItem = await _database.getNextQueueItem();
+        if (nextItem == null) {
+          appLogger.d('No more items in queue');
+          break;
+        }
+
+        await _startDownload(nextItem.mediaGlobalKey, client, nextItem);
+      }
+    } finally {
+      _isProcessingQueue = false;
+    }
+  }
+
+  /// Setup connectivity listener to auto-resume downloads when WiFi becomes available
+  void _setupConnectivityListener() {
+    _connectivitySubscription?.cancel();
+    _connectivitySubscription = Connectivity().onConnectivityChanged.listen((
+      results,
+    ) async {
+      // If WiFi becomes available, try to resume queue
+      if (results.contains(ConnectivityResult.wifi) ||
+          results.contains(ConnectivityResult.ethernet)) {
+        final hasQueuedItems = await _database.getNextQueueItem() != null;
+        if (hasQueuedItems && !_isProcessingQueue && _lastClient != null) {
+          appLogger.i('WiFi available - resuming downloads');
+          _processQueue(_lastClient!);
+        }
+      }
+    });
+  }
+
+  /// Start downloading a specific item
+  Future<void> _startDownload(
+    String globalKey,
+    PlexClient client,
+    DownloadQueueItem queueItem,
+  ) async {
+    try {
+      appLogger.i('Starting download for $globalKey');
+
+      // Update status to downloading
+      await _database.updateDownloadStatus(
+        globalKey,
+        DownloadStatus.downloading.index,
+      );
+      appLogger.d('Status updated to downloading, emitting initial progress');
+      _emitProgress(globalKey, DownloadStatus.downloading, 0);
+
+      // Parse globalKey to get serverId and ratingKey
+      final parts = globalKey.split(':');
+      final serverId = parts[0];
+      final ratingKey = parts[1];
+
+      // Get metadata from cache
+      final cachedResponse = await _apiCache.get(
+        serverId,
+        '/library/metadata/$ratingKey',
+      );
+      if (cachedResponse == null) {
+        throw Exception('Metadata not found in cache for $globalKey');
+      }
+
+      // Parse metadata from cached response
+      final metadataList =
+          cachedResponse['MediaContainer']?['Metadata'] as List?;
+      if (metadataList == null || metadataList.isEmpty) {
+        throw Exception('Invalid cached metadata for $globalKey');
+      }
+      final metadata = PlexMetadata.fromJson(
+        metadataList[0],
+      ).copyWith(serverId: serverId);
+
+      // Get video playback data (includes URL, streams, etc.)
+      final playbackData = await client.getVideoPlaybackData(
+        metadata.ratingKey,
+      );
+      if (playbackData.videoUrl == null) {
+        throw Exception('Could not get video URL');
+      }
+
+      // Cache playback extras (chapters + markers) for offline use
+      // This fetches and caches in one call
+      await client.getPlaybackExtras(metadata.ratingKey);
+
+      // Determine file extension from URL or default to mp4
+      final extension = _getExtensionFromUrl(playbackData.videoUrl!) ?? 'mp4';
+
+      final metadataWithServer = metadata;
+
+      // For episodes, look up the show's year from cached show metadata
+      int? showYear;
+      if (metadataWithServer.type == 'episode' &&
+          metadataWithServer.grandparentRatingKey != null) {
+        final showCached = await _apiCache.get(
+          serverId,
+          '/library/metadata/${metadataWithServer.grandparentRatingKey}',
+        );
+        if (showCached != null) {
+          final showList = showCached['MediaContainer']?['Metadata'] as List?;
+          if (showList != null && showList.isNotEmpty) {
+            final showMetadata = PlexMetadata.fromJson(showList[0]);
+            showYear = showMetadata.year;
+          }
+        }
+      }
+
+      // Create cancel token
+      final cancelToken = CancelToken();
+      _activeDownloads[globalKey] = cancelToken;
+
+      appLogger.d('Starting video download for $globalKey');
+
+      // Determine download path and handle SAF mode
+      final String downloadFilePath;
+      final String storedPath;
+
+      if (_storageService.isUsingSaf) {
+        // SAF mode: download to temp cache first, then copy to SAF
+        final tempFileName = '${globalKey.replaceAll(':', '_')}.$extension';
+        downloadFilePath = await _storageService.getTempDownloadPath(
+          tempFileName,
+        );
+
+        // Download to temp path
+        await _downloadFile(
+          url: playbackData.videoUrl!,
+          filePath: downloadFilePath,
+          globalKey: globalKey,
+          cancelToken: cancelToken,
+        );
+
+        appLogger.d('Video downloaded to temp, copying to SAF for $globalKey');
+
+        // Copy to SAF
+        final List<String> pathComponents;
+        final String safFileName;
+        if (metadataWithServer.type == 'movie') {
+          pathComponents = _storageService.getMovieSafPathComponents(
+            metadataWithServer,
+          );
+          safFileName = _storageService.getMovieSafFileName(
+            metadataWithServer,
+            extension,
+          );
+        } else if (metadataWithServer.type == 'episode') {
+          pathComponents = _storageService.getEpisodeSafPathComponents(
+            metadataWithServer,
+            showYear: showYear,
+          );
+          safFileName = _storageService.getEpisodeSafFileName(
+            metadataWithServer,
+            extension,
+          );
+        } else {
+          pathComponents = [serverId, metadataWithServer.ratingKey];
+          safFileName = 'video.$extension';
+        }
+
+        final safUri = await _storageService.copyToSaf(
+          downloadFilePath,
+          pathComponents,
+          safFileName,
+          _storageService.getMimeType(extension),
+        );
+
+        if (safUri == null) {
+          throw Exception('Failed to copy video to SAF storage');
+        }
+
+        storedPath = safUri;
+        appLogger.d('Video copied to SAF: $safUri');
+      } else {
+        // Normal mode: download directly to final path
+        if (metadataWithServer.type == 'movie') {
+          downloadFilePath = await _storageService.getMovieVideoPath(
+            metadataWithServer,
+            extension,
+          );
+        } else if (metadataWithServer.type == 'episode') {
+          downloadFilePath = await _storageService.getEpisodeVideoPath(
+            metadataWithServer,
+            extension,
+            showYear: showYear,
+          );
+        } else {
+          downloadFilePath = await _storageService.getVideoFilePath(
+            serverId,
+            metadataWithServer.ratingKey,
+            extension,
+          );
+        }
+
+        await _downloadFile(
+          url: playbackData.videoUrl!,
+          filePath: downloadFilePath,
+          globalKey: globalKey,
+          cancelToken: cancelToken,
+        );
+
+        // Store relative path (survives iOS container UUID changes)
+        storedPath = await _storageService.toRelativePath(downloadFilePath);
+      }
+
+      appLogger.d('Video download completed for $globalKey');
+
+      // Update database with stored path (SAF URI or relative path)
+      await _database.updateVideoFilePath(globalKey, storedPath);
+
+      // Download artwork if enabled (only episode-specific artwork, not show/season)
+      // Use the passed queueItem's settings (not getNextQueueItem which would return the NEXT item)
+      if (queueItem.downloadArtwork) {
+        await _downloadArtwork(
+          globalKey,
+          metadataWithServer,
+          client,
+          showYear: showYear,
+        );
+
+        // Download chapter thumbnails
+        await _downloadChapterThumbnails(
+          metadataWithServer.serverId!,
+          metadataWithServer.ratingKey,
+          client,
+        );
+      }
+
+      // Download subtitles if enabled
+      if (queueItem.downloadSubtitles && playbackData.mediaInfo != null) {
+        await _downloadSubtitles(
+          globalKey,
+          metadataWithServer,
+          playbackData.mediaInfo!,
+          client,
+          showYear: showYear,
+        );
+      }
+
+      // Mark as completed
+      await _database.updateDownloadStatus(
+        globalKey,
+        DownloadStatus.completed.index,
+      );
+      await _database.removeFromQueue(globalKey);
+      _emitProgress(globalKey, DownloadStatus.completed, 100);
+
+      _activeDownloads.remove(globalKey);
+
+      appLogger.i('Download completed for $globalKey');
+    } catch (e) {
+      // Check if this was a user-initiated cancel/pause (not a real failure)
+      if (e is DioException && e.type == DioExceptionType.cancel) {
+        // Status was already set by pauseDownload() or cancelDownload()
+        // Just clean up and exit without marking as failed
+        appLogger.d('Download cancelled/paused for $globalKey: ${e.message}');
+        _activeDownloads.remove(globalKey);
+        return;
+      }
+
+      appLogger.e('Download failed for $globalKey', error: e);
+      await _database.updateDownloadStatus(
+        globalKey,
+        DownloadStatus.failed.index,
+      );
+      await _database.updateDownloadError(globalKey, e.toString());
+      // Remove from queue to prevent endless retry loop
+      await _database.removeFromQueue(globalKey);
+      _emitProgress(
+        globalKey,
+        DownloadStatus.failed,
+        0,
+        errorMessage: e.toString(),
+      );
+      _activeDownloads.remove(globalKey);
+    }
+  }
+
+  Future<void> _downloadFile({
+    required String url,
+    required String filePath,
+    required String globalKey,
+    required CancelToken cancelToken,
+  }) async {
+    final file = File(filePath);
+    await file.parent.create(recursive: true);
+
+    int lastBytes = 0;
+    DateTime lastUpdate = DateTime.now();
+
+    await _dio.download(
+      url,
+      filePath,
+      cancelToken: cancelToken,
+      onReceiveProgress: (received, total) {
+        // Calculate speed (update every 500ms)
+        final now = DateTime.now();
+        if (now.difference(lastUpdate).inMilliseconds >= 500) {
+          final elapsedSeconds = now
+              .difference(lastUpdate)
+              .inSeconds
+              .clamp(1, double.infinity);
+          final bytesPerSecond = (received - lastBytes) / elapsedSeconds;
+          lastUpdate = now;
+          lastBytes = received;
+
+          final progress = total > 0 ? ((received / total) * 100).round() : 0;
+
+          appLogger.d(
+            'Download progress: $progress% ($received/$total bytes) for $globalKey',
+          );
+
+          _progressController.add(
+            DownloadProgress(
+              globalKey: globalKey,
+              status: DownloadStatus.downloading,
+              progress: progress,
+              downloadedBytes: received,
+              totalBytes: total,
+              speed: bytesPerSecond,
+              currentFile: 'video',
+            ),
+          );
+
+          // Update database asynchronously (non-blocking)
+          _database
+              .updateDownloadProgress(globalKey, progress, received, total)
+              .catchError((e) {
+                appLogger.w(
+                  'Failed to update download progress in DB',
+                  error: e,
+                );
+              });
+        }
+      },
+    );
+  }
+
+  /// Download artwork for a media item using hash-based storage
+  /// Downloads all artwork types: thumb/poster, clearLogo, and background art
+  Future<void> _downloadArtwork(
+    String globalKey,
+    PlexMetadata metadata,
+    PlexClient client, {
+    int? showYear,
+  }) async {
+    if (metadata.serverId == null) return;
+
+    try {
+      _emitProgress(
+        globalKey,
+        DownloadStatus.downloading,
+        0,
+        currentFile: 'artwork',
+      );
+
+      final serverId = metadata.serverId!;
+
+      // Download thumb/poster
+      if (metadata.thumb != null) {
+        await _downloadSingleArtwork(serverId, metadata.thumb!, client);
+      }
+
+      // Download clear logo
+      if (metadata.clearLogo != null) {
+        await _downloadSingleArtwork(serverId, metadata.clearLogo!, client);
+      }
+
+      // Download background art
+      if (metadata.art != null) {
+        await _downloadSingleArtwork(serverId, metadata.art!, client);
+      }
+
+      // Store thumb reference in database (primary artwork for display)
+      await _database.updateArtworkPaths(
+        globalKey: globalKey,
+        thumbPath: metadata.thumb,
+      );
+
+      _emitProgressWithArtwork(globalKey, thumbPath: metadata.thumb);
+      appLogger.d('Artwork downloaded for $globalKey');
+    } catch (e) {
+      appLogger.w('Failed to download artwork for $globalKey', error: e);
+      // Don't fail the entire download if artwork fails
+    }
+  }
+
+  /// Download a single artwork file if it doesn't already exist
+  Future<void> _downloadSingleArtwork(
+    String serverId,
+    String artworkPath,
+    PlexClient client,
+  ) async {
+    try {
+      // Check if already downloaded (deduplication)
+      if (await _storageService.artworkExists(serverId, artworkPath)) {
+        appLogger.d('Artwork already exists: $artworkPath');
+        return;
+      }
+
+      final url = client.getThumbnailUrl(artworkPath);
+      if (url.isEmpty) {
+        appLogger.w('Empty thumbnail URL for: $artworkPath');
+        return;
+      }
+
+      final filePath = await _storageService.getArtworkPathFromThumb(
+        serverId,
+        artworkPath,
+      );
+      final file = File(filePath);
+
+      // Ensure parent directory exists
+      await file.parent.create(recursive: true);
+
+      // Download the artwork
+      await _dio.download(url, filePath);
+      appLogger.i('Downloaded artwork: $artworkPath -> $filePath');
+    } catch (e, stack) {
+      appLogger.w(
+        'Failed to download artwork: $artworkPath',
+        error: e,
+        stackTrace: stack,
+      );
+      // Don't throw - artwork download failures shouldn't kill the entire download
+    }
+  }
+
+  /// Download all artwork for a metadata item (public method for parent metadata)
+  /// Downloads thumb/poster, clearLogo, and background art
+  Future<void> downloadArtworkForMetadata(
+    PlexMetadata metadata,
+    PlexClient client,
+  ) async {
+    if (metadata.serverId == null) return;
+    final serverId = metadata.serverId!;
+
+    // Download thumb/poster
+    if (metadata.thumb != null) {
+      await _downloadSingleArtwork(serverId, metadata.thumb!, client);
+    }
+
+    // Download clear logo
+    if (metadata.clearLogo != null) {
+      await _downloadSingleArtwork(serverId, metadata.clearLogo!, client);
+    }
+
+    // Download background art
+    if (metadata.art != null) {
+      await _downloadSingleArtwork(serverId, metadata.art!, client);
+    }
+  }
+
+  /// Download chapter thumbnail images for a media item
+  Future<void> _downloadChapterThumbnails(
+    String serverId,
+    String ratingKey,
+    PlexClient client,
+  ) async {
+    try {
+      // Get chapters from the cached API response
+      final extras = await client.getPlaybackExtras(ratingKey);
+
+      for (final chapter in extras.chapters) {
+        if (chapter.thumb != null) {
+          await _downloadSingleArtwork(serverId, chapter.thumb!, client);
+        }
+      }
+
+      if (extras.chapters.isNotEmpty) {
+        appLogger.d('Downloaded ${extras.chapters.length} chapter thumbnails');
+      }
+    } catch (e) {
+      appLogger.w('Failed to download chapter thumbnails', error: e);
+      // Don't fail the entire download if chapter thumbnails fail
+    }
+  }
+
+  /// [showYear]: For episodes, pass the show's premiere year (not the episode's year)
+  Future<void> _downloadSubtitles(
+    String globalKey,
+    PlexMetadata metadata,
+    PlexMediaInfo mediaInfo,
+    PlexClient client, {
+    int? showYear,
+  }) async {
+    try {
+      _emitProgress(
+        globalKey,
+        DownloadStatus.downloading,
+        0,
+        currentFile: 'subtitles',
+      );
+
+      for (final subtitle in mediaInfo.subtitleTracks) {
+        // Only download external subtitles
+        if (!subtitle.isExternal || subtitle.key == null) {
+          continue;
+        }
+
+        final baseUrl = client.config.baseUrl;
+        final token = client.config.token ?? '';
+        final subtitleUrl = subtitle.getSubtitleUrl(baseUrl, token);
+        if (subtitleUrl == null) continue;
+
+        // Determine file extension
+        final extension = _getExtensionFromCodec(subtitle.codec);
+
+        // Get user-friendly subtitle path based on media type
+        final String subtitlePath;
+        if (metadata.type == 'episode') {
+          subtitlePath = await _storageService.getEpisodeSubtitlePath(
+            metadata,
+            subtitle.id,
+            extension,
+            showYear: showYear,
+          );
+        } else if (metadata.type == 'movie') {
+          subtitlePath = await _storageService.getMovieSubtitlePath(
+            metadata,
+            subtitle.id,
+            extension,
+          );
+        } else {
+          // Fallback to old structure
+          subtitlePath = await _storageService.getSubtitlePath(
+            metadata.serverId!,
+            metadata.ratingKey,
+            subtitle.id,
+            extension,
+          );
+        }
+
+        // Download subtitle file
+        final file = File(subtitlePath);
+        await file.parent.create(recursive: true);
+        await _dio.download(subtitleUrl, subtitlePath);
+
+        appLogger.d('Downloaded subtitle ${subtitle.id} for $globalKey');
+      }
+    } catch (e) {
+      appLogger.w('Failed to download subtitles for $globalKey', error: e);
+      // Don't fail the entire download if subtitles fail
+    }
+  }
+
+  String? _getExtensionFromUrl(String url) {
+    final uri = Uri.tryParse(url);
+    if (uri == null) return null;
+    final path = uri.path;
+    final lastDot = path.lastIndexOf('.');
+    if (lastDot == -1) return null;
+    return path.substring(lastDot + 1).split('?').first;
+  }
+
+  String _getExtensionFromCodec(String? codec) {
+    if (codec == null) return 'srt';
+
+    switch (codec.toLowerCase()) {
+      case 'subrip':
+      case 'srt':
+        return 'srt';
+      case 'ass':
+        return 'ass';
+      case 'ssa':
+        return 'ssa';
+      case 'webvtt':
+      case 'vtt':
+        return 'vtt';
+      case 'mov_text':
+        return 'srt';
+      case 'pgs':
+      case 'hdmv_pgs_subtitle':
+        return 'sup';
+      case 'dvd_subtitle':
+      case 'dvdsub':
+        return 'sub';
+      default:
+        return 'srt';
+    }
+  }
+
+  void _emitProgress(
+    String globalKey,
+    DownloadStatus status,
+    int progress, {
+    String? errorMessage,
+    String? currentFile,
+  }) {
+    _progressController.add(
+      DownloadProgress(
+        globalKey: globalKey,
+        status: status,
+        progress: progress,
+        errorMessage: errorMessage,
+        currentFile: currentFile,
+      ),
+    );
+  }
+
+  /// Emit progress update with artwork paths so DownloadProvider can sync
+  void _emitProgressWithArtwork(String globalKey, {String? thumbPath}) {
+    // Emit a progress update containing artwork path
+    // The status is preserved as downloading since artwork is just one step
+    _progressController.add(
+      DownloadProgress(
+        globalKey: globalKey,
+        status: DownloadStatus.downloading,
+        progress: 0,
+        currentFile: 'artwork',
+        thumbPath: thumbPath,
+      ),
+    );
+  }
+
+  /// Pause a download (works for both downloading and queued items)
+  Future<void> pauseDownload(String globalKey) async {
+    // Cancel active download if exists
+    final cancelToken = _activeDownloads[globalKey];
+    if (cancelToken != null) {
+      cancelToken.cancel('Paused by user');
+      _activeDownloads.remove(globalKey);
+    }
+    // Update status to paused
+    await _database.updateDownloadStatus(
+      globalKey,
+      DownloadStatus.paused.index,
+    );
+    // Remove from queue so it doesn't restart
+    await _database.removeFromQueue(globalKey);
+    _emitProgress(globalKey, DownloadStatus.paused, 0);
+  }
+
+  /// Resume a paused download
+  Future<void> resumeDownload(String globalKey, PlexClient client) async {
+    await _database.updateDownloadStatus(
+      globalKey,
+      DownloadStatus.queued.index,
+    );
+    // Re-add to queue (pauseDownload removes from queue)
+    await _database.addToQueue(mediaGlobalKey: globalKey);
+    _emitProgress(globalKey, DownloadStatus.queued, 0);
+    _processQueue(client);
+  }
+
+  /// Retry a failed download
+  Future<void> retryDownload(String globalKey, PlexClient client) async {
+    // Clear error and reset retry count
+    await _database.clearDownloadError(globalKey);
+    // Reset status to queued
+    await _database.updateDownloadStatus(
+      globalKey,
+      DownloadStatus.queued.index,
+    );
+    // Re-add to queue
+    await _database.addToQueue(mediaGlobalKey: globalKey);
+    _emitProgress(globalKey, DownloadStatus.queued, 0);
+    _processQueue(client);
+  }
+
+  /// Cancel a download
+  Future<void> cancelDownload(String globalKey) async {
+    final cancelToken = _activeDownloads[globalKey];
+    if (cancelToken != null) {
+      cancelToken.cancel('Cancelled by user');
+      _activeDownloads.remove(globalKey);
+    }
+    await _database.updateDownloadStatus(
+      globalKey,
+      DownloadStatus.cancelled.index,
+    );
+    await _database.removeFromQueue(globalKey);
+    _emitProgress(globalKey, DownloadStatus.cancelled, 0);
+  }
+
+  /// Delete a downloaded item and its files
+  Future<void> deleteDownload(String globalKey) async {
+    // Cancel if actively downloading
+    final cancelToken = _activeDownloads[globalKey];
+    if (cancelToken != null) {
+      cancelToken.cancel('Download deleted');
+      _activeDownloads.remove(globalKey);
+    }
+
+    // Delete files from storage
+    final parts = globalKey.split(':');
+    if (parts.length != 2) {
+      await _database.deleteDownload(globalKey);
+      return;
+    }
+
+    final serverId = parts[0];
+    final ratingKey = parts[1];
+    final metadata = await _getMetadataFromCache(serverId, ratingKey);
+
+    if (metadata == null) {
+      // Fallback deletion without progress
+      await _deleteMediaFilesWithMetadata(serverId, ratingKey);
+      await _apiCache.deleteForItem(serverId, ratingKey);
+      await _database.deleteDownload(globalKey);
+      return;
+    }
+
+    // Determine total items to delete
+    final totalItems = await _getTotalItemsToDelete(metadata, serverId);
+
+    // Emit initial progress
+    _emitDeletionProgress(
+      DeletionProgress(
+        globalKey: globalKey,
+        itemTitle: metadata.title,
+        currentItem: 0,
+        totalItems: totalItems,
+      ),
+    );
+
+    // Delete files from storage (with progress updates)
+    await _deleteMediaFilesWithMetadata(serverId, ratingKey);
+
+    // Delete from API cache
+    await _apiCache.deleteForItem(serverId, ratingKey);
+
+    // Delete from database
+    await _database.deleteDownload(globalKey);
+
+    // Emit completion
+    _emitDeletionProgress(
+      DeletionProgress(
+        globalKey: globalKey,
+        itemTitle: metadata.title,
+        currentItem: totalItems,
+        totalItems: totalItems,
+      ),
+    );
+  }
+
+  /// Emit deletion progress update
+  void _emitDeletionProgress(DeletionProgress progress) {
+    _deletionProgressController.add(progress);
+  }
+
+  /// Calculate total items to delete (for progress tracking)
+  Future<int> _getTotalItemsToDelete(
+    PlexMetadata metadata,
+    String serverId,
+  ) async {
+    switch (metadata.type.toLowerCase()) {
+      case 'episode':
+        return 1; // Single episode
+      case 'movie':
+        return 1; // Single movie
+      case 'season':
+        // Count episodes in season
+        final seasonKey = metadata.ratingKey;
+        final episodes = await (_database.select(
+          _database.downloadedMedia,
+        )..where((t) => t.parentRatingKey.equals(seasonKey))).get();
+        return episodes.length;
+      case 'show':
+        // Count all episodes in show
+        final showKey = metadata.ratingKey;
+        final episodes = await (_database.select(
+          _database.downloadedMedia,
+        )..where((t) => t.grandparentRatingKey.equals(showKey))).get();
+        return episodes.length;
+      default:
+        return 1;
+    }
+  }
+
+  /// Delete media files using metadata to find correct paths
+  Future<void> _deleteMediaFilesWithMetadata(
+    String serverId,
+    String ratingKey,
+  ) async {
+    try {
+      // Get metadata from API cache
+      final metadata = await _getMetadataFromCache(serverId, ratingKey);
+
+      if (metadata == null) {
+        // Fallback: Try database record
+        final downloadRecord = await _database.getDownloadedMedia(
+          '$serverId:$ratingKey',
+        );
+        if (downloadRecord?.videoFilePath != null) {
+          await _deleteByFilePath(downloadRecord!);
+          return;
+        }
+        appLogger.w('Cannot delete - no metadata for $serverId:$ratingKey');
+        return;
+      }
+
+      // Delete based on type
+      switch (metadata.type.toLowerCase()) {
+        case 'episode':
+          await _deleteEpisodeFiles(metadata, serverId);
+          break;
+        case 'season':
+          await _deleteSeasonFiles(metadata, serverId);
+          break;
+        case 'show':
+          await _deleteShowFiles(metadata, serverId);
+          break;
+        case 'movie':
+          await _deleteMovieFiles(metadata, serverId);
+          break;
+        default:
+          appLogger.w('Unknown type for deletion: ${metadata.type}');
+      }
+    } catch (e, stack) {
+      appLogger.e('Error deleting files', error: e, stackTrace: stack);
+    }
+  }
+
+  /// Get metadata from API cache
+  Future<PlexMetadata?> _getMetadataFromCache(
+    String serverId,
+    String ratingKey,
+  ) async {
+    final cachedData = await _apiCache.get(
+      serverId,
+      '/library/metadata/$ratingKey',
+    );
+    if (cachedData != null && cachedData['MediaContainer'] != null) {
+      final container = cachedData['MediaContainer'] as Map<String, dynamic>;
+      if (container['Metadata'] != null &&
+          (container['Metadata'] as List).isNotEmpty) {
+        final metadataJson = container['Metadata'][0] as Map<String, dynamic>;
+        return PlexMetadata.fromJson(metadataJson).copyWith(serverId: serverId);
+      }
+    }
+    return null;
+  }
+
+  /// Get chapter thumb paths from cached metadata
+  Future<List<String>> _getChapterThumbPaths(
+    String serverId,
+    String ratingKey,
+  ) async {
+    try {
+      final cachedData = await _apiCache.get(
+        serverId,
+        '/library/metadata/$ratingKey',
+      );
+
+      if (cachedData == null || cachedData['MediaContainer'] == null) {
+        return [];
+      }
+
+      final container = cachedData['MediaContainer'] as Map<String, dynamic>;
+      final metadataList = container['Metadata'] as List?;
+
+      if (metadataList == null || metadataList.isEmpty) {
+        return [];
+      }
+
+      final metadata = metadataList[0] as Map<String, dynamic>;
+      final chapters = metadata['Chapter'] as List?;
+
+      if (chapters == null) {
+        return [];
+      }
+
+      final thumbPaths = <String>[];
+      for (final chapter in chapters) {
+        final thumbPath = chapter['thumb'] as String?;
+        if (thumbPath != null && thumbPath.isNotEmpty) {
+          thumbPaths.add(thumbPath);
+        }
+      }
+
+      return thumbPaths;
+    } catch (e) {
+      appLogger.w('Error getting chapter thumb paths for $ratingKey', error: e);
+      return [];
+    }
+  }
+
+  /// Check if a chapter thumbnail is used by any other downloaded items
+  Future<bool> _isChapterThumbnailInUse(
+    String serverId,
+    String thumbPath,
+    String excludeRatingKey,
+  ) async {
+    try {
+      // Get all downloaded items
+      final allItems = await _database.select(_database.downloadedMedia).get();
+
+      // Check if any other item uses this chapter thumbnail
+      for (final item in allItems) {
+        // Skip the item being deleted
+        if (item.ratingKey == excludeRatingKey) {
+          continue;
+        }
+
+        // Get chapter thumb paths for this item
+        final itemChapterPaths = await _getChapterThumbPaths(
+          serverId,
+          item.ratingKey,
+        );
+
+        // Check if this item has the same thumb path
+        if (itemChapterPaths.contains(thumbPath)) {
+          return true; // Thumbnail is in use
+        }
+      }
+
+      return false; // Thumbnail is not in use
+    } catch (e) {
+      appLogger.w(
+        'Error checking chapter thumbnail usage: $thumbPath',
+        error: e,
+      );
+      // On error, assume in use to be safe (don't delete)
+      return true;
+    }
+  }
+
+  /// Delete chapter thumbnails for a media item (with reference counting)
+  Future<void> _deleteChapterThumbnails(
+    String serverId,
+    String ratingKey,
+  ) async {
+    try {
+      final thumbPaths = await _getChapterThumbPaths(serverId, ratingKey);
+
+      if (thumbPaths.isEmpty) {
+        appLogger.d('No chapter thumbnails to delete for $ratingKey');
+        return;
+      }
+
+      int deletedCount = 0;
+      int preservedCount = 0;
+
+      for (final thumbPath in thumbPaths) {
+        try {
+          // Check if this thumbnail is used by other items
+          final inUse = await _isChapterThumbnailInUse(
+            serverId,
+            thumbPath,
+            ratingKey,
+          );
+
+          if (inUse) {
+            appLogger.d('Preserving chapter thumbnail (in use): $thumbPath');
+            preservedCount++;
+            continue;
+          }
+
+          // Get artwork file path and delete
+          final artworkPath = await _storageService.getArtworkPathFromThumb(
+            serverId,
+            thumbPath,
+          );
+          final file = File(artworkPath);
+
+          if (await file.exists()) {
+            await file.delete();
+            deletedCount++;
+            appLogger.d('Deleted chapter thumbnail: $thumbPath');
+          }
+        } catch (e) {
+          appLogger.w(
+            'Failed to delete chapter thumbnail: $thumbPath',
+            error: e,
+          );
+          // Continue with other chapters even if one fails
+        }
+      }
+
+      if (deletedCount > 0 || preservedCount > 0) {
+        appLogger.i(
+          'Deleted $deletedCount of ${thumbPaths.length} chapter thumbnails ($preservedCount preserved)',
+        );
+      }
+    } catch (e, stack) {
+      appLogger.w(
+        'Error deleting chapter thumbnails for $ratingKey',
+        error: e,
+        stackTrace: stack,
+      );
+      // Don't throw - chapter deletion shouldn't block main deletion
+    }
+  }
+
+  /// Delete episode files
+  Future<void> _deleteEpisodeFiles(
+    PlexMetadata episode,
+    String serverId,
+  ) async {
+    try {
+      final parentMetadata = episode.grandparentRatingKey != null
+          ? await _getMetadataFromCache(serverId, episode.grandparentRatingKey!)
+          : null;
+      final showYear = parentMetadata?.year;
+
+      // Delete video file
+      final videoPathTemplate = await _storageService.getEpisodeVideoPath(
+        episode,
+        'tmp',
+        showYear: showYear,
+      );
+      final videoPathWithoutExt = videoPathTemplate.substring(
+        0,
+        videoPathTemplate.lastIndexOf('.'),
+      );
+      final actualVideoFile = await _findFileWithAnyExtension(
+        videoPathWithoutExt,
+      );
+      if (actualVideoFile != null && await actualVideoFile.exists()) {
+        await actualVideoFile.delete();
+        appLogger.i('Deleted episode video: ${actualVideoFile.path}');
+      }
+
+      // Delete thumbnail
+      final thumbPath = await _storageService.getEpisodeThumbnailPath(
+        episode,
+        showYear: showYear,
+      );
+      final thumbFile = File(thumbPath);
+      if (await thumbFile.exists()) {
+        await thumbFile.delete();
+        appLogger.i('Deleted episode thumbnail: $thumbPath');
+      }
+
+      // Delete subtitles directory
+      final subsDir = await _storageService.getEpisodeSubtitlesDirectory(
+        episode,
+        showYear: showYear,
+      );
+      if (await subsDir.exists()) {
+        await subsDir.delete(recursive: true);
+        appLogger.i('Deleted episode subtitles: ${subsDir.path}');
+      }
+
+      // Delete chapter thumbnails (with reference counting)
+      await _deleteChapterThumbnails(serverId, episode.ratingKey);
+
+      // Clean up parent directories if empty
+      await _cleanupEmptyDirectories(episode, showYear);
+    } catch (e, stack) {
+      appLogger.e('Error deleting episode files', error: e, stackTrace: stack);
+    }
+  }
+
+  /// Delete season files
+  Future<void> _deleteSeasonFiles(PlexMetadata season, String serverId) async {
+    try {
+      final parentMetadata = season.parentRatingKey != null
+          ? await _getMetadataFromCache(serverId, season.parentRatingKey!)
+          : null;
+      final showYear = parentMetadata?.year;
+
+      // Get all episodes in this season
+      final seasonKey = season.ratingKey;
+      final episodesInSeason = await (_database.select(
+        _database.downloadedMedia,
+      )..where((t) => t.parentRatingKey.equals(seasonKey))).get();
+
+      appLogger.d(
+        'Deleting ${episodesInSeason.length} episodes in season $seasonKey',
+      );
+      for (int i = 0; i < episodesInSeason.length; i++) {
+        final episode = episodesInSeason[i];
+        final episodeGlobalKey = '$serverId:${episode.ratingKey}';
+
+        // Emit progress update
+        _emitDeletionProgress(
+          DeletionProgress(
+            globalKey: '$serverId:$seasonKey',
+            itemTitle: season.title,
+            currentItem: i + 1,
+            totalItems: episodesInSeason.length,
+            currentOperation:
+                'Deleting episode ${i + 1} of ${episodesInSeason.length}',
+          ),
+        );
+
+        // Delete chapter thumbnails
+        await _deleteChapterThumbnails(serverId, episode.ratingKey);
+
+        // Delete episode files (video, subtitles) if stored outside season directory
+        await _deleteByFilePath(episode);
+
+        // Delete episode from API cache
+        await _apiCache.deleteForItem(serverId, episode.ratingKey);
+
+        // Delete episode DB entry
+        await _database.deleteDownload(episodeGlobalKey);
+      }
+
+      final seasonDir = await _storageService.getSeasonDirectory(
+        season,
+        showYear: showYear,
+      );
+      if (await seasonDir.exists()) {
+        await seasonDir.delete(recursive: true);
+        appLogger.i('Deleted season directory: ${seasonDir.path}');
+      }
+
+      await _cleanupShowDirectory(season, showYear);
+    } catch (e, stack) {
+      appLogger.e('Error deleting season files', error: e, stackTrace: stack);
+    }
+  }
+
+  /// Delete show files
+  Future<void> _deleteShowFiles(PlexMetadata show, String serverId) async {
+    try {
+      // Get all episodes in this show
+      final showKey = show.ratingKey;
+      final episodesInShow = await (_database.select(
+        _database.downloadedMedia,
+      )..where((t) => t.grandparentRatingKey.equals(showKey))).get();
+
+      appLogger.d(
+        'Deleting ${episodesInShow.length} episodes in show $showKey',
+      );
+      for (int i = 0; i < episodesInShow.length; i++) {
+        final episode = episodesInShow[i];
+        final episodeGlobalKey = '$serverId:${episode.ratingKey}';
+
+        // Emit progress update
+        _emitDeletionProgress(
+          DeletionProgress(
+            globalKey: '$serverId:$showKey',
+            itemTitle: show.title,
+            currentItem: i + 1,
+            totalItems: episodesInShow.length,
+            currentOperation:
+                'Deleting episode ${i + 1} of ${episodesInShow.length}',
+          ),
+        );
+
+        // Delete chapter thumbnails
+        await _deleteChapterThumbnails(serverId, episode.ratingKey);
+
+        // Delete episode files (video, subtitles) if stored outside show directory
+        await _deleteByFilePath(episode);
+
+        // Delete episode from API cache
+        await _apiCache.deleteForItem(serverId, episode.ratingKey);
+
+        // Delete episode DB entry
+        await _database.deleteDownload(episodeGlobalKey);
+      }
+
+      final showDir = await _storageService.getShowDirectory(show);
+      if (await showDir.exists()) {
+        await showDir.delete(recursive: true);
+        appLogger.i('Deleted show directory: ${showDir.path}');
+      }
+    } catch (e, stack) {
+      appLogger.e('Error deleting show files', error: e, stackTrace: stack);
+    }
+  }
+
+  /// Delete movie files
+  Future<void> _deleteMovieFiles(PlexMetadata movie, String serverId) async {
+    try {
+      final movieDir = await _storageService.getMovieDirectory(movie);
+      if (await movieDir.exists()) {
+        await movieDir.delete(recursive: true);
+        appLogger.i('Deleted movie directory: ${movieDir.path}');
+      }
+
+      // Delete chapter thumbnails (with reference counting)
+      await _deleteChapterThumbnails(serverId, movie.ratingKey);
+    } catch (e, stack) {
+      appLogger.e('Error deleting movie files', error: e, stackTrace: stack);
+    }
+  }
+
+  /// Clean up empty directories after deleting episode
+  Future<void> _cleanupEmptyDirectories(
+    PlexMetadata episode,
+    int? showYear,
+  ) async {
+    final seasonDir = await _storageService.getSeasonDirectory(
+      episode,
+      showYear: showYear,
+    );
+
+    if (await seasonDir.exists()) {
+      final contents = await seasonDir.list().toList();
+      final hasVideos = contents.any(
+        (e) =>
+            e.path.endsWith('.mp4') ||
+            e.path.endsWith('.ogv') ||
+            e.path.endsWith('.mkv') ||
+            e.path.endsWith('.m4v') ||
+            e.path.endsWith('.avi') ||
+            e.path.contains('_subs'),
+      );
+
+      if (!hasVideos) {
+        if (!await _isSeasonArtworkInUse(episode, showYear)) {
+          await seasonDir.delete(recursive: true);
+          appLogger.i('Deleted empty season directory: ${seasonDir.path}');
+          await _cleanupShowDirectory(episode, showYear);
+        }
+      }
+    }
+  }
+
+  /// Clean up show directory if empty
+  Future<void> _cleanupShowDirectory(
+    PlexMetadata metadata,
+    int? showYear,
+  ) async {
+    final showDir = await _storageService.getShowDirectory(
+      metadata,
+      showYear: showYear,
+    );
+
+    if (await showDir.exists()) {
+      final contents = await showDir.list().toList();
+      final hasSeasons = contents.any(
+        (e) => e is Directory && e.path.contains('Season '),
+      );
+
+      if (!hasSeasons) {
+        if (!await _isShowArtworkInUse(metadata, showYear)) {
+          await showDir.delete(recursive: true);
+          appLogger.i('Deleted empty show directory: ${showDir.path}');
+        }
+      }
+    }
+  }
+
+  /// Check if season artwork is in use
+  Future<bool> _isSeasonArtworkInUse(
+    PlexMetadata episode,
+    int? showYear,
+  ) async {
+    final seasonKey = episode.parentRatingKey;
+    if (seasonKey == null) return false;
+
+    final otherEpisodes = await (_database.select(
+      _database.downloadedMedia,
+    )..where((t) => t.parentRatingKey.equals(seasonKey))).get();
+
+    // Check if any episodes besides this one
+    return otherEpisodes.any(
+      (e) => e.globalKey != '${episode.serverId}:${episode.ratingKey}',
+    );
+  }
+
+  /// Check if show artwork is in use
+  Future<bool> _isShowArtworkInUse(PlexMetadata metadata, int? showYear) async {
+    final showKey =
+        metadata.grandparentRatingKey ??
+        metadata.parentRatingKey ??
+        metadata.ratingKey;
+
+    final allItems = await _database.select(_database.downloadedMedia).get();
+
+    // Check if any items belong to this show besides this one
+    return allItems.any(
+      (item) =>
+          (item.grandparentRatingKey == showKey ||
+              item.parentRatingKey == showKey) &&
+          item.globalKey != '${metadata.serverId}:${metadata.ratingKey}',
+    );
+  }
+
+  /// Find file with any extension
+  Future<File?> _findFileWithAnyExtension(String pathWithoutExt) async {
+    final dir = Directory(path.dirname(pathWithoutExt));
+    final baseName = path.basename(pathWithoutExt);
+
+    if (!await dir.exists()) return null;
+
+    try {
+      final files = await dir
+          .list()
+          .where(
+            (e) =>
+                e is File && path.basenameWithoutExtension(e.path) == baseName,
+          )
+          .toList();
+
+      return files.isNotEmpty ? files.first as File : null;
+    } catch (e) {
+      appLogger.w('Error finding file: $pathWithoutExt', error: e);
+      return null;
+    }
+  }
+
+  /// Fallback deletion using file paths from database
+  Future<void> _deleteByFilePath(DownloadedMediaItem record) async {
+    try {
+      if (record.videoFilePath != null) {
+        final videoPath = await _storageService.toAbsolutePath(
+          record.videoFilePath!,
+        );
+        final videoFile = File(videoPath);
+        if (await videoFile.exists()) {
+          await videoFile.delete();
+          appLogger.i('Deleted video file: $videoPath');
+
+          // Delete subtitle directory
+          final subsPath = videoPath.replaceAll(RegExp(r'\.[^.]+$'), '_subs');
+          final subsDir = Directory(subsPath);
+          if (await subsDir.exists()) {
+            await subsDir.delete(recursive: true);
+            appLogger.i('Deleted subtitles: $subsPath');
+          }
+        }
+      }
+
+      if (record.thumbPath != null) {
+        final thumbPath = await _storageService.toAbsolutePath(
+          record.thumbPath!,
+        );
+        final thumbFile = File(thumbPath);
+        if (await thumbFile.exists()) {
+          await thumbFile.delete();
+          appLogger.i('Deleted thumbnail: $thumbPath');
+        }
+      }
+    } catch (e, stack) {
+      appLogger.e('Error in fallback deletion', error: e, stackTrace: stack);
+    }
+  }
+
+  /// Get all downloads with a specific status
+  Stream<List<DownloadedMediaItem>> watchDownloadsByStatus(
+    DownloadStatus status,
+  ) {
+    return (_database.select(
+      _database.downloadedMedia,
+    )..where((t) => t.status.equals(status.index))).watch();
+  }
+
+  /// Get all downloaded media items (for loading persisted data)
+  Future<List<DownloadedMediaItem>> getAllDownloads() async {
+    return _database.select(_database.downloadedMedia).get();
+  }
+
+  /// Get a specific downloaded media item by globalKey
+  Future<DownloadedMediaItem?> getDownloadedMedia(String globalKey) async {
+    return _database.getDownloadedMedia(globalKey);
+  }
+
+  /// Save metadata for a media item (show, season, movie, or episode)
+  /// Used to persist parent metadata (shows/seasons) for offline display
+  Future<void> saveMetadata(PlexMetadata metadata) async {
+    if (metadata.serverId == null) {
+      appLogger.w('Cannot save metadata without serverId');
+      return;
+    }
+
+    // Cache to API cache for offline use
+    await _cacheMetadataForOffline(
+      metadata.serverId!,
+      metadata.ratingKey,
+      metadata,
+    );
+  }
+
+  /// Cache metadata in the API response format for offline access
+  /// This simulates what PlexClient would receive from the server
+  Future<void> _cacheMetadataForOffline(
+    String serverId,
+    String ratingKey,
+    PlexMetadata metadata,
+  ) async {
+    final endpoint = '/library/metadata/$ratingKey';
+
+    // Build a response structure that matches the Plex API format
+    final cachedResponse = {
+      'MediaContainer': {
+        'Metadata': [metadata.toJson()],
+      },
+    };
+
+    await _apiCache.put(serverId, endpoint, cachedResponse);
+    await _apiCache.pinForOffline(serverId, ratingKey);
+  }
+
+  /// Cache children (seasons or episodes) in the API response format
+  Future<void> cacheChildrenForOffline(
+    String serverId,
+    String parentRatingKey,
+    List<PlexMetadata> children,
+  ) async {
+    final endpoint = '/library/metadata/$parentRatingKey/children';
+
+    // Build a response structure that matches the Plex API format
+    final cachedResponse = {
+      'MediaContainer': {'Metadata': children.map((c) => c.toJson()).toList()},
+    };
+
+    await _apiCache.put(serverId, endpoint, cachedResponse);
+  }
+
+  void dispose() {
+    _connectivitySubscription?.cancel();
+    for (final token in _activeDownloads.values) {
+      token.cancel('Service disposed');
+    }
+    _progressController.close();
+    _deletionProgressController.close();
+  }
+}
diff --git a/lib/services/download_storage_service.dart b/lib/services/download_storage_service.dart
new file mode 100644
index 00000000..9ce1ea05
--- /dev/null
+++ b/lib/services/download_storage_service.dart
@@ -0,0 +1,673 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:crypto/crypto.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:path/path.dart' as path;
+
+import '../models/plex_metadata.dart';
+import 'settings_service.dart';
+import 'saf_storage_service.dart';
+
+class DownloadStorageService {
+  static DownloadStorageService? _instance;
+  static DownloadStorageService get instance =>
+      _instance ??= DownloadStorageService._();
+  DownloadStorageService._();
+
+  Directory? _baseDownloadsDir;
+  String? _artworkDirectoryPath;
+
+  // Custom path configuration
+  SettingsService? _settingsService;
+  String? _customDownloadPath;
+  String _customPathType = 'file';
+
+  /// Check if currently using SAF mode (Android only)
+  bool get isUsingSaf =>
+      Platform.isAndroid &&
+      _customPathType == 'saf' &&
+      _customDownloadPath != null;
+
+  /// Get the SAF base URI (only valid when isUsingSaf is true)
+  String? get safBaseUri => isUsingSaf ? _customDownloadPath : null;
+
+  /// Get artwork directory path (cached, synchronous after first call)
+  String? get artworkDirectoryPath => _artworkDirectoryPath;
+
+  /// Initialize with settings service (call during app startup)
+  Future<void> initialize(SettingsService settingsService) async {
+    _settingsService = settingsService;
+    _customDownloadPath = settingsService.getCustomDownloadPath();
+    _customPathType = settingsService.getCustomDownloadPathType();
+    // Reset cached directories to force recalculation
+    _baseDownloadsDir = null;
+    _artworkDirectoryPath = null;
+  }
+
+  /// Refresh custom path from settings (call when settings change)
+  Future<void> refreshCustomPath() async {
+    if (_settingsService != null) {
+      _customDownloadPath = _settingsService!.getCustomDownloadPath();
+      _customPathType = _settingsService!.getCustomDownloadPathType();
+      _baseDownloadsDir = null;
+      _artworkDirectoryPath = null;
+    }
+  }
+
+  /// Get the base app directory for storing data.
+  /// Uses ApplicationDocumentsDirectory on mobile, ApplicationSupportDirectory on desktop.
+  Future<Directory> _getBaseAppDir() async {
+    if (Platform.isAndroid || Platform.isIOS) {
+      return getApplicationDocumentsDirectory();
+    }
+    return getApplicationSupportDirectory();
+  }
+
+  /// Format episode filename base: S{XX}E{XX} - {Title}
+  String _formatEpisodeFileName(PlexMetadata episode) {
+    final seasonNum = (episode.parentIndex ?? 0).toString().padLeft(2, '0');
+    final episodeNum = (episode.index ?? 0).toString().padLeft(2, '0');
+    final episodeName = _sanitizeFileName(episode.title);
+    return 'S${seasonNum}E$episodeNum - $episodeName';
+  }
+
+  /// Check if using custom download path
+  bool isUsingCustomPath() => _customDownloadPath != null;
+
+  /// Get current download path for display in settings
+  Future<String> getCurrentDownloadPathDisplay() async {
+    if (_customDownloadPath != null) {
+      return _customDownloadPath!;
+    }
+    final dir = await getDownloadsDirectory();
+    return dir.path;
+  }
+
+  /// Get default download path (for "Reset to Default" functionality)
+  Future<String> getDefaultDownloadPath() async {
+    final baseDir = await _getBaseAppDir();
+    return path.join(baseDir.path, 'downloads');
+  }
+
+  /// Check if a directory is writable
+  Future<bool> isDirectoryWritable(Directory dir) async {
+    try {
+      if (!await dir.exists()) {
+        await dir.create(recursive: true);
+      }
+      // Test write access with a temp file
+      final testFile = File(
+        path.join(
+          dir.path,
+          '.write_test_${DateTime.now().millisecondsSinceEpoch}',
+        ),
+      );
+      await testFile.writeAsString('test');
+      await testFile.delete();
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  /// Initialize and get base downloads directory
+  Future<Directory> getDownloadsDirectory() async {
+    if (_baseDownloadsDir != null) return _baseDownloadsDir!;
+
+    // Check for custom path first (file type only - SAF handled differently)
+    if (_customDownloadPath != null && _customPathType == 'file') {
+      final customDir = Directory(_customDownloadPath!);
+      if (await isDirectoryWritable(customDir)) {
+        _baseDownloadsDir = customDir;
+        return _baseDownloadsDir!;
+      }
+      // Fall through to default if custom path is not writable
+    }
+
+    // Default path logic
+    final baseDir = await _getBaseAppDir();
+    _baseDownloadsDir = await _ensureDirectoryExists(
+      Directory(path.join(baseDir.path, 'downloads')),
+    );
+    return _baseDownloadsDir!;
+  }
+
+  /// Get centralized artwork directory for offline artwork caching
+  /// This directory stores artwork files with hashed filenames for deduplication
+  Future<Directory> getArtworkDirectory() async {
+    // If custom download path is set, put artwork alongside downloads
+    if (_customDownloadPath != null && _customPathType == 'file') {
+      final customDir = Directory(_customDownloadPath!);
+      final parent = customDir.parent;
+      final artworkDir = Directory(path.join(parent.path, 'artwork'));
+      try {
+        // Validate writeability for custom artwork path
+        if (await isDirectoryWritable(artworkDir)) {
+          _artworkDirectoryPath = artworkDir.path;
+          return artworkDir;
+        }
+      } catch (e) {
+        // Fall through to default if we can't create artwork dir
+      }
+    }
+
+    // Default: Get the app base directory directly (not downloads directory)
+    final baseDir = await _getBaseAppDir();
+    final artworkDir = await _ensureDirectoryExists(
+      Directory(path.join(baseDir.path, 'artwork')),
+    );
+    // Cache the path for synchronous access
+    _artworkDirectoryPath = artworkDir.path;
+    return artworkDir;
+  }
+
+  /// Get artwork file path from Plex thumb path (synchronous, requires initialization)
+  /// Returns path to cached artwork file using hash of the thumb URL
+  /// Example: artwork/a1b2c3d4e5f6.jpg
+  String getArtworkPathSync(String serverId, String thumbPath) {
+    if (_artworkDirectoryPath == null) {
+      throw StateError(
+        'Artwork directory not initialized. Call getArtworkDirectory() first.',
+      );
+    }
+    // Create hash from serverId:thumbPath for deduplication
+    final hash = _hashArtworkPath(serverId, thumbPath);
+    return path.join(_artworkDirectoryPath!, '$hash.jpg');
+  }
+
+  /// Get artwork file path from Plex thumb path (async version)
+  Future<String> getArtworkPathFromThumb(
+    String serverId,
+    String thumbPath,
+  ) async {
+    final artworkDir = await getArtworkDirectory();
+    final hash = _hashArtworkPath(serverId, thumbPath);
+    return path.join(artworkDir.path, '$hash.jpg');
+  }
+
+  /// Check if artwork already exists (for deduplication)
+  Future<bool> artworkExists(String serverId, String thumbPath) async {
+    final artworkPath = await getArtworkPathFromThumb(serverId, thumbPath);
+    return File(artworkPath).exists();
+  }
+
+  /// Hash artwork path for filename using MD5 for stability across app restarts
+  String _hashArtworkPath(String serverId, String thumbPath) {
+    final combined = '$serverId:$thumbPath';
+    return md5.convert(utf8.encode(combined)).toString();
+  }
+
+  /// Get directory for a specific media item
+  Future<Directory> getMediaDirectory(String serverId, String ratingKey) async {
+    final baseDir = await getDownloadsDirectory();
+    return _ensureDirectoryExists(
+      Directory(path.join(baseDir.path, serverId, ratingKey)),
+    );
+  }
+
+  /// Get video file path
+  Future<String> getVideoFilePath(
+    String serverId,
+    String ratingKey,
+    String extension,
+  ) async {
+    final mediaDir = await getMediaDirectory(serverId, ratingKey);
+    return path.join(mediaDir.path, 'video.$extension');
+  }
+
+  /// Get artwork file path (poster, art, thumb)
+  Future<String> getArtworkPath(
+    String serverId,
+    String ratingKey,
+    String artworkType,
+  ) async {
+    final mediaDir = await getMediaDirectory(serverId, ratingKey);
+    return path.join(mediaDir.path, '$artworkType.jpg');
+  }
+
+  /// Get subtitles directory
+  Future<Directory> getSubtitlesDirectory(
+    String serverId,
+    String ratingKey,
+  ) async {
+    final mediaDir = await getMediaDirectory(serverId, ratingKey);
+    final subtitlesDir = Directory(path.join(mediaDir.path, 'subtitles'));
+    if (!await subtitlesDir.exists()) {
+      await subtitlesDir.create(recursive: true);
+    }
+    return subtitlesDir;
+  }
+
+  /// Get subtitle file path
+  Future<String> getSubtitlePath(
+    String serverId,
+    String ratingKey,
+    int trackId,
+    String extension,
+  ) async {
+    final subtitlesDir = await getSubtitlesDirectory(serverId, ratingKey);
+    return path.join(subtitlesDir.path, '$trackId.$extension');
+  }
+
+  // ============================================================
+  // USER-FRIENDLY PATH METHODS (for Files app visibility)
+  // ============================================================
+
+  /// Sanitize a filename by removing invalid filesystem characters
+  String _sanitizeFileName(String name) {
+    // Remove invalid filesystem characters: < > : " / \ | ? *
+    // Also remove leading/trailing whitespace and dots
+    return name
+        .replaceAll(RegExp(r'[<>:"/\\|?*]'), '')
+        .replaceAll(RegExp(r'^\.+|\.+$'), '')
+        .trim();
+  }
+
+  /// Ensure a directory exists, creating it if necessary
+  Future<Directory> _ensureDirectoryExists(Directory dir) async {
+    if (!await dir.exists()) {
+      await dir.create(recursive: true);
+    }
+    return dir;
+  }
+
+  /// Format a media title with optional year: "Title (YYYY)" or "Title"
+  String _formatTitleWithYear(String title, int? year) {
+    final sanitized = _sanitizeFileName(title);
+    return year != null ? '$sanitized ($year)' : sanitized;
+  }
+
+  /// Get the folder name for a movie: "Movie Name (YYYY)"
+  String _getMovieFolderName(PlexMetadata movie) {
+    return _formatTitleWithYear(movie.title, movie.year);
+  }
+
+  /// Get the folder name for a TV show: "Show Name (YYYY)"
+  /// [showYear]: Pass explicitly for episodes (episode.year may differ from show's year)
+  String _getShowFolderName(PlexMetadata metadata, {int? showYear}) {
+    final title = metadata.grandparentTitle ?? metadata.title;
+    final year = showYear ?? metadata.year;
+    return _formatTitleWithYear(title, year);
+  }
+
+  /// Get movie directory: downloads/Movies/{Movie Name} ({Year})/
+  Future<Directory> getMovieDirectory(PlexMetadata movie) async {
+    final baseDir = await getDownloadsDirectory();
+    final movieFolder = _getMovieFolderName(movie);
+    return _ensureDirectoryExists(
+      Directory(path.join(baseDir.path, 'Movies', movieFolder)),
+    );
+  }
+
+  /// Get movie video file path: .../Movie Name (YYYY)/Movie Name (YYYY).{ext}
+  Future<String> getMovieVideoPath(PlexMetadata movie, String extension) async {
+    final movieDir = await getMovieDirectory(movie);
+    final fileName = _getMovieFolderName(movie);
+    return path.join(movieDir.path, '$fileName.$extension');
+  }
+
+  /// Get movie artwork path: .../Movie Name (YYYY)/{artworkType}.jpg
+  Future<String> getMovieArtworkPath(
+    PlexMetadata movie,
+    String artworkType,
+  ) async {
+    final movieDir = await getMovieDirectory(movie);
+    return path.join(movieDir.path, '$artworkType.jpg');
+  }
+
+  /// Get show directory: downloads/TV Shows/{Show Name} ({Year})/
+  /// [showYear]: Pass the show's premiere year explicitly (for episodes, the episode's
+  /// year may differ from the show's year). If not provided, uses metadata.year.
+  Future<Directory> getShowDirectory(
+    PlexMetadata metadata, {
+    int? showYear,
+  }) async {
+    final baseDir = await getDownloadsDirectory();
+    final showFolder = _getShowFolderName(metadata, showYear: showYear);
+    return _ensureDirectoryExists(
+      Directory(path.join(baseDir.path, 'TV Shows', showFolder)),
+    );
+  }
+
+  /// Get show artwork path: downloads/TV Shows/{Show}/poster.jpg
+  Future<String> getShowArtworkPath(
+    PlexMetadata metadata,
+    String artworkType, {
+    int? showYear,
+  }) async {
+    final showDir = await getShowDirectory(metadata, showYear: showYear);
+    return path.join(showDir.path, '$artworkType.jpg');
+  }
+
+  /// Get season directory: .../TV Shows/{Show}/Season {XX}/
+  /// [showYear]: Pass the show's premiere year (not episode or season year)
+  Future<Directory> getSeasonDirectory(
+    PlexMetadata metadata, {
+    int? showYear,
+  }) async {
+    final showDir = await getShowDirectory(metadata, showYear: showYear);
+    final seasonNum = (metadata.parentIndex ?? 0).toString().padLeft(2, '0');
+    return _ensureDirectoryExists(
+      Directory(path.join(showDir.path, 'Season $seasonNum')),
+    );
+  }
+
+  /// Get season artwork path: .../Season XX/poster.jpg
+  Future<String> getSeasonArtworkPath(
+    PlexMetadata metadata,
+    String artworkType, {
+    int? showYear,
+  }) async {
+    final seasonDir = await getSeasonDirectory(metadata, showYear: showYear);
+    return path.join(seasonDir.path, '$artworkType.jpg');
+  }
+
+  /// Get base path info for episode files (season directory path and formatted filename).
+  /// [showYear]: Pass the show's premiere year (not episode year)
+  Future<({String seasonDirPath, String fileName})> _getEpisodeBasePath(
+    PlexMetadata episode, {
+    int? showYear,
+  }) async {
+    final seasonDir = await getSeasonDirectory(episode, showYear: showYear);
+    final fileName = _formatEpisodeFileName(episode);
+    return (seasonDirPath: seasonDir.path, fileName: fileName);
+  }
+
+  /// Get episode video file path: .../Season XX/S{XX}E{XX} - {Title}.{ext}
+  /// [showYear]: Pass the show's premiere year (not episode year)
+  Future<String> getEpisodeVideoPath(
+    PlexMetadata episode,
+    String extension, {
+    int? showYear,
+  }) async {
+    final base = await _getEpisodeBasePath(episode, showYear: showYear);
+    return path.join(base.seasonDirPath, '${base.fileName}.$extension');
+  }
+
+  /// Get episode thumbnail path: .../Season XX/S{XX}E{XX} - {Title}.jpg
+  /// [showYear]: Pass the show's premiere year (not episode year)
+  Future<String> getEpisodeThumbnailPath(
+    PlexMetadata episode, {
+    int? showYear,
+  }) async {
+    final base = await _getEpisodeBasePath(episode, showYear: showYear);
+    return path.join(base.seasonDirPath, '${base.fileName}.jpg');
+  }
+
+  /// Get subtitles directory for episode: .../Season XX/S{XX}E{XX} - {Title}_subs/
+  /// [showYear]: Pass the show's premiere year (not episode year)
+  Future<Directory> getEpisodeSubtitlesDirectory(
+    PlexMetadata episode, {
+    int? showYear,
+  }) async {
+    final base = await _getEpisodeBasePath(episode, showYear: showYear);
+    return _ensureDirectoryExists(
+      Directory(path.join(base.seasonDirPath, '${base.fileName}_subs')),
+    );
+  }
+
+  /// Get episode subtitle path
+  /// [showYear]: Pass the show's premiere year (not episode year)
+  Future<String> getEpisodeSubtitlePath(
+    PlexMetadata episode,
+    int trackId,
+    String extension, {
+    int? showYear,
+  }) async {
+    final subsDir = await getEpisodeSubtitlesDirectory(
+      episode,
+      showYear: showYear,
+    );
+    return path.join(subsDir.path, '$trackId.$extension');
+  }
+
+  /// Get subtitles directory for movie
+  Future<Directory> getMovieSubtitlesDirectory(PlexMetadata movie) async {
+    final movieDir = await getMovieDirectory(movie);
+    final baseName = _getMovieFolderName(movie);
+    return _ensureDirectoryExists(
+      Directory(path.join(movieDir.path, '${baseName}_subs')),
+    );
+  }
+
+  /// Get movie subtitle path
+  Future<String> getMovieSubtitlePath(
+    PlexMetadata movie,
+    int trackId,
+    String extension,
+  ) async {
+    final subsDir = await getMovieSubtitlesDirectory(movie);
+    return path.join(subsDir.path, '$trackId.$extension');
+  }
+
+  /// Delete all files for a media item
+  Future<void> deleteMediaFiles(String serverId, String ratingKey) async {
+    final mediaDir = await getMediaDirectory(serverId, ratingKey);
+    if (await mediaDir.exists()) {
+      await mediaDir.delete(recursive: true);
+    }
+  }
+
+  /// Convert an absolute file path to a relative path (for database storage)
+  /// This ensures paths remain valid across app reinstalls on iOS where
+  /// the container UUID can change.
+  /// Returns a path relative to the app's documents directory.
+  Future<String> toRelativePath(String absolutePath) async {
+    final baseDir = await _getBaseAppDir();
+
+    // If the path starts with the base directory, strip it
+    if (absolutePath.startsWith(baseDir.path)) {
+      // Remove the base path and any leading separator
+      var relative = absolutePath.substring(baseDir.path.length);
+      if (relative.startsWith('/') || relative.startsWith('\\')) {
+        relative = relative.substring(1);
+      }
+      return relative;
+    }
+
+    // Already relative or from a different base - return as-is
+    return absolutePath;
+  }
+
+  /// Convert a relative file path to an absolute path (for file operations)
+  /// Reconstructs the full path using the current app documents directory.
+  Future<String> toAbsolutePath(String relativePath) async {
+    // If it's already an absolute path, return as-is
+    if (path.isAbsolute(relativePath)) {
+      return relativePath;
+    }
+
+    final baseDir = await _getBaseAppDir();
+    return path.join(baseDir.path, relativePath);
+  }
+
+  /// Convert a potentially absolute path (from old database entries) to absolute
+  /// This handles both old absolute paths and new relative paths
+  Future<String> ensureAbsolutePath(String storedPath) async {
+    if (path.isAbsolute(storedPath)) {
+      // Already absolute - check if file exists at this path
+      if (await File(storedPath).exists()) {
+        return storedPath;
+      }
+      // File doesn't exist at absolute path - try to reconstruct
+      // Extract the relative portion (everything after 'downloads/')
+      final downloadsIndex = storedPath.indexOf('downloads/');
+      if (downloadsIndex != -1) {
+        final relativePart = storedPath.substring(downloadsIndex);
+        return await toAbsolutePath(relativePart);
+      }
+      // Can't reconstruct, return original
+      return storedPath;
+    }
+    // Relative path - convert to absolute
+    return await toAbsolutePath(storedPath);
+  }
+
+  /// Calculate total storage used by downloads
+  Future<int> getTotalStorageUsed() async {
+    final baseDir = await getDownloadsDirectory();
+    return _calculateDirectorySize(baseDir);
+  }
+
+  Future<int> _calculateDirectorySize(Directory dir) async {
+    int size = 0;
+    if (!await dir.exists()) return size;
+
+    await for (var entity in dir.list(recursive: true, followLinks: false)) {
+      if (entity is File) {
+        try {
+          size += await entity.length();
+        } catch (_) {
+          // Ignore errors reading file size
+        }
+      }
+    }
+    return size;
+  }
+
+  /// Format bytes to human readable string
+  static String formatBytes(int bytes) {
+    if (bytes < 1024) return '$bytes B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB';
+    if (bytes < 1024 * 1024 * 1024) {
+      return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
+    }
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(2)} GB';
+  }
+
+  // ============================================================
+  // SAF (Storage Access Framework) SUPPORT FOR ANDROID
+  // ============================================================
+
+  /// Get temporary cache directory for initial downloads
+  /// Files are downloaded here first, then copied to SAF if using SAF mode
+  Future<Directory> getCacheDownloadDirectory() async {
+    final cacheDir = await getApplicationDocumentsDirectory();
+    return _ensureDirectoryExists(
+      Directory(path.join(cacheDir.path, '.download_cache')),
+    );
+  }
+
+  /// Get temporary file path for downloading (before copying to SAF)
+  Future<String> getTempDownloadPath(String fileName) async {
+    final cacheDir = await getCacheDownloadDirectory();
+    return path.join(cacheDir.path, fileName);
+  }
+
+  /// Copy a file from temp cache to SAF and return the SAF URI
+  /// Returns null if SAF is not available or copy fails
+  Future<String?> copyToSaf(
+    String tempFilePath,
+    List<String> pathComponents,
+    String fileName,
+    String mimeType,
+  ) async {
+    if (!isUsingSaf || _customDownloadPath == null) return null;
+
+    final safService = SafStorageService.instance;
+
+    // Create nested directory structure in SAF
+    final targetDirUri = await safService.createNestedDirectories(
+      _customDownloadPath!,
+      pathComponents,
+    );
+
+    if (targetDirUri == null) {
+      return null;
+    }
+
+    // Copy the file to SAF
+    final safUri = await safService.copyFileToSaf(
+      tempFilePath,
+      targetDirUri,
+      fileName,
+      mimeType,
+    );
+
+    // Delete temp file after successful copy
+    if (safUri != null) {
+      try {
+        await File(tempFilePath).delete();
+      } catch (_) {
+        // Ignore cleanup errors
+      }
+    }
+
+    return safUri;
+  }
+
+  /// Get the MIME type for a file extension
+  String getMimeType(String extension) {
+    switch (extension.toLowerCase()) {
+      case 'mp4':
+        return 'video/mp4';
+      case 'mkv':
+        return 'video/x-matroska';
+      case 'm4v':
+        return 'video/x-m4v';
+      case 'avi':
+        return 'video/x-msvideo';
+      case 'ogv':
+        return 'video/ogg';
+      case 'webm':
+        return 'video/webm';
+      case 'srt':
+        return 'application/x-subrip';
+      case 'vtt':
+        return 'text/vtt';
+      case 'ass':
+      case 'ssa':
+        return 'text/x-ssa';
+      case 'jpg':
+      case 'jpeg':
+        return 'image/jpeg';
+      case 'png':
+        return 'image/png';
+      default:
+        return 'application/octet-stream';
+    }
+  }
+
+  /// Get path components for SAF based on media type
+  /// Returns list of directory names to create under the SAF base
+  List<String> getMovieSafPathComponents(PlexMetadata movie) {
+    return ['Movies', _getMovieFolderName(movie)];
+  }
+
+  /// Get path components for episode SAF storage
+  List<String> getEpisodeSafPathComponents(
+    PlexMetadata episode, {
+    int? showYear,
+  }) {
+    final showFolder = _getShowFolderName(episode, showYear: showYear);
+    final seasonNum = (episode.parentIndex ?? 0).toString().padLeft(2, '0');
+    return ['TV Shows', showFolder, 'Season $seasonNum'];
+  }
+
+  /// Get SAF file name for a movie
+  String getMovieSafFileName(PlexMetadata movie, String extension) {
+    return '${_getMovieFolderName(movie)}.$extension';
+  }
+
+  /// Get SAF file name for an episode
+  String getEpisodeSafFileName(PlexMetadata episode, String extension) {
+    final fileName = _formatEpisodeFileName(episode);
+    return '$fileName.$extension';
+  }
+
+  /// Check if a path is a SAF content URI
+  bool isSafUri(String storedPath) {
+    return storedPath.startsWith('content://');
+  }
+
+  /// Get a readable path for a stored path (handles both SAF URIs and file paths)
+  /// For SAF URIs, returns the URI as-is (content:// URIs work with media players)
+  /// For file paths, ensures the path is absolute
+  Future<String> getReadablePath(String storedPath) async {
+    if (isSafUri(storedPath)) {
+      // SAF content:// URIs are already readable by media players
+      return storedPath;
+    }
+    return await ensureAbsolutePath(storedPath);
+  }
+}
diff --git a/lib/services/episode_navigation_service.dart b/lib/services/episode_navigation_service.dart
new file mode 100644
index 00000000..677d5dfd
--- /dev/null
+++ b/lib/services/episode_navigation_service.dart
@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../mpv/mpv.dart';
+import 'plex_client.dart';
+import '../models/plex_metadata.dart';
+import '../providers/playback_state_provider.dart';
+import '../utils/app_logger.dart';
+import '../utils/video_player_navigation.dart';
+
+/// Result of loading adjacent episodes
+class AdjacentEpisodes {
+  final PlexMetadata? next;
+  final PlexMetadata? previous;
+
+  AdjacentEpisodes({this.next, this.previous});
+
+  bool get hasNext => next != null;
+  bool get hasPrevious => previous != null;
+}
+
+/// Manages episode navigation for TV show playback.
+///
+/// Handles:
+/// - Loading next/previous episodes from play queues
+/// - Navigating between episodes while preserving track selections
+/// - Supporting both sequential and shuffle playback modes
+///
+/// All episode navigation uses Plex play queues for consistent behavior.
+class EpisodeNavigationService {
+  /// Load the next and previous episodes for the current episode
+  ///
+  /// Returns null for episodes if:
+  /// - Not applicable (e.g., movie content)
+  /// - Next episode doesn't exist (end of season/series)
+  /// - Previous episode doesn't exist (first episode)
+  Future<AdjacentEpisodes> loadAdjacentEpisodes({
+    required BuildContext context,
+    required PlexClient client,
+    required PlexMetadata metadata,
+  }) async {
+    try {
+      final playbackState = context.read<PlaybackStateProvider>();
+
+      // All episode navigation now uses play queues (sequential, shuffle, playlists)
+      // If no queue is active, navigation is not available
+      if (!playbackState.isQueueActive) {
+        return AdjacentEpisodes();
+      }
+
+      // Use the play queue for next/previous navigation
+      final next = await playbackState.getNextEpisode(
+        metadata.ratingKey,
+        loopQueue: false,
+      );
+      final previous = await playbackState.getPreviousEpisode(
+        metadata.ratingKey,
+      );
+
+      final mode = playbackState.isShuffleActive ? 'Shuffle' : 'Sequential';
+      appLogger.d(
+        '$mode mode - Next: ${next?.title}, Previous: ${previous?.title}',
+      );
+
+      return AdjacentEpisodes(next: next, previous: previous);
+    } catch (e) {
+      // Non-critical: Failed to load next/previous episode metadata
+      appLogger.d('Could not load adjacent episodes', error: e);
+      return AdjacentEpisodes();
+    }
+  }
+
+  /// Navigate to the next or previous episode
+  ///
+  /// Preserves the current audio track, subtitle track, and playback rate
+  /// selections when transitioning between episodes.
+  Future<void> navigateToEpisode({
+    required BuildContext context,
+    required PlexMetadata episode,
+    required Player? player,
+    bool usePushReplacement = true,
+  }) async {
+    if (!context.mounted) return;
+
+    // Capture current player state before navigation
+    AudioTrack? currentAudioTrack;
+    SubtitleTrack? currentSubtitleTrack;
+    double? currentPlaybackRate;
+
+    if (player != null) {
+      currentAudioTrack = player.state.track.audio;
+      currentSubtitleTrack = player.state.track.subtitle;
+      currentPlaybackRate = player.state.rate;
+
+      appLogger.d(
+        'Navigating to episode with preserved settings - Audio: ${currentAudioTrack?.id}, Subtitle: ${currentSubtitleTrack?.id}, Rate: ${currentPlaybackRate}x',
+      );
+    }
+
+    // Navigate to the new episode
+    if (context.mounted) {
+      navigateToVideoPlayer(
+        context,
+        metadata: episode,
+        preferredAudioTrack: currentAudioTrack,
+        preferredSubtitleTrack: currentSubtitleTrack,
+        preferredPlaybackRate: currentPlaybackRate,
+        usePushReplacement: usePushReplacement,
+      );
+    }
+  }
+}
diff --git a/lib/services/gamepad_service.dart b/lib/services/gamepad_service.dart
new file mode 100644
index 00000000..9fe4d479
--- /dev/null
+++ b/lib/services/gamepad_service.dart
@@ -0,0 +1,341 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/scheduler.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter/services.dart';
+import 'package:gamepads/gamepads.dart';
+
+import '../utils/app_logger.dart';
+
+/// Service that bridges gamepad input to Flutter's focus navigation system.
+///
+/// Listens to gamepad events from the `gamepads` package and translates them
+/// into focus navigation actions and key events that integrate with the
+/// existing keyboard navigation system.
+class GamepadService {
+  static GamepadService? _instance;
+  StreamSubscription<GamepadEvent>? _subscription;
+
+  /// Callback to switch InputModeTracker to keyboard mode.
+  /// Set by InputModeTracker when it initializes.
+  static VoidCallback? onGamepadInput;
+
+  /// Callback for L1 bumper press (previous tab).
+  /// Screens with tabs can listen to this.
+  static VoidCallback? onL1Pressed;
+
+  /// Callback for R1 bumper press (next tab).
+  /// Screens with tabs can listen to this.
+  static VoidCallback? onR1Pressed;
+
+  // Deadzone for analog sticks (0.0 to 1.0)
+  static const double _stickDeadzone = 0.5;
+
+  // Track D-pad state to avoid repeated navigation events
+  bool _dpadUp = false;
+  bool _dpadDown = false;
+  bool _dpadLeft = false;
+  bool _dpadRight = false;
+
+  // Track stick state to avoid repeated navigation events
+  bool _leftStickUp = false;
+  bool _leftStickDown = false;
+  bool _leftStickLeft = false;
+  bool _leftStickRight = false;
+
+  // Track button states to prevent repeated events from button holds
+  final Set<String> _pressedButtons = {};
+
+  GamepadService._();
+
+  /// Get the singleton instance.
+  static GamepadService get instance {
+    _instance ??= GamepadService._();
+    return _instance!;
+  }
+
+  /// Start listening to gamepad events.
+  /// Only active on desktop platforms (macOS, Windows, Linux).
+  void start() async {
+    // Only enable on desktop platforms
+    if (!Platform.isMacOS && !Platform.isWindows && !Platform.isLinux) return;
+
+    appLogger.i('GamepadService: Starting on ${Platform.operatingSystem}');
+
+    // List connected gamepads
+    try {
+      final gamepads = await Gamepads.list();
+      appLogger.i('GamepadService: Found ${gamepads.length} gamepad(s)');
+      for (final gamepad in gamepads) {
+        appLogger.i('  - ${gamepad.name} (id: ${gamepad.id})');
+      }
+    } catch (e) {
+      appLogger.e('GamepadService: Error listing gamepads', error: e);
+    }
+
+    _subscription?.cancel();
+    _subscription = Gamepads.events.listen(
+      _handleGamepadEvent,
+      onError: (e) => appLogger.e('GamepadService: Stream error', error: e),
+    );
+    appLogger.i('GamepadService: Listening for gamepad events');
+  }
+
+  /// Stop listening to gamepad events.
+  void stop() {
+    _subscription?.cancel();
+    _subscription = null;
+  }
+
+  void _handleGamepadEvent(GamepadEvent event) {
+    final key = event.key.toLowerCase();
+    final value = event.value;
+
+    // Switch to keyboard mode on any significant gamepad input
+    if (value.abs() > 0.3) {
+      onGamepadInput?.call();
+      _setTraditionalFocusHighlight();
+      _scheduleFrameIfIdle();
+    }
+
+    // Handle D-pad (reported as axes on macOS)
+    if (_isDpadYAxis(key)) {
+      _handleDpadY(value);
+      return;
+    }
+    if (_isDpadXAxis(key)) {
+      _handleDpadX(value);
+      return;
+    }
+
+    // Handle face buttons
+    final isPressed = value > 0.5;
+    final wasPressed = _pressedButtons.contains(key);
+
+    if (isPressed && !wasPressed) {
+      _pressedButtons.add(key);
+
+      if (_isButtonA(key)) {
+        // Use enter instead of gameButtonA so it works with Flutter's built-in
+        // widgets (buttons, list tiles, etc.) which listen for enter
+        _simulateKeyPress(LogicalKeyboardKey.enter);
+      } else if (_isButtonB(key)) {
+        // Use escape instead of gameButtonB so it works with Flutter's built-in
+        // widgets (bottom sheets, dialogs, menus) which only listen for escape
+        _simulateKeyPress(LogicalKeyboardKey.escape);
+      } else if (_isButtonX(key)) {
+        _simulateKeyPress(LogicalKeyboardKey.gameButtonX);
+      } else if (_isL1(key)) {
+        onL1Pressed?.call();
+      } else if (_isR1(key)) {
+        onR1Pressed?.call();
+      }
+    } else if (!isPressed && wasPressed) {
+      _pressedButtons.remove(key);
+    }
+
+    // Handle left analog stick
+    if (_isLeftStickY(key)) {
+      _handleLeftStickY(value);
+      return;
+    }
+    if (_isLeftStickX(key)) {
+      _handleLeftStickX(value);
+      return;
+    }
+  }
+
+  void _moveFocus(TraversalDirection direction) {
+    // Convert direction to arrow key and simulate a key press
+    // This allows widgets like HubSection that intercept key events to handle navigation
+    final logicalKey = _directionToKey(direction);
+    _simulateKeyPress(logicalKey);
+  }
+
+  LogicalKeyboardKey _directionToKey(TraversalDirection direction) {
+    switch (direction) {
+      case TraversalDirection.up:
+        return LogicalKeyboardKey.arrowUp;
+      case TraversalDirection.down:
+        return LogicalKeyboardKey.arrowDown;
+      case TraversalDirection.left:
+        return LogicalKeyboardKey.arrowLeft;
+      case TraversalDirection.right:
+        return LogicalKeyboardKey.arrowRight;
+    }
+  }
+
+  void _simulateKeyPress(LogicalKeyboardKey logicalKey) {
+    // Schedule on next frame to ensure we're on the main thread
+    SchedulerBinding.instance.addPostFrameCallback((_) {
+      final focusNode = FocusManager.instance.primaryFocus;
+      if (focusNode == null) return;
+
+      // Create a synthetic key down event
+      final keyDownEvent = KeyDownEvent(
+        physicalKey: _getPhysicalKey(logicalKey),
+        logicalKey: logicalKey,
+        timeStamp: Duration(
+          milliseconds: DateTime.now().millisecondsSinceEpoch,
+        ),
+      );
+
+      // Dispatch through the focus system by walking up the focus tree
+      // and calling each node's onKeyEvent handler
+      FocusNode? node = focusNode;
+      KeyEventResult result = KeyEventResult.ignored;
+
+      while (node != null && result != KeyEventResult.handled) {
+        // The Focus widget stores its handler in onKeyEvent
+        if (node.onKeyEvent != null) {
+          result = node.onKeyEvent!(node, keyDownEvent);
+        }
+        node = node.parent;
+      }
+
+      // Send key up event
+      final keyUpEvent = KeyUpEvent(
+        physicalKey: _getPhysicalKey(logicalKey),
+        logicalKey: logicalKey,
+        timeStamp: Duration(
+          milliseconds: DateTime.now().millisecondsSinceEpoch,
+        ),
+      );
+
+      node = focusNode;
+      while (node != null) {
+        if (node.onKeyEvent != null) {
+          final upResult = node.onKeyEvent!(node, keyUpEvent);
+          if (upResult == KeyEventResult.handled) break;
+        }
+        node = node.parent;
+      }
+    });
+  }
+
+  PhysicalKeyboardKey _getPhysicalKey(LogicalKeyboardKey logicalKey) {
+    if (logicalKey == LogicalKeyboardKey.gameButtonA) {
+      return PhysicalKeyboardKey.gameButtonA;
+    } else if (logicalKey == LogicalKeyboardKey.gameButtonB) {
+      return PhysicalKeyboardKey.gameButtonB;
+    } else if (logicalKey == LogicalKeyboardKey.gameButtonX) {
+      return PhysicalKeyboardKey.gameButtonX;
+    } else if (logicalKey == LogicalKeyboardKey.arrowUp) {
+      return PhysicalKeyboardKey.arrowUp;
+    } else if (logicalKey == LogicalKeyboardKey.arrowDown) {
+      return PhysicalKeyboardKey.arrowDown;
+    } else if (logicalKey == LogicalKeyboardKey.arrowLeft) {
+      return PhysicalKeyboardKey.arrowLeft;
+    } else if (logicalKey == LogicalKeyboardKey.arrowRight) {
+      return PhysicalKeyboardKey.arrowRight;
+    } else if (logicalKey == LogicalKeyboardKey.escape) {
+      return PhysicalKeyboardKey.escape;
+    }
+    return PhysicalKeyboardKey.enter;
+  }
+
+  // macOS DualSense key matching
+  // D-pad reports as axes: dpad - xaxis, dpad - yaxis
+  bool _isDpadYAxis(String key) => key == 'dpad - yaxis';
+  bool _isDpadXAxis(String key) => key == 'dpad - xaxis';
+
+  // Face buttons - macOS uses SF Symbol names for PlayStation controllers
+  bool _isButtonA(String key) =>
+      key == 'xmark.circle'; // Cross/X button (bottom)
+  bool _isButtonB(String key) =>
+      key == 'circle.circle'; // Circle/O button (right)
+  bool _isButtonX(String key) => key == 'square.circle'; // Square button (left)
+
+  // Analog sticks
+  bool _isLeftStickX(String key) => key == 'l.joystick - xaxis';
+  bool _isLeftStickY(String key) => key == 'l.joystick - yaxis';
+
+  // Bumper buttons
+  bool _isL1(String key) => key == 'l1.rectangle.roundedbottom';
+  bool _isR1(String key) => key == 'r1.rectangle.roundedbottom';
+
+  // D-pad Y axis: -1 = down (visually up on controller), 1 = up (visually down)
+  // Inverted because macOS reports opposite of expected
+  void _handleDpadY(double value) {
+    if (value < -0.5 && !_dpadDown) {
+      _dpadDown = true;
+      _dpadUp = false;
+      _moveFocus(TraversalDirection.down);
+    } else if (value > 0.5 && !_dpadUp) {
+      _dpadUp = true;
+      _dpadDown = false;
+      _moveFocus(TraversalDirection.up);
+    } else if (value == 0) {
+      _dpadUp = false;
+      _dpadDown = false;
+    }
+  }
+
+  // D-pad X axis: -1 = left, 1 = right, 0 = released
+  void _handleDpadX(double value) {
+    if (value < -0.5 && !_dpadLeft) {
+      _dpadLeft = true;
+      _dpadRight = false;
+      _moveFocus(TraversalDirection.left);
+    } else if (value > 0.5 && !_dpadRight) {
+      _dpadRight = true;
+      _dpadLeft = false;
+      _moveFocus(TraversalDirection.right);
+    } else if (value == 0) {
+      _dpadLeft = false;
+      _dpadRight = false;
+    }
+  }
+
+  // Left stick Y axis - inverted like D-pad
+  void _handleLeftStickY(double value) {
+    if (value < -_stickDeadzone && !_leftStickDown) {
+      _leftStickDown = true;
+      _leftStickUp = false;
+      _moveFocus(TraversalDirection.down);
+    } else if (value > _stickDeadzone && !_leftStickUp) {
+      _leftStickUp = true;
+      _leftStickDown = false;
+      _moveFocus(TraversalDirection.up);
+    } else if (value.abs() <= _stickDeadzone) {
+      _leftStickUp = false;
+      _leftStickDown = false;
+    }
+  }
+
+  void _handleLeftStickX(double value) {
+    if (value < -_stickDeadzone && !_leftStickLeft) {
+      _leftStickLeft = true;
+      _leftStickRight = false;
+      _moveFocus(TraversalDirection.left);
+    } else if (value > _stickDeadzone && !_leftStickRight) {
+      _leftStickRight = true;
+      _leftStickLeft = false;
+      _moveFocus(TraversalDirection.right);
+    } else if (value.abs() <= _stickDeadzone) {
+      _leftStickLeft = false;
+      _leftStickRight = false;
+    }
+  }
+
+  // Ensure Material uses traditional (keyboard) focus highlights when navigating
+  // via gamepad. Synthetic key events we dispatch below don't go through the
+  // platform key pipeline, so Flutter won't automatically flip highlight mode.
+  void _setTraditionalFocusHighlight() {
+    if (FocusManager.instance.highlightStrategy !=
+        FocusHighlightStrategy.alwaysTraditional) {
+      FocusManager.instance.highlightStrategy =
+          FocusHighlightStrategy.alwaysTraditional;
+    }
+  }
+
+  // Force a frame when the engine is idle so focus visuals update immediately
+  // on gamepad input (desktop may not wake up without mouse/keyboard activity).
+  void _scheduleFrameIfIdle() {
+    final scheduler = SchedulerBinding.instance;
+    if (scheduler.schedulerPhase == SchedulerPhase.idle) {
+      scheduler.scheduleFrame();
+    }
+  }
+}
diff --git a/lib/services/keyboard_shortcuts_service.dart b/lib/services/keyboard_shortcuts_service.dart
index 86361db3..b2a6403b 100644
--- a/lib/services/keyboard_shortcuts_service.dart
+++ b/lib/services/keyboard_shortcuts_service.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:media_kit/media_kit.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
+import '../mpv/mpv.dart';
 import 'settings_service.dart';
+import '../utils/player_utils.dart';
 
 class KeyboardShortcutsService {
   static KeyboardShortcutsService? _instance;
@@ -152,10 +153,17 @@ class KeyboardShortcutsService {
     VoidCallback? onNextAudioTrack,
     VoidCallback? onNextSubtitleTrack,
     VoidCallback? onNextChapter,
-    VoidCallback? onPreviousChapter,
-  ) {
+    VoidCallback? onPreviousChapter, {
+    VoidCallback? onBack,
+  }) {
     if (event is! KeyDownEvent) return KeyEventResult.ignored;
 
+    // Handle back navigation keys (Escape)
+    if (event.logicalKey == LogicalKeyboardKey.escape) {
+      onBack?.call();
+      return KeyEventResult.handled;
+    }
+
     final physicalKey = event.physicalKey;
     final isShiftPressed = HardwareKeyboard.instance.isShiftPressed;
     final isControlPressed = HardwareKeyboard.instance.isControlPressed;
@@ -230,21 +238,6 @@ class KeyboardShortcutsService {
     return KeyEventResult.ignored;
   }
 
-  /// Seeks by the given offset (can be positive or negative) while clamping
-  /// the result between 0 and the video duration
-  void _seekWithClamping(Player player, Duration offset) {
-    final currentPosition = player.state.position;
-    final duration = player.state.duration;
-    final newPosition = currentPosition + offset;
-
-    // Clamp between 0 and video duration
-    final clampedPosition = newPosition.isNegative
-        ? Duration.zero
-        : (newPosition > duration ? duration : newPosition);
-
-    player.seek(clampedPosition);
-  }
-
   void _executeAction(
     String action,
     Player player,
@@ -270,16 +263,16 @@ class KeyboardShortcutsService {
         _settingsService.setVolume(newVolume);
         break;
       case 'seek_forward':
-        _seekWithClamping(player, Duration(seconds: _seekTimeSmall));
+        seekWithClamping(player, Duration(seconds: _seekTimeSmall));
         break;
       case 'seek_backward':
-        _seekWithClamping(player, Duration(seconds: -_seekTimeSmall));
+        seekWithClamping(player, Duration(seconds: -_seekTimeSmall));
         break;
       case 'seek_forward_large':
-        _seekWithClamping(player, Duration(seconds: _seekTimeLarge));
+        seekWithClamping(player, Duration(seconds: _seekTimeLarge));
         break;
       case 'seek_backward_large':
-        _seekWithClamping(player, Duration(seconds: -_seekTimeLarge));
+        seekWithClamping(player, Duration(seconds: -_seekTimeLarge));
         break;
       case 'fullscreen_toggle':
         onToggleFullscreen?.call();
diff --git a/lib/services/media_controls_manager.dart b/lib/services/media_controls_manager.dart
new file mode 100644
index 00000000..0b9fcd3f
--- /dev/null
+++ b/lib/services/media_controls_manager.dart
@@ -0,0 +1,217 @@
+import 'package:os_media_controls/os_media_controls.dart';
+import 'package:rate_limiter/rate_limiter.dart';
+
+import 'plex_client.dart';
+import '../models/plex_metadata.dart';
+import '../utils/app_logger.dart';
+
+/// Manages OS media controls integration for video playback.
+///
+/// Handles:
+/// - Metadata updates (title, artwork, etc.)
+/// - Playback state updates (playing/paused, position, speed)
+/// - Control event streaming (play, pause, next, previous, seek)
+/// - Position update throttling to prevent excessive API calls
+class MediaControlsManager {
+  /// Stream of control events from OS media controls
+  Stream<dynamic> get controlEvents => OsMediaControls.controlEvents;
+
+  /// Throttled playback state update (1 second interval, leading + trailing)
+  late final Throttle _throttledUpdate;
+
+  /// Cached control enabled state to avoid redundant platform calls
+  bool? _lastCanGoNext;
+  bool? _lastCanGoPrevious;
+
+  MediaControlsManager() {
+    _throttledUpdate = throttle(
+      _doUpdatePlaybackState,
+      const Duration(seconds: 1),
+      leading: true,
+      trailing: true, // Send final position at end of throttle window
+    );
+  }
+
+  /// Update media metadata displayed in OS media controls
+  ///
+  /// This includes title, artist, artwork, and duration.
+  Future<void> updateMetadata({
+    required PlexMetadata metadata,
+    PlexClient? client,
+    Duration? duration,
+  }) async {
+    try {
+      // Build artwork URL if client is available
+      String? artworkUrl;
+      if (client != null && metadata.thumb != null) {
+        try {
+          artworkUrl = client.getThumbnailUrl(metadata.thumb!);
+          appLogger.d('Artwork URL for media controls: $artworkUrl');
+        } catch (e) {
+          appLogger.w('Failed to build artwork URL', error: e);
+        }
+      }
+
+      // Update OS media controls
+      await OsMediaControls.setMetadata(
+        MediaMetadata(
+          title: metadata.title,
+          artist: _buildArtist(metadata),
+          artworkUrl: artworkUrl,
+          duration: duration,
+        ),
+      );
+
+      appLogger.d('Updated media controls metadata: ${metadata.title}');
+    } catch (e) {
+      appLogger.w('Failed to update media controls metadata', error: e);
+    }
+  }
+
+  /// Update playback state in OS media controls
+  ///
+  /// Updates the current playing state, position, and playback speed.
+  /// Position updates are throttled to avoid excessive API calls.
+  Future<void> updatePlaybackState({
+    required bool isPlaying,
+    required Duration position,
+    required double speed,
+    bool force = false,
+  }) async {
+    final params = _PlaybackStateParams(
+      isPlaying: isPlaying,
+      position: position,
+      speed: speed,
+    );
+
+    if (force) {
+      // Bypass throttling for forced updates
+      await _doUpdatePlaybackState(params);
+    } else {
+      // Use throttled update
+      _throttledUpdate([params]);
+    }
+  }
+
+  /// Internal method to actually perform the playback state update
+  Future<void> _doUpdatePlaybackState(_PlaybackStateParams params) async {
+    try {
+      await OsMediaControls.setPlaybackState(
+        MediaPlaybackState(
+          state: params.isPlaying
+              ? PlaybackState.playing
+              : PlaybackState.paused,
+          position: params.position,
+          speed: params.speed,
+        ),
+      );
+    } catch (e) {
+      appLogger.w('Failed to update media controls playback state', error: e);
+    }
+  }
+
+  /// Enable or disable next/previous track controls
+  ///
+  /// This should be called based on content type and playback mode.
+  /// For example:
+  /// - Episodes: Enable both if there are adjacent episodes
+  /// - Playlist items: Enable based on playlist position
+  /// - Movies: Usually disabled
+  Future<void> setControlsEnabled({
+    bool canGoNext = false,
+    bool canGoPrevious = false,
+  }) async {
+    // Skip if unchanged (avoid redundant platform calls)
+    if (canGoNext == _lastCanGoNext && canGoPrevious == _lastCanGoPrevious) {
+      return;
+    }
+
+    _lastCanGoNext = canGoNext;
+    _lastCanGoPrevious = canGoPrevious;
+
+    try {
+      final controls = <MediaControl>[];
+      if (canGoPrevious) controls.add(MediaControl.previous);
+      if (canGoNext) controls.add(MediaControl.next);
+
+      if (controls.isNotEmpty) {
+        await OsMediaControls.enableControls(controls);
+        appLogger.d(
+          'Media controls enabled - Previous: $canGoPrevious, Next: $canGoNext',
+        );
+      } else {
+        await OsMediaControls.disableControls([
+          MediaControl.previous,
+          MediaControl.next,
+        ]);
+        appLogger.d('Media controls disabled');
+      }
+    } catch (e) {
+      appLogger.w('Failed to set media controls enabled state', error: e);
+    }
+  }
+
+  /// Clear all media controls
+  ///
+  /// Should be called when playback stops or screen is disposed.
+  Future<void> clear() async {
+    try {
+      await OsMediaControls.clear();
+      _throttledUpdate.cancel();
+      appLogger.d('Media controls cleared');
+    } catch (e) {
+      appLogger.w('Failed to clear media controls', error: e);
+    }
+  }
+
+  /// Dispose resources
+  void dispose() {
+    _throttledUpdate.cancel();
+  }
+
+  /// Build artist string from metadata
+  ///
+  /// For episodes: "Show Name - Season X Episode Y"
+  /// For movies: Director or studio
+  /// For other content: Fallback to year or empty
+  String _buildArtist(PlexMetadata metadata) {
+    if (metadata.type.toLowerCase() == 'episode') {
+      final parts = <String>[];
+
+      // Add show name
+      if (metadata.grandparentTitle != null) {
+        parts.add(metadata.grandparentTitle!);
+      }
+
+      // Add season/episode info
+      if (metadata.parentIndex != null && metadata.index != null) {
+        parts.add('S${metadata.parentIndex} E${metadata.index}');
+      } else if (metadata.parentTitle != null) {
+        parts.add(metadata.parentTitle!);
+      }
+
+      return parts.join(' • ');
+    } else if (metadata.type.toLowerCase() == 'movie') {
+      // For movies, use director or studio
+      // Note: These fields may need to be added to PlexMetadata model
+      if (metadata.year != null) {
+        return metadata.year.toString();
+      }
+    }
+
+    return '';
+  }
+}
+
+/// Parameters for playback state update (used with throttle)
+class _PlaybackStateParams {
+  final bool isPlaying;
+  final Duration position;
+  final double speed;
+
+  const _PlaybackStateParams({
+    required this.isPlaying,
+    required this.position,
+    required this.speed,
+  });
+}
diff --git a/lib/services/multi_server_manager.dart b/lib/services/multi_server_manager.dart
new file mode 100644
index 00000000..c1dff021
--- /dev/null
+++ b/lib/services/multi_server_manager.dart
@@ -0,0 +1,435 @@
+import 'dart:async';
+
+import 'package:connectivity_plus/connectivity_plus.dart';
+
+import 'plex_client.dart';
+import '../models/plex_config.dart';
+import '../utils/app_logger.dart';
+import 'plex_auth_service.dart';
+import 'storage_service.dart';
+
+/// Manages multiple Plex server connections simultaneously
+class MultiServerManager {
+  /// Map of serverId (clientIdentifier) to PlexClient instances
+  final Map<String, PlexClient> _clients = {};
+
+  /// Map of serverId to server info
+  final Map<String, PlexServer> _servers = {};
+
+  /// Map of serverId to online status
+  final Map<String, bool> _serverStatus = {};
+
+  /// Stream controller for server status changes
+  final _statusController = StreamController<Map<String, bool>>.broadcast();
+
+  /// Stream of server status changes
+  Stream<Map<String, bool>> get statusStream => _statusController.stream;
+
+  /// Connectivity subscription for network monitoring
+  StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
+
+  /// Map of serverId to active optimization futures
+  final Map<String, Future<void>> _activeOptimizations = {};
+
+  /// Get all registered server IDs
+  List<String> get serverIds => _servers.keys.toList();
+
+  /// Get all online server IDs
+  List<String> get onlineServerIds =>
+      _serverStatus.entries.where((e) => e.value).map((e) => e.key).toList();
+
+  /// Get all offline server IDs
+  List<String> get offlineServerIds =>
+      _serverStatus.entries.where((e) => !e.value).map((e) => e.key).toList();
+
+  /// Get client for specific server
+  PlexClient? getClient(String serverId) => _clients[serverId];
+
+  /// Get server info for specific server
+  PlexServer? getServer(String serverId) => _servers[serverId];
+
+  /// Get all online clients
+  Map<String, PlexClient> get onlineClients {
+    final result = <String, PlexClient>{};
+    for (final serverId in onlineServerIds) {
+      final client = _clients[serverId];
+      if (client != null) {
+        result[serverId] = client;
+      }
+    }
+    return result;
+  }
+
+  /// Get all servers
+  Map<String, PlexServer> get servers => Map.unmodifiable(_servers);
+
+  /// Check if a server is online
+  bool isServerOnline(String serverId) => _serverStatus[serverId] ?? false;
+
+  /// Creates and initializes a PlexClient for a given server
+  ///
+  /// Handles finding working connection, loading cached endpoint,
+  /// creating config, and building client with failover support.
+  Future<PlexClient> _createClientForServer({
+    required PlexServer server,
+    required String clientIdentifier,
+  }) async {
+    final serverId = server.clientIdentifier;
+
+    // Find best working connection
+    PlexConnection? workingConnection;
+    await for (final connection in server.findBestWorkingConnection()) {
+      workingConnection = connection;
+      break;
+    }
+
+    if (workingConnection == null) {
+      throw Exception('No working connection found');
+    }
+
+    final baseUrl = workingConnection.uri;
+
+    // Get storage and load cached endpoint for this server
+    final storage = await StorageService.getInstance();
+    final cachedEndpoint = storage.getServerEndpoint(serverId);
+
+    // Create PlexClient with failover support
+    final prioritizedEndpoints = server.prioritizedEndpointUrls(
+      preferredFirst: cachedEndpoint ?? baseUrl,
+    );
+    final config = await PlexConfig.create(
+      baseUrl: baseUrl,
+      token: server.accessToken,
+      clientIdentifier: clientIdentifier,
+    );
+
+    final client = PlexClient(
+      config,
+      serverId: serverId,
+      serverName: server.name,
+      prioritizedEndpoints: prioritizedEndpoints,
+      onEndpointChanged: (newUrl) async {
+        await storage.saveServerEndpoint(serverId, newUrl);
+        appLogger.i(
+          'Updated endpoint for ${server.name} after failover: $newUrl',
+        );
+      },
+    );
+
+    // Save the initial endpoint
+    await storage.saveServerEndpoint(serverId, baseUrl);
+
+    return client;
+  }
+
+  /// Connect to all available servers in parallel
+  /// Returns the number of successfully connected servers
+  Future<int> connectToAllServers(
+    List<PlexServer> servers, {
+    String? clientIdentifier,
+    Duration timeout = const Duration(seconds: 10),
+    Function(String serverId, PlexClient client)? onServerConnected,
+    Function(String serverId, Object error)? onServerFailed,
+  }) async {
+    if (servers.isEmpty) {
+      appLogger.w('No servers to connect to');
+      return 0;
+    }
+
+    appLogger.i('Connecting to ${servers.length} servers...');
+
+    // Use provided client ID or generate a unique one for this app instance
+    final effectiveClientId =
+        clientIdentifier ?? DateTime.now().millisecondsSinceEpoch.toString();
+
+    // Create connection tasks for all servers
+    final connectionFutures = servers.map((server) async {
+      final serverId = server.clientIdentifier;
+
+      try {
+        appLogger.d('Attempting connection to server: ${server.name}');
+
+        final client = await _createClientForServer(
+          server: server,
+          clientIdentifier: effectiveClientId,
+        );
+
+        // Store the client and server info
+        _clients[serverId] = client;
+        _servers[serverId] = server;
+        _serverStatus[serverId] = true;
+
+        onServerConnected?.call(serverId, client);
+        appLogger.i('Successfully connected to ${server.name}');
+
+        return serverId;
+      } catch (e, stackTrace) {
+        appLogger.e(
+          'Failed to connect to ${server.name}',
+          error: e,
+          stackTrace: stackTrace,
+        );
+
+        // Mark as offline
+        _servers[serverId] = server;
+        _serverStatus[serverId] = false;
+
+        onServerFailed?.call(serverId, e);
+        return null;
+      }
+    });
+
+    // Wait for all connections with timeout
+    final results = await Future.wait(
+      connectionFutures.map(
+        (f) => f.timeout(
+          timeout,
+          onTimeout: () {
+            appLogger.w('Server connection timed out');
+            return null;
+          },
+        ),
+      ),
+    );
+
+    // Count successful connections
+    final successCount = results.where((id) => id != null).length;
+
+    // Notify listeners of status change
+    _statusController.add(Map.from(_serverStatus));
+
+    appLogger.i(
+      'Connected to $successCount/${servers.length} servers successfully',
+    );
+
+    // Start network monitoring if we have any connected servers
+    if (successCount > 0) {
+      startNetworkMonitoring();
+    }
+
+    return successCount;
+  }
+
+  /// Add a single server connection
+  Future<bool> addServer(PlexServer server, {String? clientIdentifier}) async {
+    final serverId = server.clientIdentifier;
+    final effectiveClientId =
+        clientIdentifier ?? DateTime.now().millisecondsSinceEpoch.toString();
+
+    try {
+      appLogger.d('Adding server: ${server.name}');
+
+      final client = await _createClientForServer(
+        server: server,
+        clientIdentifier: effectiveClientId,
+      );
+
+      // Store
+      _clients[serverId] = client;
+      _servers[serverId] = server;
+      _serverStatus[serverId] = true;
+
+      // Notify
+      _statusController.add(Map.from(_serverStatus));
+
+      appLogger.i('Successfully added server: ${server.name}');
+      return true;
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Failed to add server ${server.name}',
+        error: e,
+        stackTrace: stackTrace,
+      );
+
+      _servers[serverId] = server;
+      _serverStatus[serverId] = false;
+      _statusController.add(Map.from(_serverStatus));
+
+      return false;
+    }
+  }
+
+  /// Remove a server connection
+  void removeServer(String serverId) {
+    _clients.remove(serverId);
+    _servers.remove(serverId);
+    _serverStatus.remove(serverId);
+    _statusController.add(Map.from(_serverStatus));
+    appLogger.i('Removed server: $serverId');
+  }
+
+  /// Update server status (used for health monitoring)
+  void updateServerStatus(String serverId, bool isOnline) {
+    if (_serverStatus[serverId] != isOnline) {
+      _serverStatus[serverId] = isOnline;
+      _statusController.add(Map.from(_serverStatus));
+      appLogger.d('Server $serverId status changed to: $isOnline');
+    }
+  }
+
+  /// Test connection health for all servers
+  Future<void> checkServerHealth() async {
+    appLogger.d('Checking health for ${_clients.length} servers');
+
+    final healthChecks = _clients.entries.map((entry) async {
+      final serverId = entry.key;
+      final client = entry.value;
+
+      try {
+        // Simple ping by fetching server identity
+        await client.getServerIdentity();
+        updateServerStatus(serverId, true);
+      } catch (e) {
+        appLogger.w('Server $serverId health check failed: $e');
+        updateServerStatus(serverId, false);
+      }
+    });
+
+    await Future.wait(healthChecks);
+  }
+
+  /// Start monitoring network connectivity for all servers
+  void startNetworkMonitoring() {
+    if (_connectivitySubscription != null) {
+      appLogger.d('Network monitoring already active');
+      return;
+    }
+
+    appLogger.i('Starting network monitoring for all servers');
+    final connectivity = Connectivity();
+    _connectivitySubscription = connectivity.onConnectivityChanged.listen(
+      (results) {
+        final status = results.isNotEmpty
+            ? results.first
+            : ConnectivityResult.none;
+
+        if (status == ConnectivityResult.none) {
+          appLogger.w(
+            'Connectivity lost, pausing optimization until network returns',
+          );
+          return;
+        }
+
+        appLogger.d(
+          'Connectivity change detected, re-optimizing all servers',
+          error: {
+            'status': status.name,
+            'interfaces': results.map((r) => r.name).toList(),
+            'serverCount': _servers.length,
+          },
+        );
+
+        // Re-optimize all servers
+        _reoptimizeAllServers(reason: 'connectivity:${status.name}');
+      },
+      onError: (error, stackTrace) {
+        appLogger.w(
+          'Connectivity listener error',
+          error: error,
+          stackTrace: stackTrace,
+        );
+      },
+    );
+  }
+
+  /// Stop monitoring network connectivity
+  void stopNetworkMonitoring() {
+    _connectivitySubscription?.cancel();
+    _connectivitySubscription = null;
+    appLogger.i('Stopped network monitoring');
+  }
+
+  /// Re-optimize all connected servers
+  void _reoptimizeAllServers({required String reason}) {
+    for (final entry in _servers.entries) {
+      final serverId = entry.key;
+      final server = entry.value;
+
+      // Skip if server is offline
+      if (!isServerOnline(serverId)) {
+        continue;
+      }
+
+      // Skip if optimization already running for this server
+      if (_activeOptimizations.containsKey(serverId)) {
+        appLogger.d(
+          'Optimization already running for ${server.name}, skipping',
+          error: {'reason': reason},
+        );
+        continue;
+      }
+
+      // Run optimization
+      _activeOptimizations[serverId] =
+          _reoptimizeServer(
+            serverId: serverId,
+            server: server,
+            reason: reason,
+          ).whenComplete(() {
+            _activeOptimizations.remove(serverId);
+          });
+    }
+  }
+
+  /// Re-optimize connection for a specific server
+  Future<void> _reoptimizeServer({
+    required String serverId,
+    required PlexServer server,
+    required String reason,
+  }) async {
+    final storage = await StorageService.getInstance();
+    final client = _clients[serverId];
+
+    try {
+      appLogger.d(
+        'Starting connection optimization for ${server.name}',
+        error: {'reason': reason},
+      );
+
+      await for (final connection in server.findBestWorkingConnection()) {
+        final newUrl = connection.uri;
+
+        // Check if this is actually a better connection than current
+        if (client != null && client.config.baseUrl == newUrl) {
+          appLogger.d(
+            'Already using optimal endpoint for ${server.name}: $newUrl',
+          );
+          continue;
+        }
+
+        // Save the new endpoint
+        await storage.saveServerEndpoint(serverId, newUrl);
+
+        // If client has endpoint failover, it will automatically switch
+        // Otherwise, we might need to recreate the client (but failover should handle it)
+        appLogger.i(
+          'Updated optimal endpoint for ${server.name}: $newUrl',
+          error: {'type': connection.displayType},
+        );
+      }
+    } catch (e, stackTrace) {
+      appLogger.w(
+        'Connection optimization failed for ${server.name}',
+        error: e,
+        stackTrace: stackTrace,
+      );
+    }
+  }
+
+  /// Disconnect all servers
+  void disconnectAll() {
+    appLogger.i('Disconnecting all servers');
+    stopNetworkMonitoring();
+    _clients.clear();
+    _servers.clear();
+    _serverStatus.clear();
+    _activeOptimizations.clear();
+    _statusController.add({});
+  }
+
+  /// Dispose resources
+  void dispose() {
+    disconnectAll();
+    _statusController.close();
+  }
+}
diff --git a/lib/services/offline_watch_sync_service.dart b/lib/services/offline_watch_sync_service.dart
new file mode 100644
index 00000000..0d35bca7
--- /dev/null
+++ b/lib/services/offline_watch_sync_service.dart
@@ -0,0 +1,576 @@
+import 'package:flutter/foundation.dart';
+
+import '../database/app_database.dart';
+import '../providers/offline_mode_provider.dart';
+import '../utils/app_logger.dart';
+import 'multi_server_manager.dart';
+import 'plex_api_cache.dart';
+import 'plex_client.dart';
+
+/// Service for managing offline watch progress and syncing to Plex servers.
+///
+/// Handles:
+/// - Queuing progress updates when offline
+/// - Queuing manual watch/unwatch actions
+/// - Auto-marking items as watched at 90% threshold
+/// - Syncing queued actions when connectivity is restored
+class OfflineWatchSyncService extends ChangeNotifier {
+  final AppDatabase _database;
+  final MultiServerManager _serverManager;
+
+  OfflineModeProvider? _offlineModeProvider;
+  VoidCallback? _offlineModeListener;
+  bool _isSyncing = false;
+  bool _isBidirectionalSyncing = false;
+  DateTime? _lastSyncTime;
+  bool _hasPerformedStartupSync = false;
+
+  /// Callback to refresh download provider metadata after sync
+  VoidCallback? onWatchStatesRefreshed;
+
+  /// Watch threshold - mark as watched when progress exceeds this percentage
+  static const double watchedThreshold = 0.90;
+
+  /// Minimum interval between syncs (10 minutes)
+  static const Duration minSyncInterval = Duration(minutes: 10);
+
+  /// Maximum sync attempts before giving up on an item
+  static const int maxSyncAttempts = 5;
+
+  OfflineWatchSyncService({
+    required AppDatabase database,
+    required MultiServerManager serverManager,
+  }) : _database = database,
+       _serverManager = serverManager;
+
+  /// Whether a sync is currently in progress
+  bool get isSyncing => _isSyncing;
+
+  /// Start monitoring for connectivity changes to auto-sync
+  void startConnectivityMonitoring(OfflineModeProvider offlineModeProvider) {
+    // Remove previous listener if any
+    if (_offlineModeProvider != null && _offlineModeListener != null) {
+      _offlineModeProvider!.removeListener(_offlineModeListener!);
+    }
+
+    _offlineModeProvider = offlineModeProvider;
+    _offlineModeListener = () {
+      if (!offlineModeProvider.isOffline) {
+        // We just came online - trigger bidirectional sync
+        appLogger.i(
+          'Connectivity restored - starting bidirectional watch sync',
+        );
+        _performBidirectionalSync();
+      }
+    };
+
+    offlineModeProvider.addListener(_offlineModeListener!);
+
+    // Don't sync on startup - servers aren't connected yet.
+    // Sync will happen when:
+    // - Connectivity is restored (listener triggers)
+    // - App resumes from background (onAppResumed)
+  }
+
+  /// Perform bidirectional sync: push local changes, then pull server states.
+  ///
+  /// Push always happens immediately. Pull respects [minSyncInterval] unless [force] is true.
+  Future<void> _performBidirectionalSync({bool force = false}) async {
+    // Prevent overlapping bidirectional syncs
+    if (_isBidirectionalSyncing) {
+      appLogger.d('Bidirectional sync already in progress, skipping');
+      return;
+    }
+
+    if (_serverManager.onlineClients.isEmpty) {
+      appLogger.d('Skipping watch sync - no connected servers available yet');
+      return;
+    }
+
+    _isBidirectionalSyncing = true;
+    try {
+      // Always push local changes to server (never throttle outbound sync)
+      await syncPendingItems();
+
+      // Only throttle the pull from server
+      if (!force && _lastSyncTime != null) {
+        final elapsed = DateTime.now().difference(_lastSyncTime!);
+        if (elapsed < minSyncInterval) {
+          appLogger.d(
+            'Skipping server pull - last sync was ${elapsed.inMinutes}m ago (min: ${minSyncInterval.inMinutes}m)',
+          );
+          return;
+        }
+      }
+
+      // Pull latest states from server
+      await syncWatchStatesFromServer();
+      _lastSyncTime = DateTime.now();
+    } finally {
+      _isBidirectionalSyncing = false;
+    }
+  }
+
+  /// Called when app becomes active - syncs if interval has passed.
+  void onAppResumed() {
+    if (_offlineModeProvider?.isOffline != true) {
+      appLogger.d('App resumed - checking if sync needed');
+      _performBidirectionalSync();
+    }
+  }
+
+  /// Called when servers connect on app startup.
+  ///
+  /// Triggers the initial sync now that PlexClients are available.
+  /// Only runs once per app session.
+  void onServersConnected() {
+    if (_hasPerformedStartupSync) return;
+    _hasPerformedStartupSync = true;
+
+    if (_offlineModeProvider?.isOffline != true) {
+      appLogger.i('Servers connected - performing startup sync');
+      _performBidirectionalSync();
+    }
+  }
+
+  /// Queue a progress update for later sync.
+  ///
+  /// This is called during offline playback to track the watch position.
+  /// If progress exceeds 90%, shouldMarkWatched is set to true.
+  Future<void> queueProgressUpdate({
+    required String serverId,
+    required String ratingKey,
+    required int viewOffset,
+    required int duration,
+  }) async {
+    final shouldMarkWatched = isWatchedByProgress(viewOffset, duration);
+
+    await _database.upsertProgressAction(
+      serverId: serverId,
+      ratingKey: ratingKey,
+      viewOffset: viewOffset,
+      duration: duration,
+      shouldMarkWatched: shouldMarkWatched,
+    );
+
+    appLogger.d(
+      'Queued offline progress: $serverId:$ratingKey at ${(viewOffset / 1000).toStringAsFixed(0)}s / ${(duration / 1000).toStringAsFixed(0)}s (${((viewOffset / duration) * 100).toStringAsFixed(1)}%)',
+    );
+
+    notifyListeners();
+  }
+
+  /// Queue a manual "mark as watched" action.
+  ///
+  /// Removes any conflicting actions for the same item.
+  Future<void> queueMarkWatched({
+    required String serverId,
+    required String ratingKey,
+  }) => _queueWatchStatusAction(
+    serverId: serverId,
+    ratingKey: ratingKey,
+    actionType: 'watched',
+  );
+
+  /// Queue a manual "mark as unwatched" action.
+  ///
+  /// Removes any conflicting actions for the same item.
+  Future<void> queueMarkUnwatched({
+    required String serverId,
+    required String ratingKey,
+  }) => _queueWatchStatusAction(
+    serverId: serverId,
+    ratingKey: ratingKey,
+    actionType: 'unwatched',
+  );
+
+  /// Internal helper to queue watch/unwatch actions.
+  Future<void> _queueWatchStatusAction({
+    required String serverId,
+    required String ratingKey,
+    required String actionType,
+  }) async {
+    await _database.insertWatchAction(
+      serverId: serverId,
+      ratingKey: ratingKey,
+      actionType: actionType,
+    );
+
+    appLogger.d('Queued offline mark $actionType: $serverId:$ratingKey');
+    notifyListeners();
+  }
+
+  /// Check if an item should be considered watched based on progress percentage.
+  bool isWatchedByProgress(int viewOffset, int duration) {
+    if (duration == 0) return false;
+    return (viewOffset / duration) >= watchedThreshold;
+  }
+
+  /// Get the local watch status for a media item.
+  ///
+  /// Returns:
+  /// - `true` if item was marked as watched locally or progress >= 90%
+  /// - `false` if item was marked as unwatched locally
+  /// - `null` if no local action exists (use cached server data)
+  Future<bool?> getLocalWatchStatus(String globalKey) async {
+    final action = await _database.getLatestWatchAction(globalKey);
+    if (action == null) return null;
+
+    switch (action.actionType) {
+      case 'watched':
+        return true;
+      case 'unwatched':
+        return false;
+      case 'progress':
+        // Check if progress exceeds threshold
+        return action.shouldMarkWatched;
+      default:
+        return null;
+    }
+  }
+
+  /// Get local watch statuses for multiple items in a single database query.
+  ///
+  /// Returns a map of globalKey -> watch status (true/false/null).
+  /// More efficient than calling getLocalWatchStatus multiple times.
+  Future<Map<String, bool?>> getLocalWatchStatusesBatched(
+    Set<String> globalKeys,
+  ) async {
+    if (globalKeys.isEmpty) return {};
+
+    final actions = await _database.getLatestWatchActionsForKeys(globalKeys);
+    final result = <String, bool?>{};
+
+    for (final key in globalKeys) {
+      final action = actions[key];
+      if (action == null) {
+        result[key] = null;
+        continue;
+      }
+
+      switch (action.actionType) {
+        case 'watched':
+          result[key] = true;
+        case 'unwatched':
+          result[key] = false;
+        case 'progress':
+          result[key] = action.shouldMarkWatched;
+        default:
+          result[key] = null;
+      }
+    }
+
+    return result;
+  }
+
+  /// Get the local view offset (resume position) for a media item.
+  ///
+  /// Returns the locally tracked position, or null if none exists.
+  Future<int?> getLocalViewOffset(String globalKey) async {
+    final action = await _database.getLatestWatchAction(globalKey);
+    if (action == null) return null;
+
+    // Only return offset for progress actions
+    if (action.actionType == 'progress') {
+      return action.viewOffset;
+    }
+
+    return null;
+  }
+
+  /// Get count of pending sync items.
+  Future<int> getPendingSyncCount() async {
+    return _database.getPendingSyncCount();
+  }
+
+  /// Sync all pending items to their respective servers.
+  ///
+  /// Called automatically when connectivity is restored, or manually.
+  /// Actions are batched by server to reduce connectivity lookups.
+  Future<void> syncPendingItems() async {
+    if (_isSyncing) {
+      appLogger.d('Sync already in progress, skipping');
+      return;
+    }
+
+    _isSyncing = true;
+    notifyListeners();
+
+    try {
+      final pendingActions = await _database.getPendingWatchActions();
+
+      if (pendingActions.isEmpty) {
+        appLogger.d('No pending watch actions to sync');
+        return;
+      }
+
+      appLogger.i('Syncing ${pendingActions.length} pending watch actions');
+
+      // First pass: handle retry limit exceeded and group by server
+      final actionsByServer = <String, List<OfflineWatchProgressItem>>{};
+
+      for (final action in pendingActions) {
+        // Delete items that have exceeded retry limit
+        if (action.syncAttempts >= maxSyncAttempts) {
+          appLogger.w(
+            'Deleting action ${action.id} - exceeded retry limit '
+            '(${action.syncAttempts} attempts). Last error: ${action.lastError}',
+          );
+          await _database.deleteWatchAction(action.id);
+          continue;
+        }
+
+        // Check if server still exists
+        if (_serverManager.getServer(action.serverId) == null) {
+          appLogger.w(
+            'Deleting action ${action.id} - server ${action.serverId} no longer exists',
+          );
+          await _database.deleteWatchAction(action.id);
+          continue;
+        }
+
+        actionsByServer.putIfAbsent(action.serverId, () => []).add(action);
+      }
+
+      // Second pass: process each server's actions with single connectivity check
+      for (final entry in actionsByServer.entries) {
+        final serverId = entry.key;
+        final actions = entry.value;
+
+        await _withOnlineClient(serverId, (client) async {
+          for (final action in actions) {
+            try {
+              await _syncAction(client, action);
+              // Success - delete the action from queue
+              await _database.deleteWatchAction(action.id);
+              appLogger.d(
+                'Successfully synced action ${action.id}: ${action.actionType} for ${action.ratingKey}',
+              );
+            } catch (e) {
+              appLogger.w('Failed to sync action ${action.id}: $e');
+              await _database.updateSyncAttempt(action.id, e.toString());
+            }
+          }
+        });
+
+        // If _withOnlineClient returned null (server offline), mark actions for retry
+        if (_serverManager.getClient(serverId) == null ||
+            !_serverManager.isServerOnline(serverId)) {
+          for (final action in actions) {
+            // Only update if we haven't already processed it
+            final stillPending = await _database.getLatestWatchAction(
+              '${action.serverId}:${action.ratingKey}',
+            );
+            if (stillPending != null && stillPending.id == action.id) {
+              await _database.updateSyncAttempt(
+                action.id,
+                'Server not available',
+              );
+            }
+          }
+        }
+      }
+    } finally {
+      _isSyncing = false;
+      notifyListeners();
+    }
+  }
+
+  /// Execute a callback with an online client for the given server.
+  ///
+  /// Returns null if no client available or server is offline.
+  /// The callback receives the PlexClient and should return the result.
+  Future<T?> _withOnlineClient<T>(
+    String serverId,
+    Future<T> Function(PlexClient client) callback,
+  ) async {
+    final client = _serverManager.getClient(serverId);
+    if (client == null) {
+      appLogger.d('No client for server $serverId, skipping');
+      return null;
+    }
+
+    if (!_serverManager.isServerOnline(serverId)) {
+      appLogger.d('Server $serverId is offline, skipping');
+      return null;
+    }
+
+    return callback(client);
+  }
+
+  /// Sync a single action to the server.
+  Future<void> _syncAction(
+    PlexClient client,
+    OfflineWatchProgressItem action,
+  ) async {
+    switch (action.actionType) {
+      case 'watched':
+        await client.markAsWatched(action.ratingKey);
+        break;
+
+      case 'unwatched':
+        await client.markAsUnwatched(action.ratingKey);
+        break;
+
+      case 'progress':
+        // First, update the timeline with current position
+        if (action.viewOffset != null && action.duration != null) {
+          await client.updateProgress(
+            action.ratingKey,
+            time: action.viewOffset!,
+            state:
+                'stopped', // Use 'stopped' since we're syncing after the fact
+            duration: action.duration,
+          );
+        }
+
+        // If progress exceeded threshold, also mark as watched
+        if (action.shouldMarkWatched) {
+          await client.markAsWatched(action.ratingKey);
+        }
+        break;
+    }
+  }
+
+  /// Fetch latest watch states from server and update local cache.
+  ///
+  /// Called when coming online or on app startup to pull any watch state
+  /// changes made on other devices.
+  ///
+  /// Optimized to fetch episodes by season (one API call per season)
+  /// instead of one API call per episode.
+  Future<void> syncWatchStatesFromServer() async {
+    try {
+      // Get all downloaded items from database
+      final downloadedItems = await _database.getAllDownloadedMetadata();
+
+      if (downloadedItems.isEmpty) {
+        appLogger.d('No downloaded items to sync watch states for');
+        return;
+      }
+
+      appLogger.i(
+        'Syncing watch states from server for ${downloadedItems.length} items',
+      );
+
+      // Separate episodes (with season parent) from other items (movies, etc.)
+      // Structure: serverId -> seasonRatingKey -> Set<episodeRatingKey>
+      final episodesByServerAndSeason = <String, Map<String, Set<String>>>{};
+      // Structure: serverId -> List<ratingKey>
+      final nonEpisodeItems = <String, List<String>>{};
+
+      for (final item in downloadedItems) {
+        if (item.type == 'episode' && item.parentRatingKey != null) {
+          // Group episodes by server and season for batch fetching
+          episodesByServerAndSeason
+              .putIfAbsent(item.serverId, () => {})
+              .putIfAbsent(item.parentRatingKey!, () => {})
+              .add(item.ratingKey);
+        } else {
+          // Movies, or episodes without parent (fallback to individual fetch)
+          nonEpisodeItems
+              .putIfAbsent(item.serverId, () => [])
+              .add(item.ratingKey);
+        }
+      }
+
+      int syncedCount = 0;
+      int seasonCount = 0;
+
+      // Fetch episodes by season (batch) - one API call per season
+      for (final serverEntry in episodesByServerAndSeason.entries) {
+        final serverId = serverEntry.key;
+        final seasonMap = serverEntry.value;
+
+        await _withOnlineClient(serverId, (client) async {
+          for (final seasonEntry in seasonMap.entries) {
+            final seasonRatingKey = seasonEntry.key;
+            final downloadedEpisodeKeys = seasonEntry.value;
+
+            try {
+              // Fetch all episodes in this season with one API call
+              final seasonEpisodes = await client.getChildren(seasonRatingKey);
+              seasonCount++;
+
+              // Cache only the episodes we have downloaded
+              for (final episode in seasonEpisodes) {
+                if (downloadedEpisodeKeys.contains(episode.ratingKey)) {
+                  await PlexApiCache.instance.put(
+                    serverId,
+                    '/library/metadata/${episode.ratingKey}',
+                    {
+                      'MediaContainer': {
+                        'Metadata': [episode.toJson()],
+                      },
+                    },
+                  );
+                  syncedCount++;
+                }
+              }
+            } catch (e) {
+              appLogger.d(
+                'Failed to sync watch states for season $seasonRatingKey: $e',
+              );
+            }
+          }
+        });
+      }
+
+      // Fetch non-episode items individually (movies, etc.)
+      for (final entry in nonEpisodeItems.entries) {
+        final serverId = entry.key;
+        final ratingKeys = entry.value;
+
+        await _withOnlineClient(serverId, (client) async {
+          for (final ratingKey in ratingKeys) {
+            try {
+              final metadata = await client.getMetadataWithImages(ratingKey);
+              if (metadata != null) {
+                await PlexApiCache.instance.put(
+                  serverId,
+                  '/library/metadata/$ratingKey',
+                  {
+                    'MediaContainer': {
+                      'Metadata': [metadata.toJson()],
+                    },
+                  },
+                );
+                syncedCount++;
+              }
+            } catch (e) {
+              appLogger.d('Failed to sync watch state for $ratingKey: $e');
+            }
+          }
+        });
+      }
+
+      final movieCount = nonEpisodeItems.values.fold(0, (a, b) => a + b.length);
+      appLogger.i(
+        'Synced watch states: $seasonCount seasons, $movieCount other items ($syncedCount total)',
+      );
+
+      // Notify download provider to refresh metadata from updated cache
+      if (syncedCount > 0) {
+        onWatchStatesRefreshed?.call();
+      }
+
+      notifyListeners();
+    } catch (e) {
+      appLogger.w('Error syncing watch states from server: $e');
+    }
+  }
+
+  /// Clear all pending watch actions (e.g., when logging out).
+  Future<void> clearAll() async {
+    await _database.clearAllWatchActions();
+    notifyListeners();
+  }
+
+  @override
+  void dispose() {
+    if (_offlineModeProvider != null && _offlineModeListener != null) {
+      _offlineModeProvider!.removeListener(_offlineModeListener!);
+    }
+    super.dispose();
+  }
+}
diff --git a/lib/services/play_queue_launcher.dart b/lib/services/play_queue_launcher.dart
new file mode 100644
index 00000000..9e7ae35b
--- /dev/null
+++ b/lib/services/play_queue_launcher.dart
@@ -0,0 +1,288 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../models/play_queue_response.dart';
+import '../models/plex_metadata.dart';
+import '../models/plex_playlist.dart';
+import '../providers/playback_state_provider.dart';
+import '../utils/app_logger.dart';
+import '../utils/video_player_navigation.dart';
+import '../i18n/strings.g.dart';
+import 'plex_client.dart';
+
+/// Result type for play queue operations
+sealed class PlayQueueResult {
+  const PlayQueueResult();
+}
+
+class PlayQueueSuccess extends PlayQueueResult {
+  const PlayQueueSuccess();
+}
+
+class PlayQueueEmpty extends PlayQueueResult {
+  const PlayQueueEmpty();
+}
+
+class PlayQueueError extends PlayQueueResult {
+  final Object error;
+  const PlayQueueError(this.error);
+}
+
+/// Service to handle play queue creation and navigation.
+///
+/// Centralizes the common pattern of:
+/// 1. Creating a play queue via various methods
+/// 2. Setting up PlaybackStateProvider
+/// 3. Navigating to the video player
+/// 4. Handling errors with appropriate feedback
+class PlayQueueLauncher {
+  final BuildContext context;
+  final PlexClient client;
+  final String? serverId;
+  final String? serverName;
+
+  PlayQueueLauncher({
+    required this.context,
+    required this.client,
+    this.serverId,
+    this.serverName,
+  });
+
+  /// Launch playback from a collection or playlist.
+  Future<PlayQueueResult> launchFromCollectionOrPlaylist({
+    required dynamic item, // PlexMetadata (collection) or PlexPlaylist
+    required bool shuffle,
+    bool showLoadingIndicator = true,
+  }) async {
+    final isCollection = item is PlexMetadata;
+    final isPlaylist = item is PlexPlaylist;
+
+    if (!isCollection && !isPlaylist) {
+      return PlayQueueError(
+        Exception('Item must be either a collection or playlist'),
+      );
+    }
+
+    return _executeWithLoading(
+      showLoading: showLoadingIndicator,
+      action: t.common.shuffle,
+      execute: () async {
+        final String ratingKey = item.ratingKey;
+        final String? itemServerId = item.serverId ?? serverId;
+        final String? itemServerName = item.serverName ?? serverName;
+
+        PlayQueueResponse? playQueue;
+
+        if (isCollection) {
+          // Get machine identifier (fetch if not cached in config)
+          final machineId =
+              client.config.machineIdentifier ??
+              await client.getMachineIdentifier();
+
+          if (machineId == null) {
+            throw Exception('Could not get server machine identifier');
+          }
+
+          final collectionUri =
+              'server://$machineId/com.plexapp.plugins.library/library/collections/${item.ratingKey}';
+          playQueue = await client.createPlayQueue(
+            uri: collectionUri,
+            type: 'video',
+            shuffle: shuffle ? 1 : 0,
+          );
+        } else {
+          // For playlists, use playlistID parameter
+          playQueue = await client.createPlayQueue(
+            playlistID: int.parse(item.ratingKey),
+            type: 'video',
+            shuffle: shuffle ? 1 : 0,
+          );
+        }
+
+        // If the queue is empty, try fetching it again with getPlayQueue
+        if (playQueue != null &&
+            (playQueue.items == null || playQueue.items!.isEmpty)) {
+          final fetchedQueue = await client.getPlayQueue(playQueue.playQueueID);
+          if (fetchedQueue != null &&
+              fetchedQueue.items != null &&
+              fetchedQueue.items!.isNotEmpty) {
+            playQueue = fetchedQueue;
+          }
+        }
+
+        return _launchFromQueue(
+          playQueue: playQueue,
+          ratingKey: ratingKey,
+          serverId: itemServerId,
+          serverName: itemServerName,
+        );
+      },
+    );
+  }
+
+  /// Launch playback from a playlist starting at a specific item.
+  Future<PlayQueueResult> launchFromPlaylistItem({
+    required PlexPlaylist playlist,
+    required PlexMetadata selectedItem,
+    bool showLoadingIndicator = true,
+  }) async {
+    return _executeWithLoading(
+      showLoading: showLoadingIndicator,
+      action: t.discover.play,
+      execute: () async {
+        final playQueue = await client.createPlayQueue(
+          playlistID: int.parse(playlist.ratingKey),
+          type: 'video',
+          key: selectedItem.key,
+        );
+
+        return _launchFromQueue(
+          playQueue: playQueue,
+          ratingKey: playlist.ratingKey,
+          serverId: serverId,
+          serverName: serverName,
+          selectedItem: playQueue?.selectedItem,
+        );
+      },
+    );
+  }
+
+  /// Launch shuffled playback for a show or season.
+  Future<PlayQueueResult> launchShuffledShow({
+    required PlexMetadata metadata,
+    bool showLoadingIndicator = true,
+  }) async {
+    final mediaType = metadata.mediaType;
+
+    if (mediaType != PlexMediaType.show && mediaType != PlexMediaType.season) {
+      return PlayQueueError(
+        Exception('Shuffle play only works for shows and seasons'),
+      );
+    }
+
+    return _executeWithLoading(
+      showLoading: showLoadingIndicator,
+      action: t.common.shuffle,
+      execute: () async {
+        // Determine the rating key for the play queue
+        String showRatingKey;
+        if (mediaType == PlexMediaType.show) {
+          showRatingKey = metadata.ratingKey;
+        } else {
+          // For seasons, we need the show's rating key
+          if (metadata.parentRatingKey == null) {
+            throw Exception('Season is missing parentRatingKey');
+          }
+          showRatingKey = metadata.parentRatingKey!;
+        }
+
+        final playQueue = await client.createShowPlayQueue(
+          showRatingKey: showRatingKey,
+          shuffle: 1,
+        );
+
+        return _launchFromQueue(
+          playQueue: playQueue,
+          ratingKey: showRatingKey,
+          serverId: metadata.serverId ?? serverId,
+          serverName: metadata.serverName ?? serverName,
+          copyServerInfo: true,
+        );
+      },
+    );
+  }
+
+  /// Core method to launch playback from a play queue.
+  Future<PlayQueueResult> _launchFromQueue({
+    required PlayQueueResponse? playQueue,
+    required String ratingKey,
+    String? serverId,
+    String? serverName,
+    PlexMetadata? selectedItem,
+    bool copyServerInfo = false,
+  }) async {
+    if (playQueue == null ||
+        playQueue.items == null ||
+        playQueue.items!.isEmpty) {
+      return const PlayQueueEmpty();
+    }
+
+    if (!context.mounted) return const PlayQueueError('Context not mounted');
+
+    // Set up playback state
+    final playbackState = context.read<PlaybackStateProvider>();
+    playbackState.setClient(client);
+    await playbackState.setPlaybackFromPlayQueue(
+      playQueue,
+      ratingKey,
+      serverId: serverId,
+      serverName: serverName,
+    );
+
+    if (!context.mounted) return const PlayQueueError('Context not mounted');
+
+    // Determine which item to navigate to
+    var itemToPlay = selectedItem ?? playQueue.items!.first;
+
+    // Copy server info if needed
+    if (copyServerInfo && serverId != null) {
+      itemToPlay = itemToPlay.copyWith(
+        serverId: serverId,
+        serverName: serverName,
+      );
+    }
+
+    // Navigate to video player
+    await navigateToVideoPlayer(context, metadata: itemToPlay);
+
+    return const PlayQueueSuccess();
+  }
+
+  /// Execute an action with optional loading indicator and error handling.
+  Future<PlayQueueResult> _executeWithLoading({
+    required bool showLoading,
+    required String action,
+    required Future<PlayQueueResult> Function() execute,
+  }) async {
+    // Show loading indicator
+    if (showLoading && context.mounted) {
+      showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder: (context) => const Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    try {
+      final result = await execute();
+
+      // Handle empty queue result
+      if (result is PlayQueueEmpty && context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(t.messages.failedToCreatePlayQueueNoItems)),
+        );
+      }
+
+      return result;
+    } catch (e) {
+      appLogger.e('Failed to $action', error: e);
+
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              t.messages.failedPlayback(action: action, error: e.toString()),
+            ),
+          ),
+        );
+      }
+
+      return PlayQueueError(e);
+    } finally {
+      // Close loading indicator (guaranteed cleanup)
+      if (showLoading && context.mounted && Navigator.canPop(context)) {
+        Navigator.pop(context);
+      }
+    }
+  }
+}
diff --git a/lib/services/playback_initialization_service.dart b/lib/services/playback_initialization_service.dart
new file mode 100644
index 00000000..18981568
--- /dev/null
+++ b/lib/services/playback_initialization_service.dart
@@ -0,0 +1,247 @@
+import 'plex_client.dart';
+import '../models/plex_media_info.dart';
+import '../models/plex_metadata.dart';
+import '../models/download_status.dart';
+import '../mpv/mpv.dart';
+import '../utils/app_logger.dart';
+import '../i18n/strings.g.dart';
+import '../database/app_database.dart';
+import 'download_storage_service.dart';
+import 'dart:io';
+import 'package:drift/drift.dart';
+
+/// Service responsible for fetching video playback data from the Plex server
+class PlaybackInitializationService {
+  final PlexClient client;
+  final AppDatabase? database;
+
+  PlaybackInitializationService({required this.client, this.database});
+
+  /// Format a video path as a URL (adds file:// prefix for file paths)
+  String _formatVideoUrl(String path) {
+    return path.contains('://') ? path : 'file://$path';
+  }
+
+  /// Check if content is available offline and return local path
+  ///
+  /// Returns the local file path if the video is downloaded and completed.
+  /// Returns null if not available offline or database is not provided.
+  Future<String?> getOfflineVideoPath(String serverId, String ratingKey) async {
+    if (database == null) {
+      return null;
+    }
+
+    try {
+      // Query database for downloaded media with matching serverId and ratingKey
+      final query = database!.select(database!.downloadedMedia)
+        ..where(
+          (tbl) =>
+              tbl.serverId.equals(serverId) & tbl.ratingKey.equals(ratingKey),
+        );
+
+      final downloadedItem = await query.getSingleOrNull();
+
+      // Return null if not found or not completed
+      if (downloadedItem == null ||
+          downloadedItem.status != DownloadStatus.completed.index) {
+        return null;
+      }
+
+      // Return null if no video file path
+      if (downloadedItem.videoFilePath == null) {
+        return null;
+      }
+
+      final storageService = DownloadStorageService.instance;
+      final storedPath = downloadedItem.videoFilePath!;
+
+      // Get readable path (handles both SAF URIs and file paths)
+      final readablePath = await storageService.getReadablePath(storedPath);
+
+      // For file paths (not SAF), verify the file exists
+      if (!storageService.isSafUri(storedPath)) {
+        final file = File(readablePath);
+        if (!await file.exists()) {
+          appLogger.w(
+            'Offline video file not found: $readablePath (stored as: $storedPath)',
+          );
+          return null;
+        }
+      }
+
+      appLogger.d('Found offline video: $readablePath');
+      return readablePath;
+    } catch (e) {
+      appLogger.w('Error checking offline video path', error: e);
+      return null;
+    }
+  }
+
+  /// Fetch playback data for the given metadata
+  ///
+  /// Returns a PlaybackInitializationResult with video URL and available versions
+  /// If [preferOffline] is true and offline content is available, uses local file
+  Future<PlaybackInitializationResult> getPlaybackData({
+    required PlexMetadata metadata,
+    required int selectedMediaIndex,
+    bool preferOffline = false,
+  }) async {
+    try {
+      // Check for offline content first if preferOffline is enabled
+      String? offlineVideoPath;
+      if (preferOffline && database != null) {
+        offlineVideoPath = await getOfflineVideoPath(
+          client.serverId,
+          metadata.ratingKey,
+        );
+      }
+
+      // If offline video is available, use it
+      if (offlineVideoPath != null) {
+        appLogger.d('Using offline playback for ${metadata.ratingKey}');
+
+        // For offline playback, we still need to fetch media info for subtitles
+        // but use the local file path for video
+        try {
+          final playbackData = await client.getVideoPlaybackData(
+            metadata.ratingKey,
+            mediaIndex: selectedMediaIndex,
+          );
+
+          // Build list of external subtitle tracks
+          final externalSubtitles = _buildExternalSubtitles(
+            playbackData.mediaInfo,
+          );
+
+          // Return result with local file path
+          return PlaybackInitializationResult(
+            availableVersions: playbackData.availableVersions,
+            videoUrl: _formatVideoUrl(offlineVideoPath),
+            mediaInfo: playbackData.mediaInfo,
+            externalSubtitles: externalSubtitles,
+            isOffline: true,
+          );
+        } catch (e) {
+          // If we can't fetch media info (e.g., no network), use offline-only mode
+          appLogger.w(
+            'Failed to fetch media info for offline video, using offline-only mode',
+            error: e,
+          );
+          return PlaybackInitializationResult(
+            availableVersions: [],
+            videoUrl: _formatVideoUrl(offlineVideoPath),
+            mediaInfo: null,
+            externalSubtitles: const [],
+            isOffline: true,
+          );
+        }
+      }
+
+      // Fall back to network streaming
+      final playbackData = await client.getVideoPlaybackData(
+        metadata.ratingKey,
+        mediaIndex: selectedMediaIndex,
+      );
+
+      if (!playbackData.hasValidVideoUrl) {
+        throw PlaybackException(t.messages.fileInfoNotAvailable);
+      }
+
+      // Build list of external subtitle tracks
+      final externalSubtitles = _buildExternalSubtitles(playbackData.mediaInfo);
+
+      // Return result with available versions and video URL
+      return PlaybackInitializationResult(
+        availableVersions: playbackData.availableVersions,
+        videoUrl: playbackData.videoUrl,
+        mediaInfo: playbackData.mediaInfo,
+        externalSubtitles: externalSubtitles,
+        isOffline: false,
+      );
+    } catch (e) {
+      if (e is PlaybackException) {
+        rethrow;
+      }
+      throw PlaybackException(t.messages.errorLoading(error: e.toString()));
+    }
+  }
+
+  /// Build list of external subtitle tracks from media info
+  List<SubtitleTrack> _buildExternalSubtitles(PlexMediaInfo? mediaInfo) {
+    final externalSubtitles = <SubtitleTrack>[];
+
+    if (mediaInfo == null) {
+      return externalSubtitles;
+    }
+
+    final externalTracks = mediaInfo.subtitleTracks
+        .where((PlexSubtitleTrack track) => track.isExternal)
+        .toList();
+
+    if (externalTracks.isNotEmpty) {
+      appLogger.d('Found ${externalTracks.length} external subtitle track(s)');
+    }
+
+    for (final plexTrack in externalTracks) {
+      try {
+        // Skip if no auth token is available
+        final token = client.config.token;
+        if (token == null) {
+          appLogger.w('No auth token available for external subtitles');
+          continue;
+        }
+
+        final url = plexTrack.getSubtitleUrl(client.config.baseUrl, token);
+
+        // Skip if URL couldn't be constructed
+        if (url == null) continue;
+
+        externalSubtitles.add(
+          SubtitleTrack.uri(
+            url,
+            title:
+                plexTrack.displayTitle ??
+                plexTrack.language ??
+                'Track ${plexTrack.id}',
+            language: plexTrack.languageCode,
+          ),
+        );
+      } catch (e) {
+        // Silent fallback - log error but continue with other subtitles
+        appLogger.w(
+          'Failed to add external subtitle track ${plexTrack.id}',
+          error: e,
+        );
+      }
+    }
+
+    return externalSubtitles;
+  }
+}
+
+/// Result of playback initialization
+class PlaybackInitializationResult {
+  final List<dynamic> availableVersions;
+  final String? videoUrl;
+  final PlexMediaInfo? mediaInfo;
+  final List<SubtitleTrack> externalSubtitles;
+  final bool isOffline;
+
+  PlaybackInitializationResult({
+    required this.availableVersions,
+    this.videoUrl,
+    this.mediaInfo,
+    this.externalSubtitles = const [],
+    this.isOffline = false,
+  });
+}
+
+/// Exception thrown when playback initialization fails
+class PlaybackException implements Exception {
+  final String message;
+
+  PlaybackException(this.message);
+
+  @override
+  String toString() => message;
+}
diff --git a/lib/services/playback_progress_tracker.dart b/lib/services/playback_progress_tracker.dart
new file mode 100644
index 00000000..25fff345
--- /dev/null
+++ b/lib/services/playback_progress_tracker.dart
@@ -0,0 +1,165 @@
+import 'dart:async';
+
+import '../mpv/mpv.dart';
+
+import 'plex_client.dart';
+import 'offline_watch_sync_service.dart';
+import '../models/plex_metadata.dart';
+import '../utils/app_logger.dart';
+
+/// Tracks playback progress and reports it to the Plex server.
+///
+/// Handles:
+/// - Periodic timeline updates during playback (online) or queuing (offline)
+/// - Resume position tracking
+/// - State change reporting (playing, paused, stopped)
+/// - Offline progress queuing for later sync
+class PlaybackProgressTracker {
+  /// Plex client for online progress updates (null when offline)
+  final PlexClient? client;
+
+  /// Metadata of the media being played
+  final PlexMetadata metadata;
+
+  /// Video player instance
+  final Player player;
+
+  /// Whether playback is in offline mode
+  final bool isOffline;
+
+  /// Service for queuing offline progress updates
+  final OfflineWatchSyncService? offlineWatchService;
+
+  /// Timer for periodic progress updates
+  Timer? _progressTimer;
+
+  /// Update interval (default: 10 seconds)
+  final Duration updateInterval;
+
+  PlaybackProgressTracker({
+    required this.client,
+    required this.metadata,
+    required this.player,
+    this.isOffline = false,
+    this.offlineWatchService,
+    this.updateInterval = const Duration(seconds: 10),
+  }) : assert(
+         !isOffline || offlineWatchService != null,
+         'offlineWatchService is required when isOffline is true',
+       ),
+       assert(
+         isOffline || client != null,
+         'client is required when isOffline is false',
+       );
+
+  /// Start tracking playback progress
+  ///
+  /// Begins periodic timeline updates to the Plex server (online)
+  /// or queuing progress updates locally (offline).
+  void startTracking() {
+    if (_progressTimer != null) {
+      appLogger.w('Progress tracking already started');
+      return;
+    }
+
+    // Send initial progress immediately (don't wait for first timer tick)
+    if (player.state.playing) {
+      _sendProgress('playing');
+    }
+
+    _progressTimer = Timer.periodic(updateInterval, (timer) {
+      if (player.state.playing) {
+        _sendProgress('playing');
+      }
+    });
+
+    appLogger.d(
+      'Started progress tracking (interval: ${updateInterval.inSeconds}s, offline: $isOffline)',
+    );
+  }
+
+  /// Stop tracking playback progress
+  ///
+  /// Cancels the periodic timer.
+  void stopTracking() {
+    _progressTimer?.cancel();
+    _progressTimer = null;
+    appLogger.d('Stopped progress tracking');
+  }
+
+  /// Send progress update to Plex server or queue locally
+  ///
+  /// [state] can be 'playing', 'paused', or 'stopped'
+  Future<void> sendProgress(String state) async {
+    await _sendProgress(state);
+  }
+
+  Future<void> _sendProgress(String state) async {
+    try {
+      final position = player.state.position;
+      final duration = player.state.duration;
+
+      // Don't send progress if no duration (not ready)
+      if (duration.inMilliseconds == 0) {
+        return;
+      }
+
+      if (isOffline) {
+        // Queue progress update for later sync
+        await _sendOfflineProgress(position, duration);
+      } else {
+        // Send progress to server immediately
+        await _sendOnlineProgress(state, position, duration);
+      }
+    } catch (e) {
+      appLogger.d('Failed to send progress update (non-critical)', error: e);
+    }
+  }
+
+  /// Send progress update to Plex server (online mode)
+  Future<void> _sendOnlineProgress(
+    String state,
+    Duration position,
+    Duration duration,
+  ) async {
+    await client!.updateProgress(
+      metadata.ratingKey,
+      time: position.inMilliseconds,
+      state: state,
+      duration: duration.inMilliseconds,
+    );
+
+    appLogger.d(
+      'Progress update sent: $state at ${position.inSeconds}s / ${duration.inSeconds}s',
+    );
+  }
+
+  /// Queue progress update locally (offline mode)
+  Future<void> _sendOfflineProgress(
+    Duration position,
+    Duration duration,
+  ) async {
+    final serverId = metadata.serverId;
+    if (serverId == null) {
+      appLogger.w('Cannot queue offline progress: serverId is null');
+      return;
+    }
+
+    await offlineWatchService!.queueProgressUpdate(
+      serverId: serverId,
+      ratingKey: metadata.ratingKey,
+      viewOffset: position.inMilliseconds,
+      duration: duration.inMilliseconds,
+    );
+
+    final percent = (position.inMilliseconds / duration.inMilliseconds * 100);
+    appLogger.d(
+      'Offline progress queued: ${position.inSeconds}s / ${duration.inSeconds}s (${percent.toStringAsFixed(1)}%)',
+    );
+  }
+
+  /// Dispose resources
+  void dispose() {
+    stopTracking();
+  }
+}
diff --git a/lib/services/plex_api_cache.dart b/lib/services/plex_api_cache.dart
new file mode 100644
index 00000000..f89604c9
--- /dev/null
+++ b/lib/services/plex_api_cache.dart
@@ -0,0 +1,142 @@
+import 'dart:convert';
+
+import 'package:drift/drift.dart';
+
+import '../database/app_database.dart';
+
+/// Key-value cache for Plex API responses using Drift/SQLite.
+/// Stores raw JSON responses keyed by serverId:endpoint format.
+class PlexApiCache {
+  static PlexApiCache? _instance;
+  static PlexApiCache get instance {
+    if (_instance == null) {
+      throw StateError(
+        'PlexApiCache not initialized. Call PlexApiCache.initialize() first.',
+      );
+    }
+    return _instance!;
+  }
+
+  final AppDatabase _db;
+
+  PlexApiCache._(this._db);
+
+  /// Initialize the singleton with an AppDatabase instance
+  static void initialize(AppDatabase db) {
+    _instance = PlexApiCache._(db);
+  }
+
+  /// Get the database instance (for services that need direct database access)
+  AppDatabase get database => _db;
+
+  /// Build cache key from serverId and endpoint
+  String _buildKey(String serverId, String endpoint) {
+    return '$serverId:$endpoint';
+  }
+
+  /// Get cached response for an endpoint
+  Future<Map<String, dynamic>?> get(String serverId, String endpoint) async {
+    final key = _buildKey(serverId, endpoint);
+    final result = await (_db.select(
+      _db.apiCache,
+    )..where((t) => t.cacheKey.equals(key))).getSingleOrNull();
+
+    if (result != null) {
+      return jsonDecode(result.data) as Map<String, dynamic>;
+    }
+    return null;
+  }
+
+  /// Cache a response for an endpoint
+  Future<void> put(
+    String serverId,
+    String endpoint,
+    Map<String, dynamic> data,
+  ) async {
+    final key = _buildKey(serverId, endpoint);
+    await _db
+        .into(_db.apiCache)
+        .insertOnConflictUpdate(
+          ApiCacheCompanion(
+            cacheKey: Value(key),
+            data: Value(jsonEncode(data)),
+            cachedAt: Value(DateTime.now()),
+          ),
+        );
+  }
+
+  /// Delete all cached data for a server
+  Future<void> deleteForServer(String serverId) async {
+    await (_db.delete(
+      _db.apiCache,
+    )..where((t) => t.cacheKey.like('$serverId:%'))).go();
+  }
+
+  /// Delete cached data for a specific item (when removing a download)
+  Future<void> deleteForItem(String serverId, String ratingKey) async {
+    // Delete the metadata endpoint
+    final metadataKey = _buildKey(serverId, '/library/metadata/$ratingKey');
+    final childrenKey = _buildKey(
+      serverId,
+      '/library/metadata/$ratingKey/children',
+    );
+
+    await (_db.delete(_db.apiCache)..where(
+          (t) =>
+              t.cacheKey.equals(metadataKey) | t.cacheKey.equals(childrenKey),
+        ))
+        .go();
+  }
+
+  /// Mark an item as pinned for offline access
+  Future<void> pinForOffline(String serverId, String ratingKey) async {
+    final metadataKey = _buildKey(serverId, '/library/metadata/$ratingKey');
+    await (_db.update(_db.apiCache)
+          ..where((t) => t.cacheKey.equals(metadataKey)))
+        .write(const ApiCacheCompanion(pinned: Value(true)));
+  }
+
+  /// Unpin an item
+  Future<void> unpinForOffline(String serverId, String ratingKey) async {
+    final metadataKey = _buildKey(serverId, '/library/metadata/$ratingKey');
+    await (_db.update(_db.apiCache)
+          ..where((t) => t.cacheKey.equals(metadataKey)))
+        .write(const ApiCacheCompanion(pinned: Value(false)));
+  }
+
+  /// Check if an item is pinned for offline
+  Future<bool> isPinned(String serverId, String ratingKey) async {
+    final metadataKey = _buildKey(serverId, '/library/metadata/$ratingKey');
+    final result = await (_db.select(
+      _db.apiCache,
+    )..where((t) => t.cacheKey.equals(metadataKey))).getSingleOrNull();
+    return result?.pinned ?? false;
+  }
+
+  /// Get all pinned rating keys for a server
+  Future<Set<String>> getPinnedKeys(String serverId) async {
+    final results =
+        await (_db.select(_db.apiCache)..where(
+              (t) => t.cacheKey.like('$serverId:%') & t.pinned.equals(true),
+            ))
+            .get();
+
+    final keys = <String>{};
+    for (final row in results) {
+      // Extract ratingKey from cache key like "serverId:/library/metadata/12345"
+      // Rating keys can be alphanumeric, not just numeric
+      final match = RegExp(
+        r'/library/metadata/([^/]+)$',
+      ).firstMatch(row.cacheKey);
+      if (match != null) {
+        keys.add(match.group(1)!);
+      }
+    }
+    return keys;
+  }
+
+  /// Clear all cached data (useful for debugging/testing)
+  Future<void> clearAll() async {
+    await _db.delete(_db.apiCache).go();
+  }
+}
diff --git a/lib/services/plex_auth_service.dart b/lib/services/plex_auth_service.dart
index 7c6ec57c..b83571c1 100644
--- a/lib/services/plex_auth_service.dart
+++ b/lib/services/plex_auth_service.dart
@@ -2,10 +2,11 @@ import 'dart:async';
 import 'package:dio/dio.dart';
 import 'package:uuid/uuid.dart';
 import 'storage_service.dart';
-import '../client/plex_client.dart';
+import 'plex_client.dart';
 import '../models/plex_user_profile.dart';
 import '../models/plex_home.dart';
 import '../models/user_switch_response.dart';
+import '../utils/app_logger.dart';
 
 class PlexAuthService {
   static const String _appName = 'Plezy';
@@ -240,8 +241,14 @@ class _ConnectionCandidate {
   final PlexConnection connection;
   final String url;
   final bool isPlexDirectUri;
+  final bool isHttps;
 
-  _ConnectionCandidate(this.connection, this.url, this.isPlexDirectUri);
+  _ConnectionCandidate(
+    this.connection,
+    this.url,
+    this.isPlexDirectUri,
+    this.isHttps,
+  );
 }
 
 /// Represents a Plex Media Server
@@ -391,74 +398,111 @@ class PlexServer {
   /// Priority: local > remote > relay, then HTTPS > HTTP, then lowest latency
   /// Tests both plex.direct URI and direct IP for each connection
   /// HTTPS connections are tested first, with HTTP as fallback
-  Stream<PlexConnection> findBestWorkingConnection() async* {
-    if (connections.isEmpty) return;
+  Stream<PlexConnection> findBestWorkingConnection({
+    String? preferredUri,
+  }) async* {
+    if (connections.isEmpty) {
+      appLogger.w('No connections available for server discovery');
+      return;
+    }
 
-    // Create candidates: test both uri and directUrl for each connection
-    // Separate HTTPS and HTTP candidates to prioritize HTTPS first
-    final httpsCandidates = <_ConnectionCandidate>[];
-    final httpCandidates = <_ConnectionCandidate>[];
+    const preferredTimeout = Duration(seconds: 2);
+    const raceTimeout = Duration(seconds: 4);
 
-    for (final connection in connections) {
-      final uriCandidate = _ConnectionCandidate(
-        connection,
-        connection.uri,
-        true,
-      );
-      final directCandidate = _ConnectionCandidate(
-        connection,
-        connection.directUrl,
-        false,
-      );
+    final candidates = _buildPrioritizedCandidates();
+    if (candidates.isEmpty) {
+      appLogger.w('No connection candidates generated for server discovery');
+      return;
+    }
 
-      if (connection.protocol == 'https') {
-        httpsCandidates.add(uriCandidate);
-        httpsCandidates.add(directCandidate);
-      } else {
-        httpCandidates.add(uriCandidate);
-        httpCandidates.add(directCandidate);
+    final totalCandidates = candidates.length;
+    appLogger.d(
+      'Starting server connection discovery',
+      error: {'preferred': preferredUri, 'candidateCount': totalCandidates},
+    );
+
+    _ConnectionCandidate? firstCandidate;
+
+    // Fast-path: if we have a cached working URI, probe it with a short timeout
+    if (preferredUri != null) {
+      final cachedCandidate = _candidateForUrl(preferredUri);
+      if (cachedCandidate != null) {
+        appLogger.d(
+          'Testing cached endpoint before running full race',
+          error: {'uri': preferredUri},
+        );
+        final result = await PlexClient.testConnectionWithLatency(
+          cachedCandidate.url,
+          accessToken,
+          timeout: preferredTimeout,
+        );
+
+        if (result.success) {
+          appLogger.i(
+            'Cached endpoint succeeded, using immediately',
+            error: {'uri': preferredUri},
+          );
+          firstCandidate = cachedCandidate;
+        } else {
+          appLogger.w(
+            'Cached endpoint failed, falling back to candidate race',
+            error: {'uri': preferredUri},
+          );
+        }
       }
     }
 
-    // Combine candidates with HTTPS first, then HTTP
-    final candidates = [...httpsCandidates, ...httpCandidates];
-
-    // Phase 1: Race to find first working connection
-    final completer = Completer<_ConnectionCandidate?>();
-    _ConnectionCandidate? firstCandidate;
-    int completedTests = 0;
-
-    // Start testing all candidates simultaneously
-    for (final candidate in candidates) {
-      PlexClient.testConnectionWithLatency(candidate.url, accessToken).then((
-        result,
-      ) {
-        completedTests++;
-
-        // If this is the first successful connection, emit it immediately
-        if (result.success && !completer.isCompleted) {
-          completer.complete(candidate);
-        }
-
-        // If all tests complete without success, complete with null
-        if (completedTests == candidates.length && !completer.isCompleted) {
-          completer.complete(null);
-        }
-      });
-    }
-
-    // Wait for and emit the first successful connection
-    firstCandidate = await completer.future;
+    // If no cached candidate or it failed, race candidates to find first success
     if (firstCandidate == null) {
-      return; // No working connections found
+      final completer = Completer<_ConnectionCandidate?>();
+      int completedTests = 0;
+
+      appLogger.d(
+        'Running connection race to find first working endpoint',
+        error: {'candidateCount': totalCandidates},
+      );
+
+      for (final candidate in candidates) {
+        PlexClient.testConnectionWithLatency(
+          candidate.url,
+          accessToken,
+          timeout: raceTimeout,
+        ).then((result) {
+          completedTests++;
+
+          if (result.success && !completer.isCompleted) {
+            completer.complete(candidate);
+          }
+
+          if (completedTests == candidates.length && !completer.isCompleted) {
+            completer.complete(null);
+          }
+        });
+      }
+
+      firstCandidate = await completer.future;
+      if (firstCandidate == null) {
+        appLogger.e('No working server connections after race');
+        return; // No working connections found
+      }
+      appLogger.i(
+        'Connection race found first working endpoint',
+        error: {
+          'uri': firstCandidate.url,
+          'type': firstCandidate.connection.displayType,
+        },
+      );
     }
 
-    // Update the connection object to use the working URL
     final firstConnection = _updateConnectionUrl(
       firstCandidate.connection,
       firstCandidate.url,
     );
     yield firstConnection;
+    appLogger.d(
+      'Emitted first working connection, continuing latency tests in background',
+      error: {'uri': firstConnection.uri},
+    );
 
     // Phase 2: Continue testing in background to find best connection
     // Test each candidate 2-3 times and average the latency
@@ -480,20 +524,39 @@ class PlexServer {
 
     // If no connections succeeded, we're done
     if (candidateResults.isEmpty) {
+      appLogger.w('Latency sweep found no additional working endpoints');
       return;
     }
 
+    appLogger.d(
+      'Completed latency sweep for server connections',
+      error: {'successfulCandidates': candidateResults.length},
+    );
+
     // Find the best connection considering priority, latency, and URL type
     final bestCandidate = _selectBestCandidateWithLatency(candidateResults);
 
     // Emit the best connection if it's different from the first one
     if (bestCandidate != null) {
+      final upgradedCandidate =
+          await _upgradeCandidateToHttpsIfPossible(bestCandidate) ??
+          bestCandidate;
+
       final bestConnection = _updateConnectionUrl(
-        bestCandidate.connection,
-        bestCandidate.url,
+        upgradedCandidate.connection,
+        upgradedCandidate.url,
       );
       if (bestConnection.uri != firstConnection.uri) {
+        appLogger.i(
+          'Latency sweep selected better endpoint',
+          error: {'uri': bestConnection.uri},
+        );
         yield bestConnection;
+      } else {
+        appLogger.d(
+          'Latency sweep confirmed initial endpoint is optimal',
+          error: {'uri': bestConnection.uri},
+        );
       }
     }
   }
@@ -517,6 +580,239 @@ class PlexServer {
     );
   }
 
+  _ConnectionCandidate? _candidateForUrl(String url) {
+    for (final connection in connections) {
+      final httpUrl = connection.httpDirectUrl;
+      if (httpUrl == url) {
+        return _ConnectionCandidate(connection, httpUrl, false, false);
+      }
+
+      final uri = connection.uri;
+      if (uri == url) {
+        final isHttps = uri.startsWith('https://');
+        final parsedHost = Uri.tryParse(uri)?.host ?? '';
+        final isPlexDirect = parsedHost.toLowerCase().contains('plex.direct');
+        return _ConnectionCandidate(connection, uri, isPlexDirect, isHttps);
+      }
+    }
+    return null;
+  }
+
+  List<_ConnectionCandidate> _buildPrioritizedCandidates({
+    Set<String>? excludeUrls,
+  }) {
+    final seen = <String>{};
+    if (excludeUrls != null) {
+      seen.addAll(excludeUrls);
+    }
+
+    final httpsLocal = <_ConnectionCandidate>[];
+    final httpsRemote = <_ConnectionCandidate>[];
+    final httpsRelay = <_ConnectionCandidate>[];
+    final httpLocal = <_ConnectionCandidate>[];
+    final httpRemote = <_ConnectionCandidate>[];
+    final httpRelay = <_ConnectionCandidate>[];
+
+    List<_ConnectionCandidate> bucketFor(
+      PlexConnection connection,
+      bool isHttps,
+    ) {
+      if (isHttps) {
+        if (connection.relay) return httpsRelay;
+        if (connection.local) return httpsLocal;
+        return httpsRemote;
+      } else {
+        if (connection.relay) return httpRelay;
+        if (connection.local) return httpLocal;
+        return httpRemote;
+      }
+    }
+
+    void addCandidate(
+      PlexConnection connection,
+      String url,
+      bool isPlexDirectUri,
+      bool isHttps,
+    ) {
+      if (url.isEmpty || seen.contains(url)) {
+        return;
+      }
+      seen.add(url);
+      bucketFor(
+        connection,
+        isHttps,
+      ).add(_ConnectionCandidate(connection, url, isPlexDirectUri, isHttps));
+    }
+
+    for (final connection in connections) {
+      // First, try the actual connection URI (may be HTTPS plex.direct)
+      final isPlexDirect = connection.uri.contains('.plex.direct');
+      final isHttps = connection.protocol == 'https';
+      addCandidate(connection, connection.uri, isPlexDirect, isHttps);
+
+      // For HTTPS connections, also add HTTP direct IP as fallback
+      // This provides backward compatibility and fallback for cert issues
+      if (isHttps) {
+        addCandidate(connection, connection.httpDirectUrl, false, false);
+      }
+    }
+
+    return [
+      ...httpsLocal,
+      ...httpsRemote,
+      ...httpsRelay,
+      ...httpLocal,
+      ...httpRemote,
+      ...httpRelay,
+    ];
+  }
+
+  List<String> prioritizedEndpointUrls({String? preferredFirst}) {
+    final urls = <String>[];
+    final exclude = <String>{};
+
+    if (preferredFirst != null && preferredFirst.isNotEmpty) {
+      urls.add(preferredFirst);
+      exclude.add(preferredFirst);
+    }
+
+    final candidates = _buildPrioritizedCandidates(excludeUrls: exclude);
+    urls.addAll(candidates.map((candidate) => candidate.url));
+    return urls;
+  }
+
+  Future<_ConnectionCandidate?> _upgradeCandidateToHttpsIfPossible(
+    _ConnectionCandidate candidate,
+  ) async {
+    final currentUrl = candidate.url;
+    if (currentUrl.startsWith('https://')) {
+      return null;
+    }
+
+    late final String httpsUrl;
+    bool resultingIsPlexDirect = candidate.isPlexDirectUri;
+
+    if (candidate.isPlexDirectUri) {
+      if (!currentUrl.startsWith('http://')) {
+        return null;
+      }
+      httpsUrl = currentUrl.replaceFirst('http://', 'https://');
+    } else {
+      // Raw IP endpoints can't present HTTPS certificates—prefer their plex.direct alias.
+      final plexDirectUri = candidate.connection.uri;
+      if (plexDirectUri.isEmpty) {
+        return null;
+      }
+
+      if (plexDirectUri.startsWith('https://')) {
+        httpsUrl = plexDirectUri;
+      } else if (plexDirectUri.startsWith('http://')) {
+        httpsUrl = plexDirectUri.replaceFirst('http://', 'https://');
+      } else {
+        return null;
+      }
+
+      final upgradedHost = Uri.tryParse(httpsUrl)?.host;
+      if (upgradedHost == null ||
+          !upgradedHost.toLowerCase().endsWith('.plex.direct')) {
+        appLogger.d(
+          'Skipping HTTPS upgrade for raw IP candidate: no plex.direct alias available',
+          error: {'candidate': currentUrl, 'target': httpsUrl},
+        );
+        return null;
+      }
+      resultingIsPlexDirect = true;
+    }
+
+    if (httpsUrl == currentUrl) {
+      return null;
+    }
+
+    appLogger.d(
+      'Attempting HTTPS upgrade for candidate endpoint',
+      error: {'from': currentUrl, 'to': httpsUrl},
+    );
+
+    final result = await PlexClient.testConnectionWithLatency(
+      httpsUrl,
+      accessToken,
+      timeout: const Duration(seconds: 4),
+    );
+
+    if (!result.success) {
+      appLogger.w(
+        'HTTPS upgrade failed, staying on HTTP candidate',
+        error: {'url': currentUrl},
+      );
+      return null;
+    }
+
+    appLogger.i(
+      'HTTPS upgrade succeeded for candidate endpoint',
+      error: {'httpsUrl': httpsUrl},
+    );
+
+    final httpsConnection = PlexConnection(
+      protocol: 'https',
+      address: candidate.connection.address,
+      port: candidate.connection.port,
+      uri: httpsUrl,
+      local: candidate.connection.local,
+      relay: candidate.connection.relay,
+      ipv6: candidate.connection.ipv6,
+    );
+
+    return _ConnectionCandidate(
+      httpsConnection,
+      httpsUrl,
+      resultingIsPlexDirect,
+      true,
+    );
+  }
+
+  Future<PlexConnection?> upgradeConnectionToHttps(
+    PlexConnection current,
+  ) async {
+    if (current.uri.startsWith('https://')) {
+      return current;
+    }
+
+    final baseConnection = _findMatchingBaseConnection(current);
+    if (baseConnection == null) {
+      return null;
+    }
+
+    final candidate = _ConnectionCandidate(
+      baseConnection,
+      current.uri,
+      current.uri.contains('.plex.direct'),
+      current.uri.startsWith('https://'),
+    );
+    final upgradedCandidate = await _upgradeCandidateToHttpsIfPossible(
+      candidate,
+    );
+    if (upgradedCandidate == null) {
+      return null;
+    }
+    return _updateConnectionUrl(
+      upgradedCandidate.connection,
+      upgradedCandidate.url,
+    );
+  }
+
+  PlexConnection? _findMatchingBaseConnection(PlexConnection connection) {
+    for (final base in connections) {
+      final sameAddress = base.address == connection.address;
+      final samePort = base.port == connection.port;
+      final sameLocal = base.local == connection.local;
+      final sameRelay = base.relay == connection.relay;
+      if (sameAddress && samePort && sameLocal && sameRelay) {
+        return base;
+      }
+    }
+    return null;
+  }
+
   /// Select the best candidate considering priority, latency, and URL type preference
   _ConnectionCandidate? _selectBestCandidateWithLatency(
     Map<_ConnectionCandidate, ConnectionTestResult> results,
@@ -550,8 +846,8 @@ class PlexServer {
       if (latencyCompare != 0) return latencyCompare;
 
       // If latencies are equal, prefer HTTPS over HTTP
-      final aIsHttps = a.key.connection.protocol == 'https';
-      final bIsHttps = b.key.connection.protocol == 'https';
+      final aIsHttps = a.key.isHttps;
+      final bIsHttps = b.key.isHttps;
       if (aIsHttps && !bIsHttps) return -1;
       if (!aIsHttps && bIsHttps) return 1;
 
@@ -641,6 +937,13 @@ class PlexConnection {
   /// This bypasses plex.direct DNS and connects directly to the IP
   String get directUrl => '$protocol://$address:$port';
 
+  /// Always return an HTTP URL that points directly at the IP/port combo.
+  String get httpDirectUrl {
+    final needsBrackets = address.contains(':') && !address.startsWith('[');
+    final safeAddress = needsBrackets ? '[$address]' : address;
+    return 'http://$safeAddress:$port';
+  }
+
   String get displayType {
     if (relay) return 'Relay';
     if (local) return 'Local';
diff --git a/lib/services/plex_client.dart b/lib/services/plex_client.dart
new file mode 100644
index 00000000..3e01a41a
--- /dev/null
+++ b/lib/services/plex_client.dart
@@ -0,0 +1,2293 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
+
+import '../models/plex_config.dart';
+import '../models/play_queue_response.dart';
+import '../models/plex_file_info.dart';
+import '../models/plex_filter.dart';
+import '../models/plex_hub.dart';
+import '../models/plex_library.dart';
+import '../models/plex_media_info.dart';
+import '../models/plex_media_version.dart';
+import '../models/plex_metadata.dart';
+import '../models/plex_playlist.dart';
+import '../models/plex_sort.dart';
+import '../models/plex_video_playback_data.dart';
+import '../utils/endpoint_failover_interceptor.dart';
+import '../utils/app_logger.dart';
+import '../utils/log_redaction_manager.dart';
+import 'plex_api_cache.dart';
+
+/// Result of testing a connection, including success status and latency
+class ConnectionTestResult {
+  final bool success;
+  final int latencyMs;
+
+  ConnectionTestResult({required this.success, required this.latencyMs});
+}
+
+class PlexClient {
+  PlexConfig config;
+  late final Dio _dio;
+  final EndpointFailoverManager? _endpointManager;
+  final Future<void> Function(String newBaseUrl)? _onEndpointChanged;
+
+  /// Server identifier - all PlexMetadata items created by this client are tagged with this
+  final String serverId;
+
+  /// Server name - all PlexMetadata items created by this client are tagged with this
+  final String? serverName;
+
+  /// API response cache for offline support
+  final PlexApiCache _cache = PlexApiCache.instance;
+
+  /// Whether to operate in offline mode (use cache only)
+  bool _offlineMode = false;
+
+  /// Set offline mode - when true, only cached responses are returned
+  void setOfflineMode(bool offline) {
+    _offlineMode = offline;
+  }
+
+  /// Get current offline mode state
+  bool get isOfflineMode => _offlineMode;
+
+  /// Custom response decoder that handles malformed UTF-8 gracefully
+  static String _lenientUtf8Decoder(
+    List<int> responseBytes,
+    RequestOptions options,
+    ResponseBody responseBody,
+  ) {
+    return utf8.decode(responseBytes, allowMalformed: true);
+  }
+
+  PlexClient(
+    this.config, {
+    required this.serverId,
+    this.serverName,
+    List<String>? prioritizedEndpoints,
+    Future<void> Function(String newBaseUrl)? onEndpointChanged,
+  }) : _endpointManager =
+           (prioritizedEndpoints != null && prioritizedEndpoints.isNotEmpty)
+           ? EndpointFailoverManager(prioritizedEndpoints)
+           : null,
+       _onEndpointChanged = onEndpointChanged {
+    LogRedactionManager.registerServerUrl(config.baseUrl);
+    LogRedactionManager.registerToken(config.token);
+
+    _dio = Dio(
+      BaseOptions(
+        baseUrl: config.baseUrl,
+        headers: config.headers,
+        connectTimeout: const Duration(seconds: 10),
+        receiveTimeout: const Duration(seconds: 120),
+        validateStatus: (status) => status != null && status < 500,
+        responseType: ResponseType.json,
+        contentType: 'application/json; charset=utf-8',
+        responseDecoder: _lenientUtf8Decoder,
+      ),
+    );
+
+    // Add interceptor for logging (optional, can be disabled in production)
+    _dio.interceptors.add(
+      LogInterceptor(
+        requestBody: false,
+        responseBody: false,
+        error: true,
+        requestHeader: false,
+        responseHeader: false,
+      ),
+    );
+
+    if (_endpointManager != null) {
+      _dio.interceptors.add(
+        EndpointFailoverInterceptor(
+          dio: _dio,
+          endpointManager: _endpointManager,
+          onEndpointSwitch: _handleEndpointSwitch,
+        ),
+      );
+    }
+  }
+
+  /// Update the token used by this client
+  void updateToken(String newToken) {
+    // Update both the Dio headers and the config to ensure consistency
+    _dio.options.headers['X-Plex-Token'] = newToken;
+    config = config.copyWith(token: newToken);
+    LogRedactionManager.registerToken(newToken);
+    appLogger.d('PlexClient token updated (headers and config)');
+  }
+
+  /// Update endpoint priority list and optionally hop to the new best endpoint.
+  Future<void> updateEndpointPreferences(
+    List<String> prioritizedEndpoints, {
+    bool switchToFirst = false,
+  }) async {
+    if (_endpointManager == null || prioritizedEndpoints.isEmpty) {
+      return;
+    }
+
+    final targetBaseUrl = switchToFirst
+        ? prioritizedEndpoints.first
+        : config.baseUrl;
+    _endpointManager.reset(prioritizedEndpoints, currentBaseUrl: targetBaseUrl);
+
+    if (switchToFirst && targetBaseUrl != config.baseUrl) {
+      await _handleEndpointSwitch(targetBaseUrl);
+    }
+  }
+
+  /// Test connection to server
+  Future<bool> testConnection() async {
+    try {
+      final response = await _dio.get('/');
+      return response.statusCode == 200 || response.statusCode == 401;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  /// Test connection to a specific URL with token and measure latency
+  static Future<ConnectionTestResult> testConnectionWithLatency(
+    String baseUrl,
+    String token, {
+    Duration timeout = const Duration(seconds: 5),
+  }) async {
+    final stopwatch = Stopwatch()..start();
+
+    try {
+      final dio = Dio(
+        BaseOptions(
+          baseUrl: baseUrl,
+          connectTimeout: timeout,
+          receiveTimeout: timeout,
+          validateStatus: (status) => status != null && status < 500,
+          responseType: ResponseType.json,
+          contentType: 'application/json; charset=utf-8',
+        ),
+      );
+
+      final response = await dio.get(
+        '/',
+        options: Options(headers: {'X-Plex-Token': token}),
+      );
+
+      stopwatch.stop();
+      final success = response.statusCode == 200 || response.statusCode == 401;
+
+      return ConnectionTestResult(
+        success: success,
+        latencyMs: stopwatch.elapsedMilliseconds,
+      );
+    } catch (e) {
+      stopwatch.stop();
+      return ConnectionTestResult(
+        success: false,
+        latencyMs: stopwatch.elapsedMilliseconds,
+      );
+    }
+  }
+
+  /// Test connection multiple times and return average latency
+  static Future<ConnectionTestResult> testConnectionWithAverageLatency(
+    String baseUrl,
+    String token, {
+    int attempts = 3,
+    Duration timeout = const Duration(seconds: 5),
+  }) async {
+    final results = <ConnectionTestResult>[];
+
+    for (int i = 0; i < attempts; i++) {
+      final result = await testConnectionWithLatency(
+        baseUrl,
+        token,
+        timeout: timeout,
+      );
+
+      // If any attempt fails, return failed result immediately
+      if (!result.success) {
+        return ConnectionTestResult(
+          success: false,
+          latencyMs: result.latencyMs,
+        );
+      }
+
+      results.add(result);
+    }
+
+    // Calculate average latency from successful attempts
+    final avgLatency =
+        results.fold<int>(0, (sum, result) => sum + result.latencyMs) ~/
+        results.length;
+
+    return ConnectionTestResult(success: true, latencyMs: avgLatency);
+  }
+
+  // ============================================================================
+  // API Response Parsing Helpers
+  // ============================================================================
+
+  /// Extract MediaContainer from API response
+  Map<String, dynamic>? _getMediaContainer(Response response) {
+    if (response.data is Map && response.data.containsKey('MediaContainer')) {
+      return response.data['MediaContainer'];
+    }
+    return null;
+  }
+
+  /// Extract list of PlexMetadata from response
+  /// Automatically tags all items with this client's serverId and serverName
+  List<PlexMetadata> _extractMetadataList(Response response) {
+    final container = _getMediaContainer(response);
+    if (container != null && container['Metadata'] != null) {
+      return (container['Metadata'] as List)
+          .map(
+            (json) => PlexMetadata.fromJson(
+              json,
+            ).copyWith(serverId: serverId, serverName: serverName),
+          )
+          .toList();
+    }
+    return [];
+  }
+
+  /// Extract first metadata JSON from response (returns raw Map or null)
+  Map<String, dynamic>? _getFirstMetadataJson(Response response) {
+    final container = _getMediaContainer(response);
+    if (container != null &&
+        container['Metadata'] != null &&
+        (container['Metadata'] as List).isNotEmpty) {
+      return container['Metadata'][0] as Map<String, dynamic>;
+    }
+    return null;
+  }
+
+  /// Generic helper to extract and map Directory list from response
+  List<T> _extractDirectoryList<T>(
+    Response response,
+    T Function(Map<String, dynamic>) fromJson,
+  ) {
+    final container = _getMediaContainer(response);
+    if (container != null && container['Directory'] != null) {
+      return (container['Directory'] as List)
+          .map((json) => fromJson(json as Map<String, dynamic>))
+          .toList();
+    }
+    return [];
+  }
+
+  /// Extract PlexLibrary list from response with auto-tagging
+  List<PlexLibrary> _extractLibraryList(Response response) {
+    final container = _getMediaContainer(response);
+    if (container != null && container['Directory'] != null) {
+      return (container['Directory'] as List)
+          .map(
+            (json) => PlexLibrary.fromJson(
+              json as Map<String, dynamic>,
+            ).copyWith(serverId: serverId, serverName: serverName),
+          )
+          .toList();
+    }
+    return [];
+  }
+
+  /// Extract PlexPlaylist list from response with auto-tagging
+  List<PlexPlaylist> _extractPlaylistList(Response response) {
+    final container = _getMediaContainer(response);
+    if (container != null && container['Metadata'] != null) {
+      return (container['Metadata'] as List)
+          .map(
+            (json) => PlexPlaylist.fromJson(
+              json as Map<String, dynamic>,
+            ).copyWith(serverId: serverId, serverName: serverName),
+          )
+          .toList();
+    }
+    return [];
+  }
+
+  // ============================================================================
+  // API Methods
+  // ============================================================================
+
+  /// Get server identity
+  Future<Map<String, dynamic>> getServerIdentity() async {
+    final response = await _dio.get('/identity');
+    return response.data;
+  }
+
+  /// Get library sections
+  /// Returns libraries automatically tagged with this client's serverId and serverName
+  Future<List<PlexLibrary>> getLibraries() async {
+    final response = await _dio.get('/library/sections');
+    return _extractLibraryList(response);
+  }
+
+  /// Get library content by section ID
+  Future<List<PlexMetadata>> getLibraryContent(
+    String sectionId, {
+    int? start,
+    int? size,
+    Map<String, String>? filters,
+    CancelToken? cancelToken,
+  }) async {
+    final queryParams = <String, dynamic>{};
+    if (start != null) queryParams['X-Plex-Container-Start'] = start;
+    if (size != null) queryParams['X-Plex-Container-Size'] = size;
+
+    // Add filter parameters
+    if (filters != null) {
+      queryParams.addAll(filters);
+    }
+
+    final response = await _dio.get(
+      '/library/sections/$sectionId/all',
+      queryParameters: queryParams,
+      cancelToken: cancelToken,
+    );
+
+    return _extractMetadataList(response);
+  }
+
+  /// Parse list of PlexMetadata from a cached response
+  List<PlexMetadata> _parseMetadataListFromCachedResponse(
+    Map<String, dynamic> cached,
+  ) {
+    if (cached['MediaContainer'] != null &&
+        cached['MediaContainer']['Metadata'] != null) {
+      return (cached['MediaContainer']['Metadata'] as List)
+          .map(
+            (json) => PlexMetadata.fromJson(
+              json,
+            ).copyWith(serverId: serverId, serverName: serverName),
+          )
+          .toList();
+    }
+    return [];
+  }
+
+  /// Get the server's machine identifier
+  Future<String?> getMachineIdentifier() async {
+    try {
+      final response = await _dio.get('/');
+      final container = _getMediaContainer(response);
+      if (container == null) return null;
+      return container['machineIdentifier'] as String?;
+    } catch (e) {
+      appLogger.e('Failed to get machine identifier', error: e);
+      return null;
+    }
+  }
+
+  /// Build a proper metadata URI for adding to playlists
+  /// Returns URI in format: server://{machineId}/com.plexapp.plugins.library/library/metadata/{ratingKey}
+  Future<String> buildMetadataUri(String ratingKey) async {
+    // Use cached machine identifier from config if available
+    final machineId = config.machineIdentifier ?? await getMachineIdentifier();
+    if (machineId == null) {
+      throw Exception('Could not get server machine identifier');
+    }
+    return 'server://$machineId/com.plexapp.plugins.library/library/metadata/$ratingKey';
+  }
+
+  /// Get metadata by rating key with images (includes clearLogo and OnDeck)
+  /// Uses cache when offline or as fallback on network error
+  /// Note: OnDeck data is not relevant for offline mode
+  /// Always fetches with chapters/markers but caches at base endpoint
+  Future<Map<String, dynamic>> getMetadataWithImagesAndOnDeck(
+    String ratingKey,
+  ) async {
+    // Cache key is always the base endpoint (no query params)
+    final cacheKey = '/library/metadata/$ratingKey';
+
+    // If offline mode, return from cache only (no OnDeck in offline)
+    if (_offlineMode) {
+      final cached = await _cache.get(serverId, cacheKey);
+      if (cached != null) {
+        final metadata = _parseMetadataWithImagesFromCachedResponse(cached);
+        return {'metadata': metadata, 'onDeckEpisode': null};
+      }
+      return {'metadata': null, 'onDeckEpisode': null};
+    }
+
+    // Online: try network first
+    try {
+      // Fetch with chapters/markers/onDeck
+      final response = await _dio.get(
+        '/library/metadata/$ratingKey',
+        queryParameters: {
+          'includeChapters': 1,
+          'includeMarkers': 1,
+          'includeOnDeck': 1,
+        },
+      );
+
+      // Cache at base endpoint (single cache entry per item)
+      if (response.data != null) {
+        await _cache.put(serverId, cacheKey, response.data);
+      }
+
+      PlexMetadata? metadata;
+      PlexMetadata? onDeckEpisode;
+
+      final metadataJson = _getFirstMetadataJson(response);
+
+      if (metadataJson != null) {
+        metadata = PlexMetadata.fromJsonWithImages(
+          metadataJson,
+        ).copyWith(serverId: serverId, serverName: serverName);
+
+        // Check if OnDeck is nested inside Metadata
+        if (metadataJson.containsKey('OnDeck') &&
+            metadataJson['OnDeck'] != null) {
+          final onDeckData = metadataJson['OnDeck'];
+
+          // OnDeck can be either a Map with 'Metadata' key or direct metadata
+          if (onDeckData is Map && onDeckData.containsKey('Metadata')) {
+            final onDeckMetadata = onDeckData['Metadata'];
+            if (onDeckMetadata != null) {
+              onDeckEpisode = PlexMetadata.fromJson(
+                onDeckMetadata,
+              ).copyWith(serverId: serverId, serverName: serverName);
+            }
+          }
+        }
+      }
+
+      return {'metadata': metadata, 'onDeckEpisode': onDeckEpisode};
+    } catch (e) {
+      // Network failed - try cache as fallback (no OnDeck)
+      appLogger.w(
+        'Network request failed for metadata with OnDeck, trying cache',
+        error: e,
+      );
+      final cached = await _cache.get(serverId, cacheKey);
+      if (cached != null) {
+        final metadata = _parseMetadataWithImagesFromCachedResponse(cached);
+        return {'metadata': metadata, 'onDeckEpisode': null};
+      }
+      rethrow;
+    }
+  }
+
+  /// Get metadata by rating key with images (includes clearLogo)
+  /// Uses cache when offline or as fallback on network error
+  /// Always fetches with chapters/markers but caches at base endpoint
+  Future<PlexMetadata?> getMetadataWithImages(String ratingKey) async {
+    // Cache key is always the base endpoint (no query params)
+    final cacheKey = '/library/metadata/$ratingKey';
+
+    // If offline mode, return from cache only
+    if (_offlineMode) {
+      final cached = await _cache.get(serverId, cacheKey);
+      if (cached != null) {
+        return _parseMetadataWithImagesFromCachedResponse(cached);
+      }
+      return null;
+    }
+
+    // Online: try network first
+    try {
+      // Always fetch with chapters/markers - they're included in cached response
+      final response = await _dio.get(
+        '/library/metadata/$ratingKey',
+        queryParameters: {'includeChapters': 1, 'includeMarkers': 1},
+      );
+
+      // Cache at base endpoint (single cache entry per item)
+      if (response.data != null) {
+        await _cache.put(serverId, cacheKey, response.data);
+      }
+
+      final metadataJson = _getFirstMetadataJson(response);
+      return metadataJson != null
+          ? PlexMetadata.fromJsonWithImages(
+              metadataJson,
+            ).copyWith(serverId: serverId, serverName: serverName)
+          : null;
+    } catch (e) {
+      // Network failed - try cache as fallback
+      appLogger.w(
+        'Network request failed for metadata with images, trying cache',
+        error: e,
+      );
+      final cached = await _cache.get(serverId, cacheKey);
+      if (cached != null) {
+        return _parseMetadataWithImagesFromCachedResponse(cached);
+      }
+      rethrow;
+    }
+  }
+
+  /// Parse PlexMetadata with images from a cached response
+  PlexMetadata? _parseMetadataWithImagesFromCachedResponse(
+    Map<String, dynamic> cached,
+  ) {
+    if (cached['MediaContainer'] != null &&
+        cached['MediaContainer']['Metadata'] != null &&
+        (cached['MediaContainer']['Metadata'] as List).isNotEmpty) {
+      return PlexMetadata.fromJsonWithImages(
+        cached['MediaContainer']['Metadata'][0],
+      ).copyWith(serverId: serverId, serverName: serverName);
+    }
+    return null;
+  }
+
+  /// Fetch metadata with cache support for offline mode and network fallback.
+  ///
+  /// Returns the raw response data (Map) or null if not available.
+  /// Used by playback methods to share caching logic.
+  Future<Map<String, dynamic>?> _fetchMetadataWithCache(
+    String ratingKey, {
+    Map<String, dynamic>? queryParams,
+  }) async {
+    final cacheKey = '/library/metadata/$ratingKey';
+
+    // Offline mode: cache only
+    if (_offlineMode) {
+      return await _cache.get(serverId, cacheKey);
+    }
+
+    // Online: try network first
+    try {
+      final response = await _dio.get(
+        '/library/metadata/$ratingKey',
+        queryParameters: queryParams,
+      );
+
+      // Cache at base endpoint
+      if (response.data != null) {
+        await _cache.put(serverId, cacheKey, response.data);
+      }
+
+      return response.data;
+    } catch (e) {
+      // Network failed - try cache as fallback
+      appLogger.w('Network request failed for metadata, trying cache', error: e);
+      return await _cache.get(serverId, cacheKey);
+    }
+  }
+
+  /// Get first metadata JSON from response data
+  Map<String, dynamic>? _getFirstMetadataJsonFromData(Map<String, dynamic>? data) {
+    if (data == null) return null;
+    final container = data['MediaContainer'];
+    if (container != null &&
+        container['Metadata'] != null &&
+        (container['Metadata'] as List).isNotEmpty) {
+      return container['Metadata'][0];
+    }
+    return null;
+  }
+
+  /// Parse audio and subtitle tracks from a stream list
+  ({List<PlexAudioTrack> audio, List<PlexSubtitleTrack> subtitles}) _parseStreams(
+    List<dynamic>? streams,
+  ) {
+    final audioTracks = <PlexAudioTrack>[];
+    final subtitleTracks = <PlexSubtitleTrack>[];
+
+    if (streams == null) return (audio: audioTracks, subtitles: subtitleTracks);
+
+    for (var stream in streams) {
+      final streamType = stream['streamType'] as int?;
+
+      if (streamType == 2) {
+        // Audio track
+        audioTracks.add(
+          PlexAudioTrack(
+            id: stream['id'] as int,
+            index: stream['index'] as int?,
+            codec: stream['codec'] as String?,
+            language: stream['language'] as String?,
+            languageCode: stream['languageCode'] as String?,
+            title: stream['title'] as String?,
+            displayTitle: stream['displayTitle'] as String?,
+            channels: stream['channels'] as int?,
+            selected: stream['selected'] == 1,
+          ),
+        );
+      } else if (streamType == 3) {
+        // Subtitle track
+        subtitleTracks.add(
+          PlexSubtitleTrack(
+            id: stream['id'] as int,
+            index: stream['index'] as int?,
+            codec: stream['codec'] as String?,
+            language: stream['language'] as String?,
+            languageCode: stream['languageCode'] as String?,
+            title: stream['title'] as String?,
+            displayTitle: stream['displayTitle'] as String?,
+            selected: stream['selected'] == 1,
+            forced: stream['forced'] == 1,
+            key: stream['key'] as String?,
+          ),
+        );
+      }
+    }
+
+    return (audio: audioTracks, subtitles: subtitleTracks);
+  }
+
+  /// Parse chapters from metadata JSON
+  List<PlexChapter> _parseChapters(Map<String, dynamic>? metadataJson) {
+    if (metadataJson == null || metadataJson['Chapter'] == null) {
+      return [];
+    }
+
+    final chapterList = metadataJson['Chapter'] as List<dynamic>;
+    return chapterList.map((chapter) {
+      return PlexChapter(
+        id: chapter['id'] as int,
+        index: chapter['index'] as int?,
+        startTimeOffset: chapter['startTimeOffset'] as int?,
+        endTimeOffset: chapter['endTimeOffset'] as int?,
+        title: chapter['tag'] as String? ?? chapter['title'] as String?,
+        thumb: chapter['thumb'] as String?,
+      );
+    }).toList();
+  }
+
+  /// Set per-media language preferences (audio and subtitle)
+  /// For TV shows, use grandparentRatingKey to set preference for the entire series
+  /// For movies, use the movie's ratingKey
+  Future<bool> setMetadataPreferences(
+    String ratingKey, {
+    String? audioLanguage,
+    String? subtitleLanguage,
+  }) async {
+    try {
+      final queryParams = <String, dynamic>{};
+      if (audioLanguage != null) {
+        queryParams['audioLanguage'] = audioLanguage;
+      }
+      if (subtitleLanguage != null) {
+        queryParams['subtitleLanguage'] = subtitleLanguage;
+      }
+
+      // If no preferences to set, return early
+      if (queryParams.isEmpty) {
+        return true;
+      }
+
+      final response = await _dio.put(
+        '/library/metadata/$ratingKey/prefs',
+        queryParameters: queryParams,
+      );
+
+      return response.statusCode == 200;
+    } catch (e) {
+      appLogger.e('Failed to set metadata preferences', error: e);
+      return false;
+    }
+  }
+
+  /// Select specific audio and subtitle streams for playback
+  /// This updates which streams are "selected" in the media metadata
+  /// Uses the part ID from media info for accurate stream selection
+  Future<bool> selectStreams(
+    int partId, {
+    int? audioStreamID,
+    int? subtitleStreamID,
+    bool allParts = true,
+  }) async {
+    try {
+      final queryParams = <String, dynamic>{};
+      if (audioStreamID != null) {
+        queryParams['audioStreamID'] = audioStreamID;
+      }
+      if (subtitleStreamID != null) {
+        queryParams['subtitleStreamID'] = subtitleStreamID;
+      }
+      if (allParts) {
+        // If no streams to select, return early
+        if (queryParams.isEmpty) {
+          return true;
+        }
+
+        // Use PUT request on /library/parts/{partId}
+        final response = await _dio.put(
+          '/library/parts/$partId',
+          queryParameters: queryParams,
+        );
+
+        return response.statusCode == 200;
+      }
+      // Si allParts est false, retourner true ou false explicitement (selon la logique souhaitée)
+      // Ici, on retourne true par défaut si rien n'est fait
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to select streams', error: e);
+      return false;
+    }
+  }
+
+  /// Search across all libraries using the hub search endpoint
+  /// Only returns movies and shows, filtering out seasons and episodes
+  Future<List<PlexMetadata>> search(String query, {int limit = 10}) async {
+    final response = await _dio.get(
+      '/hubs/search',
+      queryParameters: {
+        'query': query,
+        'limit': limit,
+        'includeCollections': 1,
+      },
+    );
+
+    final results = <PlexMetadata>[];
+
+    if (response.data is Map && response.data.containsKey('MediaContainer')) {
+      final container = response.data['MediaContainer'];
+      if (container['Hub'] != null) {
+        // Each hub contains results of a specific type (movies, shows, etc.)
+        for (final hub in container['Hub'] as List) {
+          final hubType = hub['type'] as String?;
+
+          // Only include movie and show hubs
+          if (hubType != 'movie' && hubType != 'show') {
+            continue;
+          }
+
+          // Hubs can contain either Metadata (for movies) or Directory (for shows)
+          if (hub['Metadata'] != null) {
+            for (final json in hub['Metadata'] as List) {
+              try {
+                results.add(
+                  PlexMetadata.fromJson(
+                    json,
+                  ).copyWith(serverId: serverId, serverName: serverName),
+                );
+              } catch (e) {
+                // Skip items that fail to parse
+                appLogger.w('Failed to parse search result', error: e);
+                appLogger.d('Problematic JSON: $json');
+              }
+            }
+          }
+          if (hub['Directory'] != null) {
+            for (final json in hub['Directory'] as List) {
+              try {
+                results.add(
+                  PlexMetadata.fromJson(
+                    json,
+                  ).copyWith(serverId: serverId, serverName: serverName),
+                );
+              } catch (e) {
+                // Skip items that fail to parse
+                appLogger.w('Failed to parse search result', error: e);
+                appLogger.d('Problematic JSON: $json');
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return results;
+  }
+
+  /// Get recently added media (filtered to video content only)
+  Future<List<PlexMetadata>> getRecentlyAdded({int limit = 50}) async {
+    final response = await _dio.get(
+      '/library/recentlyAdded',
+      queryParameters: {'X-Plex-Container-Size': limit, 'includeGuids': 1},
+    );
+    final allItems = _extractMetadataList(response);
+
+    // Filter out music content (artists, albums, tracks)
+    return allItems.where((item) {
+      final type = item.type.toLowerCase();
+      return type != 'artist' && type != 'album' && type != 'track';
+    }).toList();
+  }
+
+  /// Get on deck items (continue watching, filtered to video content only)
+  Future<List<PlexMetadata>> getOnDeck() async {
+    final response = await _dio.get('/library/onDeck');
+    final container = _getMediaContainer(response);
+    if (container != null && container['Metadata'] != null) {
+      final allItems = (container['Metadata'] as List)
+          .map(
+            (json) => PlexMetadata.fromJsonWithImages(
+              json,
+            ).copyWith(serverId: serverId, serverName: serverName),
+          )
+          .toList();
+
+      // Filter out music content (artists, albums, tracks)
+      return allItems.where((item) {
+        final type = item.type.toLowerCase();
+        return type != 'artist' && type != 'album' && type != 'track';
+      }).toList();
+    }
+    return [];
+  }
+
+  /// Get on deck items filtered by a specific library section
+  Future<List<PlexMetadata>> getOnDeckForLibrary(String sectionId) async {
+    final allOnDeck = await getOnDeck();
+
+    // Filter items to only include those from the specified library section
+    return allOnDeck.where((item) {
+      return item.librarySectionID == int.tryParse(sectionId);
+    }).toList();
+  }
+
+  /// Get children of a metadata item (e.g., seasons for a show, episodes for a season)
+  /// Uses cache when offline or as fallback on network error
+  Future<List<PlexMetadata>> getChildren(String ratingKey) async {
+    final endpoint = '/library/metadata/$ratingKey/children';
+
+    // If offline mode, return from cache only
+    if (_offlineMode) {
+      final cached = await _cache.get(serverId, endpoint);
+      if (cached != null) {
+        return _parseMetadataListFromCachedResponse(cached);
+      }
+      return [];
+    }
+
+    // Online: try network first
+    try {
+      final response = await _dio.get(endpoint);
+
+      // Cache the successful response
+      if (response.data != null) {
+        await _cache.put(serverId, endpoint, response.data);
+      }
+
+      return _extractMetadataList(response);
+    } catch (e) {
+      // Network failed - try cache as fallback
+      appLogger.w(
+        'Network request failed for children, trying cache',
+        error: e,
+      );
+      final cached = await _cache.get(serverId, endpoint);
+      if (cached != null) {
+        return _parseMetadataListFromCachedResponse(cached);
+      }
+      rethrow;
+    }
+  }
+
+  /// Get all unwatched episodes for a TV show across all seasons
+  Future<List<PlexMetadata>> getAllUnwatchedEpisodes(
+    String showRatingKey,
+  ) async {
+    final allEpisodes = <PlexMetadata>[];
+
+    // Get all seasons for the show
+    final seasons = await getChildren(showRatingKey);
+
+    // Get episodes from each season
+    for (final season in seasons) {
+      if (season.type == 'season') {
+        final episodes = await getChildren(season.ratingKey);
+
+        // Filter for unwatched episodes
+        final unwatchedEpisodes = episodes
+            .where((ep) => ep.type == 'episode' && (ep.viewCount ?? 0) == 0)
+            .toList();
+
+        allEpisodes.addAll(unwatchedEpisodes);
+      }
+    }
+
+    return allEpisodes;
+  }
+
+  /// Get all unwatched episodes in a specific season
+  Future<List<PlexMetadata>> getUnwatchedEpisodesInSeason(
+    String seasonRatingKey,
+  ) async {
+    final episodes = await getChildren(seasonRatingKey);
+
+    // Filter for unwatched episodes
+    return episodes
+        .where((ep) => ep.type == 'episode' && (ep.viewCount ?? 0) == 0)
+        .toList();
+  }
+
+  /// Get thumbnail URL
+  String getThumbnailUrl(String? thumbPath) {
+    if (thumbPath == null || thumbPath.isEmpty) return '';
+
+    // Remove leading slash if present
+    final path = thumbPath.startsWith('/') ? thumbPath.substring(1) : thumbPath;
+
+    // Check if path already has query parameters
+    final separator = path.contains('?') ? '&' : '?';
+
+    return '${config.baseUrl}/$path${separator}X-Plex-Token=${config.token}';
+  }
+
+  /// Get video URL for direct playback
+  /// [mediaIndex] specifies which Media item to use (defaults to 0 - first version)
+  /// Uses cache for offline mode support and network fallback.
+  Future<String?> getVideoUrl(String ratingKey, {int mediaIndex = 0}) async {
+    final data = await _fetchMetadataWithCache(ratingKey);
+    final metadataJson = _getFirstMetadataJsonFromData(data);
+
+    if (metadataJson != null &&
+        metadataJson['Media'] != null &&
+        (metadataJson['Media'] as List).isNotEmpty) {
+      final mediaList = metadataJson['Media'] as List;
+
+      // Ensure the requested index is valid
+      if (mediaIndex < 0 || mediaIndex >= mediaList.length) {
+        mediaIndex = 0;
+      }
+
+      final media = mediaList[mediaIndex];
+      if (media['Part'] != null && (media['Part'] as List).isNotEmpty) {
+        final part = media['Part'][0];
+        final partKey = part['key'] as String?;
+
+        if (partKey != null) {
+          // Return direct play URL
+          return '${config.baseUrl}$partKey?X-Plex-Token=${config.token}';
+        }
+      }
+    }
+
+    return null;
+  }
+
+  /// Get chapters for a media item
+  Future<List<PlexChapter>> getChapters(String ratingKey) async {
+    final response = await _dio.get(
+      '/library/metadata/$ratingKey',
+      queryParameters: {'includeChapters': 1},
+    );
+
+    final metadataJson = _getFirstMetadataJson(response);
+    if (metadataJson != null && metadataJson['Chapter'] != null) {
+      final chapterList = metadataJson['Chapter'] as List<dynamic>;
+      return chapterList.map((chapter) {
+        return PlexChapter(
+          id: chapter['id'] as int,
+          index: chapter['index'] as int?,
+          startTimeOffset: chapter['startTimeOffset'] as int?,
+          endTimeOffset: chapter['endTimeOffset'] as int?,
+          title: chapter['tag'] as String?,
+          thumb: chapter['thumb'] as String?,
+        );
+      }).toList();
+    }
+
+    return [];
+  }
+
+  Future<List<PlexMarker>> getMarkers(String ratingKey) async {
+    final response = await _dio.get(
+      '/library/metadata/$ratingKey',
+      queryParameters: {'includeMarkers': 1},
+    );
+
+    final metadataJson = _getFirstMetadataJson(response);
+
+    if (metadataJson != null && metadataJson['Marker'] != null) {
+      final markerList = metadataJson['Marker'] as List;
+      return markerList.map((marker) {
+        return PlexMarker(
+          id: marker['id'] as int,
+          type: marker['type'] as String,
+          startTimeOffset: marker['startTimeOffset'] as int,
+          endTimeOffset: marker['endTimeOffset'] as int,
+        );
+      }).toList();
+    }
+
+    return [];
+  }
+
+  /// Get chapters and markers from cached metadata or fetch if needed
+  /// Uses same cache key as other metadata methods for consistency
+  Future<PlaybackExtras> getPlaybackExtras(String ratingKey) async {
+    // Use same cache key as other metadata methods
+    final cacheKey = '/library/metadata/$ratingKey';
+
+    // If offline mode, return from cache only
+    if (_offlineMode) {
+      final cached = await _cache.get(serverId, cacheKey);
+      if (cached != null) {
+        return _parsePlaybackExtrasFromCachedResponse(cached);
+      }
+      return PlaybackExtras(chapters: [], markers: []);
+    }
+
+    // Online: check cache first (already has chapters/markers from other fetches)
+    appLogger.d('getPlaybackExtras: serverId=$serverId, cacheKey=$cacheKey');
+    final cached = await _cache.get(serverId, cacheKey);
+    if (cached != null) {
+      final chapters =
+          cached['MediaContainer']?['Metadata']?[0]?['Chapter'] as List?;
+      appLogger.d(
+        'getPlaybackExtras: cache hit, ${chapters?.length ?? 0} chapters',
+      );
+      return _parsePlaybackExtrasFromCachedResponse(cached);
+    }
+    appLogger.d('getPlaybackExtras: cache miss');
+
+    // Not in cache - fetch and cache
+    try {
+      final response = await _dio.get(
+        '/library/metadata/$ratingKey',
+        queryParameters: {'includeChapters': 1, 'includeMarkers': 1},
+      );
+
+      // Cache at base endpoint
+      if (response.data != null) {
+        await _cache.put(serverId, cacheKey, response.data);
+      }
+
+      return _parsePlaybackExtrasFromResponse(response);
+    } catch (e) {
+      // Network failed
+      appLogger.w('Network request failed for playback extras', error: e);
+      return PlaybackExtras(chapters: [], markers: []);
+    }
+  }
+
+  /// Parse PlaybackExtras from API response
+  PlaybackExtras _parsePlaybackExtrasFromResponse(Response response) {
+    final metadataJson = _getFirstMetadataJson(response);
+    return _parsePlaybackExtrasFromMetadataJson(metadataJson);
+  }
+
+  /// Parse PlaybackExtras from cached response
+  PlaybackExtras _parsePlaybackExtrasFromCachedResponse(
+    Map<String, dynamic> cached,
+  ) {
+    Map<String, dynamic>? metadataJson;
+    if (cached['MediaContainer'] != null &&
+        cached['MediaContainer']['Metadata'] != null &&
+        (cached['MediaContainer']['Metadata'] as List).isNotEmpty) {
+      metadataJson =
+          cached['MediaContainer']['Metadata'][0] as Map<String, dynamic>;
+    }
+    return _parsePlaybackExtrasFromMetadataJson(metadataJson);
+  }
+
+  /// Parse PlaybackExtras from metadata JSON
+  PlaybackExtras _parsePlaybackExtrasFromMetadataJson(
+    Map<String, dynamic>? metadataJson,
+  ) {
+    final chapters = <PlexChapter>[];
+    final markers = <PlexMarker>[];
+
+    if (metadataJson != null) {
+      // Parse chapters
+      if (metadataJson['Chapter'] != null) {
+        final chapterList = metadataJson['Chapter'] as List<dynamic>;
+        for (var chapter in chapterList) {
+          chapters.add(
+            PlexChapter(
+              id: chapter['id'] as int,
+              index: chapter['index'] as int?,
+              startTimeOffset: chapter['startTimeOffset'] as int?,
+              endTimeOffset: chapter['endTimeOffset'] as int?,
+              title: chapter['tag'] as String?,
+              thumb: chapter['thumb'] as String?,
+            ),
+          );
+        }
+      }
+
+      // Parse markers
+      if (metadataJson['Marker'] != null) {
+        final markerList = metadataJson['Marker'] as List;
+        for (var marker in markerList) {
+          markers.add(
+            PlexMarker(
+              id: marker['id'] as int,
+              type: marker['type'] as String,
+              startTimeOffset: marker['startTimeOffset'] as int,
+              endTimeOffset: marker['endTimeOffset'] as int,
+            ),
+          );
+        }
+      }
+    }
+
+    return PlaybackExtras(chapters: chapters, markers: markers);
+  }
+
+  /// Get detailed media info including chapters and tracks
+  /// [mediaIndex] specifies which Media item to use (defaults to 0 - first version)
+  /// Uses cache for offline mode support and network fallback.
+  Future<PlexMediaInfo?> getMediaInfo(
+    String ratingKey, {
+    int mediaIndex = 0,
+  }) async {
+    final data = await _fetchMetadataWithCache(ratingKey);
+    final metadataJson = _getFirstMetadataJsonFromData(data);
+
+    if (metadataJson != null &&
+        metadataJson['Media'] != null &&
+        (metadataJson['Media'] as List).isNotEmpty) {
+      final mediaList = metadataJson['Media'] as List;
+
+      // Ensure the requested index is valid
+      if (mediaIndex < 0 || mediaIndex >= mediaList.length) {
+        mediaIndex = 0;
+      }
+
+      final media = mediaList[mediaIndex];
+      if (media['Part'] != null && (media['Part'] as List).isNotEmpty) {
+        final part = media['Part'][0];
+        final partKey = part['key'] as String?;
+
+        if (partKey != null) {
+          // Parse streams using helper
+          final streams = _parseStreams(part['Stream'] as List<dynamic>?);
+          // Parse chapters using helper
+          final chapters = _parseChapters(metadataJson);
+
+          return PlexMediaInfo(
+            videoUrl: '${config.baseUrl}$partKey?X-Plex-Token=${config.token}',
+            audioTracks: streams.audio,
+            subtitleTracks: streams.subtitles,
+            chapters: chapters,
+          );
+        }
+      }
+    }
+
+    return null;
+  }
+
+  /// Get all available media versions for a media item
+  /// Returns a list of PlexMediaVersion objects representing different quality/format options
+  /// Uses cache for offline mode support and network fallback.
+  Future<List<PlexMediaVersion>> getMediaVersions(String ratingKey) async {
+    final data = await _fetchMetadataWithCache(ratingKey);
+    final metadataJson = _getFirstMetadataJsonFromData(data);
+
+    if (metadataJson != null &&
+        metadataJson['Media'] != null &&
+        (metadataJson['Media'] as List).isNotEmpty) {
+      final mediaList = metadataJson['Media'] as List;
+      return mediaList
+          .map(
+            (media) => PlexMediaVersion.fromJson(media as Map<String, dynamic>),
+          )
+          .toList();
+    }
+
+    return [];
+  }
+
+  /// Get consolidated video playback data (URL, media info, and versions) in a single API call
+  /// This method combines the functionality of getVideoUrl(), getMediaInfo(), and getMediaVersions()
+  /// to reduce redundant API calls during video playback initialization.
+  /// Uses cache for offline mode support and network fallback.
+  Future<PlexVideoPlaybackData> getVideoPlaybackData(
+    String ratingKey, {
+    int mediaIndex = 0,
+  }) async {
+    final data = await _fetchMetadataWithCache(ratingKey);
+    final metadataJson = _getFirstMetadataJsonFromData(data);
+
+    String? videoUrl;
+    PlexMediaInfo? mediaInfo;
+    List<PlexMediaVersion> availableVersions = [];
+
+    if (metadataJson != null &&
+        metadataJson['Media'] != null &&
+        (metadataJson['Media'] as List).isNotEmpty) {
+      final mediaList = metadataJson['Media'] as List;
+
+      // Parse available media versions first
+      availableVersions = mediaList
+          .map(
+            (media) => PlexMediaVersion.fromJson(media as Map<String, dynamic>),
+          )
+          .toList();
+
+      // Ensure the requested index is valid
+      if (mediaIndex < 0 || mediaIndex >= mediaList.length) {
+        mediaIndex = 0;
+      }
+
+      final media = mediaList[mediaIndex];
+      if (media['Part'] != null && (media['Part'] as List).isNotEmpty) {
+        final part = media['Part'][0];
+        final partKey = part['key'] as String?;
+
+        if (partKey != null) {
+          // Get video URL
+          videoUrl = '${config.baseUrl}$partKey?X-Plex-Token=${config.token}';
+
+          // Parse streams using helper
+          final streams = _parseStreams(part['Stream'] as List<dynamic>?);
+          // Parse chapters using helper
+          final chapters = _parseChapters(metadataJson);
+
+          // Create media info
+          mediaInfo = PlexMediaInfo(
+            videoUrl: videoUrl,
+            audioTracks: streams.audio,
+            subtitleTracks: streams.subtitles,
+            chapters: chapters,
+            partId: part['id'] as int?,
+          );
+        }
+      }
+    }
+
+    return PlexVideoPlaybackData(
+      videoUrl: videoUrl,
+      mediaInfo: mediaInfo,
+      availableVersions: availableVersions,
+    );
+  }
+
+  /// Get file information for a media item
+  /// Uses cache for offline mode support and network fallback.
+  Future<PlexFileInfo?> getFileInfo(String ratingKey) async {
+    try {
+      final data = await _fetchMetadataWithCache(ratingKey);
+      final metadataJson = _getFirstMetadataJsonFromData(data);
+
+      if (metadataJson != null &&
+          metadataJson['Media'] != null &&
+          (metadataJson['Media'] as List).isNotEmpty) {
+        final media = metadataJson['Media'][0];
+        final part = media['Part'] != null && (media['Part'] as List).isNotEmpty
+            ? media['Part'][0]
+            : null;
+
+        // Extract video stream details
+        final streams = part?['Stream'] as List<dynamic>? ?? [];
+        Map<String, dynamic>? videoStream;
+        Map<String, dynamic>? audioStream;
+
+        for (var stream in streams) {
+          final streamType = stream['streamType'] as int?;
+          if (streamType == 1 && videoStream == null) {
+            videoStream = stream;
+          } else if (streamType == 2 && audioStream == null) {
+            audioStream = stream;
+          }
+        }
+
+        return PlexFileInfo(
+          // Media level properties
+          container: media['container'] as String?,
+          videoCodec: media['videoCodec'] as String?,
+          videoResolution: media['videoResolution'] as String?,
+          videoFrameRate: media['videoFrameRate'] as String?,
+          videoProfile: media['videoProfile'] as String?,
+          width: media['width'] as int?,
+          height: media['height'] as int?,
+          aspectRatio: (media['aspectRatio'] as num?)?.toDouble(),
+          bitrate: media['bitrate'] as int?,
+          duration: media['duration'] as int?,
+          audioCodec: media['audioCodec'] as String?,
+          audioProfile: media['audioProfile'] as String?,
+          audioChannels: media['audioChannels'] as int?,
+          optimizedForStreaming: media['optimizedForStreaming'] as bool?,
+          has64bitOffsets: media['has64bitOffsets'] as bool?,
+          // Part level properties (file)
+          filePath: part?['file'] as String?,
+          fileSize: part?['size'] as int?,
+          // Video stream details
+          colorSpace: videoStream?['colorSpace'] as String?,
+          colorRange: videoStream?['colorRange'] as String?,
+          colorPrimaries: videoStream?['colorPrimaries'] as String?,
+          colorTrc: videoStream?['colorTrc'] as String?,
+          chromaSubsampling: videoStream?['chromaSubsampling'] as String?,
+          frameRate: (videoStream?['frameRate'] as num?)?.toDouble(),
+          bitDepth: videoStream?['bitDepth'] as int?,
+          // Audio stream details
+          audioChannelLayout: audioStream?['audioChannelLayout'] as String?,
+        );
+      }
+
+      return null;
+    } catch (e) {
+      appLogger.e('Failed to get file info: $e');
+      return null;
+    }
+  }
+
+  /// Mark media as watched
+  Future<void> markAsWatched(String ratingKey) async {
+    await _dio.get(
+      '/:/scrobble',
+      queryParameters: {
+        'key': ratingKey,
+        'identifier': 'com.plexapp.plugins.library',
+      },
+    );
+  }
+
+  /// Mark media as unwatched
+  Future<void> markAsUnwatched(String ratingKey) async {
+    await _dio.get(
+      '/:/unscrobble',
+      queryParameters: {
+        'key': ratingKey,
+        'identifier': 'com.plexapp.plugins.library',
+      },
+    );
+  }
+
+  /// Update playback progress
+  Future<void> updateProgress(
+    String ratingKey, {
+    required int time,
+    required String state, // 'playing', 'paused', 'stopped', 'buffering'
+    int? duration,
+  }) async {
+    await _dio.post(
+      '/:/timeline',
+      queryParameters: {
+        'ratingKey': ratingKey,
+        'key': '/library/metadata/$ratingKey',
+        'time': time,
+        'state': state,
+        if (duration != null) 'duration': duration,
+      },
+    );
+  }
+
+  /// Remove item from Continue Watching (On Deck) without affecting watch status or progress
+  /// This uses the same endpoint Plex Web uses to hide items from Continue Watching
+  Future<void> removeFromOnDeck(String ratingKey) async {
+    await _dio.put(
+      '/actions/removeFromContinueWatching',
+      queryParameters: {'ratingKey': ratingKey},
+    );
+  }
+
+  /// Get server preferences
+  Future<Map<String, dynamic>> getServerPreferences() async {
+    final response = await _dio.get('/:/prefs');
+    return response.data;
+  }
+
+  /// Get sessions (currently playing)
+  Future<List<dynamic>> getSessions() async {
+    final response = await _dio.get('/status/sessions');
+    final container = _getMediaContainer(response);
+    if (container != null && container['Metadata'] != null) {
+      return container['Metadata'] as List;
+    }
+    return [];
+  }
+
+  /// Get available filters for a library section
+  Future<List<PlexFilter>> getLibraryFilters(String sectionId) async {
+    final response = await _dio.get('/library/sections/$sectionId/filters');
+    return _extractDirectoryList(response, PlexFilter.fromJson);
+  }
+
+  /// Get filter values (e.g., list of genres, years, etc.)
+  Future<List<PlexFilterValue>> getFilterValues(String filterKey) async {
+    final response = await _dio.get(filterKey);
+    return _extractDirectoryList(response, PlexFilterValue.fromJson);
+  }
+
+  /// Get available sort options for a library section
+  ///
+  /// If [libraryType] is provided (e.g., 'movie', 'show'), it's used for fallback
+  /// sorts without needing to re-fetch the library sections list.
+  Future<List<PlexSort>> getLibrarySorts(
+    String sectionId, {
+    String? libraryType,
+  }) async {
+    try {
+      // Use the dedicated sorts endpoint
+      final response = await _dio.get('/library/sections/$sectionId/sorts');
+
+      // Parse the Directory array (not Sort array) per the API spec
+      final sorts = _extractDirectoryList(response, PlexSort.fromJson);
+
+      if (sorts.isNotEmpty) {
+        return sorts;
+      }
+
+      // Fallback: return common sort options if API doesn't provide them
+      return _getFallbackSorts(libraryType);
+    } catch (e) {
+      appLogger.e('Failed to get library sorts: $e');
+      // Return fallback sort options on error
+      return _getFallbackSorts(libraryType);
+    }
+  }
+
+  /// Build fallback sort options based on library type.
+  ///
+  /// If [libraryType] is null, returns generic sorts without the show-specific options.
+  List<PlexSort> _getFallbackSorts(String? libraryType) {
+    final fallbackSorts = <PlexSort>[
+      PlexSort(key: 'titleSort', title: 'Title', defaultDirection: 'asc'),
+      PlexSort(
+        key: 'addedAt',
+        descKey: 'addedAt:desc',
+        title: 'Date Added',
+        defaultDirection: 'desc',
+      ),
+    ];
+
+    // Add "Latest Episode Air Date" only for TV show libraries
+    if (libraryType?.toLowerCase() == 'show') {
+      fallbackSorts.add(
+        PlexSort(
+          key: 'episode.originallyAvailableAt',
+          descKey: 'episode.originallyAvailableAt:desc',
+          title: 'Latest Episode Air Date',
+          defaultDirection: 'desc',
+        ),
+      );
+    }
+
+    fallbackSorts.addAll([
+      PlexSort(
+        key: 'originallyAvailableAt',
+        descKey: 'originallyAvailableAt:desc',
+        title: 'Release Date',
+        defaultDirection: 'desc',
+      ),
+      PlexSort(
+        key: 'rating',
+        descKey: 'rating:desc',
+        title: 'Rating',
+        defaultDirection: 'desc',
+      ),
+    ]);
+
+    return fallbackSorts;
+  }
+
+  /// Get library hubs (recommendations for a specific library section)
+  /// Returns a list of recommendation hubs like "Trending Movies", "Top in Genre", etc.
+  Future<List<PlexHub>> getLibraryHubs(
+    String sectionId, {
+    int limit = 10,
+  }) async {
+    try {
+      final response = await _dio.get(
+        '/hubs/sections/$sectionId',
+        queryParameters: {'count': limit, 'includeGuids': 1},
+      );
+
+      final container = _getMediaContainer(response);
+      if (container != null && container['Hub'] != null) {
+        final hubs = <PlexHub>[];
+        for (final hubJson in container['Hub'] as List) {
+          try {
+            final hub = PlexHub.fromJson(hubJson);
+            // Only include hubs that have items and are movie/show content
+            if (hub.items.isNotEmpty) {
+              // Filter out non-video content types and tag with server info
+              final videoItems = hub.items
+                  .where((item) {
+                    final type = item.type.toLowerCase();
+                    return type == 'movie' || type == 'show';
+                  })
+                  .map(
+                    (item) => item.copyWith(
+                      serverId: serverId,
+                      serverName: serverName,
+                    ),
+                  )
+                  .toList();
+
+              if (videoItems.isNotEmpty) {
+                hubs.add(
+                  PlexHub(
+                    hubKey: hub.hubKey,
+                    title: hub.title,
+                    type: hub.type,
+                    hubIdentifier: hub.hubIdentifier,
+                    size: hub.size,
+                    more: hub.more,
+                    items: videoItems,
+                    serverId: serverId,
+                    serverName: serverName,
+                  ),
+                );
+              }
+            }
+          } catch (e) {
+            appLogger.w('Failed to parse hub', error: e);
+          }
+        }
+        return hubs;
+      }
+    } catch (e) {
+      appLogger.e('Failed to get library hubs: $e');
+    }
+    return [];
+  }
+
+  /// Get full content from a hub using its hub key
+  /// Returns the complete list of metadata items in the hub
+  Future<List<PlexMetadata>> getHubContent(String hubKey) async {
+    try {
+      final response = await _dio.get(hubKey);
+      final allItems = _extractMetadataList(response);
+
+      // Filter out non-video content types
+      return allItems.where((item) {
+        final type = item.type.toLowerCase();
+        return type == 'movie' || type == 'show';
+      }).toList();
+    } catch (e) {
+      appLogger.e('Failed to get hub content: $e');
+      return [];
+    }
+  }
+
+  /// Get playlist content by playlist ID
+  /// Returns the list of metadata items in the playlist
+  Future<List<PlexMetadata>> getPlaylist(String playlistId) async {
+    try {
+      final response = await _dio.get('/playlists/$playlistId/items');
+      return _extractMetadataList(response);
+    } catch (e) {
+      appLogger.e('Failed to get playlist: $e');
+      return [];
+    }
+  }
+
+  /// Get all playlists
+  /// Filters by playlistType=video by default
+  /// Set smart to true/false to filter smart playlists, or null for all
+  Future<List<PlexPlaylist>> getPlaylists({
+    String playlistType = 'video',
+    bool? smart,
+  }) async {
+    try {
+      final queryParams = <String, dynamic>{'playlistType': playlistType};
+      if (smart != null) {
+        queryParams['smart'] = smart ? '1' : '0';
+      }
+
+      final response = await _dio.get(
+        '/playlists',
+        queryParameters: queryParams,
+      );
+
+      return _extractPlaylistList(response);
+    } catch (e) {
+      appLogger.e('Failed to get playlists: $e');
+      return [];
+    }
+  }
+
+  /// Get playlist metadata by playlist ID
+  /// Returns the playlist details (not the items)
+  Future<PlexPlaylist?> getPlaylistMetadata(String playlistId) async {
+    try {
+      final response = await _dio.get('/playlists/$playlistId');
+      final container = _getMediaContainer(response);
+
+      if (container == null || container['Metadata'] == null) {
+        return null;
+      }
+
+      final List<dynamic> metadata = container['Metadata'] as List;
+
+      if (metadata.isEmpty) {
+        return null;
+      }
+
+      return PlexPlaylist.fromJson(metadata.first as Map<String, dynamic>);
+    } catch (e) {
+      appLogger.e('Failed to get playlist metadata: $e');
+      return null;
+    }
+  }
+
+  /// Create a new playlist
+  /// [title] - Name of the playlist
+  /// [uri] - Optional comma-separated list of item URIs to add (e.g., "server://uuid/com.plexapp.plugins.library/library/metadata/1234")
+  /// [playQueueId] - Optional play queue ID to create playlist from
+  Future<PlexPlaylist?> createPlaylist({
+    required String title,
+    String? uri,
+    int? playQueueId,
+  }) async {
+    try {
+      final queryParams = <String, dynamic>{
+        'type': 'video',
+        'title': title,
+        'smart': '0',
+      };
+
+      if (uri != null) {
+        queryParams['uri'] = uri;
+      }
+      if (playQueueId != null) {
+        queryParams['playQueueID'] = playQueueId.toString();
+      }
+
+      final response = await _dio.post(
+        '/playlists',
+        queryParameters: queryParams,
+      );
+      final container = _getMediaContainer(response);
+
+      if (container == null || container['Metadata'] == null) {
+        return null;
+      }
+
+      final List<dynamic> metadata = container['Metadata'] as List;
+
+      if (metadata.isEmpty) {
+        return null;
+      }
+
+      return PlexPlaylist.fromJson(metadata.first as Map<String, dynamic>);
+    } catch (e) {
+      appLogger.e('Failed to create playlist: $e');
+      return null;
+    }
+  }
+
+  /// Delete a playlist
+  Future<bool> deletePlaylist(String playlistId) async {
+    try {
+      await _dio.delete('/playlists/$playlistId');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to delete playlist: $e');
+      return false;
+    }
+  }
+
+  /// Add items to a playlist
+  /// [playlistId] - The playlist to add items to
+  /// [uri] - Comma-separated list of item URIs to add
+  Future<bool> addToPlaylist({
+    required String playlistId,
+    required String uri,
+  }) async {
+    try {
+      appLogger.d(
+        'Adding to playlist $playlistId with URI: ${uri.substring(0, uri.length > 100 ? 100 : uri.length)}${uri.length > 100 ? "..." : ""}',
+      );
+      final response = await _dio.put(
+        '/playlists/$playlistId/items',
+        queryParameters: {'uri': uri},
+      );
+      appLogger.d('Add to playlist response status: ${response.statusCode}');
+      return response.statusCode == 200;
+    } catch (e) {
+      appLogger.e('Failed to add to playlist', error: e);
+      return false;
+    }
+  }
+
+  /// Remove an item from a playlist
+  /// [playlistId] - The playlist to remove from
+  /// [playlistItemId] - The playlist item ID to remove (from the item's playlistItemID field)
+  Future<bool> removeFromPlaylist({
+    required String playlistId,
+    required String playlistItemId,
+  }) async {
+    try {
+      await _dio.delete('/playlists/$playlistId/items/$playlistItemId');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to remove from playlist: $e');
+      return false;
+    }
+  }
+
+  /// Move a playlist item to a new position
+  /// Only works with non-smart playlists
+  /// [playlistId] - The playlist rating key
+  /// [playlistItemId] - The playlist item ID to move
+  /// [afterPlaylistItemId] - Move the item after this playlist item ID (0 = move to top)
+  Future<bool> movePlaylistItem({
+    required String playlistId,
+    required int playlistItemId,
+    required int afterPlaylistItemId,
+  }) async {
+    try {
+      appLogger.d(
+        'Moving playlist item $playlistItemId after $afterPlaylistItemId in playlist $playlistId',
+      );
+      await _dio.put(
+        '/playlists/$playlistId/items/$playlistItemId/move',
+        queryParameters: {'after': afterPlaylistItemId},
+      );
+      appLogger.d('Successfully moved playlist item');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to move playlist item', error: e);
+      return false;
+    }
+  }
+
+  /// Clear all items from a playlist
+  Future<bool> clearPlaylist(String playlistId) async {
+    try {
+      await _dio.delete('/playlists/$playlistId/items');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to clear playlist: $e');
+      return false;
+    }
+  }
+
+  /// Update playlist metadata (e.g., title, summary)
+  /// Uses the same metadata editing mechanism as other items
+  Future<bool> updatePlaylist({
+    required String playlistId,
+    String? title,
+    String? summary,
+  }) async {
+    try {
+      final queryParams = <String, dynamic>{
+        'type': 'playlist',
+        'id': playlistId,
+      };
+
+      if (title != null) {
+        queryParams['title.value'] = title;
+        queryParams['title.locked'] = '1';
+      }
+      if (summary != null) {
+        queryParams['summary.value'] = summary;
+        queryParams['summary.locked'] = '1';
+      }
+
+      await _dio.put(
+        '/library/metadata/$playlistId',
+        queryParameters: queryParams,
+      );
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to update playlist: $e');
+      return false;
+    }
+  }
+
+  // ============================================================================
+  // Collection Methods
+  // ============================================================================
+
+  /// Get all collections for a library section
+  /// Returns collections as PlexMetadata objects with type="collection"
+  Future<List<PlexMetadata>> getLibraryCollections(String sectionId) async {
+    try {
+      final response = await _dio.get(
+        '/library/sections/$sectionId/collections',
+        queryParameters: {'includeGuids': 1},
+      );
+      final allItems = _extractMetadataList(response);
+
+      // Collections should have type="collection"
+      return allItems.where((item) {
+        return item.type.toLowerCase() == 'collection';
+      }).toList();
+    } catch (e) {
+      appLogger.e('Failed to get library collections: $e');
+      return [];
+    }
+  }
+
+  /// Get items in a collection
+  /// Returns the list of metadata items in the collection
+  Future<List<PlexMetadata>> getCollectionItems(String collectionId) async {
+    try {
+      final response = await _dio.get(
+        '/library/collections/$collectionId/children',
+      );
+      return _extractMetadataList(response);
+    } catch (e) {
+      appLogger.e('Failed to get collection items: $e');
+      return [];
+    }
+  }
+
+  /// Delete a collection
+  /// Deletes a library collection from the server
+  Future<bool> deleteCollection(String sectionId, String collectionId) async {
+    try {
+      appLogger.d(
+        'Deleting collection: sectionId=$sectionId, collectionId=$collectionId',
+      );
+      final response = await _dio.delete('/library/collections/$collectionId');
+      appLogger.d('Delete collection response: ${response.statusCode}');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to delete collection', error: e);
+      return false;
+    }
+  }
+
+  /// Create a new collection
+  /// Creates a new collection and optionally adds items to it
+  /// Returns the created collection ID or null if failed
+  Future<String?> createCollection({
+    required String sectionId,
+    required String title,
+    required String uri,
+    int? type,
+  }) async {
+    try {
+      appLogger.d(
+        'Creating collection: sectionId=$sectionId, title=$title, type=$type',
+      );
+      final response = await _dio.post(
+        '/library/collections',
+        queryParameters: {
+          if (type != null) 'type': type,
+          'title': title,
+          'smart': 0,
+          'sectionId': sectionId,
+          'uri': uri,
+        },
+      );
+      appLogger.d('Create collection response: ${response.statusCode}');
+
+      // Extract the collection ID from the response
+      // The response should contain the created collection metadata
+      if (response.data != null && response.data['MediaContainer'] != null) {
+        final metadata = response.data['MediaContainer']['Metadata'];
+        if (metadata != null && metadata.isNotEmpty) {
+          final collectionId = metadata[0]['ratingKey']?.toString();
+          appLogger.d('Created collection with ID: $collectionId');
+          return collectionId;
+        }
+      }
+
+      return null;
+    } catch (e) {
+      appLogger.e('Failed to create collection', error: e);
+      return null;
+    }
+  }
+
+  /// Add items to an existing collection
+  /// Adds one or more items (specified by URI) to an existing collection
+  Future<bool> addToCollection({
+    required String collectionId,
+    required String uri,
+  }) async {
+    try {
+      appLogger.d('Adding items to collection: collectionId=$collectionId');
+      final response = await _dio.put(
+        '/library/collections/$collectionId/items',
+        queryParameters: {'uri': uri},
+      );
+      appLogger.d('Add to collection response: ${response.statusCode}');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to add items to collection', error: e);
+      return false;
+    }
+  }
+
+  /// Remove an item from a collection
+  /// Removes a single item from an existing collection
+  Future<bool> removeFromCollection({
+    required String collectionId,
+    required String itemId,
+  }) async {
+    try {
+      appLogger.d(
+        'Removing item from collection: collectionId=$collectionId, itemId=$itemId',
+      );
+      final response = await _dio.delete(
+        '/library/collections/$collectionId/items/$itemId',
+      );
+      appLogger.d('Remove from collection response: ${response.statusCode}');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to remove item from collection', error: e);
+      return false;
+    }
+  }
+
+  // ============================================================================
+  // Play Queue Methods
+  // ============================================================================
+
+  /// Create a new play queue
+  /// Either uri or playlistID must be specified
+  Future<PlayQueueResponse?> createPlayQueue({
+    String? uri,
+    int? playlistID,
+    required String type,
+    String? key,
+    int shuffle = 0,
+    int repeat = 0,
+    int continuous = 0,
+  }) async {
+    try {
+      final queryParams = <String, dynamic>{
+        'type': type,
+        'shuffle': shuffle,
+        'repeat': repeat,
+        'continuous': continuous,
+      };
+
+      if (uri != null) {
+        queryParams['uri'] = uri;
+      }
+      if (playlistID != null) {
+        queryParams['playlistID'] = playlistID;
+      }
+      if (key != null) {
+        queryParams['key'] = key;
+      }
+
+      final response = await _dio.post(
+        '/playQueues',
+        queryParameters: queryParams,
+      );
+
+      return PlayQueueResponse.fromJson(
+        response.data,
+        serverId: serverId,
+        serverName: serverName,
+      );
+    } catch (e) {
+      appLogger.e('Failed to create play queue', error: e);
+      return null;
+    }
+  }
+
+  /// Get a play queue with optional windowing
+  /// Can request a window of items around a specific item
+  Future<PlayQueueResponse?> getPlayQueue(
+    int playQueueId, {
+    String? center,
+    int window = 50,
+    int includeBefore = 1,
+    int includeAfter = 1,
+  }) async {
+    try {
+      final queryParams = <String, dynamic>{
+        'window': window,
+        'includeBefore': includeBefore,
+        'includeAfter': includeAfter,
+      };
+
+      if (center != null) {
+        queryParams['center'] = center;
+      }
+
+      final response = await _dio.get(
+        '/playQueues/$playQueueId',
+        queryParameters: queryParams,
+      );
+
+      return PlayQueueResponse.fromJson(
+        response.data,
+        serverId: serverId,
+        serverName: serverName,
+      );
+    } catch (e) {
+      appLogger.e('Failed to get play queue: $e');
+      return null;
+    }
+  }
+
+  /// Shuffle a play queue
+  /// The currently selected item is maintained
+  Future<PlayQueueResponse?> shufflePlayQueue(int playQueueId) async {
+    try {
+      final response = await _dio.put('/playQueues/$playQueueId/shuffle');
+      return PlayQueueResponse.fromJson(response.data);
+    } catch (e) {
+      appLogger.e('Failed to shuffle play queue: $e');
+      return null;
+    }
+  }
+
+  /// Clear all items from a play queue
+  Future<bool> clearPlayQueue(int playQueueId) async {
+    try {
+      await _dio.delete('/playQueues/$playQueueId/items');
+      return true;
+    } catch (e) {
+      appLogger.e('Failed to clear play queue: $e');
+      return false;
+    }
+  }
+
+  /// Create a play queue for a TV show (all episodes)
+  ///
+  /// This is a convenience method that creates a play queue from a show's URI.
+  /// Perfect for sequential or shuffle playback of an entire series.
+  ///
+  /// Parameters:
+  /// - [showRatingKey]: The rating key of the show
+  /// - [shuffle]: Whether to shuffle the episodes (0 = off, 1 = on)
+  /// - [startingEpisodeKey]: Optional rating key of episode to start from
+  ///
+  /// Returns a PlayQueueResponse with all episodes from the show
+  Future<PlayQueueResponse?> createShowPlayQueue({
+    required String showRatingKey,
+    int shuffle = 0,
+    String? startingEpisodeKey,
+  }) async {
+    try {
+      // Get machine identifier for building the URI
+      final machineId =
+          config.machineIdentifier ?? await getMachineIdentifier();
+      if (machineId == null) {
+        throw Exception('Could not get server machine identifier');
+      }
+
+      // Build the URI for the show's episodes
+      final uri =
+          'server://$machineId/com.plexapp.plugins.library/library/metadata/$showRatingKey/children';
+
+      // Create the play queue with optional starting episode
+      return await createPlayQueue(
+        uri: uri,
+        type: 'video',
+        shuffle: shuffle,
+        key: startingEpisodeKey != null
+            ? '/library/metadata/$startingEpisodeKey'
+            : null,
+      );
+    } catch (e) {
+      appLogger.e('Failed to create show play queue', error: e);
+      return null;
+    }
+  }
+
+  /// Extract both Metadata and Directory entries from response
+  /// Folders can come back as either type
+  /// Automatically tags all items with this client's serverId and serverName
+  List<PlexMetadata> _extractMetadataAndDirectories(Response response) {
+    final List<PlexMetadata> items = [];
+    final container = _getMediaContainer(response);
+
+    if (container != null) {
+      // Extract Metadata entries - try full parsing first
+      if (container['Metadata'] != null) {
+        for (final json in container['Metadata'] as List) {
+          try {
+            // Try to parse with full PlexMetadata.fromJson first
+            items.add(
+              PlexMetadata.fromJson(
+                json,
+              ).copyWith(serverId: serverId, serverName: serverName),
+            );
+          } catch (e) {
+            // If full parsing fails, use minimal safe parsing
+            appLogger.d('Using minimal parsing for metadata item: $e');
+            try {
+              items.add(
+                PlexMetadata(
+                  ratingKey: json['key'] ?? json['ratingKey'] ?? '',
+                  key: json['key'] ?? '',
+                  type: json['type'] ?? 'folder',
+                  title: json['title'] ?? 'Untitled',
+                  thumb: json['thumb'],
+                  art: json['art'],
+                  year: json['year'],
+                  serverId: serverId,
+                  serverName: serverName,
+                ),
+              );
+            } catch (e2) {
+              appLogger.e('Failed to parse metadata item: $e2');
+            }
+          }
+        }
+      }
+
+      // Extract Directory entries (folders)
+      if (container['Directory'] != null) {
+        for (final json in container['Directory'] as List) {
+          try {
+            // Try to parse as PlexMetadata first
+            items.add(
+              PlexMetadata.fromJson(
+                json,
+              ).copyWith(serverId: serverId, serverName: serverName),
+            );
+          } catch (e) {
+            // If that fails, use minimal folder representation
+            try {
+              items.add(
+                PlexMetadata(
+                  ratingKey: json['key'] ?? json['ratingKey'] ?? '',
+                  key: json['key'] ?? '',
+                  type: json['type'] ?? 'folder',
+                  title: json['title'] ?? 'Untitled',
+                  thumb: json['thumb'],
+                  art: json['art'],
+                  serverId: serverId,
+                  serverName: serverName,
+                ),
+              );
+            } catch (e2) {
+              appLogger.e('Failed to parse directory item: $e2');
+            }
+          }
+        }
+      }
+    }
+
+    return items;
+  }
+
+  /// Get root folders for a library section
+  /// Returns the top-level folder structure for filesystem-based browsing
+  Future<List<PlexMetadata>> getLibraryFolders(String sectionId) async {
+    try {
+      final response = await _dio.get(
+        '/library/sections/$sectionId/folder',
+        queryParameters: {'includeCollections': 0},
+      );
+      return _extractMetadataAndDirectories(response);
+    } catch (e) {
+      appLogger.e('Failed to get library folders: $e');
+      return [];
+    }
+  }
+
+  /// Get children of a specific folder
+  /// Returns files and subfolders within the given folder
+  Future<List<PlexMetadata>> getFolderChildren(String folderKey) async {
+    try {
+      final response = await _dio.get(folderKey);
+      return _extractMetadataAndDirectories(response);
+    } catch (e) {
+      appLogger.e('Failed to get folder children: $e');
+      return [];
+    }
+  }
+
+  /// Get library-specific playlists
+  /// Filters playlists by checking if they contain items from the specified library
+  /// This is a client-side filter since the API doesn't support sectionId for playlists
+  Future<List<PlexPlaylist>> getLibraryPlaylists({
+    required String sectionId,
+    String playlistType = 'video',
+  }) async {
+    // For now, return all video playlists
+    // Future enhancement: filter by checking playlist items' library
+    return getPlaylists(playlistType: playlistType);
+  }
+
+  // ============================================================================
+  // Library Management Methods
+  // ============================================================================
+
+  /// Scan/refresh a library section to detect new files
+  Future<void> scanLibrary(String sectionId) async {
+    await _dio.get('/library/sections/$sectionId/refresh');
+  }
+
+  /// Refresh metadata for a library section
+  Future<void> refreshLibraryMetadata(String sectionId) async {
+    await _dio.get('/library/sections/$sectionId/refresh?force=1');
+  }
+
+  /// Empty trash for a library section
+  Future<void> emptyLibraryTrash(String sectionId) async {
+    await _dio.put('/library/sections/$sectionId/emptyTrash');
+  }
+
+  /// Analyze library section
+  Future<void> analyzeLibrary(String sectionId) async {
+    await _dio.get('/library/sections/$sectionId/analyze');
+  }
+
+  // ============================================================================
+  // Library Statistics Methods
+  // ============================================================================
+
+  /// Get total item count for a library section efficiently.
+  /// Uses X-Plex-Container-Size: 1 to get totalSize with minimal data transfer.
+  Future<int> getLibraryTotalCount(String sectionId) async {
+    try {
+      final response = await _dio.get(
+        '/library/sections/$sectionId/all',
+        queryParameters: {
+          'X-Plex-Container-Start': 0,
+          'X-Plex-Container-Size': 1,
+        },
+      );
+      final container = _getMediaContainer(response);
+      // Try totalSize first, fall back to size if not available
+      return container?['totalSize'] as int? ??
+          container?['size'] as int? ??
+          0;
+    } catch (e) {
+      appLogger.e('Failed to get library total count: $e');
+      return 0;
+    }
+  }
+
+  /// Get total episode count for a TV show library.
+  /// Uses the allLeaves endpoint to count all episodes.
+  Future<int> getLibraryEpisodeCount(String sectionId) async {
+    try {
+      final response = await _dio.get(
+        '/library/sections/$sectionId/allLeaves',
+        queryParameters: {
+          'X-Plex-Container-Start': 0,
+          'X-Plex-Container-Size': 1,
+        },
+      );
+      final container = _getMediaContainer(response);
+      return container?['totalSize'] as int? ??
+          container?['size'] as int? ??
+          0;
+    } catch (e) {
+      appLogger.e('Failed to get library episode count: $e');
+      return 0;
+    }
+  }
+
+  /// Get watch history count for a time period.
+  /// [since] - Optional DateTime to filter history from this date onwards.
+  /// Returns the total count of items watched.
+  Future<int> getWatchHistoryCount({DateTime? since}) async {
+    try {
+      final queryParams = <String, dynamic>{
+        'X-Plex-Container-Start': 0,
+        'X-Plex-Container-Size': 1,
+      };
+      if (since != null) {
+        final epochSeconds = since.millisecondsSinceEpoch ~/ 1000;
+        queryParams['viewedAt>'] = epochSeconds;
+      }
+      final response = await _dio.get(
+        '/status/sessions/history/all',
+        queryParameters: queryParams,
+      );
+      final container = _getMediaContainer(response);
+      return container?['totalSize'] as int? ??
+          container?['size'] as int? ??
+          0;
+    } catch (e) {
+      appLogger.e('Failed to get watch history count: $e');
+      return 0;
+    }
+  }
+
+  Future<void> _handleEndpointSwitch(String newBaseUrl) async {
+    if (config.baseUrl == newBaseUrl) {
+      return;
+    }
+
+    appLogger.i('Applying Plex endpoint switch', error: newBaseUrl);
+    _dio.options.baseUrl = newBaseUrl;
+    config = config.copyWith(baseUrl: newBaseUrl);
+    LogRedactionManager.registerServerUrl(newBaseUrl);
+
+    if (_onEndpointChanged != null) {
+      await _onEndpointChanged(newBaseUrl);
+    }
+  }
+}
diff --git a/lib/services/saf_storage_service.dart b/lib/services/saf_storage_service.dart
new file mode 100644
index 00000000..ad7c8606
--- /dev/null
+++ b/lib/services/saf_storage_service.dart
@@ -0,0 +1,233 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:saf_util/saf_util.dart';
+import 'package:saf_util/saf_util_platform_interface.dart';
+import 'package:saf_stream/saf_stream.dart';
+
+/// Handles Storage Access Framework (SAF) operations for Android
+class SafStorageService {
+  static SafStorageService? _instance;
+  static SafStorageService get instance => _instance ??= SafStorageService._();
+  SafStorageService._();
+
+  final SafUtil _safUtil = SafUtil();
+  final SafStream _safStream = SafStream();
+
+  /// Check if SAF is available (Android only)
+  bool get isAvailable => Platform.isAndroid;
+
+  /// Pick a directory using SAF
+  /// Returns the content:// URI or null if cancelled
+  Future<String?> pickDirectory() async {
+    if (!isAvailable) return null;
+    try {
+      // Pick directory with persistent write permission
+      final doc = await _safUtil.pickDirectory(
+        writePermission: true,
+        persistablePermission: true,
+      );
+      return doc?.uri;
+    } catch (e) {
+      debugPrint('SAF pickDirectory error: $e');
+      return null;
+    }
+  }
+
+  /// Check if we have persisted access to a URI
+  Future<bool> hasPersistedPermission(String contentUri) async {
+    if (!isAvailable) return false;
+    try {
+      return await _safUtil.hasPersistedPermission(
+        contentUri,
+        checkRead: true,
+        checkWrite: true,
+      );
+    } catch (e) {
+      debugPrint('SAF hasPersistedPermission error: $e');
+      return false;
+    }
+  }
+
+  /// Get document file info for a URI
+  Future<SafDocumentFile?> getDocumentFile(
+    String contentUri, {
+    bool isDir = true,
+  }) async {
+    if (!isAvailable) return null;
+    try {
+      return await _safUtil.documentFileFromUri(contentUri, isDir);
+    } catch (e) {
+      debugPrint('SAF getDocumentFile error: $e');
+      return null;
+    }
+  }
+
+  /// Create a subdirectory in a SAF directory
+  /// Returns the URI of the created directory
+  Future<String?> createDirectory(String parentUri, String name) async {
+    if (!isAvailable) return null;
+    try {
+      final result = await _safUtil.mkdirp(parentUri, [name]);
+      return result.uri;
+    } catch (e) {
+      debugPrint('SAF createDirectory error: $e');
+      return null;
+    }
+  }
+
+  /// List files in a SAF directory
+  Future<List<SafDocumentFile>> listDirectory(String contentUri) async {
+    if (!isAvailable) return [];
+    try {
+      return await _safUtil.list(contentUri);
+    } catch (e) {
+      debugPrint('SAF listDirectory error: $e');
+      return [];
+    }
+  }
+
+  /// Get a child file/directory in a SAF directory
+  Future<SafDocumentFile?> getChild(String parentUri, String name) async {
+    if (!isAvailable) return null;
+    try {
+      return await _safUtil.child(parentUri, [name]);
+    } catch (e) {
+      debugPrint('SAF getChild error: $e');
+      return null;
+    }
+  }
+
+  /// Delete a file or directory in SAF
+  Future<bool> delete(String contentUri, {bool isDir = false}) async {
+    if (!isAvailable) return false;
+    try {
+      await _safUtil.delete(contentUri, isDir);
+      return true;
+    } catch (e) {
+      debugPrint('SAF delete error: $e');
+      return false;
+    }
+  }
+
+  /// Get a display name for a SAF URI (for UI purposes)
+  Future<String?> getDisplayName(String contentUri) async {
+    if (!isAvailable) return null;
+    try {
+      final doc = await _safUtil.documentFileFromUri(contentUri, true);
+      return doc?.name;
+    } catch (e) {
+      debugPrint('SAF getDisplayName error: $e');
+      return null;
+    }
+  }
+
+  /// Create nested directories in a SAF directory
+  /// Returns the URI of the deepest directory
+  Future<String?> createNestedDirectories(
+    String parentUri,
+    List<String> pathComponents,
+  ) async {
+    if (!isAvailable) return null;
+    try {
+      final result = await _safUtil.mkdirp(parentUri, pathComponents);
+      return result.uri;
+    } catch (e) {
+      debugPrint('SAF createNestedDirectories error: $e');
+      return null;
+    }
+  }
+
+  /// Copy a file from local storage to SAF directory using streaming
+  /// Returns the SAF URI of the copied file, or null on failure
+  Future<String?> copyFileToSaf(
+    String sourceFilePath,
+    String targetDirectoryUri,
+    String fileName,
+    String mimeType,
+  ) async {
+    if (!isAvailable) return null;
+    try {
+      final sourceFile = File(sourceFilePath);
+      if (!await sourceFile.exists()) {
+        debugPrint('SAF copyFileToSaf: source file does not exist');
+        return null;
+      }
+
+      // Start a write stream session
+      final writeInfo = await _safStream.startWriteStream(
+        targetDirectoryUri,
+        fileName,
+        mimeType,
+      );
+      final sessionId = writeInfo.session;
+
+      final stream = sourceFile.openRead();
+
+      await for (final chunk in stream) {
+        await _safStream.writeChunk(sessionId, Uint8List.fromList(chunk));
+      }
+
+      // End the write stream
+      await _safStream.endWriteStream(sessionId);
+
+      debugPrint(
+        'SAF copyFileToSaf: successfully copied to $targetDirectoryUri/$fileName',
+      );
+      return writeInfo.fileResult.uri.toString();
+    } catch (e) {
+      debugPrint('SAF copyFileToSaf error: $e');
+      return null;
+    }
+  }
+
+  /// Write bytes directly to a SAF file
+  /// Returns the SAF URI of the created file, or null on failure
+  Future<String?> writeFileBytes(
+    String directoryUri,
+    String fileName,
+    String mimeType,
+    Uint8List bytes,
+  ) async {
+    if (!isAvailable) return null;
+    try {
+      final result = await _safStream.writeFileBytes(
+        directoryUri,
+        fileName,
+        mimeType,
+        bytes,
+      );
+      return result.uri.toString();
+    } catch (e) {
+      debugPrint('SAF writeFileBytes error: $e');
+      return null;
+    }
+  }
+
+  /// Read bytes from a SAF file
+  Future<Uint8List?> readFileBytes(String fileUri) async {
+    if (!isAvailable) return null;
+    try {
+      return await _safStream.readFileBytes(fileUri);
+    } catch (e) {
+      debugPrint('SAF readFileBytes error: $e');
+      return null;
+    }
+  }
+
+  /// Check if a file exists in a SAF directory
+  Future<bool> fileExists(String parentUri, String fileName) async {
+    if (!isAvailable) return false;
+    try {
+      final child = await _safUtil.child(parentUri, [fileName]);
+      return child != null;
+    } catch (e) {
+      debugPrint('SAF fileExists error: $e');
+      return false;
+    }
+  }
+
+  /// Get the content URI for a file that should be readable by MediaStore/media players
+  /// For SAF files, this returns the same URI as input (content:// URIs are already readable)
+  String getReadableUri(String safUri) => safUri;
+}
diff --git a/lib/services/server_connection_service.dart b/lib/services/server_connection_service.dart
deleted file mode 100644
index 32569b25..00000000
--- a/lib/services/server_connection_service.dart
+++ /dev/null
@@ -1,151 +0,0 @@
-import 'plex_auth_service.dart';
-import 'storage_service.dart';
-import '../client/plex_client.dart';
-import '../config/plex_config.dart';
-import '../models/plex_user_profile.dart';
-import '../utils/app_logger.dart';
-
-/// Result of a server connection attempt
-class ServerConnectionResult {
-  final PlexClient? client;
-  final PlexUserProfile? userProfile;
-  final String? error;
-
-  ServerConnectionResult({this.client, this.userProfile, this.error});
-
-  bool get isSuccess => client != null;
-}
-
-/// Service for handling optimized server connections
-/// Implements fast-first connection with background optimization
-class ServerConnectionService {
-  /// Connect to a Plex server with optimized connection testing
-  ///
-  /// Returns immediately with first working connection, then continues
-  /// testing in background to find the optimal connection.
-  ///
-  /// Parameters:
-  /// - [server]: The PlexServer to connect to
-  /// - [clientIdentifier]: Client identifier for the PlexClient
-  /// - [plexToken]: Optional plex.tv token to save to storage
-  /// - [verifyServer]: Whether to verify server is accessible before returning
-  /// - [fetchUserProfile]: Whether to fetch and cache user profile
-  /// - [onProgress]: Callback for progress updates (e.g., show/hide loading)
-  static Future<ServerConnectionResult> connectToServer(
-    PlexServer server, {
-    required String clientIdentifier,
-    String? plexToken,
-    bool verifyServer = false,
-    bool fetchUserProfile = false,
-    void Function(String message)? onProgress,
-  }) async {
-    PlexConnection? firstConnection;
-    final storage = await StorageService.getInstance();
-
-    try {
-      // Listen to the connection stream for progressive connection testing
-      await for (final connection in server.findBestWorkingConnection()) {
-        if (firstConnection == null) {
-          // First emission - use this connection immediately
-          firstConnection = connection;
-
-          if (onProgress != null) {
-            onProgress('Connected to ${connection.displayType} endpoint');
-          }
-
-          // Save server information to storage
-          await storage.saveServerData(server.toJson());
-          await storage.saveServerUrl(connection.uri);
-          await storage.saveServerAccessToken(server.accessToken);
-
-          // Save plex token if provided
-          if (plexToken != null) {
-            await storage.savePlexToken(plexToken);
-          }
-
-          // Create client with working connection
-          final config = await PlexConfig.create(
-            baseUrl: connection.uri,
-            token: server.accessToken,
-            clientIdentifier: clientIdentifier,
-          );
-          final client = PlexClient(config);
-
-          // Verify server is accessible if requested
-          if (verifyServer) {
-            try {
-              await client.getServerIdentity();
-            } catch (e) {
-              appLogger.w('Server identity verification failed', error: e);
-              await storage.clearCredentials();
-              return ServerConnectionResult(
-                error: 'Server is not accessible: $e',
-              );
-            }
-          }
-
-          // Fetch user profile if requested
-          PlexUserProfile? userProfile;
-          if (fetchUserProfile && plexToken != null) {
-            userProfile = await _fetchUserProfile(plexToken);
-          }
-
-          // Return success result
-          // Note: Stream continues in background to find better connection
-          return ServerConnectionResult(
-            client: client,
-            userProfile: userProfile,
-          );
-        } else {
-          // Second emission - better connection found
-          // Update stored connection seamlessly for future app launches
-          await storage.saveServerUrl(connection.uri);
-          appLogger.d(
-            'Switched to better connection: ${connection.displayType} (${connection.uri})',
-          );
-        }
-      }
-
-      // Handle case where no connections were found
-      if (firstConnection == null) {
-        return ServerConnectionResult(
-          error: 'No working connections found for this server',
-        );
-      }
-
-      // Should never reach here due to return in the stream loop
-      return ServerConnectionResult(
-        error: 'Unexpected error in connection flow',
-      );
-    } catch (e) {
-      appLogger.e('Error connecting to server', error: e);
-      return ServerConnectionResult(error: 'Connection failed: $e');
-    }
-  }
-
-  /// Fetch user profile from Plex API
-  static Future<PlexUserProfile?> _fetchUserProfile(String plexToken) async {
-    appLogger.d('Fetching user profile from Plex API');
-    try {
-      final authService = await PlexAuthService.create();
-      final profile = await authService.getUserProfile(plexToken);
-
-      appLogger.i(
-        'Successfully fetched user profile from API',
-        error: {
-          'autoSelectAudio': profile.autoSelectAudio,
-          'defaultAudioLanguage': profile.defaultAudioLanguage ?? 'not set',
-          'autoSelectSubtitle': profile.autoSelectSubtitle,
-          'defaultSubtitleLanguage':
-              profile.defaultSubtitleLanguage ?? 'not set',
-          'defaultSubtitleForced': profile.defaultSubtitleForced,
-        },
-      );
-
-      return profile;
-    } catch (e) {
-      appLogger.w('Failed to fetch user profile from API', error: e);
-      return null;
-    }
-  }
-}
diff --git a/lib/services/server_registry.dart b/lib/services/server_registry.dart
new file mode 100644
index 00000000..ca34b9e6
--- /dev/null
+++ b/lib/services/server_registry.dart
@@ -0,0 +1,239 @@
+import 'dart:convert';
+
+import '../utils/app_logger.dart';
+import 'plex_auth_service.dart';
+import 'storage_service.dart';
+
+/// Centralized server configuration registry
+/// Manages which servers are available, enabled/disabled, and their configurations
+class ServerRegistry {
+  final StorageService _storage;
+
+  ServerRegistry(this._storage);
+
+  /// Get all registered servers
+  Future<List<PlexServer>> getServers() async {
+    try {
+      final serversJson = _storage.getServersListJson();
+      if (serversJson == null || serversJson.isEmpty) {
+        return [];
+      }
+
+      final List<dynamic> serversList = jsonDecode(serversJson);
+      return serversList
+          .map((json) => PlexServer.fromJson(json as Map<String, dynamic>))
+          .toList();
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Failed to load servers from storage',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      return [];
+    }
+  }
+
+  /// Save all servers to storage
+  Future<void> saveServers(List<PlexServer> servers) async {
+    try {
+      final serversJson = jsonEncode(servers.map((s) => s.toJson()).toList());
+      await _storage.saveServersListJson(serversJson);
+      appLogger.d('Saved ${servers.length} servers to storage');
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Failed to save servers to storage',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      rethrow;
+    }
+  }
+
+  /// Get enabled server IDs
+  Future<Set<String>> getEnabledServerIds() async {
+    try {
+      final enabledJson = _storage.getEnabledServersJson();
+      if (enabledJson == null || enabledJson.isEmpty) {
+        // If no enabled servers are stored, all servers are enabled by default
+        final servers = await getServers();
+        return servers.map((s) => s.clientIdentifier).toSet();
+      }
+
+      final List<dynamic> enabledList = jsonDecode(enabledJson);
+      return enabledList.cast<String>().toSet();
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Failed to load enabled servers from storage',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      return {};
+    }
+  }
+
+  /// Save enabled server IDs
+  Future<void> saveEnabledServerIds(Set<String> serverIds) async {
+    try {
+      final enabledJson = jsonEncode(serverIds.toList());
+      await _storage.saveEnabledServersJson(enabledJson);
+      appLogger.d('Saved ${serverIds.length} enabled servers to storage');
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Failed to save enabled servers to storage',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      rethrow;
+    }
+  }
+
+  /// Get only enabled servers
+  Future<List<PlexServer>> getEnabledServers() async {
+    final servers = await getServers();
+    final enabledIds = await getEnabledServerIds();
+
+    if (enabledIds.isEmpty) {
+      // If no enabled list, all servers are enabled
+      return servers;
+    }
+
+    return servers
+        .where((s) => enabledIds.contains(s.clientIdentifier))
+        .toList();
+  }
+
+  /// Enable a server
+  Future<void> enableServer(String serverId) async {
+    final enabledIds = await getEnabledServerIds();
+    enabledIds.add(serverId);
+    await saveEnabledServerIds(enabledIds);
+    appLogger.i('Enabled server: $serverId');
+  }
+
+  /// Disable a server
+  Future<void> disableServer(String serverId) async {
+    final enabledIds = await getEnabledServerIds();
+    enabledIds.remove(serverId);
+    await saveEnabledServerIds(enabledIds);
+    appLogger.i('Disabled server: $serverId');
+  }
+
+  /// Check if a server is enabled
+  Future<bool> isServerEnabled(String serverId) async {
+    final enabledIds = await getEnabledServerIds();
+    return enabledIds.contains(serverId);
+  }
+
+  /// Get a specific server by ID
+  Future<PlexServer?> getServer(String serverId) async {
+    final servers = await getServers();
+    try {
+      return servers.firstWhere((s) => s.clientIdentifier == serverId);
+    } catch (e) {
+      return null;
+    }
+  }
+
+  /// Update server status (called when server connection status changes)
+  Future<void> updateServerStatus(
+    String serverId, {
+    bool? online,
+    DateTime? lastSeen,
+  }) async {
+    final servers = await getServers();
+    final serverIndex = servers.indexWhere(
+      (s) => s.clientIdentifier == serverId,
+    );
+
+    if (serverIndex == -1) {
+      appLogger.w('Server not found for status update: $serverId');
+      return;
+    }
+
+    // Note: PlexServer from auth service doesn't have mutable status fields
+    // Status tracking is handled by MultiServerManager
+    // This method is kept for future extension if we add status to PlexServer model
+  }
+
+  /// Add or update a single server
+  Future<void> upsertServer(PlexServer server) async {
+    final servers = await getServers();
+    final index = servers.indexWhere(
+      (s) => s.clientIdentifier == server.clientIdentifier,
+    );
+
+    if (index >= 0) {
+      servers[index] = server;
+      appLogger.d('Updated server: ${server.name}');
+    } else {
+      servers.add(server);
+      appLogger.d('Added new server: ${server.name}');
+    }
+
+    await saveServers(servers);
+
+    // Ensure new servers are enabled by default
+    if (index < 0) {
+      await enableServer(server.clientIdentifier);
+    }
+  }
+
+  /// Remove a server
+  Future<void> removeServer(String serverId) async {
+    final servers = await getServers();
+    servers.removeWhere((s) => s.clientIdentifier == serverId);
+    await saveServers(servers);
+
+    // Also remove from enabled list
+    final enabledIds = await getEnabledServerIds();
+    enabledIds.remove(serverId);
+    await saveEnabledServerIds(enabledIds);
+
+    appLogger.i('Removed server: $serverId');
+  }
+
+  /// Clear all servers
+  Future<void> clearAllServers() async {
+    await _storage.clearServersList();
+    await _storage.clearEnabledServers();
+    appLogger.i('Cleared all servers from registry');
+  }
+
+  /// Migrate from single server storage to multi-server
+  /// This is called during app startup to migrate existing users
+  Future<void> migrateFromSingleServer() async {
+    try {
+      // Check if we already have servers in the new format
+      final existingServers = await getServers();
+      if (existingServers.isNotEmpty) {
+        appLogger.d('Servers already migrated, skipping migration');
+        return;
+      }
+
+      // Try to load old single-server data
+      final oldServerData = _storage.getServerData();
+      if (oldServerData == null) {
+        appLogger.d('No old server data to migrate');
+        return;
+      }
+
+      // Parse and migrate
+      final server = PlexServer.fromJson(oldServerData);
+
+      appLogger.i('Migrating single server to multi-server: ${server.name}');
+
+      // Save as first server in new format
+      await saveServers([server]);
+      await enableServer(server.clientIdentifier);
+
+      appLogger.i('Migration complete');
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Failed to migrate from single server',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      // Don't rethrow - migration failure shouldn't crash the app
+    }
+  }
+}
diff --git a/lib/services/settings_service.dart b/lib/services/settings_service.dart
index 8c745318..7c4f19fc 100644
--- a/lib/services/settings_service.dart
+++ b/lib/services/settings_service.dart
@@ -1,9 +1,10 @@
 import 'dart:convert';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter/services.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
 import 'package:plezy/utils/app_logger.dart';
 import '../i18n/strings.g.dart';
+import 'base_shared_preferences_service.dart';
+import 'tv_detection_service.dart';
 
 enum ThemeMode { system, light, dark }
 
@@ -11,13 +12,14 @@ enum LibraryDensity { compact, normal, comfortable }
 
 enum ViewMode { grid, list }
 
-class SettingsService {
+class SettingsService extends BaseSharedPreferencesService {
   static const String _keyThemeMode = 'theme_mode';
   static const String _keyEnableDebugLogging = 'enable_debug_logging';
   static const String _keyBufferSize = 'buffer_size';
   static const String _keyKeyboardShortcuts = 'keyboard_shortcuts';
   static const String _keyKeyboardHotkeys = 'keyboard_hotkeys';
   static const String _keyEnableHardwareDecoding = 'enable_hardware_decoding';
+  static const String _keyEnableHDR = 'enable_hdr';
   static const String _keyPreferredVideoCodec = 'preferred_video_codec';
   static const String _keyPreferredAudioCodec = 'preferred_audio_codec';
   static const String _keyLibraryDensity = 'library_density';
@@ -39,197 +41,200 @@ class SettingsService {
   static const String _keySubtitleBackgroundColor = 'subtitle_background_color';
   static const String _keySubtitleBackgroundOpacity =
       'subtitle_background_opacity';
-  static const String _keyShuffleUnwatchedOnly = 'shuffle_unwatched_only';
-  static const String _keyShuffleOrderNavigation = 'shuffle_order_navigation';
-  static const String _keyShuffleLoopQueue = 'shuffle_loop_queue';
   static const String _keyAppLocale = 'app_locale';
-
-  static SettingsService? _instance;
-  late SharedPreferences _prefs;
+  static const String _keyRememberTrackSelections = 'remember_track_selections';
+  static const String _keyAutoSkipIntro = 'auto_skip_intro';
+  static const String _keyAutoSkipCredits = 'auto_skip_credits';
+  static const String _keyAutoSkipDelay = 'auto_skip_delay';
+  static const String _keyCustomDownloadPath = 'custom_download_path';
+  static const String _keyCustomDownloadPathType = 'custom_download_path_type';
+  static const String _keyDownloadOnWifiOnly = 'download_on_wifi_only';
+  static const String _keyVideoPlayerNavigationEnabled =
+      'video_player_navigation_enabled';
 
   SettingsService._();
 
   static Future<SettingsService> getInstance() async {
-    if (_instance == null) {
-      _instance = SettingsService._();
-      await _instance!._init();
-    }
-    return _instance!;
+    return BaseSharedPreferencesService.initializeInstance(
+      () => SettingsService._(),
+    );
   }
 
-  Future<void> _init() async {
-    _prefs = await SharedPreferences.getInstance();
+  /// Generic helper to get an enum value from preferences
+  T _getEnumValue<T extends Enum>(String key, List<T> values, T defaultValue) {
+    final stored = prefs.getString(key);
+    if (stored == null) return defaultValue;
+    return values.firstWhere(
+      (v) => v.name == stored,
+      orElse: () => defaultValue,
+    );
   }
 
   // Theme Mode
   Future<void> setThemeMode(ThemeMode mode) async {
-    await _prefs.setString(_keyThemeMode, mode.name);
+    await prefs.setString(_keyThemeMode, mode.name);
   }
 
   ThemeMode getThemeMode() {
-    final modeString = _prefs.getString(_keyThemeMode);
-    return ThemeMode.values.firstWhere(
-      (mode) => mode.name == modeString,
-      orElse: () => ThemeMode.system,
-    );
+    return _getEnumValue(_keyThemeMode, ThemeMode.values, ThemeMode.system);
   }
 
   // Debug Logging
   Future<void> setEnableDebugLogging(bool enabled) async {
-    await _prefs.setBool(_keyEnableDebugLogging, enabled);
+    await prefs.setBool(_keyEnableDebugLogging, enabled);
     // Update logger level immediately when setting changes
     setLoggerLevel(enabled);
   }
 
   bool getEnableDebugLogging() {
-    return _prefs.getBool(_keyEnableDebugLogging) ?? false;
+    return prefs.getBool(_keyEnableDebugLogging) ?? false;
   }
 
   // Buffer Size (in MB)
   Future<void> setBufferSize(int sizeInMB) async {
-    await _prefs.setInt(_keyBufferSize, sizeInMB);
+    await prefs.setInt(_keyBufferSize, sizeInMB);
   }
 
   int getBufferSize() {
-    return _prefs.getInt(_keyBufferSize) ?? 128; // Default 128MB
+    return prefs.getInt(_keyBufferSize) ?? 128; // Default 128MB
   }
 
   // Hardware Decoding
   Future<void> setEnableHardwareDecoding(bool enabled) async {
-    await _prefs.setBool(_keyEnableHardwareDecoding, enabled);
+    await prefs.setBool(_keyEnableHardwareDecoding, enabled);
   }
 
   bool getEnableHardwareDecoding() {
-    return _prefs.getBool(_keyEnableHardwareDecoding) ??
-        true; // Default enabled
+    return prefs.getBool(_keyEnableHardwareDecoding) ?? true; // Default enabled
+  }
+
+  // HDR (High Dynamic Range)
+  Future<void> setEnableHDR(bool enabled) async {
+    await prefs.setBool(_keyEnableHDR, enabled);
+  }
+
+  bool getEnableHDR() {
+    return prefs.getBool(_keyEnableHDR) ?? true; // Default enabled
   }
 
   // Preferred Video Codec
   Future<void> setPreferredVideoCodec(String codec) async {
-    await _prefs.setString(_keyPreferredVideoCodec, codec);
+    await prefs.setString(_keyPreferredVideoCodec, codec);
   }
 
   String getPreferredVideoCodec() {
-    return _prefs.getString(_keyPreferredVideoCodec) ?? 'auto';
+    return prefs.getString(_keyPreferredVideoCodec) ?? 'auto';
   }
 
   // Preferred Audio Codec
   Future<void> setPreferredAudioCodec(String codec) async {
-    await _prefs.setString(_keyPreferredAudioCodec, codec);
+    await prefs.setString(_keyPreferredAudioCodec, codec);
   }
 
   String getPreferredAudioCodec() {
-    return _prefs.getString(_keyPreferredAudioCodec) ?? 'auto';
+    return prefs.getString(_keyPreferredAudioCodec) ?? 'auto';
   }
 
   // Library Density
   Future<void> setLibraryDensity(LibraryDensity density) async {
-    await _prefs.setString(_keyLibraryDensity, density.name);
+    await prefs.setString(_keyLibraryDensity, density.name);
   }
 
   LibraryDensity getLibraryDensity() {
-    final densityString = _prefs.getString(_keyLibraryDensity);
-    return LibraryDensity.values.firstWhere(
-      (density) => density.name == densityString,
-      orElse: () => LibraryDensity.normal,
-    );
+    return _getEnumValue(_keyLibraryDensity, LibraryDensity.values, LibraryDensity.normal);
   }
 
   // View Mode
   Future<void> setViewMode(ViewMode mode) async {
-    await _prefs.setString(_keyViewMode, mode.name);
+    await prefs.setString(_keyViewMode, mode.name);
   }
 
   ViewMode getViewMode() {
-    final modeString = _prefs.getString(_keyViewMode);
-    return ViewMode.values.firstWhere(
-      (mode) => mode.name == modeString,
-      orElse: () => ViewMode.grid,
-    );
+    return _getEnumValue(_keyViewMode, ViewMode.values, ViewMode.grid);
   }
 
   // Use Season Poster
   Future<void> setUseSeasonPoster(bool enabled) async {
-    await _prefs.setBool(_keyUseSeasonPoster, enabled);
+    await prefs.setBool(_keyUseSeasonPoster, enabled);
   }
 
   bool getUseSeasonPoster() {
-    return _prefs.getBool(_keyUseSeasonPoster) ??
+    return prefs.getBool(_keyUseSeasonPoster) ??
         false; // Default: false (use series poster)
   }
 
   // Show Hero Section
   Future<void> setShowHeroSection(bool enabled) async {
-    await _prefs.setBool(_keyShowHeroSection, enabled);
+    await prefs.setBool(_keyShowHeroSection, enabled);
   }
 
   bool getShowHeroSection() {
-    return _prefs.getBool(_keyShowHeroSection) ??
+    return prefs.getBool(_keyShowHeroSection) ??
         true; // Default: true (show hero section)
   }
 
   // Seek Time Small (in seconds)
   Future<void> setSeekTimeSmall(int seconds) async {
-    await _prefs.setInt(_keySeekTimeSmall, seconds);
+    await prefs.setInt(_keySeekTimeSmall, seconds);
   }
 
   int getSeekTimeSmall() {
-    return _prefs.getInt(_keySeekTimeSmall) ?? 10; // Default: 10 seconds
+    return prefs.getInt(_keySeekTimeSmall) ?? 10; // Default: 10 seconds
   }
 
   // Seek Time Large (in seconds)
   Future<void> setSeekTimeLarge(int seconds) async {
-    await _prefs.setInt(_keySeekTimeLarge, seconds);
+    await prefs.setInt(_keySeekTimeLarge, seconds);
   }
 
   int getSeekTimeLarge() {
-    return _prefs.getInt(_keySeekTimeLarge) ?? 30; // Default: 30 seconds
+    return prefs.getInt(_keySeekTimeLarge) ?? 30; // Default: 30 seconds
   }
 
   // Sleep Timer Duration (in minutes)
   Future<void> setSleepTimerDuration(int minutes) async {
-    await _prefs.setInt(_keySleepTimerDuration, minutes);
+    await prefs.setInt(_keySleepTimerDuration, minutes);
   }
 
   int getSleepTimerDuration() {
-    return _prefs.getInt(_keySleepTimerDuration) ?? 30; // Default: 30 minutes
+    return prefs.getInt(_keySleepTimerDuration) ?? 30; // Default: 30 minutes
   }
 
   // Audio Sync Offset (in milliseconds)
   Future<void> setAudioSyncOffset(int milliseconds) async {
-    await _prefs.setInt(_keyAudioSyncOffset, milliseconds);
+    await prefs.setInt(_keyAudioSyncOffset, milliseconds);
   }
 
   int getAudioSyncOffset() {
-    return _prefs.getInt(_keyAudioSyncOffset) ?? 0; // Default: 0ms (no offset)
+    return prefs.getInt(_keyAudioSyncOffset) ?? 0; // Default: 0ms (no offset)
   }
 
   // Subtitle Sync Offset (in milliseconds)
   Future<void> setSubtitleSyncOffset(int milliseconds) async {
-    await _prefs.setInt(_keySubtitleSyncOffset, milliseconds);
+    await prefs.setInt(_keySubtitleSyncOffset, milliseconds);
   }
 
   int getSubtitleSyncOffset() {
-    return _prefs.getInt(_keySubtitleSyncOffset) ??
+    return prefs.getInt(_keySubtitleSyncOffset) ??
         0; // Default: 0ms (no offset)
   }
 
   // Volume (0.0 to 100.0)
   Future<void> setVolume(double volume) async {
-    await _prefs.setDouble(_keyVolume, volume);
+    await prefs.setDouble(_keyVolume, volume);
   }
 
   double getVolume() {
-    return _prefs.getDouble(_keyVolume) ?? 100.0; // Default: full volume
+    return prefs.getDouble(_keyVolume) ?? 100.0; // Default: full volume
   }
 
   // Rotation Lock (mobile only)
   Future<void> setRotationLocked(bool locked) async {
-    await _prefs.setBool(_keyRotationLocked, locked);
+    await prefs.setBool(_keyRotationLocked, locked);
   }
 
   bool getRotationLocked() {
-    return _prefs.getBool(_keyRotationLocked) ??
+    return prefs.getBool(_keyRotationLocked) ??
         true; // Default: locked (landscape only)
   }
 
@@ -237,56 +242,56 @@ class SettingsService {
 
   // Font Size (30-80, default 55)
   Future<void> setSubtitleFontSize(int size) async {
-    await _prefs.setInt(_keySubtitleFontSize, size);
+    await prefs.setInt(_keySubtitleFontSize, size);
   }
 
   int getSubtitleFontSize() {
-    return _prefs.getInt(_keySubtitleFontSize) ?? 55;
+    return prefs.getInt(_keySubtitleFontSize) ?? 55;
   }
 
   // Text Color (hex format #RRGGBB, default white)
   Future<void> setSubtitleTextColor(String color) async {
-    await _prefs.setString(_keySubtitleTextColor, color);
+    await prefs.setString(_keySubtitleTextColor, color);
   }
 
   String getSubtitleTextColor() {
-    return _prefs.getString(_keySubtitleTextColor) ?? '#FFFFFF';
+    return prefs.getString(_keySubtitleTextColor) ?? '#FFFFFF';
   }
 
   // Border Size (0-5, default 3)
   Future<void> setSubtitleBorderSize(int size) async {
-    await _prefs.setInt(_keySubtitleBorderSize, size);
+    await prefs.setInt(_keySubtitleBorderSize, size);
   }
 
   int getSubtitleBorderSize() {
-    return _prefs.getInt(_keySubtitleBorderSize) ?? 3;
+    return prefs.getInt(_keySubtitleBorderSize) ?? 3;
   }
 
   // Border Color (hex format #RRGGBB, default black)
   Future<void> setSubtitleBorderColor(String color) async {
-    await _prefs.setString(_keySubtitleBorderColor, color);
+    await prefs.setString(_keySubtitleBorderColor, color);
   }
 
   String getSubtitleBorderColor() {
-    return _prefs.getString(_keySubtitleBorderColor) ?? '#000000';
+    return prefs.getString(_keySubtitleBorderColor) ?? '#000000';
   }
 
   // Background Color (hex format #RRGGBB, default black)
   Future<void> setSubtitleBackgroundColor(String color) async {
-    await _prefs.setString(_keySubtitleBackgroundColor, color);
+    await prefs.setString(_keySubtitleBackgroundColor, color);
   }
 
   String getSubtitleBackgroundColor() {
-    return _prefs.getString(_keySubtitleBackgroundColor) ?? '#000000';
+    return prefs.getString(_keySubtitleBackgroundColor) ?? '#000000';
   }
 
   // Background Opacity (0-100, default 0 for transparent)
   Future<void> setSubtitleBackgroundOpacity(int opacity) async {
-    await _prefs.setInt(_keySubtitleBackgroundOpacity, opacity);
+    await prefs.setInt(_keySubtitleBackgroundOpacity, opacity);
   }
 
   int getSubtitleBackgroundOpacity() {
-    return _prefs.getInt(_keySubtitleBackgroundOpacity) ?? 0;
+    return prefs.getInt(_keySubtitleBackgroundOpacity) ?? 0;
   }
 
   // Keyboard Shortcuts (Legacy String-based)
@@ -346,26 +351,24 @@ class SettingsService {
 
   Future<void> setKeyboardShortcuts(Map<String, String> shortcuts) async {
     final jsonString = json.encode(shortcuts);
-    await _prefs.setString(_keyKeyboardShortcuts, jsonString);
+    await prefs.setString(_keyKeyboardShortcuts, jsonString);
   }
 
   Map<String, String> getKeyboardShortcuts() {
-    final jsonString = _prefs.getString(_keyKeyboardShortcuts);
+    final jsonString = prefs.getString(_keyKeyboardShortcuts);
     if (jsonString == null) return getDefaultKeyboardShortcuts();
 
-    try {
-      final decoded = json.decode(jsonString) as Map<String, dynamic>;
-      final shortcuts = decoded.map(
-        (key, value) => MapEntry(key, value.toString()),
-      );
+    final decoded = _decodeJsonStringToMap(jsonString);
+    if (decoded.isEmpty) return getDefaultKeyboardShortcuts();
 
-      // Merge with defaults to ensure all keys exist
-      final defaults = getDefaultKeyboardShortcuts();
-      defaults.addAll(shortcuts);
-      return defaults;
-    } catch (e) {
-      return getDefaultKeyboardShortcuts();
-    }
+    final shortcuts = decoded.map(
+      (key, value) => MapEntry(key, value.toString()),
+    );
+
+    // Merge with defaults to ensure all keys exist
+    final defaults = getDefaultKeyboardShortcuts();
+    defaults.addAll(shortcuts);
+    return defaults;
   }
 
   Future<void> setKeyboardShortcut(String action, String key) async {
@@ -390,11 +393,11 @@ class SettingsService {
       serializedHotkeys[entry.key] = _serializeHotKey(entry.value);
     }
     final jsonString = json.encode(serializedHotkeys);
-    await _prefs.setString(_keyKeyboardHotkeys, jsonString);
+    await prefs.setString(_keyKeyboardHotkeys, jsonString);
   }
 
   Future<Map<String, HotKey>> getKeyboardHotkeys() async {
-    final jsonString = _prefs.getString(_keyKeyboardHotkeys);
+    final jsonString = prefs.getString(_keyKeyboardHotkeys);
     if (jsonString == null) {
       return getDefaultKeyboardHotkeys();
     }
@@ -440,7 +443,27 @@ class SettingsService {
     await setKeyboardHotkeys(getDefaultKeyboardHotkeys());
   }
 
+  // Video Player Navigation (use arrow keys to navigate video player controls)
+  Future<void> setVideoPlayerNavigationEnabled(bool enabled) async {
+    await prefs.setBool(_keyVideoPlayerNavigationEnabled, enabled);
+  }
+
+  bool getVideoPlayerNavigationEnabled() {
+    // Default: enabled on Android TV, disabled elsewhere
+    return prefs.getBool(_keyVideoPlayerNavigationEnabled) ??
+        TvDetectionService.isTVSync();
+  }
+
   // Helper methods for HotKey serialization
+  static const _modifierMap = <String, HotKeyModifier>{
+    'alt': HotKeyModifier.alt,
+    'control': HotKeyModifier.control,
+    'shift': HotKeyModifier.shift,
+    'meta': HotKeyModifier.meta,
+    'capsLock': HotKeyModifier.capsLock,
+    'fn': HotKeyModifier.fn,
+  };
+
   Map<String, dynamic> _serializeHotKey(HotKey hotKey) {
     return {
       'key': hotKey.key.toString(),
@@ -454,24 +477,7 @@ class SettingsService {
       final modifierNames = (data['modifiers'] as List<dynamic>).cast<String>();
 
       final modifiers = modifierNames
-          .map((name) {
-            switch (name) {
-              case 'alt':
-                return HotKeyModifier.alt;
-              case 'control':
-                return HotKeyModifier.control;
-              case 'shift':
-                return HotKeyModifier.shift;
-              case 'meta':
-                return HotKeyModifier.meta;
-              case 'capsLock':
-                return HotKeyModifier.capsLock;
-              case 'fn':
-                return HotKeyModifier.fn;
-              default:
-                return null;
-            }
-          })
+          .map((name) => _modifierMap[name])
           .where((m) => m != null)
           .cast<HotKeyModifier>()
           .toList();
@@ -489,255 +495,205 @@ class SettingsService {
     return null;
   }
 
+  // Unified map for USB HID codes to PhysicalKeyboardKey
+  static const _usbHidKeyMap = <String, PhysicalKeyboardKey>{
+    // Special keys
+    '0007002c': PhysicalKeyboardKey.space,
+    '0007002a': PhysicalKeyboardKey.backspace,
+    '0007004c': PhysicalKeyboardKey.delete,
+    '00070028': PhysicalKeyboardKey.enter,
+    '00070029': PhysicalKeyboardKey.escape,
+    '0007002b': PhysicalKeyboardKey.tab,
+    '00070039': PhysicalKeyboardKey.capsLock,
+    // Arrow keys
+    '00070050': PhysicalKeyboardKey.arrowLeft,
+    '00070052': PhysicalKeyboardKey.arrowUp,
+    '0007004f': PhysicalKeyboardKey.arrowRight,
+    '00070051': PhysicalKeyboardKey.arrowDown,
+    // Navigation keys
+    '0007004a': PhysicalKeyboardKey.home,
+    '0007004d': PhysicalKeyboardKey.end,
+    '0007004b': PhysicalKeyboardKey.pageUp,
+    '0007004e': PhysicalKeyboardKey.pageDown,
+    // Symbol keys
+    '0007002d': PhysicalKeyboardKey.equal,
+    '0007002e': PhysicalKeyboardKey.minus,
+    // Function keys
+    '0007003a': PhysicalKeyboardKey.f1,
+    '0007003b': PhysicalKeyboardKey.f2,
+    '0007003c': PhysicalKeyboardKey.f3,
+    '0007003d': PhysicalKeyboardKey.f4,
+    '0007003e': PhysicalKeyboardKey.f5,
+    '0007003f': PhysicalKeyboardKey.f6,
+    '00070040': PhysicalKeyboardKey.f7,
+    '00070041': PhysicalKeyboardKey.f8,
+    '00070042': PhysicalKeyboardKey.f9,
+    '00070043': PhysicalKeyboardKey.f10,
+    '00070044': PhysicalKeyboardKey.f11,
+    '00070045': PhysicalKeyboardKey.f12,
+    // Number keys
+    '00070027': PhysicalKeyboardKey.digit0,
+    '0007001e': PhysicalKeyboardKey.digit1,
+    '0007001f': PhysicalKeyboardKey.digit2,
+    '00070020': PhysicalKeyboardKey.digit3,
+    '00070021': PhysicalKeyboardKey.digit4,
+    '00070022': PhysicalKeyboardKey.digit5,
+    '00070023': PhysicalKeyboardKey.digit6,
+    '00070024': PhysicalKeyboardKey.digit7,
+    '00070025': PhysicalKeyboardKey.digit8,
+    '00070026': PhysicalKeyboardKey.digit9,
+    // Letter keys
+    '00070004': PhysicalKeyboardKey.keyA,
+    '00070005': PhysicalKeyboardKey.keyB,
+    '00070006': PhysicalKeyboardKey.keyC,
+    '00070007': PhysicalKeyboardKey.keyD,
+    '00070008': PhysicalKeyboardKey.keyE,
+    '00070009': PhysicalKeyboardKey.keyF,
+    '0007000a': PhysicalKeyboardKey.keyG,
+    '0007000b': PhysicalKeyboardKey.keyH,
+    '0007000c': PhysicalKeyboardKey.keyI,
+    '0007000d': PhysicalKeyboardKey.keyJ,
+    '0007000e': PhysicalKeyboardKey.keyK,
+    '0007000f': PhysicalKeyboardKey.keyL,
+    '00070010': PhysicalKeyboardKey.keyM,
+    '00070011': PhysicalKeyboardKey.keyN,
+    '00070012': PhysicalKeyboardKey.keyO,
+    '00070013': PhysicalKeyboardKey.keyP,
+    '00070014': PhysicalKeyboardKey.keyQ,
+    '00070015': PhysicalKeyboardKey.keyR,
+    '00070016': PhysicalKeyboardKey.keyS,
+    '00070017': PhysicalKeyboardKey.keyT,
+    '00070018': PhysicalKeyboardKey.keyU,
+    '00070019': PhysicalKeyboardKey.keyV,
+    '0007001a': PhysicalKeyboardKey.keyW,
+    '0007001b': PhysicalKeyboardKey.keyX,
+    '0007001c': PhysicalKeyboardKey.keyY,
+    '0007001d': PhysicalKeyboardKey.keyZ,
+  };
+
+  // Map for pattern-based key name matching (lowercase keys for case-insensitive matching)
+  static const _keyNameMap = <String, PhysicalKeyboardKey>{
+    'space': PhysicalKeyboardKey.space,
+    'backspace': PhysicalKeyboardKey.backspace,
+    'delete': PhysicalKeyboardKey.delete,
+    'enter': PhysicalKeyboardKey.enter,
+    'escape': PhysicalKeyboardKey.escape,
+    'tab': PhysicalKeyboardKey.tab,
+    'capslock': PhysicalKeyboardKey.capsLock,
+    'arrowleft': PhysicalKeyboardKey.arrowLeft,
+    'arrowup': PhysicalKeyboardKey.arrowUp,
+    'arrowright': PhysicalKeyboardKey.arrowRight,
+    'arrowdown': PhysicalKeyboardKey.arrowDown,
+    'home': PhysicalKeyboardKey.home,
+    'end': PhysicalKeyboardKey.end,
+    'pageup': PhysicalKeyboardKey.pageUp,
+    'pagedown': PhysicalKeyboardKey.pageDown,
+    'equal': PhysicalKeyboardKey.equal,
+    'minus': PhysicalKeyboardKey.minus,
+  };
+
+  // Function keys map
+  static const _functionKeyMap = <String, PhysicalKeyboardKey>{
+    'f1': PhysicalKeyboardKey.f1,
+    'f2': PhysicalKeyboardKey.f2,
+    'f3': PhysicalKeyboardKey.f3,
+    'f4': PhysicalKeyboardKey.f4,
+    'f5': PhysicalKeyboardKey.f5,
+    'f6': PhysicalKeyboardKey.f6,
+    'f7': PhysicalKeyboardKey.f7,
+    'f8': PhysicalKeyboardKey.f8,
+    'f9': PhysicalKeyboardKey.f9,
+    'f10': PhysicalKeyboardKey.f10,
+    'f11': PhysicalKeyboardKey.f11,
+    'f12': PhysicalKeyboardKey.f12,
+  };
+
+  // Digit keys map
+  static const _digitKeyMap = <String, PhysicalKeyboardKey>{
+    'digit0': PhysicalKeyboardKey.digit0,
+    'digit1': PhysicalKeyboardKey.digit1,
+    'digit2': PhysicalKeyboardKey.digit2,
+    'digit3': PhysicalKeyboardKey.digit3,
+    'digit4': PhysicalKeyboardKey.digit4,
+    'digit5': PhysicalKeyboardKey.digit5,
+    'digit6': PhysicalKeyboardKey.digit6,
+    'digit7': PhysicalKeyboardKey.digit7,
+    'digit8': PhysicalKeyboardKey.digit8,
+    'digit9': PhysicalKeyboardKey.digit9,
+  };
+
+  // Letter keys map
+  static const _letterKeyMap = <String, PhysicalKeyboardKey>{
+    'keya': PhysicalKeyboardKey.keyA,
+    'keyb': PhysicalKeyboardKey.keyB,
+    'keyc': PhysicalKeyboardKey.keyC,
+    'keyd': PhysicalKeyboardKey.keyD,
+    'keye': PhysicalKeyboardKey.keyE,
+    'keyf': PhysicalKeyboardKey.keyF,
+    'keyg': PhysicalKeyboardKey.keyG,
+    'keyh': PhysicalKeyboardKey.keyH,
+    'keyi': PhysicalKeyboardKey.keyI,
+    'keyj': PhysicalKeyboardKey.keyJ,
+    'keyk': PhysicalKeyboardKey.keyK,
+    'keyl': PhysicalKeyboardKey.keyL,
+    'keym': PhysicalKeyboardKey.keyM,
+    'keyn': PhysicalKeyboardKey.keyN,
+    'keyo': PhysicalKeyboardKey.keyO,
+    'keyp': PhysicalKeyboardKey.keyP,
+    'keyq': PhysicalKeyboardKey.keyQ,
+    'keyr': PhysicalKeyboardKey.keyR,
+    'keys': PhysicalKeyboardKey.keyS,
+    'keyt': PhysicalKeyboardKey.keyT,
+    'keyu': PhysicalKeyboardKey.keyU,
+    'keyv': PhysicalKeyboardKey.keyV,
+    'keyw': PhysicalKeyboardKey.keyW,
+    'keyx': PhysicalKeyboardKey.keyX,
+    'keyy': PhysicalKeyboardKey.keyY,
+    'keyz': PhysicalKeyboardKey.keyZ,
+  };
+
   // Helper method to find PhysicalKeyboardKey by string representation
   PhysicalKeyboardKey? _findKeyByString(String keyString) {
-    // Handle exact string matches first for better performance
-    const keyMap = {
-      'PhysicalKeyboardKey#0002c': PhysicalKeyboardKey.space,
-      'PhysicalKeyboardKey#7002a': PhysicalKeyboardKey.backspace,
-      'PhysicalKeyboardKey#7004c': PhysicalKeyboardKey.delete,
-      'PhysicalKeyboardKey#70028': PhysicalKeyboardKey.enter,
-      'PhysicalKeyboardKey#70029': PhysicalKeyboardKey.escape,
-      'PhysicalKeyboardKey#7002b': PhysicalKeyboardKey.tab,
-      'PhysicalKeyboardKey#7004a': PhysicalKeyboardKey.home,
-      'PhysicalKeyboardKey#7004d': PhysicalKeyboardKey.end,
-      'PhysicalKeyboardKey#7004b': PhysicalKeyboardKey.pageUp,
-      'PhysicalKeyboardKey#7004e': PhysicalKeyboardKey.pageDown,
-      'PhysicalKeyboardKey#70050': PhysicalKeyboardKey.arrowLeft,
-      'PhysicalKeyboardKey#70052': PhysicalKeyboardKey.arrowUp,
-      'PhysicalKeyboardKey#7004f': PhysicalKeyboardKey.arrowRight,
-      'PhysicalKeyboardKey#70051': PhysicalKeyboardKey.arrowDown,
-    };
+    final normalized = keyString.toLowerCase();
 
-    // Check exact matches first
-    if (keyMap.containsKey(keyString)) {
-      return keyMap[keyString];
-    }
-
-    // Alternative approach: extract USB HID usage code from the toString() output
+    // Try extracting USB HID code from toString() output
     // Format: PhysicalKeyboardKey#ec9ed(usbHidUsage: "0x0007002c", debugName: "Space")
-    try {
-      final usbHidMatch = RegExp(
-        r'usbHidUsage: "0x([0-9a-fA-F]+)"',
-      ).firstMatch(keyString);
-      if (usbHidMatch != null) {
-        final usbHidCode = usbHidMatch.group(1)!.toLowerCase();
-
-        // Map USB HID codes to PhysicalKeyboardKey objects
-        const usbHidMap = {
-          '0007002c': PhysicalKeyboardKey.space,
-          '0007002a': PhysicalKeyboardKey.backspace,
-          '0007004c': PhysicalKeyboardKey.delete,
-          '00070028': PhysicalKeyboardKey.enter,
-          '00070029': PhysicalKeyboardKey.escape,
-          '0007002b': PhysicalKeyboardKey.tab,
-          '00070039': PhysicalKeyboardKey.capsLock,
-          // Function keys
-          '0007003a': PhysicalKeyboardKey.f1,
-          '0007003b': PhysicalKeyboardKey.f2,
-          '0007003c': PhysicalKeyboardKey.f3,
-          '0007003d': PhysicalKeyboardKey.f4,
-          '0007003e': PhysicalKeyboardKey.f5,
-          '0007003f': PhysicalKeyboardKey.f6,
-          '00070040': PhysicalKeyboardKey.f7,
-          '00070041': PhysicalKeyboardKey.f8,
-          '00070042': PhysicalKeyboardKey.f9,
-          '00070043': PhysicalKeyboardKey.f10,
-          '00070044': PhysicalKeyboardKey.f11,
-          '00070045': PhysicalKeyboardKey.f12,
-          // Number keys
-          '00070027': PhysicalKeyboardKey.digit0,
-          '0007001e': PhysicalKeyboardKey.digit1,
-          '0007001f': PhysicalKeyboardKey.digit2,
-          '00070020': PhysicalKeyboardKey.digit3,
-          '00070021': PhysicalKeyboardKey.digit4,
-          '00070022': PhysicalKeyboardKey.digit5,
-          '00070023': PhysicalKeyboardKey.digit6,
-          '00070024': PhysicalKeyboardKey.digit7,
-          '00070025': PhysicalKeyboardKey.digit8,
-          '00070026': PhysicalKeyboardKey.digit9,
-          // Letter keys
-          '00070004': PhysicalKeyboardKey.keyA,
-          '00070005': PhysicalKeyboardKey.keyB,
-          '00070006': PhysicalKeyboardKey.keyC,
-          '00070007': PhysicalKeyboardKey.keyD,
-          '00070008': PhysicalKeyboardKey.keyE,
-          '00070009': PhysicalKeyboardKey.keyF,
-          '0007000a': PhysicalKeyboardKey.keyG,
-          '0007000b': PhysicalKeyboardKey.keyH,
-          '0007000c': PhysicalKeyboardKey.keyI,
-          '0007000d': PhysicalKeyboardKey.keyJ,
-          '0007000e': PhysicalKeyboardKey.keyK,
-          '0007000f': PhysicalKeyboardKey.keyL,
-          '00070010': PhysicalKeyboardKey.keyM,
-          '00070011': PhysicalKeyboardKey.keyN,
-          '00070012': PhysicalKeyboardKey.keyO,
-          '00070013': PhysicalKeyboardKey.keyP,
-          '00070014': PhysicalKeyboardKey.keyQ,
-          '00070015': PhysicalKeyboardKey.keyR,
-          '00070016': PhysicalKeyboardKey.keyS,
-          '00070017': PhysicalKeyboardKey.keyT,
-          '00070018': PhysicalKeyboardKey.keyU,
-          '00070019': PhysicalKeyboardKey.keyV,
-          '0007001a': PhysicalKeyboardKey.keyW,
-          '0007001b': PhysicalKeyboardKey.keyX,
-          '0007001c': PhysicalKeyboardKey.keyY,
-          '0007001d': PhysicalKeyboardKey.keyZ,
-          // Arrow keys
-          '00070050': PhysicalKeyboardKey.arrowLeft,
-          '00070052': PhysicalKeyboardKey.arrowUp,
-          '0007004f': PhysicalKeyboardKey.arrowRight,
-          '00070051': PhysicalKeyboardKey.arrowDown,
-          // Other common keys
-          '0007002d': PhysicalKeyboardKey.equal,
-          '0007002e': PhysicalKeyboardKey.minus,
-          '0007004a': PhysicalKeyboardKey.home,
-          '0007004d': PhysicalKeyboardKey.end,
-          '0007004b': PhysicalKeyboardKey.pageUp,
-          '0007004e': PhysicalKeyboardKey.pageDown,
-        };
-
-        if (usbHidMap.containsKey(usbHidCode)) {
-          return usbHidMap[usbHidCode];
-        }
-      }
-    } catch (e) {
-      // Ignore parsing errors
+    final usbHidMatch = RegExp(r'usbhidusage: "0x([0-9a-f]+)"').firstMatch(normalized);
+    if (usbHidMatch != null) {
+      final usbHidCode = usbHidMatch.group(1)!;
+      final key = _usbHidKeyMap[usbHidCode];
+      if (key != null) return key;
     }
 
-    // Fall back to contains() checks for partial matches
-    if (keyString.contains('space')) {
-      return PhysicalKeyboardKey.space;
-    } else if (keyString.contains('arrowUp')) {
-      return PhysicalKeyboardKey.arrowUp;
-    } else if (keyString.contains('arrowDown')) {
-      return PhysicalKeyboardKey.arrowDown;
-    } else if (keyString.contains('arrowLeft')) {
-      return PhysicalKeyboardKey.arrowLeft;
-    } else if (keyString.contains('arrowRight')) {
-      return PhysicalKeyboardKey.arrowRight;
-    } else if (keyString.contains('equal')) {
-      return PhysicalKeyboardKey.equal;
-    } else if (keyString.contains('minus')) {
-      return PhysicalKeyboardKey.minus;
-    } else if (keyString.contains('escape')) {
-      return PhysicalKeyboardKey.escape;
-    } else if (keyString.contains('enter')) {
-      return PhysicalKeyboardKey.enter;
-    } else if (keyString.contains('tab')) {
-      return PhysicalKeyboardKey.tab;
-    } else if (keyString.contains('backspace')) {
-      return PhysicalKeyboardKey.backspace;
-    } else if (keyString.contains('delete')) {
-      return PhysicalKeyboardKey.delete;
-    } else if (keyString.contains('home')) {
-      return PhysicalKeyboardKey.home;
-    } else if (keyString.contains('end')) {
-      return PhysicalKeyboardKey.end;
-    } else if (keyString.contains('pageUp')) {
-      return PhysicalKeyboardKey.pageUp;
-    } else if (keyString.contains('pageDown')) {
-      return PhysicalKeyboardKey.pageDown;
-    } else {
-      // Try function keys F1-F12
-      for (int i = 1; i <= 12; i++) {
-        if (keyString.contains('f$i') || keyString.contains('F$i')) {
-          switch (i) {
-            case 1:
-              return PhysicalKeyboardKey.f1;
-            case 2:
-              return PhysicalKeyboardKey.f2;
-            case 3:
-              return PhysicalKeyboardKey.f3;
-            case 4:
-              return PhysicalKeyboardKey.f4;
-            case 5:
-              return PhysicalKeyboardKey.f5;
-            case 6:
-              return PhysicalKeyboardKey.f6;
-            case 7:
-              return PhysicalKeyboardKey.f7;
-            case 8:
-              return PhysicalKeyboardKey.f8;
-            case 9:
-              return PhysicalKeyboardKey.f9;
-            case 10:
-              return PhysicalKeyboardKey.f10;
-            case 11:
-              return PhysicalKeyboardKey.f11;
-            case 12:
-              return PhysicalKeyboardKey.f12;
-          }
-        }
+    // Try direct name matches
+    for (final entry in _keyNameMap.entries) {
+      if (normalized.contains(entry.key)) {
+        return entry.value;
       }
-
-      // Try number keys 0-9
-      for (int i = 0; i <= 9; i++) {
-        if (keyString.contains('digit$i') || keyString.contains('Digit$i')) {
-          switch (i) {
-            case 0:
-              return PhysicalKeyboardKey.digit0;
-            case 1:
-              return PhysicalKeyboardKey.digit1;
-            case 2:
-              return PhysicalKeyboardKey.digit2;
-            case 3:
-              return PhysicalKeyboardKey.digit3;
-            case 4:
-              return PhysicalKeyboardKey.digit4;
-            case 5:
-              return PhysicalKeyboardKey.digit5;
-            case 6:
-              return PhysicalKeyboardKey.digit6;
-            case 7:
-              return PhysicalKeyboardKey.digit7;
-            case 8:
-              return PhysicalKeyboardKey.digit8;
-            case 9:
-              return PhysicalKeyboardKey.digit9;
-          }
-        }
-      }
-
-      // Try letter keys A-Z (both upper and lower case patterns)
-      const letterKeys = {
-        'A': PhysicalKeyboardKey.keyA,
-        'B': PhysicalKeyboardKey.keyB,
-        'C': PhysicalKeyboardKey.keyC,
-        'D': PhysicalKeyboardKey.keyD,
-        'E': PhysicalKeyboardKey.keyE,
-        'F': PhysicalKeyboardKey.keyF,
-        'G': PhysicalKeyboardKey.keyG,
-        'H': PhysicalKeyboardKey.keyH,
-        'I': PhysicalKeyboardKey.keyI,
-        'J': PhysicalKeyboardKey.keyJ,
-        'K': PhysicalKeyboardKey.keyK,
-        'L': PhysicalKeyboardKey.keyL,
-        'M': PhysicalKeyboardKey.keyM,
-        'N': PhysicalKeyboardKey.keyN,
-        'O': PhysicalKeyboardKey.keyO,
-        'P': PhysicalKeyboardKey.keyP,
-        'Q': PhysicalKeyboardKey.keyQ,
-        'R': PhysicalKeyboardKey.keyR,
-        'S': PhysicalKeyboardKey.keyS,
-        'T': PhysicalKeyboardKey.keyT,
-        'U': PhysicalKeyboardKey.keyU,
-        'V': PhysicalKeyboardKey.keyV,
-        'W': PhysicalKeyboardKey.keyW,
-        'X': PhysicalKeyboardKey.keyX,
-        'Y': PhysicalKeyboardKey.keyY,
-        'Z': PhysicalKeyboardKey.keyZ,
-      };
-
-      for (final entry in letterKeys.entries) {
-        if (keyString.contains('key${entry.key}') ||
-            keyString.contains('Key${entry.key}')) {
-          return entry.value;
-        }
-      }
-
-      return null;
     }
+
+    // Try function keys (check longer patterns first to avoid f1 matching f10)
+    for (final entry in _functionKeyMap.entries) {
+      if (normalized.contains(entry.key)) {
+        return entry.value;
+      }
+    }
+
+    // Try digit keys
+    for (final entry in _digitKeyMap.entries) {
+      if (normalized.contains(entry.key)) {
+        return entry.value;
+      }
+    }
+
+    // Try letter keys
+    for (final entry in _letterKeyMap.entries) {
+      if (normalized.contains(entry.key)) {
+        return entry.value;
+      }
+    }
+
+    return null;
   }
 
   // Media Version Preferences
@@ -752,7 +708,7 @@ class SettingsService {
     preferences[seriesRatingKey] = mediaIndex;
 
     final jsonString = json.encode(preferences);
-    await _prefs.setString(_keyMediaVersionPreferences, jsonString);
+    await prefs.setString(_keyMediaVersionPreferences, jsonString);
   }
 
   /// Get saved media version preference for a series
@@ -768,17 +724,22 @@ class SettingsService {
     preferences.remove(seriesRatingKey);
 
     final jsonString = json.encode(preferences);
-    await _prefs.setString(_keyMediaVersionPreferences, jsonString);
+    await prefs.setString(_keyMediaVersionPreferences, jsonString);
   }
 
   /// Get all media version preferences
   Map<String, int> _getMediaVersionPreferences() {
-    final jsonString = _prefs.getString(_keyMediaVersionPreferences);
+    final jsonString = prefs.getString(_keyMediaVersionPreferences);
     if (jsonString == null) return {};
 
+    final decoded = _decodeJsonStringToMap(jsonString);
+    return decoded.map((key, value) => MapEntry(key, value as int));
+  }
+
+  /// Helper to decode JSON string to Map with error handling
+  Map<String, dynamic> _decodeJsonStringToMap(String jsonString) {
     try {
-      final decoded = json.decode(jsonString) as Map<String, dynamic>;
-      return decoded.map((key, value) => MapEntry(key, value as int));
+      return json.decode(jsonString) as Map<String, dynamic>;
     } catch (e) {
       return {};
     }
@@ -786,11 +747,11 @@ class SettingsService {
 
   // App Locale
   Future<void> setAppLocale(AppLocale locale) async {
-    await _prefs.setString(_keyAppLocale, locale.languageCode);
+    await prefs.setString(_keyAppLocale, locale.languageCode);
   }
 
   AppLocale getAppLocale() {
-    final localeString = _prefs.getString(_keyAppLocale);
+    final localeString = prefs.getString(_keyAppLocale);
     if (localeString == null) return AppLocale.en; // Default to English
 
     return AppLocale.values.firstWhere(
@@ -799,67 +760,114 @@ class SettingsService {
     );
   }
 
-  // Shuffle Play Settings
+  // Track Selection Settings
 
-  /// Shuffle Unwatched Only - Filter shuffle queue to unwatched episodes only
-  Future<void> setShuffleUnwatchedOnly(bool enabled) async {
-    await _prefs.setBool(_keyShuffleUnwatchedOnly, enabled);
+  /// Remember Track Selections - Save per-media audio/subtitle language preferences
+  Future<void> setRememberTrackSelections(bool value) async {
+    await prefs.setBool(_keyRememberTrackSelections, value);
   }
 
-  bool getShuffleUnwatchedOnly() {
-    return _prefs.getBool(_keyShuffleUnwatchedOnly) ?? true; // Default: true
+  bool getRememberTrackSelections() {
+    return prefs.getBool(_keyRememberTrackSelections) ?? true;
   }
 
-  /// Shuffle Order Navigation - Next/previous buttons follow shuffled order
-  Future<void> setShuffleOrderNavigation(bool enabled) async {
-    await _prefs.setBool(_keyShuffleOrderNavigation, enabled);
+  // Auto Skip Intro
+  Future<void> setAutoSkipIntro(bool value) async {
+    await prefs.setBool(_keyAutoSkipIntro, value);
   }
 
-  bool getShuffleOrderNavigation() {
-    return _prefs.getBool(_keyShuffleOrderNavigation) ?? true; // Default: true
+  bool getAutoSkipIntro() {
+    return prefs.getBool(_keyAutoSkipIntro) ?? true; // Default: enabled
   }
 
-  /// Shuffle Loop Queue - Restart queue when reaching the end
-  Future<void> setShuffleLoopQueue(bool enabled) async {
-    await _prefs.setBool(_keyShuffleLoopQueue, enabled);
+  // Auto Skip Credits
+  Future<void> setAutoSkipCredits(bool value) async {
+    await prefs.setBool(_keyAutoSkipCredits, value);
   }
 
-  bool getShuffleLoopQueue() {
-    return _prefs.getBool(_keyShuffleLoopQueue) ?? false; // Default: false
+  bool getAutoSkipCredits() {
+    return prefs.getBool(_keyAutoSkipCredits) ?? true; // Default: enabled
+  }
+
+  // Auto Skip Delay (in seconds)
+  Future<void> setAutoSkipDelay(int seconds) async {
+    await prefs.setInt(_keyAutoSkipDelay, seconds);
+  }
+
+  int getAutoSkipDelay() {
+    return prefs.getInt(_keyAutoSkipDelay) ?? 5; // Default: 5 seconds
+  }
+
+  // Custom Download Path
+  Future<void> setCustomDownloadPath(
+    String? path, {
+    String type = 'file',
+  }) async {
+    if (path == null) {
+      await prefs.remove(_keyCustomDownloadPath);
+      await prefs.remove(_keyCustomDownloadPathType);
+    } else {
+      await prefs.setString(_keyCustomDownloadPath, path);
+      await prefs.setString(_keyCustomDownloadPathType, type);
+    }
+  }
+
+  String? getCustomDownloadPath() {
+    return prefs.getString(_keyCustomDownloadPath);
+  }
+
+  String getCustomDownloadPathType() {
+    return prefs.getString(_keyCustomDownloadPathType) ?? 'file';
+  }
+
+  bool hasCustomDownloadPath() {
+    return prefs.containsKey(_keyCustomDownloadPath);
+  }
+
+  // Download on WiFi Only
+  Future<void> setDownloadOnWifiOnly(bool value) async {
+    await prefs.setBool(_keyDownloadOnWifiOnly, value);
+  }
+
+  bool getDownloadOnWifiOnly() {
+    return prefs.getBool(_keyDownloadOnWifiOnly) ?? false;
   }
 
   // Reset all settings to defaults
   Future<void> resetAllSettings() async {
     await Future.wait([
-      _prefs.remove(_keyThemeMode),
-      _prefs.remove(_keyEnableDebugLogging),
-      _prefs.remove(_keyBufferSize),
-      _prefs.remove(_keyKeyboardShortcuts),
-      _prefs.remove(_keyKeyboardHotkeys),
-      _prefs.remove(_keyEnableHardwareDecoding),
-      _prefs.remove(_keyPreferredVideoCodec),
-      _prefs.remove(_keyPreferredAudioCodec),
-      _prefs.remove(_keyLibraryDensity),
-      _prefs.remove(_keyViewMode),
-      _prefs.remove(_keyUseSeasonPoster),
-      _prefs.remove(_keyShowHeroSection),
-      _prefs.remove(_keySeekTimeSmall),
-      _prefs.remove(_keySeekTimeLarge),
-      _prefs.remove(_keyMediaVersionPreferences),
-      _prefs.remove(_keySleepTimerDuration),
-      _prefs.remove(_keyAudioSyncOffset),
-      _prefs.remove(_keySubtitleSyncOffset),
-      _prefs.remove(_keyVolume),
-      _prefs.remove(_keySubtitleFontSize),
-      _prefs.remove(_keySubtitleTextColor),
-      _prefs.remove(_keySubtitleBorderSize),
-      _prefs.remove(_keySubtitleBorderColor),
-      _prefs.remove(_keySubtitleBackgroundColor),
-      _prefs.remove(_keySubtitleBackgroundOpacity),
-      _prefs.remove(_keyShuffleUnwatchedOnly),
-      _prefs.remove(_keyShuffleOrderNavigation),
-      _prefs.remove(_keyShuffleLoopQueue),
-      _prefs.remove(_keyAppLocale),
+      prefs.remove(_keyThemeMode),
+      prefs.remove(_keyEnableDebugLogging),
+      prefs.remove(_keyBufferSize),
+      prefs.remove(_keyKeyboardShortcuts),
+      prefs.remove(_keyKeyboardHotkeys),
+      prefs.remove(_keyEnableHardwareDecoding),
+      prefs.remove(_keyEnableHDR),
+      prefs.remove(_keyPreferredVideoCodec),
+      prefs.remove(_keyPreferredAudioCodec),
+      prefs.remove(_keyLibraryDensity),
+      prefs.remove(_keyViewMode),
+      prefs.remove(_keyUseSeasonPoster),
+      prefs.remove(_keyShowHeroSection),
+      prefs.remove(_keySeekTimeSmall),
+      prefs.remove(_keySeekTimeLarge),
+      prefs.remove(_keyMediaVersionPreferences),
+      prefs.remove(_keySleepTimerDuration),
+      prefs.remove(_keyAudioSyncOffset),
+      prefs.remove(_keySubtitleSyncOffset),
+      prefs.remove(_keyVolume),
+      prefs.remove(_keySubtitleFontSize),
+      prefs.remove(_keySubtitleTextColor),
+      prefs.remove(_keySubtitleBorderSize),
+      prefs.remove(_keySubtitleBorderColor),
+      prefs.remove(_keySubtitleBackgroundColor),
+      prefs.remove(_keySubtitleBackgroundOpacity),
+      prefs.remove(_keyAppLocale),
+      prefs.remove(_keyRememberTrackSelections),
+      prefs.remove(_keyCustomDownloadPath),
+      prefs.remove(_keyCustomDownloadPathType),
+      prefs.remove(_keyDownloadOnWifiOnly),
+      prefs.remove(_keyVideoPlayerNavigationEnabled),
     ]);
   }
 
@@ -891,6 +899,10 @@ class SettingsService {
       'keyboardHotkeys': hotkeys.map(
         (key, value) => MapEntry(key, _serializeHotKey(value)),
       ),
+      'rememberTrackSelections': getRememberTrackSelections(),
+      'autoSkipIntro': getAutoSkipIntro(),
+      'autoSkipCredits': getAutoSkipCredits(),
+      'autoSkipDelay': getAutoSkipDelay(),
     };
   }
 }
diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart
index 1b1c9349..9aafed7a 100644
--- a/lib/services/storage_service.dart
+++ b/lib/services/storage_service.dart
@@ -1,7 +1,9 @@
 import 'dart:convert';
-import 'package:shared_preferences/shared_preferences.dart';
 
-class StorageService {
+import '../utils/log_redaction_manager.dart';
+import 'base_shared_preferences_service.dart';
+
+class StorageService extends BaseSharedPreferencesService {
   static const String _keyServerUrl = 'server_url';
   static const String _keyToken = 'token';
   static const String _keyPlexToken = 'plex_token';
@@ -16,40 +18,85 @@ class StorageService {
   static const String _keyHomeUsersCache = 'home_users_cache';
   static const String _keyHomeUsersCacheExpiry = 'home_users_cache_expiry';
   static const String _keyHiddenLibraries = 'hidden_libraries';
+  static const String _keyServersList = 'servers_list';
+  static const String _keyEnabledServers = 'enabled_servers';
+  static const String _keyServerOrder = 'server_order';
 
-  static StorageService? _instance;
-  late SharedPreferences _prefs;
+  // Key prefixes for per-id storage
+  static const String _prefixServerEndpoint = 'server_endpoint_';
+  static const String _prefixLibraryFilters = 'library_filters_';
+  static const String _prefixLibrarySort = 'library_sort_';
+  static const String _prefixLibraryGrouping = 'library_grouping_';
+  static const String _prefixLibraryTab = 'library_tab_';
+
+  // Key groups for bulk clearing
+  static const List<String> _credentialKeys = [
+    _keyServerUrl,
+    _keyToken,
+    _keyPlexToken,
+    _keyServerData,
+    _keyClientId,
+    _keyUserProfile,
+    _keyCurrentUserUUID,
+    _keyHomeUsersCache,
+    _keyHomeUsersCacheExpiry,
+  ];
+
+  static const List<String> _libraryPreferenceKeys = [
+    _keySelectedLibraryIndex,
+    _keyLibraryFilters,
+    _keyLibraryOrder,
+    _keyHiddenLibraries,
+  ];
 
   StorageService._();
 
   static Future<StorageService> getInstance() async {
-    if (_instance == null) {
-      _instance = StorageService._();
-      await _instance!._init();
-    }
-    return _instance!;
+    return BaseSharedPreferencesService.initializeInstance(
+      () => StorageService._(),
+    );
   }
 
-  Future<void> _init() async {
-    _prefs = await SharedPreferences.getInstance();
+  @override
+  Future<void> onInit() async {
+    // Seed known values so logs can redact immediately on startup.
+    LogRedactionManager.registerServerUrl(getServerUrl());
+    LogRedactionManager.registerToken(getToken());
+    LogRedactionManager.registerToken(getPlexToken());
   }
 
   // Server URL
   Future<void> saveServerUrl(String url) async {
-    await _prefs.setString(_keyServerUrl, url);
+    await prefs.setString(_keyServerUrl, url);
+    LogRedactionManager.registerServerUrl(url);
   }
 
   String? getServerUrl() {
-    return _prefs.getString(_keyServerUrl);
+    return prefs.getString(_keyServerUrl);
+  }
+
+  // Per-Server Endpoint URL (for multi-server connection caching)
+  Future<void> saveServerEndpoint(String serverId, String url) async {
+    await prefs.setString('$_prefixServerEndpoint$serverId', url);
+    LogRedactionManager.registerServerUrl(url);
+  }
+
+  String? getServerEndpoint(String serverId) {
+    return prefs.getString('$_prefixServerEndpoint$serverId');
+  }
+
+  Future<void> clearServerEndpoint(String serverId) async {
+    await prefs.remove('$_prefixServerEndpoint$serverId');
   }
 
   // Server Access Token
   Future<void> saveToken(String token) async {
-    await _prefs.setString(_keyToken, token);
+    await prefs.setString(_keyToken, token);
+    LogRedactionManager.registerToken(token);
   }
 
   String? getToken() {
-    return _prefs.getString(_keyToken);
+    return prefs.getString(_keyToken);
   }
 
   // Alias for server access token for clarity
@@ -63,37 +110,30 @@ class StorageService {
 
   // Plex.tv Token (for API access)
   Future<void> savePlexToken(String token) async {
-    await _prefs.setString(_keyPlexToken, token);
+    await prefs.setString(_keyPlexToken, token);
+    LogRedactionManager.registerToken(token);
   }
 
   String? getPlexToken() {
-    return _prefs.getString(_keyPlexToken);
+    return prefs.getString(_keyPlexToken);
   }
 
   // Server Data (full PlexServer object as JSON)
   Future<void> saveServerData(Map<String, dynamic> serverJson) async {
-    final jsonString = json.encode(serverJson);
-    await _prefs.setString(_keyServerData, jsonString);
+    await _setJsonMap(_keyServerData, serverJson);
   }
 
   Map<String, dynamic>? getServerData() {
-    final jsonString = _prefs.getString(_keyServerData);
-    if (jsonString == null) return null;
-
-    try {
-      return json.decode(jsonString) as Map<String, dynamic>;
-    } catch (e) {
-      return null;
-    }
+    return _readJsonMap(_keyServerData);
   }
 
   // Client Identifier
   Future<void> saveClientIdentifier(String clientId) async {
-    await _prefs.setString(_keyClientId, clientId);
+    await prefs.setString(_keyClientId, clientId);
   }
 
   String? getClientIdentifier() {
-    return _prefs.getString(_keyClientId);
+    return prefs.getString(_keyClientId);
   }
 
   // Save all credentials at once
@@ -117,16 +157,10 @@ class StorageService {
   // Clear all credentials
   Future<void> clearCredentials() async {
     await Future.wait([
-      _prefs.remove(_keyServerUrl),
-      _prefs.remove(_keyToken),
-      _prefs.remove(_keyPlexToken),
-      _prefs.remove(_keyServerData),
-      _prefs.remove(_keyClientId),
-      _prefs.remove(_keyUserProfile),
-      _prefs.remove(_keyCurrentUserUUID),
-      _prefs.remove(_keyHomeUsersCache),
-      _prefs.remove(_keyHomeUsersCacheExpiry),
+      ..._credentialKeys.map((k) => prefs.remove(k)),
+      clearMultiServerData(),
     ]);
+    LogRedactionManager.clearTrackedValues();
   }
 
   // Get all credentials as a map
@@ -138,61 +172,87 @@ class StorageService {
     };
   }
 
-  // Selected Library Index (deprecated - use library key instead)
-  Future<void> saveSelectedLibraryIndex(int index) async {
-    await _prefs.setInt(_keySelectedLibraryIndex, index);
-  }
-
   int? getSelectedLibraryIndex() {
-    return _prefs.getInt(_keySelectedLibraryIndex);
+    return prefs.getInt(_keySelectedLibraryIndex);
   }
 
   // Selected Library Key (replaces index-based selection)
   Future<void> saveSelectedLibraryKey(String key) async {
-    await _prefs.setString(_keySelectedLibraryKey, key);
+    await prefs.setString(_keySelectedLibraryKey, key);
   }
 
   String? getSelectedLibraryKey() {
-    return _prefs.getString(_keySelectedLibraryKey);
+    return prefs.getString(_keySelectedLibraryKey);
   }
 
   // Library Filters (stored as JSON string)
-  Future<void> saveLibraryFilters(Map<String, String> filters) async {
+  Future<void> saveLibraryFilters(
+    Map<String, String> filters, {
+    String? sectionId,
+  }) async {
+    final key = sectionId != null
+        ? '$_prefixLibraryFilters$sectionId'
+        : _keyLibraryFilters;
+    // Note: using Map<String, String> which json.encode handles correctly
     final jsonString = json.encode(filters);
-    await _prefs.setString(_keyLibraryFilters, jsonString);
+    await prefs.setString(key, jsonString);
   }
 
-  Map<String, String> getLibraryFilters() {
-    final jsonString = _prefs.getString(_keyLibraryFilters);
+  Map<String, String> getLibraryFilters({String? sectionId}) {
+    final scopedKey = sectionId != null
+        ? '$_prefixLibraryFilters$sectionId'
+        : _keyLibraryFilters;
+
+    // Prefer per-library filters when available
+    final jsonString =
+        prefs.getString(scopedKey) ??
+        // Legacy support: fall back to global filters if present
+        prefs.getString(_keyLibraryFilters);
     if (jsonString == null) return {};
 
-    try {
-      final decoded = json.decode(jsonString) as Map<String, dynamic>;
-      return decoded.map((key, value) => MapEntry(key, value.toString()));
-    } catch (e) {
-      return {};
-    }
+    final decoded = _decodeJsonStringToMap(jsonString);
+    return decoded.map((key, value) => MapEntry(key, value.toString()));
   }
 
-  // Library Sort (per-library, stored individually)
-  Future<void> saveLibrarySort(String sectionId, String sortKey) async {
-    await _prefs.setString('library_sort_$sectionId', sortKey);
+  // Library Sort (per-library, stored individually with descending flag)
+  Future<void> saveLibrarySort(
+    String sectionId,
+    String sortKey, {
+    bool descending = false,
+  }) async {
+    final sortData = {'key': sortKey, 'descending': descending};
+    await _setJsonMap('$_prefixLibrarySort$sectionId', sortData);
   }
 
-  String getLibrarySort(String sectionId) {
-    // Return saved sort or default to titleSort (alphabetical)
-    return _prefs.getString('library_sort_$sectionId') ?? 'titleSort';
+  Map<String, dynamic>? getLibrarySort(String sectionId) {
+    return _readJsonMap('$_prefixLibrarySort$sectionId', legacyStringOk: true);
+  }
+
+  // Library Grouping (per-library, e.g., 'movies', 'shows', 'seasons', 'episodes')
+  Future<void> saveLibraryGrouping(String sectionId, String grouping) async {
+    await prefs.setString('$_prefixLibraryGrouping$sectionId', grouping);
+  }
+
+  String? getLibraryGrouping(String sectionId) {
+    return prefs.getString('$_prefixLibraryGrouping$sectionId');
+  }
+
+  // Library Tab (per-library, saves last selected tab index)
+  Future<void> saveLibraryTab(String sectionId, int tabIndex) async {
+    await prefs.setInt('$_prefixLibraryTab$sectionId', tabIndex);
+  }
+
+  int? getLibraryTab(String sectionId) {
+    return prefs.getInt('$_prefixLibraryTab$sectionId');
   }
 
   // Hidden Libraries (stored as JSON array of library section IDs)
   Future<void> saveHiddenLibraries(Set<String> libraryKeys) async {
-    final list = libraryKeys.toList();
-    final jsonString = json.encode(list);
-    await _prefs.setString(_keyHiddenLibraries, jsonString);
+    await _setStringList(_keyHiddenLibraries, libraryKeys.toList());
   }
 
   Set<String> getHiddenLibraries() {
-    final jsonString = _prefs.getString(_keyHiddenLibraries);
+    final jsonString = prefs.getString(_keyHiddenLibraries);
     if (jsonString == null) return {};
 
     try {
@@ -206,102 +266,71 @@ class StorageService {
   // Clear library preferences
   Future<void> clearLibraryPreferences() async {
     await Future.wait([
-      _prefs.remove(_keySelectedLibraryIndex),
-      _prefs.remove(_keyLibraryFilters),
-      _prefs.remove(_keyLibraryOrder),
-      _prefs.remove(_keyHiddenLibraries),
+      ..._libraryPreferenceKeys.map((k) => prefs.remove(k)),
+      _clearKeysWithPrefix(_prefixLibrarySort),
+      _clearKeysWithPrefix(_prefixLibraryFilters),
+      _clearKeysWithPrefix(_prefixLibraryGrouping),
+      _clearKeysWithPrefix(_prefixLibraryTab),
     ]);
-
-    // Also clear all library sort preferences
-    final keys = _prefs.getKeys();
-    final sortKeys = keys.where((key) => key.startsWith('library_sort_'));
-    await Future.wait(sortKeys.map((key) => _prefs.remove(key)));
   }
 
   // Library Order (stored as JSON list of library keys)
   Future<void> saveLibraryOrder(List<String> libraryKeys) async {
-    final jsonString = json.encode(libraryKeys);
-    await _prefs.setString(_keyLibraryOrder, jsonString);
+    await _setStringList(_keyLibraryOrder, libraryKeys);
   }
 
-  List<String>? getLibraryOrder() {
-    final jsonString = _prefs.getString(_keyLibraryOrder);
-    if (jsonString == null) return null;
-
-    try {
-      final decoded = json.decode(jsonString) as List<dynamic>;
-      return decoded.map((e) => e.toString()).toList();
-    } catch (e) {
-      return null;
-    }
-  }
+  List<String>? getLibraryOrder() => _getStringList(_keyLibraryOrder);
 
   // User Profile (stored as JSON string)
   Future<void> saveUserProfile(Map<String, dynamic> profileJson) async {
-    final jsonString = json.encode(profileJson);
-    await _prefs.setString(_keyUserProfile, jsonString);
+    await _setJsonMap(_keyUserProfile, profileJson);
   }
 
   Map<String, dynamic>? getUserProfile() {
-    final jsonString = _prefs.getString(_keyUserProfile);
-    if (jsonString == null) return null;
-
-    try {
-      return json.decode(jsonString) as Map<String, dynamic>;
-    } catch (e) {
-      return null;
-    }
+    return _readJsonMap(_keyUserProfile);
   }
 
   // Current User UUID
   Future<void> saveCurrentUserUUID(String uuid) async {
-    await _prefs.setString(_keyCurrentUserUUID, uuid);
+    await prefs.setString(_keyCurrentUserUUID, uuid);
   }
 
   String? getCurrentUserUUID() {
-    return _prefs.getString(_keyCurrentUserUUID);
+    return prefs.getString(_keyCurrentUserUUID);
   }
 
   // Home Users Cache (stored as JSON string with expiry)
   Future<void> saveHomeUsersCache(Map<String, dynamic> homeData) async {
-    final jsonString = json.encode(homeData);
-    await _prefs.setString(_keyHomeUsersCache, jsonString);
+    await _setJsonMap(_keyHomeUsersCache, homeData);
 
     // Set cache expiry to 1 hour from now
     final expiry = DateTime.now()
         .add(const Duration(hours: 1))
         .millisecondsSinceEpoch;
-    await _prefs.setInt(_keyHomeUsersCacheExpiry, expiry);
+    await prefs.setInt(_keyHomeUsersCacheExpiry, expiry);
   }
 
   Map<String, dynamic>? getHomeUsersCache() {
-    final expiry = _prefs.getInt(_keyHomeUsersCacheExpiry);
+    final expiry = prefs.getInt(_keyHomeUsersCacheExpiry);
     if (expiry == null || DateTime.now().millisecondsSinceEpoch > expiry) {
       // Cache expired, clear it
       clearHomeUsersCache();
       return null;
     }
 
-    final jsonString = _prefs.getString(_keyHomeUsersCache);
-    if (jsonString == null) return null;
-
-    try {
-      return json.decode(jsonString) as Map<String, dynamic>;
-    } catch (e) {
-      return null;
-    }
+    return _readJsonMap(_keyHomeUsersCache);
   }
 
   Future<void> clearHomeUsersCache() async {
     await Future.wait([
-      _prefs.remove(_keyHomeUsersCache),
-      _prefs.remove(_keyHomeUsersCacheExpiry),
+      prefs.remove(_keyHomeUsersCache),
+      prefs.remove(_keyHomeUsersCacheExpiry),
     ]);
   }
 
   // Clear current user UUID (for server switching)
   Future<void> clearCurrentUserUUID() async {
-    await _prefs.remove(_keyCurrentUserUUID);
+    await prefs.remove(_keyCurrentUserUUID);
   }
 
   // Clear all user-related data (for logout)
@@ -316,4 +345,128 @@ class StorageService {
       saveToken(authToken), // Update the main token
     ]);
   }
+
+  // Multi-Server Support Methods
+
+  /// Get servers list as JSON string
+  String? getServersListJson() {
+    return prefs.getString(_keyServersList);
+  }
+
+  /// Save servers list as JSON string
+  Future<void> saveServersListJson(String serversJson) async {
+    await prefs.setString(_keyServersList, serversJson);
+  }
+
+  /// Get enabled servers as JSON string
+  String? getEnabledServersJson() {
+    return prefs.getString(_keyEnabledServers);
+  }
+
+  /// Save enabled servers as JSON string
+  Future<void> saveEnabledServersJson(String enabledJson) async {
+    await prefs.setString(_keyEnabledServers, enabledJson);
+  }
+
+  /// Clear servers list
+  Future<void> clearServersList() async {
+    await prefs.remove(_keyServersList);
+  }
+
+  /// Clear enabled servers
+  Future<void> clearEnabledServers() async {
+    await prefs.remove(_keyEnabledServers);
+  }
+
+  /// Clear all multi-server data
+  Future<void> clearMultiServerData() async {
+    await Future.wait([
+      clearServersList(),
+      clearEnabledServers(),
+      clearServerOrder(),
+      _clearKeysWithPrefix(_prefixServerEndpoint),
+    ]);
+  }
+
+  /// Server Order (stored as JSON list of server IDs)
+  Future<void> saveServerOrder(List<String> serverIds) async {
+    await _setStringList(_keyServerOrder, serverIds);
+  }
+
+  List<String>? getServerOrder() => _getStringList(_keyServerOrder);
+
+  /// Clear server order
+  Future<void> clearServerOrder() async {
+    await prefs.remove(_keyServerOrder);
+  }
+
+  // Private helper methods
+
+  /// Helper to read and decode JSON `List<String>` from preferences
+  List<String>? _getStringList(String key) {
+    final jsonString = prefs.getString(key);
+    if (jsonString == null) return null;
+
+    try {
+      final decoded = json.decode(jsonString) as List<dynamic>;
+      return decoded.map((e) => e.toString()).toList();
+    } catch (e) {
+      return null;
+    }
+  }
+
+  /// Helper to read and decode JSON Map from preferences
+  ///
+  /// [key] - The preference key to read
+  /// [legacyStringOk] - If true, returns {'key': value, 'descending': false}
+  ///                    when value is a plain string (for legacy library sort)
+  Map<String, dynamic>? _readJsonMap(
+    String key, {
+    bool legacyStringOk = false,
+  }) {
+    final jsonString = prefs.getString(key);
+    if (jsonString == null) return null;
+
+    return _decodeJsonStringToMap(jsonString, legacyStringOk: legacyStringOk);
+  }
+
+  /// Helper to decode JSON string to Map with error handling
+  ///
+  /// [jsonString] - The JSON string to decode
+  /// [legacyStringOk] - If true, returns {'key': value, 'descending': false}
+  ///                    when value is a plain string (for legacy library sort)
+  Map<String, dynamic> _decodeJsonStringToMap(
+    String jsonString, {
+    bool legacyStringOk = false,
+  }) {
+    try {
+      return json.decode(jsonString) as Map<String, dynamic>;
+    } catch (e) {
+      if (legacyStringOk) {
+        // Legacy support: if it's just a string, return it as the key
+        return {'key': jsonString, 'descending': false};
+      }
+      return {};
+    }
+  }
+
+  /// Remove all keys matching a prefix
+  Future<void> _clearKeysWithPrefix(String prefix) async {
+    final keys = prefs.getKeys().where((k) => k.startsWith(prefix));
+    await Future.wait(keys.map((k) => prefs.remove(k)));
+  }
+
+  // Public JSON helpers for reducing boilerplate
+
+  /// Save a JSON-encodable map to storage
+  Future<void> _setJsonMap(String key, Map<String, dynamic> data) async {
+    final jsonString = json.encode(data);
+    await prefs.setString(key, jsonString);
+  }
+
+  /// Save a string list as JSON array
+  Future<void> _setStringList(String key, List<String> list) async {
+    final jsonString = json.encode(list);
+    await prefs.setString(key, jsonString);
+  }
 }
diff --git a/lib/services/track_selection_service.dart b/lib/services/track_selection_service.dart
index d852abef..4ddf0ec0 100644
--- a/lib/services/track_selection_service.dart
+++ b/lib/services/track_selection_service.dart
@@ -1,173 +1,341 @@
-import '../models/plex_media_info.dart';
+import '../mpv/mpv.dart';
+
+import '../models/plex_metadata.dart';
 import '../models/plex_user_profile.dart';
+import '../utils/app_logger.dart';
+import '../utils/language_codes.dart';
 
-/// Service for selecting audio and subtitle tracks based on user preferences
+/// Service for selecting and applying audio and subtitle tracks based on
+/// preferences, user profiles, and per-media settings.
 class TrackSelectionService {
-  /// Selects the best audio track based on user preferences
-  ///
-  /// Returns the selected audio track, or null if no suitable track is found
-  static PlexAudioTrack? selectAudioTrack(
-    List<PlexAudioTrack> tracks,
-    PlexUserProfile profile,
-  ) {
-    if (tracks.isEmpty) return null;
+  final Player player;
+  final PlexUserProfile? profileSettings;
+  final PlexMetadata metadata;
 
-    // If auto-select is disabled, use Plex's selected track
-    if (!profile.autoSelectAudio) {
-      return tracks.firstWhere(
-        (track) => track.selected,
-        orElse: () => tracks.first,
-      );
-    }
+  TrackSelectionService({
+    required this.player,
+    this.profileSettings,
+    required this.metadata,
+  });
 
-    // Build list of preferred language codes
-    final preferredLanguages = <String>[];
-    if (profile.defaultAudioLanguage != null) {
-      preferredLanguages.add(profile.defaultAudioLanguage!);
-    }
-    if (profile.defaultAudioLanguages != null) {
-      preferredLanguages.addAll(profile.defaultAudioLanguages!);
-    }
+  /// Build list of preferred languages from a user profile
+  List<String> _buildPreferredLanguages(PlexUserProfile profile, {required bool isAudio}) {
+    final primary = isAudio
+        ? profile.defaultAudioLanguage
+        : profile.defaultSubtitleLanguage;
+    final list = isAudio
+        ? profile.defaultAudioLanguages
+        : profile.defaultSubtitleLanguages;
 
-    // If no preferred languages, return first track
-    if (preferredLanguages.isEmpty) {
-      return tracks.first;
+    final result = <String>[];
+    if (primary != null && primary.isNotEmpty) {
+      result.add(primary);
     }
-
-    // Try to find a track matching preferred languages
-    for (final language in preferredLanguages) {
-      final matchingTrack = tracks.firstWhere(
-        (track) => _matchesLanguage(track.languageCode, language),
-        orElse: () => tracks.first,
-      );
-      if (matchingTrack != tracks.first ||
-          _matchesLanguage(matchingTrack.languageCode, language)) {
-        return matchingTrack;
-      }
+    if (list != null) {
+      result.addAll(list);
     }
-
-    // Fallback to first track
-    return tracks.first;
+    return result;
   }
 
-  /// Selects the best subtitle track based on user preferences
-  ///
-  /// Returns the selected subtitle track, or null if subtitles should be disabled
-  static PlexSubtitleTrack? selectSubtitleTrack(
-    List<PlexSubtitleTrack> tracks,
-    PlexUserProfile profile,
-    PlexAudioTrack? selectedAudioTrack,
+  /// Find a track by preferred language with variation lookup and logging
+  T? _findTrackByPreferredLanguage<T>(
+    List<T> tracks,
+    String preferredLanguage,
+    String? Function(T) getLanguage,
+    String Function(T) getDescription,
+    String trackType,
   ) {
-    if (tracks.isEmpty) return null;
+    final languageVariations = LanguageCodes.getVariations(preferredLanguage);
+    appLogger.d(
+      'Checking language variations for "$preferredLanguage": ${languageVariations.join(", ")}',
+    );
 
-    // Mode 0: Manually selected - return null to disable subtitles
-    if (profile.autoSelectSubtitle == 0) {
-      return null;
+    return _findTrackByLanguageVariations<T>(
+      tracks,
+      preferredLanguage,
+      languageVariations,
+      getLanguage,
+      getDescription,
+      trackType,
+    );
+  }
+
+  /// Apply a filter to tracks, falling back to original if filter produces empty result
+  List<T> _applyFilterWithFallback<T>(
+    List<T> tracks,
+    List<T> Function(List<T>) filter,
+    String filterDescription,
+  ) {
+    final filtered = filter(tracks);
+    if (filtered.isNotEmpty) {
+      return filtered;
     }
+    appLogger.d('No tracks match $filterDescription, using all tracks');
+    return tracks;
+  }
 
-    // Mode 1: Shown with foreign audio
-    if (profile.autoSelectSubtitle == 1) {
-      // Check if audio language matches user's preferred subtitle language
-      if (selectedAudioTrack != null &&
-          profile.defaultSubtitleLanguage != null) {
-        final audioLang = selectedAudioTrack.languageCode;
-        final prefLang = profile.defaultSubtitleLanguage;
+  /// Generic track matching for audio and subtitle tracks
+  /// Returns the best matching track based on hierarchical criteria:
+  /// 1. Exact match (id + title + language)
+  /// 2. Partial match (title + language)
+  /// 3. Language-only match
+  T? findBestTrackMatch<T>(
+    List<T> availableTracks,
+    T preferred,
+    String Function(T) getId,
+    String? Function(T) getTitle,
+    String? Function(T) getLanguage,
+  ) {
+    if (availableTracks.isEmpty) return null;
 
-        // If audio matches preferred language, no subtitles needed
-        if (_matchesLanguage(audioLang, prefLang)) {
-          return null;
-        }
+    // Filter out auto and no tracks
+    final validTracks = availableTracks
+        .where((t) => getId(t) != 'auto' && getId(t) != 'no')
+        .toList();
+    if (validTracks.isEmpty) return null;
+
+    final preferredId = getId(preferred);
+    final preferredTitle = getTitle(preferred);
+    final preferredLanguage = getLanguage(preferred);
+
+    // Try to match: id, title, and language
+    for (var track in validTracks) {
+      if (getId(track) == preferredId &&
+          getTitle(track) == preferredTitle &&
+          getLanguage(track) == preferredLanguage) {
+        return track;
       }
-
-      // Foreign audio detected, enable subtitles
-      return _findBestSubtitle(tracks, profile);
     }
 
-    // Mode 2: Always enabled
-    if (profile.autoSelectSubtitle == 2) {
-      return _findBestSubtitle(tracks, profile);
+    // Try to match: title and language
+    for (var track in validTracks) {
+      if (getTitle(track) == preferredTitle &&
+          getLanguage(track) == preferredLanguage) {
+        return track;
+      }
+    }
+
+    // Try to match: language only
+    for (var track in validTracks) {
+      if (getLanguage(track) == preferredLanguage) {
+        return track;
+      }
     }
 
     return null;
   }
 
-  /// Finds the best subtitle track matching user preferences
-  static PlexSubtitleTrack? _findBestSubtitle(
-    List<PlexSubtitleTrack> tracks,
+  AudioTrack? findBestAudioMatch(
+    List<AudioTrack> availableTracks,
+    AudioTrack preferred,
+  ) {
+    return findBestTrackMatch<AudioTrack>(
+      availableTracks,
+      preferred,
+      (t) => t.id,
+      (t) => t.title,
+      (t) => t.language,
+    );
+  }
+
+  AudioTrack? findAudioTrackByProfile(
+    List<AudioTrack> availableTracks,
     PlexUserProfile profile,
   ) {
-    // Build list of preferred language codes
-    final preferredLanguages = <String>[];
-    if (profile.defaultSubtitleLanguage != null) {
-      preferredLanguages.add(profile.defaultSubtitleLanguage!);
-    }
-    if (profile.defaultSubtitleLanguages != null) {
-      preferredLanguages.addAll(profile.defaultSubtitleLanguages!);
+    appLogger.d('Audio track selection using user profile');
+    appLogger.d(
+      'Profile settings - autoSelectAudio: ${profile.autoSelectAudio}, defaultAudioLanguage: ${profile.defaultAudioLanguage}, defaultAudioLanguages: ${profile.defaultAudioLanguages}',
+    );
+
+    if (availableTracks.isEmpty || !profile.autoSelectAudio) {
+      appLogger.d(
+        'Cannot use profile: ${availableTracks.isEmpty ? "No tracks available" : "autoSelectAudio is false"}',
+      );
+      return null;
     }
 
-    // Filter tracks based on preferences
-    var candidateTracks = tracks;
+    final preferredLanguages = _buildPreferredLanguages(profile, isAudio: true);
 
-    // Apply SDH (hearing impaired) filtering
-    candidateTracks = _filterBySDH(
+    if (preferredLanguages.isEmpty) {
+      appLogger.d('Cannot use profile: No defaultAudioLanguage(s) specified');
+      return null;
+    }
+
+    appLogger.d('Preferred languages: ${preferredLanguages.join(", ")}');
+
+    // Try to find track matching any preferred language
+    for (final preferredLanguage in preferredLanguages) {
+      final match = _findTrackByPreferredLanguage<AudioTrack>(
+        availableTracks,
+        preferredLanguage,
+        (t) => t.language,
+        (t) => t.title ?? 'Track ${t.id}',
+        'audio track',
+      );
+      if (match != null) return match;
+    }
+
+    appLogger.d(
+      'No audio track found matching profile languages or their variations',
+    );
+    return null;
+  }
+
+  SubtitleTrack? findBestSubtitleMatch(
+    List<SubtitleTrack> availableTracks,
+    SubtitleTrack preferred,
+  ) {
+    // Handle special "no subtitles" case
+    if (preferred.id == 'no') {
+      return SubtitleTrack.off;
+    }
+
+    return findBestTrackMatch<SubtitleTrack>(
+      availableTracks,
+      preferred,
+      (t) => t.id,
+      (t) => t.title,
+      (t) => t.language,
+    );
+  }
+
+  SubtitleTrack? findSubtitleTrackByProfile(
+    List<SubtitleTrack> availableTracks,
+    PlexUserProfile profile, {
+    AudioTrack? selectedAudioTrack,
+  }) {
+    appLogger.d('Subtitle track selection using user profile');
+    appLogger.d(
+      'Profile settings - autoSelectSubtitle: ${profile.autoSelectSubtitle}, defaultSubtitleLanguage: ${profile.defaultSubtitleLanguage}, defaultSubtitleLanguages: ${profile.defaultSubtitleLanguages}, defaultSubtitleForced: ${profile.defaultSubtitleForced}, defaultSubtitleAccessibility: ${profile.defaultSubtitleAccessibility}',
+    );
+
+    if (availableTracks.isEmpty) {
+      appLogger.d('Cannot use profile: No subtitle tracks available');
+      return null;
+    }
+
+    // Mode 0: Manually selected - return OFF
+    if (profile.autoSelectSubtitle == 0) {
+      appLogger.d(
+        'Profile specifies manual mode (autoSelectSubtitle=0) - Subtitles OFF',
+      );
+      return SubtitleTrack.off;
+    }
+
+    // Mode 1: Shown with foreign audio
+    if (profile.autoSelectSubtitle == 1) {
+      appLogger.d(
+        'Profile specifies foreign audio mode (autoSelectSubtitle=1)',
+      );
+
+      // Check if audio language matches user's preferred subtitle language
+      if (selectedAudioTrack != null &&
+          profile.defaultSubtitleLanguage != null) {
+        final audioLang = selectedAudioTrack.language?.toLowerCase();
+        final prefLang = profile.defaultSubtitleLanguage!.toLowerCase();
+        final languageVariations = LanguageCodes.getVariations(prefLang);
+
+        appLogger.d(
+          'Checking if audio is foreign - audio: $audioLang, preferred subtitle lang: $prefLang',
+        );
+
+        // If audio matches preferred language, no subtitles needed
+        if (audioLang != null && languageVariations.contains(audioLang)) {
+          appLogger.d('Audio matches preferred language - Subtitles OFF');
+          return SubtitleTrack.off;
+        }
+        appLogger.d('Foreign audio detected - enabling subtitles');
+      }
+      // Foreign audio detected or cannot determine, enable subtitles
+    }
+
+    // Mode 2: Always enabled (or continuing from mode 1 with foreign audio)
+    appLogger.d('Selecting subtitle track based on preferences');
+
+    final preferredLanguages = _buildPreferredLanguages(profile, isAudio: false);
+
+    if (preferredLanguages.isEmpty) {
+      appLogger.d(
+        'Cannot use profile: No defaultSubtitleLanguage(s) specified',
+      );
+      return null;
+    }
+
+    appLogger.d('Preferred languages: ${preferredLanguages.join(", ")}');
+
+    // Apply filtering with fallback to original tracks if filter produces empty result
+    var candidateTracks = availableTracks;
+
+    // Filter by SDH (defaultSubtitleAccessibility: 0-3)
+    candidateTracks = filterSubtitlesBySDH(
       candidateTracks,
       profile.defaultSubtitleAccessibility,
     );
 
-    // Apply forced subtitle filtering
-    candidateTracks = _filterByForced(
+    // Filter by forced subtitle preference (defaultSubtitleForced: 0-3)
+    candidateTracks = filterSubtitlesByForced(
       candidateTracks,
       profile.defaultSubtitleForced,
     );
 
     // If no candidates after filtering, relax filters
-    if (candidateTracks.isEmpty) {
-      candidateTracks = tracks;
-    }
+    candidateTracks = _applyFilterWithFallback(
+      availableTracks,
+      (_) => candidateTracks,
+      'strict filters',
+    );
 
-    // If no preferred languages, return first candidate
-    if (preferredLanguages.isEmpty) {
-      return candidateTracks.firstOrNull;
-    }
-
-    // Try to find a track matching preferred languages
-    for (final language in preferredLanguages) {
-      final matchingTrack = candidateTracks.firstWhere(
-        (track) => _matchesLanguage(track.languageCode, language),
-        orElse: () => candidateTracks.first,
+    // Try to find track matching any preferred language
+    for (final preferredLanguage in preferredLanguages) {
+      final match = _findTrackByPreferredLanguage<SubtitleTrack>(
+        candidateTracks,
+        preferredLanguage,
+        (t) => t.language,
+        (t) => t.title ?? 'Track ${t.id}',
+        'subtitle',
       );
-      if (matchingTrack != candidateTracks.first ||
-          _matchesLanguage(matchingTrack.languageCode, language)) {
-        return matchingTrack;
-      }
+      if (match != null) return match;
     }
 
-    // Fallback to first candidate
-    return candidateTracks.firstOrNull;
+    appLogger.d(
+      'No subtitle track found matching profile languages or their variations',
+    );
+    return null;
   }
 
-  /// Filters subtitle tracks based on SDH (hearing impaired) preference
+  /// Filters subtitle tracks based on SDH (Subtitles for Deaf or Hard-of-Hearing) preference
   ///
   /// Values:
   /// - 0: Prefer non-SDH subtitles
   /// - 1: Prefer SDH subtitles
   /// - 2: Only show SDH subtitles
   /// - 3: Only show non-SDH subtitles
-  static List<PlexSubtitleTrack> _filterBySDH(
-    List<PlexSubtitleTrack> tracks,
+  List<SubtitleTrack> filterSubtitlesBySDH(
+    List<SubtitleTrack> tracks,
     int preference,
   ) {
     if (preference == 0 || preference == 1) {
       // Prefer but don't require
       final preferSDH = preference == 1;
-      final preferred = tracks.where((t) => _isSDH(t) == preferSDH).toList();
-      return preferred.isNotEmpty ? preferred : tracks;
+      final preferred = tracks.where((t) => isSDH(t) == preferSDH).toList();
+      if (preferred.isNotEmpty) {
+        appLogger.d(
+          'Applying SDH preference: ${preferSDH ? "prefer SDH" : "prefer non-SDH"} (${preferred.length} tracks)',
+        );
+        return preferred;
+      }
+      appLogger.d('No tracks match SDH preference, using all tracks');
+      return tracks;
     } else if (preference == 2) {
       // Only SDH
-      return tracks.where(_isSDH).toList();
+      final filtered = tracks.where((t) => isSDH(t)).toList();
+      appLogger.d('Filtering to SDH only (${filtered.length} tracks)');
+      return filtered;
     } else if (preference == 3) {
       // Only non-SDH
-      return tracks.where((t) => !_isSDH(t)).toList();
+      final filtered = tracks.where((t) => !isSDH(t)).toList();
+      appLogger.d('Filtering to non-SDH only (${filtered.length} tracks)');
+      return filtered;
     }
     return tracks;
   }
@@ -179,48 +347,85 @@ class TrackSelectionService {
   /// - 1: Prefer forced subtitles
   /// - 2: Only show forced subtitles
   /// - 3: Only show non-forced subtitles
-  static List<PlexSubtitleTrack> _filterByForced(
-    List<PlexSubtitleTrack> tracks,
+  List<SubtitleTrack> filterSubtitlesByForced(
+    List<SubtitleTrack> tracks,
     int preference,
   ) {
     if (preference == 0 || preference == 1) {
       // Prefer but don't require
       final preferForced = preference == 1;
-      final preferred = tracks.where((t) => t.forced == preferForced).toList();
-      return preferred.isNotEmpty ? preferred : tracks;
+      final preferred = tracks
+          .where((t) => isForced(t) == preferForced)
+          .toList();
+      if (preferred.isNotEmpty) {
+        appLogger.d(
+          'Applying forced preference: ${preferForced ? "prefer forced" : "prefer non-forced"} (${preferred.length} tracks)',
+        );
+        return preferred;
+      }
+      appLogger.d('No tracks match forced preference, using all tracks');
+      return tracks;
     } else if (preference == 2) {
       // Only forced
-      return tracks.where((t) => t.forced).toList();
+      final filtered = tracks.where((t) => isForced(t)).toList();
+      appLogger.d('Filtering to forced only (${filtered.length} tracks)');
+      return filtered;
     } else if (preference == 3) {
       // Only non-forced
-      return tracks.where((t) => !t.forced).toList();
+      final filtered = tracks.where((t) => !isForced(t)).toList();
+      appLogger.d('Filtering to non-forced only (${filtered.length} tracks)');
+      return filtered;
     }
     return tracks;
   }
 
   /// Checks if a subtitle track is SDH (Subtitles for Deaf or Hard-of-Hearing)
   ///
-  /// Since Plex API may not expose this directly, we infer from the title/displayTitle
-  static bool _isSDH(PlexSubtitleTrack track) {
+  /// Since mpv may not expose this directly, we infer from the title
+  bool isSDH(SubtitleTrack track) {
     final title = track.title?.toLowerCase() ?? '';
-    final displayTitle = track.displayTitle?.toLowerCase() ?? '';
 
     // Look for common SDH indicators
     return title.contains('sdh') ||
-        displayTitle.contains('sdh') ||
         title.contains('cc') ||
-        displayTitle.contains('cc') ||
         title.contains('hearing impaired') ||
-        displayTitle.contains('hearing impaired');
+        title.contains('deaf');
   }
 
-  /// Checks if a language code matches a preferred language
+  /// Checks if a subtitle track is forced
+  bool isForced(SubtitleTrack track) {
+    final title = track.title?.toLowerCase() ?? '';
+    return title.contains('forced');
+  }
+
+  /// Find a track matching a preferred language from a list of tracks
+  /// Returns the first track whose language matches any variation of the preferred language
+  T? _findTrackByLanguageVariations<T>(
+    List<T> tracks,
+    String preferredLanguage,
+    List<String> languageVariations,
+    String? Function(T) getLanguage,
+    String Function(T) getTrackDescription,
+    String trackType,
+  ) {
+    for (var track in tracks) {
+      final trackLang = getLanguage(track)?.toLowerCase();
+      if (trackLang != null &&
+          languageVariations.any((lang) => trackLang.startsWith(lang))) {
+        appLogger.d(
+          'Found $trackType matching profile language "$preferredLanguage" (matched: "$trackLang"): ${getTrackDescription(track)}',
+        );
+        return track;
+      }
+    }
+    return null;
+  }
+
+  /// Checks if a track language matches a preferred language
   ///
   /// Handles both 2-letter (ISO 639-1) and 3-letter (ISO 639-2) codes
-  static bool _matchesLanguage(
-    String? trackLanguage,
-    String? preferredLanguage,
-  ) {
+  /// Also handles bibliographic variants and region codes (e.g., "en-US")
+  bool languageMatches(String? trackLanguage, String? preferredLanguage) {
     if (trackLanguage == null || preferredLanguage == null) {
       return false;
     }
@@ -231,49 +436,280 @@ class TrackSelectionService {
     // Direct match
     if (track == preferred) return true;
 
-    // Handle common 2-letter to 3-letter mappings
-    final languageMap = {
-      'en': 'eng',
-      'es': 'spa',
-      'fr': 'fra',
-      'de': 'deu',
-      'it': 'ita',
-      'pt': 'por',
-      'ja': 'jpn',
-      'ko': 'kor',
-      'zh': 'zho',
-      'ru': 'rus',
-      'ar': 'ara',
-      'hi': 'hin',
-      'nl': 'nld',
-      'pl': 'pol',
-      'tr': 'tur',
-      'sv': 'swe',
-      'no': 'nor',
-      'da': 'dan',
-      'fi': 'fin',
-      'cs': 'ces',
-      'hu': 'hun',
-      'ro': 'ron',
-      'th': 'tha',
-      'vi': 'vie',
-      'id': 'ind',
-      'uk': 'ukr',
-      'el': 'ell',
-      'he': 'heb',
-    };
+    // Extract base language codes (handle region codes like "en-US")
+    final trackBase = track.split('-').first;
+    final preferredBase = preferred.split('-').first;
 
-    // Try mapping preferred to 3-letter and compare
-    if (languageMap[preferred] == track) return true;
+    if (trackBase == preferredBase) return true;
 
-    // Try mapping track to 3-letter and compare with preferred 3-letter
-    if (languageMap[track] == preferred) return true;
+    // Get all variations of the preferred language (e.g., "en" → ["en", "eng"])
+    final variations = LanguageCodes.getVariations(preferredBase);
 
-    // Try reverse mapping (3-letter to 2-letter)
-    final reverseMap = languageMap.map((k, v) => MapEntry(v, k));
-    if (reverseMap[preferred] == track) return true;
-    if (reverseMap[track] == preferred) return true;
+    // Check if track's base code matches any variation
+    return variations.contains(trackBase);
+  }
 
-    return false;
+  /// Log available tracks for debugging
+  void logAvailableTracks(
+    List<AudioTrack> audioTracks,
+    List<SubtitleTrack> subtitleTracks,
+  ) {
+    appLogger.d('Available audio tracks: ${audioTracks.length}');
+    for (var track in audioTracks) {
+      appLogger.d(
+        '  - ${track.title ?? "Track ${track.id}"} (${track.language ?? "unknown"}) ${track.isDefault == true ? "[DEFAULT]" : ""}',
+      );
+    }
+    appLogger.d('Available subtitle tracks: ${subtitleTracks.length}');
+    for (var track in subtitleTracks) {
+      appLogger.d(
+        '  - ${track.title ?? "Track ${track.id}"} (${track.language ?? "unknown"}) ${track.isDefault == true ? "[DEFAULT]" : ""}',
+      );
+    }
+  }
+
+  /// Select the best audio track based on priority:
+  /// Priority 1: Preferred track from navigation
+  /// Priority 2: Per-media language preference
+  /// Priority 3: User profile preferences
+  /// Priority 4: Default or first track
+  AudioTrack? selectAudioTrack(
+    List<AudioTrack> availableTracks,
+    AudioTrack? preferredAudioTrack,
+  ) {
+    if (availableTracks.isEmpty) return null;
+
+    AudioTrack? trackToSelect;
+
+    // Priority 1: Try to match preferred track from navigation
+    if (preferredAudioTrack != null) {
+      appLogger.d('Priority 1: Checking preferred track from navigation');
+      appLogger.d(
+        '  Preferred: ${preferredAudioTrack.title ?? "Track ${preferredAudioTrack.id}"} (${preferredAudioTrack.language ?? "unknown"})',
+      );
+      trackToSelect = findBestAudioMatch(availableTracks, preferredAudioTrack);
+      if (trackToSelect != null) {
+        appLogger.d('  Matched preferred track');
+        return trackToSelect;
+      }
+      appLogger.d('  No match found for preferred track');
+    } else {
+      appLogger.d('Priority 1: No preferred track from navigation');
+    }
+
+    // Priority 2: If no preferred track matched, try per-media language preference
+    if (metadata.audioLanguage != null) {
+      appLogger.d('Priority 2: Checking per-media audio language preference');
+      appLogger.d('  Per-media audio language: ${metadata.audioLanguage}');
+
+      final matchedTrack = availableTracks.firstWhere(
+        (track) => languageMatches(track.language, metadata.audioLanguage),
+        orElse: () => availableTracks.first,
+      );
+
+      if (languageMatches(matchedTrack.language, metadata.audioLanguage)) {
+        appLogger.d('  Matched per-media audio language preference');
+        return matchedTrack;
+      }
+      appLogger.d('  No match found for per-media audio language');
+    } else {
+      appLogger.d('Priority 2: No per-media audio language preference');
+    }
+
+    // Priority 3: If no preferred track matched, try user profile preferences
+    if (profileSettings != null) {
+      appLogger.d('Priority 3: Checking user profile preferences');
+      trackToSelect = findAudioTrackByProfile(
+        availableTracks,
+        profileSettings!,
+      );
+      if (trackToSelect != null) {
+        return trackToSelect;
+      }
+    } else {
+      appLogger.d('Priority 3: No user profile available');
+    }
+
+    // Priority 4: If no match, use default or first track
+    appLogger.d('Priority 4: Using default or first available track');
+    trackToSelect = availableTracks.firstWhere(
+      (t) => t.isDefault == true,
+      orElse: () => availableTracks.first,
+    );
+    final isDefault = trackToSelect.isDefault == true;
+    appLogger.d(
+      '  Selected ${isDefault ? "default" : "first"} track: ${trackToSelect.title ?? "Track ${trackToSelect.id}"} (${trackToSelect.language ?? "unknown"})',
+    );
+
+    return trackToSelect;
+  }
+
+  /// Select the best subtitle track based on priority:
+  /// Priority 1: Preferred track from navigation
+  /// Priority 2: Per-media language preference
+  /// Priority 3: User profile preferences
+  /// Priority 4: Default track
+  /// Priority 5: Off
+  SubtitleTrack selectSubtitleTrack(
+    List<SubtitleTrack> availableTracks,
+    SubtitleTrack? preferredSubtitleTrack,
+    AudioTrack? selectedAudioTrack,
+  ) {
+    SubtitleTrack? subtitleToSelect;
+
+    // Priority 1: Try preferred track from navigation (always wins)
+    if (preferredSubtitleTrack != null) {
+      appLogger.d('Priority 1: Checking preferred track from navigation');
+      if (preferredSubtitleTrack.id == 'no') {
+        appLogger.d('  Preferred: OFF');
+        return SubtitleTrack.off;
+      } else if (availableTracks.isNotEmpty) {
+        appLogger.d(
+          '  Preferred: ${preferredSubtitleTrack.title ?? "Track ${preferredSubtitleTrack.id}"} (${preferredSubtitleTrack.language ?? "unknown"})',
+        );
+        subtitleToSelect = findBestSubtitleMatch(
+          availableTracks,
+          preferredSubtitleTrack,
+        );
+        if (subtitleToSelect != null) {
+          appLogger.d('  Matched preferred track');
+          return subtitleToSelect;
+        }
+        appLogger.d('  No match found for preferred track');
+      }
+    } else {
+      appLogger.d('Priority 1: No preferred track from navigation');
+    }
+
+    // Priority 2: If no preferred match, try per-media language preference
+    if (metadata.subtitleLanguage != null) {
+      appLogger.d(
+        'Priority 2: Checking per-media subtitle language preference',
+      );
+      appLogger.d(
+        '  Per-media subtitle language: ${metadata.subtitleLanguage}',
+      );
+
+      // Check if subtitle should be disabled
+      if (metadata.subtitleLanguage == 'none' ||
+          metadata.subtitleLanguage!.isEmpty) {
+        appLogger.d('  Per-media preference: Subtitles OFF');
+        return SubtitleTrack.off;
+      } else if (availableTracks.isNotEmpty) {
+        final matchedTrack = availableTracks.firstWhere(
+          (track) => languageMatches(track.language, metadata.subtitleLanguage),
+          orElse: () => availableTracks.first,
+        );
+        if (languageMatches(matchedTrack.language, metadata.subtitleLanguage)) {
+          appLogger.d('  Matched per-media subtitle language preference');
+          return matchedTrack;
+        }
+        appLogger.d('  No match found for per-media subtitle language');
+      }
+    } else {
+      appLogger.d('Priority 2: No per-media subtitle language preference');
+    }
+
+    // Priority 3: If no preferred match, apply user profile preferences
+    if (profileSettings != null && availableTracks.isNotEmpty) {
+      appLogger.d('Priority 3: Checking user profile preferences');
+      subtitleToSelect = findSubtitleTrackByProfile(
+        availableTracks,
+        profileSettings!,
+        selectedAudioTrack: selectedAudioTrack,
+      );
+      if (subtitleToSelect != null) {
+        return subtitleToSelect;
+      }
+    } else if (availableTracks.isNotEmpty) {
+      appLogger.d('Priority 3: No user profile available');
+    }
+
+    // Priority 4: If no profile match, check for default subtitle
+    if (availableTracks.isNotEmpty) {
+      appLogger.d('Priority 4: Checking for default subtitle track');
+      final defaultTrack = availableTracks.firstWhere(
+        (t) => t.isDefault == true,
+        orElse: () => availableTracks.first,
+      );
+      if (defaultTrack.isDefault == true) {
+        appLogger.d(
+          '  Found default track: ${defaultTrack.title ?? "Track ${defaultTrack.id}"} (${defaultTrack.language ?? "unknown"})',
+        );
+        return defaultTrack;
+      }
+      appLogger.d('  No default subtitle track found');
+    }
+
+    // Priority 5: If still no subtitle selected, turn off
+    appLogger.d('Priority 5: No subtitle selected - Subtitles OFF');
+    return SubtitleTrack.off;
+  }
+
+  /// Select and apply audio and subtitle tracks based on preferences
+  Future<void> selectAndApplyTracks({
+    AudioTrack? preferredAudioTrack,
+    SubtitleTrack? preferredSubtitleTrack,
+    double? preferredPlaybackRate,
+    Function(AudioTrack)? onAudioTrackChanged,
+    Function(SubtitleTrack)? onSubtitleTrackChanged,
+  }) async {
+    // Wait for tracks to be loaded
+    int attempts = 0;
+    while (player.state.tracks.audio.isEmpty &&
+        player.state.tracks.subtitle.isEmpty &&
+        attempts < 100) {
+      await Future.delayed(const Duration(milliseconds: 100));
+      attempts++;
+    }
+
+    appLogger.d('Starting track selection process');
+
+    // Get real tracks (excluding auto and no)
+    final realAudioTracks = player.state.tracks.audio
+        .where((t) => t.id != 'auto' && t.id != 'no')
+        .toList();
+    final realSubtitleTracks = player.state.tracks.subtitle
+        .where((t) => t.id != 'auto' && t.id != 'no')
+        .toList();
+
+    // Log available tracks
+    logAvailableTracks(realAudioTracks, realSubtitleTracks);
+
+    // Select and apply audio track
+    appLogger.d('Audio track selection');
+    final selectedAudioTrack = selectAudioTrack(
+      realAudioTracks,
+      preferredAudioTrack,
+    );
+    if (selectedAudioTrack != null) {
+      appLogger.i(
+        'Final audio selection: ${selectedAudioTrack.title ?? "Track ${selectedAudioTrack.id}"} (${selectedAudioTrack.language ?? "unknown"})',
+      );
+      player.selectAudioTrack(selectedAudioTrack);
+    } else {
+      appLogger.d('No audio tracks available');
+    }
+
+    // Select and apply subtitle track
+    appLogger.d('Subtitle track selection');
+    final selectedSubtitleTrack = selectSubtitleTrack(
+      realSubtitleTracks,
+      preferredSubtitleTrack,
+      selectedAudioTrack,
+    );
+    final finalSubtitle = selectedSubtitleTrack.id == 'no'
+        ? 'OFF'
+        : '${selectedSubtitleTrack.title ?? "Track ${selectedSubtitleTrack.id}"} (${selectedSubtitleTrack.language ?? "unknown"})';
+    appLogger.i('Final subtitle selection: $finalSubtitle');
+    player.selectSubtitleTrack(selectedSubtitleTrack);
+
+    // Set playback rate if preferred rate was provided
+    if (preferredPlaybackRate != null) {
+      appLogger.d('Setting preferred playback rate: ${preferredPlaybackRate}x');
+      player.setRate(preferredPlaybackRate);
+    }
+
+    appLogger.d('Track selection complete');
   }
 }
diff --git a/lib/services/tv_detection_service.dart b/lib/services/tv_detection_service.dart
new file mode 100644
index 00000000..8f91d36e
--- /dev/null
+++ b/lib/services/tv_detection_service.dart
@@ -0,0 +1,38 @@
+import 'dart:io';
+
+import 'package:device_info_plus/device_info_plus.dart';
+
+/// Service for detecting if the app is running on Android TV
+class TvDetectionService {
+  static TvDetectionService? _instance;
+  bool _isTV = false;
+  bool _initialized = false;
+
+  TvDetectionService._();
+
+  /// Get the singleton instance, initializing if needed
+  static Future<TvDetectionService> getInstance() async {
+    if (_instance == null) {
+      _instance = TvDetectionService._();
+      await _instance!._detect();
+    }
+    return _instance!;
+  }
+
+  Future<void> _detect() async {
+    if (_initialized) return;
+
+    if (Platform.isAndroid) {
+      final deviceInfo = DeviceInfoPlugin();
+      final androidInfo = await deviceInfo.androidInfo;
+      // Check for android.software.leanback feature (standard Android TV detection)
+      _isTV = androidInfo.systemFeatures.contains('android.software.leanback');
+    }
+    _initialized = true;
+  }
+
+  bool get isTV => _isTV;
+
+  /// Synchronous access after initialization (returns false if not initialized)
+  static bool isTVSync() => _instance?._isTV ?? false;
+}
diff --git a/lib/services/update_service.dart b/lib/services/update_service.dart
index b2e2b93b..6f6fcd0a 100644
--- a/lib/services/update_service.dart
+++ b/lib/services/update_service.dart
@@ -63,15 +63,20 @@ class UpdateService {
     await prefs.setString(_keyLastCheckTime, DateTime.now().toIso8601String());
   }
 
-  /// Check for updates on GitHub (manual check, ignores cooldown)
-  /// Returns a map with update info, or null if no update or error
-  static Future<Map<String, dynamic>?> checkForUpdates({
-    bool silent = false,
+  /// Internal method that performs the actual update check
+  /// [respectCooldown] - if true, checks cooldown and updates last check time
+  static Future<Map<String, dynamic>?> _performUpdateCheck({
+    required bool respectCooldown,
   }) async {
     if (!isUpdateCheckEnabled) {
       return null;
     }
 
+    // Check cooldown if requested
+    if (respectCooldown && !await shouldCheckForUpdates()) {
+      return null;
+    }
+
     try {
       final packageInfo = await PackageInfo.fromPlatform();
       final currentVersion = packageInfo.version;
@@ -94,12 +99,21 @@ class UpdateService {
         final hasUpdate = _isNewerVersion(cleanVersion, currentVersion);
 
         if (hasUpdate) {
-          // Check if this version was skipped (always check, regardless of silent mode)
+          // Check if this version was skipped
           final skippedVersion = await getSkippedVersion();
           if (skippedVersion == cleanVersion) {
+            // Update last check time even when skipped (if respecting cooldown)
+            if (respectCooldown) {
+              await _updateLastCheckTime();
+            }
             return null;
           }
 
+          // Update last check time on success (if respecting cooldown)
+          if (respectCooldown) {
+            await _updateLastCheckTime();
+          }
+
           return {
             'hasUpdate': true,
             'currentVersion': currentVersion,
@@ -111,6 +125,11 @@ class UpdateService {
           };
         }
       }
+
+      // Update last check time even when no update (if respecting cooldown)
+      if (respectCooldown) {
+        await _updateLastCheckTime();
+      }
     } catch (e) {
       _logger.e('Failed to check for updates: $e');
     }
@@ -118,42 +137,35 @@ class UpdateService {
     return null;
   }
 
+  /// Check for updates on GitHub (manual check, ignores cooldown)
+  /// Returns a map with update info, or null if no update or error
+  static Future<Map<String, dynamic>?> checkForUpdates({
+    bool silent = false,
+  }) async {
+    return _performUpdateCheck(respectCooldown: false);
+  }
+
   /// Check for updates on startup (respects cooldown and skipped versions)
   /// Returns update info if available, null otherwise
   static Future<Map<String, dynamic>?> checkForUpdatesOnStartup() async {
-    if (!isUpdateCheckEnabled) {
-      return null;
-    }
+    return _performUpdateCheck(respectCooldown: true);
+  }
 
-    // Check cooldown
-    if (!await shouldCheckForUpdates()) {
-      return null;
-    }
-
-    // Perform the check
-    final updateInfo = await checkForUpdates(silent: true);
-
-    // Update last check time
-    await _updateLastCheckTime();
-
-    return updateInfo;
+  /// Parse version string into list of integers
+  /// Handles versions like "1.2.3+4" by taking only the numeric parts
+  static List<int> _parseVersionParts(String version) {
+    return version.split('.').map((p) {
+      final numPart = p.split('+').first.split('-').first;
+      return int.tryParse(numPart) ?? 0;
+    }).toList();
   }
 
   /// Compare two version strings
   /// Returns true if newVersion is newer than currentVersion
   static bool _isNewerVersion(String newVersion, String currentVersion) {
     try {
-      // Split by '.' and parse as integers
-      final newParts = newVersion.split('.').map((p) {
-        // Handle versions like "1.2.3+4" by taking only the numeric part
-        final numPart = p.split('+').first.split('-').first;
-        return int.tryParse(numPart) ?? 0;
-      }).toList();
-
-      final currentParts = currentVersion.split('.').map((p) {
-        final numPart = p.split('+').first.split('-').first;
-        return int.tryParse(numPart) ?? 0;
-      }).toList();
+      final newParts = _parseVersionParts(newVersion);
+      final currentParts = _parseVersionParts(currentVersion);
 
       // Compare each part
       final maxLength = newParts.length > currentParts.length
diff --git a/lib/services/video_filter_manager.dart b/lib/services/video_filter_manager.dart
new file mode 100644
index 00000000..792f78ee
--- /dev/null
+++ b/lib/services/video_filter_manager.dart
@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+import 'package:rate_limiter/rate_limiter.dart';
+
+import '../mpv/mpv.dart';
+
+import '../models/plex_media_version.dart';
+import '../utils/app_logger.dart';
+
+/// Manages video filtering, aspect ratio modes, and subtitle positioning for video playback.
+///
+/// This service handles:
+/// - BoxFit mode cycling (contain → cover → fill)
+/// - Video cropping calculations for fill screen mode
+/// - Subtitle positioning adjustments based on crop parameters
+/// - Debounced video filter updates on resize events
+class VideoFilterManager {
+  final Player player;
+  final List<PlexMediaVersion> availableVersions;
+  final int selectedMediaIndex;
+
+  /// BoxFit mode state: 0=contain (letterbox), 1=cover (fill screen), 2=fill (stretch)
+  int _boxFitMode = 0;
+
+  /// Track if a pinch gesture is occurring (public for gesture tracking)
+  bool isPinching = false;
+
+  /// Current player viewport size
+  Size? _playerSize;
+
+  /// Debounced video filter update with leading edge execution
+  late final Debounce _debouncedUpdateVideoFilter;
+
+  VideoFilterManager({
+    required this.player,
+    required this.availableVersions,
+    required this.selectedMediaIndex,
+  }) {
+    _debouncedUpdateVideoFilter = debounce(
+      updateVideoFilter,
+      const Duration(milliseconds: 50),
+      leading: true,
+      trailing: true,
+    );
+  }
+
+  /// Current BoxFit mode (0=contain, 1=cover, 2=fill)
+  int get boxFitMode => _boxFitMode;
+
+  /// Current player size
+  Size? get playerSize => _playerSize;
+
+  /// Cycle through BoxFit modes: contain → cover → fill → contain (for button)
+  void cycleBoxFitMode() {
+    _boxFitMode = (_boxFitMode + 1) % 3;
+    updateVideoFilter();
+  }
+
+  /// Toggle between contain and cover modes only (for pinch gesture)
+  void toggleContainCover() {
+    _boxFitMode = _boxFitMode == 0 ? 1 : 0;
+    updateVideoFilter();
+  }
+
+  /// Update player size when layout changes
+  void updatePlayerSize(Size size) {
+    // Check if size actually changed to avoid unnecessary updates
+    if (_playerSize == null ||
+        (_playerSize!.width - size.width).abs() > 0.1 ||
+        (_playerSize!.height - size.height).abs() > 0.1) {
+      _playerSize = size;
+      debouncedUpdateVideoFilter();
+    }
+  }
+
+  /// Update the video scaling and positioning based on current display mode
+  void updateVideoFilter() async {
+    try {
+      // Clear all video filters and manual scaling first
+      await player.setProperty('video-aspect-override', 'no');
+      await player.setProperty('sub-ass-force-margins', 'no');
+      await player.setProperty('panscan', '0');
+
+      if (_boxFitMode == 1) {
+        // Cover mode - use panscan to fill screen while maintaining aspect ratio
+        await player.setProperty('panscan', '1.0');
+        await player.setProperty('sub-ass-force-margins', 'yes');
+      } else if (_boxFitMode == 2) {
+        // Fill/stretch mode - override aspect ratio to match player (stretches video)
+        if (_playerSize != null) {
+          final playerAspect = _playerSize!.width / _playerSize!.height;
+          await player.setProperty(
+            'video-aspect-override',
+            playerAspect.toString(),
+          );
+          appLogger.d(
+            'Stretch mode: aspect-override=$playerAspect (player: $_playerSize)',
+          );
+        }
+      }
+    } catch (e) {
+      appLogger.w('Failed to update video filter', error: e);
+    }
+  }
+
+  /// Debounced version of updateVideoFilter for resize events.
+  /// Uses leading-edge debounce: first call executes immediately,
+  /// subsequent calls within 50ms are debounced.
+  void debouncedUpdateVideoFilter() => _debouncedUpdateVideoFilter();
+
+  /// Clean up resources
+  void dispose() {
+    _debouncedUpdateVideoFilter.cancel();
+  }
+}
diff --git a/lib/theme/mono_theme.dart b/lib/theme/mono_theme.dart
index 78710145..02e46b7e 100644
--- a/lib/theme/mono_theme.dart
+++ b/lib/theme/mono_theme.dart
@@ -19,6 +19,16 @@ ThemeData monoTheme({required bool dark}) {
           textMuted: const Color(0x99111111),
         );
 
+  final buttonStyle = ButtonStyle(
+    padding: const WidgetStatePropertyAll(
+      EdgeInsets.symmetric(horizontal: 18, vertical: 14),
+    ),
+    elevation: const WidgetStatePropertyAll(0),
+    backgroundColor: WidgetStatePropertyAll(c.text),
+    foregroundColor: WidgetStatePropertyAll(dark ? c.bg : Colors.white),
+    shape: const WidgetStatePropertyAll(StadiumBorder()),
+  );
+
   final base = ThemeData(
     useMaterial3: true,
     brightness: dark ? Brightness.dark : Brightness.light,
@@ -103,28 +113,8 @@ ThemeData monoTheme({required bool dark}) {
       ),
       hintStyle: TextStyle(color: c.textMuted),
     ),
-    elevatedButtonTheme: ElevatedButtonThemeData(
-      style: ButtonStyle(
-        padding: const WidgetStatePropertyAll(
-          EdgeInsets.symmetric(horizontal: 18, vertical: 14),
-        ),
-        elevation: const WidgetStatePropertyAll(0),
-        backgroundColor: WidgetStatePropertyAll(c.text),
-        foregroundColor: WidgetStatePropertyAll(dark ? c.bg : Colors.white),
-        shape: const WidgetStatePropertyAll(StadiumBorder()),
-      ),
-    ),
-    filledButtonTheme: FilledButtonThemeData(
-      style: ButtonStyle(
-        padding: const WidgetStatePropertyAll(
-          EdgeInsets.symmetric(horizontal: 18, vertical: 14),
-        ),
-        elevation: const WidgetStatePropertyAll(0),
-        backgroundColor: WidgetStatePropertyAll(c.text),
-        foregroundColor: WidgetStatePropertyAll(dark ? c.bg : Colors.white),
-        shape: const WidgetStatePropertyAll(StadiumBorder()),
-      ),
-    ),
+    elevatedButtonTheme: ElevatedButtonThemeData(style: buttonStyle),
+    filledButtonTheme: FilledButtonThemeData(style: buttonStyle),
     dividerTheme: DividerThemeData(space: 0, thickness: 1, color: c.outline),
     listTileTheme: ListTileThemeData(
       dense: true,
diff --git a/lib/utils/app_logger.dart b/lib/utils/app_logger.dart
index 07c39cb6..9450fed4 100644
--- a/lib/utils/app_logger.dart
+++ b/lib/utils/app_logger.dart
@@ -1,72 +1,22 @@
 import 'package:logger/logger.dart';
 
-/// Redacts sensitive information from log messages
+import 'log_redaction_manager.dart';
+
+/// Redacts sensitive information from log messages based on known values.
 String _redactSensitiveData(String message) {
-  String redacted = message;
+  var redacted = LogRedactionManager.redact(message);
 
-  // Redact Plex tokens (alphanumeric strings typically 20+ characters)
-  // Pattern: X-Plex-Token=... or token=... or accessToken=... or similar
+  // Fallbacks for sensitive fields we cannot track ahead of time.
   redacted = redacted.replaceAllMapped(
-    RegExp(r'([Tt]oken[=:]\s*)([A-Za-z0-9_-]{10,})', caseSensitive: false),
+    RegExp(r'([Aa]uthorization[=:]\s*)([^\s,]+)'),
     (match) => '${match.group(1)}[REDACTED]',
   );
 
-  // Redact authorization headers
   redacted = redacted.replaceAllMapped(
-    RegExp(
-      r'([Aa]uthorization[=:]\s*)([A-Za-z0-9_\-\.]+)',
-      caseSensitive: false,
-    ),
+    RegExp(r'([Pp]assword[=:]\s*)([^\s&,;]+)'),
     (match) => '${match.group(1)}[REDACTED]',
   );
 
-  // Redact API keys
-  redacted = redacted.replaceAllMapped(
-    RegExp(r'([Aa]pi[Kk]ey[=:]\s*)([A-Za-z0-9_-]{10,})', caseSensitive: false),
-    (match) => '${match.group(1)}[REDACTED]',
-  );
-
-  // Redact passwords
-  redacted = redacted.replaceAllMapped(
-    RegExp(r'([Pp]assword[=:]\s*)([^\s&,;]+)', caseSensitive: false),
-    (match) => '${match.group(1)}[REDACTED]',
-  );
-
-  // Redact full URLs with tokens in query parameters
-  redacted = redacted.replaceAllMapped(
-    RegExp(
-      r'(https?://[^\s]*[?&])([Xx]-[Pp]lex-[Tt]oken|token)=([A-Za-z0-9_-]+)',
-    ),
-    (match) => '${match.group(1)}${match.group(2)}=[REDACTED]',
-  );
-
-  // Redact IP addresses in dot notation (e.g., 192.168.1.100)
-  redacted = redacted.replaceAllMapped(
-    RegExp(r'\b(\d{1,3}\.)(\d{1,3}\.)(\d{1,3}\.)(\d{1,3})\b'),
-    (match) => '${match.group(1)}***.***.${match.group(4)}',
-  );
-
-  // Redact IP addresses in dash notation (e.g., 192-168-1-11)
-  redacted = redacted.replaceAllMapped(
-    RegExp(r'\b(\d{1,3}-)(\d{1,3}-)(\d{1,3}-)(\d{1,3})\b'),
-    (match) => '${match.group(1)}***-***-${match.group(4)}',
-  );
-
-  // Redact standalone token-like strings (20+ alphanumeric characters)
-  // Only if they appear in common token contexts
-  redacted = redacted.replaceAllMapped(RegExp(r'\b([A-Za-z0-9_-]{20,})\b'), (
-    match,
-  ) {
-    final token = match.group(1)!;
-    // Only redact if it looks like a token (mixed case or contains hyphens/underscores)
-    if (token.contains(RegExp(r'[A-Z]')) && token.contains(RegExp(r'[a-z]')) ||
-        token.contains('_') ||
-        token.contains('-')) {
-      return '[REDACTED_TOKEN]';
-    }
-    return token;
-  });
-
   return redacted;
 }
 
diff --git a/lib/utils/desktop_window_padding.dart b/lib/utils/desktop_window_padding.dart
index 39b2f667..e15b5de4 100644
--- a/lib/utils/desktop_window_padding.dart
+++ b/lib/utils/desktop_window_padding.dart
@@ -2,6 +2,21 @@ import 'dart:io' show Platform;
 import 'package:flutter/material.dart';
 import '../services/fullscreen_state_manager.dart';
 
+/// InheritedWidget to indicate that a side navigation is present in the widget tree.
+/// When present, app bars should skip their left padding since the side nav
+/// already handles the macOS traffic lights area.
+class SideNavigationScope extends InheritedWidget {
+  const SideNavigationScope({super.key, required super.child});
+
+  static bool isPresent(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<SideNavigationScope>() !=
+        null;
+  }
+
+  @override
+  bool updateShouldNotify(SideNavigationScope oldWidget) => false;
+}
+
 /// Padding values for desktop window controls
 class DesktopWindowPadding {
   /// Left padding for macOS traffic lights (normal window mode)
@@ -45,14 +60,28 @@ class DesktopAppBarHelper {
   /// Builds leading widget with appropriate left padding for macOS traffic lights
   ///
   /// [includeGestureDetector] - If true, wraps in GestureDetector to prevent window dragging
+  /// [context] - Required to check if side navigation is visible
   static Widget? buildAdjustedLeading(
     Widget? leading, {
     bool includeGestureDetector = false,
+    BuildContext? context,
   }) {
     if (!Platform.isMacOS || leading == null) {
       return leading;
     }
 
+    // Skip left padding when side navigation scope is present in widget tree
+    if (context != null && SideNavigationScope.isPresent(context)) {
+      if (includeGestureDetector) {
+        return GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          onPanDown: (_) {},
+          child: leading,
+        );
+      }
+      return leading;
+    }
+
     return ListenableBuilder(
       listenable: FullscreenStateManager(),
       builder: (context, _) {
@@ -94,11 +123,20 @@ class DesktopAppBarHelper {
   }
 
   /// Calculates the leading width for SliverAppBar to account for macOS traffic lights
-  static double? calculateLeadingWidth(Widget? leading) {
+  /// [context] - Required to check if side navigation is visible
+  static double? calculateLeadingWidth(
+    Widget? leading, {
+    BuildContext? context,
+  }) {
     if (!Platform.isMacOS || leading == null) {
       return null;
     }
 
+    // Skip extra width when side navigation scope is present in widget tree
+    if (context != null && SideNavigationScope.isPresent(context)) {
+      return null;
+    }
+
     final isFullscreen = FullscreenStateManager().isFullscreen;
     final leftPadding = isFullscreen
         ? DesktopWindowPadding.macOSLeftFullscreen
@@ -107,13 +145,16 @@ class DesktopAppBarHelper {
   }
 
   /// Wraps a widget with GestureDetector on macOS to prevent window dragging
-  static Widget wrapWithGestureDetector(Widget child) {
+  ///
+  /// [opaque] - If true, uses HitTestBehavior.opaque to fully consume gestures.
+  ///            If false (default), uses HitTestBehavior.translucent.
+  static Widget wrapWithGestureDetector(Widget child, {bool opaque = false}) {
     if (!Platform.isMacOS) {
       return child;
     }
 
     return GestureDetector(
-      behavior: HitTestBehavior.translucent,
+      behavior: opaque ? HitTestBehavior.opaque : HitTestBehavior.translucent,
       onPanDown: (_) {}, // Consume pan gestures to prevent window dragging
       child: child,
     );
@@ -122,6 +163,8 @@ class DesktopAppBarHelper {
 
 /// A widget that adds padding to account for desktop window controls.
 /// On macOS, adds left padding for traffic lights (reduced in fullscreen).
+/// When side navigation is visible, left padding is skipped as the side nav
+/// already occupies the traffic lights area.
 class DesktopTitleBarPadding extends StatelessWidget {
   final Widget child;
   final double? leftPadding;
@@ -140,6 +183,19 @@ class DesktopTitleBarPadding extends StatelessWidget {
       return child;
     }
 
+    // Skip left padding when side navigation scope is present in widget tree
+    // (side nav already handles the traffic lights area)
+    if (SideNavigationScope.isPresent(context)) {
+      final right = rightPadding ?? 0.0;
+      if (right == 0.0) {
+        return child;
+      }
+      return Padding(
+        padding: EdgeInsets.only(right: right),
+        child: child,
+      );
+    }
+
     return ListenableBuilder(
       listenable: FullscreenStateManager(),
       builder: (context, _) {
diff --git a/lib/utils/dialogs.dart b/lib/utils/dialogs.dart
new file mode 100644
index 00000000..ac1840a5
--- /dev/null
+++ b/lib/utils/dialogs.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import '../i18n/strings.g.dart';
+
+/// Utility functions for showing common dialogs
+
+/// Shows a delete confirmation dialog
+/// Returns true if user confirmed, false if cancelled
+Future<bool> showDeleteConfirmation(
+  BuildContext context, {
+  required String title,
+  required String message,
+}) async {
+  final confirmed = await showDialog<bool>(
+    context: context,
+    builder: (context) => AlertDialog(
+      title: Text(title),
+      content: Text(message),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context, false),
+          child: Text(t.common.cancel),
+        ),
+        TextButton(
+          onPressed: () => Navigator.pop(context, true),
+          style: TextButton.styleFrom(foregroundColor: Colors.red),
+          child: Text(t.common.delete),
+        ),
+      ],
+    ),
+  );
+
+  return confirmed ?? false;
+}
diff --git a/lib/utils/duration_formatter.dart b/lib/utils/duration_formatter.dart
new file mode 100644
index 00000000..698b612f
--- /dev/null
+++ b/lib/utils/duration_formatter.dart
@@ -0,0 +1,92 @@
+import 'package:duration/duration.dart';
+import 'package:duration/locale.dart';
+import '../i18n/strings.g.dart';
+
+/// Formats a duration in human-readable textual format (e.g., "1h 23m" or "1 hour 23 minutes").
+/// Uses localized unit names based on the current app locale.
+/// Shows hours and minutes only (no seconds).
+///
+/// Used for: media cards, media details, playlists.
+String formatDurationTextual(int milliseconds, {bool abbreviated = true}) {
+  final duration = Duration(milliseconds: milliseconds);
+
+  // Get the appropriate locale for the duration package
+  final durationLocale = _getDurationLocale();
+
+  // Format with abbreviated or full units (h, m) but no seconds
+  return prettyDuration(
+    duration,
+    abbreviated: abbreviated,
+    locale: durationLocale,
+    delimiter: abbreviated ? ' ' : ', ',
+    spacer: '',
+    // Configure to show only hours and minutes
+    tersity: DurationTersity.minute,
+  );
+}
+
+/// Formats a duration in human-readable textual format with seconds (e.g., "1h 23m 45s").
+/// Uses localized unit names based on the current app locale.
+/// Shows hours, minutes, and seconds.
+///
+/// Used for: sleep timer countdown.
+String formatDurationWithSeconds(Duration duration) {
+  // Get the appropriate locale for the duration package
+  final durationLocale = _getDurationLocale();
+
+  // Format with abbreviated units (h, m, s) including seconds
+  return prettyDuration(
+    duration,
+    abbreviated: true,
+    locale: durationLocale,
+    delimiter: ' ',
+    spacer: '',
+    // Show all non-zero units
+    tersity: DurationTersity.second,
+  );
+}
+
+/// Formats a duration in timestamp format (e.g., "1:23:45" or "23:45").
+/// This format is not localized as it follows universal digital clock conventions.
+/// Shows H:MM:SS or M:SS depending on duration.
+///
+/// Used for: video controls, chapters, episode durations.
+String formatDurationTimestamp(Duration duration) {
+  final hours = duration.inHours;
+  final minutes = duration.inMinutes.remainder(60);
+  final seconds = duration.inSeconds.remainder(60);
+
+  if (hours > 0) {
+    return '$hours:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
+  } else {
+    return '$minutes:${seconds.toString().padLeft(2, '0')}';
+  }
+}
+
+/// Formats a sync offset in milliseconds with sign indicator (e.g., "+150ms", "-250ms").
+/// This format is used for audio/subtitle synchronization adjustments.
+///
+/// Used for: audio sync sheet, sync offset controls.
+String formatSyncOffset(double offsetMs) {
+  final sign = offsetMs >= 0 ? '+' : '';
+  return '$sign${offsetMs.round()}ms';
+}
+
+/// Gets the duration package locale based on the current app locale.
+/// Falls back to English if the locale is not supported by the duration package.
+DurationLocale _getDurationLocale() {
+  // Get the current locale from slang's LocaleSettings
+  final appLocale = LocaleSettings.currentLocale;
+  final languageCode = appLocale.languageCode;
+
+  // Map supported locales to duration package locales
+  // The duration package supports many languages, but we'll focus on the ones
+  // that our app supports: en, de, it, nl, sv, zh
+  try {
+    return DurationLocale.fromLanguageCode(languageCode) ??
+        const EnglishDurationLocale();
+  } catch (e) {
+    // Fallback to English if language code is not supported
+    return const EnglishDurationLocale();
+  }
+}
diff --git a/lib/utils/endpoint_failover_interceptor.dart b/lib/utils/endpoint_failover_interceptor.dart
new file mode 100644
index 00000000..5a4c621c
--- /dev/null
+++ b/lib/utils/endpoint_failover_interceptor.dart
@@ -0,0 +1,169 @@
+import 'package:dio/dio.dart';
+
+import '../utils/app_logger.dart';
+
+/// Maintains the list of endpoints we can cycle through when one fails.
+class EndpointFailoverManager {
+  EndpointFailoverManager(List<String> urls) {
+    _setEndpoints(urls);
+  }
+
+  late List<String> _endpoints;
+  int _currentIndex = 0;
+
+  List<String> get endpoints => List.unmodifiable(_endpoints);
+
+  String get current => _endpoints[_currentIndex];
+
+  bool get hasFallback => _currentIndex < _endpoints.length - 1;
+
+  /// Move to the next endpoint, returning its URL or null if exhausted.
+  String? moveToNext() {
+    if (!hasFallback) return null;
+    _currentIndex++;
+    return _endpoints[_currentIndex];
+  }
+
+  /// Replace the endpoint list and optionally set the active endpoint.
+  void reset(List<String> urls, {String? currentBaseUrl}) {
+    _setEndpoints(urls);
+    if (currentBaseUrl != null) {
+      final index = _endpoints.indexOf(currentBaseUrl);
+      _currentIndex = index >= 0 ? index : 0;
+    } else {
+      _currentIndex = 0;
+    }
+  }
+
+  void _setEndpoints(List<String> urls) {
+    final sanitized = <String>[];
+    final seen = <String>{};
+    for (final url in urls) {
+      if (url.isEmpty || seen.contains(url)) continue;
+      seen.add(url);
+      sanitized.add(url);
+    }
+    if (sanitized.isEmpty) {
+      throw ArgumentError('At least one endpoint is required');
+    }
+    _endpoints = sanitized;
+    _currentIndex = _currentIndex.clamp(0, _endpoints.length - 1);
+  }
+}
+
+/// Dio interceptor that retries failed requests on the next available endpoint.
+class EndpointFailoverInterceptor extends Interceptor {
+  EndpointFailoverInterceptor({
+    required Dio dio,
+    required this.endpointManager,
+    required Future<void> Function(String newBaseUrl) onEndpointSwitch,
+  }) : _dio = dio,
+       _onEndpointSwitch = onEndpointSwitch;
+
+  final Dio _dio;
+  final EndpointFailoverManager endpointManager;
+  final Future<void> Function(String newBaseUrl) _onEndpointSwitch;
+  bool _isSwitching = false;
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) async {
+    if (_isSwitching ||
+        !_shouldAttemptFailover(err) ||
+        !endpointManager.hasFallback) {
+      handler.next(err);
+      return;
+    }
+
+    final failedEndpoint = endpointManager.current;
+    appLogger.w(
+      'Endpoint request failed, evaluating failover',
+      error: {
+        'endpoint': failedEndpoint,
+        'type': err.type.name,
+        'statusCode': err.response?.statusCode,
+      },
+      stackTrace: err.stackTrace,
+    );
+
+    final nextBaseUrl = endpointManager.moveToNext();
+    if (nextBaseUrl == null) {
+      appLogger.w(
+        'Endpoint failure but no fallback endpoints remain',
+        error: {'failedEndpoint': failedEndpoint},
+      );
+      handler.next(err);
+      return;
+    }
+
+    _isSwitching = true;
+    try {
+      appLogger.i(
+        'Switching Plex endpoint after request failure',
+        error: {
+          'from': failedEndpoint,
+          'to': nextBaseUrl,
+          'path': err.requestOptions.path,
+        },
+      );
+      await _onEndpointSwitch(nextBaseUrl);
+      final response = await _retryRequest(err.requestOptions);
+      appLogger.i(
+        'Endpoint failover retry succeeded',
+        error: {'newEndpoint': nextBaseUrl},
+      );
+      handler.resolve(response);
+    } on DioException catch (dioError) {
+      appLogger.w(
+        'Endpoint failover retry failed',
+        error: {
+          'newEndpoint': nextBaseUrl,
+          'type': dioError.type.name,
+          'statusCode': dioError.response?.statusCode,
+        },
+        stackTrace: dioError.stackTrace,
+      );
+      handler.next(dioError);
+    } catch (_) {
+      handler.next(err);
+    } finally {
+      _isSwitching = false;
+    }
+  }
+
+  bool _shouldAttemptFailover(DioException error) {
+    if (error.type == DioExceptionType.connectionTimeout ||
+        error.type == DioExceptionType.receiveTimeout ||
+        error.type == DioExceptionType.sendTimeout ||
+        error.type == DioExceptionType.connectionError) {
+      return true;
+    }
+
+    return false;
+  }
+
+  Future<Response<dynamic>> _retryRequest(RequestOptions requestOptions) {
+    final options = Options(
+      method: requestOptions.method,
+      headers: requestOptions.headers,
+      responseType: requestOptions.responseType,
+      contentType: requestOptions.contentType,
+      followRedirects: requestOptions.followRedirects,
+      receiveDataWhenStatusError: requestOptions.receiveDataWhenStatusError,
+      validateStatus: requestOptions.validateStatus,
+      sendTimeout: requestOptions.sendTimeout,
+      receiveTimeout: requestOptions.receiveTimeout,
+      extra: requestOptions.extra,
+      listFormat: requestOptions.listFormat,
+    );
+
+    return _dio.request<dynamic>(
+      requestOptions.path,
+      data: requestOptions.data,
+      queryParameters: requestOptions.queryParameters,
+      options: options,
+      cancelToken: requestOptions.cancelToken,
+      onSendProgress: requestOptions.onSendProgress,
+      onReceiveProgress: requestOptions.onReceiveProgress,
+    );
+  }
+}
diff --git a/lib/utils/error_message_utils.dart b/lib/utils/error_message_utils.dart
new file mode 100644
index 00000000..567ef238
--- /dev/null
+++ b/lib/utils/error_message_utils.dart
@@ -0,0 +1,26 @@
+import 'package:dio/dio.dart';
+import '../i18n/strings.g.dart';
+import 'app_logger.dart';
+
+/// Shared helpers for translating network errors into user-friendly messages.
+String mapDioErrorToMessage(DioException error, {required String context}) {
+  switch (error.type) {
+    case DioExceptionType.connectionTimeout:
+    case DioExceptionType.receiveTimeout:
+      return t.errors.connectionTimeout(context: context);
+    case DioExceptionType.connectionError:
+      return t.errors.connectionFailed;
+    default:
+      appLogger.e('Error loading $context', error: error);
+      return t.errors.failedToLoad(
+        context: context,
+        error: error.message ?? t.common.unknown,
+      );
+  }
+}
+
+/// Generic fallback for unexpected errors.
+String mapUnexpectedErrorToMessage(dynamic error, {required String context}) {
+  appLogger.e('Unexpected error in $context', error: error);
+  return t.errors.failedToLoad(context: context, error: error.toString());
+}
diff --git a/lib/utils/grid_size_calculator.dart b/lib/utils/grid_size_calculator.dart
new file mode 100644
index 00000000..4d1c567c
--- /dev/null
+++ b/lib/utils/grid_size_calculator.dart
@@ -0,0 +1,105 @@
+import 'package:flutter/material.dart';
+import '../services/settings_service.dart' show LibraryDensity;
+import 'layout_constants.dart';
+
+/// Utility class for calculating consistent grid sizes across the app
+class GridSizeCalculator {
+  /// Screen width breakpoint for tablet devices
+  static const double tabletBreakpoint = ScreenBreakpoints.tablet;
+
+  /// Screen width breakpoint for desktop devices
+  static const double desktopBreakpoint = ScreenBreakpoints.desktop;
+
+  /// Calculates the maximum cross-axis extent for grid items based on screen size and density
+  static double getMaxCrossAxisExtent(
+    BuildContext context,
+    LibraryDensity density,
+  ) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    final isDesktop = screenWidth > desktopBreakpoint;
+    final isTablet =
+        screenWidth > tabletBreakpoint && screenWidth <= desktopBreakpoint;
+
+    switch (density) {
+      case LibraryDensity.comfortable:
+        if (isDesktop) return GridLayoutConstants.comfortableDesktop;
+        if (isTablet) return GridLayoutConstants.comfortableTablet;
+        return GridLayoutConstants.comfortableMobile;
+      case LibraryDensity.compact:
+        if (isDesktop) return GridLayoutConstants.compactDesktop;
+        if (isTablet) return GridLayoutConstants.compactTablet;
+        return GridLayoutConstants.compactMobile;
+      case LibraryDensity.normal:
+        if (isDesktop) return GridLayoutConstants.normalDesktop;
+        if (isTablet) return GridLayoutConstants.normalTablet;
+        return GridLayoutConstants.normalMobile;
+    }
+  }
+
+  /// Calculates the max cross-axis extent accounting for outer padding.
+  ///
+  /// Uses responsive strategies:
+  /// - Wide screens (>=900px): Divisor-based calculation with max item width
+  /// - Medium screens (600-899px): Fixed item count (4-6 items based on density)
+  /// - Small screens (<600px): Fixed item count (2-4 items based on density)
+  static double getMaxCrossAxisExtentWithPadding(
+    BuildContext context,
+    LibraryDensity density,
+    double horizontalPadding,
+  ) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    final availableWidth = screenWidth - horizontalPadding;
+
+    if (ScreenBreakpoints.isWideTabletOrLarger(screenWidth)) {
+      // Wide screens (desktop/large tablet landscape): Responsive division
+      double divisor;
+      double maxItemWidth;
+
+      switch (density) {
+        case LibraryDensity.comfortable:
+          divisor = 6.5;
+          maxItemWidth = 280;
+        case LibraryDensity.normal:
+          divisor = 8.0;
+          maxItemWidth = 200;
+        case LibraryDensity.compact:
+          divisor = 10.0;
+          maxItemWidth = 160;
+      }
+
+      return (availableWidth / divisor).clamp(0, maxItemWidth);
+    } else if (ScreenBreakpoints.isTablet(screenWidth)) {
+      // Medium screens (tablets): Fixed 4-5-6 items
+      int targetItemCount = switch (density) {
+        LibraryDensity.comfortable => 4,
+        LibraryDensity.normal => 5,
+        LibraryDensity.compact => 6,
+      };
+      return availableWidth / targetItemCount;
+    } else {
+      // Small screens (phones): Fixed 2-3-4 items
+      int targetItemCount = switch (density) {
+        LibraryDensity.comfortable => 2,
+        LibraryDensity.normal => 3,
+        LibraryDensity.compact => 4,
+      };
+      return availableWidth / targetItemCount;
+    }
+  }
+
+  /// Returns whether the current screen is a desktop-sized screen
+  static bool isDesktop(BuildContext context) {
+    return MediaQuery.of(context).size.width > desktopBreakpoint;
+  }
+
+  /// Returns whether the current screen is a tablet-sized screen
+  static bool isTablet(BuildContext context) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    return screenWidth > tabletBreakpoint && screenWidth <= desktopBreakpoint;
+  }
+
+  /// Returns whether the current screen is a mobile-sized screen
+  static bool isMobile(BuildContext context) {
+    return MediaQuery.of(context).size.width <= tabletBreakpoint;
+  }
+}
diff --git a/lib/utils/layout_constants.dart b/lib/utils/layout_constants.dart
new file mode 100644
index 00000000..c35550c3
--- /dev/null
+++ b/lib/utils/layout_constants.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/widgets.dart';
+
+/// Layout and sizing constants used throughout the application
+/// Screen width breakpoints for responsive design
+class ScreenBreakpoints {
+  /// Breakpoint for mobile devices (< 600px)
+  static const double mobile = 600;
+
+  /// Breakpoint for wide tablets / small desktops (900px)
+  /// Used for intermediate responsive layouts
+  static const double wideTablet = 900;
+
+  /// Breakpoint for desktop devices (1200px)
+  static const double desktop = 1200;
+
+  /// Breakpoint for large desktop devices (1600px)
+  static const double largeDesktop = 1600;
+
+  // Legacy alias for backward compatibility
+  static const double tablet = mobile;
+
+  /// Whether width is mobile-sized (< 600px)
+  static bool isMobile(double width) => width < mobile;
+
+  /// Whether width is tablet-sized (600px - 1199px)
+  static bool isTablet(double width) => width >= mobile && width < desktop;
+
+  /// Whether width is wide tablet (900px - 1199px)
+  /// Useful for layouts that need more columns than phone but less than desktop
+  static bool isWideTablet(double width) => width >= wideTablet && width < desktop;
+
+  /// Whether width is desktop-sized (1200px - 1599px)
+  static bool isDesktop(double width) => width >= desktop && width < largeDesktop;
+
+  /// Whether width is large desktop-sized (>= 1600px)
+  static bool isLargeDesktop(double width) => width >= largeDesktop;
+
+  /// Whether width is desktop or larger (>= 1200px)
+  static bool isDesktopOrLarger(double width) => width >= desktop;
+
+  /// Whether width is wide tablet or larger (>= 900px)
+  static bool isWideTabletOrLarger(double width) => width >= wideTablet;
+}
+
+/// Grid layout constants
+class GridLayoutConstants {
+  /// Maximum cross-axis extent for grid items in comfortable density mode
+  static const double comfortableDesktop = 280;
+  static const double comfortableTablet = 240;
+  static const double comfortableMobile = 200;
+
+  /// Maximum cross-axis extent for grid items in compact density mode
+  static const double compactDesktop = 200;
+  static const double compactTablet = 170;
+  static const double compactMobile = 140;
+
+  /// Maximum cross-axis extent for grid items in normal density mode
+  static const double normalDesktop = 240;
+  static const double normalTablet = 200;
+  static const double normalMobile = 170;
+
+  /// Default aspect ratio for media cards (poster)
+  static const double posterAspectRatio = 2 / 3.3;
+
+  /// Grid spacing (edge-to-edge cards)
+  static const double crossAxisSpacing = 0;
+  static const double mainAxisSpacing = 0;
+
+  /// Standard grid padding
+  static EdgeInsets get gridPadding => const EdgeInsets.fromLTRB(8, 0, 8, 8);
+}
diff --git a/lib/utils/library_refresh_notifier.dart b/lib/utils/library_refresh_notifier.dart
new file mode 100644
index 00000000..e732d09c
--- /dev/null
+++ b/lib/utils/library_refresh_notifier.dart
@@ -0,0 +1,55 @@
+import 'dart:async';
+
+/// Types of library refresh events
+enum LibraryRefreshType { collections, playlists }
+
+/// Notifier for triggering refreshes of library tabs.
+///
+/// Singleton pattern with reinitializable state. The controller is lazily
+/// created and automatically recreated if disposed and later accessed.
+class LibraryRefreshNotifier {
+  static final LibraryRefreshNotifier _instance =
+      LibraryRefreshNotifier._internal();
+
+  factory LibraryRefreshNotifier() => _instance;
+
+  LibraryRefreshNotifier._internal();
+
+  /// Unified stream controller (lazily created, reinitializable)
+  StreamController<LibraryRefreshType>? _controller;
+
+  /// Ensure controller exists (creates if null or closed)
+  StreamController<LibraryRefreshType> get _ensureController {
+    if (_controller == null || _controller!.isClosed) {
+      _controller = StreamController<LibraryRefreshType>.broadcast();
+    }
+    return _controller!;
+  }
+
+  /// Unified stream of all refresh events
+  Stream<LibraryRefreshType> get stream => _ensureController.stream;
+
+  /// Stream for collections tab (backward compatible)
+  Stream<void> get collectionsStream =>
+      stream.where((t) => t == LibraryRefreshType.collections).map((_) {});
+
+  /// Stream for playlists tab (backward compatible)
+  Stream<void> get playlistsStream =>
+      stream.where((t) => t == LibraryRefreshType.playlists).map((_) {});
+
+  /// Notify that collections have changed
+  void notifyCollectionsChanged() {
+    _ensureController.add(LibraryRefreshType.collections);
+  }
+
+  /// Notify that playlists have changed
+  void notifyPlaylistsChanged() {
+    _ensureController.add(LibraryRefreshType.playlists);
+  }
+
+  /// Dispose controller (can be reinitialized later by accessing stream)
+  void dispose() {
+    _controller?.close();
+    _controller = null;
+  }
+}
diff --git a/lib/utils/log_redaction_manager.dart b/lib/utils/log_redaction_manager.dart
new file mode 100644
index 00000000..841be727
--- /dev/null
+++ b/lib/utils/log_redaction_manager.dart
@@ -0,0 +1,186 @@
+class LogRedactionManager {
+  // Size limits for bounded sets (FIFO eviction when exceeded)
+  static const int _maxTokens = 50;
+  static const int _maxUrls = 20;
+  static const int _maxCustomValues = 50;
+
+  // Use LinkedHashSet for FIFO ordering
+  static final Set<String> _tokens = <String>{};
+  static final Set<String> _urls = <String>{};
+  static final Set<String> _customValues = <String>{};
+
+  static final RegExp _ipv4Pattern = RegExp(
+    r'\b(\d{1,3})([.-])(\d{1,3})\2(\d{1,3})\2(\d{1,3})\b',
+  );
+  static final RegExp _ipv4HostPattern = RegExp(r'^\d{1,3}([.-]\d{1,3}){3}$');
+
+  // Combined regex for single-pass redaction (rebuilt on set changes)
+  static RegExp? _combinedPattern;
+
+  /// Register a server access token or Plex.tv token for redaction.
+  static void registerToken(String? token) {
+    final normalized = _normalize(token);
+    if (normalized == null) return;
+
+    _addWithLimit(_tokens, normalized, _maxTokens);
+
+    // Tokens often appear URL encoded in query params.
+    final encoded = Uri.encodeQueryComponent(normalized);
+    if (encoded != normalized) {
+      _addWithLimit(_tokens, encoded, _maxTokens);
+    }
+
+    _rebuildCombinedPattern();
+  }
+
+  /// Register the server/base URL currently in use.
+  static void registerServerUrl(String? url) {
+    final normalized = _normalize(url);
+    if (normalized == null) return;
+
+    final uri = Uri.tryParse(normalized);
+    final host = uri?.host;
+    if (host != null && host.isNotEmpty && _isIpv4Like(host)) {
+      // Do not register full IP-based URLs; regex redaction handles them.
+      return;
+    }
+
+    if (host == null && _isIpv4Like(normalized)) {
+      return;
+    }
+
+    final strippedSlash = normalized.endsWith('/')
+        ? normalized.substring(0, normalized.length - 1)
+        : normalized;
+
+    if (strippedSlash.isNotEmpty) {
+      _addWithLimit(_urls, strippedSlash, _maxUrls);
+      _addWithLimit(_urls, '$strippedSlash/', _maxUrls);
+    }
+
+    // Capture origin and host-level strings as well to cover most cases.
+    if (uri != null && uri.host.isNotEmpty) {
+      final origin =
+          '${uri.scheme.isEmpty ? 'https' : uri.scheme}://${uri.host}${uri.hasPort ? ':${uri.port}' : ''}';
+      _addWithLimit(_urls, origin, _maxUrls);
+      if (origin.endsWith('/')) {
+        _addWithLimit(_urls, origin.substring(0, origin.length - 1), _maxUrls);
+      }
+    }
+
+    _rebuildCombinedPattern();
+  }
+
+  /// Register other sensitive values that need redaction.
+  static void registerCustomValue(String? value) {
+    final normalized = _normalize(value);
+    if (normalized == null) return;
+    _addWithLimit(_customValues, normalized, _maxCustomValues);
+    _rebuildCombinedPattern();
+  }
+
+  /// Reset any tracked sensitive values (e.g., on logout).
+  static void clearTrackedValues() {
+    _tokens.clear();
+    _urls.clear();
+    _customValues.clear();
+    _combinedPattern = null;
+  }
+
+  /// Redact known sensitive values from the provided message.
+  static String redact(String message) {
+    // Pass 1: IPv4 addresses (regex pattern)
+    var redacted = message.replaceAllMapped(
+      _ipv4Pattern,
+      (match) => _maskIpv4(match.group(1)!, match.group(2)!, match.group(5)!),
+    );
+
+    // Pass 2: All tracked values in single pass
+    if (_combinedPattern != null) {
+      redacted = redacted.replaceAllMapped(_combinedPattern!, (match) {
+        final value = match.group(0)!;
+        if (_tokens.contains(value)) return '[REDACTED_TOKEN]';
+        if (_urls.contains(value)) return _maskUrlPreview(value);
+        return '[REDACTED]';
+      });
+    }
+
+    return redacted;
+  }
+
+  /// Rebuild the combined regex pattern from all tracked values.
+  static void _rebuildCombinedPattern() {
+    final allLiterals = [
+      ..._tokens.map(RegExp.escape),
+      ..._urls.map(RegExp.escape),
+      ..._customValues.map(RegExp.escape),
+    ];
+
+    if (allLiterals.isEmpty) {
+      _combinedPattern = null;
+      return;
+    }
+
+    // Sort by length descending so longer matches are preferred
+    allLiterals.sort((a, b) => b.length.compareTo(a.length));
+    _combinedPattern = RegExp(allLiterals.join('|'));
+  }
+
+  /// Add value to set with FIFO eviction if limit exceeded.
+  static void _addWithLimit(Set<String> set, String value, int maxSize) {
+    if (set.contains(value)) return; // Already tracked
+
+    // Evict oldest entries if at capacity
+    while (set.length >= maxSize) {
+      set.remove(set.first);
+    }
+    set.add(value);
+  }
+
+  static String? _normalize(String? value) {
+    if (value == null) return null;
+    final trimmed = value.trim();
+    if (trimmed.isEmpty) return null;
+    return trimmed;
+  }
+
+  static bool _isIpv4Like(String value) {
+    return _ipv4HostPattern.hasMatch(value);
+  }
+
+  static String _maskIpv4(String first, String separator, String last) {
+    return '$first$separator'
+        'x$separator'
+        'x$separator'
+        '$last';
+  }
+
+  static String _maskUrlPreview(String url) {
+    const startPreviewLength = 12;
+    const endPreviewLength = 8;
+
+    if (url.isEmpty) {
+      return '[REDACTED_URL]';
+    }
+
+    if (url.length <= 4) {
+      return '[REDACTED_URL]';
+    }
+
+    final startLength = url.length <= startPreviewLength
+        ? (url.length / 2).ceil()
+        : startPreviewLength;
+    final remainingForEnd = url.length - startLength;
+    final endLength = remainingForEnd <= endPreviewLength
+        ? remainingForEnd
+        : endPreviewLength;
+
+    final start = url.substring(0, startLength);
+    if (endLength <= 0) {
+      return '$start...[REDACTED_URL]';
+    }
+
+    final end = url.substring(url.length - endLength);
+    return '$start...[REDACTED_URL]...$end';
+  }
+}
diff --git a/lib/utils/media_navigation_helper.dart b/lib/utils/media_navigation_helper.dart
new file mode 100644
index 00000000..bfdb0630
--- /dev/null
+++ b/lib/utils/media_navigation_helper.dart
@@ -0,0 +1,115 @@
+import 'package:flutter/material.dart';
+import '../models/plex_metadata.dart';
+import '../models/plex_playlist.dart';
+import '../screens/collection_detail_screen.dart';
+import '../screens/media_detail_screen.dart';
+import '../screens/season_detail_screen.dart';
+import '../screens/playlist/playlist_detail_screen.dart';
+import 'video_player_navigation.dart';
+
+/// Result of media navigation indicating what action was taken
+enum MediaNavigationResult {
+  /// Navigation completed successfully
+  navigated,
+  /// Navigation completed, parent list should be refreshed (e.g., collection deleted)
+  listRefreshNeeded,
+  /// Item type not supported (e.g., music content)
+  unsupported,
+}
+
+/// Navigates to the appropriate screen based on the item type.
+///
+/// For episodes, starts playback directly via video player.
+/// For seasons, navigates to season detail screen.
+/// For playlists, navigates to playlist detail screen.
+/// For collections, navigates to collection detail screen.
+/// For other types (shows, movies), navigates to media detail screen.
+/// For music types (artist, album, track), returns [MediaNavigationResult.unsupported].
+///
+/// The [onRefresh] callback is invoked with the item's ratingKey after
+/// returning from the detail screen, allowing the caller to refresh state.
+///
+/// Set [isOffline] to true for downloaded content without server access.
+///
+/// Returns a [MediaNavigationResult] indicating what action was taken:
+/// - [MediaNavigationResult.navigated]: Navigation completed, item refresh handled
+/// - [MediaNavigationResult.listRefreshNeeded]: Caller should refresh entire list
+/// - [MediaNavigationResult.unsupported]: Item type not supported, caller should handle
+Future<MediaNavigationResult> navigateToMediaItem(
+  BuildContext context,
+  dynamic item, {
+  void Function(String)? onRefresh,
+  bool isOffline = false,
+}) async {
+  // Handle playlists
+  if (item is PlexPlaylist) {
+    await Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) => PlaylistDetailScreen(playlist: item),
+      ),
+    );
+    return MediaNavigationResult.navigated;
+  }
+
+  final metadata = item as PlexMetadata;
+
+  switch (metadata.mediaType) {
+    case PlexMediaType.collection:
+      final result = await Navigator.push<bool>(
+        context,
+        MaterialPageRoute(
+          builder: (context) => CollectionDetailScreen(collection: metadata),
+        ),
+      );
+      // If collection was deleted, signal that list refresh is needed
+      if (result == true) {
+        return MediaNavigationResult.listRefreshNeeded;
+      }
+      return MediaNavigationResult.navigated;
+
+    case PlexMediaType.artist:
+    case PlexMediaType.album:
+    case PlexMediaType.track:
+      // Music types not supported
+      return MediaNavigationResult.unsupported;
+
+    case PlexMediaType.episode:
+      // For episodes, start playback directly
+      final result = await navigateToVideoPlayer(
+        context,
+        metadata: metadata,
+        isOffline: isOffline,
+      );
+      if (result == true) {
+        onRefresh?.call(metadata.ratingKey);
+      }
+      return MediaNavigationResult.navigated;
+
+    case PlexMediaType.season:
+      await Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (context) => SeasonDetailScreen(season: metadata),
+        ),
+      );
+      onRefresh?.call(metadata.ratingKey);
+      return MediaNavigationResult.navigated;
+
+    default:
+      // For all other types (shows, movies), show detail screen
+      final result = await Navigator.push<bool>(
+        context,
+        MaterialPageRoute(
+          builder: (context) => MediaDetailScreen(
+            metadata: metadata,
+            isOffline: isOffline,
+          ),
+        ),
+      );
+      if (result == true) {
+        onRefresh?.call(metadata.ratingKey);
+      }
+      return MediaNavigationResult.navigated;
+  }
+}
diff --git a/lib/utils/platform_detector.dart b/lib/utils/platform_detector.dart
index 43d3f514..acd467af 100644
--- a/lib/utils/platform_detector.dart
+++ b/lib/utils/platform_detector.dart
@@ -1,8 +1,20 @@
 import 'package:flutter/material.dart';
 import 'dart:math';
 
+import '../services/tv_detection_service.dart';
+
 /// Utility class for platform detection
 class PlatformDetector {
+  /// Detects if running on Android TV (requires TvDetectionService to be initialized)
+  static bool isTV() {
+    return TvDetectionService.isTVSync();
+  }
+
+  /// Detects if the app should use side navigation (Desktop or TV)
+  static bool shouldUseSideNavigation(BuildContext context) {
+    return isDesktop(context) || isTV();
+  }
+
   /// Detects if running on a mobile platform (iOS or Android)
   /// Uses Theme for consistent platform detection across the app
   static bool isMobile(BuildContext context) {
diff --git a/lib/utils/player_utils.dart b/lib/utils/player_utils.dart
new file mode 100644
index 00000000..bba1df81
--- /dev/null
+++ b/lib/utils/player_utils.dart
@@ -0,0 +1,16 @@
+import '../mpv/mpv.dart';
+
+/// Seeks by the given offset (can be positive or negative) while clamping
+/// the result between 0 and the video duration
+void seekWithClamping(Player player, Duration offset) {
+  final currentPosition = player.state.position;
+  final duration = player.state.duration;
+  final newPosition = currentPosition + offset;
+
+  // Clamp between 0 and video duration
+  final clampedPosition = newPosition.isNegative
+      ? Duration.zero
+      : (newPosition > duration ? duration : newPosition);
+
+  player.seek(clampedPosition);
+}
diff --git a/lib/utils/plex_image_helper.dart b/lib/utils/plex_image_helper.dart
new file mode 100644
index 00000000..f82bfc31
--- /dev/null
+++ b/lib/utils/plex_image_helper.dart
@@ -0,0 +1,235 @@
+import 'dart:math';
+import '../services/plex_client.dart';
+
+/// Image types for different transcoding strategies
+enum ImageType {
+  poster, // 2:3 ratio posters
+  art, // Wide background art
+  thumb, // 16:9 episode thumbnails
+  logo, // Variable ratio clear logos
+  avatar, // Square-ish user avatars
+}
+
+class PlexImageHelper {
+  static const int _widthRoundingFactor = 40;
+  static const int _heightRoundingFactor = 60;
+
+  static const int _maxTranscodedWidth = 1920;
+  static const int _maxTranscodedHeight = 1080;
+
+  static const int _minTranscodedWidth = 160;
+  static const int _minTranscodedHeight = 240;
+
+  /// Rounds dimensions to cache-friendly values to increase cache hit rate
+  static (int width, int height) roundDimensions(double width, double height) {
+    final roundedWidth =
+        (width / _widthRoundingFactor).ceil() * _widthRoundingFactor;
+    final roundedHeight =
+        (height / _heightRoundingFactor).ceil() * _heightRoundingFactor;
+
+    return (
+      roundedWidth.clamp(_minTranscodedWidth, _maxTranscodedWidth),
+      roundedHeight.clamp(_minTranscodedHeight, _maxTranscodedHeight),
+    );
+  }
+
+  /// Calculates optimal image dimensions based on image type and constraints
+  static (int width, int height) calculateOptimalDimensions({
+    required double maxWidth,
+    required double maxHeight,
+    required double devicePixelRatio,
+    ImageType imageType = ImageType.poster,
+  }) {
+    final targetWidth = maxWidth.isFinite
+        ? maxWidth * devicePixelRatio
+        : 300 * devicePixelRatio;
+    final targetHeight = maxHeight.isFinite
+        ? maxHeight * devicePixelRatio
+        : 450 * devicePixelRatio;
+
+    switch (imageType) {
+      case ImageType.art:
+        // For art/background images, preserve aspect ratio while covering container
+        // Calculate dimensions that ensure the image covers the container without stretching
+        // This mimics BoxFit.cover behavior for the transcoding request
+
+        // Use larger dimensions to ensure coverage while preserving aspect ratio
+        // This will request a slightly larger image that can be cropped by Flutter's BoxFit.cover
+        final coverWidth = targetWidth * 1.1; // 10% larger for better coverage
+        final coverHeight = targetHeight * 1.1;
+
+        return roundDimensions(coverWidth, coverHeight);
+
+      case ImageType.logo:
+        // For logos, use generous bounds to avoid forcing aspect ratio
+        // Prefer width-based scaling for most logos
+        final logoWidth = targetWidth;
+        final logoHeight = targetHeight; // Allow full height flexibility
+        return roundDimensions(logoWidth, logoHeight);
+
+      case ImageType.thumb:
+        // For episode thumbs, optimize for 16:9 but allow flexibility
+        final thumbHeight = targetHeight;
+        final thumbWidth = min(targetWidth, thumbHeight * (16 / 9));
+        return roundDimensions(thumbWidth, thumbHeight);
+
+      case ImageType.avatar:
+        // For avatars, use square dimensions based on smaller constraint
+        final size = min(targetWidth, targetHeight);
+        return roundDimensions(size, size);
+
+      case ImageType.poster:
+        // For posters, maintain 2:3 aspect ratio
+        final calculatedWidth = min(targetWidth, targetHeight / (2 / 3));
+        final calculatedHeight = calculatedWidth * (2 / 3);
+        return roundDimensions(calculatedWidth, calculatedHeight);
+    }
+  }
+
+  /// Builds a Plex photo transcode URL with optimized parameters
+  static String buildTranscodeUrl({
+    required PlexClient client,
+    required String originalPath,
+    required int width,
+    int? height,
+  }) {
+    final baseUrl = client.config.baseUrl;
+    final token = client.config.token;
+
+    // URL encode the original path with token
+    final encodedPath = Uri.encodeComponent(
+      '$originalPath${originalPath.contains('?') ? '&' : '?'}X-Plex-Token=$token',
+    );
+
+    // Build the transcode URL
+    final transcodeParams = {
+      'width': width.toString(),
+      if (height != null) 'height': height.toString(),
+      'minSize': '1', // Ensure minimum size is maintained
+      'upscale': '1', // Allow upscaling for better quality
+      'url': encodedPath,
+      'X-Plex-Token': token,
+    };
+
+    final queryString = transcodeParams.entries
+        .map((e) => '${e.key}=${e.value}')
+        .join('&');
+
+    return '$baseUrl/photo/:/transcode?$queryString';
+  }
+
+  /// Creates an optimized image URL for Plex content
+  /// Falls back to original URL if transcoding is not appropriate
+  /// If client is null (offline mode), returns empty string for relative paths
+  static String getOptimizedImageUrl({
+    PlexClient? client,
+    required String? thumbPath,
+    required double maxWidth,
+    required double maxHeight,
+    required double devicePixelRatio,
+    bool enableTranscoding = true,
+    ImageType imageType = ImageType.poster,
+  }) {
+    if (thumbPath == null || thumbPath.isEmpty) {
+      return '';
+    }
+
+    final basePath = thumbPath;
+
+    // If we can't/shouldn't transcode (already a full URL), just return it.
+    if (basePath.startsWith('http://') || basePath.startsWith('https://')) {
+      return basePath;
+    }
+
+    // If no client (offline mode), we can't build URLs for relative paths
+    // Images should already be cached from when they were originally loaded
+    if (client == null) {
+      return '';
+    }
+
+    // For art/backgrounds and clear logos, prefer the original image to avoid
+    // any aspect ratio changes from Plex photo transcoding.
+    if (imageType == ImageType.art || imageType == ImageType.logo) {
+      return client.getThumbnailUrl(basePath);
+    }
+
+    final canTranscode = enableTranscoding && shouldTranscode(basePath);
+
+    // If marked non-transcodable or transcoding disabled, use the direct thumbnail URL.
+    if (!canTranscode) {
+      return client.getThumbnailUrl(basePath);
+    }
+
+    // For very small images use original URL
+    if (maxWidth < 80 || maxHeight < 120) {
+      return client.getThumbnailUrl(basePath);
+    }
+
+    // Calculate optimal dimensions
+    final (width, height) = calculateOptimalDimensions(
+      maxWidth: maxWidth,
+      maxHeight: maxHeight,
+      devicePixelRatio: devicePixelRatio,
+      imageType: imageType,
+    );
+
+    // For art and logos we only constrain width to preserve native aspect.
+    final useWidthOnly =
+        imageType == ImageType.art || imageType == ImageType.logo;
+
+    // For dimensions close to minimum, use original to avoid unnecessary processing
+    if (width <= _minTranscodedWidth * 1.2 &&
+        height <= _minTranscodedHeight * 1.2) {
+      return client.getThumbnailUrl(basePath);
+    }
+
+    try {
+      return buildTranscodeUrl(
+        client: client,
+        originalPath: basePath,
+        width: width,
+        height: useWidthOnly ? null : height,
+      );
+    } catch (e) {
+      // Fallback to original URL on any error
+      return client.getThumbnailUrl(basePath);
+    }
+  }
+
+  /// Generates cache-friendly dimensions for memory caching
+  static (int memWidth, int memHeight) getMemCacheDimensions({
+    required int displayWidth,
+    required int displayHeight,
+    double scaleFactor = 1.0,
+  }) {
+    final scaledWidth = (displayWidth * scaleFactor).round();
+    final scaledHeight = (displayHeight * scaleFactor).round();
+
+    return (scaledWidth.clamp(120, 1200), scaledHeight.clamp(180, 1800));
+  }
+
+  /// Determines if an image path is suitable for transcoding
+  static bool shouldTranscode(String? imagePath) {
+    if (imagePath == null || imagePath.isEmpty) return false;
+
+    // Don't transcode already processed images or external URLs
+    if (imagePath.contains('/photo/:/transcode') ||
+        imagePath.startsWith('http://') ||
+        imagePath.startsWith('https://')) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /// Creates a consistent cache key for rounded dimensions
+  static String generateCacheKey({
+    required String originalPath,
+    required int width,
+    required int height,
+    String? serverId,
+  }) {
+    final serverPrefix = serverId != null ? '${serverId}_' : '';
+    return '${serverPrefix}transcode_${width}x${height}_${originalPath.hashCode}';
+  }
+}
diff --git a/lib/utils/provider_extensions.dart b/lib/utils/provider_extensions.dart
index 973fd4c4..99dd9382 100644
--- a/lib/utils/provider_extensions.dart
+++ b/lib/utils/provider_extensions.dart
@@ -1,10 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import '../services/plex_client.dart';
+import '../i18n/strings.g.dart';
+import '../models/plex_library.dart';
+import '../models/plex_user_profile.dart';
+import '../providers/hidden_libraries_provider.dart';
+import '../providers/multi_server_provider.dart';
 import '../providers/plex_client_provider.dart';
 import '../providers/user_profile_provider.dart';
-import '../providers/hidden_libraries_provider.dart';
-import '../client/plex_client.dart';
-import '../models/plex_user_profile.dart';
+import 'app_logger.dart';
 
 extension ProviderExtensions on BuildContext {
   PlexClientProvider get plexClient =>
@@ -25,12 +29,41 @@ extension ProviderExtensions on BuildContext {
   HiddenLibrariesProvider watchHiddenLibraries() =>
       Provider.of<HiddenLibrariesProvider>(this, listen: true);
 
-  // Direct client access (nullable)
-  PlexClient? get client => plexClient.client;
-
-  // Null-safe client access
-  PlexClient get clientSafe => plexClient.client!;
-
   // Direct profile settings access (nullable)
   PlexUserProfile? get profileSettings => userProfile.profileSettings;
+
+  /// Get PlexClient for a specific server ID
+  /// Throws an exception if no client is available for the given serverId
+  PlexClient getClientForServer(String serverId) {
+    final multiServerProvider = Provider.of<MultiServerProvider>(
+      this,
+      listen: false,
+    );
+
+    final serverClient = multiServerProvider.getClientForServer(serverId);
+
+    if (serverClient == null) {
+      appLogger.e('No client found for server $serverId');
+      throw Exception(t.errors.noClientAvailable);
+    }
+
+    return serverClient;
+  }
+
+  /// Get PlexClient for a library
+  /// Throws an exception if no client is available
+  PlexClient getClientForLibrary(PlexLibrary library) {
+    // If library doesn't have a serverId, fall back to first available server
+    if (library.serverId == null) {
+      final multiServerProvider = Provider.of<MultiServerProvider>(
+        this,
+        listen: false,
+      );
+      if (!multiServerProvider.hasConnectedServers) {
+        throw Exception(t.errors.noClientAvailable);
+      }
+      return getClientForServer(multiServerProvider.onlineServerIds.first);
+    }
+    return getClientForServer(library.serverId!);
+  }
 }
diff --git a/lib/utils/shuffle_play_helper.dart b/lib/utils/shuffle_play_helper.dart
deleted file mode 100644
index 58abed1c..00000000
--- a/lib/utils/shuffle_play_helper.dart
+++ /dev/null
@@ -1,111 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import '../models/plex_metadata.dart';
-import '../providers/playback_state_provider.dart';
-import '../providers/settings_provider.dart';
-import '../utils/provider_extensions.dart';
-import '../utils/video_player_navigation.dart';
-import '../i18n/strings.g.dart';
-
-/// Handle shuffle play action for shows and seasons
-///
-/// Fetches episodes based on user settings (unwatched only or including watched),
-/// shuffles them, and starts playback from the first shuffled episode.
-/// The shuffle queue is stored in the PlaybackStateProvider for continuous shuffle playback.
-Future<void> handleShufflePlay(
-  BuildContext context,
-  PlexMetadata metadata,
-) async {
-  final client = context.client;
-  if (client == null) return;
-
-  final playbackState = context.read<PlaybackStateProvider>();
-  final settingsProvider = context.read<SettingsProvider>();
-  final itemType = metadata.type.toLowerCase();
-
-  // Get shuffle setting
-  final unwatchedOnly = settingsProvider.shuffleUnwatchedOnly;
-
-  try {
-    // Show loading indicator
-    if (context.mounted) {
-      showDialog(
-        context: context,
-        barrierDismissible: false,
-        builder: (context) => const Center(child: CircularProgressIndicator()),
-      );
-    }
-
-    // Get episodes based on type and settings
-    List<PlexMetadata> episodes;
-    if (itemType == 'show') {
-      if (unwatchedOnly) {
-        // Get only unwatched episodes
-        episodes = await client.getAllUnwatchedEpisodes(metadata.ratingKey);
-      } else {
-        // Get all episodes from all seasons
-        final allEpisodes = <PlexMetadata>[];
-        final seasons = await client.getChildren(metadata.ratingKey);
-
-        for (final season in seasons) {
-          if (season.type == 'season') {
-            final seasonEpisodes = await client.getChildren(season.ratingKey);
-            final episodesOnly = seasonEpisodes
-                .where((ep) => ep.type == 'episode')
-                .toList();
-            allEpisodes.addAll(episodesOnly);
-          }
-        }
-        episodes = allEpisodes;
-      }
-    } else {
-      // season
-      if (unwatchedOnly) {
-        // Get only unwatched episodes
-        episodes = await client.getUnwatchedEpisodesInSeason(
-          metadata.ratingKey,
-        );
-      } else {
-        // Get all episodes in season
-        final seasonEpisodes = await client.getChildren(metadata.ratingKey);
-        episodes = seasonEpisodes.where((ep) => ep.type == 'episode').toList();
-      }
-    }
-
-    // Close loading indicator
-    if (context.mounted) {
-      Navigator.pop(context);
-    }
-
-    if (episodes.isEmpty) {
-      if (context.mounted) {
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text(t.messages.noEpisodesFound)));
-      }
-      return;
-    }
-
-    // Shuffle the episodes
-    episodes.shuffle();
-
-    // Store shuffle queue in provider
-    playbackState.setShuffleQueue(episodes, metadata.ratingKey);
-
-    // Navigate to first episode
-    if (context.mounted) {
-      await navigateToVideoPlayer(context, metadata: episodes.first);
-    }
-  } catch (e) {
-    // Close loading indicator if it's still open
-    if (context.mounted && Navigator.canPop(context)) {
-      Navigator.pop(context);
-    }
-
-    if (context.mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(t.messages.errorLoading(error: e.toString()))),
-      );
-    }
-  }
-}
diff --git a/lib/utils/sliver_adaptive_media_builder.dart b/lib/utils/sliver_adaptive_media_builder.dart
new file mode 100644
index 00000000..a5e11013
--- /dev/null
+++ b/lib/utils/sliver_adaptive_media_builder.dart
@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import '../services/settings_service.dart';
+import 'grid_size_calculator.dart';
+import 'layout_constants.dart';
+
+/// Builds an adaptive Sliver widget that switches between grid and list
+/// based on the current view mode setting.
+///
+/// This helper consolidates the list vs grid Sliver builders to keep
+/// padding and density logic in sync across different screens.
+Widget buildAdaptiveMediaSliverBuilder<T>({
+  required BuildContext context,
+  required List<T> items,
+  required Widget Function(BuildContext context, T item, int index) itemBuilder,
+  required ViewMode viewMode,
+  required LibraryDensity density,
+  EdgeInsets? padding,
+  double? childAspectRatio,
+  double? crossAxisSpacing,
+  double? mainAxisSpacing,
+}) {
+  final effectivePadding = padding ?? GridLayoutConstants.gridPadding;
+  final effectiveAspectRatio =
+      childAspectRatio ?? GridLayoutConstants.posterAspectRatio;
+  final effectiveCrossAxisSpacing =
+      crossAxisSpacing ?? GridLayoutConstants.crossAxisSpacing;
+  final effectiveMainAxisSpacing =
+      mainAxisSpacing ?? GridLayoutConstants.mainAxisSpacing;
+
+  if (viewMode == ViewMode.list) {
+    return SliverPadding(
+      padding: effectivePadding,
+      sliver: SliverList(
+        delegate: SliverChildBuilderDelegate((context, index) {
+          final item = items[index];
+          return itemBuilder(context, item, index);
+        }, childCount: items.length),
+      ),
+    );
+  } else {
+    return SliverPadding(
+      padding: effectivePadding,
+      sliver: SliverGrid(
+        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: GridSizeCalculator.getMaxCrossAxisExtent(
+            context,
+            density,
+          ),
+          childAspectRatio: effectiveAspectRatio,
+          crossAxisSpacing: effectiveCrossAxisSpacing,
+          mainAxisSpacing: effectiveMainAxisSpacing,
+        ),
+        delegate: SliverChildBuilderDelegate((context, index) {
+          final item = items[index];
+          return itemBuilder(context, item, index);
+        }, childCount: items.length),
+      ),
+    );
+  }
+}
diff --git a/lib/utils/smart_deletion_handler.dart b/lib/utils/smart_deletion_handler.dart
new file mode 100644
index 00000000..cd490a60
--- /dev/null
+++ b/lib/utils/smart_deletion_handler.dart
@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../providers/download_provider.dart';
+import '../widgets/deletion_progress_dialog.dart';
+
+class SmartDeletionHandler {
+  /// Execute deletion with smart progress dialog
+  /// Only shows dialog if deletion takes longer than delayMs
+  static Future<void> deleteWithProgress({
+    required BuildContext context,
+    required DownloadProvider provider,
+    required String globalKey,
+    int delayMs = 500,
+  }) async {
+    bool dialogShown = false;
+    bool deletionComplete = false;
+
+    // Start a timer to show dialog after delay
+    Future.delayed(Duration(milliseconds: delayMs), () {
+      if (!deletionComplete && context.mounted) {
+        dialogShown = true;
+        _showProgressDialog(context, provider, globalKey);
+      }
+    });
+
+    try {
+      await provider.deleteDownload(globalKey);
+    } finally {
+      deletionComplete = true;
+      // Close dialog if shown (with canPop guard to prevent double-pop)
+      if (dialogShown && context.mounted && Navigator.canPop(context)) {
+        Navigator.of(context).pop();
+      }
+    }
+  }
+
+  /// Show progress dialog and listen to updates
+  static void _showProgressDialog(
+    BuildContext context,
+    DownloadProvider provider,
+    String globalKey,
+  ) {
+    showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (dialogContext) => Consumer<DownloadProvider>(
+        builder: (context, provider, child) {
+          final progress = provider.getDeletionProgress(globalKey);
+
+          // If no progress, show simple fallback
+          if (progress == null) {
+            return const AlertDialog(
+              content: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  CircularProgressIndicator(),
+                  SizedBox(width: 20),
+                  Text('Deleting...'),
+                ],
+              ),
+            );
+          }
+
+          return DeletionProgressDialog(progress: progress);
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/utils/user_switching_utils.dart b/lib/utils/user_switching_utils.dart
deleted file mode 100644
index 38827aa0..00000000
--- a/lib/utils/user_switching_utils.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-import '../models/plex_home_user.dart';
-import '../i18n/strings.g.dart';
-import 'provider_extensions.dart';
-
-class UserSwitchingUtils {
-  static Future<bool> switchToUser(
-    BuildContext context,
-    PlexHomeUser user, {
-    bool popOnSuccess = false,
-  }) async {
-    final userProvider = context.userProfile;
-
-    final success = await userProvider.switchToUser(user, context);
-
-    if (success && context.mounted && popOnSuccess) {
-      Navigator.of(context).pop();
-    } else if (!success && context.mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(
-            t.messages.failedToSwitchProfile(displayName: user.displayName),
-          ),
-          backgroundColor: Theme.of(context).colorScheme.error,
-        ),
-      );
-    }
-
-    return success;
-  }
-}
diff --git a/lib/utils/video_control_icons.dart b/lib/utils/video_control_icons.dart
new file mode 100644
index 00000000..d9dfdc03
--- /dev/null
+++ b/lib/utils/video_control_icons.dart
@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+/// Get the replay icon based on the duration
+/// Returns numbered icons (replay_5, replay_10, replay_30) when available,
+/// otherwise returns generic replay icon
+IconData getReplayIcon(int seconds) {
+  switch (seconds) {
+    case 5:
+      return Symbols.replay_5_rounded;
+    case 10:
+      return Symbols.replay_10_rounded;
+    case 30:
+      return Symbols.replay_30_rounded;
+    default:
+      return Symbols.replay_rounded; // Generic icon for custom durations
+  }
+}
+
+/// Get the forward icon based on the duration
+/// Returns numbered icons (forward_5, forward_10, forward_30) when available,
+/// otherwise returns generic forward icon
+IconData getForwardIcon(int seconds) {
+  switch (seconds) {
+    case 5:
+      return Symbols.forward_5_rounded;
+    case 10:
+      return Symbols.forward_10_rounded;
+    case 30:
+      return Symbols.forward_30_rounded;
+    default:
+      return Symbols.forward_rounded; // Generic icon for custom durations
+  }
+}
diff --git a/lib/utils/video_player_navigation.dart b/lib/utils/video_player_navigation.dart
index d0996f21..2f1b51a1 100644
--- a/lib/utils/video_player_navigation.dart
+++ b/lib/utils/video_player_navigation.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
+
+import '../mpv/mpv.dart';
 import '../models/plex_metadata.dart';
 import '../screens/video_player_screen.dart';
 import '../services/settings_service.dart';
@@ -20,6 +21,7 @@ import '../services/settings_service.dart';
 ///   loads the saved preference for the series/movie. Defaults to 0 if no preference exists.
 /// - [usePushReplacement]: If true, replaces current route instead of pushing;
 ///   useful for episode-to-episode navigation. Defaults to false.
+/// - [isOffline]: If true, plays from downloaded content without requiring server connection.
 ///
 /// Returns a Future that completes with a boolean indicating whether the content
 /// was watched, or null if navigation was cancelled.
@@ -31,6 +33,7 @@ Future<bool?> navigateToVideoPlayer(
   double? preferredPlaybackRate,
   int? selectedMediaIndex,
   bool usePushReplacement = false,
+  bool isOffline = false,
 }) async {
   // Extract navigator before any async operations
   final navigator = Navigator.of(context);
@@ -59,6 +62,7 @@ Future<bool?> navigateToVideoPlayer(
       preferredSubtitleTrack: preferredSubtitleTrack,
       preferredPlaybackRate: preferredPlaybackRate,
       selectedMediaIndex: mediaIndex,
+      isOffline: isOffline,
     ),
     transitionDuration: Duration.zero,
     reverseTransitionDuration: Duration.zero,
diff --git a/lib/widgets/app_bar_back_button.dart b/lib/widgets/app_bar_back_button.dart
index a23b924f..5f6d17fd 100644
--- a/lib/widgets/app_bar_back_button.dart
+++ b/lib/widgets/app_bar_back_button.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 
 /// Defines the visual style of the back button
 enum BackButtonStyle {
@@ -29,11 +31,13 @@ class AppBarBackButton extends StatefulWidget {
   /// [style] determines the visual appearance of the back button.
   /// [onPressed] is called when the button is tapped. If null, defaults to Navigator.pop.
   /// [color] overrides the default icon color. If null, uses white for circular/video, theme default for plain.
+  /// [semanticLabel] provides accessibility label for screen readers.
   const AppBarBackButton({
     super.key,
     this.style = BackButtonStyle.circular,
     this.onPressed,
     this.color,
+    this.semanticLabel,
   });
 
   /// The visual style of the back button
@@ -45,6 +49,9 @@ class AppBarBackButton extends StatefulWidget {
   /// The color of the back arrow icon. If null, uses style-appropriate default.
   final Color? color;
 
+  /// Semantic label for screen readers
+  final String? semanticLabel;
+
   @override
   State<AppBarBackButton> createState() => _AppBarBackButtonState();
 }
@@ -124,7 +131,7 @@ class _AppBarBackButtonState extends State<AppBarBackButton>
         break;
     }
 
-    final button = MouseRegion(
+    final buttonWidget = MouseRegion(
       cursor: SystemMouseCursors.click,
       onEnter: (_) => _onHoverChange(true),
       onExit: (_) => _onHoverChange(false),
@@ -147,13 +154,27 @@ class _AppBarBackButtonState extends State<AppBarBackButton>
                 color: currentColor,
                 shape: BoxShape.circle,
               ),
-              child: Icon(Icons.arrow_back, color: effectiveColor, size: 20),
+              child: AppIcon(
+                Symbols.arrow_back_rounded,
+                fill: 1,
+                color: effectiveColor,
+                size: 20,
+              ),
             );
           },
         ),
       ),
     );
 
+    final button = widget.semanticLabel != null
+        ? Semantics(
+            label: widget.semanticLabel,
+            button: true,
+            excludeSemantics: true,
+            child: buttonWidget,
+          )
+        : buttonWidget;
+
     return widget.style == BackButtonStyle.circular
         ? SafeArea(child: button)
         : button;
diff --git a/lib/widgets/app_icon.dart b/lib/widgets/app_icon.dart
new file mode 100644
index 00000000..88febcea
--- /dev/null
+++ b/lib/widgets/app_icon.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+
+/// Wrapper around [Icon] that centralizes our Material Symbols defaults.
+/// Defaults: fill=1 (filled) and weight=700 (bold). Update [AppIconDefaults]
+/// to tweak app-wide icon appearance from one place.
+class AppIcon extends StatelessWidget {
+  const AppIcon(
+    this.icon, {
+    super.key,
+    this.size,
+    this.color,
+    this.fill,
+    this.weight,
+    this.grade,
+    this.opticalSize,
+    this.shadows,
+    this.semanticLabel,
+    this.textDirection,
+  });
+
+  final IconData? icon;
+  final double? size;
+  final Color? color;
+  final double? fill;
+  final double? weight;
+  final double? grade;
+  final double? opticalSize;
+  final List<Shadow>? shadows;
+  final String? semanticLabel;
+  final TextDirection? textDirection;
+
+  @override
+  Widget build(BuildContext context) {
+    if (icon == null) return const SizedBox.shrink();
+    return Icon(
+      icon,
+      size: size,
+      color: color,
+      fill: fill ?? AppIconDefaults.fill,
+      weight: weight ?? AppIconDefaults.weight,
+      grade: grade ?? AppIconDefaults.grade,
+      opticalSize: opticalSize ?? AppIconDefaults.opticalSize,
+      shadows: shadows ?? AppIconDefaults.shadows,
+      semanticLabel: semanticLabel,
+      textDirection: textDirection,
+    );
+  }
+}
+
+/// Central place to adjust default Material Symbol variations.
+class AppIconDefaults {
+  static double fill = 1;
+  static double weight = 700;
+  static double? grade;
+  static double? opticalSize;
+  static Color? color;
+  static List<Shadow>? shadows;
+
+  static void update({
+    double? fill,
+    double? weight,
+    double? grade,
+    double? opticalSize,
+    Color? color,
+    List<Shadow>? shadows,
+  }) {
+    if (fill != null) AppIconDefaults.fill = fill;
+    if (weight != null) AppIconDefaults.weight = weight;
+    if (grade != null) AppIconDefaults.grade = grade;
+    if (opticalSize != null) AppIconDefaults.opticalSize = opticalSize;
+    if (color != null) AppIconDefaults.color = color;
+    if (shadows != null) AppIconDefaults.shadows = shadows;
+  }
+}
diff --git a/lib/widgets/bottom_sheet_header.dart b/lib/widgets/bottom_sheet_header.dart
new file mode 100644
index 00000000..389fc453
--- /dev/null
+++ b/lib/widgets/bottom_sheet_header.dart
@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+/// A reusable header widget for bottom sheets
+/// Provides consistent styling with title, optional leading widget, optional action, and close button
+class BottomSheetHeader extends StatelessWidget {
+  /// The title text to display
+  final String title;
+
+  /// Optional leading widget (e.g., icon or back button)
+  final Widget? leading;
+
+  /// Optional action widget (e.g., clear button)
+  final Widget? action;
+
+  /// Optional callback when close button is pressed
+  /// Defaults to Navigator.pop(context)
+  final VoidCallback? onClose;
+
+  const BottomSheetHeader({
+    super.key,
+    required this.title,
+    this.leading,
+    this.action,
+    this.onClose,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        border: Border(
+          bottom: BorderSide(color: Theme.of(context).dividerColor),
+        ),
+      ),
+      child: Row(
+        children: [
+          if (leading != null) ...[leading!, const SizedBox(width: 8)],
+          Expanded(
+            child: Text(
+              title,
+              style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+            ),
+          ),
+          if (action != null) action!,
+          IconButton(
+            icon: const AppIcon(Symbols.close_rounded, fill: 1),
+            onPressed: onClose ?? () => Navigator.pop(context),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/context_menu_wrapper.dart b/lib/widgets/context_menu_wrapper.dart
deleted file mode 100644
index 474daf2f..00000000
--- a/lib/widgets/context_menu_wrapper.dart
+++ /dev/null
@@ -1,192 +0,0 @@
-import 'package:flutter/material.dart';
-import '../utils/platform_detector.dart';
-import '../i18n/strings.g.dart';
-
-/// A menu action item for context menus
-class ContextMenuItem {
-  final String value;
-  final IconData icon;
-  final String label;
-  final bool requiresConfirmation;
-  final String? confirmationTitle;
-  final String? confirmationMessage;
-  final bool isDestructive;
-
-  const ContextMenuItem({
-    required this.value,
-    required this.icon,
-    required this.label,
-    this.requiresConfirmation = false,
-    this.confirmationTitle,
-    this.confirmationMessage,
-    this.isDestructive = false,
-  });
-}
-
-/// A wrapper widget that shows context menus differently based on platform.
-/// On mobile (iOS/Android): Shows a bottom sheet on long-press
-/// On desktop (Windows/macOS/Linux): Shows a popup menu on right-click or long-press
-class ContextMenuWrapper extends StatefulWidget {
-  final Widget child;
-  final List<ContextMenuItem> menuItems;
-  final Function(String)? onMenuItemSelected;
-  final VoidCallback? onTap;
-  final String? title;
-  final bool forceBottomSheet;
-
-  const ContextMenuWrapper({
-    super.key,
-    required this.child,
-    required this.menuItems,
-    this.onMenuItemSelected,
-    this.onTap,
-    this.title,
-    this.forceBottomSheet = false,
-  });
-
-  @override
-  State<ContextMenuWrapper> createState() => _ContextMenuWrapperState();
-}
-
-class _ContextMenuWrapperState extends State<ContextMenuWrapper> {
-  Offset _tapPosition = Offset.zero;
-
-  void _storeTapPosition(TapDownDetails details) {
-    _tapPosition = details.globalPosition;
-  }
-
-  Future<bool> _showConfirmationDialog({
-    required String title,
-    required String message,
-    required bool isDestructive,
-  }) async {
-    final result = await showDialog<bool>(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Text(title),
-        content: Text(message),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: Text(t.common.cancel),
-          ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            style: isDestructive
-                ? TextButton.styleFrom(foregroundColor: Colors.red)
-                : null,
-            child: Text(t.common.confirm),
-          ),
-        ],
-      ),
-    );
-    return result ?? false;
-  }
-
-  Future<void> _showContextMenu(BuildContext context) async {
-    final useBottomSheet =
-        widget.forceBottomSheet || PlatformDetector.isMobile(context);
-    String? selected;
-
-    if (useBottomSheet) {
-      // Mobile: Show bottom sheet
-      selected = await showModalBottomSheet<String>(
-        context: context,
-        builder: (context) => SafeArea(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              if (widget.title != null)
-                Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Text(
-                    widget.title!,
-                    style: const TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                ),
-              ...widget.menuItems.map(
-                (item) => ListTile(
-                  leading: Icon(item.icon),
-                  title: Text(item.label),
-                  onTap: () => Navigator.pop(context, item.value),
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-    } else {
-      // Desktop: Show popup menu
-      final RenderBox overlay =
-          Overlay.of(context).context.findRenderObject() as RenderBox;
-      final overlayRect = Rect.fromPoints(
-        _tapPosition,
-        _tapPosition.translate(1, 1),
-      );
-
-      final menuItems = widget.menuItems
-          .map(
-            (item) => PopupMenuItem<String>(
-              value: item.value,
-              child: Row(
-                children: [
-                  Icon(item.icon, size: 20),
-                  const SizedBox(width: 12),
-                  Expanded(child: Text(item.label)),
-                ],
-              ),
-            ),
-          )
-          .toList();
-
-      selected = await showMenu<String>(
-        context: context,
-        position: RelativeRect.fromRect(
-          overlayRect,
-          Offset.zero & overlay.size,
-        ),
-        items: menuItems,
-        elevation: 8,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-        popUpAnimationStyle: AnimationStyle(
-          duration: const Duration(milliseconds: 150),
-          reverseDuration: const Duration(milliseconds: 100),
-        ),
-      );
-    }
-
-    if (selected != null && widget.onMenuItemSelected != null) {
-      // Find the selected item to check if confirmation is needed
-      final selectedItem = widget.menuItems.firstWhere(
-        (item) => item.value == selected,
-      );
-
-      if (selectedItem.requiresConfirmation) {
-        final confirmed = await _showConfirmationDialog(
-          title: selectedItem.confirmationTitle ?? t.dialog.confirmAction,
-          message: selectedItem.confirmationMessage ?? t.dialog.areYouSure,
-          isDestructive: selectedItem.isDestructive,
-        );
-
-        if (!confirmed) return;
-      }
-
-      widget.onMenuItemSelected!(selected);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: widget.onTap,
-      onTapDown: _storeTapPosition,
-      onLongPress: () => _showContextMenu(context),
-      onSecondaryTapDown: _storeTapPosition,
-      onSecondaryTap: () => _showContextMenu(context),
-      child: widget.child,
-    );
-  }
-}
diff --git a/lib/widgets/deletion_progress_dialog.dart b/lib/widgets/deletion_progress_dialog.dart
new file mode 100644
index 00000000..c335a1d0
--- /dev/null
+++ b/lib/widgets/deletion_progress_dialog.dart
@@ -0,0 +1,82 @@
+import 'package:flutter/material.dart';
+import '../models/deletion_progress.dart';
+import '../i18n/strings.g.dart';
+
+class DeletionProgressDialog extends StatelessWidget {
+  final DeletionProgress progress;
+
+  const DeletionProgressDialog({super.key, required this.progress});
+
+  @override
+  Widget build(BuildContext context) {
+    final t = Translations.of(context);
+
+    return PopScope(
+      canPop: false, // Prevent back button dismissal
+      child: AlertDialog(
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            // Circular progress indicator
+            const SizedBox(
+              width: 48,
+              height: 48,
+              child: CircularProgressIndicator(),
+            ),
+
+            const SizedBox(height: 24),
+
+            // Progress text
+            Text(
+              t.downloads.deletingWithProgress(
+                title: progress.itemTitle,
+                current: progress.currentItem,
+                total: progress.totalItems,
+              ),
+              style: Theme.of(context).textTheme.titleMedium,
+              textAlign: TextAlign.center,
+            ),
+
+            const SizedBox(height: 24),
+
+            // Progress text
+            Text(
+              'Deleting ${progress.itemTitle}... (${progress.currentItem} of ${progress.totalItems})',
+              style: Theme.of(context).textTheme.titleMedium,
+              textAlign: TextAlign.center,
+            ),
+
+            const SizedBox(height: 16),
+
+            // Progress bar
+            LinearProgressIndicator(value: progress.progressPercent),
+
+            const SizedBox(height: 8),
+
+            // Percentage text
+            Text(
+              '${progress.progressPercentInt}%',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+
+            // Optional: Current operation
+            if (progress.currentOperation != null) ...[
+              const SizedBox(height: 8),
+              Text(
+                progress.currentOperation!,
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                      color: Theme.of(context)
+                          .textTheme
+                          .bodySmall
+                          ?.color
+                          ?.withValues(alpha: 0.7),
+                    ),
+                textAlign: TextAlign.center,
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/desktop_app_bar.dart b/lib/widgets/desktop_app_bar.dart
index 2d39a8ba..13296f1f 100644
--- a/lib/widgets/desktop_app_bar.dart
+++ b/lib/widgets/desktop_app_bar.dart
@@ -1,58 +1,104 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import '../utils/desktop_window_padding.dart';
 import '../services/fullscreen_state_manager.dart';
 import 'app_bar_back_button.dart';
 
-/// A custom app bar that automatically handles desktop window controls spacing.
-/// Use this instead of AppBar for consistent desktop platform behavior.
-class DesktopAppBar extends StatelessWidget implements PreferredSizeWidget {
+/// Configuration class for common app bar properties.
+/// Reduces duplication between different app bar implementations.
+class DesktopAppBarConfig {
   final Widget? title;
   final List<Widget>? actions;
-  final Widget? leading;
-  final bool automaticallyImplyLeading;
   final double? elevation;
   final Color? backgroundColor;
   final Color? surfaceTintColor;
   final Color? shadowColor;
   final double? scrolledUnderElevation;
+  final bool floating;
+  final bool pinned;
+  final double? expandedHeight;
+  final Widget? flexibleSpace;
+  final PreferredSizeWidget? bottom;
 
-  const DesktopAppBar({
-    super.key,
+  const DesktopAppBarConfig({
     this.title,
     this.actions,
-    this.leading,
-    this.automaticallyImplyLeading = true,
     this.elevation,
     this.backgroundColor,
     this.surfaceTintColor,
     this.shadowColor,
     this.scrolledUnderElevation,
+    this.floating = false,
+    this.pinned = false,
+    this.expandedHeight,
+    this.flexibleSpace,
+    this.bottom,
   });
+}
 
-  @override
-  Widget build(BuildContext context) {
-    final appBar = AppBar(
-      title: title != null
-          ? DesktopTitleBarPadding(
-              leftPadding: leading != null ? 0 : null,
-              child: title!,
-            )
-          : null,
-      actions: DesktopAppBarHelper.buildAdjustedActions(actions),
-      leading: DesktopAppBarHelper.buildAdjustedLeading(leading),
-      automaticallyImplyLeading: automaticallyImplyLeading,
-      elevation: elevation,
-      backgroundColor: backgroundColor,
-      surfaceTintColor: surfaceTintColor,
-      shadowColor: shadowColor,
-      scrolledUnderElevation: scrolledUnderElevation,
+/// Helper class for building app bar sections with consistent desktop behavior.
+class DesktopAppBarSections {
+  /// Builds the leading section with proper padding and back button handling.
+  static Widget? buildLeadingSection({
+    Widget? leading,
+    bool automaticallyImplyLeading = true,
+    required BuildContext context,
+  }) {
+    Widget? effectiveLeading = leading;
+
+    // If no leading is provided but automaticallyImplyLeading is true,
+    // create a back button manually so it goes through our padding logic
+    if (leading == null && automaticallyImplyLeading) {
+      final parentRoute = ModalRoute.of(context);
+      final canPop = parentRoute?.canPop ?? false;
+
+      if (canPop) {
+        effectiveLeading = IconButton(
+          icon: const AppIcon(Symbols.arrow_back_rounded, fill: 1),
+          onPressed: () => Navigator.of(context).pop(),
+          tooltip: MaterialLocalizations.of(context).backButtonTooltip,
+        );
+      }
+    }
+
+    return DesktopAppBarHelper.buildAdjustedLeading(
+      effectiveLeading,
+      includeGestureDetector: true,
+      context: context,
     );
-
-    return DesktopAppBarHelper.wrapWithGestureDetector(appBar);
   }
 
-  @override
-  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+  /// Builds the title section with proper padding.
+  static Widget? buildTitleSection({
+    required Widget? title,
+    required Widget? leading,
+  }) {
+    if (title == null) return null;
+
+    return DesktopTitleBarPadding(
+      leftPadding: leading != null ? 0 : null,
+      child: title,
+    );
+  }
+
+  /// Builds the actions section with proper padding.
+  static List<Widget>? buildActionsSection(List<Widget>? actions) {
+    return DesktopAppBarHelper.buildAdjustedActions(actions);
+  }
+
+  /// Calculates the leading width for the app bar.
+  static double? calculateLeadingWidthForSection({
+    required Widget? leading,
+    required BuildContext context,
+  }) {
+    return DesktopAppBarHelper.calculateLeadingWidth(leading, context: context);
+  }
+
+  /// Builds the flexible space section with gesture handling.
+  static Widget? buildFlexibleSpaceSection(Widget? flexibleSpace) {
+    return DesktopAppBarHelper.buildAdjustedFlexibleSpace(flexibleSpace);
+  }
 }
 
 /// A custom sliver app bar that automatically handles desktop window controls spacing.
@@ -93,37 +139,23 @@ class DesktopSliverAppBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // Determine the effective leading widget
-    Widget? effectiveLeading = leading;
-
-    // If no leading is provided but automaticallyImplyLeading is true,
-    // create a back button manually so it goes through our padding logic
-    if (leading == null && automaticallyImplyLeading) {
-      final parentRoute = ModalRoute.of(context);
-      final canPop = parentRoute?.canPop ?? false;
-
-      if (canPop) {
-        effectiveLeading = IconButton(
-          icon: const Icon(Icons.arrow_back),
-          onPressed: () => Navigator.of(context).pop(),
-          tooltip: MaterialLocalizations.of(context).backButtonTooltip,
-        );
-      }
-    }
+    final effectiveLeading = DesktopAppBarSections.buildLeadingSection(
+      leading: leading,
+      automaticallyImplyLeading: automaticallyImplyLeading,
+      context: context,
+    );
 
     return SliverAppBar(
-      title: title != null
-          ? DesktopTitleBarPadding(
-              leftPadding: effectiveLeading != null ? 0 : null,
-              child: title!,
-            )
-          : null,
-      actions: DesktopAppBarHelper.buildAdjustedActions(actions),
-      leading: DesktopAppBarHelper.buildAdjustedLeading(
-        effectiveLeading,
-        includeGestureDetector: true,
+      title: DesktopAppBarSections.buildTitleSection(
+        title: title,
+        leading: effectiveLeading,
+      ),
+      actions: DesktopAppBarSections.buildActionsSection(actions),
+      leading: effectiveLeading,
+      leadingWidth: DesktopAppBarSections.calculateLeadingWidthForSection(
+        leading: effectiveLeading,
+        context: context,
       ),
-      leadingWidth: DesktopAppBarHelper.calculateLeadingWidth(effectiveLeading),
       automaticallyImplyLeading:
           false, // Always false since we handle it manually
       elevation: elevation,
@@ -134,7 +166,7 @@ class DesktopSliverAppBar extends StatelessWidget {
       floating: floating,
       pinned: pinned,
       expandedHeight: expandedHeight,
-      flexibleSpace: DesktopAppBarHelper.buildAdjustedFlexibleSpace(
+      flexibleSpace: DesktopAppBarSections.buildFlexibleSpaceSection(
         flexibleSpace,
       ),
       bottom: bottom,
@@ -142,27 +174,20 @@ class DesktopSliverAppBar extends StatelessWidget {
   }
 }
 
-/// Convenient wrapper for DesktopAppBar with built-in back button handling
-class PlexAppBar extends StatelessWidget implements PreferredSizeWidget {
-  final Widget? title;
-  final List<Widget>? actions;
+/// Unified widget for desktop top bars that handles fullscreen state and back button logic.
+/// Reduces UI drift by centralizing the app bar implementation.
+class DesktopTopBar extends StatelessWidget {
+  final DesktopAppBarConfig config;
+  final Widget? leading;
   final VoidCallback? onBackPressed;
-  final double? elevation;
-  final Color? backgroundColor;
-  final Color? surfaceTintColor;
-  final Color? shadowColor;
-  final double? scrolledUnderElevation;
+  final bool automaticallyImplyLeading;
 
-  const PlexAppBar({
+  const DesktopTopBar({
     super.key,
-    this.title,
-    this.actions,
+    required this.config,
+    this.leading,
     this.onBackPressed,
-    this.elevation,
-    this.backgroundColor,
-    this.surfaceTintColor,
-    this.shadowColor,
-    this.scrolledUnderElevation,
+    this.automaticallyImplyLeading = true,
   });
 
   @override
@@ -172,37 +197,46 @@ class PlexAppBar extends StatelessWidget implements PreferredSizeWidget {
       builder: (context, _) {
         final isFullscreen = FullscreenStateManager().isFullscreen;
 
-        return DesktopAppBar(
-          key: ValueKey('plex_app_bar_$isFullscreen'),
-          title: title,
-          actions: actions,
-          leading: _shouldShowBackButton(context)
-              ? AppBarBackButton(
-                  style: BackButtonStyle.plain,
-                  onPressed: onBackPressed,
-                )
-              : null,
+        // Determine the effective leading widget
+        Widget? effectiveLeading = leading;
+        if (effectiveLeading == null && automaticallyImplyLeading) {
+          final parentRoute = ModalRoute.of(context);
+          final canPop = parentRoute?.canPop ?? false;
+
+          if (canPop) {
+            effectiveLeading = AppBarBackButton(
+              style: BackButtonStyle.plain,
+              onPressed: onBackPressed,
+            );
+          }
+        }
+
+        return DesktopSliverAppBar(
+          key: ValueKey('desktop_top_bar_$isFullscreen'),
+          title: config.title,
+          actions: config.actions,
+          leading: effectiveLeading,
           automaticallyImplyLeading: false,
-          elevation: elevation,
-          backgroundColor: backgroundColor,
-          surfaceTintColor: surfaceTintColor,
-          shadowColor: shadowColor,
-          scrolledUnderElevation: scrolledUnderElevation,
+          elevation: config.elevation,
+          backgroundColor: config.backgroundColor,
+          surfaceTintColor: config.surfaceTintColor,
+          shadowColor: config.shadowColor,
+          scrolledUnderElevation: config.scrolledUnderElevation,
+          floating: config.floating,
+          pinned: config.pinned,
+          expandedHeight: config.expandedHeight,
+          flexibleSpace: config.flexibleSpace,
+          bottom: config.bottom,
         );
       },
     );
   }
-
-  bool _shouldShowBackButton(BuildContext context) {
-    final parentRoute = ModalRoute.of(context);
-    return parentRoute?.canPop ?? false;
-  }
-
-  @override
-  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
 }
 
-/// Convenient wrapper for DesktopSliverAppBar with built-in back button handling
+/// Convenient wrapper for DesktopSliverAppBar with built-in back button handling.
+///
+/// This widget is maintained for backward compatibility. For new code, consider
+/// using [DesktopTopBar] directly for a more unified approach.
 class CustomAppBar extends StatelessWidget {
   final Widget? title;
   final List<Widget>? actions;
@@ -237,39 +271,23 @@ class CustomAppBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ListenableBuilder(
-      listenable: FullscreenStateManager(),
-      builder: (context, _) {
-        final isFullscreen = FullscreenStateManager().isFullscreen;
-
-        return DesktopSliverAppBar(
-          key: ValueKey('plex_sliver_app_bar_$isFullscreen'),
-          title: title,
-          actions: actions,
-          leading: _shouldShowBackButton(context)
-              ? AppBarBackButton(
-                  style: BackButtonStyle.plain,
-                  onPressed: onBackPressed,
-                )
-              : null,
-          automaticallyImplyLeading: false,
-          elevation: elevation,
-          backgroundColor: backgroundColor,
-          surfaceTintColor: surfaceTintColor,
-          shadowColor: shadowColor,
-          scrolledUnderElevation: scrolledUnderElevation,
-          floating: floating,
-          pinned: pinned,
-          expandedHeight: expandedHeight,
-          flexibleSpace: flexibleSpace,
-          bottom: bottom,
-        );
-      },
+    return DesktopTopBar(
+      config: DesktopAppBarConfig(
+        title: title,
+        actions: actions,
+        elevation: elevation,
+        backgroundColor: backgroundColor,
+        surfaceTintColor: surfaceTintColor,
+        shadowColor: shadowColor,
+        scrolledUnderElevation: scrolledUnderElevation,
+        floating: floating,
+        pinned: pinned,
+        expandedHeight: expandedHeight,
+        flexibleSpace: flexibleSpace,
+        bottom: bottom,
+      ),
+      onBackPressed: onBackPressed,
+      automaticallyImplyLeading: true,
     );
   }
-
-  bool _shouldShowBackButton(BuildContext context) {
-    final parentRoute = ModalRoute.of(context);
-    return parentRoute?.canPop ?? false;
-  }
 }
diff --git a/lib/widgets/download_tree_view.dart b/lib/widgets/download_tree_view.dart
new file mode 100644
index 00000000..01af2b1d
--- /dev/null
+++ b/lib/widgets/download_tree_view.dart
@@ -0,0 +1,683 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../i18n/strings.g.dart';
+import '../models/download_progress.dart';
+import '../models/download_status.dart';
+import '../models/plex_metadata.dart';
+
+/// Represents a node in the download tree
+class DownloadTreeNode {
+  final String key;
+  final String title;
+  final DownloadNodeType type;
+  final double progress; // 0.0-1.0
+  final DownloadStatus status;
+  final List<DownloadTreeNode> children;
+  final PlexMetadata? metadata;
+  final DownloadProgress? downloadProgress;
+
+  const DownloadTreeNode({
+    required this.key,
+    required this.title,
+    required this.type,
+    this.progress = 0.0,
+    required this.status,
+    this.children = const [],
+    this.metadata,
+    this.downloadProgress,
+  });
+
+  /// Check if this node has children
+  bool get hasChildren => children.isNotEmpty;
+
+  /// Get the number of completed children
+  int get completedChildrenCount {
+    return children
+        .where((child) => child.status == DownloadStatus.completed)
+        .length;
+  }
+
+  /// Get the number of downloading children
+  int get downloadingChildrenCount {
+    return children
+        .where((child) => child.status == DownloadStatus.downloading)
+        .length;
+  }
+}
+
+/// Type of node in the download tree
+enum DownloadNodeType { show, season, episode, movie }
+
+/// Hierarchical tree view for downloads
+/// Groups TV shows by show -> season -> episode
+/// Movies appear at top level
+class DownloadTreeView extends StatefulWidget {
+  final Map<String, DownloadProgress> downloads;
+  final Map<String, PlexMetadata> metadata;
+  final void Function(String globalKey)? onPause;
+  final void Function(String globalKey)? onResume;
+  final void Function(String globalKey)? onRetry;
+  final void Function(String globalKey)? onCancel;
+  final void Function(String globalKey)? onDelete;
+
+  const DownloadTreeView({
+    super.key,
+    required this.downloads,
+    required this.metadata,
+    this.onPause,
+    this.onResume,
+    this.onRetry,
+    this.onCancel,
+    this.onDelete,
+  });
+
+  @override
+  State<DownloadTreeView> createState() => _DownloadTreeViewState();
+}
+
+class _DownloadTreeViewState extends State<DownloadTreeView> {
+  final Set<String> _expandedNodes = {};
+
+  @override
+  Widget build(BuildContext context) {
+    final tree = _buildTree();
+    final flattenedNodes = _flattenTree(tree);
+
+    if (flattenedNodes.isEmpty) {
+      return const Center(child: Text('No downloads'));
+    }
+
+    return ListView.builder(
+      padding: EdgeInsets.zero,
+      itemCount: flattenedNodes.length,
+      itemBuilder: (context, index) {
+        final item = flattenedNodes[index];
+        return _buildTreeItem(item.node, item.depth);
+      },
+    );
+  }
+
+  /// Build the download tree from flat download list
+  List<DownloadTreeNode> _buildTree() {
+    final Map<String, List<MapEntry<String, DownloadProgress>>> showGroups = {};
+    final List<DownloadTreeNode> movies = [];
+
+    // Group downloads
+    for (final entry in widget.downloads.entries) {
+      final globalKey = entry.key;
+      final download = entry.value;
+      final meta = widget.metadata[globalKey];
+
+      if (meta == null) continue;
+
+      if (meta.type.toLowerCase() == 'episode') {
+        // Group episodes by show
+        final showKey = meta.grandparentRatingKey ?? 'unknown';
+        showGroups.putIfAbsent(showKey, () => []);
+        showGroups[showKey]!.add(entry);
+      } else if (meta.type.toLowerCase() == 'movie') {
+        // Movies go at top level
+        movies.add(
+          DownloadTreeNode(
+            key: globalKey,
+            title: meta.title,
+            type: DownloadNodeType.movie,
+            progress: download.progressPercent,
+            status: download.status,
+            metadata: meta,
+            downloadProgress: download,
+          ),
+        );
+      }
+    }
+
+    // Build show nodes
+    final List<DownloadTreeNode> shows = [];
+    for (final showEntry in showGroups.entries) {
+      final showKey = showEntry.key;
+      final episodes = showEntry.value;
+
+      if (episodes.isEmpty) continue;
+
+      // Get show metadata from first episode
+      final firstEpisode = widget.metadata[episodes.first.key];
+      final showTitle = firstEpisode?.grandparentTitle ?? 'Unknown Show';
+
+      // Group episodes by season
+      final Map<String, List<MapEntry<String, DownloadProgress>>> seasonGroups =
+          {};
+      for (final episode in episodes) {
+        final meta = widget.metadata[episode.key];
+        if (meta == null) continue;
+
+        final seasonKey = meta.parentRatingKey ?? 'unknown';
+        seasonGroups.putIfAbsent(seasonKey, () => []);
+        seasonGroups[seasonKey]!.add(episode);
+      }
+
+      // Build season nodes
+      final List<DownloadTreeNode> seasons = [];
+      for (final seasonEntry in seasonGroups.entries) {
+        final seasonKey = seasonEntry.key;
+        final seasonEpisodes = seasonEntry.value;
+
+        if (seasonEpisodes.isEmpty) continue;
+
+        // Get season metadata from first episode
+        final firstEpisode = widget.metadata[seasonEpisodes.first.key];
+        final seasonTitle = firstEpisode?.parentTitle ?? 'Unknown Season';
+        final seasonNumber = firstEpisode?.parentIndex;
+
+        // Build episode nodes
+        final List<DownloadTreeNode> episodeNodes = [];
+        for (final episodeEntry in seasonEpisodes) {
+          final globalKey = episodeEntry.key;
+          final download = episodeEntry.value;
+          final meta = widget.metadata[globalKey];
+
+          if (meta == null) continue;
+
+          final episodeNumber = meta.index;
+          final episodeTitle = episodeNumber != null
+              ? 'Episode $episodeNumber - ${meta.title}'
+              : meta.title;
+
+          episodeNodes.add(
+            DownloadTreeNode(
+              key: globalKey,
+              title: episodeTitle,
+              type: DownloadNodeType.episode,
+              progress: download.progressPercent,
+              status: download.status,
+              metadata: meta,
+              downloadProgress: download,
+            ),
+          );
+        }
+
+        // Sort episodes by episode number only (not by status)
+        episodeNodes.sort((a, b) {
+          final aIndex = a.metadata?.index ?? 0;
+          final bIndex = b.metadata?.index ?? 0;
+          return aIndex.compareTo(bIndex);
+        });
+
+        // Calculate aggregate season progress
+        final seasonProgress = episodeNodes.isEmpty
+            ? 0.0
+            : episodeNodes.map((e) => e.progress).reduce((a, b) => a + b) /
+                  episodeNodes.length;
+        final seasonStatus = _determineAggregateStatus(
+          episodeNodes.map((e) => e.status).toList(),
+        );
+
+        final displayTitle = seasonNumber != null
+            ? 'Season $seasonNumber'
+            : seasonTitle;
+
+        seasons.add(
+          DownloadTreeNode(
+            key: '$showKey:$seasonKey',
+            title: displayTitle,
+            type: DownloadNodeType.season,
+            progress: seasonProgress,
+            status: seasonStatus,
+            children: episodeNodes,
+          ),
+        );
+      }
+
+      // Sort seasons by season number
+      seasons.sort((a, b) {
+        final aSeasonNum =
+            widget.metadata[a.children.first.key]?.parentIndex ?? 0;
+        final bSeasonNum =
+            widget.metadata[b.children.first.key]?.parentIndex ?? 0;
+        return aSeasonNum.compareTo(bSeasonNum);
+      });
+
+      // Calculate aggregate show progress
+      final showProgress = seasons.isEmpty
+          ? 0.0
+          : seasons.map((s) => s.progress).reduce((a, b) => a + b) /
+                seasons.length;
+      final showStatus = _determineAggregateStatus(
+        seasons.map((s) => s.status).toList(),
+      );
+
+      shows.add(
+        DownloadTreeNode(
+          key: showKey,
+          title: showTitle,
+          type: DownloadNodeType.show,
+          progress: showProgress,
+          status: showStatus,
+          children: seasons,
+        ),
+      );
+    }
+
+    // Sort shows by status and title
+    shows.sort((a, b) {
+      final statusCompare = _compareByStatus(a.status, b.status);
+      if (statusCompare != 0) return statusCompare;
+      return a.title.compareTo(b.title);
+    });
+
+    // Sort movies by status and title
+    movies.sort((a, b) {
+      final statusCompare = _compareByStatus(a.status, b.status);
+      if (statusCompare != 0) return statusCompare;
+      return a.title.compareTo(b.title);
+    });
+
+    // Combine movies and shows
+    return [...movies, ...shows];
+  }
+
+  /// Determine aggregate status from child statuses
+  /// Priority: downloading > queued > paused > completed > failed
+  DownloadStatus _determineAggregateStatus(List<DownloadStatus> statuses) {
+    if (statuses.isEmpty) return DownloadStatus.queued;
+
+    if (statuses.any((s) => s == DownloadStatus.downloading)) {
+      return DownloadStatus.downloading;
+    }
+    if (statuses.any((s) => s == DownloadStatus.queued)) {
+      return DownloadStatus.queued;
+    }
+    if (statuses.any((s) => s == DownloadStatus.paused)) {
+      return DownloadStatus.paused;
+    }
+    if (statuses.any((s) => s == DownloadStatus.failed)) {
+      return DownloadStatus.failed;
+    }
+    return DownloadStatus.completed;
+  }
+
+  /// Compare statuses for sorting (downloading first, then queued, etc.)
+  int _compareByStatus(DownloadStatus a, DownloadStatus b) {
+    const statusOrder = {
+      DownloadStatus.downloading: 0,
+      DownloadStatus.queued: 1,
+      DownloadStatus.paused: 2,
+      DownloadStatus.completed: 3,
+      DownloadStatus.failed: 4,
+      DownloadStatus.cancelled: 5,
+    };
+    return (statusOrder[a] ?? 99).compareTo(statusOrder[b] ?? 99);
+  }
+
+  /// Flatten the tree into a list of visible nodes with their depths
+  List<_FlatNode> _flattenTree(List<DownloadTreeNode> nodes, [int depth = 0]) {
+    final List<_FlatNode> result = [];
+
+    for (final node in nodes) {
+      result.add(_FlatNode(node: node, depth: depth));
+
+      // Add children if node is expanded
+      if (_expandedNodes.contains(node.key) && node.hasChildren) {
+        result.addAll(_flattenTree(node.children, depth + 1));
+      }
+    }
+
+    return result;
+  }
+
+  /// Toggle node expansion
+  void _toggleExpansion(String key) {
+    setState(() {
+      if (_expandedNodes.contains(key)) {
+        _expandedNodes.remove(key);
+      } else {
+        _expandedNodes.add(key);
+      }
+    });
+  }
+
+  /// Build a tree item widget
+  Widget _buildTreeItem(DownloadTreeNode node, int depth) {
+    final isExpanded = _expandedNodes.contains(node.key);
+    final canExpand = node.hasChildren;
+
+    return InkWell(
+      onTap: canExpand ? () => _toggleExpansion(node.key) : null,
+      child: Padding(
+        padding: EdgeInsets.only(left: depth * 16.0),
+        child: _buildNodeContent(node, isExpanded, canExpand),
+      ),
+    );
+  }
+
+  /// Build the content for a node
+  Widget _buildNodeContent(
+    DownloadTreeNode node,
+    bool isExpanded,
+    bool canExpand,
+  ) {
+    final theme = Theme.of(context);
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      child: Row(
+        children: [
+          // Expand/collapse icon
+          if (canExpand)
+            AppIcon(
+              isExpanded
+                  ? Symbols.expand_more_rounded
+                  : Symbols.chevron_right_rounded,
+              fill: 1,
+              size: 20,
+            )
+          else
+            const SizedBox(width: 20),
+
+          const SizedBox(width: 8),
+
+          // Status icon
+          _buildStatusIcon(node.status),
+
+          const SizedBox(width: 12),
+
+          // Title and info
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  node.title,
+                  style: theme.textTheme.bodyMedium?.copyWith(
+                    fontWeight: canExpand ? FontWeight.w600 : FontWeight.normal,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+
+                if (canExpand) ...[
+                  const SizedBox(height: 4),
+                Text(
+                  _getNodeSummary(node),
+                  style: theme.textTheme.bodySmall?.copyWith(
+                    color:
+                        theme.colorScheme.onSurface.withValues(alpha: 0.6),
+                  ),
+                ),
+              ],
+
+                // Progress bar
+                if (node.status == DownloadStatus.downloading ||
+                    node.status == DownloadStatus.queued) ...[
+                  const SizedBox(height: 8),
+                  LinearProgressIndicator(
+                    value: node.progress,
+                    backgroundColor: theme.colorScheme.surfaceContainerHighest,
+                  ),
+                  if (node.downloadProgress != null) ...[
+                    const SizedBox(height: 4),
+                    Text(
+                      '${(node.progress * 100).toStringAsFixed(1)}% - ${node.downloadProgress!.speedFormatted}',
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color:
+                            theme.colorScheme.onSurface.withValues(alpha: 0.6),
+                      ),
+                    ),
+                  ],
+                ],
+              ],
+            ),
+          ),
+
+          // Actions
+          _buildActions(node),
+        ],
+      ),
+    );
+  }
+
+  /// Build status icon
+  Widget _buildStatusIcon(DownloadStatus status) {
+    IconData iconData;
+    Color? color;
+
+    switch (status) {
+      case DownloadStatus.downloading:
+        iconData = Symbols.downloading_rounded;
+        color = Colors.blue;
+        break;
+      case DownloadStatus.queued:
+        iconData = Symbols.schedule_rounded;
+        color = Colors.orange;
+        break;
+      case DownloadStatus.paused:
+        iconData = Symbols.pause_circle_outline_rounded;
+        color = Colors.grey;
+        break;
+      case DownloadStatus.completed:
+        iconData = Symbols.check_circle_rounded;
+        color = Colors.green;
+        break;
+      case DownloadStatus.failed:
+        iconData = Symbols.error_rounded;
+        color = Colors.red;
+        break;
+      case DownloadStatus.cancelled:
+        iconData = Symbols.cancel_rounded;
+        color = Colors.grey;
+        break;
+      case DownloadStatus.partial:
+        iconData = Symbols.downloading_rounded;
+        color = Colors.orange;
+        break;
+    }
+
+    return AppIcon(iconData, fill: 1, size: 20, color: color);
+  }
+
+  /// Get summary text for container nodes (shows/seasons)
+  String _getNodeSummary(DownloadTreeNode node) {
+    final total = node.children.length;
+    final completed = node.completedChildrenCount;
+    return '$completed/$total completed';
+  }
+
+  /// Build action buttons for nodes
+  Widget _buildActions(DownloadTreeNode node) {
+    final isContainer =
+        node.type == DownloadNodeType.show ||
+        node.type == DownloadNodeType.season;
+
+    final actions = isContainer
+        ? _getContainerActions(node)
+        : _getItemActions(node);
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: actions,
+    );
+  }
+
+  /// Get action buttons for individual items (episodes/movies)
+  List<Widget> _getItemActions(DownloadTreeNode node) {
+    final globalKey = node.key;
+    final status = node.status;
+    final actions = <Widget>[];
+
+    // Pause button for downloading items
+    if (status == DownloadStatus.downloading && widget.onPause != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.pause_rounded,
+        tooltip: 'Pause',
+        onPressed: () => widget.onPause!(globalKey),
+      ));
+    }
+
+    // Resume button for paused items
+    if (status == DownloadStatus.paused && widget.onResume != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.play_arrow_rounded,
+        tooltip: 'Resume',
+        onPressed: () => widget.onResume!(globalKey),
+      ));
+    }
+
+    // Cancel button for downloading/queued items
+    if ((status == DownloadStatus.downloading ||
+            status == DownloadStatus.queued) &&
+        widget.onCancel != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.close_rounded,
+        tooltip: 'Cancel',
+        onPressed: () => widget.onCancel!(globalKey),
+      ));
+    }
+
+    // Retry button for failed items
+    if (status == DownloadStatus.failed && widget.onRetry != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.refresh_rounded,
+        tooltip: t.downloads.retryDownload,
+        onPressed: () => widget.onRetry!(globalKey),
+      ));
+    }
+
+    // Delete button for completed/failed/cancelled items
+    if ((status == DownloadStatus.completed ||
+            status == DownloadStatus.failed ||
+            status == DownloadStatus.cancelled) &&
+        widget.onDelete != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.delete_rounded,
+        tooltip: 'Delete',
+        onPressed: () => widget.onDelete!(globalKey),
+      ));
+    }
+
+    return actions;
+  }
+
+  /// Get action buttons for container nodes (shows/seasons)
+  List<Widget> _getContainerActions(DownloadTreeNode node) {
+    final status = node.status;
+    final actions = <Widget>[];
+
+    // Pause all button - show if any children are downloading or queued
+    if ((status == DownloadStatus.downloading ||
+            status == DownloadStatus.queued) &&
+        widget.onPause != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.pause_rounded,
+        tooltip: 'Pause all',
+        onPressed: () => _pauseAllChildren(node),
+      ));
+    }
+
+    // Resume all button - show if container is paused
+    if (status == DownloadStatus.paused && widget.onResume != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.play_arrow_rounded,
+        tooltip: 'Resume all',
+        onPressed: () => _resumeAllChildren(node),
+      ));
+    }
+
+    // Delete all button
+    if (widget.onDelete != null) {
+      actions.add(_buildActionButton(
+        icon: Symbols.delete_sweep_rounded,
+        tooltip: 'Delete all',
+        onPressed: () => _deleteAllChildren(node),
+      ));
+    }
+
+    return actions;
+  }
+
+  /// Build a single action button
+  Widget _buildActionButton({
+    required IconData icon,
+    required String tooltip,
+    required VoidCallback onPressed,
+  }) {
+    return IconButton(
+      icon: AppIcon(icon, fill: 1, size: 20),
+      onPressed: onPressed,
+      tooltip: tooltip,
+    );
+  }
+
+  /// Pause all active (downloading and queued) children of a container node
+  void _pauseAllChildren(DownloadTreeNode node) {
+    final keys = _getActiveChildKeys(node);
+    for (final key in keys) {
+      widget.onPause?.call(key);
+    }
+  }
+
+  /// Resume all paused children of a container node
+  void _resumeAllChildren(DownloadTreeNode node) {
+    final keys = _getPausedChildKeys(node);
+    for (final key in keys) {
+      widget.onResume?.call(key);
+    }
+  }
+
+  /// Get all active (downloading or queued) child keys from a container node
+  List<String> _getActiveChildKeys(DownloadTreeNode node) {
+    final List<String> keys = [];
+    for (final child in node.children) {
+      if (child.hasChildren) {
+        keys.addAll(_getActiveChildKeys(child));
+      } else if (child.status == DownloadStatus.downloading ||
+          child.status == DownloadStatus.queued) {
+        keys.add(child.key);
+      }
+    }
+    return keys;
+  }
+
+  /// Get all paused child keys from a container node
+  List<String> _getPausedChildKeys(DownloadTreeNode node) {
+    final List<String> keys = [];
+    for (final child in node.children) {
+      if (child.hasChildren) {
+        keys.addAll(_getPausedChildKeys(child));
+      } else if (child.status == DownloadStatus.paused) {
+        keys.add(child.key);
+      }
+    }
+    return keys;
+  }
+
+  /// Delete all children of a container node
+  void _deleteAllChildren(DownloadTreeNode node) {
+    final allKeys = _getAllChildKeys(node);
+    for (final key in allKeys) {
+      widget.onDelete?.call(key);
+    }
+  }
+
+  /// Get all leaf node keys from a container node
+  List<String> _getAllChildKeys(DownloadTreeNode node) {
+    final List<String> keys = [];
+
+    for (final child in node.children) {
+      if (child.hasChildren) {
+        keys.addAll(_getAllChildKeys(child));
+      } else {
+        keys.add(child.key);
+      }
+    }
+
+    return keys;
+  }
+}
+
+/// Helper class to store a node with its depth in the flattened tree
+class _FlatNode {
+  final DownloadTreeNode node;
+  final int depth;
+
+  const _FlatNode({required this.node, required this.depth});
+}
diff --git a/lib/widgets/file_info_bottom_sheet.dart b/lib/widgets/file_info_bottom_sheet.dart
index 58b92d48..f71e53d5 100644
--- a/lib/widgets/file_info_bottom_sheet.dart
+++ b/lib/widgets/file_info_bottom_sheet.dart
@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import '../models/plex_file_info.dart';
 import '../i18n/strings.g.dart';
+import 'focusable_bottom_sheet.dart';
 
-class FileInfoBottomSheet extends StatelessWidget {
+class FileInfoBottomSheet extends StatefulWidget {
   final PlexFileInfo fileInfo;
   final String title;
 
@@ -12,174 +15,213 @@ class FileInfoBottomSheet extends StatelessWidget {
     required this.title,
   });
 
+  @override
+  State<FileInfoBottomSheet> createState() => _FileInfoBottomSheetState();
+}
+
+class _FileInfoBottomSheetState extends State<FileInfoBottomSheet> {
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _initialFocusNode = FocusNode(
+      debugLabel: 'FileInfoBottomSheetInitialFocus',
+    );
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-        color: Colors.grey[900],
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(16),
-          topRight: Radius.circular(16),
+    return FocusableBottomSheet(
+      initialFocusNode: _initialFocusNode,
+      child: Container(
+        decoration: BoxDecoration(
+          color: Colors.grey[900],
+          borderRadius: const BorderRadius.only(
+            topLeft: Radius.circular(16),
+            topRight: Radius.circular(16),
+          ),
         ),
-      ),
-      child: SafeArea(
-        child: SizedBox(
-          height: MediaQuery.of(context).size.height * 0.75,
-          child: Column(
-            children: [
-              // Header
-              Padding(
-                padding: const EdgeInsets.all(16),
-                child: Row(
-                  children: [
-                    const Icon(
-                      Icons.info_outline,
-                      color: Colors.white,
-                      size: 24,
-                    ),
-                    const SizedBox(width: 12),
-                    Expanded(
-                      child: Text(
-                        t.fileInfo.title,
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold,
+        child: SafeArea(
+          child: SizedBox(
+            height: MediaQuery.of(context).size.height * 0.75,
+            child: Column(
+              children: [
+                // Header
+                Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Row(
+                    children: [
+                      const AppIcon(
+                        Symbols.info_rounded,
+                        fill: 1,
+                        color: Colors.white,
+                        size: 24,
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: Text(
+                          t.fileInfo.title,
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 20,
+                            fontWeight: FontWeight.bold,
+                          ),
                         ),
                       ),
-                    ),
-                    IconButton(
-                      icon: const Icon(Icons.close, color: Colors.white),
-                      onPressed: () => Navigator.pop(context),
-                    ),
-                  ],
-                ),
-              ),
-              const Divider(color: Colors.grey, height: 1),
-              // Content
-              Expanded(
-                child: ListView(
-                  padding: const EdgeInsets.all(16),
-                  children: [
-                    // Title
-                    if (title.isNotEmpty) ...[
-                      Text(
-                        title,
-                        style: const TextStyle(
+                      IconButton(
+                        focusNode: _initialFocusNode,
+                        icon: const AppIcon(
+                          Symbols.close_rounded,
+                          fill: 1,
                           color: Colors.white,
-                          fontSize: 16,
-                          fontWeight: FontWeight.w500,
                         ),
+                        onPressed: () => Navigator.pop(context),
+                      ),
+                    ],
+                  ),
+                ),
+                const Divider(color: Colors.grey, height: 1),
+                // Content
+                Expanded(
+                  child: ListView(
+                    padding: const EdgeInsets.all(16),
+                    children: [
+                      // Title
+                      if (widget.title.isNotEmpty) ...[
+                        Text(
+                          widget.title,
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 16,
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                        const SizedBox(height: 20),
+                      ],
+
+                      // Video Section
+                      _buildSectionHeader(t.fileInfo.video),
+                      const SizedBox(height: 8),
+                      _buildInfoRow(
+                        t.fileInfo.codec,
+                        widget.fileInfo.videoCodec ?? t.common.unknown,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.resolution,
+                        widget.fileInfo.resolutionFormatted,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.bitrate,
+                        widget.fileInfo.bitrateFormatted,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.frameRate,
+                        widget.fileInfo.frameRateFormatted,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.aspectRatio,
+                        widget.fileInfo.aspectRatioFormatted,
+                      ),
+                      if (widget.fileInfo.videoProfile != null)
+                        _buildInfoRow(
+                          t.fileInfo.profile,
+                          widget.fileInfo.videoProfile!,
+                        ),
+                      if (widget.fileInfo.bitDepth != null)
+                        _buildInfoRow(
+                          t.fileInfo.bitDepth,
+                          '${widget.fileInfo.bitDepth} bit',
+                        ),
+                      if (widget.fileInfo.colorSpace != null)
+                        _buildInfoRow(
+                          t.fileInfo.colorSpace,
+                          widget.fileInfo.colorSpace!,
+                        ),
+                      if (widget.fileInfo.colorRange != null)
+                        _buildInfoRow(
+                          t.fileInfo.colorRange,
+                          widget.fileInfo.colorRange!,
+                        ),
+                      if (widget.fileInfo.colorPrimaries != null)
+                        _buildInfoRow(
+                          t.fileInfo.colorPrimaries,
+                          widget.fileInfo.colorPrimaries!,
+                        ),
+                      if (widget.fileInfo.chromaSubsampling != null)
+                        _buildInfoRow(
+                          t.fileInfo.chromaSubsampling,
+                          widget.fileInfo.chromaSubsampling!,
+                        ),
+                      const SizedBox(height: 20),
+
+                      // Audio Section
+                      _buildSectionHeader(t.fileInfo.audio),
+                      const SizedBox(height: 8),
+                      _buildInfoRow(
+                        t.fileInfo.codec,
+                        widget.fileInfo.audioCodec ?? t.common.unknown,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.channels,
+                        widget.fileInfo.audioChannelsFormatted,
+                      ),
+                      if (widget.fileInfo.audioProfile != null)
+                        _buildInfoRow(
+                          t.fileInfo.profile,
+                          widget.fileInfo.audioProfile!,
+                        ),
+                      const SizedBox(height: 20),
+
+                      // File Section
+                      _buildSectionHeader(t.fileInfo.file),
+                      const SizedBox(height: 8),
+                      if (widget.fileInfo.filePath != null)
+                        _buildInfoRow(
+                          t.fileInfo.path,
+                          widget.fileInfo.filePath!,
+                          isMonospace: true,
+                        ),
+                      _buildInfoRow(
+                        t.fileInfo.size,
+                        widget.fileInfo.fileSizeFormatted,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.container,
+                        widget.fileInfo.container ?? t.common.unknown,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.duration,
+                        widget.fileInfo.durationFormatted,
                       ),
                       const SizedBox(height: 20),
+
+                      // Advanced Section
+                      _buildSectionHeader(t.fileInfo.advanced),
+                      const SizedBox(height: 8),
+                      _buildInfoRow(
+                        t.fileInfo.optimizedForStreaming,
+                        widget.fileInfo.optimizedForStreaming == true
+                            ? t.common.yes
+                            : t.common.no,
+                      ),
+                      _buildInfoRow(
+                        t.fileInfo.has64bitOffsets,
+                        widget.fileInfo.has64bitOffsets == true
+                            ? t.common.yes
+                            : t.common.no,
+                      ),
                     ],
-
-                    // Video Section
-                    _buildSectionHeader(t.fileInfo.video),
-                    const SizedBox(height: 8),
-                    _buildInfoRow(
-                      t.fileInfo.codec,
-                      fileInfo.videoCodec ?? t.common.unknown,
-                    ),
-                    _buildInfoRow(
-                      t.fileInfo.resolution,
-                      fileInfo.resolutionFormatted,
-                    ),
-                    _buildInfoRow(
-                      t.fileInfo.bitrate,
-                      fileInfo.bitrateFormatted,
-                    ),
-                    _buildInfoRow(
-                      t.fileInfo.frameRate,
-                      fileInfo.frameRateFormatted,
-                    ),
-                    _buildInfoRow(
-                      t.fileInfo.aspectRatio,
-                      fileInfo.aspectRatioFormatted,
-                    ),
-                    if (fileInfo.videoProfile != null)
-                      _buildInfoRow(t.fileInfo.profile, fileInfo.videoProfile!),
-                    if (fileInfo.bitDepth != null)
-                      _buildInfoRow(
-                        t.fileInfo.bitDepth,
-                        '${fileInfo.bitDepth} bit',
-                      ),
-                    if (fileInfo.colorSpace != null)
-                      _buildInfoRow(
-                        t.fileInfo.colorSpace,
-                        fileInfo.colorSpace!,
-                      ),
-                    if (fileInfo.colorRange != null)
-                      _buildInfoRow(
-                        t.fileInfo.colorRange,
-                        fileInfo.colorRange!,
-                      ),
-                    if (fileInfo.colorPrimaries != null)
-                      _buildInfoRow(
-                        t.fileInfo.colorPrimaries,
-                        fileInfo.colorPrimaries!,
-                      ),
-                    if (fileInfo.chromaSubsampling != null)
-                      _buildInfoRow(
-                        t.fileInfo.chromaSubsampling,
-                        fileInfo.chromaSubsampling!,
-                      ),
-                    const SizedBox(height: 20),
-
-                    // Audio Section
-                    _buildSectionHeader(t.fileInfo.audio),
-                    const SizedBox(height: 8),
-                    _buildInfoRow(
-                      t.fileInfo.codec,
-                      fileInfo.audioCodec ?? t.common.unknown,
-                    ),
-                    _buildInfoRow(
-                      t.fileInfo.channels,
-                      fileInfo.audioChannelsFormatted,
-                    ),
-                    if (fileInfo.audioProfile != null)
-                      _buildInfoRow(t.fileInfo.profile, fileInfo.audioProfile!),
-                    const SizedBox(height: 20),
-
-                    // File Section
-                    _buildSectionHeader(t.fileInfo.file),
-                    const SizedBox(height: 8),
-                    if (fileInfo.filePath != null)
-                      _buildInfoRow(
-                        t.fileInfo.path,
-                        fileInfo.filePath!,
-                        isMonospace: true,
-                      ),
-                    _buildInfoRow(t.fileInfo.size, fileInfo.fileSizeFormatted),
-                    _buildInfoRow(
-                      t.fileInfo.container,
-                      fileInfo.container ?? t.common.unknown,
-                    ),
-                    _buildInfoRow(
-                      t.fileInfo.duration,
-                      fileInfo.durationFormatted,
-                    ),
-                    const SizedBox(height: 20),
-
-                    // Advanced Section
-                    _buildSectionHeader(t.fileInfo.advanced),
-                    const SizedBox(height: 8),
-                    _buildInfoRow(
-                      t.fileInfo.optimizedForStreaming,
-                      fileInfo.optimizedForStreaming == true
-                          ? t.common.yes
-                          : t.common.no,
-                    ),
-                    _buildInfoRow(
-                      t.fileInfo.has64bitOffsets,
-                      fileInfo.has64bitOffsets == true
-                          ? t.common.yes
-                          : t.common.no,
-                    ),
-                  ],
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
       ),
diff --git a/lib/widgets/focus_builders.dart b/lib/widgets/focus_builders.dart
new file mode 100644
index 00000000..3f85e975
--- /dev/null
+++ b/lib/widgets/focus_builders.dart
@@ -0,0 +1,150 @@
+import 'package:flutter/material.dart';
+import '../focus/focus_theme.dart';
+import '../focus/input_mode_tracker.dart';
+
+/// Shared builders for focusable widgets to reduce code duplication.
+///
+/// These builders provide consistent focus decoration patterns across
+/// different focusable widgets (chips, cards, etc.).
+class FocusBuilders {
+  /// Builds a chip-style focusable widget with background color changes.
+  ///
+  /// Used by FocusableTabChip and FocusableFilterChip.
+  ///
+  /// Parameters:
+  /// - [context]: Build context for theming
+  /// - [focusNode]: The focus node for this widget
+  /// - [isFocused]: Whether this widget currently has focus
+  /// - [onKeyEvent]: Callback for handling key events
+  /// - [onTap]: Callback for tap/click events
+  /// - [padding]: Padding inside the chip
+  /// - [backgroundColor]: Background color for the chip
+  /// - [borderRadius]: Border radius for the chip (defaults to 20)
+  /// - [child]: The content to display inside the chip
+  static Widget buildFocusableChip({
+    required BuildContext context,
+    required FocusNode focusNode,
+    required bool isFocused,
+    required KeyEventResult Function(FocusNode, KeyEvent) onKeyEvent,
+    required VoidCallback onTap,
+    required EdgeInsetsGeometry padding,
+    required Color backgroundColor,
+    double borderRadius = 20,
+    required Widget child,
+  }) {
+    final duration = FocusTheme.getAnimationDuration(context);
+
+    return Focus(
+      focusNode: focusNode,
+      onKeyEvent: onKeyEvent,
+      child: GestureDetector(
+        onTap: onTap,
+        child: AnimatedContainer(
+          duration: duration,
+          curve: Curves.easeOutCubic,
+          padding: padding,
+          decoration: BoxDecoration(
+            color: backgroundColor,
+            borderRadius: BorderRadius.circular(borderRadius),
+          ),
+          child: child,
+        ),
+      ),
+    );
+  }
+
+  /// Builds a card-style focusable widget with scale and border decoration.
+  ///
+  /// Used by FocusableMediaCard and _LockedHubItemWrapper.
+  ///
+  /// Parameters:
+  /// - [context]: Build context for theming
+  /// - [focusNode]: The focus node for this widget (optional for locked wrappers)
+  /// - [isFocused]: Whether this widget currently has focus
+  /// - [onKeyEvent]: Callback for handling key events (optional for locked wrappers)
+  /// - [onTap]: Callback for tap/click events
+  /// - [onLongPress]: Callback for long press events
+  /// - [borderRadius]: Border radius for the focus decoration
+  /// - [child]: The content to display inside the card
+  static Widget buildFocusableCard({
+    required BuildContext context,
+    FocusNode? focusNode,
+    required bool isFocused,
+    KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent,
+    VoidCallback? onTap,
+    VoidCallback? onLongPress,
+    double borderRadius = FocusTheme.defaultBorderRadius,
+    required Widget child,
+  }) {
+    final duration = FocusTheme.getAnimationDuration(context);
+    // Only show focus effects during keyboard/d-pad navigation
+    final showFocus = isFocused && InputModeTracker.isKeyboardMode(context);
+
+    final focusedWidget = AnimatedScale(
+      scale: showFocus ? FocusTheme.focusScale : 1.0,
+      duration: duration,
+      curve: Curves.easeOutCubic,
+      child: AnimatedContainer(
+        duration: duration,
+        curve: Curves.easeOutCubic,
+        decoration: FocusTheme.focusDecoration(
+          context,
+          isFocused: showFocus,
+          borderRadius: borderRadius,
+        ),
+        child: child,
+      ),
+    );
+
+    // Wrap in GestureDetector if tap/long press handlers provided
+    final gestureWidget = (onTap != null || onLongPress != null)
+        ? GestureDetector(
+            onTap: onTap,
+            onLongPress: onLongPress,
+            child: focusedWidget,
+          )
+        : focusedWidget;
+
+    // Wrap in Focus if focus node and key event handler provided
+    if (focusNode != null && onKeyEvent != null) {
+      return Focus(
+        focusNode: focusNode,
+        onKeyEvent: onKeyEvent,
+        child: gestureWidget,
+      );
+    }
+
+    return gestureWidget;
+  }
+
+  /// Builds a simple locked wrapper (no Focus widget) with scale and border decoration.
+  ///
+  /// Used by _LockedHubItemWrapper where focus is managed at a higher level.
+  ///
+  /// Parameters:
+  /// - [context]: Build context for theming
+  /// - [isFocused]: Whether this widget should appear focused
+  /// - [onTap]: Callback for tap/click events
+  /// - [onLongPress]: Callback for long press events
+  /// - [borderRadius]: Border radius for the focus decoration
+  /// - [child]: The content to display inside the wrapper
+  static Widget buildLockedFocusWrapper({
+    required BuildContext context,
+    required bool isFocused,
+    VoidCallback? onTap,
+    VoidCallback? onLongPress,
+    double borderRadius = FocusTheme.defaultBorderRadius,
+    required Widget child,
+  }) {
+    return buildFocusableCard(
+      context: context,
+      focusNode: null,
+      isFocused: isFocused,
+      onKeyEvent: null,
+      onTap: onTap,
+      onLongPress: onLongPress,
+      borderRadius: borderRadius,
+      child: child,
+    );
+  }
+}
diff --git a/lib/widgets/focusable_bottom_sheet.dart b/lib/widgets/focusable_bottom_sheet.dart
new file mode 100644
index 00000000..5bf0f5f0
--- /dev/null
+++ b/lib/widgets/focusable_bottom_sheet.dart
@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+
+import '../focus/input_mode_tracker.dart';
+
+/// A wrapper widget that provides autofocus functionality for bottom sheets.
+///
+/// When the sheet opens and keyboard/controller mode is active, this widget
+/// will automatically request focus on the provided [initialFocusNode].
+/// This enables keyboard/controller navigation within the sheet.
+///
+/// When opened via touch/mouse, no autofocus occurs to avoid showing
+/// focus indicators unnecessarily.
+class FocusableBottomSheet extends StatefulWidget {
+  /// The content of the bottom sheet.
+  final Widget child;
+
+  /// The FocusNode to focus when the sheet opens in keyboard mode.
+  /// If null, no autofocus occurs.
+  final FocusNode? initialFocusNode;
+
+  const FocusableBottomSheet({
+    super.key,
+    required this.child,
+    this.initialFocusNode,
+  });
+
+  @override
+  State<FocusableBottomSheet> createState() => _FocusableBottomSheetState();
+}
+
+class _FocusableBottomSheetState extends State<FocusableBottomSheet> {
+  @override
+  void initState() {
+    super.initState();
+    _requestInitialFocus();
+  }
+
+  void _requestInitialFocus() {
+    if (widget.initialFocusNode == null) return;
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+
+      // Only autofocus when in keyboard/controller mode
+      if (InputModeTracker.isKeyboardMode(context)) {
+        widget.initialFocusNode?.requestFocus();
+      }
+    });
+  }
+
+  @override
+  void didUpdateWidget(FocusableBottomSheet oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    // If the focus node changed, request focus on the new one
+    if (widget.initialFocusNode != oldWidget.initialFocusNode) {
+      _requestInitialFocus();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return widget.child;
+  }
+}
diff --git a/lib/widgets/focusable_filter_chip.dart b/lib/widgets/focusable_filter_chip.dart
new file mode 100644
index 00000000..df5fb211
--- /dev/null
+++ b/lib/widgets/focusable_filter_chip.dart
@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+
+import '../focus/focusable_chip_mixin.dart';
+import '../focus/input_mode_tracker.dart';
+import 'focus_builders.dart';
+
+/// A focusable filter chip that shows a color change when focused.
+///
+/// Unlike FocusableWrapper which uses scale + border, this widget
+/// uses a background color change to indicate focus state.
+class FocusableFilterChip extends StatefulWidget {
+  final IconData icon;
+  final String label;
+  final VoidCallback onPressed;
+
+  /// Optional external focus node for programmatic focus control.
+  final FocusNode? focusNode;
+
+  /// Called when the user presses DOWN from this chip.
+  final VoidCallback? onNavigateDown;
+
+  /// Called when the user presses UP from this chip.
+  final VoidCallback? onNavigateUp;
+
+  /// Called when the user presses BACK from this chip.
+  final VoidCallback? onBack;
+
+  const FocusableFilterChip({
+    super.key,
+    required this.icon,
+    required this.label,
+    required this.onPressed,
+    this.focusNode,
+    this.onNavigateDown,
+    this.onNavigateUp,
+    this.onBack,
+  });
+
+  @override
+  State<FocusableFilterChip> createState() => _FocusableFilterChipState();
+}
+
+class _FocusableFilterChipState extends State<FocusableFilterChip>
+    with FocusableChipStateMixin<FocusableFilterChip> {
+  @override
+  FocusNode? get widgetFocusNode => widget.focusNode;
+
+  @override
+  String get debugLabel => 'filter_chip_${widget.label}';
+
+  @override
+  void initState() {
+    super.initState();
+    initFocusNode();
+  }
+
+  @override
+  void didUpdateWidget(FocusableFilterChip oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    updateFocusNode(oldWidget.focusNode);
+  }
+
+  @override
+  void dispose() {
+    disposeFocusNode();
+    super.dispose();
+  }
+
+  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
+    return handleChipKeyEvent(
+      node,
+      event,
+      ChipKeyCallbacks(
+        onSelect: widget.onPressed,
+        onNavigateDown: widget.onNavigateDown,
+        onNavigateUp: widget.onNavigateUp,
+        onBack: widget.onBack,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    // Only show focus effects during keyboard/d-pad navigation
+    final showFocus = isFocused && InputModeTracker.isKeyboardMode(context);
+
+    // Use primary color when focused, surface color when not
+    final backgroundColor = showFocus
+        ? colorScheme.primary
+        : colorScheme.surfaceContainerHighest;
+    final foregroundColor = showFocus
+        ? colorScheme.onPrimary
+        : colorScheme.onSurfaceVariant;
+
+    return FocusBuilders.buildFocusableChip(
+      context: context,
+      focusNode: focusNode,
+      isFocused: isFocused,
+      onKeyEvent: _handleKeyEvent,
+      onTap: widget.onPressed,
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      backgroundColor: backgroundColor,
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          AppIcon(icon, fill: 1, size: 16, color: foregroundColor),
+          const SizedBox(width: 6),
+          Text(
+            widget.label,
+            style: Theme.of(
+              context,
+            ).textTheme.labelMedium?.copyWith(color: foregroundColor),
+          ),
+        ],
+      ),
+    );
+  }
+
+  IconData get icon => widget.icon;
+}
diff --git a/lib/widgets/focusable_list_tile.dart b/lib/widgets/focusable_list_tile.dart
new file mode 100644
index 00000000..1082ba75
--- /dev/null
+++ b/lib/widgets/focusable_list_tile.dart
@@ -0,0 +1,187 @@
+import 'package:flutter/material.dart';
+
+/// A ListTile that accepts a FocusNode for keyboard/controller navigation.
+///
+/// Uses Flutter's native ListTile focus support - no custom styling wrapper.
+/// The focusNode allows programmatic focus control (e.g., auto-focus first item).
+class FocusableListTile extends StatelessWidget {
+  /// The primary content of the list tile.
+  final Widget? title;
+
+  /// Additional content displayed below the title.
+  final Widget? subtitle;
+
+  /// A widget to display before the title.
+  final Widget? leading;
+
+  /// A widget to display after the title.
+  final Widget? trailing;
+
+  /// Called when the user taps this list tile.
+  final VoidCallback? onTap;
+
+  /// Called when the user long-presses this list tile.
+  final VoidCallback? onLongPress;
+
+  /// Whether this list tile is part of a vertically dense list.
+  final bool dense;
+
+  /// Whether this list tile is interactive.
+  final bool enabled;
+
+  /// If true, the tile is rendered with a selected highlight.
+  final bool selected;
+
+  /// Optional FocusNode for keyboard/controller navigation.
+  final FocusNode? focusNode;
+
+  /// Whether this tile should autofocus when first built.
+  final bool autofocus;
+
+  /// The tile's internal padding.
+  final EdgeInsetsGeometry? contentPadding;
+
+  const FocusableListTile({
+    super.key,
+    this.title,
+    this.subtitle,
+    this.leading,
+    this.trailing,
+    this.onTap,
+    this.onLongPress,
+    this.dense = false,
+    this.enabled = true,
+    this.selected = false,
+    this.focusNode,
+    this.autofocus = false,
+    this.contentPadding,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      title: title,
+      subtitle: subtitle,
+      leading: leading,
+      trailing: trailing,
+      onTap: onTap,
+      onLongPress: onLongPress,
+      dense: dense,
+      enabled: enabled,
+      selected: selected,
+      contentPadding: contentPadding,
+      focusNode: focusNode,
+      autofocus: autofocus,
+    );
+  }
+}
+
+/// A RadioListTile that accepts a FocusNode for keyboard/controller navigation.
+///
+/// Uses Flutter's native RadioListTile focus support - no custom styling wrapper.
+class FocusableRadioListTile<T> extends StatelessWidget {
+  /// The primary content of the list tile.
+  final Widget? title;
+
+  /// Additional content displayed below the title.
+  final Widget? subtitle;
+
+  /// A widget to display on the opposite side from the radio.
+  final Widget? secondary;
+
+  /// The value represented by this radio button.
+  final T value;
+
+  /// Whether this radio button is part of a vertically dense list.
+  final bool dense;
+
+  /// Optional FocusNode for keyboard/controller navigation.
+  final FocusNode? focusNode;
+
+  /// Whether this tile should autofocus when first built.
+  final bool autofocus;
+
+  /// Whether the radio tile is interactive.
+  final bool? enabled;
+
+  const FocusableRadioListTile({
+    super.key,
+    this.title,
+    this.subtitle,
+    this.secondary,
+    required this.value,
+    this.dense = false,
+    this.focusNode,
+    this.autofocus = false,
+    this.enabled,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return RadioListTile<T>(
+      title: title,
+      subtitle: subtitle,
+      secondary: secondary,
+      value: value,
+      dense: dense,
+      focusNode: focusNode,
+      autofocus: autofocus,
+      enabled: enabled,
+    );
+  }
+}
+
+/// A SwitchListTile that accepts a FocusNode for keyboard/controller navigation.
+///
+/// Uses Flutter's native SwitchListTile focus support - no custom styling wrapper.
+class FocusableSwitchListTile extends StatelessWidget {
+  /// The primary content of the list tile.
+  final Widget? title;
+
+  /// Additional content displayed below the title.
+  final Widget? subtitle;
+
+  /// A widget to display on the opposite side from the switch.
+  final Widget? secondary;
+
+  /// Whether this switch is checked.
+  final bool value;
+
+  /// Called when the user toggles the switch.
+  final ValueChanged<bool>? onChanged;
+
+  /// Whether this switch is part of a vertically dense list.
+  final bool dense;
+
+  /// Optional FocusNode for keyboard/controller navigation.
+  final FocusNode? focusNode;
+
+  /// Whether this tile should autofocus when first built.
+  final bool autofocus;
+
+  const FocusableSwitchListTile({
+    super.key,
+    this.title,
+    this.subtitle,
+    this.secondary,
+    required this.value,
+    required this.onChanged,
+    this.dense = false,
+    this.focusNode,
+    this.autofocus = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SwitchListTile(
+      title: title,
+      subtitle: subtitle,
+      secondary: secondary,
+      value: value,
+      onChanged: onChanged,
+      dense: dense,
+      focusNode: focusNode,
+      autofocus: autofocus,
+    );
+  }
+}
diff --git a/lib/widgets/focusable_media_card.dart b/lib/widgets/focusable_media_card.dart
new file mode 100644
index 00000000..317a2c6b
--- /dev/null
+++ b/lib/widgets/focusable_media_card.dart
@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+
+import '../focus/focusable_wrapper.dart';
+import 'media_card.dart';
+
+/// A focusable wrapper for MediaCard that handles D-pad navigation.
+///
+/// Wraps MediaCard with focus handling for TV/desktop navigation:
+/// - Shows scale + border decoration when focused
+/// - Handles SELECT key for activation with long-press detection
+/// - Accepts optional external focusNode for programmatic focus control
+class FocusableMediaCard extends StatefulWidget {
+  final dynamic item; // PlexMetadata or PlexPlaylist
+  final double? width;
+  final double? height;
+  final void Function(String ratingKey)? onRefresh;
+  final VoidCallback? onRemoveFromContinueWatching;
+  final VoidCallback? onListRefresh;
+  final bool forceGridMode;
+  final bool isInContinueWatching;
+  final String? collectionId;
+
+  /// True for downloaded content without server access
+  final bool isOffline;
+
+  /// Optional external focus node for programmatic focus control.
+  /// If not provided, an internal focus node is created.
+  final FocusNode? focusNode;
+
+  /// Called when the user presses UP and there's no focusable item above.
+  /// Used to navigate from the top row to filter chips.
+  final VoidCallback? onNavigateUp;
+
+  /// Called when the user presses BACK.
+  /// Used to navigate from tab content to tab bar.
+  final VoidCallback? onBack;
+
+  const FocusableMediaCard({
+    super.key,
+    required this.item,
+    this.width,
+    this.height,
+    this.onRefresh,
+    this.onRemoveFromContinueWatching,
+    this.onListRefresh,
+    this.forceGridMode = false,
+    this.isInContinueWatching = false,
+    this.collectionId,
+    this.isOffline = false,
+    this.focusNode,
+    this.onNavigateUp,
+    this.onBack,
+  });
+
+  @override
+  State<FocusableMediaCard> createState() => _FocusableMediaCardState();
+}
+
+class _FocusableMediaCardState extends State<FocusableMediaCard> {
+  // Key for accessing MediaCard's state
+  final GlobalKey<MediaCardState> _mediaCardKey = GlobalKey();
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusableWrapper(
+      focusNode: widget.focusNode,
+      onSelect: () => _mediaCardKey.currentState?.handleTap(),
+      onLongPress: () => _mediaCardKey.currentState?.showContextMenu(),
+      onNavigateUp: widget.onNavigateUp,
+      onBack: widget.onBack,
+      enableLongPress: true,
+      useComfortableZone: true,
+      scrollAlignment: 0.5,
+      child: MediaCard(
+        key: _mediaCardKey,
+        item: widget.item,
+        width: widget.width,
+        height: widget.height,
+        onRefresh: widget.onRefresh,
+        onRemoveFromContinueWatching: widget.onRemoveFromContinueWatching,
+        onListRefresh: widget.onListRefresh,
+        forceGridMode: widget.forceGridMode,
+        isInContinueWatching: widget.isInContinueWatching,
+        collectionId: widget.collectionId,
+        isOffline: widget.isOffline,
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/focusable_tab_chip.dart b/lib/widgets/focusable_tab_chip.dart
new file mode 100644
index 00000000..da082262
--- /dev/null
+++ b/lib/widgets/focusable_tab_chip.dart
@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+
+import '../focus/focusable_chip_mixin.dart';
+import '../focus/input_mode_tracker.dart';
+import 'focus_builders.dart';
+
+/// A focusable tab chip that shows a color change when focused or selected.
+///
+/// Used for tab navigation in LibrariesScreen. Handles:
+/// - SELECT key to activate the tab
+/// - LEFT/RIGHT arrows to switch between tabs
+/// - DOWN arrow to navigate to tab content
+/// - BACK key to navigate to sidenav
+class FocusableTabChip extends StatefulWidget {
+  final String label;
+  final bool isSelected;
+  final VoidCallback onSelect;
+
+  /// Optional external focus node for programmatic focus control.
+  final FocusNode? focusNode;
+
+  /// Called when the user presses LEFT from this chip.
+  /// Should switch to the previous tab.
+  final VoidCallback? onNavigateLeft;
+
+  /// Called when the user presses RIGHT from this chip.
+  /// Should switch to the next tab.
+  final VoidCallback? onNavigateRight;
+
+  /// Called when the user presses DOWN from this chip.
+  final VoidCallback? onNavigateDown;
+
+  /// Called when the user presses BACK from this chip.
+  final VoidCallback? onBack;
+
+  const FocusableTabChip({
+    super.key,
+    required this.label,
+    required this.isSelected,
+    required this.onSelect,
+    this.focusNode,
+    this.onNavigateLeft,
+    this.onNavigateRight,
+    this.onNavigateDown,
+    this.onBack,
+  });
+
+  @override
+  State<FocusableTabChip> createState() => _FocusableTabChipState();
+}
+
+class _FocusableTabChipState extends State<FocusableTabChip>
+    with FocusableChipStateMixin<FocusableTabChip> {
+  @override
+  FocusNode? get widgetFocusNode => widget.focusNode;
+
+  @override
+  String get debugLabel => 'tab_chip_${widget.label}';
+
+  @override
+  void initState() {
+    super.initState();
+    initFocusNode();
+  }
+
+  @override
+  void didUpdateWidget(FocusableTabChip oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    updateFocusNode(oldWidget.focusNode);
+  }
+
+  @override
+  void dispose() {
+    disposeFocusNode();
+    super.dispose();
+  }
+
+  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
+    return handleChipKeyEvent(
+      node,
+      event,
+      ChipKeyCallbacks(
+        onSelect: widget.onSelect,
+        onNavigateLeft: widget.onNavigateLeft,
+        onNavigateRight: widget.onNavigateRight,
+        onNavigateDown: widget.onNavigateDown,
+        onBack: widget.onBack,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    // Only show focus effects during keyboard/d-pad navigation
+    final showFocus = isFocused && InputModeTracker.isKeyboardMode(context);
+
+    // Determine background color based on focus and selection state
+    // - Selected + Focused: slightly dimmed primary (to show focus distinction)
+    // - Selected only: primary color
+    // - Focused only: primary color
+    // - Neither: surface color
+    Color backgroundColor;
+    Color foregroundColor;
+
+    if (widget.isSelected && showFocus) {
+      // Selected + focused: dim the primary color slightly
+      backgroundColor = Color.lerp(
+        colorScheme.primary,
+        colorScheme.surface,
+        0.25,
+      )!;
+      foregroundColor = colorScheme.onPrimary;
+    } else if (widget.isSelected || showFocus) {
+      // Selected or focused (but not both): full primary
+      backgroundColor = colorScheme.primary;
+      foregroundColor = colorScheme.onPrimary;
+    } else {
+      // Neither selected nor focused
+      backgroundColor = colorScheme.surfaceContainerHighest;
+      foregroundColor = colorScheme.onSurfaceVariant;
+    }
+
+    final isHighlighted = showFocus || widget.isSelected;
+
+    return FocusBuilders.buildFocusableChip(
+      context: context,
+      focusNode: focusNode,
+      isFocused: isFocused,
+      onKeyEvent: _handleKeyEvent,
+      onTap: widget.onSelect,
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      backgroundColor: backgroundColor,
+      child: Text(
+        widget.label,
+        style: Theme.of(context).textTheme.labelLarge?.copyWith(
+          color: foregroundColor,
+          fontWeight: isHighlighted ? FontWeight.w600 : FontWeight.normal,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/focused_scroll_scaffold.dart b/lib/widgets/focused_scroll_scaffold.dart
new file mode 100644
index 00000000..ff314d74
--- /dev/null
+++ b/lib/widgets/focused_scroll_scaffold.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import '../focus/key_event_utils.dart';
+import 'desktop_app_bar.dart';
+
+/// A scaffold widget that wraps Focus + Scaffold + CustomScrollView
+/// with consistent keyboard navigation handling and app bar styling.
+///
+/// This widget reduces boilerplate for screens that need:
+/// - Keyboard navigation (back key handling)
+/// - Custom scrollable content with slivers
+/// - Consistent app bar with title and optional actions
+class FocusedScrollScaffold extends StatelessWidget {
+  /// The title to display in the app bar.
+  /// Can be a Text widget or a more complex widget like Column.
+  final Widget title;
+
+  /// The list of slivers to display in the scroll view.
+  /// Should not include the app bar (it's added automatically).
+  final List<Widget> slivers;
+
+  /// Optional actions to display in the app bar (e.g., IconButton widgets).
+  final List<Widget>? actions;
+
+  /// Whether the app bar should remain visible when scrolling.
+  /// Defaults to true.
+  final bool pinned;
+
+  const FocusedScrollScaffold({
+    super.key,
+    required this.title,
+    required this.slivers,
+    this.actions,
+    this.pinned = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Focus(
+      onKeyEvent: (_, event) => handleBackKeyNavigation(context, event),
+      child: Scaffold(
+        body: CustomScrollView(
+          slivers: [
+            CustomAppBar(title: title, pinned: pinned, actions: actions),
+            ...slivers,
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/horizontal_scroll_with_arrows.dart b/lib/widgets/horizontal_scroll_with_arrows.dart
index 1e1a0475..76fedd84 100644
--- a/lib/widgets/horizontal_scroll_with_arrows.dart
+++ b/lib/widgets/horizontal_scroll_with_arrows.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import '../utils/platform_detector.dart';
 
 /// A wrapper widget that adds hover-activated navigation arrows to horizontal scrolling content.
@@ -9,11 +11,13 @@ import '../utils/platform_detector.dart';
 class HorizontalScrollWithArrows extends StatefulWidget {
   final Widget Function(ScrollController) builder;
   final double scrollAmount;
+  final ScrollController? controller;
 
   const HorizontalScrollWithArrows({
     super.key,
     required this.builder,
     this.scrollAmount = 0.8, // Scroll by 80% of viewport width by default
+    this.controller,
   });
 
   @override
@@ -24,6 +28,7 @@ class HorizontalScrollWithArrows extends StatefulWidget {
 class _HorizontalScrollWithArrowsState
     extends State<HorizontalScrollWithArrows> {
   late final ScrollController _scrollController;
+  late final bool _ownsController;
   bool _isHovering = false;
   bool _canScrollLeft = false;
   bool _canScrollRight = false;
@@ -31,7 +36,8 @@ class _HorizontalScrollWithArrowsState
   @override
   void initState() {
     super.initState();
-    _scrollController = ScrollController();
+    _ownsController = widget.controller == null;
+    _scrollController = widget.controller ?? ScrollController();
     _scrollController.addListener(_updateScrollState);
     // Initial state update after first frame
     WidgetsBinding.instance.addPostFrameCallback((_) => _updateScrollState());
@@ -40,7 +46,9 @@ class _HorizontalScrollWithArrowsState
   @override
   void dispose() {
     _scrollController.removeListener(_updateScrollState);
-    _scrollController.dispose();
+    if (_ownsController) {
+      _scrollController.dispose();
+    }
     super.dispose();
   }
 
@@ -80,6 +88,31 @@ class _HorizontalScrollWithArrowsState
     );
   }
 
+  Widget _buildArrowButton({
+    required double position,
+    required IconData icon,
+    required VoidCallback onPressed,
+    required bool canScroll,
+  }) {
+    return Positioned(
+      left: position < 0 ? null : position,
+      right: position < 0 ? -position : null,
+      top: 0,
+      bottom: 0,
+      child: Center(
+        child: AnimatedOpacity(
+          opacity: (_isHovering && canScroll) ? 1.0 : 0.0,
+          duration: const Duration(milliseconds: 200),
+          curve: Curves.easeInOut,
+          child: IgnorePointer(
+            ignoring: !(_isHovering && canScroll),
+            child: _NavigationArrow(icon: icon, onPressed: onPressed),
+          ),
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final child = widget.builder(_scrollController);
@@ -95,45 +128,17 @@ class _HorizontalScrollWithArrowsState
       child: Stack(
         children: [
           child,
-          // Left arrow
-          Positioned(
-            left: 8,
-            top: 0,
-            bottom: 0,
-            child: Center(
-              child: AnimatedOpacity(
-                opacity: (_isHovering && _canScrollLeft) ? 1.0 : 0.0,
-                duration: const Duration(milliseconds: 200),
-                curve: Curves.easeInOut,
-                child: IgnorePointer(
-                  ignoring: !(_isHovering && _canScrollLeft),
-                  child: _NavigationArrow(
-                    icon: Icons.chevron_left,
-                    onPressed: _scrollLeft,
-                  ),
-                ),
-              ),
-            ),
+          _buildArrowButton(
+            position: 8,
+            icon: Symbols.chevron_left_rounded,
+            onPressed: _scrollLeft,
+            canScroll: _canScrollLeft,
           ),
-          // Right arrow
-          Positioned(
-            right: 8,
-            top: 0,
-            bottom: 0,
-            child: Center(
-              child: AnimatedOpacity(
-                opacity: (_isHovering && _canScrollRight) ? 1.0 : 0.0,
-                duration: const Duration(milliseconds: 200),
-                curve: Curves.easeInOut,
-                child: IgnorePointer(
-                  ignoring: !(_isHovering && _canScrollRight),
-                  child: _NavigationArrow(
-                    icon: Icons.chevron_right,
-                    onPressed: _scrollRight,
-                  ),
-                ),
-              ),
-            ),
+          _buildArrowButton(
+            position: -8,
+            icon: Symbols.chevron_right_rounded,
+            onPressed: _scrollRight,
+            canScroll: _canScrollRight,
           ),
         ],
       ),
@@ -179,7 +184,7 @@ class _NavigationArrowState extends State<_NavigationArrow> {
               ),
             ],
           ),
-          child: Icon(widget.icon, color: Colors.white, size: 32),
+          child: AppIcon(widget.icon, fill: 1, color: Colors.white, size: 32),
         ),
       ),
     );
diff --git a/lib/widgets/hub_section.dart b/lib/widgets/hub_section.dart
new file mode 100644
index 00000000..a93f0d55
--- /dev/null
+++ b/lib/widgets/hub_section.dart
@@ -0,0 +1,424 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter/services.dart';
+import '../focus/dpad_navigator.dart';
+import '../utils/layout_constants.dart';
+import '../focus/locked_hub_controller.dart';
+import '../models/plex_hub.dart';
+import '../screens/hub_detail_screen.dart';
+import '../utils/media_navigation_helper.dart';
+import 'focus_builders.dart';
+import 'media_card.dart';
+import 'horizontal_scroll_with_arrows.dart';
+import '../i18n/strings.g.dart';
+
+/// Shared hub section widget used in both discover and library screens
+/// Displays a hub title with icon and a horizontal scrollable list of items
+///
+/// Uses a "locked" focus pattern where:
+/// - A single Focus widget at the hub level intercepts ALL arrow keys
+/// - Visual focus index is tracked in state (not Flutter's focus system)
+/// - Children render focus visuals based on the passed index
+/// - Focus never "escapes" to random elements
+class HubSection extends StatefulWidget {
+  final PlexHub hub;
+  final IconData icon;
+  final void Function(String)? onRefresh;
+  final VoidCallback? onRemoveFromContinueWatching;
+  final bool isInContinueWatching;
+
+  /// Callback for vertical navigation (up/down). Return true if handled.
+  final bool Function(bool isUp)? onVerticalNavigation;
+
+  /// Called when the user presses BACK.
+  /// Used to navigate focus back to the tab bar.
+  final VoidCallback? onBack;
+
+  const HubSection({
+    super.key,
+    required this.hub,
+    required this.icon,
+    this.onRefresh,
+    this.onRemoveFromContinueWatching,
+    this.isInContinueWatching = false,
+    this.onVerticalNavigation,
+    this.onBack,
+  });
+
+  @override
+  State<HubSection> createState() => HubSectionState();
+}
+
+class HubSectionState extends State<HubSection> {
+  late FocusNode _hubFocusNode;
+  final ScrollController _scrollController = ScrollController();
+
+  /// Current visual focus index (not tied to Flutter's focus system)
+  int _focusedIndex = 0;
+
+  /// Item extent for scroll calculations
+  double _itemExtent = 0;
+  static const double _leadingPadding = 12.0;
+
+  @override
+  void initState() {
+    super.initState();
+    _hubFocusNode = FocusNode(debugLabel: 'hub_${widget.hub.hubKey}');
+    _hubFocusNode.addListener(_onFocusChange);
+  }
+
+  @override
+  void didUpdateWidget(HubSection oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // Clamp focus index if item count changed
+    if (widget.hub.items.length != oldWidget.hub.items.length) {
+      final maxIndex = widget.hub.items.isEmpty
+          ? 0
+          : widget.hub.items.length - 1;
+      if (_focusedIndex > maxIndex) {
+        _focusedIndex = maxIndex;
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _hubFocusNode.removeListener(_onFocusChange);
+    _hubFocusNode.dispose();
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  void _onFocusChange() {
+    // Rebuild to update visual focus state
+    if (mounted) setState(() {});
+  }
+
+  /// Request focus on this hub at a specific item index
+  void requestFocusAt(int index) {
+    if (widget.hub.items.isEmpty) return;
+
+    final clamped = index.clamp(0, widget.hub.items.length - 1);
+    _focusedIndex = clamped;
+    // Remember this position for this specific hub
+    HubFocusMemory.setForHub(widget.hub.hubKey, clamped);
+    _scrollToIndex(clamped);
+    _hubFocusNode.requestFocus();
+    if (mounted) setState(() {});
+
+    // Scroll the hub into view in the parent scroll view
+    _scrollHubIntoView();
+  }
+
+  /// Request focus using the stored memory for this hub
+  void requestFocusFromMemory() {
+    final index = HubFocusMemory.getForHub(
+      widget.hub.hubKey,
+      widget.hub.items.length,
+    );
+    requestFocusAt(index);
+  }
+
+  /// Scroll this hub into view in the parent scroll view
+  void _scrollHubIntoView() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      Scrollable.ensureVisible(
+        context,
+        alignment: 0.3, // Position hub near top third of viewport
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeOut,
+      );
+    });
+  }
+
+  /// Check if this hub currently has focus
+  bool get hasFocusedItem => _hubFocusNode.hasFocus;
+
+  /// Get the number of items in this hub
+  int get itemCount => widget.hub.items.length;
+
+  /// Scroll to center the item at the given index
+  void _scrollToIndex(int index, {bool animate = true}) {
+    if (!_scrollController.hasClients || _itemExtent <= 0) return;
+
+    final viewport = _scrollController.position.viewportDimension;
+    final targetCenter =
+        _leadingPadding + (index * _itemExtent) + (_itemExtent / 2);
+    final desiredOffset = (targetCenter - (viewport / 2)).clamp(
+      0.0,
+      _scrollController.position.maxScrollExtent,
+    );
+
+    if (animate) {
+      _scrollController.animateTo(
+        desiredOffset,
+        duration: const Duration(milliseconds: 150),
+        curve: Curves.easeOut,
+      );
+    } else {
+      _scrollController.jumpTo(desiredOffset);
+    }
+  }
+
+  /// Handle ALL key events at the hub level
+  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
+    // Handle key down and repeat events
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+    final itemCount = widget.hub.items.length;
+    if (itemCount == 0) return KeyEventResult.ignored;
+
+    // Left: move to previous item, ALWAYS consume to prevent escape
+    if (key.isLeftKey) {
+      if (_focusedIndex > 0) {
+        _focusedIndex--;
+        HubFocusMemory.setForHub(widget.hub.hubKey, _focusedIndex);
+        _scrollToIndex(_focusedIndex);
+        setState(() {});
+      }
+      return KeyEventResult.handled;
+    }
+
+    // Right: move to next item, ALWAYS consume to prevent escape
+    if (key.isRightKey) {
+      if (_focusedIndex < itemCount - 1) {
+        _focusedIndex++;
+        HubFocusMemory.setForHub(widget.hub.hubKey, _focusedIndex);
+        _scrollToIndex(_focusedIndex);
+        setState(() {});
+      }
+      return KeyEventResult.handled;
+    }
+
+    // Up/Down: delegate to parent for vertical hub navigation, ALWAYS consume
+    if (key.isUpKey) {
+      widget.onVerticalNavigation?.call(true);
+      return KeyEventResult.handled;
+    }
+    if (key.isDownKey) {
+      widget.onVerticalNavigation?.call(false);
+      return KeyEventResult.handled;
+    }
+
+    // Select: activate the current item
+    if (key.isSelectKey) {
+      _activateCurrentItem();
+      return KeyEventResult.handled;
+    }
+
+    // Context menu key: show context menu
+    if (key.isContextMenuKey) {
+      _showContextMenuForCurrentItem();
+      return KeyEventResult.handled;
+    }
+
+    // Back key: navigate to tab bar
+    if (key.isBackKey && widget.onBack != null) {
+      widget.onBack!();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  /// GlobalKeys for MediaCards to access their state (for context menu)
+  final Map<int, GlobalKey<MediaCardState>> _mediaCardKeys = {};
+
+  GlobalKey<MediaCardState> _getMediaCardKey(int index) {
+    return _mediaCardKeys.putIfAbsent(index, () => GlobalKey<MediaCardState>());
+  }
+
+  void _activateCurrentItem() {
+    if (_focusedIndex >= widget.hub.items.length) return;
+    final item = widget.hub.items[_focusedIndex];
+    _navigateToItem(item);
+  }
+
+  void _showContextMenuForCurrentItem() {
+    _mediaCardKeys[_focusedIndex]?.currentState?.showContextMenu();
+  }
+
+  Future<void> _navigateToItem(dynamic item) async {
+    await navigateToMediaItem(context, item, onRefresh: widget.onRefresh);
+  }
+
+  void _navigateToHubDetail(BuildContext context) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(builder: (context) => HubDetailScreen(hub: widget.hub)),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasFocus = _hubFocusNode.hasFocus;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        // Hub header (NOT focusable - titles should not be focusable)
+        Padding(
+          padding: const EdgeInsets.fromLTRB(16, 24, 16, 8),
+          child: ExcludeFocus(
+            child: InkWell(
+              onTap: widget.hub.more
+                  ? () => _navigateToHubDetail(context)
+                  : null,
+              borderRadius: BorderRadius.circular(8),
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    AppIcon(widget.icon, fill: 1),
+                    const SizedBox(width: 8),
+                    Expanded(
+                      child: Text(
+                        widget.hub.title,
+                        style: Theme.of(context).textTheme.titleLarge,
+                        overflow: TextOverflow.ellipsis,
+                        maxLines: 1,
+                      ),
+                    ),
+                    if (widget.hub.more) ...[
+                      const SizedBox(width: 4),
+                      const AppIcon(
+                        Symbols.chevron_right_rounded,
+                        fill: 1,
+                        size: 20,
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+
+        // Hub items with locked focus control
+        if (widget.hub.items.isNotEmpty)
+          Focus(
+            focusNode: _hubFocusNode,
+            onKeyEvent: _handleKeyEvent,
+            child: LayoutBuilder(
+              builder: (context, constraints) {
+                // Responsive card width based on screen size
+                final screenWidth = constraints.maxWidth;
+                final cardWidth = ScreenBreakpoints.isLargeDesktop(screenWidth)
+                    ? 220.0
+                    : ScreenBreakpoints.isDesktop(screenWidth)
+                    ? 200.0
+                    : ScreenBreakpoints.isWideTablet(screenWidth)
+                    ? 190.0
+                    : 160.0;
+
+                // Store item extent for scroll calculations
+                _itemExtent = cardWidth + 4; // 4px total horizontal padding
+
+                // MediaCard has 8px padding on all sides (16px total horizontally)
+                final posterWidth = cardWidth - 16;
+                // 2:3 poster aspect ratio
+                final posterHeight = posterWidth * 1.5;
+                // Container height calculation
+                final containerHeight = posterHeight + 66;
+
+                return SizedBox(
+                  height: containerHeight,
+                  child: HorizontalScrollWithArrows(
+                    controller: _scrollController,
+                    builder: (scrollController) => ListView.builder(
+                      controller: scrollController,
+                      scrollDirection: Axis.horizontal,
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                        vertical: 5,
+                      ),
+                      itemCount: widget.hub.items.length,
+                      itemBuilder: (context, index) {
+                        final item = widget.hub.items[index];
+                        final isItemFocused =
+                            hasFocus && index == _focusedIndex;
+
+                        return Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 2),
+                          child: _LockedHubItemWrapper(
+                            isFocused: isItemFocused,
+                            onTap: () => _onItemTapped(index),
+                            onLongPress: () => _mediaCardKeys[index]
+                                ?.currentState
+                                ?.showContextMenu(),
+                            child: MediaCard(
+                              key: _getMediaCardKey(index),
+                              item: item,
+                              width: cardWidth,
+                              height: posterHeight,
+                              onRefresh: widget.onRefresh,
+                              onRemoveFromContinueWatching:
+                                  widget.onRemoveFromContinueWatching,
+                              forceGridMode: true,
+                              isInContinueWatching: widget.isInContinueWatching,
+                            ),
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+                );
+              },
+            ),
+          )
+        else
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            child: Text(
+              t.messages.noItemsAvailable,
+              style: Theme.of(
+                context,
+              ).textTheme.bodySmall?.copyWith(color: Colors.grey),
+            ),
+          ),
+      ],
+    );
+  }
+
+  /// Called when an item is tapped (mouse/touch)
+  void _onItemTapped(int index) {
+    // Update focus to tapped item and request hub focus
+    _focusedIndex = index;
+    HubFocusMemory.setForHub(widget.hub.hubKey, index);
+    _hubFocusNode.requestFocus();
+    setState(() {});
+  }
+}
+
+/// Wrapper that provides visual focus decoration without using Flutter's focus system.
+class _LockedHubItemWrapper extends StatelessWidget {
+  final bool isFocused;
+  final Widget child;
+  final VoidCallback? onTap;
+  final VoidCallback? onLongPress;
+
+  const _LockedHubItemWrapper({
+    required this.isFocused,
+    required this.child,
+    this.onTap,
+    this.onLongPress,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusBuilders.buildLockedFocusWrapper(
+      context: context,
+      isFocused: isFocused,
+      onTap: onTap,
+      onLongPress: onLongPress,
+      child: child,
+    );
+  }
+}
diff --git a/lib/widgets/media_card.dart b/lib/widgets/media_card.dart
index 0801f86e..0bd8c442 100644
--- a/lib/widgets/media_card.dart
+++ b/lib/widgets/media_card.dart
@@ -1,27 +1,37 @@
 import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
+import '../../services/plex_client.dart';
 import '../models/plex_metadata.dart';
-import '../providers/plex_client_provider.dart';
+import '../models/plex_playlist.dart';
+import '../providers/download_provider.dart';
+import '../providers/multi_server_provider.dart';
+import '../services/download_storage_service.dart';
 import '../providers/settings_provider.dart';
 import '../services/settings_service.dart';
 import '../utils/provider_extensions.dart';
-import '../utils/video_player_navigation.dart';
 import '../utils/content_rating_formatter.dart';
-import '../screens/media_detail_screen.dart';
-import '../screens/season_detail_screen.dart';
+import '../utils/duration_formatter.dart';
+import '../utils/media_navigation_helper.dart';
 import '../theme/theme_helper.dart';
 import '../i18n/strings.g.dart';
 import 'media_context_menu.dart';
+import 'plex_optimized_image.dart';
 
 class MediaCard extends StatefulWidget {
-  final PlexMetadata item;
+  final dynamic item; // Can be PlexMetadata or PlexPlaylist
   final double? width;
   final double? height;
   final void Function(String ratingKey)? onRefresh;
   final VoidCallback? onRemoveFromContinueWatching;
+  final VoidCallback?
+  onListRefresh; // Callback to refresh the entire parent list
   final bool forceGridMode;
   final bool isInContinueWatching;
+  final String?
+  collectionId; // The collection ID if displaying within a collection
+  final bool isOffline; // True for downloaded content without server access
 
   const MediaCard({
     super.key,
@@ -30,67 +40,125 @@ class MediaCard extends StatefulWidget {
     this.height,
     this.onRefresh,
     this.onRemoveFromContinueWatching,
+    this.onListRefresh,
     this.forceGridMode = false,
     this.isInContinueWatching = false,
+    this.collectionId,
+    this.isOffline = false,
   });
 
   @override
-  State<MediaCard> createState() => _MediaCardState();
+  State<MediaCard> createState() => MediaCardState();
 }
 
-class _MediaCardState extends State<MediaCard> {
+class MediaCardState extends State<MediaCard> {
+  final _contextMenuKey = GlobalKey<MediaContextMenuState>();
+
+  void _showContextMenu() {
+    _contextMenuKey.currentState?.showContextMenu(context);
+  }
+
+  /// Public method to trigger tap action (for keyboard/gamepad SELECT)
+  void handleTap() {
+    _handleTap(context);
+  }
+
+  /// Public method to show context menu (for keyboard/gamepad context menu key)
+  void showContextMenu() {
+    _showContextMenu();
+  }
+
+  String _buildSemanticLabel() {
+    final item = widget.item;
+
+    // Build base label based on type
+    String baseLabel;
+    switch (item.mediaType) {
+      case PlexMediaType.episode:
+        final episodeInfo = item.parentIndex != null && item.index != null
+            ? 'S${item.parentIndex} E${item.index}'
+            : '';
+        baseLabel = t.accessibility.mediaCardEpisode(
+          title: item.displayTitle,
+          episodeInfo: episodeInfo,
+        );
+      case PlexMediaType.season:
+        final seasonInfo =
+            item.parentIndex != null ? 'Season ${item.parentIndex}' : '';
+        baseLabel = t.accessibility.mediaCardSeason(
+          title: item.displayTitle,
+          seasonInfo: seasonInfo,
+        );
+      case PlexMediaType.movie:
+        baseLabel = t.accessibility.mediaCardMovie(title: item.displayTitle);
+      default:
+        baseLabel = t.accessibility.mediaCardShow(title: item.displayTitle);
+    }
+
+    // Add watched status
+    if (item.isWatched) {
+      baseLabel = '$baseLabel, ${t.accessibility.mediaCardWatched}';
+    } else if (item.viewOffset != null &&
+        item.duration != null &&
+        item.viewOffset! > 0) {
+      final percent = ((item.viewOffset! / item.duration!) * 100).round();
+      baseLabel =
+          '$baseLabel, ${t.accessibility.mediaCardPartiallyWatched(percent: percent)}';
+    } else {
+      baseLabel = '$baseLabel, ${t.accessibility.mediaCardUnwatched}';
+    }
+
+    return baseLabel;
+  }
+
   void _handleTap(BuildContext context) async {
-    final client = context.client;
-    if (client == null) return;
+    // Ignore taps while context menu is open to avoid double-activating
+    if (_contextMenuKey.currentState?.isContextMenuOpen == true) {
+      return;
+    }
 
-    final itemType = widget.item.type.toLowerCase();
+    final result = await navigateToMediaItem(
+      context,
+      widget.item,
+      onRefresh: widget.onRefresh,
+      isOffline: widget.isOffline,
+    );
 
-    // Music content is not yet supported
-    if (itemType == 'artist' || itemType == 'album' || itemType == 'track') {
-      if (context.mounted) {
+    if (!context.mounted) return;
+
+    switch (result) {
+      case MediaNavigationResult.unsupported:
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
             content: Text(t.messages.musicNotSupported),
             duration: const Duration(seconds: 2),
           ),
         );
-      }
-      return;
+      case MediaNavigationResult.listRefreshNeeded:
+        widget.onListRefresh?.call();
+      case MediaNavigationResult.navigated:
+        // Item refresh already handled by onRefresh callback in helper
+        break;
     }
+  }
 
-    // For episodes, start playback directly
-    if (itemType == 'episode') {
-      final result = await navigateToVideoPlayer(
-        context,
-        metadata: widget.item,
-      );
-      // Refresh parent screen if result indicates it's needed
-      if (result == true) {
-        widget.onRefresh?.call(widget.item.ratingKey);
-      }
-    } else if (itemType == 'season') {
-      // For seasons, show season detail screen
-      await Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => SeasonDetailScreen(season: widget.item),
-        ),
-      );
-      // Season screen doesn't return a refresh flag, but we can refresh anyway
-      widget.onRefresh?.call(widget.item.ratingKey);
-    } else {
-      // For all other types (shows, movies), show detail screen
-      final result = await Navigator.push<bool>(
-        context,
-        MaterialPageRoute(
-          builder: (context) => MediaDetailScreen(metadata: widget.item),
-        ),
-      );
-      // Refresh parent screen if result indicates it's needed
-      if (result == true) {
-        widget.onRefresh?.call(widget.item.ratingKey);
-      }
-    }
+  /// Get the local poster path for offline mode
+  String? _getLocalPosterPath(BuildContext context) {
+    if (!widget.isOffline) return null;
+    if (widget.item is! PlexMetadata) return null;
+
+    final metadata = widget.item as PlexMetadata;
+    if (metadata.serverId == null) return null;
+
+    final downloadProvider = context.read<DownloadProvider>();
+    final globalKey = '${metadata.serverId}:${metadata.ratingKey}';
+
+    // Get artwork reference and resolve to local path using hash (includes serverId)
+    final artwork = downloadProvider.getArtworkPaths(globalKey);
+    return artwork?.getLocalPath(
+      DownloadStorageService.instance,
+      metadata.serverId!,
+    );
   }
 
   @override
@@ -100,40 +168,65 @@ class _MediaCardState extends State<MediaCard> {
         ? ViewMode.grid
         : settingsProvider.viewMode;
 
+    final semanticLabel = _buildSemanticLabel();
+    final localPosterPath = _getLocalPosterPath(context);
+
+    final cardWidget = viewMode == ViewMode.grid
+        ? _MediaCardGrid(
+            item: widget.item,
+            width: widget.width,
+            height: widget.height,
+            semanticLabel: semanticLabel,
+            onTap: () => _handleTap(context),
+            onLongPress: _showContextMenu,
+            isOffline: widget.isOffline,
+            localPosterPath: localPosterPath,
+          )
+        : _MediaCardList(
+            item: widget.item,
+            semanticLabel: semanticLabel,
+            onTap: () => _handleTap(context),
+            onLongPress: _showContextMenu,
+            density: settingsProvider.libraryDensity,
+            isOffline: widget.isOffline,
+            localPosterPath: localPosterPath,
+          );
+
+    // Use context menu for both PlexMetadata and PlexPlaylist items
     return MediaContextMenu(
-      metadata: widget.item,
+      key: _contextMenuKey,
+      item: widget.item,
       onRefresh: widget.onRefresh,
       onRemoveFromContinueWatching: widget.onRemoveFromContinueWatching,
+      onListRefresh: widget.onListRefresh,
       onTap: () => _handleTap(context),
       isInContinueWatching: widget.isInContinueWatching,
-      child: viewMode == ViewMode.grid
-          ? _MediaCardGrid(
-              item: widget.item,
-              width: widget.width,
-              height: widget.height,
-              onTap: () => _handleTap(context),
-            )
-          : _MediaCardList(
-              item: widget.item,
-              onTap: () => _handleTap(context),
-              density: settingsProvider.libraryDensity,
-            ),
+      collectionId: widget.collectionId,
+      child: cardWidget,
     );
   }
 }
 
 /// Grid layout for media cards
 class _MediaCardGrid extends StatelessWidget {
-  final PlexMetadata item;
+  final dynamic item; // Can be PlexMetadata or PlexPlaylist
   final double? width;
   final double? height;
+  final String semanticLabel;
   final VoidCallback onTap;
+  final VoidCallback onLongPress;
+  final bool isOffline;
+  final String? localPosterPath;
 
   const _MediaCardGrid({
     required this.item,
     this.width,
     this.height,
+    required this.semanticLabel,
     required this.onTap,
+    required this.onLongPress,
+    this.isOffline = false,
+    this.localPosterPath,
   });
 
   @override
@@ -141,10 +234,11 @@ class _MediaCardGrid extends StatelessWidget {
     return SizedBox(
       width: width,
       child: Semantics(
-        label: "media-card-${item.ratingKey}",
-        identifier: "media-card-${item.ratingKey}",
+        label: semanticLabel,
         button: true,
         child: InkWell(
+          canRequestFocus: false, // Keyboard handled by FocusableMediaCard
+          onTap: onTap,
           borderRadius: BorderRadius.circular(8),
           child: Padding(
             padding: const EdgeInsets.all(8),
@@ -167,7 +261,9 @@ class _MediaCardGrid extends StatelessWidget {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     Text(
-                      item.displayTitle,
+                      item is PlexPlaylist
+                          ? (item as PlexPlaylist).title
+                          : (item as PlexMetadata).displayTitle,
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                       style: const TextStyle(
@@ -176,36 +272,15 @@ class _MediaCardGrid extends StatelessWidget {
                         height: 1.1,
                       ),
                     ),
-                    if (item.displaySubtitle != null)
-                      Text(
-                        item.displaySubtitle!,
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          color: tokens(context).textMuted,
-                          fontSize: 11,
-                          height: 1.1,
-                        ),
+                    if (item is PlexPlaylist)
+                      _MediaCardHelpers.buildPlaylistMeta(
+                        context,
+                        item as PlexPlaylist,
                       )
-                    else if (item.parentTitle != null)
-                      Text(
-                        item.parentTitle!,
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          color: tokens(context).textMuted,
-                          fontSize: 11,
-                          height: 1.1,
-                        ),
-                      )
-                    else if (item.year != null)
-                      Text(
-                        '${item.year}',
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          color: tokens(context).textMuted,
-                          fontSize: 11,
-                          height: 1.1,
-                        ),
+                    else if (item is PlexMetadata)
+                      _MediaCardHelpers.buildMetadataSubtitle(
+                        context,
+                        item as PlexMetadata,
                       ),
                   ],
                 ),
@@ -222,63 +297,37 @@ class _MediaCardGrid extends StatelessWidget {
       children: [
         ClipRRect(
           borderRadius: BorderRadius.circular(8),
-          child: _buildPosterImage(context),
+          child: _buildPosterImage(
+            context,
+            item,
+            isOffline: isOffline,
+            localPosterPath: localPosterPath,
+          ),
         ),
         _PosterOverlay(item: item),
       ],
     );
   }
-
-  Widget _buildPosterImage(BuildContext context) {
-    final useSeasonPoster = context.watch<SettingsProvider>().useSeasonPoster;
-    final posterUrl = item.posterThumb(useSeasonPoster: useSeasonPoster);
-    if (posterUrl != null) {
-      return Consumer<PlexClientProvider>(
-        builder: (context, clientProvider, child) {
-          final client = clientProvider.client;
-          if (client == null) {
-            return const SkeletonLoader(
-              child: Center(
-                child: Icon(Icons.movie, size: 40, color: Colors.white54),
-              ),
-            );
-          }
-
-          return CachedNetworkImage(
-            imageUrl: client.getThumbnailUrl(posterUrl),
-            fit: BoxFit.cover,
-            width: double.infinity,
-            height: double.infinity,
-            filterQuality: FilterQuality.medium,
-            fadeInDuration: const Duration(milliseconds: 300),
-            placeholder: (context, url) => const SkeletonLoader(),
-            errorWidget: (context, url, error) => Container(
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
-              child: const Center(child: Icon(Icons.broken_image, size: 40)),
-            ),
-          );
-        },
-      );
-    } else {
-      return const SkeletonLoader(
-        child: Center(
-          child: Icon(Icons.movie, size: 40, color: Colors.white54),
-        ),
-      );
-    }
-  }
 }
 
 /// List layout for media cards
 class _MediaCardList extends StatelessWidget {
-  final PlexMetadata item;
+  final dynamic item; // Can be PlexMetadata or PlexPlaylist
+  final String semanticLabel;
   final VoidCallback onTap;
+  final VoidCallback onLongPress;
   final LibraryDensity density;
+  final bool isOffline;
+  final String? localPosterPath;
 
   const _MediaCardList({
     required this.item,
+    required this.semanticLabel,
     required this.onTap,
+    required this.onLongPress,
     required this.density,
+    this.isOffline = false,
+    this.localPosterPath,
   });
 
   double get _posterWidth {
@@ -330,14 +379,8 @@ class _MediaCardList extends StatelessWidget {
   }
 
   double get _summaryFontSize {
-    switch (density) {
-      case LibraryDensity.compact:
-        return 11;
-      case LibraryDensity.normal:
-        return 12;
-      case LibraryDensity.comfortable:
-        return 13;
-    }
+    // Summary uses the same sizing as metadata text
+    return _metadataFontSize;
   }
 
   int get _summaryMaxLines {
@@ -351,63 +394,88 @@ class _MediaCardList extends StatelessWidget {
     }
   }
 
-  String _formatDuration(int milliseconds) {
-    final duration = Duration(milliseconds: milliseconds);
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-
-    if (hours > 0) {
-      return '${hours}h ${minutes}m';
-    } else {
-      return '${minutes}m';
-    }
-  }
-
   String _buildMetadataLine() {
     final parts = <String>[];
 
-    // Add content rating
-    if (item.contentRating != null && item.contentRating!.isNotEmpty) {
-      final rating = formatContentRating(item.contentRating);
-      if (rating.isNotEmpty) {
-        parts.add(rating);
+    if (item is PlexPlaylist) {
+      final playlist = item as PlexPlaylist;
+      // Add item count
+      if (playlist.leafCount != null && playlist.leafCount! > 0) {
+        parts.add(t.playlists.itemCount(count: playlist.leafCount!));
       }
-    }
 
-    // Add year
-    if (item.year != null) {
-      parts.add('${item.year}');
-    }
+      // Add duration
+      if (playlist.duration != null) {
+        parts.add(formatDurationTextual(playlist.duration!));
+      }
 
-    // Add duration
-    if (item.duration != null) {
-      parts.add(_formatDuration(item.duration!));
-    }
+      // Add smart playlist badge
+      if (playlist.smart) {
+        parts.add(t.playlists.smartPlaylist);
+      }
+    } else if (item is PlexMetadata) {
+      final metadata = item as PlexMetadata;
 
-    // Add user rating
-    if (item.rating != null) {
-      parts.add('${item.rating!.toStringAsFixed(1)}★');
-    }
+      // For collections, show item count
+      if (metadata.mediaType == PlexMediaType.collection) {
+        final count = metadata.childCount ?? metadata.leafCount;
+        if (count != null && count > 0) {
+          parts.add(t.playlists.itemCount(count: count));
+        }
+      } else {
+        // For other media types, show standard metadata
+        // Add content rating
+        if (metadata.contentRating != null &&
+            metadata.contentRating!.isNotEmpty) {
+          final rating = formatContentRating(metadata.contentRating);
+          if (rating.isNotEmpty) {
+            parts.add(rating);
+          }
+        }
 
-    // Add studio
-    if (item.studio != null && item.studio!.isNotEmpty) {
-      parts.add(item.studio!);
+        // Add year
+        if (metadata.year != null) {
+          parts.add('${metadata.year}');
+        }
+
+        // Add duration
+        if (metadata.duration != null) {
+          parts.add(formatDurationTextual(metadata.duration!));
+        }
+
+        // Add user rating
+        if (metadata.rating != null) {
+          parts.add('${metadata.rating!.toStringAsFixed(1)}★');
+        }
+
+        // Add studio
+        if (metadata.studio != null && metadata.studio!.isNotEmpty) {
+          parts.add(metadata.studio!);
+        }
+      }
     }
 
     return parts.join(' • ');
   }
 
   String? _buildSubtitleText() {
-    // For TV episodes, show S#E# format
-    if (item.parentIndex != null && item.index != null) {
-      return 'S${item.parentIndex} E${item.index}';
-    }
+    if (item is PlexPlaylist) {
+      // Playlists don't have subtitles
+      return null;
+    } else if (item is PlexMetadata) {
+      final metadata = item as PlexMetadata;
 
-    // Otherwise use existing subtitle logic
-    if (item.displaySubtitle != null) {
-      return item.displaySubtitle;
-    } else if (item.parentTitle != null) {
-      return item.parentTitle;
+      // For TV episodes, show S#E# format
+      if (metadata.parentIndex != null && metadata.index != null) {
+        return 'S${metadata.parentIndex} E${metadata.index}';
+      }
+
+      // Otherwise use existing subtitle logic
+      if (metadata.displaySubtitle != null) {
+        return metadata.displaySubtitle;
+      } else if (metadata.parentTitle != null) {
+        return metadata.parentTitle;
+      }
     }
 
     // Year is now shown in metadata line, so don't show it here
@@ -420,10 +488,11 @@ class _MediaCardList extends StatelessWidget {
     final subtitle = _buildSubtitleText();
 
     return Semantics(
-      label: "media-card-${item.ratingKey}",
-      identifier: "media-card-${item.ratingKey}",
+      label: semanticLabel,
       button: true,
       child: InkWell(
+        canRequestFocus: false, // Keyboard handled by FocusableMediaCard
+        onTap: onTap,
         borderRadius: BorderRadius.circular(8),
         child: Padding(
           padding: const EdgeInsets.all(8),
@@ -438,7 +507,12 @@ class _MediaCardList extends StatelessWidget {
                   children: [
                     ClipRRect(
                       borderRadius: BorderRadius.circular(8),
-                      child: _buildPosterImage(context),
+                      child: _buildPosterImage(
+                        context,
+                        item,
+                        isOffline: isOffline,
+                        localPosterPath: localPosterPath,
+                      ),
                     ),
                     _PosterOverlay(item: item),
                   ],
@@ -518,59 +592,179 @@ class _MediaCardList extends StatelessWidget {
       ),
     );
   }
+}
 
-  Widget _buildPosterImage(BuildContext context) {
-    final useSeasonPoster = context.watch<SettingsProvider>().useSeasonPoster;
-    final posterUrl = item.posterThumb(useSeasonPoster: useSeasonPoster);
-    if (posterUrl != null) {
-      return Consumer<PlexClientProvider>(
-        builder: (context, clientProvider, child) {
-          final client = clientProvider.client;
-          if (client == null) {
-            return const SkeletonLoader(
-              child: Center(
-                child: Icon(Icons.movie, size: 40, color: Colors.white54),
-              ),
-            );
-          }
+/// Helper to get the correct PlexClient for an item's server
+PlexClient _getClientForItem(BuildContext context, dynamic item) {
+  String? serverId;
 
-          return CachedNetworkImage(
-            imageUrl: client.getThumbnailUrl(posterUrl),
-            fit: BoxFit.cover,
-            width: double.infinity,
-            height: double.infinity,
-            filterQuality: FilterQuality.medium,
-            fadeInDuration: const Duration(milliseconds: 300),
-            placeholder: (context, url) => const SkeletonLoader(),
-            errorWidget: (context, url, error) => Container(
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
-              child: const Center(child: Icon(Icons.broken_image, size: 40)),
-            ),
-          );
-        },
-      );
-    } else {
-      return const SkeletonLoader(
-        child: Center(
-          child: Icon(Icons.movie, size: 40, color: Colors.white54),
-        ),
-      );
-    }
+  if (item is PlexMetadata) {
+    serverId = item.serverId;
+  } else if (item is PlexPlaylist) {
+    serverId = item.serverId;
   }
+
+  // If serverId is null, fall back to first available server
+  if (serverId == null) {
+    final multiServerProvider = Provider.of<MultiServerProvider>(
+      context,
+      listen: false,
+    );
+    if (!multiServerProvider.hasConnectedServers) {
+      throw Exception('No servers available');
+    }
+    serverId = multiServerProvider.onlineServerIds.first;
+  }
+
+  return context.getClientForServer(serverId);
+}
+
+Widget _buildPosterImage(
+  BuildContext context,
+  dynamic item, {
+  bool isOffline = false,
+  String? localPosterPath,
+}) {
+  String? posterUrl;
+  IconData fallbackIcon = Symbols.movie_rounded;
+
+  if (item is PlexPlaylist) {
+    posterUrl = item.displayImage;
+    fallbackIcon = Symbols.playlist_play_rounded;
+
+    return PlexOptimizedImage.playlist(
+      client: isOffline ? null : _getClientForItem(context, item),
+      imagePath: posterUrl,
+      width: double.infinity,
+      height: double.infinity,
+      fit: BoxFit.cover,
+      localFilePath: localPosterPath,
+    );
+  } else if (item is PlexMetadata) {
+    final useSeasonPoster = context.watch<SettingsProvider>().useSeasonPoster;
+    posterUrl = item.posterThumb(useSeasonPoster: useSeasonPoster);
+
+    return PlexOptimizedImage.poster(
+      client: isOffline ? null : _getClientForItem(context, item),
+      imagePath: posterUrl,
+      width: double.infinity,
+      height: double.infinity,
+      fit: BoxFit.cover,
+      localFilePath: localPosterPath,
+    );
+  }
+
+  return SkeletonLoader(
+    child: Center(
+      child: AppIcon(fallbackIcon, fill: 1, size: 40, color: Colors.white54),
+    ),
+  );
 }
 
 /// Overlay widget for poster showing watched indicator and progress bar
 class _PosterOverlay extends StatelessWidget {
-  final PlexMetadata item;
+  final dynamic item; // Can be PlexMetadata or PlexPlaylist
 
   const _PosterOverlay({required this.item});
 
   @override
   Widget build(BuildContext context) {
+    // Only show overlays for PlexMetadata items
+    if (item is! PlexMetadata) {
+      return const SizedBox.shrink();
+    }
+
+    return _MediaCardHelpers.buildWatchProgress(context, item as PlexMetadata);
+  }
+}
+
+/// Helper methods for building media card metadata and subtitles
+class _MediaCardHelpers {
+  /// Builds playlist metadata (item count)
+  static Widget buildPlaylistMeta(BuildContext context, PlexPlaylist playlist) {
+    if (playlist.leafCount != null && playlist.leafCount! > 0) {
+      return Text(
+        t.playlists.itemCount(count: playlist.leafCount!),
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+          color: tokens(context).textMuted,
+          fontSize: 11,
+          height: 1.1,
+        ),
+      );
+    }
+    return const SizedBox.shrink();
+  }
+
+  /// Builds metadata subtitle (for collections, episodes, movies, shows)
+  static Widget buildMetadataSubtitle(
+    BuildContext context,
+    PlexMetadata metadata,
+  ) {
+    // For collections, show item count
+    if (metadata.mediaType == PlexMediaType.collection) {
+      final count = metadata.childCount ?? metadata.leafCount;
+      if (count != null && count > 0) {
+        return Text(
+          t.playlists.itemCount(count: count),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: Theme.of(context).textTheme.bodySmall?.copyWith(
+            color: tokens(context).textMuted,
+            fontSize: 11,
+            height: 1.1,
+          ),
+        );
+      }
+    }
+
+    // For other media types, show subtitle/parent/year
+    if (metadata.displaySubtitle != null) {
+      return Text(
+        metadata.displaySubtitle!,
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+          color: tokens(context).textMuted,
+          fontSize: 11,
+          height: 1.1,
+        ),
+      );
+    } else if (metadata.parentTitle != null) {
+      return Text(
+        metadata.parentTitle!,
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+          color: tokens(context).textMuted,
+          fontSize: 11,
+          height: 1.1,
+        ),
+      );
+    } else if (metadata.year != null) {
+      return Text(
+        '${metadata.year}',
+        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+          color: tokens(context).textMuted,
+          fontSize: 11,
+          height: 1.1,
+        ),
+      );
+    }
+
+    return const SizedBox.shrink();
+  }
+
+  /// Builds watch progress overlay (checkmark for watched, progress bar for in-progress)
+  static Widget buildWatchProgress(
+    BuildContext context,
+    PlexMetadata metadata,
+  ) {
     return Stack(
       children: [
         // Watched indicator (checkmark)
-        if (item.isWatched)
+        if (metadata.isWatched)
           Positioned(
             top: 4,
             right: 4,
@@ -586,14 +780,19 @@ class _PosterOverlay extends StatelessWidget {
                   ),
                 ],
               ),
-              child: Icon(Icons.check, color: tokens(context).bg, size: 16),
+              child: AppIcon(
+                Symbols.check_rounded,
+                fill: 1,
+                color: tokens(context).bg,
+                size: 16,
+              ),
             ),
           ),
-        // Progress bar for partially watched content
-        if (item.viewOffset != null &&
-            item.duration != null &&
-            item.viewOffset! > 0 &&
-            !item.isWatched)
+        // Progress bar for partially watched content (episodes/movies)
+        if (metadata.viewOffset != null &&
+            metadata.duration != null &&
+            metadata.viewOffset! > 0 &&
+            !metadata.isWatched)
           Positioned(
             bottom: 0,
             left: 0,
@@ -604,7 +803,33 @@ class _PosterOverlay extends StatelessWidget {
                 bottomRight: Radius.circular(8),
               ),
               child: LinearProgressIndicator(
-                value: item.viewOffset! / item.duration!,
+                value: metadata.viewOffset! / metadata.duration!,
+                backgroundColor: tokens(context).outline,
+                valueColor: AlwaysStoppedAnimation<Color>(
+                  Theme.of(context).colorScheme.primary,
+                ),
+                minHeight: 4,
+              ),
+            ),
+          ),
+        // Progress bar for seasons (viewedLeafCount / leafCount)
+        if (metadata.type == 'season' &&
+            metadata.viewedLeafCount != null &&
+            metadata.leafCount != null &&
+            metadata.leafCount! > 0 &&
+            metadata.viewedLeafCount! > 0 &&
+            metadata.viewedLeafCount! < metadata.leafCount!)
+          Positioned(
+            bottom: 0,
+            left: 0,
+            right: 0,
+            child: ClipRRect(
+              borderRadius: const BorderRadius.only(
+                bottomLeft: Radius.circular(8),
+                bottomRight: Radius.circular(8),
+              ),
+              child: LinearProgressIndicator(
+                value: metadata.viewedLeafCount! / metadata.leafCount!,
                 backgroundColor: tokens(context).outline,
                 valueColor: AlwaysStoppedAnimation<Color>(
                   Theme.of(context).colorScheme.primary,
diff --git a/lib/widgets/media_context_menu.dart b/lib/widgets/media_context_menu.dart
index a186469d..66bdaee8 100644
--- a/lib/widgets/media_context_menu.dart
+++ b/lib/widgets/media_context_menu.dart
@@ -1,11 +1,25 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import '../services/plex_client.dart';
+import '../services/play_queue_launcher.dart';
 import '../models/plex_metadata.dart';
+import '../models/plex_playlist.dart';
+import '../providers/multi_server_provider.dart';
+import '../providers/download_provider.dart';
+import '../providers/offline_mode_provider.dart';
+import '../providers/offline_watch_provider.dart';
 import '../utils/provider_extensions.dart';
+import '../utils/app_logger.dart';
+import '../utils/library_refresh_notifier.dart';
 import '../screens/media_detail_screen.dart';
 import '../screens/season_detail_screen.dart';
+import '../utils/smart_deletion_handler.dart';
 import '../widgets/file_info_bottom_sheet.dart';
-import '../utils/shuffle_play_helper.dart';
+import '../widgets/focusable_bottom_sheet.dart';
+import '../widgets/focusable_list_tile.dart';
 import '../i18n/strings.g.dart';
 
 /// Helper class to store menu action data
@@ -20,44 +34,112 @@ class _MenuAction {
 /// A reusable wrapper widget that adds a context menu (long press / right click)
 /// to any media item with appropriate actions based on the item type.
 class MediaContextMenu extends StatefulWidget {
-  final PlexMetadata metadata;
+  final dynamic item; // Can be PlexMetadata or PlexPlaylist
   final void Function(String ratingKey)? onRefresh;
   final VoidCallback? onRemoveFromContinueWatching;
+  final VoidCallback? onListRefresh; // For refreshing list after deletion
   final VoidCallback? onTap;
   final Widget child;
   final bool isInContinueWatching;
+  final String?
+  collectionId; // The collection ID if displaying within a collection
 
   const MediaContextMenu({
     super.key,
-    required this.metadata,
+    required this.item,
     this.onRefresh,
     this.onRemoveFromContinueWatching,
+    this.onListRefresh,
     this.onTap,
     required this.child,
     this.isInContinueWatching = false,
+    this.collectionId,
   });
 
   @override
-  State<MediaContextMenu> createState() => _MediaContextMenuState();
+  State<MediaContextMenu> createState() => MediaContextMenuState();
 }
 
-class _MediaContextMenuState extends State<MediaContextMenu> {
+class MediaContextMenuState extends State<MediaContextMenu> {
   Offset? _tapPosition;
 
   void _storeTapPosition(TapDownDetails details) {
     _tapPosition = details.globalPosition;
   }
 
+  bool _openedFromKeyboard = false;
+  bool _isContextMenuOpen = false;
+
+  bool get isContextMenuOpen => _isContextMenuOpen;
+
+  /// Show the context menu programmatically.
+  /// Used for keyboard/gamepad long-press activation.
+  /// If [position] is null, the menu will appear at the center of this widget.
+  void showContextMenu(BuildContext menuContext, {Offset? position}) {
+    _openedFromKeyboard = true;
+    if (position != null) {
+      _tapPosition = position;
+    } else {
+      // Calculate center of the widget for keyboard activation
+      final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
+      if (renderBox != null) {
+        final size = renderBox.size;
+        final topLeft = renderBox.localToGlobal(Offset.zero);
+        _tapPosition = Offset(
+          topLeft.dx + size.width / 2,
+          topLeft.dy + size.height / 2,
+        );
+      }
+    }
+    _showContextMenu(menuContext);
+  }
+
+  /// Get the correct PlexClient for this item's server
+  PlexClient _getClientForItem() {
+    String? serverId;
+
+    // Get serverId from the item (could be PlexMetadata or PlexPlaylist)
+    if (widget.item is PlexMetadata) {
+      serverId = (widget.item as PlexMetadata).serverId;
+    } else if (widget.item is PlexPlaylist) {
+      serverId = (widget.item as PlexPlaylist).serverId;
+    }
+
+    // If serverId is null, fall back to first available server
+    if (serverId == null) {
+      final multiServerProvider = Provider.of<MultiServerProvider>(
+        context,
+        listen: false,
+      );
+      if (!multiServerProvider.hasConnectedServers) {
+        throw Exception('No servers available');
+      }
+      serverId = multiServerProvider.onlineServerIds.first;
+    }
+
+    return context.getClientForServer(serverId);
+  }
+
+  void _handleTap() {
+    if (_isContextMenuOpen) return;
+    widget.onTap?.call();
+  }
+
   void _showContextMenu(BuildContext context) async {
-    final client = context.client;
-    if (client == null) return;
+    if (_isContextMenuOpen) return;
+    _isContextMenuOpen = true;
+
+    final isPlaylist = widget.item is PlexPlaylist;
+    final metadata = isPlaylist ? null : widget.item as PlexMetadata;
+    final mediaType = isPlaylist ? null : metadata!.mediaType;
+    final isCollection = mediaType == PlexMediaType.collection;
 
-    final itemType = widget.metadata.type.toLowerCase();
     final isPartiallyWatched =
-        widget.metadata.viewedLeafCount != null &&
-        widget.metadata.leafCount != null &&
-        widget.metadata.viewedLeafCount! > 0 &&
-        widget.metadata.viewedLeafCount! < widget.metadata.leafCount!;
+        !isPlaylist &&
+        metadata!.viewedLeafCount != null &&
+        metadata.leafCount != null &&
+        metadata.viewedLeafCount! > 0 &&
+        metadata.viewedLeafCount! < widget.item.leafCount!;
 
     // Check if we should use bottom sheet (on iOS and Android)
     final useBottomSheet = Platform.isIOS || Platform.isAndroid;
@@ -65,131 +147,196 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
     // Build menu actions
     final menuActions = <_MenuAction>[];
 
-    // Mark as Watched
-    if (!widget.metadata.isWatched || isPartiallyWatched) {
+    // Special actions for collections and playlists
+    if (isCollection || isPlaylist) {
+      // Play
       menuActions.add(
         _MenuAction(
-          value: 'watch',
-          icon: Icons.check_circle_outline,
-          label: t.mediaMenu.markAsWatched,
+          value: 'play',
+          icon: Symbols.play_arrow_rounded,
+          label: t.discover.play,
         ),
       );
-    }
 
-    // Mark as Unwatched
-    if (widget.metadata.isWatched || isPartiallyWatched) {
+      // Shuffle
       menuActions.add(
         _MenuAction(
-          value: 'unwatch',
-          icon: Icons.remove_circle_outline,
-          label: t.mediaMenu.markAsUnwatched,
-        ),
-      );
-    }
-
-    // Remove from Continue Watching (only in continue watching section)
-    if (widget.isInContinueWatching) {
-      menuActions.add(
-        _MenuAction(
-          value: 'remove_from_continue_watching',
-          icon: Icons.close,
-          label: t.mediaMenu.removeFromContinueWatching,
-        ),
-      );
-    }
-
-    // Go to Series (for episodes and seasons)
-    if ((itemType == 'episode' || itemType == 'season') &&
-        widget.metadata.grandparentTitle != null) {
-      menuActions.add(
-        _MenuAction(
-          value: 'series',
-          icon: Icons.tv,
-          label: t.mediaMenu.goToSeries,
-        ),
-      );
-    }
-
-    // Go to Season (for episodes)
-    if (itemType == 'episode' && widget.metadata.parentTitle != null) {
-      menuActions.add(
-        _MenuAction(
-          value: 'season',
-          icon: Icons.playlist_play,
-          label: t.mediaMenu.goToSeason,
-        ),
-      );
-    }
-
-    // Shuffle Play (for shows and seasons)
-    if (itemType == 'show' || itemType == 'season') {
-      menuActions.add(
-        _MenuAction(
-          value: 'shuffle_play',
-          icon: Icons.shuffle,
+          value: 'shuffle',
+          icon: Symbols.shuffle_rounded,
           label: t.mediaMenu.shufflePlay,
         ),
       );
-    }
 
-    // File Info (for episodes and movies)
-    if (itemType == 'episode' || itemType == 'movie') {
+      // Delete
       menuActions.add(
         _MenuAction(
-          value: 'fileinfo',
-          icon: Icons.info_outline,
-          label: t.mediaMenu.fileInfo,
+          value: 'delete',
+          icon: Symbols.delete_rounded,
+          label: t.common.delete,
         ),
       );
-    }
+
+      // Skip other menu items for collections and playlists
+    } else {
+      // Regular menu items for other types
+
+      // Mark as Watched
+      if (!metadata!.isWatched || isPartiallyWatched) {
+        menuActions.add(
+          _MenuAction(
+            value: 'watch',
+            icon: Symbols.check_circle_outline_rounded,
+            label: t.mediaMenu.markAsWatched,
+          ),
+        );
+      }
+
+      // Mark as Unwatched
+      if (metadata.isWatched || isPartiallyWatched) {
+        menuActions.add(
+          _MenuAction(
+            value: 'unwatch',
+            icon: Symbols.remove_circle_outline_rounded,
+            label: t.mediaMenu.markAsUnwatched,
+          ),
+        );
+      }
+
+      // Remove from Continue Watching (only in continue watching section)
+      if (widget.isInContinueWatching) {
+        menuActions.add(
+          _MenuAction(
+            value: 'remove_from_continue_watching',
+            icon: Symbols.close_rounded,
+            label: t.mediaMenu.removeFromContinueWatching,
+          ),
+        );
+      }
+
+      // Remove from Collection (only when viewing items within a collection)
+      if (widget.collectionId != null) {
+        menuActions.add(
+          _MenuAction(
+            value: 'remove_from_collection',
+            icon: Symbols.delete_outline_rounded,
+            label: t.collections.removeFromCollection,
+          ),
+        );
+      }
+
+      // Go to Series (for episodes and seasons)
+      if ((mediaType == PlexMediaType.episode ||
+              mediaType == PlexMediaType.season) &&
+          metadata.grandparentTitle != null) {
+        menuActions.add(
+          _MenuAction(
+            value: 'series',
+            icon: Symbols.tv_rounded,
+            label: t.mediaMenu.goToSeries,
+          ),
+        );
+      }
+
+      // Go to Season (for episodes)
+      if (mediaType == PlexMediaType.episode && metadata.parentTitle != null) {
+        menuActions.add(
+          _MenuAction(
+            value: 'season',
+            icon: Symbols.playlist_play_rounded,
+            label: t.mediaMenu.goToSeason,
+          ),
+        );
+      }
+
+      // Shuffle Play (for shows and seasons)
+      if (mediaType == PlexMediaType.show ||
+          mediaType == PlexMediaType.season) {
+        menuActions.add(
+          _MenuAction(
+            value: 'shuffle_play',
+            icon: Symbols.shuffle_rounded,
+            label: t.mediaMenu.shufflePlay,
+          ),
+        );
+      }
+
+      // File Info (for episodes and movies)
+      if (mediaType == PlexMediaType.episode ||
+          mediaType == PlexMediaType.movie) {
+        menuActions.add(
+          _MenuAction(
+            value: 'fileinfo',
+            icon: Symbols.info_rounded,
+            label: t.mediaMenu.fileInfo,
+          ),
+        );
+      }
+
+      // Download options (for episodes, movies, shows, and seasons)
+      if (mediaType == PlexMediaType.episode ||
+          mediaType == PlexMediaType.movie ||
+          mediaType == PlexMediaType.show ||
+          mediaType == PlexMediaType.season) {
+        final downloadProvider = Provider.of<DownloadProvider>(
+          context,
+          listen: false,
+        );
+        final globalKey = '${metadata.serverId}:${metadata.ratingKey}';
+        final isDownloaded = downloadProvider.isDownloaded(globalKey);
+
+        if (isDownloaded) {
+          // Show delete download option
+          menuActions.add(
+            _MenuAction(
+              value: 'delete_download',
+              icon: Symbols.delete_rounded,
+              label: t.downloads.deleteDownload,
+            ),
+          );
+        } else {
+          // Show download option
+          menuActions.add(
+            _MenuAction(
+              value: 'download',
+              icon: Symbols.download_rounded,
+              label: t.downloads.downloadNow,
+            ),
+          );
+        }
+      }
+
+      // Add to... (for episodes, movies, shows, and seasons)
+      if (mediaType == PlexMediaType.episode ||
+          mediaType == PlexMediaType.movie ||
+          mediaType == PlexMediaType.show ||
+          mediaType == PlexMediaType.season) {
+        menuActions.add(
+          _MenuAction(
+            value: 'add_to',
+            icon: Symbols.add_rounded,
+            label: t.common.addTo,
+          ),
+        );
+      }
+    } // End of regular menu items else block
 
     String? selected;
 
+    final openedFromKeyboard = _openedFromKeyboard;
+    _openedFromKeyboard = false;
+
     if (useBottomSheet) {
       // Show bottom sheet on mobile
       selected = await showModalBottomSheet<String>(
         context: context,
-        builder: (context) => SafeArea(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Padding(
-                padding: const EdgeInsets.all(16.0),
-                child: Text(
-                  widget.metadata.title,
-                  style: Theme.of(context).textTheme.titleMedium,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ),
-              ...menuActions.map(
-                (action) => ListTile(
-                  leading: Icon(action.icon),
-                  title: Text(action.label),
-                  onTap: () => Navigator.pop(context, action.value),
-                ),
-              ),
-            ],
-          ),
+        builder: (context) => _FocusableContextMenuSheet(
+          title: widget.item.title,
+          actions: menuActions,
+          focusFirstItem: openedFromKeyboard,
         ),
       );
     } else {
-      // Show popup menu on larger screens
-      final menuItems = menuActions
-          .map(
-            (action) => PopupMenuItem(
-              value: action.value,
-              child: Row(
-                children: [
-                  Icon(action.icon),
-                  const SizedBox(width: 12),
-                  Expanded(child: Text(action.label)),
-                ],
-              ),
-            ),
-          )
-          .toList();
-
+      // Show custom focusable popup menu on larger screens
       // Use stored tap position or fallback to widget position
       final RenderBox? overlay =
           Overlay.of(context).context.findRenderObject() as RenderBox?;
@@ -202,103 +349,157 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
         position = renderBox.localToGlobal(Offset.zero, ancestor: overlay);
       }
 
-      // Calculate position for menu using RelativeRect
-      final overlayRect = RelativeRect.fromLTRB(
-        position.dx,
-        position.dy,
-        position.dx + 1,
-        position.dy + 1,
-      );
-
-      // Use showMenu with fast animations via PopupMenuTheme
-      selected = await showMenu<String>(
+      selected = await showDialog<String>(
         context: context,
-        position: overlayRect,
-        items: menuItems,
-        elevation: 8,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-        menuPadding: EdgeInsets.zero,
-        // Override animation duration for faster animations
-        popUpAnimationStyle: AnimationStyle(
-          duration: const Duration(milliseconds: 150),
-          curve: Curves.easeOutCubic,
-          reverseCurve: Curves.easeIn,
+        barrierColor: Colors.transparent,
+        builder: (dialogContext) => _FocusablePopupMenu(
+          actions: menuActions,
+          position: position,
+          focusFirstItem: openedFromKeyboard,
         ),
       );
     }
 
-    if (!context.mounted) return;
+    try {
+      final client = _getClientForItem();
 
-    switch (selected) {
-      case 'watch':
-        await _executeAction(
-          context,
-          () => client.markAsWatched(widget.metadata.ratingKey),
-          t.messages.markedAsWatched,
-        );
-        break;
+      if (!context.mounted) return;
 
-      case 'unwatch':
-        await _executeAction(
-          context,
-          () => client.markAsUnwatched(widget.metadata.ratingKey),
-          t.messages.markedAsUnwatched,
-        );
-        break;
+      // Check if we're in offline mode for watch actions
+      final offlineModeProvider = context.read<OfflineModeProvider>();
+      final isOffline = offlineModeProvider.isOffline;
 
-      case 'remove_from_continue_watching':
-        // Remove from Continue Watching without affecting watch status or progress
-        // This preserves the progression for partially watched items
-        // and doesn't mark unwatched next episodes as watched
-        try {
-          await client.removeFromOnDeck(widget.metadata.ratingKey);
-          if (context.mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(content: Text(t.messages.removedFromContinueWatching)),
+      switch (selected) {
+        case 'watch':
+          if (isOffline && metadata?.serverId != null) {
+            // Offline mode: queue action for later sync
+            final offlineWatch = context.read<OfflineWatchProvider>();
+            await offlineWatch.markAsWatched(
+              serverId: metadata!.serverId!,
+              ratingKey: metadata.ratingKey,
             );
-            // Use specific callback if provided, otherwise fallback to onRefresh
-            if (widget.onRemoveFromContinueWatching != null) {
-              widget.onRemoveFromContinueWatching!();
-            } else {
-              widget.onRefresh?.call(widget.metadata.ratingKey);
+            if (context.mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text(t.messages.markedAsWatchedOffline)),
+              );
+              widget.onRefresh?.call(metadata.ratingKey);
+            }
+          } else {
+            await _executeAction(
+              context,
+              () => client.markAsWatched(metadata!.ratingKey),
+              t.messages.markedAsWatched,
+            );
+          }
+          break;
+
+        case 'unwatch':
+          if (isOffline && metadata?.serverId != null) {
+            // Offline mode: queue action for later sync
+            final offlineWatch = context.read<OfflineWatchProvider>();
+            await offlineWatch.markAsUnwatched(
+              serverId: metadata!.serverId!,
+              ratingKey: metadata.ratingKey,
+            );
+            if (context.mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text(t.messages.markedAsUnwatchedOffline)),
+              );
+              widget.onRefresh?.call(metadata.ratingKey);
+            }
+          } else {
+            await _executeAction(
+              context,
+              () => client.markAsUnwatched(metadata!.ratingKey),
+              t.messages.markedAsUnwatched,
+            );
+          }
+          break;
+
+        case 'remove_from_continue_watching':
+          // Remove from Continue Watching without affecting watch status or progress
+          // This preserves the progression for partially watched items
+          // and doesn't mark unwatched next episodes as watched
+          try {
+            await client.removeFromOnDeck(metadata!.ratingKey);
+            if (context.mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text(t.messages.removedFromContinueWatching)),
+              );
+              // Use specific callback if provided, otherwise fallback to onRefresh
+              if (widget.onRemoveFromContinueWatching != null) {
+                widget.onRemoveFromContinueWatching!();
+              } else {
+                widget.onRefresh?.call(metadata.ratingKey);
+              }
+            }
+          } catch (e) {
+            if (context.mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(t.messages.errorLoading(error: e.toString())),
+                ),
+              );
             }
           }
-        } catch (e) {
-          if (context.mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text(t.messages.errorLoading(error: e.toString())),
-              ),
-            );
-          }
-        }
-        break;
+          break;
 
-      case 'series':
-        await _navigateToRelated(
-          context,
-          widget.metadata.grandparentRatingKey,
-          (metadata) => MediaDetailScreen(metadata: metadata),
-          t.messages.errorLoadingSeries,
-        );
-        break;
+        case 'remove_from_collection':
+          await _handleRemoveFromCollection(context, metadata!);
+          break;
 
-      case 'season':
-        await _navigateToRelated(
-          context,
-          widget.metadata.parentRatingKey,
-          (metadata) => SeasonDetailScreen(season: metadata),
-          t.messages.errorLoadingSeason,
-        );
-        break;
+        case 'series':
+          await _navigateToRelated(
+            context,
+            metadata!.grandparentRatingKey,
+            (metadata) => MediaDetailScreen(metadata: metadata),
+            t.messages.errorLoadingSeries,
+          );
+          break;
 
-      case 'fileinfo':
-        await _showFileInfo(context);
-        break;
+        case 'season':
+          await _navigateToRelated(
+            context,
+            metadata!.parentRatingKey,
+            (metadata) => SeasonDetailScreen(season: metadata),
+            t.messages.errorLoadingSeason,
+          );
+          break;
 
-      case 'shuffle_play':
-        await handleShufflePlay(context, widget.metadata);
-        break;
+        case 'fileinfo':
+          await _showFileInfo(context);
+          break;
+
+        case 'add_to':
+          await _showAddToSubmenu(context);
+          break;
+
+        case 'shuffle_play':
+          await _handleShufflePlayWithQueue(context);
+          break;
+
+        case 'play':
+          await _handlePlay(context, isCollection, isPlaylist);
+          break;
+
+        case 'shuffle':
+          await _handleShuffle(context, isCollection, isPlaylist);
+          break;
+
+        case 'delete':
+          await _handleDelete(context, isCollection, isPlaylist);
+          break;
+
+        case 'download':
+          await _handleDownload(context);
+          break;
+
+        case 'delete_download':
+          await _handleDeleteDownload(context);
+          break;
+      }
+    } finally {
+      _isContextMenuOpen = false;
     }
   }
 
@@ -314,7 +515,7 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
         ScaffoldMessenger.of(
           context,
         ).showSnackBar(SnackBar(content: Text(successMessage)));
-        widget.onRefresh?.call(widget.metadata.ratingKey);
+        widget.onRefresh?.call(widget.item.ratingKey);
       }
     } catch (e) {
       if (context.mounted) {
@@ -334,18 +535,16 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
   ) async {
     if (ratingKey == null) return;
 
-    final clientProvider = context.plexClient;
-    final client = clientProvider.client;
-    if (client == null) return;
+    final client = _getClientForItem();
 
     try {
-      final metadata = await client.getMetadata(ratingKey);
+      final metadata = await client.getMetadataWithImages(ratingKey);
       if (metadata != null && context.mounted) {
         await Navigator.push(
           context,
           MaterialPageRoute(builder: (context) => screenBuilder(metadata)),
         );
-        widget.onRefresh?.call(widget.metadata.ratingKey);
+        widget.onRefresh?.call(widget.item.ratingKey);
       }
     } catch (e) {
       if (context.mounted) {
@@ -358,8 +557,7 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
 
   /// Show file info bottom sheet
   Future<void> _showFileInfo(BuildContext context) async {
-    final client = context.client;
-    if (client == null) return;
+    final client = _getClientForItem();
 
     try {
       // Show loading indicator
@@ -373,7 +571,8 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
       }
 
       // Fetch file info
-      final fileInfo = await client.getFileInfo(widget.metadata.ratingKey);
+      final metadata = widget.item as PlexMetadata;
+      final fileInfo = await client.getFileInfo(metadata.ratingKey);
 
       // Close loading indicator
       if (context.mounted) {
@@ -386,10 +585,8 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
           context: context,
           isScrollControlled: true,
           backgroundColor: Colors.transparent,
-          builder: (context) => FileInfoBottomSheet(
-            fileInfo: fileInfo,
-            title: widget.metadata.title,
-          ),
+          builder: (context) =>
+              FileInfoBottomSheet(fileInfo: fileInfo, title: metadata.title),
         );
       } else if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
@@ -412,10 +609,743 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
     }
   }
 
+  /// Handle shuffle play using play queues
+  Future<void> _handleShufflePlayWithQueue(BuildContext context) async {
+    final client = _getClientForItem();
+    final metadata = widget.item as PlexMetadata;
+
+    final launcher = PlayQueueLauncher(
+      context: context,
+      client: client,
+      serverId: metadata.serverId,
+      serverName: metadata.serverName,
+    );
+
+    await launcher.launchShuffledShow(
+      metadata: metadata,
+      showLoadingIndicator: true,
+    );
+  }
+
+  /// Show submenu for Add to... (Playlist or Collection)
+  Future<void> _showAddToSubmenu(BuildContext context) async {
+    final useBottomSheet = Platform.isIOS || Platform.isAndroid;
+
+    final submenuActions = [
+      _MenuAction(
+        value: 'playlist',
+        icon: Symbols.playlist_play_rounded,
+        label: t.playlists.playlist,
+      ),
+      _MenuAction(
+        value: 'collection',
+        icon: Symbols.collections_rounded,
+        label: t.collections.collection,
+      ),
+    ];
+
+    String? selected;
+
+    if (useBottomSheet) {
+      // Show bottom sheet on mobile
+      selected = await showModalBottomSheet<String>(
+        context: context,
+        builder: (context) => SafeArea(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Padding(
+                padding: const EdgeInsets.all(16),
+                child: Text(
+                  t.common.addTo,
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
+              ),
+              ...submenuActions.map((action) {
+                return ListTile(
+                  leading: AppIcon(action.icon, fill: 1),
+                  title: Text(action.label),
+                  onTap: () => Navigator.pop(context, action.value),
+                );
+              }),
+              const SizedBox(height: 8),
+            ],
+          ),
+        ),
+      );
+    } else {
+      // Show popup menu on desktop
+      selected = await showMenu<String>(
+        context: context,
+        position: RelativeRect.fromLTRB(
+          _tapPosition?.dx ?? 0,
+          _tapPosition?.dy ?? 0,
+          _tapPosition?.dx ?? 0,
+          _tapPosition?.dy ?? 0,
+        ),
+        items: submenuActions.map((action) {
+          return PopupMenuItem<String>(
+            value: action.value,
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                AppIcon(action.icon, fill: 1, size: 20),
+                const SizedBox(width: 12),
+                Text(action.label),
+              ],
+            ),
+          );
+        }).toList(),
+      );
+    }
+
+    // Handle the submenu selection
+    if (selected == 'playlist' && context.mounted) {
+      await _showAddToPlaylistDialog(context);
+    } else if (selected == 'collection' && context.mounted) {
+      await _showAddToCollectionDialog(context);
+    }
+  }
+
+  /// Show dialog to select playlist and add item
+  Future<void> _showAddToPlaylistDialog(BuildContext context) async {
+    final client = _getClientForItem();
+
+    try {
+      final metadata = widget.item as PlexMetadata;
+      final itemType = metadata.type.toLowerCase();
+
+      // Load playlists
+      final playlists = await client.getPlaylists(playlistType: 'video');
+
+      if (!context.mounted) return;
+
+      // Show dialog to select playlist or create new
+      final result = await showDialog<String>(
+        context: context,
+        builder: (context) => _PlaylistSelectionDialog(playlists: playlists),
+      );
+
+      if (result == null || !context.mounted) return;
+
+      // Build URI for the item (works for all types: movies, episodes, seasons, shows)
+      // For seasons/shows, the Plex API should automatically expand to include all episodes
+      final itemUri = await client.buildMetadataUri(metadata.ratingKey);
+      appLogger.d('Built URI for $itemType: $itemUri');
+
+      if (!context.mounted) return;
+
+      if (result == '_create_new') {
+        // Create new playlist flow
+        final playlistName = await showDialog<String>(
+          context: context,
+          builder: (context) => _CreatePlaylistDialog(),
+        );
+
+        if (playlistName == null || playlistName.isEmpty || !context.mounted) {
+          return;
+        }
+
+        // Create playlist with the item(s)
+        appLogger.d(
+          'Creating playlist "$playlistName" with URI length: ${itemUri.length}',
+        );
+        final newPlaylist = await client.createPlaylist(
+          title: playlistName,
+          uri: itemUri,
+        );
+
+        if (!context.mounted) return;
+
+        if (context.mounted) {
+          if (newPlaylist != null) {
+            appLogger.d('Successfully created playlist: ${newPlaylist.title}');
+            ScaffoldMessenger.of(
+              context,
+            ).showSnackBar(SnackBar(content: Text(t.playlists.created)));
+            // Trigger refresh of playlists tab
+            LibraryRefreshNotifier().notifyPlaylistsChanged();
+          } else {
+            appLogger.e('Failed to create playlist - API returned null');
+            ScaffoldMessenger.of(
+              context,
+            ).showSnackBar(SnackBar(content: Text(t.playlists.errorCreating)));
+          }
+        }
+      } else {
+        // Add to existing playlist
+        appLogger.d('Adding to playlist $result with URI: $itemUri');
+        final success = await client.addToPlaylist(
+          playlistId: result,
+          uri: itemUri,
+        );
+
+        if (!context.mounted) return;
+
+        if (context.mounted) {
+          if (success) {
+            appLogger.d('Successfully added item(s) to playlist $result');
+            ScaffoldMessenger.of(
+              context,
+            ).showSnackBar(SnackBar(content: Text(t.playlists.itemAdded)));
+            // Trigger refresh of playlists tab
+            LibraryRefreshNotifier().notifyPlaylistsChanged();
+          } else {
+            appLogger.e(
+              'Failed to add item(s) to playlist $result - API returned false',
+            );
+            ScaffoldMessenger.of(
+              context,
+            ).showSnackBar(SnackBar(content: Text(t.playlists.errorAdding)));
+          }
+        }
+      }
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Error in add to playlist flow',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('${t.playlists.errorLoading}: ${e.toString()}'),
+            duration: const Duration(seconds: 5),
+          ),
+        );
+      }
+    }
+  }
+
+  /// Show dialog to select collection and add item
+  Future<void> _showAddToCollectionDialog(BuildContext context) async {
+    final client = _getClientForItem();
+
+    try {
+      final metadata = widget.item as PlexMetadata;
+      final itemType = metadata.type.toLowerCase();
+
+      // Get the library section ID from the item
+      // First try from the metadata itself
+      int? sectionId = metadata.librarySectionID;
+      appLogger.d('Attempting to get section ID for ${metadata.title}');
+      appLogger.d('  - librarySectionID: $sectionId');
+      appLogger.d('  - key: ${metadata.key}');
+
+      // If not available, fetch the full metadata which should include the section ID
+      if (sectionId == null) {
+        try {
+          appLogger.d('  - Fetching full metadata for: ${metadata.ratingKey}');
+          final fullMetadata = await client.getMetadataWithImages(
+            metadata.ratingKey,
+          );
+          if (fullMetadata != null) {
+            sectionId = fullMetadata.librarySectionID;
+            appLogger.d('  - Section ID from full metadata: $sectionId');
+          }
+        } catch (e) {
+          appLogger.w('Failed to get full metadata for section ID: $e');
+        }
+      }
+
+      // If still not found, try to extract from the key field
+      if (sectionId == null) {
+        final keyMatch = RegExp(
+          r'/library/sections/(\d+)',
+        ).firstMatch(metadata.key);
+        if (keyMatch != null) {
+          sectionId = int.tryParse(keyMatch.group(1)!);
+          appLogger.d('  - Extracted from key: $sectionId');
+        }
+      }
+
+      // Last resort: try to get it from the item's parent (for episodes/seasons)
+      if (sectionId == null && metadata.grandparentRatingKey != null) {
+        try {
+          appLogger.d(
+            '  - Trying to get from parent: ${metadata.grandparentRatingKey}',
+          );
+          final parentMeta = await client.getMetadataWithImages(
+            metadata.grandparentRatingKey!,
+          );
+          sectionId = parentMeta?.librarySectionID;
+          appLogger.d('  - Parent sectionId: $sectionId');
+        } catch (e) {
+          appLogger.w('Failed to get parent metadata for section ID: $e');
+        }
+      }
+
+      appLogger.d('  - Final sectionId: $sectionId');
+
+      if (sectionId == null) {
+        if (context.mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(
+              content: Text(
+                'Unable to determine library section for this item',
+              ),
+            ),
+          );
+        }
+        return;
+      }
+
+      // Load collections for this library section
+      final collections = await client.getLibraryCollections(
+        sectionId.toString(),
+      );
+
+      if (!context.mounted) return;
+
+      // Show dialog to select collection or create new
+      final result = await showDialog<String>(
+        context: context,
+        builder: (context) =>
+            _CollectionSelectionDialog(collections: collections),
+      );
+
+      if (result == null || !context.mounted) return;
+
+      // Build URI for the item
+      final itemUri = await client.buildMetadataUri(metadata.ratingKey);
+      appLogger.d('Built URI for $itemType: $itemUri');
+
+      if (!context.mounted) return;
+
+      if (result == '_create_new') {
+        // Create new collection flow
+        final collectionName = await showDialog<String>(
+          context: context,
+          builder: (context) => _CreateCollectionDialog(),
+        );
+
+        if (collectionName == null ||
+            collectionName.isEmpty ||
+            !context.mounted) {
+          return;
+        }
+
+        // Create collection first (without items)
+        // Determine the collection type based on the item type
+        int? collectionType;
+        switch (itemType) {
+          case 'movie':
+            collectionType = 1;
+            break;
+          case 'show':
+            collectionType = 2;
+            break;
+          case 'season':
+            collectionType = 3;
+            break;
+          case 'episode':
+            collectionType = 4;
+            break;
+        }
+
+        appLogger.d(
+          'Creating collection "$collectionName" with type $collectionType',
+        );
+        final newCollectionId = await client.createCollection(
+          sectionId: sectionId.toString(),
+          title: collectionName,
+          uri: '', // Empty for regular collections
+          type: collectionType,
+        );
+
+        if (!context.mounted) return;
+
+        if (context.mounted) {
+          if (newCollectionId != null) {
+            appLogger.d(
+              'Successfully created collection with ID: $newCollectionId',
+            );
+
+            // Now add the item to the newly created collection
+            appLogger.d(
+              'Adding item to new collection $newCollectionId with URI: $itemUri',
+            );
+            final addSuccess = await client.addToCollection(
+              collectionId: newCollectionId,
+              uri: itemUri,
+            );
+
+            if (!context.mounted) return;
+
+            if (addSuccess) {
+              appLogger.d('Successfully added item to new collection');
+              ScaffoldMessenger.of(
+                context,
+              ).showSnackBar(SnackBar(content: Text(t.collections.created)));
+              // Trigger refresh of collections tab
+              LibraryRefreshNotifier().notifyCollectionsChanged();
+            } else {
+              appLogger.e('Failed to add item to new collection');
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text(t.collections.errorAddingToCollection)),
+              );
+            }
+          } else {
+            appLogger.e('Failed to create collection - API returned null');
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(t.collections.errorAddingToCollection)),
+            );
+          }
+        }
+      } else {
+        // Add to existing collection
+        appLogger.d('Adding to collection $result with URI: $itemUri');
+        final success = await client.addToCollection(
+          collectionId: result,
+          uri: itemUri,
+        );
+
+        if (!context.mounted) return;
+
+        if (context.mounted) {
+          if (success) {
+            appLogger.d('Successfully added item(s) to collection $result');
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(t.collections.addedToCollection)),
+            );
+            // Trigger refresh of collections tab
+            LibraryRefreshNotifier().notifyCollectionsChanged();
+          } else {
+            appLogger.e(
+              'Failed to add item(s) to collection $result - API returned false',
+            );
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(t.collections.errorAddingToCollection)),
+            );
+          }
+        }
+      }
+    } catch (e, stackTrace) {
+      appLogger.e(
+        'Error in add to collection flow',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              '${t.collections.errorAddingToCollection}: ${e.toString()}',
+            ),
+            duration: const Duration(seconds: 5),
+          ),
+        );
+      }
+    }
+  }
+
+  /// Handle remove from collection action
+  Future<void> _handleRemoveFromCollection(
+    BuildContext context,
+    PlexMetadata metadata,
+  ) async {
+    final client = _getClientForItem();
+
+    if (widget.collectionId == null) {
+      appLogger.e('Cannot remove from collection: collectionId is null');
+      return;
+    }
+
+    // Show confirmation dialog
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(t.collections.removeFromCollection),
+        content: Text(
+          t.collections.removeFromCollectionConfirm(title: metadata.title),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, false),
+            child: Text(t.common.cancel),
+          ),
+          TextButton(
+            onPressed: () => Navigator.pop(context, true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: Text(t.common.delete),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed != true || !context.mounted) return;
+
+    try {
+      appLogger.d(
+        'Removing item ${metadata.ratingKey} from collection ${widget.collectionId}',
+      );
+      final success = await client.removeFromCollection(
+        collectionId: widget.collectionId!,
+        itemId: metadata.ratingKey,
+      );
+
+      if (context.mounted) {
+        if (success) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(t.collections.removedFromCollection)),
+          );
+          // Trigger refresh of collections tab
+          LibraryRefreshNotifier().notifyCollectionsChanged();
+          // Trigger list refresh to remove the item from the view
+          widget.onListRefresh?.call();
+        } else {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(t.collections.removeFromCollectionFailed)),
+          );
+        }
+      }
+    } catch (e) {
+      appLogger.e('Failed to remove from collection', error: e);
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              t.collections.removeFromCollectionError(error: e.toString()),
+            ),
+          ),
+        );
+      }
+    }
+  }
+
+  /// Handle play action for collections and playlists
+  Future<void> _handlePlay(
+    BuildContext context,
+    bool isCollection,
+    bool isPlaylist,
+  ) async {
+    await _launchCollectionOrPlaylist(context, shuffle: false);
+  }
+
+  /// Handle shuffle action for collections and playlists
+  Future<void> _handleShuffle(
+    BuildContext context,
+    bool isCollection,
+    bool isPlaylist,
+  ) async {
+    await _launchCollectionOrPlaylist(context, shuffle: true);
+  }
+
+  /// Launch playback for collection or playlist
+  Future<void> _launchCollectionOrPlaylist(
+    BuildContext context, {
+    required bool shuffle,
+  }) async {
+    final client = _getClientForItem();
+    final item = widget.item;
+
+    final launcher = PlayQueueLauncher(
+      context: context,
+      client: client,
+      serverId: item is PlexMetadata
+          ? item.serverId
+          : (item as PlexPlaylist).serverId,
+      serverName: item is PlexMetadata
+          ? item.serverName
+          : (item as PlexPlaylist).serverName,
+    );
+
+    await launcher.launchFromCollectionOrPlaylist(
+      item: item,
+      shuffle: shuffle,
+      showLoadingIndicator: false,
+    );
+  }
+
+  /// Handle delete action for collections and playlists
+  Future<void> _handleDelete(
+    BuildContext context,
+    bool isCollection,
+    bool isPlaylist,
+  ) async {
+    final client = _getClientForItem();
+
+    final itemTitle = widget.item.title;
+    final itemTypeLabel = isCollection
+        ? t.collections.collection
+        : t.playlists.playlist;
+
+    // Show confirmation dialog
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(
+          isCollection ? t.collections.deleteCollection : t.playlists.delete,
+        ),
+        content: Text(
+          isCollection
+              ? t.collections.deleteConfirm(title: itemTitle)
+              : t.playlists.deleteMessage(name: itemTitle),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, false),
+            child: Text(t.common.cancel),
+          ),
+          TextButton(
+            onPressed: () => Navigator.pop(context, true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: Text(t.common.delete),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed != true || !context.mounted) return;
+
+    try {
+      bool success = false;
+
+      if (isCollection) {
+        final metadata = widget.item as PlexMetadata;
+        final sectionId = metadata.librarySectionID?.toString() ?? '0';
+        success = await client.deleteCollection(sectionId, metadata.ratingKey);
+      } else if (isPlaylist) {
+        final playlist = widget.item as PlexPlaylist;
+        success = await client.deletePlaylist(playlist.ratingKey);
+      }
+
+      if (context.mounted) {
+        if (success) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                isCollection ? t.collections.deleted : t.playlists.deleted,
+              ),
+            ),
+          );
+          // Trigger list refresh
+          widget.onListRefresh?.call();
+        } else {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                isCollection
+                    ? t.collections.deleteFailed
+                    : t.playlists.errorDeleting,
+              ),
+            ),
+          );
+        }
+      }
+    } catch (e) {
+      appLogger.e('Failed to delete $itemTypeLabel', error: e);
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              isCollection
+                  ? t.collections.deleteFailedWithError(error: e.toString())
+                  : t.playlists.errorDeleting,
+            ),
+          ),
+        );
+      }
+    }
+  }
+
+  /// Handle download action
+  Future<void> _handleDownload(BuildContext context) async {
+    final downloadProvider = Provider.of<DownloadProvider>(
+      context,
+      listen: false,
+    );
+    final metadata = widget.item as PlexMetadata;
+    final client = _getClientForItem();
+
+    try {
+      final count = await downloadProvider.queueDownload(metadata, client);
+      if (context.mounted) {
+        // Show appropriate message based on count
+        final message = count > 1
+            ? t.downloads.episodesQueued(count: count)
+            : t.downloads.downloadQueued;
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(message)));
+      }
+    } on CellularDownloadBlockedException {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(t.settings.cellularDownloadBlocked)),
+        );
+      }
+    } catch (e) {
+      appLogger.e('Failed to queue download', error: e);
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(t.messages.errorLoading(error: e.toString()))),
+        );
+      }
+    }
+  }
+
+  /// Handle delete download action
+  Future<void> _handleDeleteDownload(BuildContext context) async {
+    final downloadProvider = Provider.of<DownloadProvider>(
+      context,
+      listen: false,
+    );
+    final metadata = widget.item as PlexMetadata;
+    final globalKey = '${metadata.serverId}:${metadata.ratingKey}';
+
+    // Show confirmation dialog
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(t.downloads.deleteDownload),
+        content: Text(t.downloads.deleteConfirm(title: metadata.title)),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, false),
+            child: Text(t.common.cancel),
+          ),
+          TextButton(
+            onPressed: () => Navigator.pop(context, true),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+            child: Text(t.common.delete),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed != true || !context.mounted) return;
+
+    try {
+      // Use smart deletion handler (shows progress only if >500ms)
+      await SmartDeletionHandler.deleteWithProgress(
+        context: context,
+        provider: downloadProvider,
+        globalKey: globalKey,
+      );
+
+      if (context.mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(t.downloads.downloadDeleted)));
+        // Refresh the view if needed
+        widget.onRefresh?.call(metadata.ratingKey);
+      }
+    } catch (e) {
+      appLogger.e('Failed to delete download', error: e);
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(t.messages.errorLoading(error: e.toString()))),
+        );
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: widget.onTap,
+      onTap: _handleTap,
       onTapDown: _storeTapPosition,
       onLongPress: () => _showContextMenu(context),
       onSecondaryTapDown: _storeTapPosition,
@@ -424,3 +1354,377 @@ class _MediaContextMenuState extends State<MediaContextMenu> {
     );
   }
 }
+
+/// Dialog to select a playlist or create a new one
+class _PlaylistSelectionDialog extends StatelessWidget {
+  final List<PlexPlaylist> playlists;
+
+  const _PlaylistSelectionDialog({required this.playlists});
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(t.playlists.selectPlaylist),
+      content: SizedBox(
+        width: double.maxFinite,
+        child: ListView.builder(
+          shrinkWrap: true,
+          itemCount: playlists.length + 1,
+          itemBuilder: (context, index) {
+            if (index == 0) {
+              // Create new playlist option (always shown first)
+              return ListTile(
+                leading: const AppIcon(Symbols.add_rounded, fill: 1),
+                title: Text(t.playlists.createNewPlaylist),
+                onTap: () => Navigator.pop(context, '_create_new'),
+              );
+            }
+
+            final playlist = playlists[index - 1];
+            return ListTile(
+              leading: playlist.smart
+                  ? const AppIcon(Symbols.auto_awesome_rounded, fill: 1)
+                  : const AppIcon(Symbols.playlist_play_rounded, fill: 1),
+              title: Text(playlist.title),
+              subtitle: playlist.leafCount != null
+                  ? Text(
+                      playlist.leafCount == 1
+                          ? t.playlists.oneItem
+                          : t.playlists.itemCount(count: playlist.leafCount!),
+                    )
+                  : null,
+              onTap: playlist.smart
+                  ? null // Disable smart playlists
+                  : () => Navigator.pop(context, playlist.ratingKey),
+              enabled: !playlist.smart,
+            );
+          },
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: Text(t.common.cancel),
+        ),
+      ],
+    );
+  }
+}
+
+/// Dialog to create a new playlist
+class _CreatePlaylistDialog extends StatefulWidget {
+  @override
+  State<_CreatePlaylistDialog> createState() => _CreatePlaylistDialogState();
+}
+
+class _CreatePlaylistDialogState extends State<_CreatePlaylistDialog> {
+  final _controller = TextEditingController();
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(t.playlists.create),
+      content: TextField(
+        controller: _controller,
+        autofocus: true,
+        decoration: InputDecoration(
+          labelText: t.playlists.playlistName,
+          hintText: t.playlists.enterPlaylistName,
+        ),
+        onSubmitted: (value) {
+          if (value.isNotEmpty) {
+            Navigator.pop(context, value);
+          }
+        },
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: Text(t.common.cancel),
+        ),
+        TextButton(
+          onPressed: () {
+            if (_controller.text.isNotEmpty) {
+              Navigator.pop(context, _controller.text);
+            }
+          },
+          child: Text(t.common.save),
+        ),
+      ],
+    );
+  }
+}
+
+/// Dialog to select a collection or create a new one
+class _CollectionSelectionDialog extends StatelessWidget {
+  final List<PlexMetadata> collections;
+
+  const _CollectionSelectionDialog({required this.collections});
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(t.collections.selectCollection),
+      content: SizedBox(
+        width: double.maxFinite,
+        child: ListView.builder(
+          shrinkWrap: true,
+          itemCount: collections.length + 1,
+          itemBuilder: (context, index) {
+            if (index == 0) {
+              // Create new collection option (always shown first)
+              return ListTile(
+                leading: const AppIcon(Symbols.add_rounded, fill: 1),
+                title: Text(t.collections.createNewCollection),
+                onTap: () => Navigator.pop(context, '_create_new'),
+              );
+            }
+
+            final collection = collections[index - 1];
+            return ListTile(
+              leading: const AppIcon(Symbols.collections_rounded, fill: 1),
+              title: Text(collection.title),
+              subtitle: collection.childCount != null
+                  ? Text('${collection.childCount} items')
+                  : null,
+              onTap: () => Navigator.pop(context, collection.ratingKey),
+            );
+          },
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: Text(t.common.cancel),
+        ),
+      ],
+    );
+  }
+}
+
+/// Dialog to create a new collection
+class _CreateCollectionDialog extends StatefulWidget {
+  @override
+  State<_CreateCollectionDialog> createState() =>
+      _CreateCollectionDialogState();
+}
+
+class _CreateCollectionDialogState extends State<_CreateCollectionDialog> {
+  final _controller = TextEditingController();
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(t.collections.createNewCollection),
+      content: TextField(
+        controller: _controller,
+        autofocus: true,
+        decoration: InputDecoration(
+          labelText: t.collections.collectionName,
+          hintText: t.collections.enterCollectionName,
+        ),
+        onSubmitted: (value) {
+          if (value.isNotEmpty) {
+            Navigator.pop(context, value);
+          }
+        },
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: Text(t.common.cancel),
+        ),
+        TextButton(
+          onPressed: () {
+            if (_controller.text.isNotEmpty) {
+              Navigator.pop(context, _controller.text);
+            }
+          },
+          child: Text(t.common.save),
+        ),
+      ],
+    );
+  }
+}
+
+/// Focusable context menu sheet for keyboard/gamepad navigation (mobile)
+class _FocusableContextMenuSheet extends StatefulWidget {
+  final String title;
+  final List<_MenuAction> actions;
+  final bool focusFirstItem;
+
+  const _FocusableContextMenuSheet({
+    required this.title,
+    required this.actions,
+    this.focusFirstItem = false,
+  });
+
+  @override
+  State<_FocusableContextMenuSheet> createState() =>
+      _FocusableContextMenuSheetState();
+}
+
+class _FocusableContextMenuSheetState
+    extends State<_FocusableContextMenuSheet> {
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _initialFocusNode = FocusNode(debugLabel: 'ContextMenuSheetInitialFocus');
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusableBottomSheet(
+      initialFocusNode: widget.focusFirstItem ? _initialFocusNode : null,
+      child: SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: Text(
+                widget.title,
+                style: Theme.of(context).textTheme.titleMedium,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+            ...widget.actions.asMap().entries.map((entry) {
+              final index = entry.key;
+              final action = entry.value;
+              return FocusableListTile(
+                focusNode: index == 0 ? _initialFocusNode : null,
+                leading: AppIcon(action.icon, fill: 1),
+                title: Text(action.label),
+                onTap: () => Navigator.pop(context, action.value),
+              );
+            }),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// Focusable popup menu for keyboard/gamepad navigation (desktop)
+class _FocusablePopupMenu extends StatefulWidget {
+  final List<_MenuAction> actions;
+  final Offset position;
+  final bool focusFirstItem;
+
+  const _FocusablePopupMenu({
+    required this.actions,
+    required this.position,
+    this.focusFirstItem = false,
+  });
+
+  @override
+  State<_FocusablePopupMenu> createState() => _FocusablePopupMenuState();
+}
+
+class _FocusablePopupMenuState extends State<_FocusablePopupMenu> {
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _initialFocusNode = FocusNode(debugLabel: 'PopupMenuInitialFocus');
+    if (widget.focusFirstItem) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          _initialFocusNode.requestFocus();
+        }
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final screenSize = MediaQuery.of(context).size;
+    const menuWidth = 220.0;
+
+    // Calculate menu position, keeping it on screen
+    double left = widget.position.dx;
+    double top = widget.position.dy;
+
+    // Adjust if menu would go off right edge
+    if (left + menuWidth > screenSize.width) {
+      left = screenSize.width - menuWidth - 8;
+    }
+
+    // Estimate menu height and adjust if would go off bottom
+    final estimatedHeight = widget.actions.length * 48.0 + 16;
+    if (top + estimatedHeight > screenSize.height) {
+      top = screenSize.height - estimatedHeight - 8;
+    }
+
+    return Stack(
+      children: [
+        // Barrier to close menu when clicking outside
+        Positioned.fill(
+          child: GestureDetector(
+            onTap: () => Navigator.pop(context),
+            behavior: HitTestBehavior.opaque,
+            child: Container(color: Colors.transparent),
+          ),
+        ),
+        // Menu
+        Positioned(
+          left: left,
+          top: top,
+          child: Material(
+            elevation: 8,
+            borderRadius: BorderRadius.circular(8),
+            clipBehavior: Clip.antiAlias,
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(
+                minWidth: menuWidth,
+                maxWidth: menuWidth,
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: widget.actions.asMap().entries.map((entry) {
+                  final index = entry.key;
+                  final action = entry.value;
+                  return FocusableListTile(
+                    focusNode: index == 0 ? _initialFocusNode : null,
+                    leading: AppIcon(action.icon, fill: 1, size: 20),
+                    title: Text(action.label),
+                    onTap: () => Navigator.pop(context, action.value),
+                  );
+                }).toList(),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/media_grid_delegate.dart b/lib/widgets/media_grid_delegate.dart
new file mode 100644
index 00000000..c3c31365
--- /dev/null
+++ b/lib/widgets/media_grid_delegate.dart
@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import '../services/settings_service.dart';
+import '../utils/grid_size_calculator.dart';
+import '../utils/layout_constants.dart';
+
+/// Shared grid delegate configuration for media item grids
+/// Maintains consistent spacing (2/3.3 aspect ratio, 0 spacing) across all media grids
+class MediaGridDelegate {
+  /// Creates a standard grid delegate for media items
+  ///
+  /// Uses [GridSizeCalculator.getMaxCrossAxisExtent] by default.
+  /// Set [usePaddingAware] to true to use [GridSizeCalculator.getMaxCrossAxisExtentWithPadding] instead.
+  static SliverGridDelegateWithMaxCrossAxisExtent createDelegate({
+    required BuildContext context,
+    required LibraryDensity density,
+    bool usePaddingAware = false,
+    double horizontalPadding = 16,
+  }) {
+    final maxCrossAxisExtent = usePaddingAware
+        ? GridSizeCalculator.getMaxCrossAxisExtentWithPadding(
+            context,
+            density,
+            horizontalPadding,
+          )
+        : GridSizeCalculator.getMaxCrossAxisExtent(context, density);
+
+    return SliverGridDelegateWithMaxCrossAxisExtent(
+      maxCrossAxisExtent: maxCrossAxisExtent,
+      childAspectRatio: GridLayoutConstants.posterAspectRatio,
+      crossAxisSpacing: GridLayoutConstants.crossAxisSpacing,
+      mainAxisSpacing: GridLayoutConstants.mainAxisSpacing,
+    );
+  }
+}
diff --git a/lib/widgets/media_grid_sliver.dart b/lib/widgets/media_grid_sliver.dart
new file mode 100644
index 00000000..9464af49
--- /dev/null
+++ b/lib/widgets/media_grid_sliver.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../models/plex_metadata.dart';
+import '../providers/settings_provider.dart';
+import 'media_card.dart';
+import 'media_grid_delegate.dart';
+
+/// Shared sliver grid builder for displaying media items
+/// Used across hub detail, collection detail, playlist detail, and library browse screens
+/// to maintain consistent spacing and focus behavior
+class MediaGridSliver extends StatelessWidget {
+  /// The list of media items to display
+  final List<PlexMetadata> items;
+
+  /// Callback when an item needs to be refreshed
+  final void Function(String ratingKey)? onRefresh;
+
+  /// Optional collection ID for collection-specific functionality
+  final String? collectionId;
+
+  /// Optional callback to refresh the entire parent list
+  final VoidCallback? onListRefresh;
+
+  /// Padding around the grid
+  /// Defaults to EdgeInsets.fromLTRB(8, 0, 8, 8)
+  final EdgeInsets padding;
+
+  /// Whether to use the padding-aware cross axis extent calculation
+  /// Defaults to false (uses standard GridSizeCalculator)
+  final bool usePaddingAwareExtent;
+
+  /// Horizontal padding to account for when usePaddingAwareExtent is true
+  /// Only used if usePaddingAwareExtent is true
+  final double horizontalPadding;
+
+  const MediaGridSliver({
+    super.key,
+    required this.items,
+    this.onRefresh,
+    this.collectionId,
+    this.onListRefresh,
+    this.padding = const EdgeInsets.fromLTRB(8, 0, 8, 8),
+    this.usePaddingAwareExtent = false,
+    this.horizontalPadding = 16,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: padding,
+      sliver: Consumer<SettingsProvider>(
+        builder: (context, settingsProvider, child) {
+          return SliverGrid(
+            gridDelegate: MediaGridDelegate.createDelegate(
+              context: context,
+              density: settingsProvider.libraryDensity,
+              usePaddingAware: usePaddingAwareExtent,
+              horizontalPadding: horizontalPadding,
+            ),
+            delegate: SliverChildBuilderDelegate((context, index) {
+              final item = items[index];
+              return MediaCard(
+                key: Key(item.ratingKey),
+                item: item,
+                onRefresh: onRefresh,
+                collectionId: collectionId,
+                onListRefresh: onListRefresh,
+              );
+            }, childCount: items.length),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/plex_optimized_image.dart b/lib/widgets/plex_optimized_image.dart
new file mode 100644
index 00000000..e7951a19
--- /dev/null
+++ b/lib/widgets/plex_optimized_image.dart
@@ -0,0 +1,385 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import '../../services/plex_client.dart';
+import '../utils/plex_image_helper.dart';
+import 'media_card.dart';
+
+class PlexOptimizedImage extends StatelessWidget {
+  final PlexClient? client;
+  final String? imagePath;
+  final double? width;
+  final double? height;
+  final BoxFit fit;
+  final FilterQuality filterQuality;
+  final Widget Function(BuildContext, String)? placeholder;
+  final Widget Function(BuildContext, String, dynamic)? errorWidget;
+  final Duration fadeInDuration;
+  final bool enableTranscoding;
+  final String? cacheKey;
+  final Alignment alignment;
+  final IconData? fallbackIcon;
+  final ImageType imageType;
+  final String? localFilePath;
+
+  const PlexOptimizedImage._({
+    super.key,
+    this.client,
+    required this.imagePath,
+    this.width,
+    this.height,
+    this.fit = BoxFit.cover,
+    this.filterQuality = FilterQuality.medium,
+    this.placeholder,
+    this.errorWidget,
+    this.fadeInDuration = const Duration(milliseconds: 300),
+    this.enableTranscoding = true,
+    this.cacheKey,
+    this.alignment = Alignment.center,
+    this.fallbackIcon,
+    this.imageType = ImageType.poster,
+    this.localFilePath,
+  });
+
+  /// Generic constructor for optimized images.
+  const factory PlexOptimizedImage({
+    Key? key,
+    PlexClient? client,
+    required String? imagePath,
+    double? width,
+    double? height,
+    BoxFit fit,
+    FilterQuality filterQuality,
+    Widget Function(BuildContext, String)? placeholder,
+    Widget Function(BuildContext, String, dynamic)? errorWidget,
+    Duration fadeInDuration,
+    bool enableTranscoding,
+    String? cacheKey,
+    Alignment alignment,
+    IconData? fallbackIcon,
+    ImageType imageType,
+    String? localFilePath,
+  }) = PlexOptimizedImage._;
+
+  /// Named constructor for poster images with default fallback icon.
+  const factory PlexOptimizedImage.poster({
+    Key? key,
+    PlexClient? client,
+    required String? imagePath,
+    double? width,
+    double? height,
+    BoxFit fit,
+    FilterQuality filterQuality,
+    Widget Function(BuildContext, String)? placeholder,
+    Widget Function(BuildContext, String, dynamic)? errorWidget,
+    Duration fadeInDuration,
+    bool enableTranscoding,
+    String? cacheKey,
+    Alignment alignment,
+    String? localFilePath,
+  }) = PlexOptimizedImage._poster;
+
+  /// Named constructor for episode thumbnails.
+  const factory PlexOptimizedImage.thumb({
+    Key? key,
+    PlexClient? client,
+    required String? imagePath,
+    double? width,
+    double? height,
+    BoxFit fit,
+    FilterQuality filterQuality,
+    Widget Function(BuildContext, String)? placeholder,
+    Widget Function(BuildContext, String, dynamic)? errorWidget,
+    Duration fadeInDuration,
+    bool enableTranscoding,
+    String? cacheKey,
+    Alignment alignment,
+    String? localFilePath,
+  }) = PlexOptimizedImage._thumb;
+
+  /// Named constructor for playlist images.
+  const factory PlexOptimizedImage.playlist({
+    Key? key,
+    PlexClient? client,
+    required String? imagePath,
+    double? width,
+    double? height,
+    BoxFit fit,
+    FilterQuality filterQuality,
+    Widget Function(BuildContext, String)? placeholder,
+    Widget Function(BuildContext, String, dynamic)? errorWidget,
+    Duration fadeInDuration,
+    bool enableTranscoding,
+    String? cacheKey,
+    Alignment alignment,
+    String? localFilePath,
+  }) = PlexOptimizedImage._playlist;
+
+  const PlexOptimizedImage._poster({
+    Key? key,
+    PlexClient? client,
+    required String? imagePath,
+    double? width,
+    double? height,
+    BoxFit fit = BoxFit.cover,
+    FilterQuality filterQuality = FilterQuality.medium,
+    Widget Function(BuildContext, String)? placeholder,
+    Widget Function(BuildContext, String, dynamic)? errorWidget,
+    Duration fadeInDuration = const Duration(milliseconds: 300),
+    bool enableTranscoding = true,
+    String? cacheKey,
+    Alignment alignment = Alignment.center,
+    String? localFilePath,
+  }) : this._(
+         key: key,
+         client: client,
+         imagePath: imagePath,
+         width: width,
+         height: height,
+         fit: fit,
+         filterQuality: filterQuality,
+         placeholder: placeholder,
+         errorWidget: errorWidget,
+         fadeInDuration: fadeInDuration,
+         enableTranscoding: enableTranscoding,
+         cacheKey: cacheKey,
+         alignment: alignment,
+         fallbackIcon: Symbols.movie_rounded,
+         imageType: ImageType.poster,
+         localFilePath: localFilePath,
+       );
+
+  const PlexOptimizedImage._thumb({
+    Key? key,
+    PlexClient? client,
+    required String? imagePath,
+    double? width,
+    double? height,
+    BoxFit fit = BoxFit.cover,
+    FilterQuality filterQuality = FilterQuality.medium,
+    Widget Function(BuildContext, String)? placeholder,
+    Widget Function(BuildContext, String, dynamic)? errorWidget,
+    Duration fadeInDuration = const Duration(milliseconds: 300),
+    bool enableTranscoding = true,
+    String? cacheKey,
+    Alignment alignment = Alignment.center,
+    String? localFilePath,
+  }) : this._(
+         key: key,
+         client: client,
+         imagePath: imagePath,
+         width: width,
+         height: height,
+         fit: fit,
+         filterQuality: filterQuality,
+         placeholder: placeholder,
+         errorWidget: errorWidget,
+         fadeInDuration: fadeInDuration,
+         enableTranscoding: enableTranscoding,
+         cacheKey: cacheKey,
+         alignment: alignment,
+         fallbackIcon: Symbols.video_library_rounded,
+         imageType: ImageType.thumb,
+         localFilePath: localFilePath,
+       );
+
+  const PlexOptimizedImage._playlist({
+    Key? key,
+    PlexClient? client,
+    required String? imagePath,
+    double? width,
+    double? height,
+    BoxFit fit = BoxFit.cover,
+    FilterQuality filterQuality = FilterQuality.medium,
+    Widget Function(BuildContext, String)? placeholder,
+    Widget Function(BuildContext, String, dynamic)? errorWidget,
+    Duration fadeInDuration = const Duration(milliseconds: 300),
+    bool enableTranscoding = true,
+    String? cacheKey,
+    Alignment alignment = Alignment.center,
+    String? localFilePath,
+  }) : this._(
+         key: key,
+         client: client,
+         imagePath: imagePath,
+         width: width,
+         height: height,
+         fit: fit,
+         filterQuality: filterQuality,
+         placeholder: placeholder,
+         errorWidget: errorWidget,
+         fadeInDuration: fadeInDuration,
+         enableTranscoding: enableTranscoding,
+         cacheKey: cacheKey,
+         alignment: alignment,
+         fallbackIcon: Symbols.playlist_play_rounded,
+         imageType: ImageType.poster,
+         localFilePath: localFilePath,
+       );
+
+  @override
+  Widget build(BuildContext context) {
+    // Check for local file first
+    if (localFilePath != null) {
+      final file = File(localFilePath!);
+      if (file.existsSync()) {
+        return Image.file(
+          file,
+          width: width,
+          height: height,
+          fit: fit,
+          filterQuality: filterQuality,
+          alignment: alignment,
+          errorBuilder: (context, error, stackTrace) =>
+              _buildErrorWidget(context, error),
+        );
+      }
+    }
+
+    double resolvedDimension(
+      double? explicit,
+      double constraintMax,
+      double fallback,
+    ) {
+      // Pick the explicit size when it's a finite positive number, otherwise
+      // fall back to the constraint or a sensible default so we don't end up
+      // with NaN/Infinity when rounding to ints for caching.
+      final candidate =
+          explicit ??
+          (constraintMax.isFinite && constraintMax > 0
+              ? constraintMax
+              : fallback);
+      if (candidate.isNaN || candidate.isInfinite || candidate <= 0) {
+        return fallback;
+      }
+      return candidate;
+    }
+
+    // Return empty container if no image path
+    if (imagePath == null || imagePath!.isEmpty) {
+      return _buildFallback(context);
+    }
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
+
+        // Calculate effective constraints with safe fallbacks
+        final effectiveWidth = resolvedDimension(
+          width,
+          constraints.maxWidth,
+          300.0,
+        );
+        final effectiveHeight = resolvedDimension(
+          height,
+          constraints.maxHeight,
+          450.0,
+        );
+
+        // Get optimized image URL
+        final imageUrl = PlexImageHelper.getOptimizedImageUrl(
+          client: client,
+          thumbPath: imagePath,
+          maxWidth: effectiveWidth,
+          maxHeight: effectiveHeight,
+          devicePixelRatio: devicePixelRatio,
+          enableTranscoding:
+              enableTranscoding && PlexImageHelper.shouldTranscode(imagePath),
+          imageType: imageType,
+        );
+
+        if (imageUrl.isEmpty) {
+          return _buildFallback(context);
+        }
+
+        // Calculate memory cache dimensions
+        final scaledWidth = effectiveWidth * devicePixelRatio;
+        final scaledHeight = effectiveHeight * devicePixelRatio;
+        final (memWidth, memHeight) = PlexImageHelper.getMemCacheDimensions(
+          displayWidth: scaledWidth.isFinite && scaledWidth > 0
+              ? scaledWidth.round()
+              : 0,
+          displayHeight: scaledHeight.isFinite && scaledHeight > 0
+              ? scaledHeight.round()
+              : 0,
+        );
+
+        // Generate cache key if not provided
+        final effectiveCacheKey =
+            cacheKey ?? _generateCacheKey(imageUrl, memWidth, memHeight);
+
+        return CachedNetworkImage(
+          imageUrl: imageUrl,
+          width: width,
+          height: height,
+          fit: fit,
+          filterQuality: filterQuality,
+          alignment: alignment,
+          fadeInDuration: fadeInDuration,
+          memCacheWidth: memWidth,
+          memCacheHeight: memHeight,
+          cacheKey: effectiveCacheKey,
+          placeholder: placeholder != null
+              ? placeholder!
+              : (context, url) => _buildPlaceholder(context),
+          errorWidget: errorWidget != null
+              ? errorWidget!
+              : (context, url, error) => _buildErrorWidget(context, error),
+          httpHeaders: {'User-Agent': 'Plezy Flutter Client'},
+        );
+      },
+    );
+  }
+
+  Widget _buildPlaceholder(BuildContext context) {
+    return SkeletonLoader(
+      child: fallbackIcon != null
+          ? Center(
+              child: AppIcon(
+                fallbackIcon!,
+                fill: 1,
+                size: 40,
+                color: Colors.white54,
+              ),
+            )
+          : null,
+    );
+  }
+
+  Widget _buildErrorWidget(BuildContext context, dynamic error) {
+    return Container(
+      color: Theme.of(context).colorScheme.surfaceContainerHighest,
+      child: Center(
+        child: AppIcon(
+          fallbackIcon ?? Symbols.broken_image_rounded,
+          fill: 1,
+          size: 40,
+          color: Theme.of(context).colorScheme.onSurfaceVariant,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFallback(BuildContext context) {
+    return Container(
+      width: width,
+      height: height,
+      color: Theme.of(context).colorScheme.surfaceContainerHighest,
+      child: Center(
+        child: AppIcon(
+          fallbackIcon ?? Symbols.image_not_supported_rounded,
+          fill: 1,
+          size: 40,
+          color: Theme.of(context).colorScheme.onSurfaceVariant,
+        ),
+      ),
+    );
+  }
+
+  String _generateCacheKey(String imageUrl, int memWidth, int memHeight) {
+    final urlHash = imageUrl.hashCode;
+    return 'plex_optimized_${memWidth}x${memHeight}_$urlHash';
+  }
+}
diff --git a/lib/widgets/profile_selector.dart b/lib/widgets/profile_selector.dart
deleted file mode 100644
index fd7d3070..00000000
--- a/lib/widgets/profile_selector.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import '../models/plex_home_user.dart';
-import '../providers/user_profile_provider.dart';
-import '../utils/user_switching_utils.dart';
-import 'user_avatar_widget.dart';
-import '../screens/profile_switch_screen.dart';
-
-class ProfileSelector extends StatelessWidget {
-  final double avatarSize;
-  final bool showCurrentUserOnly;
-
-  const ProfileSelector({
-    super.key,
-    this.avatarSize = 32,
-    this.showCurrentUserOnly = false,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<UserProfileProvider>(
-      builder: (context, userProvider, child) {
-        if (userProvider.currentUser == null) {
-          return const SizedBox.shrink();
-        }
-
-        if (showCurrentUserOnly || !userProvider.hasMultipleUsers) {
-          // Show only current user avatar
-          return UserAvatarWidget(
-            user: userProvider.currentUser!,
-            size: avatarSize,
-            onTap: userProvider.hasMultipleUsers
-                ? () => _showProfileSwitchDialog(context)
-                : null,
-          );
-        }
-
-        // Show horizontal list of users
-        return SizedBox(
-          height: avatarSize + 8,
-          child: ListView.separated(
-            scrollDirection: Axis.horizontal,
-            itemCount: userProvider.home?.users.length ?? 0,
-            separatorBuilder: (context, index) => const SizedBox(width: 8),
-            itemBuilder: (context, index) {
-              final users = userProvider.home!.users;
-              final user = users[index];
-              final isCurrentUser = user.uuid == userProvider.currentUser?.uuid;
-
-              return Container(
-                decoration: isCurrentUser
-                    ? BoxDecoration(
-                        shape: BoxShape.circle,
-                        border: Border.all(
-                          color: Theme.of(context).colorScheme.primary,
-                          width: 2,
-                        ),
-                      )
-                    : null,
-                child: Padding(
-                  padding: EdgeInsets.all(isCurrentUser ? 2 : 0),
-                  child: UserAvatarWidget(
-                    user: user,
-                    size: avatarSize - (isCurrentUser ? 4 : 0),
-                    onTap: isCurrentUser
-                        ? () => _showProfileSwitchDialog(context)
-                        : () => _switchToUser(context, user),
-                  ),
-                ),
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  void _showProfileSwitchDialog(BuildContext context) {
-    Navigator.push(
-      context,
-      MaterialPageRoute(builder: (context) => const ProfileSwitchScreen()),
-    );
-  }
-
-  void _switchToUser(BuildContext context, PlexHomeUser user) async {
-    await UserSwitchingUtils.switchToUser(context, user);
-  }
-}
diff --git a/lib/widgets/profile_switch_dialog.dart b/lib/widgets/profile_switch_dialog.dart
deleted file mode 100644
index f4f947b6..00000000
--- a/lib/widgets/profile_switch_dialog.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import '../models/plex_home_user.dart';
-import '../providers/user_profile_provider.dart';
-import '../utils/user_switching_utils.dart';
-import 'profile_list_tile.dart';
-import '../i18n/strings.g.dart';
-
-class ProfileSwitchDialog extends StatelessWidget {
-  const ProfileSwitchDialog({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    return Consumer<UserProfileProvider>(
-      builder: (context, userProvider, child) {
-        final users = userProvider.home?.users ?? [];
-
-        return AlertDialog(
-          content: SizedBox(
-            width: double.maxFinite,
-            height: users.isEmpty ? 100 : (users.length * 72.0).clamp(100, 400),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                if (userProvider.isLoading)
-                  const Expanded(
-                    child: Center(child: CircularProgressIndicator()),
-                  )
-                else if (users.isEmpty)
-                  Expanded(
-                    child: Center(child: Text(t.profile.noUsersAvailable)),
-                  )
-                else
-                  Expanded(
-                    child: ListView.builder(
-                      shrinkWrap: true,
-                      itemCount: users.length,
-                      itemBuilder: (context, index) {
-                        final user = users[index];
-                        final isCurrentUser =
-                            user.uuid == userProvider.currentUser?.uuid;
-
-                        return Padding(
-                          padding: const EdgeInsets.only(bottom: 8),
-                          child: Card(
-                            child: ProfileListTile(
-                              user: user,
-                              isCurrentUser: isCurrentUser,
-                              onTap: () => _switchToUser(context, user),
-                            ),
-                          ),
-                        );
-                      },
-                    ),
-                  ),
-
-                if (userProvider.error != null)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 16),
-                    child: Text(
-                      userProvider.error!,
-                      style: TextStyle(
-                        color: theme.colorScheme.error,
-                        fontSize: 12,
-                      ),
-                      textAlign: TextAlign.center,
-                    ),
-                  ),
-              ],
-            ),
-          ),
-          actions: [
-            TextButton(
-              onPressed: () => Navigator.of(context).pop(),
-              child: Text(t.common.cancel),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  void _switchToUser(BuildContext context, PlexHomeUser user) async {
-    await UserSwitchingUtils.switchToUser(context, user, popOnSuccess: true);
-  }
-}
diff --git a/lib/widgets/server_list_tile.dart b/lib/widgets/server_list_tile.dart
deleted file mode 100644
index 427d7c40..00000000
--- a/lib/widgets/server_list_tile.dart
+++ /dev/null
@@ -1,103 +0,0 @@
-import 'package:flutter/material.dart';
-import '../services/plex_auth_service.dart';
-import '../i18n/strings.g.dart';
-
-class ServerListTile extends StatelessWidget {
-  final PlexServer server;
-  final VoidCallback onTap;
-  final bool showTrailingIcon;
-  final bool isCurrentServer;
-
-  const ServerListTile({
-    super.key,
-    required this.server,
-    required this.onTap,
-    this.showTrailingIcon = true,
-    this.isCurrentServer = false,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final isOnline = server.isOnline;
-
-    return Semantics(
-      selected: isCurrentServer,
-      identifier: server.name,
-      label: server.name,
-      child: ListTile(
-        key: ValueKey(server.name),
-        leading: Icon(
-          Icons.dns,
-          color: isOnline
-              ? Theme.of(context).colorScheme.primary
-              : Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.5),
-          semanticLabel: t.common.server,
-        ),
-        title: Text(server.name),
-        subtitle: Semantics(
-          label:
-              '${isOnline ? t.common.online : t.common.offline}, ${server.owned ? t.common.owned : t.common.shared}',
-          excludeSemantics: true,
-          child: Row(
-            children: [
-              Semantics(
-                excludeSemantics: true,
-                child: Icon(
-                  isOnline ? Icons.circle : Icons.circle_outlined,
-                  size: 10,
-                  color: isOnline ? Colors.green : Colors.grey,
-                ),
-              ),
-              const SizedBox(width: 4),
-              Text(
-                isOnline ? t.common.online : t.common.offline,
-                style: TextStyle(
-                  fontSize: 12,
-                  color: isOnline ? Colors.green : Colors.grey,
-                ),
-              ),
-              const SizedBox(width: 8),
-              Semantics(
-                excludeSemantics: true,
-                child: Text(
-                  '•',
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: Theme.of(
-                      context,
-                    ).colorScheme.onSurface.withValues(alpha: 0.5),
-                  ),
-                ),
-              ),
-              const SizedBox(width: 8),
-              Text(
-                server.owned ? t.common.owned : t.common.shared,
-                style: const TextStyle(fontSize: 12),
-              ),
-            ],
-          ),
-        ),
-        trailing: isCurrentServer
-            ? Container(
-                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-                decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.primary,
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Text(
-                  t.common.current,
-                  style: TextStyle(
-                    fontSize: 10,
-                    color: Theme.of(context).colorScheme.onPrimary,
-                    fontWeight: FontWeight.bold,
-                    letterSpacing: 0.5,
-                  ),
-                ),
-              )
-            : (showTrailingIcon ? const Icon(Icons.chevron_right) : null),
-        onTap: isCurrentServer ? null : onTap,
-        enabled: !isCurrentServer,
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/side_navigation_rail.dart b/lib/widgets/side_navigation_rail.dart
new file mode 100644
index 00000000..1ac5edcf
--- /dev/null
+++ b/lib/widgets/side_navigation_rail.dart
@@ -0,0 +1,658 @@
+import 'dart:io' show Platform;
+
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+import '../focus/dpad_navigator.dart';
+import '../models/plex_library.dart';
+import '../navigation/navigation_tabs.dart';
+import '../providers/hidden_libraries_provider.dart';
+import '../providers/multi_server_provider.dart';
+import '../services/fullscreen_state_manager.dart';
+import '../services/storage_service.dart';
+import '../theme/theme_helper.dart';
+import '../i18n/strings.g.dart';
+
+/// Tracks focus state for a set of named items, avoiding repeated boilerplate
+class _FocusStateTracker {
+  final Map<String, FocusNode> _nodes = {};
+  final Set<String> _focused = {};
+  final VoidCallback _onChanged;
+
+  _FocusStateTracker(this._onChanged);
+
+  /// Get or create a focus node for the given key
+  FocusNode get(String key, {String? debugLabel}) {
+    return _nodes.putIfAbsent(key, () {
+      final node = FocusNode(debugLabel: debugLabel ?? 'nav_$key');
+      node.addListener(() {
+        final wasFocused = _focused.contains(key);
+        if (node.hasFocus && !wasFocused) {
+          _focused.add(key);
+          _onChanged();
+        } else if (!node.hasFocus && wasFocused) {
+          _focused.remove(key);
+          _onChanged();
+        }
+      });
+      return node;
+    });
+  }
+
+  /// Check if a key is currently focused
+  bool isFocused(String key) => _focused.contains(key);
+
+  /// Check if a node exists for the given key
+  FocusNode? nodeFor(String key) => _nodes[key];
+
+  /// Dispose all nodes
+  void dispose() {
+    for (final node in _nodes.values) {
+      node.dispose();
+    }
+    _nodes.clear();
+    _focused.clear();
+  }
+
+  /// Remove nodes not in the given set of valid keys (prunes stale nodes)
+  void pruneExcept(Set<String> validKeys) {
+    final toRemove = _nodes.keys.where((k) => !validKeys.contains(k)).toList();
+    for (final key in toRemove) {
+      _nodes[key]?.dispose();
+      _nodes.remove(key);
+      _focused.remove(key);
+    }
+  }
+}
+
+/// Reusable navigation rail item widget that handles focus, selection, and interaction
+class NavigationRailItem extends StatelessWidget {
+  final IconData icon;
+  final IconData? selectedIcon;
+  final Widget label;
+  final bool isSelected;
+  final bool isFocused;
+  final VoidCallback onTap;
+  final FocusNode focusNode;
+  final bool autofocus;
+  final EdgeInsets padding;
+  final BorderRadius borderRadius;
+  final double iconSize;
+
+  const NavigationRailItem({
+    super.key,
+    required this.icon,
+    this.selectedIcon,
+    required this.label,
+    required this.isSelected,
+    required this.isFocused,
+    required this.onTap,
+    required this.focusNode,
+    this.autofocus = false,
+    this.padding = const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+    this.borderRadius = const BorderRadius.all(Radius.circular(12)),
+    this.iconSize = 22,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final t = tokens(context);
+
+    return Focus(
+      focusNode: focusNode,
+      autofocus: autofocus,
+      onKeyEvent: (node, event) {
+        if (event is! KeyDownEvent) return KeyEventResult.ignored;
+        if (event.logicalKey.isSelectKey) {
+          onTap();
+          return KeyEventResult.handled;
+        }
+        return KeyEventResult.ignored;
+      },
+      child: Material(
+        color: Colors.transparent,
+        child: InkWell(
+          onTap: onTap,
+          borderRadius: borderRadius,
+          child: Container(
+            padding: padding,
+            decoration: BoxDecoration(
+              color: isSelected && isFocused
+                  ? t.text.withValues(alpha: 0.15) // Selected + focused
+                  : isSelected
+                  ? t.text.withValues(alpha: 0.1) // Just selected
+                  : isFocused
+                  ? t.text.withValues(
+                      alpha: 0.12,
+                    ) // Just focused (more visible)
+                  : null,
+              borderRadius: borderRadius,
+            ),
+            child: Row(
+              children: [
+                AppIcon(
+                  isSelected && selectedIcon != null ? selectedIcon! : icon,
+                  fill: 1,
+                  size: iconSize,
+                  color: isSelected ? t.text : t.textMuted,
+                ),
+                const SizedBox(width: 12),
+                Expanded(child: label),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+/// Side navigation rail for Desktop and Android TV platforms
+class SideNavigationRail extends StatefulWidget {
+  final int selectedIndex;
+  final String? selectedLibraryKey;
+  final bool isOfflineMode;
+  final ValueChanged<int> onDestinationSelected;
+  final ValueChanged<String> onLibrarySelected;
+
+  const SideNavigationRail({
+    super.key,
+    required this.selectedIndex,
+    this.selectedLibraryKey,
+    this.isOfflineMode = false,
+    required this.onDestinationSelected,
+    required this.onLibrarySelected,
+  });
+
+  @override
+  State<SideNavigationRail> createState() => SideNavigationRailState();
+}
+
+class SideNavigationRailState extends State<SideNavigationRail> {
+  bool _librariesExpanded = true;
+  List<PlexLibrary> _libraries = [];
+  bool _isLoadingLibraries = true;
+
+  // Focus keys for main nav items
+  static const _kHome = 'home';
+  static const _kLibraries = 'libraries';
+  static const _kSearch = 'search';
+  static const _kDownloads = 'downloads';
+  static const _kSettings = 'settings';
+
+  // Unified focus state tracker for all nav items (main + libraries)
+  late final _FocusStateTracker _focusTracker;
+
+  @override
+  void initState() {
+    super.initState();
+    _focusTracker = _FocusStateTracker(() {
+      if (mounted) setState(() {});
+    });
+    _loadLibraries();
+  }
+
+  @override
+  void dispose() {
+    _focusTracker.dispose();
+    super.dispose();
+  }
+
+  /// Focus the currently selected nav item
+  void focusActiveItem() {
+    if (widget.selectedLibraryKey != null) {
+      // A library is selected - focus that library item
+      _focusTracker.nodeFor(widget.selectedLibraryKey!)?.requestFocus();
+    } else {
+      // Focus main nav item based on selectedIndex
+      final key = switch (widget.selectedIndex) {
+        0 => _kHome,
+        1 => _kLibraries,
+        2 => _kSearch,
+        3 => _kDownloads,
+        4 => _kSettings,
+        _ => null,
+      };
+      if (key != null) _focusTracker.nodeFor(key)?.requestFocus();
+    }
+  }
+
+  /// Fetch, filter, and order libraries (pure logic, no state changes)
+  Future<List<PlexLibrary>> _resolveLibraries(
+    MultiServerProvider provider,
+    StorageService storage,
+  ) async {
+    if (!provider.hasConnectedServers) return [];
+
+    final libraries =
+        await provider.aggregationService.getLibrariesFromAllServers();
+
+    // Filter out unsupported library types (music)
+    var filtered = libraries.where((lib) => lib.type != 'artist').toList();
+
+    // Apply saved order
+    final savedOrder = storage.getLibraryOrder();
+    if (savedOrder == null || savedOrder.isEmpty) return filtered;
+
+    final libraryMap = {for (var lib in filtered) lib.globalKey: lib};
+    final ordered = <PlexLibrary>[];
+    for (final key in savedOrder) {
+      final lib = libraryMap.remove(key);
+      if (lib != null) ordered.add(lib);
+    }
+    ordered.addAll(libraryMap.values); // New libraries not in saved order
+    return ordered;
+  }
+
+  /// Build the set of valid focus keys (main nav + current libraries)
+  Set<String> _buildValidFocusKeys(List<PlexLibrary> libraries) {
+    return {
+      _kHome,
+      _kLibraries,
+      _kSearch,
+      _kDownloads,
+      _kSettings,
+      ...libraries.map((lib) => lib.globalKey),
+    };
+  }
+
+  Future<void> _loadLibraries() async {
+    final provider = context.read<MultiServerProvider>();
+    final storage = await StorageService.getInstance();
+
+    try {
+      final libraries = await _resolveLibraries(provider, storage);
+
+      if (mounted) {
+        setState(() {
+          _libraries = libraries;
+          _isLoadingLibraries = false;
+        });
+        // Prune stale library focus nodes
+        _focusTracker.pruneExcept(_buildValidFocusKeys(libraries));
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _isLoadingLibraries = false;
+        });
+      }
+    }
+  }
+
+  /// Reload libraries (called when servers change)
+  void reloadLibraries() {
+    setState(() {
+      _isLoadingLibraries = true;
+    });
+    _loadLibraries();
+  }
+
+  IconData _getLibraryIcon(String type) {
+    switch (type.toLowerCase()) {
+      case 'movie':
+        return Symbols.movie_rounded;
+      case 'show':
+        return Symbols.tv_rounded;
+      case 'artist':
+        return Symbols.music_note_rounded;
+      case 'photo':
+        return Symbols.photo_rounded;
+      default:
+        return Symbols.folder_rounded;
+    }
+  }
+
+  /// Calculate top padding for macOS traffic lights
+  double _getTopPadding(BuildContext context) {
+    double basePadding = MediaQuery.of(context).padding.top + 16;
+
+    // On macOS, add extra padding for traffic lights (when not fullscreen)
+    if (Platform.isMacOS) {
+      final isFullscreen = FullscreenStateManager().isFullscreen;
+      if (!isFullscreen) {
+        // Traffic lights area is approximately 52 pixels high
+        basePadding = basePadding < 52 ? 52 : basePadding;
+      }
+    }
+
+    return basePadding;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final t = tokens(context);
+    final hiddenLibrariesProvider = context.watch<HiddenLibrariesProvider>();
+    final hiddenKeys = hiddenLibrariesProvider.hiddenLibraryKeys;
+
+    // Filter visible libraries
+    final visibleLibraries = _libraries
+        .where((lib) => !hiddenKeys.contains(lib.globalKey))
+        .toList();
+
+    // Listen to fullscreen changes for macOS
+    return ListenableBuilder(
+      listenable: FullscreenStateManager(),
+      builder: (context, _) {
+        return Container(
+          width: 220,
+          color: t.surface,
+          child: Column(
+            children: [
+              // Safe area for status bar and macOS traffic lights
+              SizedBox(height: _getTopPadding(context)),
+
+              // Navigation content
+              Expanded(
+                child: ListView(
+                  padding: const EdgeInsets.symmetric(horizontal: 12),
+                  children: [
+                    // In offline mode, only show Downloads and Settings
+                    if (!widget.isOfflineMode) ...[
+                      // Home
+                      _buildNavItem(
+                        icon: Symbols.home_rounded,
+                        selectedIcon: Symbols.home_rounded,
+                        label: Translations.of(context).navigation.home,
+                        isSelected: widget.selectedIndex == 0,
+                        isFocused: _focusTracker.isFocused(_kHome),
+                        onTap: () => widget.onDestinationSelected(0),
+                        focusNode: _focusTracker.get(_kHome),
+                      ),
+
+                      const SizedBox(height: 8),
+
+                      // Libraries section
+                      _buildLibrariesSection(visibleLibraries, t),
+
+                      const SizedBox(height: 8),
+
+                      // Search
+                      _buildNavItem(
+                        icon: Symbols.search_rounded,
+                        selectedIcon: Symbols.search_rounded,
+                        label: Translations.of(context).navigation.search,
+                        isSelected: widget.selectedIndex == 2,
+                        isFocused: _focusTracker.isFocused(_kSearch),
+                        onTap: () => widget.onDestinationSelected(2),
+                        focusNode: _focusTracker.get(_kSearch),
+                      ),
+
+                      const SizedBox(height: 8),
+                    ],
+
+                    // Downloads
+                    _buildNavItem(
+                      icon: Symbols.download_rounded,
+                      selectedIcon: Symbols.download_rounded,
+                      label: Translations.of(context).navigation.downloads,
+                      isSelected: NavigationTab.isTabAtIndex(
+                        NavigationTabId.downloads,
+                        widget.selectedIndex,
+                        isOffline: widget.isOfflineMode,
+                      ),
+                      isFocused: _focusTracker.isFocused(_kDownloads),
+                      onTap: () => widget.onDestinationSelected(
+                        NavigationTab.indexFor(
+                          NavigationTabId.downloads,
+                          isOffline: widget.isOfflineMode,
+                        ),
+                      ),
+                      focusNode: _focusTracker.get(_kDownloads),
+                    ),
+
+                    const SizedBox(height: 8),
+
+                    // Settings
+                    _buildNavItem(
+                      icon: Symbols.settings_rounded,
+                      selectedIcon: Symbols.settings_rounded,
+                      label: Translations.of(context).navigation.settings,
+                      isSelected: NavigationTab.isTabAtIndex(
+                        NavigationTabId.settings,
+                        widget.selectedIndex,
+                        isOffline: widget.isOfflineMode,
+                      ),
+                      isFocused: _focusTracker.isFocused(_kSettings),
+                      onTap: () => widget.onDestinationSelected(
+                        NavigationTab.indexFor(
+                          NavigationTabId.settings,
+                          isOffline: widget.isOfflineMode,
+                        ),
+                      ),
+                      focusNode: _focusTracker.get(_kSettings),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildNavItem({
+    required IconData icon,
+    required IconData selectedIcon,
+    required String label,
+    required bool isSelected,
+    required bool isFocused,
+    required VoidCallback onTap,
+    required FocusNode focusNode,
+    bool autofocus = false,
+  }) {
+    final t = tokens(context);
+
+    return NavigationRailItem(
+      icon: icon,
+      selectedIcon: selectedIcon,
+      label: Text(
+        label,
+        style: TextStyle(
+          fontSize: 14,
+          fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
+          color: isSelected ? t.text : t.textMuted,
+        ),
+      ),
+      isSelected: isSelected,
+      isFocused: isFocused,
+      onTap: onTap,
+      focusNode: focusNode,
+      autofocus: autofocus,
+    );
+  }
+
+  Widget _buildLibrariesSection(List<PlexLibrary> visibleLibraries, dynamic t) {
+    final isLibrariesSelected =
+        widget.selectedIndex == 1 && widget.selectedLibraryKey == null;
+    final isLibrariesFocused = _focusTracker.isFocused(_kLibraries);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        // Libraries header with expand/collapse
+        Focus(
+          focusNode: _focusTracker.get(_kLibraries),
+          onKeyEvent: (node, event) {
+            if (event is! KeyDownEvent) return KeyEventResult.ignored;
+            if (event.logicalKey.isSelectKey) {
+              setState(() {
+                _librariesExpanded = !_librariesExpanded;
+              });
+              return KeyEventResult.handled;
+            }
+            return KeyEventResult.ignored;
+          },
+          child: Material(
+            color: Colors.transparent,
+            child: InkWell(
+              onTap: () {
+                setState(() {
+                  _librariesExpanded = !_librariesExpanded;
+                });
+              },
+              borderRadius: BorderRadius.circular(12),
+              child: Container(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 12,
+                ),
+                decoration: BoxDecoration(
+                  color: isLibrariesSelected
+                      ? t.text.withValues(alpha: 0.1)
+                      : isLibrariesFocused
+                      ? t.text.withValues(alpha: 0.08)
+                      : null,
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Row(
+                  children: [
+                    AppIcon(
+                      widget.selectedIndex == 1
+                          ? Symbols.video_library_rounded
+                          : Symbols.video_library_rounded,
+                      fill: 1,
+                      size: 22,
+                      color: widget.selectedIndex == 1 ? t.text : t.textMuted,
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: Text(
+                        Translations.of(context).navigation.libraries,
+                        style: TextStyle(
+                          fontSize: 14,
+                          fontWeight: widget.selectedIndex == 1
+                              ? FontWeight.w600
+                              : FontWeight.w400,
+                          color: widget.selectedIndex == 1
+                              ? t.text
+                              : t.textMuted,
+                        ),
+                      ),
+                    ),
+                    AppIcon(
+                      _librariesExpanded
+                          ? Symbols.expand_less_rounded
+                          : Symbols.expand_more_rounded,
+                      fill: 1,
+                      size: 20,
+                      color: t.textMuted,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+
+        // Library items
+        if (_librariesExpanded)
+          _isLoadingLibraries
+              ? Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Center(
+                    child: SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2,
+                        color: t.textMuted,
+                      ),
+                    ),
+                  ),
+                )
+              : visibleLibraries.isEmpty
+              ? Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Text(
+                    Translations.of(context).libraries.noLibrariesFound,
+                    style: TextStyle(fontSize: 12, color: t.textMuted),
+                  ),
+                )
+              : _buildLibraryItems(visibleLibraries, t),
+      ],
+    );
+  }
+
+  /// Get set of library names that appear more than once (not globally unique)
+  Set<String> _getNonUniqueLibraryNames(List<PlexLibrary> libraries) {
+    final nameCounts = <String, int>{};
+    for (final lib in libraries) {
+      nameCounts[lib.title] = (nameCounts[lib.title] ?? 0) + 1;
+    }
+    return nameCounts.entries
+        .where((e) => e.value > 1)
+        .map((e) => e.key)
+        .toSet();
+  }
+
+  Widget _buildLibraryItems(List<PlexLibrary> visibleLibraries, dynamic t) {
+    // Find which library names are not unique
+    final nonUniqueNames = _getNonUniqueLibraryNames(visibleLibraries);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: visibleLibraries.map((library) {
+        final showServerName =
+            nonUniqueNames.contains(library.title) &&
+            library.serverName != null;
+        return _buildLibraryItem(library, t, showServerName: showServerName);
+      }).toList(),
+    );
+  }
+
+  Widget _buildLibraryItem(
+    PlexLibrary library,
+    dynamic t, {
+    bool showServerName = false,
+  }) {
+    final isSelected =
+        widget.selectedIndex == 1 &&
+        widget.selectedLibraryKey == library.globalKey;
+    final isFocused = _focusTracker.isFocused(library.globalKey);
+    final focusNode = _focusTracker.get(library.globalKey);
+
+    return NavigationRailItem(
+      icon: _getLibraryIcon(library.type),
+      selectedIcon: _getLibraryIcon(library.type),
+      label: SizedBox(
+        height: 32, // Fixed height for consistent item sizing
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text(
+              library.title,
+              style: TextStyle(
+                fontSize: 13,
+                fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
+                color: isSelected ? t.text : t.textMuted,
+              ),
+              overflow: TextOverflow.ellipsis,
+            ),
+            if (showServerName)
+              Text(
+                library.serverName!,
+                style: TextStyle(
+                  fontSize: 9,
+                  color: t.textMuted.withValues(alpha: 0.4),
+                ),
+                overflow: TextOverflow.ellipsis,
+              ),
+          ],
+        ),
+      ),
+      isSelected: isSelected,
+      isFocused: isFocused,
+      onTap: () => widget.onLibrarySelected(library.globalKey),
+      focusNode: focusNode,
+      padding: const EdgeInsets.only(left: 28, right: 12, top: 10, bottom: 10),
+      borderRadius: BorderRadius.circular(8),
+      iconSize: 18,
+    );
+  }
+}
diff --git a/lib/widgets/sort_bottom_sheet.dart b/lib/widgets/sort_bottom_sheet.dart
deleted file mode 100644
index 6d5908fd..00000000
--- a/lib/widgets/sort_bottom_sheet.dart
+++ /dev/null
@@ -1,155 +0,0 @@
-import 'package:flutter/material.dart';
-import '../models/plex_sort.dart';
-import '../i18n/strings.g.dart';
-
-class SortBottomSheet extends StatefulWidget {
-  final List<PlexSort> sortOptions;
-  final PlexSort? selectedSort;
-  final bool isSortDescending;
-  final Function(PlexSort, bool) onSortChanged;
-  final VoidCallback? onClear;
-
-  const SortBottomSheet({
-    super.key,
-    required this.sortOptions,
-    required this.selectedSort,
-    required this.isSortDescending,
-    required this.onSortChanged,
-    this.onClear,
-  });
-
-  @override
-  State<SortBottomSheet> createState() => _SortBottomSheetState();
-}
-
-class _SortBottomSheetState extends State<SortBottomSheet> {
-  late PlexSort? _currentSort;
-  late bool _currentDescending;
-
-  @override
-  void initState() {
-    super.initState();
-    _currentSort = widget.selectedSort;
-    _currentDescending = widget.isSortDescending;
-  }
-
-  void _handleSortChange(PlexSort sort, bool descending) {
-    setState(() {
-      _currentSort = sort;
-      _currentDescending = descending;
-    });
-    widget.onSortChanged(sort, descending);
-  }
-
-  void _handleClear() {
-    setState(() {
-      _currentSort = null;
-      _currentDescending = false;
-    });
-    widget.onClear?.call();
-    Navigator.pop(context);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return DraggableScrollableSheet(
-      initialChildSize: 0.6,
-      minChildSize: 0.4,
-      maxChildSize: 0.9,
-      expand: false,
-      builder: (context, scrollController) {
-        return Column(
-          children: [
-            Container(
-              padding: const EdgeInsets.all(16),
-              decoration: BoxDecoration(
-                border: Border(
-                  bottom: BorderSide(color: Theme.of(context).dividerColor),
-                ),
-              ),
-              child: Row(
-                children: [
-                  const Expanded(
-                    child: Text(
-                      'Sort By',
-                      style: TextStyle(
-                        fontSize: 20,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  if (widget.onClear != null)
-                    TextButton(
-                      onPressed: _handleClear,
-                      child: Text(t.common.clear),
-                    ),
-                  IconButton(
-                    icon: const Icon(Icons.close),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                ],
-              ),
-            ),
-            Expanded(
-              child: RadioGroup<PlexSort>(
-                groupValue: _currentSort,
-                onChanged: (PlexSort? value) {
-                  if (value != null) {
-                    _handleSortChange(value, value.defaultDirection == 'desc');
-                  }
-                },
-                child: ListView.builder(
-                  controller: scrollController,
-                  padding: const EdgeInsets.symmetric(vertical: 8),
-                  itemCount: widget.sortOptions.length,
-                  itemBuilder: (context, index) {
-                    final sort = widget.sortOptions[index];
-                    final isSelected = _currentSort?.key == sort.key;
-
-                    return ListTile(
-                      title: Text(sort.title),
-                      trailing: isSelected
-                          ? Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                SegmentedButton<bool>(
-                                  showSelectedIcon: false,
-                                  segments: const [
-                                    ButtonSegment(
-                                      value: false,
-                                      icon: Icon(Icons.arrow_upward, size: 16),
-                                    ),
-                                    ButtonSegment(
-                                      value: true,
-                                      icon: Icon(
-                                        Icons.arrow_downward,
-                                        size: 16,
-                                      ),
-                                    ),
-                                  ],
-                                  selected: {_currentDescending},
-                                  onSelectionChanged: (Set<bool> newSelection) {
-                                    _handleSortChange(sort, newSelection.first);
-                                  },
-                                ),
-                              ],
-                            )
-                          : null,
-                      leading: Radio<PlexSort>(value: sort, toggleable: false),
-                      onTap: () {
-                        _handleSortChange(
-                          sort,
-                          sort.defaultDirection == 'desc',
-                        );
-                      },
-                    );
-                  },
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
diff --git a/lib/widgets/user_avatar_widget.dart b/lib/widgets/user_avatar_widget.dart
deleted file mode 100644
index ca050007..00000000
--- a/lib/widgets/user_avatar_widget.dart
+++ /dev/null
@@ -1,236 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import '../models/plex_home_user.dart';
-import '../i18n/strings.g.dart';
-
-class UserAvatarWidget extends StatelessWidget {
-  final PlexHomeUser user;
-  final double size;
-  final bool showIndicators;
-  final bool useTextLabels;
-  final VoidCallback? onTap;
-
-  const UserAvatarWidget({
-    super.key,
-    required this.user,
-    this.size = 40,
-    this.showIndicators = true,
-    this.useTextLabels = false,
-    this.onTap,
-  });
-
-  Widget _buildPlaceholderAvatar(ThemeData theme) {
-    return Container(
-      width: size,
-      height: size,
-      decoration: BoxDecoration(
-        color: theme.colorScheme.surfaceContainerHighest,
-        shape: BoxShape.circle,
-      ),
-      child: Icon(
-        Icons.person,
-        size: size * 0.6,
-        color: theme.colorScheme.onSurfaceVariant,
-      ),
-    );
-  }
-
-  List<Widget> _buildTextLabels(ThemeData theme) {
-    if (!useTextLabels || !showIndicators) return [];
-
-    final labels = <Widget>[];
-
-    if (user.isAdminUser) {
-      labels.add(
-        Container(
-          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-          decoration: BoxDecoration(
-            color: theme.colorScheme.primary,
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: Text(
-            t.userStatus.admin,
-            style: theme.textTheme.labelSmall?.copyWith(
-              color: theme.colorScheme.onPrimary,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-        ),
-      );
-    }
-
-    if (user.isRestrictedUser && !user.isAdminUser) {
-      labels.add(
-        Container(
-          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-          decoration: BoxDecoration(
-            color: theme.colorScheme.warning ?? Colors.orange,
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: Text(
-            t.userStatus.restricted,
-            style: theme.textTheme.labelSmall?.copyWith(
-              color: theme.colorScheme.onPrimary,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-        ),
-      );
-    }
-
-    if (user.requiresPassword) {
-      labels.add(
-        Container(
-          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-          decoration: BoxDecoration(
-            color: theme.colorScheme.secondary,
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: Text(
-            t.userStatus.protected,
-            style: theme.textTheme.labelSmall?.copyWith(
-              color: theme.colorScheme.onSecondary,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-        ),
-      );
-    }
-
-    if (labels.isEmpty) return [];
-
-    return [
-      const SizedBox(height: 4),
-      Wrap(
-        spacing: 4,
-        runSpacing: 2,
-        alignment: WrapAlignment.center,
-        children: labels,
-      ),
-    ];
-  }
-
-  Widget _buildAvatar(ThemeData theme) {
-    return SizedBox(
-      width: size,
-      height: size,
-      child: Stack(
-        children: [
-          // Avatar image
-          ClipOval(
-            child: CachedNetworkImage(
-              imageUrl: user.thumb,
-              width: size,
-              height: size,
-              fit: BoxFit.cover,
-              placeholder: (context, url) => _buildPlaceholderAvatar(theme),
-              errorWidget: (context, url, error) =>
-                  _buildPlaceholderAvatar(theme),
-            ),
-          ),
-
-          // Indicators (only show icon indicators when not using text labels)
-          if (showIndicators && !useTextLabels) ...[
-            // Admin badge
-            if (user.isAdminUser)
-              Positioned(
-                top: 0,
-                right: 0,
-                child: Container(
-                  width: size * 0.3,
-                  height: size * 0.3,
-                  decoration: BoxDecoration(
-                    color: theme.colorScheme.primary,
-                    shape: BoxShape.circle,
-                    border: Border.all(
-                      color: theme.colorScheme.surface,
-                      width: 1,
-                    ),
-                  ),
-                  child: Icon(
-                    Icons.admin_panel_settings,
-                    size: size * 0.2,
-                    color: theme.colorScheme.onPrimary,
-                  ),
-                ),
-              ),
-
-            // Restricted badge
-            if (user.isRestrictedUser && !user.isAdminUser)
-              Positioned(
-                top: 0,
-                right: 0,
-                child: Container(
-                  width: size * 0.3,
-                  height: size * 0.3,
-                  decoration: BoxDecoration(
-                    color: theme.colorScheme.warning ?? Colors.orange,
-                    shape: BoxShape.circle,
-                    border: Border.all(
-                      color: theme.colorScheme.surface,
-                      width: 1,
-                    ),
-                  ),
-                  child: Icon(
-                    Icons.security,
-                    size: size * 0.2,
-                    color: theme.colorScheme.onPrimary,
-                  ),
-                ),
-              ),
-
-            // Password indicator
-            if (user.requiresPassword)
-              Positioned(
-                bottom: 0,
-                right: 0,
-                child: Container(
-                  width: size * 0.25,
-                  height: size * 0.25,
-                  decoration: BoxDecoration(
-                    color: theme.colorScheme.secondary,
-                    shape: BoxShape.circle,
-                    border: Border.all(
-                      color: theme.colorScheme.surface,
-                      width: 1,
-                    ),
-                  ),
-                  child: Icon(
-                    Icons.lock,
-                    size: size * 0.15,
-                    color: theme.colorScheme.onSecondary,
-                  ),
-                ),
-              ),
-          ],
-        ],
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    if (useTextLabels) {
-      // Return avatar with text labels below
-      return GestureDetector(
-        onTap: onTap,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [_buildAvatar(theme), ..._buildTextLabels(theme)],
-        ),
-      );
-    } else {
-      // Return just the avatar (original behavior)
-      return GestureDetector(onTap: onTap, child: _buildAvatar(theme));
-    }
-  }
-}
-
-// Extension to add warning color to ColorScheme if not available
-extension ColorSchemeExtension on ColorScheme {
-  Color? get warning => brightness == Brightness.light
-      ? Colors.orange.shade600
-      : Colors.orange.shade400;
-}
diff --git a/lib/widgets/video_controls/desktop_video_controls.dart b/lib/widgets/video_controls/desktop_video_controls.dart
new file mode 100644
index 00000000..abf40a4a
--- /dev/null
+++ b/lib/widgets/video_controls/desktop_video_controls.dart
@@ -0,0 +1,524 @@
+import 'dart:io' show Platform;
+
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter/services.dart';
+
+import '../../mpv/mpv.dart';
+import '../../models/plex_media_info.dart';
+import '../../models/plex_media_version.dart';
+import '../../models/plex_metadata.dart';
+import '../../services/fullscreen_state_manager.dart';
+import '../../utils/desktop_window_padding.dart';
+import '../../i18n/strings.g.dart';
+import '../../focus/focusable_wrapper.dart';
+import 'widgets/video_controls_header.dart';
+import 'widgets/video_timeline_bar.dart';
+import 'widgets/volume_control.dart';
+import 'widgets/track_chapter_controls.dart';
+
+/// Desktop-specific video controls layout with top bar and bottom controls
+class DesktopVideoControls extends StatefulWidget {
+  final Player player;
+  final PlexMetadata metadata;
+  final VoidCallback? onNext;
+  final VoidCallback? onPrevious;
+  final List<PlexChapter> chapters;
+  final bool chaptersLoaded;
+  final int seekTimeSmall;
+  final VoidCallback onSeekToPreviousChapter;
+  final VoidCallback onSeekToNextChapter;
+  final ValueChanged<Duration> onSeek;
+  final ValueChanged<Duration> onSeekEnd;
+  final IconData Function(int) getReplayIcon;
+  final IconData Function(int) getForwardIcon;
+
+  /// Called when focus activity occurs (to reset hide timer)
+  final VoidCallback? onFocusActivity;
+
+  /// Called to request focus on play/pause button (e.g., when controls shown via keyboard)
+  final VoidCallback? onRequestPlayPauseFocus;
+
+  /// Called when user navigates up from timeline (to hide controls)
+  final VoidCallback? onHideControls;
+
+  // Track chapter controls parameters
+  final List<PlexMediaVersion> availableVersions;
+  final int selectedMediaIndex;
+  final int boxFitMode;
+  final int audioSyncOffset;
+  final int subtitleSyncOffset;
+  final bool isFullscreen;
+  final VoidCallback? onCycleBoxFitMode;
+  final VoidCallback? onToggleFullscreen;
+  final Function(int)? onSwitchVersion;
+  final Function(AudioTrack)? onAudioTrackChanged;
+  final Function(SubtitleTrack)? onSubtitleTrackChanged;
+  final VoidCallback? onLoadSeekTimes;
+  final VoidCallback? onCancelAutoHide;
+  final VoidCallback? onStartAutoHide;
+  final String serverId;
+
+  const DesktopVideoControls({
+    super.key,
+    required this.player,
+    required this.metadata,
+    this.onNext,
+    this.onPrevious,
+    required this.chapters,
+    required this.chaptersLoaded,
+    required this.seekTimeSmall,
+    required this.onSeekToPreviousChapter,
+    required this.onSeekToNextChapter,
+    required this.onSeek,
+    required this.onSeekEnd,
+    required this.getReplayIcon,
+    required this.getForwardIcon,
+    this.onFocusActivity,
+    this.onRequestPlayPauseFocus,
+    this.onHideControls,
+    this.availableVersions = const [],
+    this.selectedMediaIndex = 0,
+    this.boxFitMode = 0,
+    this.audioSyncOffset = 0,
+    this.subtitleSyncOffset = 0,
+    this.isFullscreen = false,
+    this.onCycleBoxFitMode,
+    this.onToggleFullscreen,
+    this.onSwitchVersion,
+    this.onAudioTrackChanged,
+    this.onSubtitleTrackChanged,
+    this.onLoadSeekTimes,
+    this.onCancelAutoHide,
+    this.onStartAutoHide,
+    this.serverId = '',
+  });
+
+  @override
+  State<DesktopVideoControls> createState() => DesktopVideoControlsState();
+}
+
+class DesktopVideoControlsState extends State<DesktopVideoControls> {
+  // Focus nodes for playback control buttons
+  late final FocusNode _prevItemFocusNode;
+  late final FocusNode _prevChapterFocusNode;
+  late final FocusNode _playPauseFocusNode;
+  late final FocusNode _nextChapterFocusNode;
+  late final FocusNode _nextItemFocusNode;
+  late final FocusNode _timelineFocusNode;
+
+  // Focus node for volume control
+  late final FocusNode _volumeFocusNode;
+
+  // Focus nodes for track/chapter controls (max 8 buttons possible)
+  late final List<FocusNode> _trackControlFocusNodes;
+
+  // List of button focus nodes for horizontal navigation
+  late final List<FocusNode> _buttonFocusNodes;
+
+  @override
+  void initState() {
+    super.initState();
+    _prevItemFocusNode = FocusNode(debugLabel: 'PrevItem');
+    _prevChapterFocusNode = FocusNode(debugLabel: 'PrevChapter');
+    _playPauseFocusNode = FocusNode(debugLabel: 'PlayPause');
+    _nextChapterFocusNode = FocusNode(debugLabel: 'NextChapter');
+    _nextItemFocusNode = FocusNode(debugLabel: 'NextItem');
+    _timelineFocusNode = FocusNode(debugLabel: 'Timeline');
+    _volumeFocusNode = FocusNode(debugLabel: 'Volume');
+
+    // Create focus nodes for track controls (up to 8 buttons)
+    _trackControlFocusNodes = List.generate(
+      8,
+      (i) => FocusNode(debugLabel: 'TrackControl$i'),
+    );
+
+    _buttonFocusNodes = [
+      _prevItemFocusNode,
+      _prevChapterFocusNode,
+      _playPauseFocusNode,
+      _nextChapterFocusNode,
+      _nextItemFocusNode,
+    ];
+  }
+
+  @override
+  void dispose() {
+    _prevItemFocusNode.dispose();
+    _prevChapterFocusNode.dispose();
+    _playPauseFocusNode.dispose();
+    _nextChapterFocusNode.dispose();
+    _nextItemFocusNode.dispose();
+    _timelineFocusNode.dispose();
+    _volumeFocusNode.dispose();
+    for (final node in _trackControlFocusNodes) {
+      node.dispose();
+    }
+    super.dispose();
+  }
+
+  /// Request focus on the play/pause button (called when controls shown via keyboard)
+  void requestPlayPauseFocus() {
+    _playPauseFocusNode.requestFocus();
+  }
+
+  /// Get focus node for volume control
+  FocusNode get volumeFocusNode => _volumeFocusNode;
+
+  /// Get focus nodes for track controls
+  List<FocusNode> get trackControlFocusNodes => _trackControlFocusNodes;
+
+  /// Handle left navigation from first track control - go to volume
+  void navigateFromTrackToVolume() {
+    _volumeFocusNode.requestFocus();
+    widget.onFocusActivity?.call();
+  }
+
+  void _onFocusChange(bool hasFocus) {
+    if (hasFocus) {
+      widget.onFocusActivity?.call();
+    }
+  }
+
+  /// Handle directional navigation for bottom control row.
+  ///
+  /// Returns [KeyEventResult.handled] if the key was processed,
+  /// [KeyEventResult.ignored] otherwise.
+  /// UP always navigates to timeline.
+  KeyEventResult _handleDirectionalNavigation(
+    KeyEvent event, {
+    FocusNode? leftTarget,
+    FocusNode? rightTarget,
+  }) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    if (key == LogicalKeyboardKey.arrowLeft) {
+      leftTarget?.requestFocus();
+      widget.onFocusActivity?.call();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowRight) {
+      rightTarget?.requestFocus();
+      widget.onFocusActivity?.call();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowUp) {
+      _timelineFocusNode.requestFocus();
+      widget.onFocusActivity?.call();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  /// Handle key events for horizontal button navigation
+  KeyEventResult _handleButtonKeyEvent(
+    FocusNode node,
+    KeyEvent event,
+    int index,
+  ) {
+    final leftTarget = index > 0 ? _buttonFocusNodes[index - 1] : null;
+    final rightTarget = index < _buttonFocusNodes.length - 1
+        ? _buttonFocusNodes[index + 1]
+        : _volumeFocusNode;
+
+    return _handleDirectionalNavigation(
+      event,
+      leftTarget: leftTarget,
+      rightTarget: rightTarget,
+    );
+  }
+
+  /// Handle key events for volume control navigation
+  KeyEventResult _handleVolumeKeyEvent(FocusNode node, KeyEvent event) {
+    return _handleDirectionalNavigation(
+      event,
+      leftTarget: _nextItemFocusNode,
+      rightTarget: _trackControlFocusNodes.isNotEmpty
+          ? _trackControlFocusNodes[0]
+          : null,
+    );
+  }
+
+  /// Handle key events for timeline navigation
+  KeyEventResult _handleTimelineKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+    final duration = widget.player.state.duration;
+    final position = widget.player.state.position;
+
+    // UP arrow - hide controls
+    if (key == LogicalKeyboardKey.arrowUp) {
+      widget.onHideControls?.call();
+      return KeyEventResult.handled;
+    }
+
+    // DOWN arrow - move focus to play/pause button
+    if (key == LogicalKeyboardKey.arrowDown) {
+      _playPauseFocusNode.requestFocus();
+      widget.onFocusActivity?.call();
+      return KeyEventResult.handled;
+    }
+
+    // LEFT/RIGHT for smooth scrubbing
+    if (key == LogicalKeyboardKey.arrowLeft ||
+        key == LogicalKeyboardKey.arrowRight) {
+      if (duration.inMilliseconds <= 0) return KeyEventResult.handled;
+
+      // Base step: 0.5% of duration, minimum 500ms
+      final baseStep = Duration(
+        milliseconds: (duration.inMilliseconds * 0.005)
+            .clamp(500, 15000)
+            .toInt(),
+      );
+
+      // Accelerate on key repeat
+      final step = event is KeyRepeatEvent
+          ? Duration(
+              milliseconds: (baseStep.inMilliseconds * 2).clamp(500, 30000),
+            )
+          : baseStep;
+
+      final isForward = key == LogicalKeyboardKey.arrowRight;
+      final newPosition = isForward ? position + step : position - step;
+
+      // Clamp to valid range
+      final clampedPosition = Duration(
+        milliseconds: newPosition.inMilliseconds.clamp(
+          0,
+          duration.inMilliseconds,
+        ),
+      );
+
+      widget.onSeek(clampedPosition);
+      widget.onFocusActivity?.call();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        // Top bar with back button and title
+        _buildTopBar(context),
+        const Spacer(),
+        // Bottom controls
+        _buildBottomControls(context),
+      ],
+    );
+  }
+
+  Widget _buildTopBar(BuildContext context) {
+    // Use global fullscreen state for padding
+    return ListenableBuilder(
+      listenable: FullscreenStateManager(),
+      builder: (context, _) {
+        final isFullscreen = FullscreenStateManager().isFullscreen;
+        // In fullscreen on macOS, use less left padding since traffic lights auto-hide
+        // In normal mode on macOS, need more padding to avoid traffic lights
+        final leftPadding = Platform.isMacOS
+            ? (isFullscreen
+                  ? DesktopWindowPadding.macOSLeftFullscreen
+                  : DesktopWindowPadding.macOSLeft)
+            : DesktopWindowPadding.macOSLeftFullscreen;
+
+        return _buildTopBarContent(context, leftPadding);
+      },
+    );
+  }
+
+  Widget _buildTopBarContent(BuildContext context, double leftPadding) {
+    final topBar = Padding(
+      padding: EdgeInsets.only(left: leftPadding, right: 16),
+      child: VideoControlsHeader(
+        metadata: widget.metadata,
+        style: Platform.isMacOS
+            ? VideoHeaderStyle.singleLine
+            : VideoHeaderStyle.multiLine,
+      ),
+    );
+
+    return DesktopAppBarHelper.wrapWithGestureDetector(topBar, opaque: true);
+  }
+
+  Widget _buildBottomControls(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
+      child: Column(
+        children: [
+          // Row 1: Timeline with time indicators
+          VideoTimelineBar(
+            player: widget.player,
+            chapters: widget.chapters,
+            chaptersLoaded: widget.chaptersLoaded,
+            onSeek: widget.onSeek,
+            onSeekEnd: widget.onSeekEnd,
+            horizontalLayout: true,
+            focusNode: _timelineFocusNode,
+            onKeyEvent: _handleTimelineKeyEvent,
+            onFocusChange: _onFocusChange,
+          ),
+          const SizedBox(height: 4),
+          // Row 2: Playback controls and options
+          Row(
+            children: [
+              // Previous item
+              _buildFocusableButton(
+                focusNode: _prevItemFocusNode,
+                index: 0,
+                icon: Symbols.skip_previous_rounded,
+                color: widget.onPrevious != null
+                    ? Colors.white
+                    : Colors.white54,
+                onPressed: widget.onPrevious,
+                semanticLabel: t.videoControls.previousButton,
+              ),
+              // Previous chapter (or skip backward if no chapters)
+              _buildFocusableButton(
+                focusNode: _prevChapterFocusNode,
+                index: 1,
+                icon: widget.chapters.isEmpty
+                    ? widget.getReplayIcon(widget.seekTimeSmall)
+                    : Symbols.fast_rewind_rounded,
+                onPressed: widget.onSeekToPreviousChapter,
+                semanticLabel: widget.chapters.isEmpty
+                    ? t.videoControls.seekBackwardButton(
+                        seconds: widget.seekTimeSmall,
+                      )
+                    : t.videoControls.previousChapterButton,
+              ),
+              // Play/Pause
+              StreamBuilder<bool>(
+                stream: widget.player.streams.playing,
+                initialData: widget.player.state.playing,
+                builder: (context, snapshot) {
+                  final isPlaying = snapshot.data ?? false;
+                  return _buildFocusableButton(
+                    focusNode: _playPauseFocusNode,
+                    index: 2,
+                    icon: isPlaying
+                        ? Symbols.pause_rounded
+                        : Symbols.play_arrow_rounded,
+                    iconSize: 32,
+                    onPressed: () {
+                      if (isPlaying) {
+                        widget.player.pause();
+                      } else {
+                        widget.player.play();
+                      }
+                    },
+                    semanticLabel: isPlaying
+                        ? t.videoControls.pauseButton
+                        : t.videoControls.playButton,
+                  );
+                },
+              ),
+              // Next chapter (or skip forward if no chapters)
+              _buildFocusableButton(
+                focusNode: _nextChapterFocusNode,
+                index: 3,
+                icon: widget.chapters.isEmpty
+                    ? widget.getForwardIcon(widget.seekTimeSmall)
+                    : Symbols.fast_forward_rounded,
+                onPressed: widget.onSeekToNextChapter,
+                semanticLabel: widget.chapters.isEmpty
+                    ? t.videoControls.seekForwardButton(
+                        seconds: widget.seekTimeSmall,
+                      )
+                    : t.videoControls.nextChapterButton,
+              ),
+              // Next item
+              _buildFocusableButton(
+                focusNode: _nextItemFocusNode,
+                index: 4,
+                icon: Symbols.skip_next_rounded,
+                color: widget.onNext != null ? Colors.white : Colors.white54,
+                onPressed: widget.onNext,
+                semanticLabel: t.videoControls.nextButton,
+              ),
+              const Spacer(),
+              // Volume control
+              VolumeControl(
+                player: widget.player,
+                focusNode: _volumeFocusNode,
+                onKeyEvent: _handleVolumeKeyEvent,
+                onFocusChange: _onFocusChange,
+                onFocusActivity: widget.onFocusActivity,
+              ),
+              const SizedBox(width: 16),
+              // Audio track, subtitle, and chapter controls
+              TrackChapterControls(
+                player: widget.player,
+                chapters: widget.chapters,
+                chaptersLoaded: widget.chaptersLoaded,
+                availableVersions: widget.availableVersions,
+                selectedMediaIndex: widget.selectedMediaIndex,
+                boxFitMode: widget.boxFitMode,
+                audioSyncOffset: widget.audioSyncOffset,
+                subtitleSyncOffset: widget.subtitleSyncOffset,
+                isRotationLocked: false, // Desktop doesn't have rotation lock
+                isFullscreen: widget.isFullscreen,
+                serverId: widget.serverId,
+                onCycleBoxFitMode: widget.onCycleBoxFitMode,
+                onToggleFullscreen: widget.onToggleFullscreen,
+                onSwitchVersion: widget.onSwitchVersion,
+                onAudioTrackChanged: widget.onAudioTrackChanged,
+                onSubtitleTrackChanged: widget.onSubtitleTrackChanged,
+                onLoadSeekTimes: widget.onLoadSeekTimes,
+                onCancelAutoHide: widget.onCancelAutoHide,
+                onStartAutoHide: widget.onStartAutoHide,
+                focusNodes: _trackControlFocusNodes,
+                onFocusChange: _onFocusChange,
+                onNavigateLeft: navigateFromTrackToVolume,
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildFocusableButton({
+    required FocusNode focusNode,
+    required int index,
+    required IconData icon,
+    required VoidCallback? onPressed,
+    required String semanticLabel,
+    Color color = Colors.white,
+    double iconSize = 24,
+  }) {
+    return FocusableWrapper(
+      focusNode: focusNode,
+      onSelect: onPressed,
+      onKeyEvent: (node, event) => _handleButtonKeyEvent(node, event, index),
+      onFocusChange: _onFocusChange,
+      borderRadius: 20,
+      autoScroll: false,
+      useBackgroundFocus: true,
+      semanticLabel: semanticLabel,
+      child: Semantics(
+        label: semanticLabel,
+        button: true,
+        excludeSemantics: true,
+        child: IconButton(
+          icon: AppIcon(icon, fill: 1, color: color, size: iconSize),
+          iconSize: iconSize,
+          onPressed: onPressed,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/helpers/track_filter_helper.dart b/lib/widgets/video_controls/helpers/track_filter_helper.dart
new file mode 100644
index 00000000..6a8bda3e
--- /dev/null
+++ b/lib/widgets/video_controls/helpers/track_filter_helper.dart
@@ -0,0 +1,39 @@
+import '../../../mpv/mpv.dart';
+
+/// Helper class for filtering tracks to remove auto/no tracks
+///
+/// This keeps track-filter rules in one place and eliminates duplication.
+class TrackFilterHelper {
+  /// Generic method to filter tracks based on type
+  static List<T> filterTracks<T>(List<T> tracks) {
+    return tracks.where(_isAllowedTrack).toList();
+  }
+
+  /// Extract and filter tracks from Tracks object
+  static List<T> extractAndFilterTracks<T>(
+    Tracks? tracks,
+    List<T> Function(Tracks?) extractor,
+  ) {
+    return filterTracks<T>(extractor(tracks));
+  }
+
+  /// Check if a track list has multiple tracks (excluding auto/no)
+  static bool hasMultipleTracks<T>(List<T> tracks) {
+    return filterTracks<T>(tracks).length > 1;
+  }
+
+  /// Check if a track list has any tracks (excluding auto/no)
+  static bool hasTracks<T>(List<T> tracks) {
+    return filterTracks<T>(tracks).isNotEmpty;
+  }
+
+  static bool _isAllowedTrack<T>(T track) {
+    final id = switch (track) {
+      AudioTrack t => t.id,
+      SubtitleTrack t => t.id,
+      _ => '',
+    };
+
+    return id != 'auto' && id != 'no';
+  }
+}
diff --git a/lib/widgets/video_controls/helpers/track_selection_helper.dart b/lib/widgets/video_controls/helpers/track_selection_helper.dart
new file mode 100644
index 00000000..20c996b6
--- /dev/null
+++ b/lib/widgets/video_controls/helpers/track_selection_helper.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../../mpv/mpv.dart';
+import '../../../widgets/focusable_list_tile.dart';
+
+/// Helper class for shared track selection logic
+///
+/// Provides common utilities for empty states, "Off" handling, and selection logic
+class TrackSelectionHelper {
+  /// Get the appropriate empty message based on track type
+  static String getEmptyMessage<T>() {
+    if (T == SubtitleTrack) {
+      return 'No subtitles available';
+    } else if (T == AudioTrack) {
+      return 'No audio tracks available';
+    }
+    return 'No tracks available';
+  }
+
+  /// Build a centered empty state widget
+  static Widget buildEmptyState<T>() {
+    return Center(
+      child: Text(
+        getEmptyMessage<T>(),
+        style: const TextStyle(color: Colors.white70),
+      ),
+    );
+  }
+
+  /// Check if "Off" is selected for a track
+  static bool isOffSelected<T>(
+    T? selectedTrack,
+    bool Function(T track)? isOffTrack,
+  ) {
+    return selectedTrack == null || (isOffTrack?.call(selectedTrack) ?? false);
+  }
+
+  /// Get the track ID from a track object
+  static String getTrackId<T>(T track) {
+    if (track is AudioTrack) {
+      return track.id;
+    } else if (track is SubtitleTrack) {
+      return track.id;
+    }
+    return '';
+  }
+
+  /// Build the "Off" list tile for track selection
+  static Widget buildOffTile<T>({
+    required bool isSelected,
+    required VoidCallback onTap,
+    FocusNode? focusNode,
+  }) {
+    return _buildSelectableTile(
+      label: 'Off',
+      isSelected: isSelected,
+      onTap: onTap,
+      focusNode: focusNode,
+    );
+  }
+
+  /// Build a track selection list tile
+  static Widget buildTrackTile<T>({
+    required String label,
+    required bool isSelected,
+    required VoidCallback onTap,
+    FocusNode? focusNode,
+  }) {
+    return _buildSelectableTile(
+      label: label,
+      isSelected: isSelected,
+      onTap: onTap,
+      focusNode: focusNode,
+    );
+  }
+
+  static Widget _buildSelectableTile({
+    required String label,
+    required bool isSelected,
+    required VoidCallback onTap,
+    FocusNode? focusNode,
+  }) {
+    return FocusableListTile(
+      focusNode: focusNode,
+      title: Text(
+        label,
+        style: TextStyle(color: isSelected ? Colors.blue : Colors.white),
+      ),
+      trailing: isSelected
+          ? const AppIcon(Symbols.check_rounded, fill: 1, color: Colors.blue)
+          : null,
+      onTap: onTap,
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/mobile_video_controls.dart b/lib/widgets/video_controls/mobile_video_controls.dart
new file mode 100644
index 00000000..4a535c5a
--- /dev/null
+++ b/lib/widgets/video_controls/mobile_video_controls.dart
@@ -0,0 +1,197 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../mpv/mpv.dart';
+import '../../models/plex_media_info.dart';
+import '../../models/plex_metadata.dart';
+import '../../utils/desktop_window_padding.dart';
+import '../../utils/player_utils.dart';
+import '../../utils/video_control_icons.dart';
+import '../../i18n/strings.g.dart';
+import 'widgets/video_controls_header.dart';
+import 'widgets/video_timeline_bar.dart';
+
+/// Mobile video controls layout for Plex video player
+///
+/// Displays a full-screen overlay with:
+/// - Top bar: Back button, title, and track/chapter controls
+/// - Center: Large playback controls (seek backward, play/pause, seek forward)
+/// - Bottom bar: Timeline slider with chapter markers and timestamps
+class MobileVideoControls extends StatelessWidget {
+  final Player player;
+  final PlexMetadata metadata;
+  final List<PlexChapter> chapters;
+  final bool chaptersLoaded;
+  final int seekTimeSmall;
+  final Widget trackChapterControls;
+  final Function(Duration) onSeek;
+  final Function(Duration) onSeekEnd;
+  final VoidCallback onPlayPause;
+  final VoidCallback? onCancelAutoHide;
+  final VoidCallback? onStartAutoHide;
+
+  const MobileVideoControls({
+    super.key,
+    required this.player,
+    required this.metadata,
+    required this.chapters,
+    required this.chaptersLoaded,
+    required this.seekTimeSmall,
+    required this.trackChapterControls,
+    required this.onSeek,
+    required this.onSeekEnd,
+    required this.onPlayPause,
+    this.onCancelAutoHide,
+    this.onStartAutoHide,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        // Top bar with back button and track/chapter controls
+        _buildTopBar(context),
+        const Spacer(),
+        // Centered large playback controls
+        _buildPlaybackControls(context),
+        const Spacer(),
+        // Progress bar at bottom
+        _buildBottomBar(context),
+      ],
+    );
+  }
+
+  Widget _buildTopBar(BuildContext context) {
+    final topBar = _conditionalSafeArea(
+      context: context,
+      bottom: false, // Only respect top safe area when in portrait
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: VideoControlsHeader(
+          metadata: metadata,
+          style: VideoHeaderStyle.multiLine,
+          trailing: trackChapterControls,
+        ),
+      ),
+    );
+
+    return DesktopAppBarHelper.wrapWithGestureDetector(topBar, opaque: true);
+  }
+
+  Widget _buildPlaybackControls(BuildContext context) {
+    return StreamBuilder<bool>(
+      stream: player.streams.playing,
+      initialData: player.state.playing,
+      builder: (context, snapshot) {
+        final isPlaying = snapshot.data ?? false;
+        return Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            _buildCircularButton(
+              semanticLabel: t.videoControls.seekBackwardButton(
+                seconds: seekTimeSmall,
+              ),
+              icon: getReplayIcon(seekTimeSmall),
+              iconSize: 48,
+              onPressed: () {
+                seekWithClamping(player, Duration(seconds: -seekTimeSmall));
+              },
+            ),
+            const SizedBox(width: 48),
+            _buildCircularButton(
+              semanticLabel: isPlaying
+                  ? t.videoControls.pauseButton
+                  : t.videoControls.playButton,
+              icon: isPlaying
+                  ? Symbols.pause_rounded
+                  : Symbols.play_arrow_rounded,
+              iconSize: 72,
+              onPressed: () {
+                if (isPlaying) {
+                  player.pause();
+                  onCancelAutoHide?.call(); // Cancel auto-hide when paused
+                } else {
+                  player.play();
+                  onStartAutoHide?.call(); // Start auto-hide when playing
+                }
+              },
+            ),
+            const SizedBox(width: 48),
+            _buildCircularButton(
+              semanticLabel: t.videoControls.seekForwardButton(
+                seconds: seekTimeSmall,
+              ),
+              icon: getForwardIcon(seekTimeSmall),
+              iconSize: 48,
+              onPressed: () {
+                seekWithClamping(player, Duration(seconds: seekTimeSmall));
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildBottomBar(BuildContext context) {
+    return _conditionalSafeArea(
+      context: context,
+      top: false, // Only respect bottom safe area when in portrait
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: VideoTimelineBar(
+          player: player,
+          chapters: chapters,
+          chaptersLoaded: chaptersLoaded,
+          onSeek: onSeek,
+          onSeekEnd: onSeekEnd,
+          horizontalLayout: false,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildCircularButton({
+    required String semanticLabel,
+    required IconData icon,
+    required double iconSize,
+    required VoidCallback onPressed,
+  }) {
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.black.withValues(alpha: 0.5),
+        shape: BoxShape.circle,
+      ),
+      child: Semantics(
+        label: semanticLabel,
+        button: true,
+        excludeSemantics: true,
+        child: IconButton(
+          icon: AppIcon(icon, fill: 1, color: Colors.white, size: iconSize),
+          iconSize: iconSize,
+          onPressed: onPressed,
+        ),
+      ),
+    );
+  }
+
+  /// Conditionally wraps child with SafeArea only in portrait mode
+  Widget _conditionalSafeArea({
+    required BuildContext context,
+    required Widget child,
+    bool top = true,
+    bool bottom = true,
+  }) {
+    final orientation = MediaQuery.of(context).orientation;
+    final isPortrait = orientation == Orientation.portrait;
+
+    // Only apply SafeArea in portrait mode
+    if (isPortrait) {
+      return SafeArea(top: top, bottom: bottom, child: child);
+    }
+
+    // In landscape, return child without SafeArea
+    return child;
+  }
+}
diff --git a/lib/widgets/video_controls/sheets/audio_sync_sheet.dart b/lib/widgets/video_controls/sheets/audio_sync_sheet.dart
deleted file mode 100644
index 5d1af9a3..00000000
--- a/lib/widgets/video_controls/sheets/audio_sync_sheet.dart
+++ /dev/null
@@ -1,194 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
-import 'package:plezy/services/settings_service.dart';
-import '../../../i18n/strings.g.dart';
-
-/// Bottom sheet for adjusting audio sync offset
-class AudioSyncSheet extends StatefulWidget {
-  final Player player;
-  final int initialOffset;
-
-  const AudioSyncSheet({
-    super.key,
-    required this.player,
-    required this.initialOffset,
-  });
-
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
-  static void show(BuildContext context, Player player, int initialOffset) {
-    showModalBottomSheet(
-      context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
-      builder: (context) =>
-          AudioSyncSheet(player: player, initialOffset: initialOffset),
-    );
-  }
-
-  @override
-  State<AudioSyncSheet> createState() => _AudioSyncSheetState();
-}
-
-class _AudioSyncSheetState extends State<AudioSyncSheet> {
-  late double _currentOffset;
-
-  @override
-  void initState() {
-    super.initState();
-    _currentOffset = widget.initialOffset.toDouble();
-  }
-
-  void _applyOffset(double offsetMs) async {
-    // Convert milliseconds to seconds for media_kit
-    final offsetSeconds = offsetMs / 1000.0;
-
-    // Apply to player using setProperty
-    await (widget.player.platform as dynamic).setProperty(
-      'audio-delay',
-      offsetSeconds.toString(),
-    );
-
-    // Save to settings
-    final settings = await SettingsService.getInstance();
-    await settings.setAudioSyncOffset(offsetMs.round());
-  }
-
-  void _resetOffset() {
-    setState(() {
-      _currentOffset = 0;
-    });
-    _applyOffset(0);
-  }
-
-  String _formatOffset(double offsetMs) {
-    final sign = offsetMs >= 0 ? '+' : '';
-    return '$sign${offsetMs.round()}ms';
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SafeArea(
-      child: SizedBox(
-        height: MediaQuery.of(context).size.height * 0.75,
-        child: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: Row(
-                children: [
-                  const Icon(Icons.sync, color: Colors.white),
-                  const SizedBox(width: 12),
-                  const Text(
-                    'Audio Sync',
-                    style: TextStyle(
-                      color: Colors.white,
-                      fontSize: 18,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const Spacer(),
-                  IconButton(
-                    icon: const Icon(Icons.close, color: Colors.white),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                ],
-              ),
-            ),
-            const Divider(color: Colors.white24, height: 1),
-            Expanded(
-              child: Padding(
-                padding: const EdgeInsets.all(24),
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    // Current offset display
-                    Text(
-                      _formatOffset(_currentOffset),
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 48,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const SizedBox(height: 8),
-                    Text(
-                      _currentOffset > 0
-                          ? 'Audio plays later'
-                          : _currentOffset < 0
-                          ? 'Audio plays earlier'
-                          : 'No offset',
-                      style: const TextStyle(
-                        color: Colors.white70,
-                        fontSize: 16,
-                      ),
-                    ),
-                    const SizedBox(height: 48),
-                    // Slider
-                    Row(
-                      children: [
-                        Text(
-                          t.videoControls.minusTime(amount: "2", unit: "s"),
-                          style: const TextStyle(color: Colors.white70),
-                        ),
-                        Expanded(
-                          child: Slider(
-                            value: _currentOffset,
-                            min: -2000,
-                            max: 2000,
-                            divisions: 80, // 50ms steps
-                            activeColor: Colors.blue,
-                            inactiveColor: Colors.white24,
-                            onChanged: (value) {
-                              setState(() {
-                                _currentOffset = value;
-                              });
-                            },
-                            onChangeEnd: (value) {
-                              _applyOffset(value);
-                            },
-                          ),
-                        ),
-                        Text(
-                          t.videoControls.addTime(amount: "2", unit: "s"),
-                          style: const TextStyle(color: Colors.white70),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 24),
-                    // Reset button
-                    ElevatedButton.icon(
-                      onPressed: _currentOffset != 0 ? _resetOffset : null,
-                      icon: const Icon(Icons.restart_alt),
-                      label: Text(t.videoControls.resetToZero),
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: Colors.grey[800],
-                        foregroundColor: Colors.white,
-                        disabledBackgroundColor: Colors.grey[850],
-                        disabledForegroundColor: Colors.white38,
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 24,
-                          vertical: 12,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/video_controls/sheets/audio_track_sheet.dart b/lib/widgets/video_controls/sheets/audio_track_sheet.dart
index ba7cd991..e35326d6 100644
--- a/lib/widgets/video_controls/sheets/audio_track_sheet.dart
+++ b/lib/widgets/video_controls/sheets/audio_track_sheet.dart
@@ -1,148 +1,46 @@
 import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../../mpv/mpv.dart';
 import '../../../i18n/strings.g.dart';
+import 'track_selection_sheet.dart';
 
 /// Bottom sheet for selecting audio tracks
-class AudioTrackSheet extends StatelessWidget {
-  final Player player;
-
-  const AudioTrackSheet({super.key, required this.player});
-
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
-  static void show(BuildContext context, Player player) {
-    showModalBottomSheet(
+class AudioTrackSheet {
+  static void show(
+    BuildContext context,
+    Player player, {
+    Function(AudioTrack)? onTrackChanged,
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    TrackSelectionSheet.show<AudioTrack>(
       context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
-      builder: (context) => AudioTrackSheet(player: player),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return StreamBuilder<Tracks>(
-      stream: player.stream.tracks,
-      initialData: player.state.tracks,
-      builder: (context, snapshot) {
-        final tracks = snapshot.data;
-        final audioTracks = (tracks?.audio ?? [])
-            .where((track) => track.id != 'auto' && track.id != 'no')
-            .toList();
-
-        return SafeArea(
-          child: SizedBox(
-            height: MediaQuery.of(context).size.height * 0.75,
-            child: Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(
-                    children: [
-                      const Icon(Icons.audiotrack, color: Colors.white),
-                      const SizedBox(width: 12),
-                      Text(
-                        t.videoControls.audioLabel,
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      const Spacer(),
-                      IconButton(
-                        icon: const Icon(Icons.close, color: Colors.white),
-                        onPressed: () => Navigator.pop(context),
-                      ),
-                    ],
-                  ),
-                ),
-                const Divider(color: Colors.white24, height: 1),
-                if (audioTracks.isEmpty)
-                  const Expanded(
-                    child: Center(
-                      child: Text(
-                        'No audio tracks available',
-                        style: TextStyle(color: Colors.white70),
-                      ),
-                    ),
-                  )
-                else
-                  Expanded(
-                    child: StreamBuilder<Track>(
-                      stream: player.stream.track,
-                      initialData: player.state.track,
-                      builder: (context, selectedSnapshot) {
-                        // Use snapshot data or fall back to current state
-                        final currentTrack =
-                            selectedSnapshot.data ?? player.state.track;
-                        final selectedTrack = currentTrack.audio;
-                        final selectedId = selectedTrack.id;
-
-                        return ListView.builder(
-                          itemCount: audioTracks.length,
-                          itemBuilder: (context, index) {
-                            final audioTrack = audioTracks[index];
-                            final isSelected = audioTrack.id == selectedId;
-
-                            final parts = <String>[];
-                            if (audioTrack.title != null &&
-                                audioTrack.title!.isNotEmpty) {
-                              parts.add(audioTrack.title!);
-                            }
-                            if (audioTrack.language != null &&
-                                audioTrack.language!.isNotEmpty) {
-                              parts.add(audioTrack.language!.toUpperCase());
-                            }
-                            if (audioTrack.codec != null &&
-                                audioTrack.codec!.isNotEmpty) {
-                              parts.add(audioTrack.codec!.toUpperCase());
-                            }
-                            if (audioTrack.channelscount != null) {
-                              parts.add('${audioTrack.channelscount}ch');
-                            }
-
-                            final label = parts.isEmpty
-                                ? 'Audio Track ${index + 1}'
-                                : parts.join(' · ');
-
-                            return ListTile(
-                              title: Text(
-                                label,
-                                style: TextStyle(
-                                  color: isSelected
-                                      ? Colors.blue
-                                      : Colors.white,
-                                ),
-                              ),
-                              trailing: isSelected
-                                  ? const Icon(Icons.check, color: Colors.blue)
-                                  : null,
-                              onTap: () {
-                                player.setAudioTrack(audioTrack);
-                                Navigator.pop(context);
-                              },
-                            );
-                          },
-                        );
-                      },
-                    ),
-                  ),
-              ],
-            ),
-          ),
-        );
+      player: player,
+      title: t.videoControls.audioLabel,
+      icon: Symbols.audiotrack_rounded,
+      extractTracks: (tracks) => tracks?.audio ?? [],
+      getCurrentTrack: (track) => track.audio,
+      buildLabel: (audioTrack, index) {
+        final parts = <String>[];
+        if (audioTrack.title != null && audioTrack.title!.isNotEmpty) {
+          parts.add(audioTrack.title!);
+        }
+        if (audioTrack.language != null && audioTrack.language!.isNotEmpty) {
+          parts.add(audioTrack.language!.toUpperCase());
+        }
+        if (audioTrack.codec != null && audioTrack.codec!.isNotEmpty) {
+          parts.add(audioTrack.codec!.toUpperCase());
+        }
+        if (audioTrack.channelsCount != null) {
+          parts.add('${audioTrack.channelsCount}ch');
+        }
+        return parts.isEmpty ? 'Audio Track ${index + 1}' : parts.join(' · ');
       },
+      setTrack: (track) => player.selectAudioTrack(track),
+      onTrackChanged: onTrackChanged,
+      onOpen: onOpen,
+      onClose: onClose,
     );
   }
 }
diff --git a/lib/widgets/video_controls/sheets/base_video_control_sheet.dart b/lib/widgets/video_controls/sheets/base_video_control_sheet.dart
new file mode 100644
index 00000000..d7a7d770
--- /dev/null
+++ b/lib/widgets/video_controls/sheets/base_video_control_sheet.dart
@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+import 'video_sheet_header.dart';
+
+/// Base class for video control bottom sheets providing common UI structure
+class BaseVideoControlSheet extends StatelessWidget {
+  final String title;
+  final IconData icon;
+  final Widget child;
+  final Color? iconColor;
+  final VoidCallback? onBack;
+
+  const BaseVideoControlSheet({
+    super.key,
+    required this.title,
+    required this.icon,
+    required this.child,
+    this.iconColor,
+    this.onBack,
+  });
+
+  /// Get consistent bottom sheet constraints across all video control sheets
+  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
+    final size = MediaQuery.of(context).size;
+    final isDesktop = size.width > 600;
+
+    return BoxConstraints(
+      maxWidth: isDesktop ? 700 : double.infinity,
+      maxHeight: isDesktop ? 400 : size.height * 0.75,
+      minHeight: isDesktop ? 300 : size.height * 0.5,
+    );
+  }
+
+  /// Helper method to show a modal bottom sheet with consistent styling
+  static Future<T?> showSheet<T>({
+    required BuildContext context,
+    required WidgetBuilder builder,
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    onOpen?.call();
+    return showModalBottomSheet<T>(
+      context: context,
+      backgroundColor: Colors.grey[900],
+      isScrollControlled: true,
+      constraints: getBottomSheetConstraints(context),
+      builder: builder,
+    ).whenComplete(() {
+      onClose?.call();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SafeArea(
+      child: SizedBox(
+        height: MediaQuery.of(context).size.height * 0.75,
+        child: Column(
+          children: [
+            VideoSheetHeader(
+              title: title,
+              icon: icon,
+              iconColor: iconColor,
+              onBack: onBack,
+            ),
+            const Divider(color: Colors.white24, height: 1),
+            Expanded(child: child),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/sheets/chapter_sheet.dart b/lib/widgets/video_controls/sheets/chapter_sheet.dart
index f77ea04a..c07daf16 100644
--- a/lib/widgets/video_controls/sheets/chapter_sheet.dart
+++ b/lib/widgets/video_controls/sheets/chapter_sheet.dart
@@ -1,234 +1,218 @@
 import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
-import 'package:provider/provider.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../../mpv/mpv.dart';
+import '../../../services/plex_client.dart';
+import '../../../services/download_storage_service.dart';
 import '../../../models/plex_media_info.dart';
-import '../../../providers/plex_client_provider.dart';
+import '../../../utils/duration_formatter.dart';
+import '../../../utils/provider_extensions.dart';
+import '../../../widgets/focusable_bottom_sheet.dart';
+import '../../../widgets/focusable_list_tile.dart';
+import 'base_video_control_sheet.dart';
+import 'video_control_sheet_launcher.dart';
+import '../../plex_optimized_image.dart';
 
 /// Bottom sheet for selecting chapters
-class ChapterSheet extends StatelessWidget {
+class ChapterSheet extends StatefulWidget {
   final Player player;
   final List<PlexChapter> chapters;
   final bool chaptersLoaded;
+  final String? serverId; // Server ID for the metadata these chapters belong to
 
   const ChapterSheet({
     super.key,
     required this.player,
     required this.chapters,
     required this.chaptersLoaded,
+    this.serverId,
   });
 
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
   static void show(
     BuildContext context,
     Player player,
     List<PlexChapter> chapters,
-    bool chaptersLoaded,
-  ) {
-    showModalBottomSheet(
+    bool chaptersLoaded, {
+    String? serverId,
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    VideoControlSheetLauncher.show(
       context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
+      onOpen: onOpen,
+      onClose: onClose,
       builder: (context) => ChapterSheet(
         player: player,
         chapters: chapters,
         chaptersLoaded: chaptersLoaded,
+        serverId: serverId,
       ),
     );
   }
 
-  String _formatDuration(Duration duration) {
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-    final seconds = duration.inSeconds.remainder(60);
+  @override
+  State<ChapterSheet> createState() => _ChapterSheetState();
+}
 
-    if (hours > 0) {
-      return '$hours:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-    } else {
-      return '$minutes:${seconds.toString().padLeft(2, '0')}';
+class _ChapterSheetState extends State<ChapterSheet> {
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _initialFocusNode = FocusNode(debugLabel: 'ChapterSheetInitialFocus');
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  /// Get the PlexClient for chapters, or null if unavailable (offline mode)
+  PlexClient? _tryGetClientForChapters(BuildContext context) {
+    if (widget.serverId == null) return null;
+    try {
+      return context.getClientForServer(widget.serverId!);
+    } catch (_) {
+      return null;
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    return StreamBuilder<Duration>(
-      stream: player.stream.position,
-      initialData: player.state.position,
-      builder: (context, positionSnapshot) {
-        final currentPosition = positionSnapshot.data ?? Duration.zero;
-        final currentPositionMs = currentPosition.inMilliseconds;
+    return FocusableBottomSheet(
+      initialFocusNode: _initialFocusNode,
+      child: StreamBuilder<Duration>(
+        stream: widget.player.streams.position,
+        initialData: widget.player.state.position,
+        builder: (context, positionSnapshot) {
+          final currentPosition = positionSnapshot.data ?? Duration.zero;
+          final currentPositionMs = currentPosition.inMilliseconds;
 
-        // Find the current chapter based on position
-        int? currentChapterIndex;
-        for (int i = 0; i < chapters.length; i++) {
-          final chapter = chapters[i];
-          final startMs = chapter.startTimeOffset ?? 0;
-          final endMs =
-              chapter.endTimeOffset ??
-              (i < chapters.length - 1
-                  ? chapters[i + 1].startTimeOffset ?? 0
-                  : double.maxFinite.toInt());
+          // Find the current chapter based on position
+          int? currentChapterIndex;
+          for (int i = 0; i < widget.chapters.length; i++) {
+            final chapter = widget.chapters[i];
+            final startMs = chapter.startTimeOffset ?? 0;
+            final endMs =
+                chapter.endTimeOffset ??
+                (i < widget.chapters.length - 1
+                    ? widget.chapters[i + 1].startTimeOffset ?? 0
+                    : double.maxFinite.toInt());
 
-          if (currentPositionMs >= startMs && currentPositionMs < endMs) {
-            currentChapterIndex = i;
-            break;
+            if (currentPositionMs >= startMs && currentPositionMs < endMs) {
+              currentChapterIndex = i;
+              break;
+            }
           }
-        }
 
-        return SafeArea(
-          child: SizedBox(
-            height: MediaQuery.of(context).size.height * 0.75,
-            child: Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(
-                    children: [
-                      const Icon(Icons.video_library, color: Colors.white),
-                      const SizedBox(width: 12),
-                      const Text(
-                        'Chapters',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      const Spacer(),
-                      IconButton(
-                        icon: const Icon(Icons.close, color: Colors.white),
-                        onPressed: () => Navigator.pop(context),
-                      ),
-                    ],
-                  ),
-                ),
-                const Divider(color: Colors.white24, height: 1),
-                if (!chaptersLoaded)
-                  const Expanded(
-                    child: Center(child: CircularProgressIndicator()),
-                  )
-                else if (chapters.isEmpty)
-                  const Expanded(
-                    child: Center(
-                      child: Text(
-                        'No chapters available',
-                        style: TextStyle(color: Colors.white70),
-                      ),
-                    ),
-                  )
-                else
-                  Expanded(
-                    child: ListView.builder(
-                      itemCount: chapters.length,
-                      itemBuilder: (context, index) {
-                        final chapter = chapters[index];
-                        final isCurrentChapter = currentChapterIndex == index;
+          Widget content;
+          if (!widget.chaptersLoaded) {
+            content = const Center(child: CircularProgressIndicator());
+          } else if (widget.chapters.isEmpty) {
+            content = const Center(
+              child: Text(
+                'No chapters available',
+                style: TextStyle(color: Colors.white70),
+              ),
+            );
+          } else {
+            content = ListView.builder(
+              itemCount: widget.chapters.length,
+              itemBuilder: (context, index) {
+                final chapter = widget.chapters[index];
+                final isCurrentChapter = currentChapterIndex == index;
 
-                        return ListTile(
-                          leading: chapter.thumb != null
-                              ? Stack(
-                                  children: [
-                                    ClipRRect(
-                                      borderRadius: BorderRadius.circular(4),
-                                      child: Consumer<PlexClientProvider>(
-                                        builder:
-                                            (context, clientProvider, child) {
-                                              final client =
-                                                  clientProvider.client;
-                                              if (client == null) {
-                                                return const Icon(
-                                                  Icons.image,
-                                                  color: Colors.white54,
-                                                  size: 34,
-                                                );
-                                              }
-                                              return Image.network(
-                                                client.getThumbnailUrl(
-                                                  chapter.thumb,
-                                                ),
-                                                width: 60,
-                                                height: 34,
-                                                fit: BoxFit.cover,
-                                                errorBuilder:
-                                                    (
-                                                      context,
-                                                      error,
-                                                      stackTrace,
-                                                    ) => const Icon(
-                                                      Icons.image,
-                                                      color: Colors.white54,
-                                                      size: 34,
-                                                    ),
-                                              );
-                                            },
-                                      ),
+                // Get local file path for offline chapter thumbnails
+                final localThumbPath =
+                    widget.serverId != null && chapter.thumb != null
+                    ? DownloadStorageService.instance.getArtworkPathSync(
+                        widget.serverId!,
+                        chapter.thumb!,
+                      )
+                    : null;
+
+                return FocusableListTile(
+                  focusNode: index == 0 ? _initialFocusNode : null,
+                  leading: chapter.thumb != null
+                      ? Stack(
+                          children: [
+                            ClipRRect(
+                              borderRadius: BorderRadius.circular(4),
+                              child: PlexOptimizedImage.thumb(
+                                client: _tryGetClientForChapters(context),
+                                imagePath: chapter.thumb,
+                                localFilePath: localThumbPath,
+                                width: 60,
+                                height: 34,
+                                fit: BoxFit.cover,
+                                errorWidget: (context, url, error) =>
+                                    const AppIcon(
+                                      Symbols.image_rounded,
+                                      fill: 1,
+                                      color: Colors.white54,
+                                      size: 34,
                                     ),
-                                    if (isCurrentChapter)
-                                      Positioned.fill(
-                                        child: Container(
-                                          decoration: BoxDecoration(
-                                            borderRadius: BorderRadius.circular(
-                                              4,
-                                            ),
-                                            border: Border.all(
-                                              color: Colors.blue,
-                                              width: 2,
-                                            ),
-                                          ),
-                                        ),
-                                      ),
-                                  ],
-                                )
-                              : null,
-                          title: Text(
-                            chapter.label,
-                            style: TextStyle(
-                              color: isCurrentChapter
-                                  ? Colors.blue
-                                  : Colors.white,
-                              fontWeight: isCurrentChapter
-                                  ? FontWeight.bold
-                                  : FontWeight.normal,
+                              ),
                             ),
-                          ),
-                          subtitle: Text(
-                            _formatDuration(chapter.startTime),
-                            style: TextStyle(
-                              color: isCurrentChapter
-                                  ? Colors.blue.withValues(alpha: 0.7)
-                                  : Colors.white70,
-                              fontSize: 12,
-                            ),
-                          ),
-                          trailing: isCurrentChapter
-                              ? const Icon(
-                                  Icons.play_circle_filled,
-                                  color: Colors.blue,
-                                )
-                              : null,
-                          onTap: () {
-                            player.seek(chapter.startTime);
-                            Navigator.pop(context);
-                          },
-                        );
-                      },
+                            if (isCurrentChapter)
+                              Positioned.fill(
+                                child: Container(
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(4),
+                                    border: Border.all(
+                                      color: Colors.blue,
+                                      width: 2,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                          ],
+                        )
+                      : null,
+                  title: Text(
+                    chapter.label,
+                    style: TextStyle(
+                      color: isCurrentChapter ? Colors.blue : Colors.white,
+                      fontWeight: isCurrentChapter
+                          ? FontWeight.bold
+                          : FontWeight.normal,
                     ),
                   ),
-              ],
-            ),
-          ),
-        );
-      },
+                  subtitle: Text(
+                    formatDurationTimestamp(chapter.startTime),
+                    style: TextStyle(
+                      color: isCurrentChapter
+                          ? Colors.blue.withValues(alpha: 0.7)
+                          : Colors.white70,
+                      fontSize: 12,
+                    ),
+                  ),
+                  trailing: isCurrentChapter
+                      ? const AppIcon(
+                          Symbols.play_circle_rounded,
+                          fill: 1,
+                          color: Colors.blue,
+                        )
+                      : null,
+                  onTap: () {
+                    widget.player.seek(chapter.startTime);
+                    Navigator.pop(context);
+                  },
+                );
+              },
+            );
+          }
+
+          return BaseVideoControlSheet(
+            title: 'Chapters',
+            icon: Symbols.video_library_rounded,
+            child: content,
+          );
+        },
+      ),
     );
   }
 }
diff --git a/lib/widgets/video_controls/sheets/playback_speed_sheet.dart b/lib/widgets/video_controls/sheets/playback_speed_sheet.dart
deleted file mode 100644
index ea96e225..00000000
--- a/lib/widgets/video_controls/sheets/playback_speed_sheet.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
-
-/// Bottom sheet for selecting playback speed
-class PlaybackSpeedSheet extends StatelessWidget {
-  final Player player;
-
-  const PlaybackSpeedSheet({super.key, required this.player});
-
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
-  static void show(BuildContext context, Player player) {
-    showModalBottomSheet(
-      context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
-      builder: (context) => PlaybackSpeedSheet(player: player),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return StreamBuilder<double>(
-      stream: player.stream.rate,
-      initialData: player.state.rate,
-      builder: (context, snapshot) {
-        final currentRate = snapshot.data ?? 1.0;
-
-        // Define available playback speeds
-        final speeds = [0.5, 0.75, 1.0, 1.25, 1.5, 2.0, 2.5, 3.0];
-
-        return SafeArea(
-          child: SizedBox(
-            height: MediaQuery.of(context).size.height * 0.75,
-            child: Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(
-                    children: [
-                      const Icon(Icons.speed, color: Colors.white),
-                      const SizedBox(width: 12),
-                      const Text(
-                        'Playback Speed',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      const Spacer(),
-                      IconButton(
-                        icon: const Icon(Icons.close, color: Colors.white),
-                        onPressed: () => Navigator.pop(context),
-                      ),
-                    ],
-                  ),
-                ),
-                const Divider(color: Colors.white24, height: 1),
-                Expanded(
-                  child: ListView.builder(
-                    itemCount: speeds.length,
-                    itemBuilder: (context, index) {
-                      final speed = speeds[index];
-                      final isSelected = (currentRate - speed).abs() < 0.01;
-
-                      // Format speed label
-                      final label = speed == 1.0
-                          ? 'Normal'
-                          : '${speed.toStringAsFixed(2)}x';
-
-                      return ListTile(
-                        title: Text(
-                          label,
-                          style: TextStyle(
-                            color: isSelected ? Colors.blue : Colors.white,
-                          ),
-                        ),
-                        trailing: isSelected
-                            ? const Icon(Icons.check, color: Colors.blue)
-                            : null,
-                        onTap: () {
-                          player.setRate(speed);
-                          Navigator.pop(context);
-                        },
-                      );
-                    },
-                  ),
-                ),
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-}
diff --git a/lib/widgets/video_controls/sheets/sleep_timer_sheet.dart b/lib/widgets/video_controls/sheets/sleep_timer_sheet.dart
deleted file mode 100644
index b2786ba3..00000000
--- a/lib/widgets/video_controls/sheets/sleep_timer_sheet.dart
+++ /dev/null
@@ -1,234 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
-import '../../../services/settings_service.dart';
-import '../../../services/sleep_timer_service.dart';
-import '../../../i18n/strings.g.dart';
-
-/// Bottom sheet for sleep timer configuration
-class SleepTimerSheet extends StatelessWidget {
-  final Player player;
-  final int defaultDuration;
-
-  const SleepTimerSheet({
-    super.key,
-    required this.player,
-    required this.defaultDuration,
-  });
-
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
-  static void show(BuildContext context, Player player) async {
-    final settingsService = await SettingsService.getInstance();
-    final defaultDuration = settingsService.getSleepTimerDuration();
-
-    if (!context.mounted) return;
-
-    showModalBottomSheet(
-      context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
-      builder: (context) =>
-          SleepTimerSheet(player: player, defaultDuration: defaultDuration),
-    );
-  }
-
-  String _formatSleepTimerDuration(Duration duration) {
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-    final seconds = duration.inSeconds.remainder(60);
-
-    if (hours > 0) {
-      return '${hours}h ${minutes}m ${seconds}s';
-    } else if (minutes > 0) {
-      return '${minutes}m ${seconds}s';
-    } else {
-      return '${seconds}s';
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final sleepTimer = SleepTimerService();
-
-    return ListenableBuilder(
-      listenable: sleepTimer,
-      builder: (context, _) {
-        final durations = [5, 10, 15, 30, 45, 60, 90, 120];
-        // Add default duration if not in list
-        if (!durations.contains(defaultDuration)) {
-          durations.add(defaultDuration);
-          durations.sort();
-        }
-        final remainingTime = sleepTimer.remainingTime;
-
-        return SafeArea(
-          child: SizedBox(
-            height: MediaQuery.of(context).size.height * 0.75,
-            child: Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(
-                    children: [
-                      Icon(
-                        sleepTimer.isActive
-                            ? Icons.bedtime
-                            : Icons.bedtime_outlined,
-                        color: sleepTimer.isActive
-                            ? Colors.amber
-                            : Colors.white,
-                      ),
-                      const SizedBox(width: 12),
-                      const Text(
-                        'Sleep Timer',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      const Spacer(),
-                      IconButton(
-                        icon: const Icon(Icons.close, color: Colors.white),
-                        onPressed: () => Navigator.pop(context),
-                      ),
-                    ],
-                  ),
-                ),
-                const Divider(color: Colors.white24, height: 1),
-
-                // Show current timer status if active
-                if (sleepTimer.isActive && remainingTime != null) ...[
-                  Container(
-                    padding: const EdgeInsets.all(16),
-                    color: Colors.amber.withValues(alpha: 0.1),
-                    child: Column(
-                      children: [
-                        const Text(
-                          'Timer Active',
-                          style: TextStyle(
-                            color: Colors.amber,
-                            fontSize: 16,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                        const SizedBox(height: 8),
-                        Text(
-                          'Playback will pause in ${_formatSleepTimerDuration(remainingTime)}',
-                          style: const TextStyle(
-                            color: Colors.white70,
-                            fontSize: 14,
-                          ),
-                        ),
-                        const SizedBox(height: 16),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            OutlinedButton.icon(
-                              icon: const Icon(Icons.add),
-                              label: Text(
-                                t.videoControls.addTime(
-                                  amount: "15",
-                                  unit: " min",
-                                ),
-                              ),
-                              style: OutlinedButton.styleFrom(
-                                foregroundColor: Colors.white,
-                                side: const BorderSide(color: Colors.white54),
-                              ),
-                              onPressed: () {
-                                sleepTimer.extendTimer(
-                                  const Duration(minutes: 15),
-                                );
-                              },
-                            ),
-                            const SizedBox(width: 12),
-                            FilledButton.icon(
-                              icon: const Icon(Icons.cancel),
-                              label: Text(t.common.cancel),
-                              style: FilledButton.styleFrom(
-                                backgroundColor: Colors.red,
-                              ),
-                              onPressed: () {
-                                sleepTimer.cancelTimer();
-                                Navigator.pop(context);
-                              },
-                            ),
-                          ],
-                        ),
-                      ],
-                    ),
-                  ),
-                  const Divider(color: Colors.white24, height: 1),
-                ],
-
-                // Duration selection list
-                Expanded(
-                  child: ListView.builder(
-                    itemCount: durations.length,
-                    itemBuilder: (context, index) {
-                      final minutes = durations[index];
-                      final label = minutes < 60
-                          ? '$minutes minutes'
-                          : '${(minutes / 60).toStringAsFixed(minutes % 60 == 0 ? 0 : 1)} ${minutes == 60 ? 'hour' : 'hours'}';
-
-                      return ListTile(
-                        leading: const Icon(Icons.timer, color: Colors.white70),
-                        title: Text(
-                          label,
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontWeight: FontWeight.normal,
-                          ),
-                        ),
-                        onTap: () {
-                          sleepTimer.startTimer(Duration(minutes: minutes), () {
-                            // Pause playback when timer completes
-                            player.pause();
-
-                            // Show a snackbar notification
-                            if (context.mounted) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                const SnackBar(
-                                  content: Text(
-                                    'Sleep timer completed - playback paused',
-                                  ),
-                                  duration: Duration(seconds: 3),
-                                ),
-                              );
-                            }
-                          });
-                          Navigator.pop(context);
-
-                          // Show confirmation snackbar
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text(
-                                t.messages.sleepTimerSet(label: label),
-                              ),
-                              duration: const Duration(seconds: 2),
-                            ),
-                          );
-                        },
-                      );
-                    },
-                  ),
-                ),
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-}
diff --git a/lib/widgets/video_controls/sheets/subtitle_track_sheet.dart b/lib/widgets/video_controls/sheets/subtitle_track_sheet.dart
index ab3858b7..ec4409ca 100644
--- a/lib/widgets/video_controls/sheets/subtitle_track_sheet.dart
+++ b/lib/widgets/video_controls/sheets/subtitle_track_sheet.dart
@@ -1,185 +1,57 @@
 import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../../mpv/mpv.dart';
 import '../../../i18n/strings.g.dart';
+import 'track_selection_sheet.dart';
 
 /// Bottom sheet for selecting subtitle tracks
-class SubtitleTrackSheet extends StatelessWidget {
-  final Player player;
-
-  const SubtitleTrackSheet({super.key, required this.player});
-
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
-  static void show(BuildContext context, Player player) {
-    showModalBottomSheet(
+class SubtitleTrackSheet {
+  static void show(
+    BuildContext context,
+    Player player, {
+    Function(SubtitleTrack)? onTrackChanged,
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    TrackSelectionSheet.show<SubtitleTrack>(
       context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
-      builder: (context) => SubtitleTrackSheet(player: player),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return StreamBuilder<Tracks>(
-      stream: player.stream.tracks,
-      initialData: player.state.tracks,
-      builder: (context, snapshot) {
-        final tracks = snapshot.data;
-        final subtitles = (tracks?.subtitle ?? [])
-            .where((track) => track.id != 'auto' && track.id != 'no')
-            .toList();
-
-        return SafeArea(
-          child: SizedBox(
-            height: MediaQuery.of(context).size.height * 0.75,
-            child: Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(
-                    children: [
-                      const Icon(Icons.subtitles, color: Colors.white),
-                      const SizedBox(width: 12),
-                      Text(
-                        t.videoControls.subtitlesLabel,
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      const Spacer(),
-                      IconButton(
-                        icon: const Icon(Icons.close, color: Colors.white),
-                        onPressed: () => Navigator.pop(context),
-                      ),
-                    ],
-                  ),
-                ),
-                const Divider(color: Colors.white24, height: 1),
-                if (subtitles.isEmpty)
-                  const Expanded(
-                    child: Center(
-                      child: Text(
-                        'No subtitles available',
-                        style: TextStyle(color: Colors.white70),
-                      ),
-                    ),
-                  )
-                else
-                  Expanded(
-                    child: StreamBuilder<Track>(
-                      stream: player.stream.track,
-                      initialData: player.state.track,
-                      builder: (context, selectedSnapshot) {
-                        // Use snapshot data or fall back to current state
-                        final currentTrack =
-                            selectedSnapshot.data ?? player.state.track;
-                        final selectedTrack = currentTrack.subtitle;
-                        final selectedId = selectedTrack.id;
-                        final isOffSelected = selectedId == 'no';
-
-                        return ListView.builder(
-                          itemCount:
-                              subtitles.length + 1, // +1 for "Off" option
-                          itemBuilder: (context, index) {
-                            // First item is "Off"
-                            if (index == 0) {
-                              return ListTile(
-                                title: Text(
-                                  'Off',
-                                  style: TextStyle(
-                                    color: isOffSelected
-                                        ? Colors.blue
-                                        : Colors.white,
-                                  ),
-                                ),
-                                trailing: isOffSelected
-                                    ? const Icon(
-                                        Icons.check,
-                                        color: Colors.blue,
-                                      )
-                                    : null,
-                                onTap: () {
-                                  player.setSubtitleTrack(SubtitleTrack.no());
-                                  Navigator.pop(context);
-                                },
-                              );
-                            }
-
-                            // Subsequent items are subtitle tracks
-                            final subtitle = subtitles[index - 1];
-                            final isSelected = subtitle.id == selectedId;
-
-                            // Build label with available info
-                            final parts = <String>[];
-                            if (subtitle.title != null &&
-                                subtitle.title!.isNotEmpty) {
-                              parts.add(subtitle.title!);
-                            }
-                            if (subtitle.language != null &&
-                                subtitle.language!.isNotEmpty) {
-                              parts.add(subtitle.language!.toUpperCase());
-                            }
-                            if (subtitle.codec != null &&
-                                subtitle.codec!.isNotEmpty) {
-                              // Format codec names nicely
-                              String codecName = subtitle.codec!.toUpperCase();
-                              if (codecName == 'SUBRIP') {
-                                codecName = 'SRT';
-                              } else if (codecName == 'DVD_SUBTITLE') {
-                                codecName = 'DVD';
-                              } else if (codecName == 'ASS' ||
-                                  codecName == 'SSA') {
-                                codecName = codecName; // Keep as-is
-                              } else if (codecName == 'WEBVTT') {
-                                codecName = 'VTT';
-                              }
-                              parts.add(codecName);
-                            }
-
-                            final label = parts.isEmpty
-                                ? 'Track $index'
-                                : parts.join(' · ');
-
-                            return ListTile(
-                              title: Text(
-                                label,
-                                style: TextStyle(
-                                  color: isSelected
-                                      ? Colors.blue
-                                      : Colors.white,
-                                ),
-                              ),
-                              trailing: isSelected
-                                  ? const Icon(Icons.check, color: Colors.blue)
-                                  : null,
-                              onTap: () {
-                                player.setSubtitleTrack(subtitle);
-                                Navigator.pop(context);
-                              },
-                            );
-                          },
-                        );
-                      },
-                    ),
-                  ),
-              ],
-            ),
-          ),
-        );
+      player: player,
+      title: t.videoControls.subtitlesLabel,
+      icon: Symbols.subtitles_rounded,
+      extractTracks: (tracks) => tracks?.subtitle ?? [],
+      getCurrentTrack: (track) => track.subtitle,
+      buildLabel: (subtitle, index) {
+        final parts = <String>[];
+        if (subtitle.title != null && subtitle.title!.isNotEmpty) {
+          parts.add(subtitle.title!);
+        }
+        if (subtitle.language != null && subtitle.language!.isNotEmpty) {
+          parts.add(subtitle.language!.toUpperCase());
+        }
+        if (subtitle.codec != null && subtitle.codec!.isNotEmpty) {
+          // Format codec names nicely
+          String codecName = subtitle.codec!.toUpperCase();
+          if (codecName == 'SUBRIP') {
+            codecName = 'SRT';
+          } else if (codecName == 'DVD_SUBTITLE') {
+            codecName = 'DVD';
+          } else if (codecName == 'ASS' || codecName == 'SSA') {
+            codecName = codecName; // Keep as-is
+          } else if (codecName == 'WEBVTT') {
+            codecName = 'VTT';
+          }
+          parts.add(codecName);
+        }
+        return parts.isEmpty ? 'Track ${index + 1}' : parts.join(' · ');
       },
+      setTrack: (track) => player.selectSubtitleTrack(track),
+      onTrackChanged: onTrackChanged,
+      showOffOption: true,
+      createOffTrack: () => SubtitleTrack.off,
+      isOffTrack: (track) => track.id == 'no',
+      onOpen: onOpen,
+      onClose: onClose,
     );
   }
 }
diff --git a/lib/widgets/video_controls/sheets/track_selection_sheet.dart b/lib/widgets/video_controls/sheets/track_selection_sheet.dart
new file mode 100644
index 00000000..5e5e9b19
--- /dev/null
+++ b/lib/widgets/video_controls/sheets/track_selection_sheet.dart
@@ -0,0 +1,194 @@
+import 'package:flutter/material.dart';
+
+import '../../../mpv/mpv.dart';
+import '../../../widgets/focusable_bottom_sheet.dart';
+import 'base_video_control_sheet.dart';
+import 'video_control_sheet_launcher.dart';
+import '../helpers/track_filter_helper.dart';
+import '../helpers/track_selection_helper.dart';
+
+/// Generic track selection sheet for audio and subtitle tracks
+///
+/// Type parameter [T] should be either [AudioTrack] or [SubtitleTrack]
+class TrackSelectionSheet<T> extends StatefulWidget {
+  final Player player;
+  final String title;
+  final IconData icon;
+  final List<T> Function(Tracks?) extractTracks;
+  final T? Function(TrackSelection) getCurrentTrack;
+  final String Function(T track, int index) buildLabel;
+  final void Function(T track) setTrack;
+  final Function(T)? onTrackChanged;
+  final bool showOffOption;
+  final T Function()? createOffTrack;
+  final bool Function(T track)? isOffTrack;
+
+  const TrackSelectionSheet({
+    super.key,
+    required this.player,
+    required this.title,
+    required this.icon,
+    required this.extractTracks,
+    required this.getCurrentTrack,
+    required this.buildLabel,
+    required this.setTrack,
+    this.onTrackChanged,
+    this.showOffOption = false,
+    this.createOffTrack,
+    this.isOffTrack,
+  });
+
+  static void show<T>({
+    required BuildContext context,
+    required Player player,
+    required String title,
+    required IconData icon,
+    required List<T> Function(Tracks?) extractTracks,
+    required T? Function(TrackSelection) getCurrentTrack,
+    required String Function(T track, int index) buildLabel,
+    required void Function(T track) setTrack,
+    Function(T)? onTrackChanged,
+    bool showOffOption = false,
+    T Function()? createOffTrack,
+    bool Function(T track)? isOffTrack,
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    VideoControlSheetLauncher.show(
+      context: context,
+      onOpen: onOpen,
+      onClose: onClose,
+      builder: (context) => TrackSelectionSheet<T>(
+        player: player,
+        title: title,
+        icon: icon,
+        extractTracks: extractTracks,
+        getCurrentTrack: getCurrentTrack,
+        buildLabel: buildLabel,
+        setTrack: setTrack,
+        onTrackChanged: onTrackChanged,
+        showOffOption: showOffOption,
+        createOffTrack: createOffTrack,
+        isOffTrack: isOffTrack,
+      ),
+    );
+  }
+
+  @override
+  State<TrackSelectionSheet<T>> createState() => _TrackSelectionSheetState<T>();
+}
+
+class _TrackSelectionSheetState<T> extends State<TrackSelectionSheet<T>> {
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _initialFocusNode = FocusNode(debugLabel: 'TrackSelectionInitialFocus');
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusableBottomSheet(
+      initialFocusNode: _initialFocusNode,
+      child: StreamBuilder<Tracks>(
+        stream: widget.player.streams.tracks,
+        initialData: widget.player.state.tracks,
+        builder: (context, snapshot) {
+          final tracks = snapshot.data;
+          final availableTracks = TrackFilterHelper.extractAndFilterTracks<T>(
+            tracks,
+            widget.extractTracks,
+          );
+
+          return BaseVideoControlSheet(
+            title: widget.title,
+            icon: widget.icon,
+            child: availableTracks.isEmpty
+                ? TrackSelectionHelper.buildEmptyState<T>()
+                : StreamBuilder<TrackSelection>(
+                    stream: widget.player.streams.track,
+                    initialData: widget.player.state.track,
+                    builder: (context, selectedSnapshot) {
+                      final currentTrack =
+                          selectedSnapshot.data ?? widget.player.state.track;
+                      final selectedTrack = widget.getCurrentTrack(
+                        currentTrack,
+                      );
+
+                      // Determine if "Off" is selected (null or explicit off)
+                      final isOffSelected = TrackSelectionHelper.isOffSelected(
+                        selectedTrack,
+                        widget.isOffTrack,
+                      );
+
+                      final itemCount =
+                          availableTracks.length +
+                          (widget.showOffOption ? 1 : 0);
+
+                      return ListView.builder(
+                        itemCount: itemCount,
+                        itemBuilder: (context, index) {
+                          // First item is "Off" if enabled
+                          if (widget.showOffOption && index == 0) {
+                            return TrackSelectionHelper.buildOffTile<T>(
+                              isSelected: isOffSelected,
+                              focusNode: _initialFocusNode,
+                              onTap: () {
+                                if (widget.createOffTrack != null) {
+                                  final offTrack = widget.createOffTrack!();
+                                  widget.setTrack(offTrack);
+                                  widget.onTrackChanged?.call(offTrack);
+                                }
+                                Navigator.pop(context);
+                              },
+                            );
+                          }
+
+                          // Subsequent items are tracks
+                          final trackIndex = widget.showOffOption
+                              ? index - 1
+                              : index;
+                          final track = availableTracks[trackIndex];
+
+                          // Check if this track is selected
+                          final trackId = TrackSelectionHelper.getTrackId(
+                            track,
+                          );
+                          final selectedId = selectedTrack == null
+                              ? ''
+                              : TrackSelectionHelper.getTrackId(selectedTrack);
+
+                          final isSelected = trackId == selectedId;
+                          final label = widget.buildLabel(track, trackIndex);
+
+                          // Focus the first actual track if no "Off" option
+                          final shouldFocus =
+                              !widget.showOffOption && index == 0;
+
+                          return TrackSelectionHelper.buildTrackTile<T>(
+                            label: label,
+                            isSelected: isSelected,
+                            focusNode: shouldFocus ? _initialFocusNode : null,
+                            onTap: () {
+                              widget.setTrack(track);
+                              widget.onTrackChanged?.call(track);
+                              Navigator.pop(context);
+                            },
+                          );
+                        },
+                      );
+                    },
+                  ),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/sheets/version_sheet.dart b/lib/widgets/video_controls/sheets/version_sheet.dart
index eafd4dfe..2f890677 100644
--- a/lib/widgets/video_controls/sheets/version_sheet.dart
+++ b/lib/widgets/video_controls/sheets/version_sheet.dart
@@ -1,8 +1,14 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import '../../../models/plex_media_version.dart';
+import '../../../widgets/focusable_bottom_sheet.dart';
+import '../../../widgets/focusable_list_tile.dart';
+import 'base_video_control_sheet.dart';
+import 'video_control_sheet_launcher.dart';
 
 /// Bottom sheet for selecting video version
-class VersionSheet extends StatelessWidget {
+class VersionSheet extends StatefulWidget {
   final List<PlexMediaVersion> availableVersions;
   final int selectedMediaIndex;
   final Function(int) onVersionSelected;
@@ -14,28 +20,18 @@ class VersionSheet extends StatelessWidget {
     required this.onVersionSelected,
   });
 
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
   static void show(
     BuildContext context,
     List<PlexMediaVersion> availableVersions,
     int selectedMediaIndex,
-    Function(int) onVersionSelected,
-  ) {
-    showModalBottomSheet(
+    Function(int) onVersionSelected, {
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    VideoControlSheetLauncher.show(
       context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
+      onOpen: onOpen,
+      onClose: onClose,
       builder: (context) => VersionSheet(
         availableVersions: availableVersions,
         selectedMediaIndex: selectedMediaIndex,
@@ -45,61 +41,58 @@ class VersionSheet extends StatelessWidget {
   }
 
   @override
-  Widget build(BuildContext context) {
-    return SafeArea(
-      child: SizedBox(
-        height: MediaQuery.of(context).size.height * 0.75,
-        child: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: Row(
-                children: [
-                  const Icon(Icons.video_file, color: Colors.white),
-                  const SizedBox(width: 12),
-                  const Text(
-                    'Video Version',
-                    style: TextStyle(
-                      color: Colors.white,
-                      fontSize: 18,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const Spacer(),
-                  IconButton(
-                    icon: const Icon(Icons.close, color: Colors.white),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                ],
-              ),
-            ),
-            const Divider(color: Colors.white24, height: 1),
-            Expanded(
-              child: ListView.builder(
-                itemCount: availableVersions.length,
-                itemBuilder: (context, index) {
-                  final version = availableVersions[index];
-                  final isSelected = index == selectedMediaIndex;
+  State<VersionSheet> createState() => _VersionSheetState();
+}
 
-                  return ListTile(
-                    title: Text(
-                      version.displayLabel,
-                      style: TextStyle(
-                        color: isSelected ? Colors.blue : Colors.white,
-                      ),
-                    ),
-                    trailing: isSelected
-                        ? const Icon(Icons.check, color: Colors.blue)
-                        : null,
-                    onTap: () {
-                      Navigator.pop(context);
-                      onVersionSelected(index);
-                    },
-                  );
-                },
+class _VersionSheetState extends State<VersionSheet> {
+  late final FocusNode _initialFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _initialFocusNode = FocusNode(debugLabel: 'VersionSheetInitialFocus');
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FocusableBottomSheet(
+      initialFocusNode: _initialFocusNode,
+      child: BaseVideoControlSheet(
+        title: 'Video Version',
+        icon: Symbols.video_file_rounded,
+        child: ListView.builder(
+          itemCount: widget.availableVersions.length,
+          itemBuilder: (context, index) {
+            final version = widget.availableVersions[index];
+            final isSelected = index == widget.selectedMediaIndex;
+
+            return FocusableListTile(
+              focusNode: index == 0 ? _initialFocusNode : null,
+              title: Text(
+                version.displayLabel,
+                style: TextStyle(
+                  color: isSelected ? Colors.blue : Colors.white,
+                ),
               ),
-            ),
-          ],
+              trailing: isSelected
+                  ? const AppIcon(
+                      Symbols.check_rounded,
+                      fill: 1,
+                      color: Colors.blue,
+                    )
+                  : null,
+              onTap: () {
+                Navigator.pop(context);
+                widget.onVersionSelected(index);
+              },
+            );
+          },
         ),
       ),
     );
diff --git a/lib/widgets/video_controls/sheets/video_control_sheet_launcher.dart b/lib/widgets/video_controls/sheets/video_control_sheet_launcher.dart
new file mode 100644
index 00000000..dedc4edf
--- /dev/null
+++ b/lib/widgets/video_controls/sheets/video_control_sheet_launcher.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'base_video_control_sheet.dart';
+
+/// Helper class to launch video control sheets with consistent behavior
+///
+/// This eliminates the need for each sheet to duplicate the showSheet wrapper.
+class VideoControlSheetLauncher {
+  /// Show a video control sheet with consistent styling and callbacks
+  static Future<T?> show<T>({
+    required BuildContext context,
+    required WidgetBuilder builder,
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    return BaseVideoControlSheet.showSheet<T>(
+      context: context,
+      onOpen: onOpen,
+      onClose: onClose,
+      builder: builder,
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/sheets/video_settings_sheet.dart b/lib/widgets/video_controls/sheets/video_settings_sheet.dart
index fb78e421..66bb7cdc 100644
--- a/lib/widgets/video_controls/sheets/video_settings_sheet.dart
+++ b/lib/widgets/video_controls/sheets/video_settings_sheet.dart
@@ -1,13 +1,79 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../../mpv/mpv.dart';
 import '../../../services/settings_service.dart';
 import '../../../services/sleep_timer_service.dart';
+import '../../../utils/duration_formatter.dart';
 import '../../../utils/platform_detector.dart';
+import '../../../widgets/focusable_bottom_sheet.dart';
+import '../../../widgets/focusable_list_tile.dart';
 import '../widgets/sync_offset_control.dart';
+import '../widgets/sleep_timer_content.dart';
 import '../../../i18n/strings.g.dart';
+import 'base_video_control_sheet.dart';
 
 enum _SettingsView { menu, speed, sleep, audioSync, subtitleSync, audioDevice }
 
+/// Reusable menu item widget for settings sheet
+class _SettingsMenuItem extends StatelessWidget {
+  final IconData icon;
+  final String title;
+  final String valueText;
+  final VoidCallback onTap;
+  final bool isHighlighted;
+  final bool allowValueOverflow;
+  final FocusNode? focusNode;
+
+  const _SettingsMenuItem({
+    required this.icon,
+    required this.title,
+    required this.valueText,
+    required this.onTap,
+    this.isHighlighted = false,
+    this.allowValueOverflow = false,
+    this.focusNode,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final valueWidget = Text(
+      valueText,
+      style: TextStyle(
+        color: isHighlighted ? Colors.amber : Colors.white70,
+        fontSize: 14,
+      ),
+      overflow: allowValueOverflow ? TextOverflow.ellipsis : null,
+    );
+
+    return FocusableListTile(
+      focusNode: focusNode,
+      leading: AppIcon(
+        icon,
+        fill: 1,
+        color: isHighlighted ? Colors.amber : Colors.white70,
+      ),
+      title: Text(title, style: const TextStyle(color: Colors.white)),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (allowValueOverflow) Flexible(child: valueWidget) else valueWidget,
+          const SizedBox(width: 8),
+          const AppIcon(
+            Symbols.chevron_right_rounded,
+            fill: 1,
+            color: Colors.white70,
+          ),
+        ],
+      ),
+      onTap: onTap,
+    );
+  }
+}
+
 /// Unified settings sheet for playback adjustments with in-sheet navigation
 class VideoSettingsSheet extends StatefulWidget {
   final Player player;
@@ -21,28 +87,18 @@ class VideoSettingsSheet extends StatefulWidget {
     required this.subtitleSyncOffset,
   });
 
-  static BoxConstraints getBottomSheetConstraints(BuildContext context) {
-    final size = MediaQuery.of(context).size;
-    final isDesktop = size.width > 600;
-
-    return BoxConstraints(
-      maxWidth: isDesktop ? 700 : double.infinity,
-      maxHeight: isDesktop ? 400 : size.height * 0.75,
-      minHeight: isDesktop ? 300 : size.height * 0.5,
-    );
-  }
-
   static Future<void> show(
     BuildContext context,
     Player player,
     int audioSyncOffset,
-    int subtitleSyncOffset,
-  ) {
-    return showModalBottomSheet(
+    int subtitleSyncOffset, {
+    VoidCallback? onOpen,
+    VoidCallback? onClose,
+  }) {
+    return BaseVideoControlSheet.showSheet(
       context: context,
-      backgroundColor: Colors.grey[900],
-      isScrollControlled: true,
-      constraints: getBottomSheetConstraints(context),
+      onOpen: onOpen,
+      onClose: onClose,
       builder: (context) => VideoSettingsSheet(
         player: player,
         audioSyncOffset: audioSyncOffset,
@@ -59,12 +115,40 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
   _SettingsView _currentView = _SettingsView.menu;
   late int _audioSyncOffset;
   late int _subtitleSyncOffset;
+  bool _enableHDR = true;
+  late final FocusNode _initialFocusNode;
 
   @override
   void initState() {
     super.initState();
     _audioSyncOffset = widget.audioSyncOffset;
     _subtitleSyncOffset = widget.subtitleSyncOffset;
+    _initialFocusNode = FocusNode(debugLabel: 'VideoSettingsInitialFocus');
+    _loadHDRSetting();
+  }
+
+  @override
+  void dispose() {
+    _initialFocusNode.dispose();
+    super.dispose();
+  }
+
+  Future<void> _loadHDRSetting() async {
+    final settings = await SettingsService.getInstance();
+    setState(() {
+      _enableHDR = settings.getEnableHDR();
+    });
+  }
+
+  Future<void> _toggleHDR() async {
+    final newValue = !_enableHDR;
+    final settings = await SettingsService.getInstance();
+    await settings.setEnableHDR(newValue);
+    setState(() {
+      _enableHDR = newValue;
+    });
+    // Apply to player immediately
+    await widget.player.setProperty('hdr-enabled', newValue ? 'yes' : 'no');
   }
 
   void _navigateTo(_SettingsView view) {
@@ -99,17 +183,17 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
   IconData _getIcon() {
     switch (_currentView) {
       case _SettingsView.menu:
-        return Icons.tune;
+        return Symbols.tune_rounded;
       case _SettingsView.speed:
-        return Icons.speed;
+        return Symbols.speed_rounded;
       case _SettingsView.sleep:
-        return Icons.bedtime;
+        return Symbols.bedtime_rounded;
       case _SettingsView.audioSync:
-        return Icons.sync;
+        return Symbols.sync_rounded;
       case _SettingsView.subtitleSync:
-        return Icons.subtitles;
+        return Symbols.subtitles_rounded;
       case _SettingsView.audioDevice:
-        return Icons.speaker;
+        return Symbols.speaker_rounded;
     }
   }
 
@@ -118,78 +202,11 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
     return '${speed.toStringAsFixed(2)}x';
   }
 
-  String _formatAudioSync(int offsetMs) {
-    if (offsetMs == 0) return '0ms';
-    final sign = offsetMs >= 0 ? '+' : '';
-    return '$sign${offsetMs}ms';
-  }
-
   String _formatSleepTimer(SleepTimerService sleepTimer) {
     if (!sleepTimer.isActive) return 'Off';
     final remaining = sleepTimer.remainingTime;
     if (remaining == null) return 'Off';
-
-    final minutes = remaining.inMinutes;
-    final seconds = remaining.inSeconds.remainder(60);
-
-    if (minutes > 0) {
-      return 'Active (${minutes}m ${seconds}s)';
-    } else {
-      return 'Active (${seconds}s)';
-    }
-  }
-
-  String _formatSleepTimerDuration(Duration duration) {
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-    final seconds = duration.inSeconds.remainder(60);
-
-    if (hours > 0) {
-      return '${hours}h ${minutes}m ${seconds}s';
-    } else if (minutes > 0) {
-      return '${minutes}m ${seconds}s';
-    } else {
-      return '${seconds}s';
-    }
-  }
-
-  Widget _buildHeader() {
-    final sleepTimer = SleepTimerService();
-    final isIconActive =
-        _currentView == _SettingsView.menu &&
-        (sleepTimer.isActive ||
-            _audioSyncOffset != 0 ||
-            _subtitleSyncOffset != 0);
-
-    return Padding(
-      padding: const EdgeInsets.all(16),
-      child: Row(
-        children: [
-          // Back button or icon
-          if (_currentView != _SettingsView.menu)
-            IconButton(
-              icon: const Icon(Icons.arrow_back, color: Colors.white),
-              onPressed: _navigateBack,
-            )
-          else
-            Icon(_getIcon(), color: isIconActive ? Colors.amber : Colors.white),
-          const SizedBox(width: 12),
-          Text(
-            _getTitle(),
-            style: const TextStyle(
-              color: Colors.white,
-              fontSize: 18,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-          const Spacer(),
-          IconButton(
-            icon: const Icon(Icons.close, color: Colors.white),
-            onPressed: () => Navigator.pop(context),
-          ),
-        ],
-      ),
-    );
+    return 'Active (${formatDurationWithSeconds(remaining)})';
   }
 
   Widget _buildMenuView() {
@@ -200,27 +217,15 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
       children: [
         // Playback Speed
         StreamBuilder<double>(
-          stream: widget.player.stream.rate,
+          stream: widget.player.streams.rate,
           initialData: widget.player.state.rate,
           builder: (context, snapshot) {
             final currentRate = snapshot.data ?? 1.0;
-            return ListTile(
-              leading: const Icon(Icons.speed, color: Colors.white70),
-              title: const Text(
-                'Playback Speed',
-                style: TextStyle(color: Colors.white),
-              ),
-              trailing: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    _formatSpeed(currentRate),
-                    style: const TextStyle(color: Colors.white70, fontSize: 14),
-                  ),
-                  const SizedBox(width: 8),
-                  const Icon(Icons.chevron_right, color: Colors.white70),
-                ],
-              ),
+            return _SettingsMenuItem(
+              focusNode: _initialFocusNode,
+              icon: Symbols.speed_rounded,
+              title: 'Playback Speed',
+              valueText: _formatSpeed(currentRate),
               onTap: () => _navigateTo(_SettingsView.speed),
             );
           },
@@ -231,125 +236,70 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
           listenable: sleepTimer,
           builder: (context, _) {
             final isActive = sleepTimer.isActive;
-            return ListTile(
-              leading: Icon(
-                isActive ? Icons.bedtime : Icons.bedtime_outlined,
-                color: isActive ? Colors.amber : Colors.white70,
-              ),
-              title: const Text(
-                'Sleep Timer',
-                style: TextStyle(color: Colors.white),
-              ),
-              trailing: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    _formatSleepTimer(sleepTimer),
-                    style: TextStyle(
-                      color: isActive ? Colors.amber : Colors.white70,
-                      fontSize: 14,
-                    ),
-                  ),
-                  const SizedBox(width: 8),
-                  const Icon(Icons.chevron_right, color: Colors.white70),
-                ],
-              ),
+            return _SettingsMenuItem(
+              icon: isActive
+                  ? Symbols.bedtime_rounded
+                  : Symbols.bedtime_rounded,
+              title: 'Sleep Timer',
+              valueText: _formatSleepTimer(sleepTimer),
+              isHighlighted: isActive,
               onTap: () => _navigateTo(_SettingsView.sleep),
             );
           },
         ),
 
         // Audio Sync
-        ListTile(
-          leading: Icon(
-            Icons.sync,
-            color: _audioSyncOffset != 0 ? Colors.amber : Colors.white70,
-          ),
-          title: const Text(
-            'Audio Sync',
-            style: TextStyle(color: Colors.white),
-          ),
-          trailing: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                _formatAudioSync(_audioSyncOffset),
-                style: TextStyle(
-                  color: _audioSyncOffset != 0 ? Colors.amber : Colors.white70,
-                  fontSize: 14,
-                ),
-              ),
-              const SizedBox(width: 8),
-              const Icon(Icons.chevron_right, color: Colors.white70),
-            ],
-          ),
+        _SettingsMenuItem(
+          icon: Symbols.sync_rounded,
+          title: 'Audio Sync',
+          valueText: formatSyncOffset(_audioSyncOffset.toDouble()),
+          isHighlighted: _audioSyncOffset != 0,
           onTap: () => _navigateTo(_SettingsView.audioSync),
         ),
 
         // Subtitle Sync
-        ListTile(
-          leading: Icon(
-            Icons.subtitles,
-            color: _subtitleSyncOffset != 0 ? Colors.amber : Colors.white70,
-          ),
-          title: const Text(
-            'Subtitle Sync',
-            style: TextStyle(color: Colors.white),
-          ),
-          trailing: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                _formatAudioSync(_subtitleSyncOffset),
-                style: TextStyle(
-                  color: _subtitleSyncOffset != 0
-                      ? Colors.amber
-                      : Colors.white70,
-                  fontSize: 14,
-                ),
-              ),
-              const SizedBox(width: 8),
-              const Icon(Icons.chevron_right, color: Colors.white70),
-            ],
-          ),
+        _SettingsMenuItem(
+          icon: Symbols.subtitles_rounded,
+          title: 'Subtitle Sync',
+          valueText: formatSyncOffset(_subtitleSyncOffset.toDouble()),
+          isHighlighted: _subtitleSyncOffset != 0,
           onTap: () => _navigateTo(_SettingsView.subtitleSync),
         ),
 
+        // HDR Toggle (iOS, macOS, and Windows)
+        if (Platform.isIOS || Platform.isMacOS || Platform.isWindows)
+          ListTile(
+            leading: AppIcon(
+              Symbols.hdr_strong_rounded,
+              fill: 1,
+              color: _enableHDR ? Colors.amber : Colors.white70,
+            ),
+            title: const Text('HDR', style: TextStyle(color: Colors.white)),
+            trailing: Switch(
+              value: _enableHDR,
+              onChanged: (_) => _toggleHDR(),
+              activeThumbColor: Colors.amber,
+            ),
+            onTap: _toggleHDR,
+          ),
+
         // Audio Output Device (Desktop only)
         if (isDesktop)
           StreamBuilder<AudioDevice>(
-            stream: widget.player.stream.audioDevice,
+            stream: widget.player.streams.audioDevice,
             initialData: widget.player.state.audioDevice,
             builder: (context, snapshot) {
               final currentDevice =
                   snapshot.data ?? widget.player.state.audioDevice;
               final deviceLabel = currentDevice.description.isEmpty
                   ? currentDevice.name
-                  : currentDevice.description;
+                  : '${currentDevice.name} · ${currentDevice.description}';
 
-              return ListTile(
-                leading: const Icon(Icons.speaker, color: Colors.white70),
-                title: const Text(
-                  'Audio Output',
-                  style: TextStyle(color: Colors.white),
-                ),
-                trailing: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Flexible(
-                      child: Text(
-                        deviceLabel,
-                        style: const TextStyle(
-                          color: Colors.white70,
-                          fontSize: 14,
-                        ),
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                    const SizedBox(width: 8),
-                    const Icon(Icons.chevron_right, color: Colors.white70),
-                  ],
-                ),
+              return _SettingsMenuItem(
+                icon: Symbols.speaker_rounded,
+                title: 'Audio Output',
+                valueText: deviceLabel,
+                allowValueOverflow: true,
                 onTap: () => _navigateTo(_SettingsView.audioDevice),
               );
             },
@@ -360,7 +310,7 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
 
   Widget _buildSpeedView() {
     return StreamBuilder<double>(
-      stream: widget.player.stream.rate,
+      stream: widget.player.streams.rate,
       initialData: widget.player.state.rate,
       builder: (context, snapshot) {
         final currentRate = snapshot.data ?? 1.0;
@@ -383,7 +333,11 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
                 ),
               ),
               trailing: isSelected
-                  ? const Icon(Icons.check, color: Colors.blue)
+                  ? const AppIcon(
+                      Symbols.check_rounded,
+                      fill: 1,
+                      color: Colors.blue,
+                    )
                   : null,
               onTap: () {
                 widget.player.setRate(speed);
@@ -399,119 +353,10 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
   Widget _buildSleepView() {
     final sleepTimer = SleepTimerService();
 
-    return ListenableBuilder(
-      listenable: sleepTimer,
-      builder: (context, _) {
-        final durations = [5, 10, 15, 30, 45, 60, 90, 120];
-        final remainingTime = sleepTimer.remainingTime;
-
-        return Column(
-          children: [
-            // Active timer status
-            if (sleepTimer.isActive && remainingTime != null) ...[
-              Container(
-                padding: const EdgeInsets.all(16),
-                color: Colors.amber.withValues(alpha: 0.1),
-                child: Column(
-                  children: [
-                    const Text(
-                      'Timer Active',
-                      style: TextStyle(
-                        color: Colors.amber,
-                        fontSize: 16,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const SizedBox(height: 8),
-                    Text(
-                      'Playback will pause in ${_formatSleepTimerDuration(remainingTime)}',
-                      style: const TextStyle(
-                        color: Colors.white70,
-                        fontSize: 14,
-                      ),
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        OutlinedButton.icon(
-                          icon: const Icon(Icons.add),
-                          label: Text(
-                            t.videoControls.addTime(amount: "15", unit: " min"),
-                          ),
-                          style: OutlinedButton.styleFrom(
-                            foregroundColor: Colors.white,
-                            side: const BorderSide(color: Colors.white54),
-                          ),
-                          onPressed: () {
-                            sleepTimer.extendTimer(const Duration(minutes: 15));
-                          },
-                        ),
-                        const SizedBox(width: 12),
-                        FilledButton.icon(
-                          icon: const Icon(Icons.cancel),
-                          label: Text(t.common.cancel),
-                          style: FilledButton.styleFrom(
-                            backgroundColor: Colors.red,
-                          ),
-                          onPressed: () {
-                            sleepTimer.cancelTimer();
-                            Navigator.pop(context); // Close after cancel
-                          },
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-              const Divider(color: Colors.white24, height: 1),
-            ],
-
-            // Duration list
-            Expanded(
-              child: ListView.builder(
-                itemCount: durations.length,
-                itemBuilder: (context, index) {
-                  final minutes = durations[index];
-                  final label = minutes < 60
-                      ? '$minutes minutes'
-                      : '${(minutes / 60).toStringAsFixed(minutes % 60 == 0 ? 0 : 1)} ${minutes == 60 ? 'hour' : 'hours'}';
-
-                  return ListTile(
-                    leading: const Icon(Icons.timer, color: Colors.white70),
-                    title: Text(
-                      label,
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                    onTap: () {
-                      sleepTimer.startTimer(Duration(minutes: minutes), () {
-                        widget.player.pause();
-                        if (context.mounted) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text(
-                                'Sleep timer completed - playback paused',
-                              ),
-                              duration: Duration(seconds: 3),
-                            ),
-                          );
-                        }
-                      });
-                      Navigator.pop(context); // Close after selection
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(t.messages.sleepTimerSet(label: label)),
-                          duration: const Duration(seconds: 2),
-                        ),
-                      );
-                    },
-                  );
-                },
-              ),
-            ),
-          ],
-        );
-      },
+    return SleepTimerContent(
+      player: widget.player,
+      sleepTimer: sleepTimer,
+      onCancel: () => Navigator.pop(context),
     );
   }
 
@@ -549,13 +394,13 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
 
   Widget _buildAudioDeviceView() {
     return StreamBuilder<List<AudioDevice>>(
-      stream: widget.player.stream.audioDevices,
+      stream: widget.player.streams.audioDevices,
       initialData: widget.player.state.audioDevices,
       builder: (context, snapshot) {
         final devices = snapshot.data ?? [];
 
         return StreamBuilder<AudioDevice>(
-          stream: widget.player.stream.audioDevice,
+          stream: widget.player.streams.audioDevice,
           initialData: widget.player.state.audioDevice,
           builder: (context, selectedSnapshot) {
             final currentDevice =
@@ -578,7 +423,11 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
                     ),
                   ),
                   trailing: isSelected
-                      ? const Icon(Icons.check, color: Colors.blue)
+                      ? const AppIcon(
+                          Symbols.check_rounded,
+                          fill: 1,
+                          color: Colors.blue,
+                        )
                       : null,
                   onTap: () {
                     widget.player.setAudioDevice(device);
@@ -595,33 +444,36 @@ class _VideoSettingsSheetState extends State<VideoSettingsSheet> {
 
   @override
   Widget build(BuildContext context) {
-    return SafeArea(
-      child: SizedBox(
-        height: MediaQuery.of(context).size.height * 0.75,
-        child: Column(
-          children: [
-            _buildHeader(),
-            const Divider(color: Colors.white24, height: 1),
-            Expanded(
-              child: () {
-                switch (_currentView) {
-                  case _SettingsView.menu:
-                    return _buildMenuView();
-                  case _SettingsView.speed:
-                    return _buildSpeedView();
-                  case _SettingsView.sleep:
-                    return _buildSleepView();
-                  case _SettingsView.audioSync:
-                    return _buildAudioSyncView();
-                  case _SettingsView.subtitleSync:
-                    return _buildSubtitleSyncView();
-                  case _SettingsView.audioDevice:
-                    return _buildAudioDeviceView();
-                }
-              }(),
-            ),
-          ],
-        ),
+    final sleepTimer = SleepTimerService();
+    final isIconActive =
+        _currentView == _SettingsView.menu &&
+        (sleepTimer.isActive ||
+            _audioSyncOffset != 0 ||
+            _subtitleSyncOffset != 0);
+
+    return FocusableBottomSheet(
+      initialFocusNode: _initialFocusNode,
+      child: BaseVideoControlSheet(
+        title: _getTitle(),
+        icon: _getIcon(),
+        iconColor: isIconActive ? Colors.amber : Colors.white,
+        onBack: _currentView != _SettingsView.menu ? _navigateBack : null,
+        child: () {
+          switch (_currentView) {
+            case _SettingsView.menu:
+              return _buildMenuView();
+            case _SettingsView.speed:
+              return _buildSpeedView();
+            case _SettingsView.sleep:
+              return _buildSleepView();
+            case _SettingsView.audioSync:
+              return _buildAudioSyncView();
+            case _SettingsView.subtitleSync:
+              return _buildSubtitleSyncView();
+            case _SettingsView.audioDevice:
+              return _buildAudioDeviceView();
+          }
+        }(),
       ),
     );
   }
diff --git a/lib/widgets/video_controls/sheets/video_sheet_header.dart b/lib/widgets/video_controls/sheets/video_sheet_header.dart
new file mode 100644
index 00000000..54b1b61b
--- /dev/null
+++ b/lib/widgets/video_controls/sheets/video_sheet_header.dart
@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+/// Shared header widget for video control sheets
+///
+/// Provides a consistent header with an icon/back button, title, and close button
+class VideoSheetHeader extends StatelessWidget {
+  final String title;
+  final IconData? icon;
+  final Color? iconColor;
+  final VoidCallback? onBack;
+  final VoidCallback? onClose;
+
+  const VideoSheetHeader({
+    super.key,
+    required this.title,
+    this.icon,
+    this.iconColor,
+    this.onBack,
+    this.onClose,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(16),
+      child: Row(
+        children: [
+          // Back button or icon
+          if (onBack != null)
+            IconButton(
+              icon: const AppIcon(
+                Symbols.arrow_back_rounded,
+                fill: 1,
+                color: Colors.white,
+              ),
+              onPressed: onBack,
+            )
+          else if (icon != null)
+            AppIcon(icon, fill: 1, color: iconColor ?? Colors.white),
+          const SizedBox(width: 12),
+          Text(
+            title,
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 18,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const Spacer(),
+          IconButton(
+            icon: const AppIcon(
+              Symbols.close_rounded,
+              fill: 1,
+              color: Colors.white,
+            ),
+            onPressed: onClose ?? () => Navigator.pop(context),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/video_control_button.dart b/lib/widgets/video_controls/video_control_button.dart
index 0b0f6b3a..860b061e 100644
--- a/lib/widgets/video_controls/video_control_button.dart
+++ b/lib/widgets/video_controls/video_control_button.dart
@@ -1,4 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+
+import '../../focus/focusable_wrapper.dart';
 
 /// A standardized button for video player controls with improved tap targets.
 ///
@@ -18,17 +21,39 @@ class VideoControlButton extends StatelessWidget {
   /// Optional tooltip text shown on hover or long press.
   final String? tooltip;
 
+  /// Optional semantic label for screen readers.
+  /// If not provided, falls back to tooltip.
+  final String? semanticLabel;
+
   /// Whether this button represents an active state (e.g., a feature is enabled).
   /// When true, the icon color defaults to amber instead of white.
   final bool isActive;
 
+  /// Optional FocusNode for D-pad/keyboard navigation.
+  /// When provided, the button becomes focusable with visual focus indicator.
+  final FocusNode? focusNode;
+
+  /// Custom key event handler for focus navigation.
+  final KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent;
+
+  /// Called when focus changes.
+  final ValueChanged<bool>? onFocusChange;
+
+  /// Whether this button should autofocus when first built.
+  final bool autofocus;
+
   const VideoControlButton({
     super.key,
     required this.icon,
     required this.onPressed,
     this.color,
     this.tooltip,
+    this.semanticLabel,
     this.isActive = false,
+    this.focusNode,
+    this.onKeyEvent,
+    this.onFocusChange,
+    this.autofocus = false,
   });
 
   @override
@@ -36,11 +61,38 @@ class VideoControlButton extends StatelessWidget {
     // Determine the effective color: explicit color > active amber > default white
     final effectiveColor = color ?? (isActive ? Colors.amber : Colors.white);
 
-    return IconButton(
-      icon: Icon(icon, color: effectiveColor),
+    final button = IconButton(
+      icon: AppIcon(icon, fill: 1, color: effectiveColor),
       onPressed: onPressed,
       tooltip: tooltip,
       constraints: const BoxConstraints(minWidth: 40, minHeight: 40),
     );
+
+    Widget result = semanticLabel != null
+        ? Semantics(
+            label: semanticLabel,
+            button: true,
+            excludeSemantics: true,
+            child: button,
+          )
+        : button;
+
+    // Wrap with FocusableWrapper when focusNode is provided
+    if (focusNode != null) {
+      result = FocusableWrapper(
+        focusNode: focusNode,
+        onSelect: onPressed,
+        onKeyEvent: onKeyEvent,
+        onFocusChange: onFocusChange,
+        autofocus: autofocus,
+        semanticLabel: semanticLabel,
+        borderRadius: 20, // Circular for icon buttons
+        autoScroll: false, // Video controls don't scroll
+        useBackgroundFocus: true, // Use background highlight for video controls
+        child: result,
+      );
+    }
+
+    return result;
   }
 }
diff --git a/lib/widgets/video_controls/video_controls.dart b/lib/widgets/video_controls/video_controls.dart
index c3bc93b4..0d239724 100644
--- a/lib/widgets/video_controls/video_controls.dart
+++ b/lib/widgets/video_controls/video_controls.dart
@@ -1,32 +1,40 @@
-import 'dart:async';
+import 'dart:async' show StreamSubscription, Timer;
 import 'dart:io' show Platform;
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart' show SystemChrome, DeviceOrientation;
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:rate_limiter/rate_limiter.dart';
+import 'package:flutter/services.dart'
+    show
+        SystemChrome,
+        DeviceOrientation,
+        LogicalKeyboardKey,
+        KeyDownEvent,
+        KeyRepeatEvent;
 import 'package:macos_window_utils/macos_window_utils.dart';
-import 'package:media_kit/media_kit.dart';
 import 'package:window_manager/window_manager.dart';
 
+import '../../mpv/mpv.dart';
+
+import '../../services/plex_client.dart';
+import '../../services/plex_api_cache.dart';
 import '../../models/plex_media_info.dart';
 import '../../models/plex_media_version.dart';
 import '../../models/plex_metadata.dart';
 import '../../screens/video_player_screen.dart';
-import '../../services/fullscreen_state_manager.dart';
 import '../../services/keyboard_shortcuts_service.dart';
 import '../../services/settings_service.dart';
-import '../../services/sleep_timer_service.dart';
-import '../../utils/desktop_window_padding.dart';
 import '../../utils/platform_detector.dart';
+import '../../utils/player_utils.dart';
 import '../../utils/provider_extensions.dart';
+import '../../utils/video_control_icons.dart';
+import '../../utils/app_logger.dart';
 import '../../i18n/strings.g.dart';
-import '../app_bar_back_button.dart';
-import 'painters/chapter_marker_painter.dart';
-import 'sheets/audio_track_sheet.dart';
-import 'sheets/chapter_sheet.dart';
-import 'sheets/subtitle_track_sheet.dart';
-import 'sheets/version_sheet.dart';
-import 'sheets/video_settings_sheet.dart';
-import 'video_control_button.dart';
+import '../../focus/input_mode_tracker.dart';
+import 'widgets/track_chapter_controls.dart';
+import 'mobile_video_controls.dart';
+import 'desktop_video_controls.dart';
 
 /// Custom video controls builder for Plex with chapter, audio, and subtitle support
 Widget plexVideoControlsBuilder(
@@ -38,6 +46,8 @@ Widget plexVideoControlsBuilder(
   int? selectedMediaIndex,
   int boxFitMode = 0,
   VoidCallback? onCycleBoxFitMode,
+  Function(AudioTrack)? onAudioTrackChanged,
+  Function(SubtitleTrack)? onSubtitleTrackChanged,
 }) {
   return PlexVideoControls(
     player: player,
@@ -48,6 +58,8 @@ Widget plexVideoControlsBuilder(
     selectedMediaIndex: selectedMediaIndex ?? 0,
     boxFitMode: boxFitMode,
     onCycleBoxFitMode: onCycleBoxFitMode,
+    onAudioTrackChanged: onAudioTrackChanged,
+    onSubtitleTrackChanged: onSubtitleTrackChanged,
   );
 }
 
@@ -60,6 +72,8 @@ class PlexVideoControls extends StatefulWidget {
   final int selectedMediaIndex;
   final int boxFitMode;
   final VoidCallback? onCycleBoxFitMode;
+  final Function(AudioTrack)? onAudioTrackChanged;
+  final Function(SubtitleTrack)? onSubtitleTrackChanged;
 
   const PlexVideoControls({
     super.key,
@@ -71,6 +85,8 @@ class PlexVideoControls extends StatefulWidget {
     this.selectedMediaIndex = 0,
     this.boxFitMode = 0,
     this.onCycleBoxFitMode,
+    this.onAudioTrackChanged,
+    this.onSubtitleTrackChanged,
   });
 
   @override
@@ -80,6 +96,7 @@ class PlexVideoControls extends StatefulWidget {
 class _PlexVideoControlsState extends State<PlexVideoControls>
     with WindowListener, WidgetsBindingObserver {
   bool _showControls = true;
+  bool _controlsFullyHidden = false; // For Linux: true after fade-out completes
   List<PlexChapter> _chapters = [];
   bool _chaptersLoaded = false;
   Timer? _hideTimer;
@@ -90,35 +107,79 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
   int _audioSyncOffset = 0; // Default, loaded from settings
   int _subtitleSyncOffset = 0; // Default, loaded from settings
   bool _isRotationLocked = true; // Default locked (landscape only)
+
+  // GlobalKey to access DesktopVideoControls state for focus management
+  final GlobalKey<DesktopVideoControlsState> _desktopControlsKey =
+      GlobalKey<DesktopVideoControlsState>();
+
+  /// Get the correct PlexClient for this metadata's server
+  PlexClient _getClientForMetadata() {
+    return context.getClientForServer(widget.metadata.serverId!);
+  }
+
   // Double-tap feedback state
   bool _showDoubleTapFeedback = false;
   double _doubleTapFeedbackOpacity = 0.0;
   bool _lastDoubleTapWasForward = true;
   Timer? _feedbackTimer;
-  // Seek throttle state
-  Timer? _seekThrottleTimer;
-  Duration? _pendingSeekPosition;
+  // Seek throttle
+  late final Throttle _seekThrottle;
   // Current marker state
   PlexMarker? _currentMarker;
   List<PlexMarker> _markers = [];
   bool _markersLoaded = false;
+  // Playback state subscription for auto-hide timer
+  StreamSubscription<bool>? _playingSubscription;
+  // Completed subscription to show controls when video ends
+  StreamSubscription<bool>? _completedSubscription;
+  // Window resize pause state
+  Timer? _resizeDebounceTimer;
+  bool _wasPlayingBeforeResize = false;
+  // Auto-skip state
+  bool _autoSkipIntro = true;
+  bool _autoSkipCredits = true;
+  int _autoSkipDelay = 5;
+  Timer? _autoSkipTimer;
+  double _autoSkipProgress = 0.0;
+  // Video player navigation (use arrow keys to navigate controls)
+  bool _videoPlayerNavigationEnabled = false;
 
   @override
   void initState() {
     super.initState();
     _focusNode = FocusNode();
-    _loadChapters();
-    _loadMarkers();
+    _seekThrottle = throttle(
+      (Duration pos) => widget.player.seek(pos),
+      const Duration(milliseconds: 200),
+      leading: true,
+      trailing: true,
+    );
+    _loadPlaybackExtras();
     _loadSeekTimes();
     _startHideTimer();
     _initKeyboardService();
     _listenToPosition();
+    _listenToPlayingState();
+    _listenToCompleted();
     // Add lifecycle observer to reload settings when app resumes
     WidgetsBinding.instance.addObserver(this);
     // Add window listener for tracking fullscreen state (for button icon)
     if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
       windowManager.addListener(this);
     }
+    // Focus play/pause button on first frame if in keyboard mode
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _focusPlayPauseIfKeyboardMode();
+    });
+  }
+
+  /// Focus play/pause button if we're in keyboard navigation mode (desktop only)
+  void _focusPlayPauseIfKeyboardMode() {
+    if (!mounted) return;
+    final isMobile = PlatformDetector.isMobile(context);
+    if (!isMobile && InputModeTracker.isKeyboardMode(context)) {
+      _desktopControlsKey.currentState?.requestPlayPauseFocus();
+    }
   }
 
   Future<void> _initKeyboardService() async {
@@ -126,7 +187,7 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
   }
 
   void _listenToPosition() {
-    widget.player.stream.position.listen((position) {
+    widget.player.streams.position.listen((position) {
       if (_markers.isEmpty || !_markersLoaded) {
         return;
       }
@@ -144,6 +205,44 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
           setState(() {
             _currentMarker = foundMarker;
           });
+
+          // Start auto-skip timer for new marker
+          if (foundMarker != null) {
+            _startAutoSkipTimer(foundMarker);
+          } else {
+            _cancelAutoSkipTimer();
+          }
+        }
+      }
+    });
+  }
+
+  /// Listen to playback state changes to manage auto-hide timer on iOS/mobile
+  void _listenToPlayingState() {
+    _playingSubscription = widget.player.streams.playing.listen((isPlaying) {
+      if (isPlaying && _showControls) {
+        _startHideTimer();
+      } else if (!isPlaying) {
+        _hideTimer?.cancel();
+      }
+    });
+  }
+
+  /// Listen to completed stream to show controls when video ends
+  void _listenToCompleted() {
+    _completedSubscription = widget.player.streams.completed.listen((
+      completed,
+    ) {
+      if (completed && mounted) {
+        // Show controls when video completes (for play next dialog etc.)
+        setState(() {
+          _showControls = true;
+          _controlsFullyHidden = false;
+        });
+        _hideTimer?.cancel();
+        // On Linux, ensure Flutter view is visible
+        if (Platform.isLinux) {
+          widget.player.setControlsVisible(true);
         }
       }
     });
@@ -153,6 +252,75 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
     if (_currentMarker != null) {
       widget.player.seek(_currentMarker!.endTime);
     }
+    _cancelAutoSkipTimer();
+  }
+
+  void _startAutoSkipTimer(PlexMarker marker) {
+    _cancelAutoSkipTimer();
+
+    final shouldAutoSkip =
+        (marker.isCredits && _autoSkipCredits) ||
+        (!marker.isCredits && _autoSkipIntro);
+
+    if (!shouldAutoSkip || _autoSkipDelay <= 0) return;
+
+    _autoSkipProgress = 0.0;
+    const tickDuration = Duration(milliseconds: 50);
+    final totalTicks = (_autoSkipDelay * 1000) / tickDuration.inMilliseconds;
+
+    if (totalTicks <= 0) return;
+
+    _autoSkipTimer = Timer.periodic(tickDuration, (timer) {
+      if (!mounted || _currentMarker != marker) {
+        timer.cancel();
+        return;
+      }
+
+      setState(() {
+        _autoSkipProgress = (timer.tick / totalTicks).clamp(0.0, 1.0);
+      });
+
+      if (timer.tick >= totalTicks) {
+        timer.cancel();
+        try {
+          _performAutoSkip();
+        } catch (e) {
+          // Handle any errors during skip gracefully
+        }
+      }
+    });
+  }
+
+  void _cancelAutoSkipTimer() {
+    _autoSkipTimer?.cancel();
+    _autoSkipTimer = null;
+    if (mounted) {
+      setState(() {
+        _autoSkipProgress = 0.0;
+      });
+    }
+  }
+
+  /// Perform the appropriate skip action based on marker type and next episode availability
+  void _performAutoSkip() {
+    if (_currentMarker == null) return;
+
+    final isCredits = _currentMarker!.isCredits;
+    final hasNextEpisode = widget.onNext != null;
+    final showNextEpisode = isCredits && hasNextEpisode;
+
+    if (showNextEpisode) {
+      widget.onNext?.call();
+    } else {
+      _skipMarker();
+    }
+  }
+
+  /// Check if auto-skip should be active for the current marker
+  bool _shouldShowAutoSkip() {
+    if (_currentMarker == null) return false;
+    return (_currentMarker!.isCredits && _autoSkipCredits) ||
+        (!_currentMarker!.isCredits && _autoSkipIntro);
   }
 
   Future<void> _loadSeekTimes() async {
@@ -163,6 +331,11 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
         _audioSyncOffset = settingsService.getAudioSyncOffset();
         _subtitleSyncOffset = settingsService.getSubtitleSyncOffset();
         _isRotationLocked = settingsService.getRotationLocked();
+        _autoSkipIntro = settingsService.getAutoSkipIntro();
+        _autoSkipCredits = settingsService.getAutoSkipCredits();
+        _autoSkipDelay = settingsService.getAutoSkipDelay();
+        _videoPlayerNavigationEnabled = settingsService
+            .getVideoPlayerNavigationEnabled();
       });
 
       // Apply rotation lock setting
@@ -210,7 +383,11 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
   void dispose() {
     _hideTimer?.cancel();
     _feedbackTimer?.cancel();
-    _seekThrottleTimer?.cancel();
+    _resizeDebounceTimer?.cancel();
+    _autoSkipTimer?.cancel();
+    _seekThrottle.cancel();
+    _playingSubscription?.cancel();
+    _completedSubscription?.cancel();
     _focusNode.dispose();
     // Remove lifecycle observer
     WidgetsBinding.instance.removeObserver(this);
@@ -267,6 +444,25 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
     }
   }
 
+  @override
+  void onWindowResize() {
+    // Pause video while resizing to prevent lag
+    if (_resizeDebounceTimer == null && widget.player.state.playing) {
+      _wasPlayingBeforeResize = true;
+      widget.player.pause();
+    }
+
+    // Reset debounce timer - resume when resizing stops
+    _resizeDebounceTimer?.cancel();
+    _resizeDebounceTimer = Timer(const Duration(milliseconds: 300), () {
+      if (_wasPlayingBeforeResize && mounted) {
+        widget.player.play();
+      }
+      _wasPlayingBeforeResize = false;
+      _resizeDebounceTimer = null;
+    });
+  }
+
   void _startHideTimer() {
     _hideTimer?.cancel();
     // Only auto-hide if playing
@@ -280,17 +476,56 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
           if (Platform.isMacOS) {
             _updateTrafficLightVisibility();
           }
+          // On Linux, fully hide after animation completes (200ms)
+          if (Platform.isLinux) {
+            Future.delayed(const Duration(milliseconds: 250), () {
+              if (mounted && !_showControls) {
+                setState(() {
+                  _controlsFullyHidden = true;
+                });
+                // Hide Flutter view to show only video
+                widget.player.setControlsVisible(false);
+              }
+            });
+          }
         }
       });
     }
   }
 
+  /// Restart the hide timer on user interaction (if video is playing)
+  void _restartHideTimerIfPlaying() {
+    if (widget.player.state.playing) {
+      _startHideTimer();
+    }
+  }
+
   void _toggleControls() {
     setState(() {
       _showControls = !_showControls;
+      if (_showControls) {
+        _controlsFullyHidden = false;
+        // On Linux, show Flutter view when controls are shown
+        if (Platform.isLinux) {
+          widget.player.setControlsVisible(true);
+        }
+      }
     });
     if (_showControls) {
       _startHideTimer();
+      // Cancel auto-skip when user manually shows controls
+      _cancelAutoSkipTimer();
+    } else if (Platform.isLinux) {
+      // On Linux, fully hide after animation completes (200ms)
+      Future.delayed(const Duration(milliseconds: 250), () {
+        if (mounted && !_showControls) {
+          setState(() {
+            _controlsFullyHidden = true;
+          });
+          // Hide Flutter view to show only video
+          widget.player.setControlsVisible(false);
+        }
+      });
     }
 
     // On macOS, hide/show traffic lights with controls
@@ -334,201 +569,138 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
     }
   }
 
-  Future<void> _loadChapters() async {
-    final clientProvider = context.plexClient;
-    final client = clientProvider.client;
-    if (client == null) return;
+  Future<void> _loadPlaybackExtras() async {
+    try {
+      appLogger.d(
+        '_loadPlaybackExtras: starting for ${widget.metadata.ratingKey}',
+      );
+      final client = _getClientForMetadata();
+      appLogger.d(
+        '_loadPlaybackExtras: got client with serverId=${client.serverId}',
+      );
 
-    final chapters = await client.getChapters(widget.metadata.ratingKey);
-    if (mounted) {
-      setState(() {
-        _chapters = chapters;
-        _chaptersLoaded = true;
-      });
+      final extras = await client.getPlaybackExtras(widget.metadata.ratingKey);
+      appLogger.d(
+        '_loadPlaybackExtras: got ${extras.chapters.length} chapters',
+      );
+
+      if (mounted) {
+        setState(() {
+          _chapters = extras.chapters;
+          _markers = extras.markers;
+          _chaptersLoaded = true;
+          _markersLoaded = true;
+        });
+      }
+    } catch (e, stack) {
+      // Fallback: try to load from cache directly (for offline playback)
+      appLogger.d(
+        '_loadPlaybackExtras: client unavailable, trying cache fallback',
+      );
+      final serverId = widget.metadata.serverId;
+      if (serverId != null) {
+        final cacheKey = '/library/metadata/${widget.metadata.ratingKey}';
+        final cached = await PlexApiCache.instance.get(serverId, cacheKey);
+        if (cached != null) {
+          final extras = _parsePlaybackExtrasFromCache(cached);
+          appLogger.d(
+            '_loadPlaybackExtras: loaded ${extras.chapters.length} chapters from cache',
+          );
+          if (mounted) {
+            setState(() {
+              _chapters = extras.chapters;
+              _markers = extras.markers;
+              _chaptersLoaded = true;
+              _markersLoaded = true;
+            });
+          }
+          return;
+        }
+      }
+      appLogger.e('_loadPlaybackExtras failed', error: e, stackTrace: stack);
     }
   }
 
-  Future<void> _loadMarkers() async {
-    final clientProvider = context.plexClient;
-    final client = clientProvider.client;
-    if (client == null) return;
+  /// Parse PlaybackExtras from cached API response (for offline playback)
+  PlaybackExtras _parsePlaybackExtrasFromCache(Map<String, dynamic> cached) {
+    final chapters = <PlexChapter>[];
+    final markers = <PlexMarker>[];
 
-    final markers = await client.getMarkers(widget.metadata.ratingKey);
-
-    if (mounted) {
-      setState(() {
-        _markers = markers;
-        _markersLoaded = true;
-      });
-    }
-  }
-
-  bool _hasMultipleAudioTracks(Tracks? tracks) {
-    if (tracks == null) return false;
-    final audioTracks = tracks.audio
-        .where((track) => track.id != 'auto' && track.id != 'no')
-        .toList();
-    return audioTracks.length > 1;
-  }
-
-  bool _hasSubtitles(Tracks? tracks) {
-    if (tracks == null) return false;
-    final subtitles = tracks.subtitle
-        .where((track) => track.id != 'auto' && track.id != 'no')
-        .toList();
-    return subtitles.isNotEmpty;
-  }
-
-  IconData _getBoxFitIcon(int mode) {
-    switch (mode) {
-      case 0:
-        return Icons.fit_screen; // contain (letterbox)
-      case 1:
-        return Icons.aspect_ratio; // cover (fill screen)
-      case 2:
-        return Icons.settings_overscan; // fill (stretch)
-      default:
-        return Icons.fit_screen;
-    }
-  }
-
-  String _getBoxFitTooltip(int mode) {
-    switch (mode) {
-      case 0:
-        return t.videoControls.letterbox;
-      case 1:
-        return t.videoControls.fillScreen;
-      case 2:
-        return t.videoControls.stretch;
-      default:
-        return t.videoControls.letterbox;
-    }
-  }
-
-  /// Conditionally wraps child with SafeArea only in portrait mode
-  Widget _conditionalSafeArea({
-    required Widget child,
-    bool top = true,
-    bool bottom = true,
-  }) {
-    final orientation = MediaQuery.of(context).orientation;
-    final isPortrait = orientation == Orientation.portrait;
-
-    // Only apply SafeArea in portrait mode
-    if (isPortrait) {
-      return SafeArea(top: top, bottom: bottom, child: child);
+    Map<String, dynamic>? metadataJson;
+    if (cached['MediaContainer']?['Metadata'] != null &&
+        (cached['MediaContainer']['Metadata'] as List).isNotEmpty) {
+      metadataJson =
+          cached['MediaContainer']['Metadata'][0] as Map<String, dynamic>;
     }
 
-    // In landscape, return child without SafeArea
-    return child;
+    if (metadataJson != null) {
+      // Parse chapters
+      if (metadataJson['Chapter'] != null) {
+        for (var chapter in metadataJson['Chapter'] as List) {
+          chapters.add(
+            PlexChapter(
+              id: chapter['id'] as int,
+              index: chapter['index'] as int?,
+              startTimeOffset: chapter['startTimeOffset'] as int?,
+              endTimeOffset: chapter['endTimeOffset'] as int?,
+              title: chapter['tag'] as String?,
+              thumb: chapter['thumb'] as String?,
+            ),
+          );
+        }
+      }
+
+      // Parse markers
+      if (metadataJson['Marker'] != null) {
+        for (var marker in metadataJson['Marker'] as List) {
+          markers.add(
+            PlexMarker(
+              id: marker['id'] as int,
+              type: marker['type'] as String,
+              startTimeOffset: marker['startTimeOffset'] as int,
+              endTimeOffset: marker['endTimeOffset'] as int,
+            ),
+          );
+        }
+      }
+    }
+
+    return PlaybackExtras(chapters: chapters, markers: markers);
   }
 
-  Widget _buildTrackAndChapterControls() {
-    return StreamBuilder<Tracks>(
-      stream: widget.player.stream.tracks,
-      initialData: widget.player.state.tracks,
-      builder: (context, snapshot) {
-        final tracks = snapshot.data;
-        return IntrinsicHeight(
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              // Unified settings button (speed, sleep timer, audio sync, subtitle sync)
-              ListenableBuilder(
-                listenable: SleepTimerService(),
-                builder: (context, _) {
-                  final sleepTimer = SleepTimerService();
-                  final isActive =
-                      sleepTimer.isActive ||
-                      _audioSyncOffset != 0 ||
-                      _subtitleSyncOffset != 0;
-                  return VideoControlButton(
-                    icon: Icons.tune,
-                    isActive: isActive,
-                    onPressed: () async {
-                      await VideoSettingsSheet.show(
-                        context,
-                        widget.player,
-                        _audioSyncOffset,
-                        _subtitleSyncOffset,
-                      );
-                      // Sheet is now closed, reload immediately
-                      if (mounted) {
-                        await _loadSeekTimes();
-                      }
-                    },
-                  );
-                },
-              ),
-              if (_hasMultipleAudioTracks(tracks))
-                VideoControlButton(
-                  icon: Icons.audiotrack,
-                  onPressed: () => AudioTrackSheet.show(context, widget.player),
-                ),
-              if (_hasSubtitles(tracks))
-                VideoControlButton(
-                  icon: Icons.subtitles,
-                  onPressed: () =>
-                      SubtitleTrackSheet.show(context, widget.player),
-                ),
-              if (_chapters.isNotEmpty)
-                VideoControlButton(
-                  icon: Icons.video_library,
-                  onPressed: () => ChapterSheet.show(
-                    context,
-                    widget.player,
-                    _chapters,
-                    _chaptersLoaded,
-                  ),
-                ),
-              if (widget.availableVersions.length > 1)
-                VideoControlButton(
-                  icon: Icons.video_file,
-                  onPressed: () => VersionSheet.show(
-                    context,
-                    widget.availableVersions,
-                    widget.selectedMediaIndex,
-                    _switchMediaVersion,
-                  ),
-                ),
-              // BoxFit mode cycle button
-              if (widget.onCycleBoxFitMode != null)
-                VideoControlButton(
-                  icon: _getBoxFitIcon(widget.boxFitMode),
-                  tooltip: _getBoxFitTooltip(widget.boxFitMode),
-                  onPressed: widget.onCycleBoxFitMode,
-                ),
-              // Rotation lock toggle (mobile only)
-              if (PlatformDetector.isMobile(context))
-                VideoControlButton(
-                  icon: _isRotationLocked
-                      ? Icons.screen_lock_rotation
-                      : Icons.screen_rotation,
-                  tooltip: _isRotationLocked
-                      ? t.videoControls.unlockRotation
-                      : t.videoControls.lockRotation,
-                  onPressed: _toggleRotationLock,
-                ),
-              // Fullscreen toggle (desktop only)
-              if (Platform.isWindows || Platform.isLinux || Platform.isMacOS)
-                VideoControlButton(
-                  icon: _isFullscreen
-                      ? Icons.fullscreen_exit
-                      : Icons.fullscreen,
-                  onPressed: _toggleFullscreen,
-                ),
-            ],
-          ),
-        );
+  Widget _buildTrackChapterControlsWidget() {
+    return TrackChapterControls(
+      player: widget.player,
+      chapters: _chapters,
+      chaptersLoaded: _chaptersLoaded,
+      availableVersions: widget.availableVersions,
+      selectedMediaIndex: widget.selectedMediaIndex,
+      boxFitMode: widget.boxFitMode,
+      audioSyncOffset: _audioSyncOffset,
+      subtitleSyncOffset: _subtitleSyncOffset,
+      isRotationLocked: _isRotationLocked,
+      isFullscreen: _isFullscreen,
+      onCycleBoxFitMode: widget.onCycleBoxFitMode,
+      onToggleRotationLock: _toggleRotationLock,
+      onToggleFullscreen: _toggleFullscreen,
+      onSwitchVersion: _switchMediaVersion,
+      onAudioTrackChanged: widget.onAudioTrackChanged,
+      onSubtitleTrackChanged: widget.onSubtitleTrackChanged,
+      onLoadSeekTimes: () async {
+        if (mounted) {
+          await _loadSeekTimes();
+        }
       },
+      onCancelAutoHide: () => _hideTimer?.cancel(),
+      onStartAutoHide: _startHideTimer,
+      serverId: widget.metadata.serverId ?? '',
     );
   }
 
   void _seekToPreviousChapter() {
     if (_chapters.isEmpty) {
       // No chapters - seek backward by configured amount
-      _seekWithClamping(Duration(seconds: -_seekTimeSmall));
+      seekWithClamping(widget.player, Duration(seconds: -_seekTimeSmall));
       return;
     }
 
@@ -551,7 +723,7 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
   void _seekToNextChapter() {
     if (_chapters.isEmpty) {
       // No chapters - seek forward by configured amount
-      _seekWithClamping(Duration(seconds: _seekTimeSmall));
+      seekWithClamping(widget.player, Duration(seconds: _seekTimeSmall));
       return;
     }
 
@@ -567,91 +739,20 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
     }
   }
 
-  /// Seeks by the given offset (can be positive or negative) while clamping
-  /// the result between 0 and the video duration
-  void _seekWithClamping(Duration offset) {
-    final currentPosition = widget.player.state.position;
-    final duration = widget.player.state.duration;
-    final newPosition = currentPosition + offset;
-
-    // Clamp between 0 and video duration
-    final clampedPosition = newPosition.isNegative
-        ? Duration.zero
-        : (newPosition > duration ? duration : newPosition);
-
-    widget.player.seek(clampedPosition);
-  }
-
-  /// Throttled seek for timeline slider - only sends seek events at most every 100ms
-  void _throttledSeek(Duration position) {
-    // Store the pending position
-    _pendingSeekPosition = position;
-
-    // If timer is already active, just update the pending position
-    if (_seekThrottleTimer?.isActive ?? false) {
-      return;
-    }
-
-    // Execute the seek immediately for the first call
-    widget.player.seek(position);
-
-    // Start a timer to throttle subsequent seeks
-    _seekThrottleTimer = Timer(const Duration(milliseconds: 200), () {
-      // If there's a pending position that's different, execute it
-      if (_pendingSeekPosition != null && _pendingSeekPosition != position) {
-        widget.player.seek(_pendingSeekPosition!);
-      }
-      _pendingSeekPosition = null;
-    });
-  }
+  /// Throttled seek for timeline slider - executes immediately then throttles to 200ms
+  void _throttledSeek(Duration position) => _seekThrottle([position]);
 
   /// Finalizes the seek when user stops scrubbing the timeline
   void _finalizeSeek(Duration position) {
-    // Cancel any pending throttled seek
-    _seekThrottleTimer?.cancel();
-    _seekThrottleTimer = null;
-
-    // Execute the final position immediately to ensure accuracy
+    _seekThrottle.cancel();
     widget.player.seek(position);
-    _pendingSeekPosition = null;
-  }
-
-  /// Get the replay icon based on the duration
-  /// Returns numbered icons (replay_5, replay_10, replay_30) when available,
-  /// otherwise returns generic replay icon
-  IconData _getReplayIcon(int seconds) {
-    switch (seconds) {
-      case 5:
-        return Icons.replay_5;
-      case 10:
-        return Icons.replay_10;
-      case 30:
-        return Icons.replay_30;
-      default:
-        return Icons.replay; // Generic icon for custom durations
-    }
-  }
-
-  /// Get the forward icon based on the duration
-  /// Returns numbered icons (forward_5, forward_10, forward_30) when available,
-  /// otherwise returns generic forward icon
-  IconData _getForwardIcon(int seconds) {
-    switch (seconds) {
-      case 5:
-        return Icons.forward_5;
-      case 10:
-        return Icons.forward_10;
-      case 30:
-        return Icons.forward_30;
-      default:
-        return Icons.forward; // Generic icon for custom durations
-    }
   }
 
   /// Handle double-tap skip forward or backward
   void _handleDoubleTapSkip({required bool isForward}) {
     // Perform the seek
-    _seekWithClamping(
+    seekWithClamping(
+      widget.player,
       Duration(seconds: isForward ? _seekTimeSmall : -_seekTimeSmall),
     );
 
@@ -700,10 +801,11 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
           color: Colors.black.withValues(alpha: 0.6),
           shape: BoxShape.circle,
         ),
-        child: Icon(
+        child: AppIcon(
           _lastDoubleTapWasForward
-              ? _getForwardIcon(_seekTimeSmall)
-              : _getReplayIcon(_seekTimeSmall),
+              ? getForwardIcon(_seekTimeSmall)
+              : getReplayIcon(_seekTimeSmall),
+          fill: 1,
           color: Colors.white,
           size: 48,
         ),
@@ -737,14 +839,133 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
     }
   }
 
+  /// Check if a key is a directional key (arrow keys)
+  bool _isDirectionalKey(LogicalKeyboardKey key) {
+    return key == LogicalKeyboardKey.arrowUp ||
+        key == LogicalKeyboardKey.arrowDown ||
+        key == LogicalKeyboardKey.arrowLeft ||
+        key == LogicalKeyboardKey.arrowRight;
+  }
+
+  /// Check if a key is a back/escape key
+  bool _isBackKey(LogicalKeyboardKey key) {
+    return key == LogicalKeyboardKey.escape ||
+        key == LogicalKeyboardKey.goBack ||
+        key == LogicalKeyboardKey.browserBack ||
+        key == LogicalKeyboardKey.gameButtonB;
+  }
+
+  /// Check if a key is a select/enter key
+  bool _isSelectKey(LogicalKeyboardKey key) {
+    return key == LogicalKeyboardKey.select ||
+        key == LogicalKeyboardKey.enter ||
+        key == LogicalKeyboardKey.numpadEnter ||
+        key == LogicalKeyboardKey.gameButtonA;
+  }
+
+  /// Show controls and focus play/pause on keyboard input (desktop only)
+  void _showControlsWithFocus() {
+    if (!_showControls) {
+      setState(() {
+        _showControls = true;
+        _controlsFullyHidden = false;
+      });
+      if (Platform.isLinux) {
+        widget.player.setControlsVisible(true);
+      }
+      if (Platform.isMacOS) {
+        _updateTrafficLightVisibility();
+      }
+    }
+    _startHideTimer();
+
+    // Request focus on play/pause button after controls are shown
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _desktopControlsKey.currentState?.requestPlayPauseFocus();
+    });
+  }
+
+  /// Hide controls when navigating up from timeline (keyboard mode)
+  void _hideControlsFromKeyboard() {
+    if (_showControls) {
+      setState(() {
+        _showControls = false;
+      });
+      // Return focus to the main focus node
+      _focusNode.requestFocus();
+      if (Platform.isMacOS) {
+        _updateTrafficLightVisibility();
+      }
+      if (Platform.isLinux) {
+        Future.delayed(const Duration(milliseconds: 250), () {
+          if (mounted && !_showControls) {
+            setState(() {
+              _controlsFullyHidden = true;
+            });
+            widget.player.setControlsVisible(false);
+          }
+        });
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    final isMobile = PlatformDetector.isMobile(context);
+    // Use desktop controls for desktop platforms AND Android TV
+    final isMobile =
+        PlatformDetector.isMobile(context) && !PlatformDetector.isTV();
 
     return Focus(
       focusNode: _focusNode,
       autofocus: true,
       onKeyEvent: (node, event) {
+        // Only handle KeyDown and KeyRepeat events
+        if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+          return KeyEventResult.ignored;
+        }
+
+        // Reset hide timer on any keyboard/controller input when controls are visible
+        if (_showControls) {
+          _restartHideTimerIfPlaying();
+        }
+
+        final key = event.logicalKey;
+
+        // Handle Back/Escape: show controls if hidden, navigate back if visible
+        if (_isBackKey(key)) {
+          if (!_showControls) {
+            _showControlsWithFocus();
+            return KeyEventResult.handled;
+          }
+          // Controls visible - navigate back
+          Navigator.of(context).pop(true);
+          return KeyEventResult.handled;
+        }
+
+        // Handle Select/Enter when controls are hidden: pause and show controls
+        // Only intercept if this Focus node itself has primary focus (not a descendant)
+        if (_isSelectKey(key) && !_showControls && _focusNode.hasPrimaryFocus) {
+          widget.player.playOrPause();
+          _showControlsWithFocus();
+          return KeyEventResult.handled;
+        }
+
+        // On desktop, show controls and focus play/pause on directional input
+        // Only handle navigation if video player navigation is enabled
+        if (!isMobile &&
+            _isDirectionalKey(key) &&
+            _videoPlayerNavigationEnabled) {
+          // If controls are hidden, show them and focus play/pause
+          if (!_showControls) {
+            _showControlsWithFocus();
+            return KeyEventResult.handled;
+          }
+          // If controls are shown, let the event propagate to the focused control
+          // The DesktopVideoControls will handle navigation
+          return KeyEventResult.ignored;
+        }
+
+        // Pass other events to the keyboard shortcuts service
         if (_keyboardService == null) return KeyEventResult.ignored;
 
         return _keyboardService!.handleVideoPlayerKeyEvent(
@@ -756,6 +977,7 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
           _nextSubtitleTrack,
           _nextChapter,
           _previousChapter,
+          onBack: () => Navigator.of(context).pop(true),
         );
       },
       child: MouseRegion(
@@ -767,7 +989,12 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
           if (!_showControls) {
             setState(() {
               _showControls = true;
+              _controlsFullyHidden = false;
             });
+            // On Linux, show Flutter view when controls are shown
+            if (Platform.isLinux) {
+              widget.player.setControlsVisible(true);
+            }
             _startHideTimer();
             // On macOS, show traffic lights when controls appear
             if (Platform.isMacOS) {
@@ -786,32 +1013,107 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
               ),
             ),
             // Custom controls overlay - use AnimatedOpacity to keep widget tree alive
+            // On Linux, use Offstage after fade completes to fully hide
             Positioned.fill(
-              child: IgnorePointer(
-                ignoring: !_showControls,
-                child: AnimatedOpacity(
-                  opacity: _showControls ? 1.0 : 0.0,
-                  duration: const Duration(milliseconds: 200),
-                  child: GestureDetector(
-                    onTap: _toggleControls,
-                    behavior: HitTestBehavior.deferToChild,
-                    child: Container(
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.topCenter,
-                          end: Alignment.bottomCenter,
-                          colors: [
-                            Colors.black.withValues(alpha: 0.7),
-                            Colors.transparent,
-                            Colors.transparent,
-                            Colors.black.withValues(alpha: 0.7),
-                          ],
-                          stops: const [0.0, 0.2, 0.8, 1.0],
+              child: Offstage(
+                offstage: Platform.isLinux && _controlsFullyHidden,
+                child: IgnorePointer(
+                  ignoring: !_showControls,
+                  child: FocusScope(
+                    // Prevent focus from entering controls when hidden
+                    canRequestFocus: _showControls,
+                    child: AnimatedOpacity(
+                      opacity: _showControls ? 1.0 : 0.0,
+                      duration: const Duration(milliseconds: 200),
+                      child: GestureDetector(
+                        onTap: _toggleControls,
+                        behavior: HitTestBehavior.deferToChild,
+                        child: Container(
+                          decoration: BoxDecoration(
+                            gradient: LinearGradient(
+                              begin: Alignment.topCenter,
+                              end: Alignment.bottomCenter,
+                              colors: [
+                                Colors.black.withValues(alpha: 0.7),
+                                Colors.transparent,
+                                Colors.transparent,
+                                Colors.black.withValues(alpha: 0.7),
+                              ],
+                              stops: const [0.0, 0.2, 0.8, 1.0],
+                            ),
+                          ),
+                          child: isMobile
+                              ? Listener(
+                                  behavior: HitTestBehavior.translucent,
+                                  onPointerDown: (_) =>
+                                      _restartHideTimerIfPlaying(),
+                                  child: MobileVideoControls(
+                                    player: widget.player,
+                                    metadata: widget.metadata,
+                                    chapters: _chapters,
+                                    chaptersLoaded: _chaptersLoaded,
+                                    seekTimeSmall: _seekTimeSmall,
+                                    trackChapterControls:
+                                        _buildTrackChapterControlsWidget(),
+                                    onSeek: _throttledSeek,
+                                    onSeekEnd: _finalizeSeek,
+                                    onPlayPause:
+                                        () {}, // Not used, handled internally
+                                    onCancelAutoHide: () =>
+                                        _hideTimer?.cancel(),
+                                    onStartAutoHide: _startHideTimer,
+                                  ),
+                                )
+                              : Listener(
+                                  behavior: HitTestBehavior.translucent,
+                                  onPointerDown: (_) =>
+                                      _restartHideTimerIfPlaying(),
+                                  child: DesktopVideoControls(
+                                    key: _desktopControlsKey,
+                                    player: widget.player,
+                                    metadata: widget.metadata,
+                                    onNext: widget.onNext,
+                                    onPrevious: widget.onPrevious,
+                                    chapters: _chapters,
+                                    chaptersLoaded: _chaptersLoaded,
+                                    seekTimeSmall: _seekTimeSmall,
+                                    onSeekToPreviousChapter:
+                                        _seekToPreviousChapter,
+                                    onSeekToNextChapter: _seekToNextChapter,
+                                    onSeek: _throttledSeek,
+                                    onSeekEnd: _finalizeSeek,
+                                    getReplayIcon: getReplayIcon,
+                                    getForwardIcon: getForwardIcon,
+                                    onFocusActivity: _restartHideTimerIfPlaying,
+                                    onHideControls: _hideControlsFromKeyboard,
+                                    // Track chapter controls data
+                                    availableVersions: widget.availableVersions,
+                                    selectedMediaIndex:
+                                        widget.selectedMediaIndex,
+                                    boxFitMode: widget.boxFitMode,
+                                    audioSyncOffset: _audioSyncOffset,
+                                    subtitleSyncOffset: _subtitleSyncOffset,
+                                    isFullscreen: _isFullscreen,
+                                    onCycleBoxFitMode: widget.onCycleBoxFitMode,
+                                    onToggleFullscreen: _toggleFullscreen,
+                                    onSwitchVersion: _switchMediaVersion,
+                                    onAudioTrackChanged:
+                                        widget.onAudioTrackChanged,
+                                    onSubtitleTrackChanged:
+                                        widget.onSubtitleTrackChanged,
+                                    onLoadSeekTimes: () async {
+                                      if (mounted) {
+                                        await _loadSeekTimes();
+                                      }
+                                    },
+                                    onCancelAutoHide: () =>
+                                        _hideTimer?.cancel(),
+                                    onStartAutoHide: _startHideTimer,
+                                    serverId: widget.metadata.serverId ?? '',
+                                  ),
+                                ),
                         ),
                       ),
-                      child: isMobile
-                          ? _buildMobileLayout()
-                          : _buildDesktopLayout(),
                     ),
                   ),
                 ),
@@ -932,630 +1234,101 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
 
     // Show "Next Episode" for credits when next episode is available
     final bool showNextEpisode = isCredits && hasNextEpisode;
-    final String buttonText = showNextEpisode
+    final String baseButtonText = showNextEpisode
         ? 'Next Episode'
         : (isCredits ? 'Skip Credits' : 'Skip Intro');
+
+    final isAutoSkipActive = _autoSkipTimer?.isActive ?? false;
+    final shouldShowAutoSkip = _shouldShowAutoSkip();
+
+    final int remainingSeconds = isAutoSkipActive && shouldShowAutoSkip
+        ? (_autoSkipDelay - (_autoSkipProgress * _autoSkipDelay)).ceil().clamp(
+            0,
+            _autoSkipDelay,
+          )
+        : 0;
+
+    final String buttonText =
+        isAutoSkipActive && shouldShowAutoSkip && remainingSeconds > 0
+        ? '$baseButtonText ($remainingSeconds)'
+        : baseButtonText;
     final IconData buttonIcon = showNextEpisode
-        ? Icons.skip_next
-        : Icons.fast_forward;
+        ? Symbols.skip_next_rounded
+        : Symbols.fast_forward_rounded;
 
     return Material(
       color: Colors.transparent,
       child: InkWell(
-        onTap: showNextEpisode ? widget.onNext : _skipMarker,
+        onTap: () {
+          if (isAutoSkipActive) {
+            _cancelAutoSkipTimer();
+          }
+          // Always perform the skip action when tapped
+          _performAutoSkip();
+        },
         borderRadius: BorderRadius.circular(8),
-        child: Container(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-          decoration: BoxDecoration(
-            color: Colors.white.withValues(alpha: 0.9),
-            borderRadius: BorderRadius.circular(8),
-            boxShadow: [
-              BoxShadow(
-                color: Colors.black.withValues(alpha: 0.3),
-                blurRadius: 8,
-                offset: const Offset(0, 2),
-              ),
-            ],
-          ),
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                buttonText,
-                style: const TextStyle(
-                  color: Colors.black,
-                  fontSize: 16,
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-              const SizedBox(width: 8),
-              Icon(buttonIcon, color: Colors.black, size: 20),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildMobileLayout() {
-    return Column(
-      children: [
-        // Top bar with back button and track/chapter controls
-        _buildMobileTopBar(),
-        const Spacer(),
-        // Centered large playback controls
-        _buildMobilePlaybackControls(),
-        const Spacer(),
-        // Progress bar at bottom
-        _buildMobileBottomBar(),
-      ],
-    );
-  }
-
-  Widget _buildDesktopLayout() {
-    return Column(
-      children: [
-        // Top bar with back button and title
-        _buildDesktopTopBar(),
-        const Spacer(),
-        // Bottom controls
-        _buildDesktopBottomControls(),
-      ],
-    );
-  }
-
-  // Mobile layout components
-  Widget _buildMobileTopBar() {
-    final topBar = _conditionalSafeArea(
-      bottom: false, // Only respect top safe area when in portrait
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Row(
+        child: Stack(
           children: [
-            AppBarBackButton(
-              style: BackButtonStyle.video,
-              onPressed: () => Navigator.of(context).pop(true),
-            ),
-            const SizedBox(width: 16),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+              decoration: BoxDecoration(
+                color: Colors.white.withValues(alpha: 0.9),
+                borderRadius: BorderRadius.circular(8),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.black.withValues(alpha: 0.3),
+                    blurRadius: 8,
+                    offset: const Offset(0, 2),
+                  ),
+                ],
+              ),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
-                    widget.metadata.grandparentTitle ?? widget.metadata.title,
+                    buttonText,
                     style: const TextStyle(
-                      color: Colors.white,
+                      color: Colors.black,
                       fontSize: 16,
-                      fontWeight: FontWeight.bold,
+                      fontWeight: FontWeight.w600,
                     ),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
                   ),
-                  if (widget.metadata.parentIndex != null &&
-                      widget.metadata.index != null)
-                    Text(
-                      'S${widget.metadata.parentIndex} · E${widget.metadata.index} · ${widget.metadata.title}',
-                      style: const TextStyle(
-                        color: Colors.white70,
-                        fontSize: 14,
-                      ),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
+                  const SizedBox(width: 8),
+                  AppIcon(buttonIcon, fill: 1, color: Colors.black, size: 20),
                 ],
               ),
             ),
-            // Track and chapter controls in top right
-            _buildTrackAndChapterControls(),
-          ],
-        ),
-      ),
-    );
-
-    // On macOS, wrap with GestureDetector to prevent window dragging
-    if (Platform.isMacOS) {
-      return GestureDetector(
-        behavior: HitTestBehavior.opaque,
-        onPanDown: (_) {}, // Consume pan gestures to prevent window dragging
-        child: topBar,
-      );
-    }
-
-    return topBar;
-  }
-
-  Widget _buildMobilePlaybackControls() {
-    return StreamBuilder<bool>(
-      stream: widget.player.stream.playing,
-      initialData: widget.player.state.playing,
-      builder: (context, snapshot) {
-        final isPlaying = snapshot.data ?? false;
-        return Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Container(
-              decoration: BoxDecoration(
-                color: Colors.black.withValues(alpha: 0.5),
-                shape: BoxShape.circle,
-              ),
-              child: IconButton(
-                icon: Icon(
-                  _getReplayIcon(_seekTimeSmall),
-                  color: Colors.white,
-                  size: 48,
-                ),
-                iconSize: 48,
-                onPressed: () {
-                  _seekWithClamping(Duration(seconds: -_seekTimeSmall));
-                },
-              ),
-            ),
-            const SizedBox(width: 48),
-            Container(
-              decoration: BoxDecoration(
-                color: Colors.black.withValues(alpha: 0.5),
-                shape: BoxShape.circle,
-              ),
-              child: IconButton(
-                icon: Icon(
-                  isPlaying ? Icons.pause : Icons.play_arrow,
-                  color: Colors.white,
-                  size: 72,
-                ),
-                iconSize: 72,
-                onPressed: () {
-                  if (isPlaying) {
-                    widget.player.pause();
-                    _hideTimer?.cancel(); // Cancel auto-hide when paused
-                  } else {
-                    widget.player.play();
-                    _startHideTimer(); // Start auto-hide when playing
-                  }
-                },
-              ),
-            ),
-            const SizedBox(width: 48),
-            Container(
-              decoration: BoxDecoration(
-                color: Colors.black.withValues(alpha: 0.5),
-                shape: BoxShape.circle,
-              ),
-              child: IconButton(
-                icon: Icon(
-                  _getForwardIcon(_seekTimeSmall),
-                  color: Colors.white,
-                  size: 48,
-                ),
-                iconSize: 48,
-                onPressed: () {
-                  _seekWithClamping(Duration(seconds: _seekTimeSmall));
-                },
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildMobileBottomBar() {
-    return _conditionalSafeArea(
-      top: false, // Only respect bottom safe area when in portrait
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: StreamBuilder<Duration>(
-          stream: widget.player.stream.position,
-          initialData: widget.player.state.position,
-          builder: (context, positionSnapshot) {
-            return StreamBuilder<Duration>(
-              stream: widget.player.stream.duration,
-              initialData: widget.player.state.duration,
-              builder: (context, durationSnapshot) {
-                final position = positionSnapshot.data ?? Duration.zero;
-                final duration = durationSnapshot.data ?? Duration.zero;
-
-                return Column(
-                  children: [
-                    _buildTimelineWithChapters(
-                      position: position,
-                      duration: duration,
-                    ),
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 16),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          Text(
-                            _formatDuration(position),
-                            style: const TextStyle(
-                              color: Colors.white,
-                              fontSize: 14,
-                            ),
-                          ),
-                          Text(
-                            _formatDuration(duration),
-                            style: const TextStyle(
-                              color: Colors.white,
-                              fontSize: 14,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                );
-              },
-            );
-          },
-        ),
-      ),
-    );
-  }
-
-  // Desktop layout components
-  Widget _buildDesktopTopBar() {
-    // Use global fullscreen state for padding
-    return ListenableBuilder(
-      listenable: FullscreenStateManager(),
-      builder: (context, _) {
-        final isFullscreen = FullscreenStateManager().isFullscreen;
-        // In fullscreen on macOS, use less left padding since traffic lights auto-hide
-        // In normal mode on macOS, need more padding to avoid traffic lights
-        final leftPadding = Platform.isMacOS
-            ? (isFullscreen
-                  ? DesktopWindowPadding.macOSLeftFullscreen
-                  : DesktopWindowPadding.macOSLeft)
-            : DesktopWindowPadding.macOSLeftFullscreen;
-
-        return _buildDesktopTopBarContent(leftPadding);
-      },
-    );
-  }
-
-  Widget _buildDesktopTopBarContent(double leftPadding) {
-    final topBar = Padding(
-      padding: EdgeInsets.only(left: leftPadding, right: 16),
-      child: Row(
-        children: [
-          AppBarBackButton(
-            style: BackButtonStyle.video,
-            onPressed: () => Navigator.of(context).pop(true),
-          ),
-          const SizedBox(width: 16),
-          Expanded(
-            child: Platform.isMacOS
-                ? _buildMacOSSingleLineTitle()
-                : _buildMultiLineTitle(),
-          ),
-        ],
-      ),
-    );
-
-    // On macOS, wrap with GestureDetector to prevent window dragging
-    if (Platform.isMacOS) {
-      return GestureDetector(
-        behavior: HitTestBehavior.opaque,
-        onPanDown: (_) {}, // Consume pan gestures to prevent window dragging
-        child: topBar,
-      );
-    }
-
-    return topBar;
-  }
-
-  Widget _buildMacOSSingleLineTitle() {
-    // Build single-line title combining series and episode info
-    final seriesName =
-        widget.metadata.grandparentTitle ?? widget.metadata.title;
-    final hasEpisodeInfo =
-        widget.metadata.parentIndex != null && widget.metadata.index != null;
-
-    final titleText = hasEpisodeInfo
-        ? '$seriesName · S${widget.metadata.parentIndex} E${widget.metadata.index} · ${widget.metadata.title}'
-        : seriesName;
-
-    return Text(
-      titleText,
-      style: const TextStyle(
-        color: Colors.white,
-        fontSize: 15,
-        fontWeight: FontWeight.w500,
-      ),
-      maxLines: 1,
-      overflow: TextOverflow.ellipsis,
-    );
-  }
-
-  Widget _buildMultiLineTitle() {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          widget.metadata.grandparentTitle ?? widget.metadata.title,
-          style: const TextStyle(
-            color: Colors.white,
-            fontSize: 16,
-            fontWeight: FontWeight.bold,
-          ),
-          maxLines: 1,
-          overflow: TextOverflow.ellipsis,
-        ),
-        if (widget.metadata.parentIndex != null &&
-            widget.metadata.index != null)
-          Text(
-            'S${widget.metadata.parentIndex} · E${widget.metadata.index} · ${widget.metadata.title}',
-            style: const TextStyle(color: Colors.white70, fontSize: 14),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-          ),
-      ],
-    );
-  }
-
-  Widget _buildDesktopBottomControls() {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
-      child: Column(
-        children: [
-          // Row 1: Timeline with time indicators
-          StreamBuilder<Duration>(
-            stream: widget.player.stream.position,
-            initialData: widget.player.state.position,
-            builder: (context, positionSnapshot) {
-              return StreamBuilder<Duration>(
-                stream: widget.player.stream.duration,
-                initialData: widget.player.state.duration,
-                builder: (context, durationSnapshot) {
-                  final position = positionSnapshot.data ?? Duration.zero;
-                  final duration = durationSnapshot.data ?? Duration.zero;
-
-                  return Row(
+            // Progress indicator overlay
+            if (isAutoSkipActive && shouldShowAutoSkip)
+              Positioned.fill(
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(8),
+                  child: Row(
                     children: [
-                      Text(
-                        _formatDuration(position),
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 14,
-                        ),
-                      ),
-                      const SizedBox(width: 12),
                       Expanded(
-                        child: _buildTimelineWithChapters(
-                          position: position,
-                          duration: duration,
+                        flex: (_autoSkipProgress * 100).round(),
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: Colors.blue.withValues(alpha: 0.2),
+                            borderRadius: BorderRadius.circular(8),
+                          ),
                         ),
                       ),
-                      const SizedBox(width: 12),
-                      Text(
-                        _formatDuration(duration),
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 14,
+                      Expanded(
+                        flex: ((1.0 - _autoSkipProgress) * 100).round(),
+                        child: Container(
+                          decoration: const BoxDecoration(
+                            color: Colors.transparent,
+                          ),
                         ),
                       ),
                     ],
-                  );
-                },
-              );
-            },
-          ),
-          const SizedBox(height: 4),
-          // Row 2: Playback controls and options
-          Row(
-            children: [
-              // Previous item
-              IconButton(
-                icon: Icon(
-                  Icons.skip_previous,
-                  color: widget.onPrevious != null
-                      ? Colors.white
-                      : Colors.white54,
-                ),
-                onPressed: widget.onPrevious,
-              ),
-              // Previous chapter (or skip backward if no chapters)
-              IconButton(
-                icon: Icon(
-                  _chapters.isEmpty
-                      ? _getReplayIcon(_seekTimeSmall)
-                      : Icons.fast_rewind,
-                  color: Colors.white,
-                ),
-                onPressed: _seekToPreviousChapter,
-              ),
-              // Play/Pause
-              StreamBuilder<bool>(
-                stream: widget.player.stream.playing,
-                initialData: widget.player.state.playing,
-                builder: (context, snapshot) {
-                  final isPlaying = snapshot.data ?? false;
-                  return IconButton(
-                    icon: Icon(
-                      isPlaying ? Icons.pause : Icons.play_arrow,
-                      color: Colors.white,
-                      size: 32,
-                    ),
-                    iconSize: 32,
-                    onPressed: () {
-                      if (isPlaying) {
-                        widget.player.pause();
-                        _hideTimer?.cancel(); // Cancel auto-hide when paused
-                      } else {
-                        widget.player.play();
-                        _startHideTimer(); // Start auto-hide when playing
-                      }
-                    },
-                  );
-                },
-              ),
-              // Next chapter (or skip forward if no chapters)
-              IconButton(
-                icon: Icon(
-                  _chapters.isEmpty
-                      ? _getForwardIcon(_seekTimeSmall)
-                      : Icons.fast_forward,
-                  color: Colors.white,
-                ),
-                onPressed: _seekToNextChapter,
-              ),
-              // Next item
-              IconButton(
-                icon: Icon(
-                  Icons.skip_next,
-                  color: widget.onNext != null ? Colors.white : Colors.white54,
-                ),
-                onPressed: widget.onNext,
-              ),
-              const Spacer(),
-              // Volume control
-              _buildVolumeControl(),
-              const SizedBox(width: 16),
-              // Audio track, subtitle, and chapter controls
-              _buildTrackAndChapterControls(),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildTimelineWithChapters({
-    required Duration position,
-    required Duration duration,
-  }) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        // Chapter markers layer
-        if (_chaptersLoaded &&
-            _chapters.isNotEmpty &&
-            duration.inMilliseconds > 0)
-          Positioned.fill(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 24),
-              child: Row(
-                children:
-                    _chapters.map((chapter) {
-                      final chapterPosition =
-                          (chapter.startTimeOffset ?? 0) /
-                          duration.inMilliseconds;
-                      return Expanded(
-                        flex: (chapterPosition * 1000).toInt(),
-                        child: const SizedBox(),
-                      );
-                    }).toList()..add(
-                      Expanded(
-                        flex:
-                            1000 -
-                            _chapters.fold<int>(
-                              0,
-                              (sum, chapter) =>
-                                  sum +
-                                  ((chapter.startTimeOffset ?? 0) /
-                                          duration.inMilliseconds *
-                                          1000)
-                                      .toInt(),
-                            ),
-                        child: const SizedBox(),
-                      ),
-                    ),
-              ),
-            ),
-          ),
-        // Slider
-        Slider(
-          value: duration.inMilliseconds > 0
-              ? position.inMilliseconds.toDouble()
-              : 0.0,
-          min: 0.0,
-          max: duration.inMilliseconds.toDouble(),
-          onChanged: (value) {
-            _throttledSeek(Duration(milliseconds: value.toInt()));
-          },
-          onChangeEnd: (value) {
-            _finalizeSeek(Duration(milliseconds: value.toInt()));
-          },
-          activeColor: Colors.white,
-          inactiveColor: Colors.white.withValues(alpha: 0.3),
-        ),
-        // Chapter marker indicators
-        if (_chaptersLoaded &&
-            _chapters.isNotEmpty &&
-            duration.inMilliseconds > 0)
-          Positioned.fill(
-            child: IgnorePointer(
-              child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 24),
-                child: CustomPaint(
-                  painter: ChapterMarkerPainter(
-                    chapters: _chapters,
-                    duration: duration,
                   ),
                 ),
               ),
-            ),
-          ),
-      ],
-    );
-  }
-
-  Widget _buildVolumeControl() {
-    return StreamBuilder<double>(
-      stream: widget.player.stream.volume,
-      initialData: widget.player.state.volume,
-      builder: (context, snapshot) {
-        final volume = snapshot.data ?? 100.0;
-        final isMuted = volume == 0;
-
-        return Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            IconButton(
-              icon: Icon(
-                isMuted ? Icons.volume_off : Icons.volume_up,
-                color: Colors.white,
-              ),
-              onPressed: () async {
-                final newVolume = isMuted ? 100.0 : 0.0;
-                widget.player.setVolume(newVolume);
-                final settings = await SettingsService.getInstance();
-                await settings.setVolume(newVolume);
-              },
-              padding: EdgeInsets.zero,
-              constraints: const BoxConstraints(),
-            ),
-            const SizedBox(width: 8),
-            SizedBox(
-              width: 100,
-              child: SliderTheme(
-                data: SliderThemeData(
-                  trackHeight: 3,
-                  thumbShape: const RoundSliderThumbShape(
-                    enabledThumbRadius: 6,
-                  ),
-                  overlayShape: const RoundSliderOverlayShape(
-                    overlayRadius: 12,
-                  ),
-                ),
-                child: Slider(
-                  value: volume,
-                  min: 0.0,
-                  max: 100.0,
-                  onChanged: (value) {
-                    widget.player.setVolume(value);
-                  },
-                  onChangeEnd: (value) async {
-                    final settings = await SettingsService.getInstance();
-                    await settings.setVolume(value);
-                  },
-                  activeColor: Colors.white,
-                  inactiveColor: Colors.white.withValues(alpha: 0.3),
-                ),
-              ),
-            ),
           ],
-        );
-      },
+        ),
+      ),
     );
   }
 
@@ -1581,6 +1354,8 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
 
       // Set flag on parent VideoPlayerScreen to skip orientation restoration
       videoPlayerState?.setReplacingWithVideo();
+      // Dispose the existing player before spinning up the replacement to avoid race conditions
+      await videoPlayerState?.disposePlayerForNavigation();
 
       // Navigate to new player screen with the selected version
       // Use PageRouteBuilder with zero-duration transitions to prevent orientation reset
@@ -1608,16 +1383,4 @@ class _PlexVideoControlsState extends State<PlexVideoControls>
       }
     }
   }
-
-  String _formatDuration(Duration duration) {
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-    final seconds = duration.inSeconds.remainder(60);
-
-    if (hours > 0) {
-      return '$hours:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-    } else {
-      return '$minutes:${seconds.toString().padLeft(2, '0')}';
-    }
-  }
 }
diff --git a/lib/widgets/video_controls/widgets/sleep_timer_active_status.dart b/lib/widgets/video_controls/widgets/sleep_timer_active_status.dart
new file mode 100644
index 00000000..a9edf491
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/sleep_timer_active_status.dart
@@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import '../../../services/sleep_timer_service.dart';
+import '../../../i18n/strings.g.dart';
+import '../../../utils/duration_formatter.dart';
+
+/// Widget displaying active sleep timer status with extend/cancel actions
+class SleepTimerActiveStatus extends StatelessWidget {
+  final SleepTimerService sleepTimer;
+  final Duration remainingTime;
+  final VoidCallback? onCancel;
+
+  const SleepTimerActiveStatus({
+    super.key,
+    required this.sleepTimer,
+    required this.remainingTime,
+    this.onCancel,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      color: Colors.amber.withValues(alpha: 0.1),
+      child: Column(
+        children: [
+          Text(
+            t.videoControls.timerActive,
+            style: const TextStyle(
+              color: Colors.amber,
+              fontSize: 16,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            t.videoControls.playbackWillPauseIn(
+              duration: formatDurationWithSeconds(remainingTime),
+            ),
+            style: const TextStyle(color: Colors.white70, fontSize: 14),
+          ),
+          const SizedBox(height: 16),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              OutlinedButton.icon(
+                icon: const AppIcon(Symbols.add_rounded, fill: 1),
+                label: Text(
+                  t.videoControls.addTime(amount: "15", unit: " min"),
+                ),
+                style: OutlinedButton.styleFrom(
+                  foregroundColor: Colors.white,
+                  side: const BorderSide(color: Colors.white54),
+                ),
+                onPressed: () {
+                  sleepTimer.extendTimer(const Duration(minutes: 15));
+                },
+              ),
+              const SizedBox(width: 12),
+              FilledButton.icon(
+                icon: const AppIcon(Symbols.cancel_rounded, fill: 1),
+                label: Text(t.common.cancel),
+                style: FilledButton.styleFrom(backgroundColor: Colors.red),
+                onPressed: () {
+                  sleepTimer.cancelTimer();
+                  onCancel?.call();
+                },
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/widgets/sleep_timer_content.dart b/lib/widgets/video_controls/widgets/sleep_timer_content.dart
new file mode 100644
index 00000000..1561315b
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/sleep_timer_content.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+
+import '../../../mpv/mpv.dart';
+import '../../../services/sleep_timer_service.dart';
+import 'sleep_timer_active_status.dart';
+import 'sleep_timer_duration_list.dart';
+
+/// Shared UI for sleep timer selection and active status.
+class SleepTimerContent extends StatelessWidget {
+  final Player player;
+  final SleepTimerService sleepTimer;
+  final int? defaultDuration;
+  final VoidCallback? onCancel;
+
+  const SleepTimerContent({
+    super.key,
+    required this.player,
+    required this.sleepTimer,
+    this.defaultDuration,
+    this.onCancel,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListenableBuilder(
+      listenable: sleepTimer,
+      builder: (context, _) {
+        final remainingTime = sleepTimer.remainingTime;
+
+        return Column(
+          children: [
+            if (sleepTimer.isActive && remainingTime != null) ...[
+              SleepTimerActiveStatus(
+                sleepTimer: sleepTimer,
+                remainingTime: remainingTime,
+                onCancel: onCancel,
+              ),
+              const Divider(color: Colors.white24, height: 1),
+            ],
+            Expanded(
+              child: SleepTimerDurationList(
+                player: player,
+                sleepTimer: sleepTimer,
+                defaultDuration: defaultDuration,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/widgets/sleep_timer_duration_list.dart b/lib/widgets/video_controls/widgets/sleep_timer_duration_list.dart
new file mode 100644
index 00000000..2603f1fe
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/sleep_timer_duration_list.dart
@@ -0,0 +1,83 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../../mpv/mpv.dart';
+import '../../../services/sleep_timer_service.dart';
+import '../../../utils/duration_formatter.dart';
+import '../../../i18n/strings.g.dart';
+
+/// Widget displaying list of sleep timer durations for selection
+class SleepTimerDurationList extends StatelessWidget {
+  final Player player;
+  final SleepTimerService sleepTimer;
+  final int? defaultDuration;
+
+  const SleepTimerDurationList({
+    super.key,
+    required this.player,
+    required this.sleepTimer,
+    this.defaultDuration,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final durations = [5, 10, 15, 30, 45, 60, 90, 120];
+    // Add default duration if provided and not already in list
+    if (defaultDuration != null && !durations.contains(defaultDuration)) {
+      durations.add(defaultDuration!);
+      durations.sort();
+    }
+
+    return ListView.builder(
+      itemCount: durations.length,
+      itemBuilder: (context, index) {
+        final minutes = durations[index];
+        final label = formatDurationTextual(
+          minutes * 60 * 1000, // Convert minutes to milliseconds
+          abbreviated: false, // Use full format for better readability
+        );
+
+        return ListTile(
+          leading: const AppIcon(
+            Symbols.timer_rounded,
+            fill: 1,
+            color: Colors.white70,
+          ),
+          title: Text(
+            label,
+            style: const TextStyle(
+              color: Colors.white,
+              fontWeight: FontWeight.normal,
+            ),
+          ),
+          onTap: () {
+            sleepTimer.startTimer(Duration(minutes: minutes), () {
+              // Pause playback when timer completes
+              player.pause();
+
+              // Show a snackbar notification
+              if (context.mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(t.videoControls.sleepTimerCompleted),
+                    duration: const Duration(seconds: 3),
+                  ),
+                );
+              }
+            });
+            Navigator.pop(context);
+
+            // Show confirmation snackbar
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(t.messages.sleepTimerSet(label: label)),
+                duration: const Duration(seconds: 2),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/widgets/sync_offset_control.dart b/lib/widgets/video_controls/widgets/sync_offset_control.dart
index 16a8a7ea..3c56f55f 100644
--- a/lib/widgets/video_controls/widgets/sync_offset_control.dart
+++ b/lib/widgets/video_controls/widgets/sync_offset_control.dart
@@ -1,6 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:media_kit/media_kit.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+import '../../../mpv/mpv.dart';
 import '../../../i18n/strings.g.dart';
+import '../../../utils/duration_formatter.dart';
 
 /// Reusable widget for adjusting sync offsets (audio or subtitle)
 class SyncOffsetControl extends StatefulWidget {
@@ -43,11 +47,11 @@ class _SyncOffsetControlState extends State<SyncOffsetControl> {
   }
 
   Future<void> _applyOffset(double offsetMs) async {
-    // Convert milliseconds to seconds for media_kit
+    // Convert milliseconds to seconds for mpv
     final offsetSeconds = offsetMs / 1000.0;
 
     // Apply to player using setProperty
-    await (widget.player.platform as dynamic).setProperty(
+    await widget.player.setProperty(
       widget.propertyName,
       offsetSeconds.toString(),
     );
@@ -63,11 +67,6 @@ class _SyncOffsetControlState extends State<SyncOffsetControl> {
     _applyOffset(0);
   }
 
-  String _formatOffset(double offsetMs) {
-    final sign = offsetMs >= 0 ? '+' : '';
-    return '$sign${offsetMs.round()}ms';
-  }
-
   String _getDescriptionText() {
     if (_currentOffset > 0) {
       return t.videoControls.playsLater(label: widget.labelText);
@@ -87,7 +86,7 @@ class _SyncOffsetControlState extends State<SyncOffsetControl> {
         children: [
           // Current offset display
           Text(
-            _formatOffset(_currentOffset),
+            formatSyncOffset(_currentOffset),
             style: const TextStyle(
               color: Colors.white,
               fontSize: 48,
@@ -135,7 +134,7 @@ class _SyncOffsetControlState extends State<SyncOffsetControl> {
           // Reset button
           ElevatedButton.icon(
             onPressed: _currentOffset != 0 ? _resetOffset : null,
-            icon: const Icon(Icons.restart_alt),
+            icon: const AppIcon(Symbols.restart_alt_rounded, fill: 1),
             label: Text(t.videoControls.resetToZero),
             style: ElevatedButton.styleFrom(
               backgroundColor: Colors.grey[800],
diff --git a/lib/widgets/video_controls/widgets/timeline_slider.dart b/lib/widgets/video_controls/widgets/timeline_slider.dart
new file mode 100644
index 00000000..c9534bb5
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/timeline_slider.dart
@@ -0,0 +1,139 @@
+import 'package:flutter/material.dart';
+import '../../../models/plex_media_info.dart';
+import '../../../i18n/strings.g.dart';
+import '../../../focus/focusable_wrapper.dart';
+import '../painters/chapter_marker_painter.dart';
+
+/// Timeline slider with chapter markers for video playback
+///
+/// Displays a horizontal slider showing playback position and duration,
+/// with optional chapter markers overlaid at their respective positions.
+class TimelineSlider extends StatelessWidget {
+  final Duration position;
+  final Duration duration;
+  final List<PlexChapter> chapters;
+  final bool chaptersLoaded;
+  final ValueChanged<Duration> onSeek;
+  final ValueChanged<Duration> onSeekEnd;
+
+  /// Optional FocusNode for D-pad/keyboard navigation.
+  final FocusNode? focusNode;
+
+  /// Custom key event handler for focus navigation.
+  final KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent;
+
+  /// Called when focus changes.
+  final ValueChanged<bool>? onFocusChange;
+
+  const TimelineSlider({
+    super.key,
+    required this.position,
+    required this.duration,
+    required this.chapters,
+    required this.chaptersLoaded,
+    required this.onSeek,
+    required this.onSeekEnd,
+    this.focusNode,
+    this.onKeyEvent,
+    this.onFocusChange,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Widget slider = Stack(
+      alignment: Alignment.center,
+      children: [
+        // Chapter markers layer
+        if (chaptersLoaded &&
+            chapters.isNotEmpty &&
+            duration.inMilliseconds > 0)
+          Positioned.fill(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 24),
+              child: Row(
+                children:
+                    chapters.map((chapter) {
+                      final chapterPosition =
+                          (chapter.startTimeOffset ?? 0) /
+                          duration.inMilliseconds;
+                      return Expanded(
+                        flex: (chapterPosition * 1000).toInt(),
+                        child: const SizedBox(),
+                      );
+                    }).toList()..add(
+                      Expanded(
+                        flex:
+                            1000 -
+                            chapters.fold<int>(
+                              0,
+                              (sum, chapter) =>
+                                  sum +
+                                  ((chapter.startTimeOffset ?? 0) /
+                                          duration.inMilliseconds *
+                                          1000)
+                                      .toInt(),
+                            ),
+                        child: const SizedBox(),
+                      ),
+                    ),
+              ),
+            ),
+          ),
+        // Slider
+        Semantics(
+          label: t.videoControls.timelineSlider,
+          slider: true,
+          child: Slider(
+            value: duration.inMilliseconds > 0
+                ? position.inMilliseconds.toDouble()
+                : 0.0,
+            min: 0.0,
+            max: duration.inMilliseconds.toDouble(),
+            onChanged: (value) {
+              onSeek(Duration(milliseconds: value.toInt()));
+            },
+            onChangeEnd: (value) {
+              onSeekEnd(Duration(milliseconds: value.toInt()));
+            },
+            activeColor: Colors.white,
+            inactiveColor: Colors.white.withValues(alpha: 0.3),
+          ),
+        ),
+        // Chapter marker indicators
+        if (chaptersLoaded &&
+            chapters.isNotEmpty &&
+            duration.inMilliseconds > 0)
+          Positioned.fill(
+            child: IgnorePointer(
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 24),
+                child: CustomPaint(
+                  painter: ChapterMarkerPainter(
+                    chapters: chapters,
+                    duration: duration,
+                  ),
+                ),
+              ),
+            ),
+          ),
+      ],
+    );
+
+    // Wrap with FocusableWrapper when focusNode is provided
+    if (focusNode != null) {
+      slider = FocusableWrapper(
+        focusNode: focusNode,
+        onKeyEvent: onKeyEvent,
+        onFocusChange: onFocusChange,
+        borderRadius: 8,
+        autoScroll: false,
+        useBackgroundFocus: true,
+        disableScale: true,
+        semanticLabel: t.videoControls.timelineSlider,
+        child: slider,
+      );
+    }
+
+    return slider;
+  }
+}
diff --git a/lib/widgets/video_controls/widgets/track_chapter_controls.dart b/lib/widgets/video_controls/widgets/track_chapter_controls.dart
new file mode 100644
index 00000000..6ba21a0b
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/track_chapter_controls.dart
@@ -0,0 +1,449 @@
+import 'dart:io' show Platform;
+
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter/services.dart';
+
+import '../../../mpv/mpv.dart';
+import '../../../models/plex_media_info.dart';
+import '../../../models/plex_media_version.dart';
+import '../../../services/sleep_timer_service.dart';
+import '../../../utils/platform_detector.dart';
+import '../../../i18n/strings.g.dart';
+import '../sheets/audio_track_sheet.dart';
+import '../sheets/chapter_sheet.dart';
+import '../sheets/subtitle_track_sheet.dart';
+import '../sheets/version_sheet.dart';
+import '../sheets/video_settings_sheet.dart';
+import '../helpers/track_filter_helper.dart';
+import '../video_control_button.dart';
+
+/// Row of track and chapter control buttons for the video player
+class TrackChapterControls extends StatelessWidget {
+  final Player player;
+  final List<PlexChapter> chapters;
+  final bool chaptersLoaded;
+  final List<PlexMediaVersion> availableVersions;
+  final int selectedMediaIndex;
+  final int boxFitMode;
+  final int audioSyncOffset;
+  final int subtitleSyncOffset;
+  final bool isRotationLocked;
+  final bool isFullscreen;
+  final VoidCallback? onCycleBoxFitMode;
+  final VoidCallback? onToggleRotationLock;
+  final VoidCallback? onToggleFullscreen;
+  final Function(int)? onSwitchVersion;
+  final Function(AudioTrack)? onAudioTrackChanged;
+  final Function(SubtitleTrack)? onSubtitleTrackChanged;
+  final VoidCallback? onLoadSeekTimes;
+  final VoidCallback? onCancelAutoHide;
+  final VoidCallback? onStartAutoHide;
+  final String serverId;
+
+  /// List of FocusNodes for the buttons (passed from parent for navigation)
+  final List<FocusNode>? focusNodes;
+
+  /// Called when focus changes on any button
+  final ValueChanged<bool>? onFocusChange;
+
+  /// Called to navigate left from the first button
+  final VoidCallback? onNavigateLeft;
+
+  const TrackChapterControls({
+    super.key,
+    required this.player,
+    required this.chapters,
+    required this.chaptersLoaded,
+    required this.availableVersions,
+    required this.selectedMediaIndex,
+    required this.boxFitMode,
+    required this.audioSyncOffset,
+    required this.subtitleSyncOffset,
+    required this.isRotationLocked,
+    required this.isFullscreen,
+    required this.serverId,
+    this.onCycleBoxFitMode,
+    this.onToggleRotationLock,
+    this.onToggleFullscreen,
+    this.onSwitchVersion,
+    this.onAudioTrackChanged,
+    this.onSubtitleTrackChanged,
+    this.onLoadSeekTimes,
+    this.onCancelAutoHide,
+    this.onStartAutoHide,
+    this.focusNodes,
+    this.onFocusChange,
+    this.onNavigateLeft,
+  });
+
+  /// Handle key event for button navigation
+  KeyEventResult _handleButtonKeyEvent(
+    FocusNode node,
+    KeyEvent event,
+    int index,
+    int totalButtons,
+  ) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    // LEFT arrow - move to previous button or exit to volume
+    if (key == LogicalKeyboardKey.arrowLeft) {
+      if (index > 0 && focusNodes != null && focusNodes!.length > index - 1) {
+        focusNodes![index - 1].requestFocus();
+        return KeyEventResult.handled;
+      } else if (index == 0) {
+        onNavigateLeft?.call();
+        return KeyEventResult.handled;
+      }
+      return KeyEventResult.handled;
+    }
+
+    // RIGHT arrow - move to next button
+    if (key == LogicalKeyboardKey.arrowRight) {
+      if (index < totalButtons - 1 &&
+          focusNodes != null &&
+          focusNodes!.length > index + 1) {
+        focusNodes![index + 1].requestFocus();
+        return KeyEventResult.handled;
+      }
+      // At end, consume to prevent bubbling
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<Tracks>(
+      stream: player.streams.tracks,
+      initialData: player.state.tracks,
+      builder: (context, snapshot) {
+        final tracks = snapshot.data;
+        final isMobile = PlatformDetector.isMobile(context);
+        final isDesktop =
+            Platform.isWindows || Platform.isLinux || Platform.isMacOS;
+
+        // Build list of buttons dynamically to track indices
+        final buttons = <Widget>[];
+        int buttonIndex = 0;
+
+        // Settings button (always shown)
+        buttons.add(
+          ListenableBuilder(
+            listenable: SleepTimerService(),
+            builder: (context, _) {
+              final sleepTimer = SleepTimerService();
+              final isActive =
+                  sleepTimer.isActive ||
+                  audioSyncOffset != 0 ||
+                  subtitleSyncOffset != 0;
+              final currentIndex = 0;
+              return VideoControlButton(
+                icon: Symbols.tune_rounded,
+                isActive: isActive,
+                semanticLabel: t.videoControls.settingsButton,
+                focusNode: focusNodes != null && focusNodes!.isNotEmpty
+                    ? focusNodes![currentIndex]
+                    : null,
+                onKeyEvent: focusNodes != null
+                    ? (node, event) => _handleButtonKeyEvent(
+                        node,
+                        event,
+                        currentIndex,
+                        _getButtonCount(tracks, isMobile, isDesktop),
+                      )
+                    : null,
+                onFocusChange: onFocusChange,
+                onPressed: () async {
+                  await VideoSettingsSheet.show(
+                    context,
+                    player,
+                    audioSyncOffset,
+                    subtitleSyncOffset,
+                    onOpen: onCancelAutoHide,
+                    onClose: onStartAutoHide,
+                  );
+                  onLoadSeekTimes?.call();
+                },
+              );
+            },
+          ),
+        );
+        buttonIndex++;
+
+        // Audio track button
+        if (_hasMultipleAudioTracks(tracks)) {
+          final currentIndex = buttonIndex;
+          buttons.add(
+            VideoControlButton(
+              icon: Symbols.audiotrack_rounded,
+              semanticLabel: t.videoControls.audioTrackButton,
+              focusNode: focusNodes != null && focusNodes!.length > currentIndex
+                  ? focusNodes![currentIndex]
+                  : null,
+              onKeyEvent: focusNodes != null
+                  ? (node, event) => _handleButtonKeyEvent(
+                      node,
+                      event,
+                      currentIndex,
+                      _getButtonCount(tracks, isMobile, isDesktop),
+                    )
+                  : null,
+              onFocusChange: onFocusChange,
+              onPressed: () => AudioTrackSheet.show(
+                context,
+                player,
+                onTrackChanged: onAudioTrackChanged,
+                onOpen: onCancelAutoHide,
+                onClose: onStartAutoHide,
+              ),
+            ),
+          );
+          buttonIndex++;
+        }
+
+        // Subtitles button
+        if (_hasSubtitles(tracks)) {
+          final currentIndex = buttonIndex;
+          buttons.add(
+            VideoControlButton(
+              icon: Symbols.subtitles_rounded,
+              semanticLabel: t.videoControls.subtitlesButton,
+              focusNode: focusNodes != null && focusNodes!.length > currentIndex
+                  ? focusNodes![currentIndex]
+                  : null,
+              onKeyEvent: focusNodes != null
+                  ? (node, event) => _handleButtonKeyEvent(
+                      node,
+                      event,
+                      currentIndex,
+                      _getButtonCount(tracks, isMobile, isDesktop),
+                    )
+                  : null,
+              onFocusChange: onFocusChange,
+              onPressed: () => SubtitleTrackSheet.show(
+                context,
+                player,
+                onTrackChanged: onSubtitleTrackChanged,
+                onOpen: onCancelAutoHide,
+                onClose: onStartAutoHide,
+              ),
+            ),
+          );
+          buttonIndex++;
+        }
+
+        // Chapters button
+        if (chapters.isNotEmpty) {
+          final currentIndex = buttonIndex;
+          buttons.add(
+            VideoControlButton(
+              icon: Symbols.video_library_rounded,
+              semanticLabel: t.videoControls.chaptersButton,
+              focusNode: focusNodes != null && focusNodes!.length > currentIndex
+                  ? focusNodes![currentIndex]
+                  : null,
+              onKeyEvent: focusNodes != null
+                  ? (node, event) => _handleButtonKeyEvent(
+                      node,
+                      event,
+                      currentIndex,
+                      _getButtonCount(tracks, isMobile, isDesktop),
+                    )
+                  : null,
+              onFocusChange: onFocusChange,
+              onPressed: () => ChapterSheet.show(
+                context,
+                player,
+                chapters,
+                chaptersLoaded,
+                serverId: serverId,
+                onOpen: onCancelAutoHide,
+                onClose: onStartAutoHide,
+              ),
+            ),
+          );
+          buttonIndex++;
+        }
+
+        // Versions button
+        if (availableVersions.length > 1 && onSwitchVersion != null) {
+          final currentIndex = buttonIndex;
+          buttons.add(
+            VideoControlButton(
+              icon: Symbols.video_file_rounded,
+              semanticLabel: t.videoControls.versionsButton,
+              focusNode: focusNodes != null && focusNodes!.length > currentIndex
+                  ? focusNodes![currentIndex]
+                  : null,
+              onKeyEvent: focusNodes != null
+                  ? (node, event) => _handleButtonKeyEvent(
+                      node,
+                      event,
+                      currentIndex,
+                      _getButtonCount(tracks, isMobile, isDesktop),
+                    )
+                  : null,
+              onFocusChange: onFocusChange,
+              onPressed: () => VersionSheet.show(
+                context,
+                availableVersions,
+                selectedMediaIndex,
+                onSwitchVersion!,
+                onOpen: onCancelAutoHide,
+                onClose: onStartAutoHide,
+              ),
+            ),
+          );
+          buttonIndex++;
+        }
+
+        // BoxFit mode button
+        if (onCycleBoxFitMode != null) {
+          final currentIndex = buttonIndex;
+          buttons.add(
+            VideoControlButton(
+              icon: _getBoxFitIcon(boxFitMode),
+              tooltip: _getBoxFitTooltip(boxFitMode),
+              semanticLabel: t.videoControls.aspectRatioButton,
+              focusNode: focusNodes != null && focusNodes!.length > currentIndex
+                  ? focusNodes![currentIndex]
+                  : null,
+              onKeyEvent: focusNodes != null
+                  ? (node, event) => _handleButtonKeyEvent(
+                      node,
+                      event,
+                      currentIndex,
+                      _getButtonCount(tracks, isMobile, isDesktop),
+                    )
+                  : null,
+              onFocusChange: onFocusChange,
+              onPressed: onCycleBoxFitMode,
+            ),
+          );
+          buttonIndex++;
+        }
+
+        // Rotation lock button (mobile only)
+        if (isMobile) {
+          final currentIndex = buttonIndex;
+          buttons.add(
+            VideoControlButton(
+              icon: isRotationLocked
+                  ? Symbols.screen_lock_rotation_rounded
+                  : Symbols.screen_rotation_rounded,
+              tooltip: isRotationLocked
+                  ? t.videoControls.unlockRotation
+                  : t.videoControls.lockRotation,
+              semanticLabel: t.videoControls.rotationLockButton,
+              focusNode: focusNodes != null && focusNodes!.length > currentIndex
+                  ? focusNodes![currentIndex]
+                  : null,
+              onKeyEvent: focusNodes != null
+                  ? (node, event) => _handleButtonKeyEvent(
+                      node,
+                      event,
+                      currentIndex,
+                      _getButtonCount(tracks, isMobile, isDesktop),
+                    )
+                  : null,
+              onFocusChange: onFocusChange,
+              onPressed: onToggleRotationLock,
+            ),
+          );
+          buttonIndex++;
+        }
+
+        // Fullscreen button (desktop only)
+        if (isDesktop) {
+          final currentIndex = buttonIndex;
+          buttons.add(
+            VideoControlButton(
+              icon: isFullscreen
+                  ? Symbols.fullscreen_exit_rounded
+                  : Symbols.fullscreen_rounded,
+              semanticLabel: isFullscreen
+                  ? t.videoControls.exitFullscreenButton
+                  : t.videoControls.fullscreenButton,
+              focusNode: focusNodes != null && focusNodes!.length > currentIndex
+                  ? focusNodes![currentIndex]
+                  : null,
+              onKeyEvent: focusNodes != null
+                  ? (node, event) => _handleButtonKeyEvent(
+                      node,
+                      event,
+                      currentIndex,
+                      _getButtonCount(tracks, isMobile, isDesktop),
+                    )
+                  : null,
+              onFocusChange: onFocusChange,
+              onPressed: onToggleFullscreen,
+            ),
+          );
+        }
+
+        return IntrinsicHeight(
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: buttons,
+          ),
+        );
+      },
+    );
+  }
+
+  /// Calculate total button count for navigation
+  int _getButtonCount(Tracks? tracks, bool isMobile, bool isDesktop) {
+    int count = 1; // Settings button always shown
+    if (_hasMultipleAudioTracks(tracks)) count++;
+    if (_hasSubtitles(tracks)) count++;
+    if (chapters.isNotEmpty) count++;
+    if (availableVersions.length > 1 && onSwitchVersion != null) count++;
+    if (onCycleBoxFitMode != null) count++;
+    if (isMobile) count++;
+    if (isDesktop) count++;
+    return count;
+  }
+
+  bool _hasMultipleAudioTracks(Tracks? tracks) {
+    if (tracks == null) return false;
+    return TrackFilterHelper.hasMultipleTracks<AudioTrack>(tracks.audio);
+  }
+
+  bool _hasSubtitles(Tracks? tracks) {
+    if (tracks == null) return false;
+    return TrackFilterHelper.hasTracks<SubtitleTrack>(tracks.subtitle);
+  }
+
+  IconData _getBoxFitIcon(int mode) {
+    switch (mode) {
+      case 0:
+        return Symbols.fit_screen_rounded; // contain (letterbox)
+      case 1:
+        return Symbols.aspect_ratio_rounded; // cover (fill screen)
+      case 2:
+        return Symbols.settings_overscan_rounded; // fill (stretch)
+      default:
+        return Symbols.fit_screen_rounded;
+    }
+  }
+
+  String _getBoxFitTooltip(int mode) {
+    switch (mode) {
+      case 0:
+        return t.videoControls.letterbox;
+      case 1:
+        return t.videoControls.fillScreen;
+      case 2:
+        return t.videoControls.stretch;
+      default:
+        return t.videoControls.letterbox;
+    }
+  }
+}
diff --git a/lib/widgets/video_controls/widgets/video_controls_header.dart b/lib/widgets/video_controls/widgets/video_controls_header.dart
new file mode 100644
index 00000000..bf4bfe66
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/video_controls_header.dart
@@ -0,0 +1,100 @@
+import 'package:flutter/material.dart';
+
+import '../../../models/plex_metadata.dart';
+import '../../../i18n/strings.g.dart';
+import '../../app_bar_back_button.dart';
+
+/// Header layout style for video controls
+enum VideoHeaderStyle {
+  /// Multi-line: Series name on first line, episode info on second line
+  multiLine,
+
+  /// Single-line: All info combined with separators (for macOS)
+  singleLine,
+}
+
+/// Shared header widget for video controls with back button and title.
+///
+/// Displays the video title with optional series/episode information.
+/// Supports both single-line (macOS) and multi-line (other platforms) layouts.
+class VideoControlsHeader extends StatelessWidget {
+  final PlexMetadata metadata;
+  final VideoHeaderStyle style;
+
+  /// Optional trailing widget (e.g., track/chapter controls)
+  final Widget? trailing;
+
+  const VideoControlsHeader({
+    super.key,
+    required this.metadata,
+    this.style = VideoHeaderStyle.multiLine,
+    this.trailing,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        AppBarBackButton(
+          style: BackButtonStyle.video,
+          semanticLabel: t.videoControls.backButton,
+          onPressed: () => Navigator.of(context).pop(true),
+        ),
+        const SizedBox(width: 16),
+        Expanded(
+          child: style == VideoHeaderStyle.singleLine
+              ? _buildSingleLineTitle()
+              : _buildMultiLineTitle(),
+        ),
+        if (trailing != null) trailing!,
+      ],
+    );
+  }
+
+  Widget _buildSingleLineTitle() {
+    // Build single-line title combining series and episode info
+    final seriesName = metadata.grandparentTitle ?? metadata.title;
+    final hasEpisodeInfo =
+        metadata.parentIndex != null && metadata.index != null;
+
+    final titleText = hasEpisodeInfo
+        ? '$seriesName · S${metadata.parentIndex} E${metadata.index} · ${metadata.title}'
+        : seriesName;
+
+    return Text(
+      titleText,
+      style: const TextStyle(
+        color: Colors.white,
+        fontSize: 15,
+        fontWeight: FontWeight.w500,
+      ),
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+    );
+  }
+
+  Widget _buildMultiLineTitle() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          metadata.grandparentTitle ?? metadata.title,
+          style: const TextStyle(
+            color: Colors.white,
+            fontSize: 16,
+            fontWeight: FontWeight.bold,
+          ),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+        ),
+        if (metadata.parentIndex != null && metadata.index != null)
+          Text(
+            'S${metadata.parentIndex} · E${metadata.index} · ${metadata.title}',
+            style: const TextStyle(color: Colors.white70, fontSize: 14),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/widgets/video_timeline_bar.dart b/lib/widgets/video_controls/widgets/video_timeline_bar.dart
new file mode 100644
index 00000000..fa9aa472
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/video_timeline_bar.dart
@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+
+import '../../../mpv/mpv.dart';
+import '../../../models/plex_media_info.dart';
+import '../../../utils/duration_formatter.dart';
+import 'timeline_slider.dart';
+
+/// Encapsulates the StreamBuilder stack for video timeline with timestamps.
+///
+/// This widget listens to player position and duration streams, and displays
+/// a timeline slider with formatted timestamps. Supports both horizontal
+/// layout (timestamps beside slider) and vertical layout (timestamps below slider).
+class VideoTimelineBar extends StatelessWidget {
+  final Player player;
+  final List<PlexChapter> chapters;
+  final bool chaptersLoaded;
+  final ValueChanged<Duration> onSeek;
+  final ValueChanged<Duration> onSeekEnd;
+
+  /// If true, timestamps are shown in a row beside the slider (desktop layout).
+  /// If false, timestamps are shown in a row below the slider (mobile layout).
+  final bool horizontalLayout;
+
+  /// Optional FocusNode for D-pad/keyboard navigation.
+  final FocusNode? focusNode;
+
+  /// Custom key event handler for focus navigation.
+  final KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent;
+
+  /// Called when focus changes.
+  final ValueChanged<bool>? onFocusChange;
+
+  const VideoTimelineBar({
+    super.key,
+    required this.player,
+    required this.chapters,
+    required this.chaptersLoaded,
+    required this.onSeek,
+    required this.onSeekEnd,
+    this.horizontalLayout = true,
+    this.focusNode,
+    this.onKeyEvent,
+    this.onFocusChange,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<Duration>(
+      stream: player.streams.position,
+      initialData: player.state.position,
+      builder: (context, positionSnapshot) {
+        return StreamBuilder<Duration>(
+          stream: player.streams.duration,
+          initialData: player.state.duration,
+          builder: (context, durationSnapshot) {
+            final position = positionSnapshot.data ?? Duration.zero;
+            final duration = durationSnapshot.data ?? Duration.zero;
+
+            if (horizontalLayout) {
+              return _buildHorizontalLayout(position, duration);
+            } else {
+              return _buildVerticalLayout(position, duration);
+            }
+          },
+        );
+      },
+    );
+  }
+
+  Widget _buildHorizontalLayout(Duration position, Duration duration) {
+    return Row(
+      children: [
+        _buildTimestamp(position),
+        const SizedBox(width: 12),
+        Expanded(child: _buildSlider(position, duration)),
+        const SizedBox(width: 12),
+        _buildTimestamp(duration),
+      ],
+    );
+  }
+
+  Widget _buildVerticalLayout(Duration position, Duration duration) {
+    return Column(
+      children: [
+        _buildSlider(position, duration),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [_buildTimestamp(position), _buildTimestamp(duration)],
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildTimestamp(Duration time) {
+    return Text(
+      formatDurationTimestamp(time),
+      style: const TextStyle(color: Colors.white, fontSize: 14),
+    );
+  }
+
+  Widget _buildSlider(Duration position, Duration duration) {
+    return TimelineSlider(
+      position: position,
+      duration: duration,
+      chapters: chapters,
+      chaptersLoaded: chaptersLoaded,
+      onSeek: onSeek,
+      onSeekEnd: onSeekEnd,
+      focusNode: focusNode,
+      onKeyEvent: onKeyEvent,
+      onFocusChange: onFocusChange,
+    );
+  }
+}
diff --git a/lib/widgets/video_controls/widgets/volume_control.dart b/lib/widgets/video_controls/widgets/volume_control.dart
new file mode 100644
index 00000000..db1ab030
--- /dev/null
+++ b/lib/widgets/video_controls/widgets/volume_control.dart
@@ -0,0 +1,218 @@
+import 'package:flutter/material.dart';
+import 'package:plezy/widgets/app_icon.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:flutter/services.dart';
+
+import '../../../focus/dpad_navigator.dart';
+import '../../../mpv/mpv.dart';
+import '../../../services/settings_service.dart';
+import '../../../i18n/strings.g.dart';
+import '../../../focus/focusable_wrapper.dart';
+import '../../../focus/input_mode_tracker.dart';
+
+/// A volume control widget that displays a mute/unmute button and volume slider.
+///
+/// This widget integrates with [Player] to control volume and persists
+/// the volume setting using [SettingsService].
+///
+/// When using keyboard/D-pad navigation, pressing Select enters "adjust mode"
+/// where left/right arrows adjust volume instead of navigating.
+class VolumeControl extends StatefulWidget {
+  final Player player;
+
+  /// Optional FocusNode for D-pad/keyboard navigation.
+  final FocusNode? focusNode;
+
+  /// Custom key event handler for focus navigation (used when NOT in adjust mode).
+  final KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent;
+
+  /// Called when focus changes.
+  final ValueChanged<bool>? onFocusChange;
+
+  /// Called on any keyboard activity (to reset hide timer).
+  final VoidCallback? onFocusActivity;
+
+  const VolumeControl({
+    super.key,
+    required this.player,
+    this.focusNode,
+    this.onKeyEvent,
+    this.onFocusChange,
+    this.onFocusActivity,
+  });
+
+  @override
+  State<VolumeControl> createState() => _VolumeControlState();
+}
+
+class _VolumeControlState extends State<VolumeControl> {
+  /// Whether we're in volume adjust mode (left/right adjusts volume).
+  bool _isAdjustMode = false;
+
+  /// Volume step size for keyboard adjustment.
+  static const double _volumeStep = 5.0;
+
+  void _enterAdjustMode() {
+    setState(() {
+      _isAdjustMode = true;
+    });
+  }
+
+  void _exitAdjustMode() {
+    setState(() {
+      _isAdjustMode = false;
+    });
+  }
+
+  Future<void> _adjustVolume(double delta) async {
+    final currentVolume = widget.player.state.volume;
+    final newVolume = (currentVolume + delta).clamp(0.0, 100.0);
+    widget.player.setVolume(newVolume);
+    final settings = await SettingsService.getInstance();
+    await settings.setVolume(newVolume);
+  }
+
+  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    if (_isAdjustMode) {
+      // Notify activity on any key in adjust mode (to reset hide timer)
+      widget.onFocusActivity?.call();
+
+      // In adjust mode: left/right adjusts volume, back/escape exits
+      if (key == LogicalKeyboardKey.arrowLeft) {
+        _adjustVolume(-_volumeStep);
+        return KeyEventResult.handled;
+      }
+      if (key == LogicalKeyboardKey.arrowRight) {
+        _adjustVolume(_volumeStep);
+        return KeyEventResult.handled;
+      }
+      if (key.isBackKey || key.isSelectKey) {
+        _exitAdjustMode();
+        return KeyEventResult.handled;
+      }
+      // UP/DOWN exits adjust mode and lets navigation continue
+      if (key == LogicalKeyboardKey.arrowUp ||
+          key == LogicalKeyboardKey.arrowDown) {
+        _exitAdjustMode();
+        // Pass through to normal navigation handler
+        return widget.onKeyEvent?.call(node, event) ?? KeyEventResult.ignored;
+      }
+      // Consume other keys in adjust mode
+      return KeyEventResult.handled;
+    }
+
+    // Not in adjust mode: use the provided key event handler for navigation
+    return widget.onKeyEvent?.call(node, event) ?? KeyEventResult.ignored;
+  }
+
+  void _handleFocusChange(bool hasFocus) {
+    // Exit adjust mode when focus is lost
+    if (!hasFocus && _isAdjustMode) {
+      _exitAdjustMode();
+    }
+    widget.onFocusChange?.call(hasFocus);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<double>(
+      stream: widget.player.streams.volume,
+      initialData: widget.player.state.volume,
+      builder: (context, snapshot) {
+        final volume = snapshot.data ?? 100.0;
+        final isMuted = volume == 0;
+        final isKeyboardMode = InputModeTracker.isKeyboardMode(context);
+
+        final muteButton = Semantics(
+          label: isMuted
+              ? t.videoControls.unmuteButton
+              : t.videoControls.muteButton,
+          button: true,
+          excludeSemantics: true,
+          child: IconButton(
+            icon: AppIcon(
+              isMuted ? Symbols.volume_off_rounded : Symbols.volume_up_rounded,
+              fill: 1,
+              color: Colors.white,
+            ),
+            onPressed: () async {
+              final newVolume = isMuted ? 100.0 : 0.0;
+              widget.player.setVolume(newVolume);
+              final settings = await SettingsService.getInstance();
+              await settings.setVolume(newVolume);
+            },
+          ),
+        );
+
+        return Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            if (widget.focusNode != null)
+              FocusableWrapper(
+                focusNode: widget.focusNode,
+                onSelect: _enterAdjustMode,
+                onKeyEvent: _handleKeyEvent,
+                onFocusChange: _handleFocusChange,
+                borderRadius: 20,
+                autoScroll: false,
+                useBackgroundFocus: true,
+                disableScale: true,
+                semanticLabel: _isAdjustMode
+                    ? t.videoControls.volumeSlider
+                    : (isMuted
+                          ? t.videoControls.unmuteButton
+                          : t.videoControls.muteButton),
+                child: muteButton,
+              )
+            else
+              muteButton,
+            const SizedBox(width: 8),
+            _buildVolumeSlider(volume, isKeyboardMode),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildVolumeSlider(double volume, bool isKeyboardMode) {
+    // Show visual indicator when in adjust mode with keyboard
+    final showAdjustIndicator = _isAdjustMode && isKeyboardMode;
+
+    return SizedBox(
+      width: 100,
+      child: SliderTheme(
+        data: SliderThemeData(
+          trackHeight: showAdjustIndicator ? 4 : 3,
+          thumbShape: RoundSliderThumbShape(
+            enabledThumbRadius: showAdjustIndicator ? 8 : 6,
+          ),
+          overlayShape: const RoundSliderOverlayShape(overlayRadius: 12),
+        ),
+        child: Semantics(
+          label: t.videoControls.volumeSlider,
+          slider: true,
+          child: Slider(
+            value: volume,
+            min: 0.0,
+            max: 100.0,
+            onChanged: (value) {
+              widget.player.setVolume(value);
+            },
+            onChangeEnd: (value) async {
+              final settings = await SettingsService.getInstance();
+              await settings.setVolume(value);
+            },
+            activeColor: Colors.white,
+            inactiveColor: Colors.white.withValues(alpha: 0.3),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index 1bc31b4d..25bbda5c 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -6,33 +6,33 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <gamepads_linux/gamepads_linux_plugin.h>
 #include <hotkey_manager_linux/hotkey_manager_linux_plugin.h>
-#include <media_kit_libs_linux/media_kit_libs_linux_plugin.h>
-#include <media_kit_video/media_kit_video_plugin.h>
+#include <os_media_controls/os_media_controls_plugin.h>
 #include <screen_retriever_linux/screen_retriever_linux_plugin.h>
+#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
-#include <volume_controller/volume_controller_plugin.h>
 #include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) gamepads_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "GamepadsLinuxPlugin");
+  gamepads_linux_plugin_register_with_registrar(gamepads_linux_registrar);
   g_autoptr(FlPluginRegistrar) hotkey_manager_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "HotkeyManagerLinuxPlugin");
   hotkey_manager_linux_plugin_register_with_registrar(hotkey_manager_linux_registrar);
-  g_autoptr(FlPluginRegistrar) media_kit_libs_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitLibsLinuxPlugin");
-  media_kit_libs_linux_plugin_register_with_registrar(media_kit_libs_linux_registrar);
-  g_autoptr(FlPluginRegistrar) media_kit_video_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitVideoPlugin");
-  media_kit_video_plugin_register_with_registrar(media_kit_video_registrar);
+  g_autoptr(FlPluginRegistrar) os_media_controls_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "OsMediaControlsPlugin");
+  os_media_controls_plugin_register_with_registrar(os_media_controls_registrar);
   g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
   screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
+  g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
+  sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
-  g_autoptr(FlPluginRegistrar) volume_controller_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "VolumeControllerPlugin");
-  volume_controller_plugin_register_with_registrar(volume_controller_registrar);
   g_autoptr(FlPluginRegistrar) window_manager_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin");
   window_manager_plugin_register_with_registrar(window_manager_registrar);
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index c9b34237..11f8fb02 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -3,12 +3,12 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  gamepads_linux
   hotkey_manager_linux
-  media_kit_libs_linux
-  media_kit_video
+  os_media_controls
   screen_retriever_linux
+  sqlite3_flutter_libs
   url_launcher_linux
-  volume_controller
   window_manager
 )
 
diff --git a/linux/runner/CMakeLists.txt b/linux/runner/CMakeLists.txt
index e97dabc7..db4ed130 100644
--- a/linux/runner/CMakeLists.txt
+++ b/linux/runner/CMakeLists.txt
@@ -9,6 +9,8 @@ project(runner LANGUAGES CXX)
 add_executable(${BINARY_NAME}
   "main.cc"
   "my_application.cc"
+  "mpv/mpv_player.cc"
+  "mpv/mpv_plugin.cc"
   "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
 )
 
@@ -19,8 +21,16 @@ apply_standard_settings(${BINARY_NAME})
 # Add preprocessor definitions for the application ID.
 add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
 
+# Find mpv library.
+pkg_check_modules(MPV REQUIRED IMPORTED_TARGET mpv)
+
+# Find epoxy (OpenGL loader).
+pkg_check_modules(EPOXY REQUIRED IMPORTED_TARGET epoxy)
+
 # Add dependency libraries. Add any application-specific dependencies here.
 target_link_libraries(${BINARY_NAME} PRIVATE flutter)
 target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::MPV)
+target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::EPOXY)
 
 target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
diff --git a/linux/runner/mpv/mpv_player.cc b/linux/runner/mpv/mpv_player.cc
new file mode 100644
index 00000000..0c7c994c
--- /dev/null
+++ b/linux/runner/mpv/mpv_player.cc
@@ -0,0 +1,469 @@
+#include "mpv_player.h"
+
+#include <flutter_linux/flutter_linux.h>
+#include <epoxy/gl.h>
+#include <epoxy/egl.h>
+#include <epoxy/glx.h>
+#include <gdk/gdk.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
+#include <clocale>
+#include <cstring>
+#include <string>
+
+// Static helper to get proc address - must be defined outside the namespace
+// to have the correct function signature.
+static void* get_opengl_proc_address(void* ctx, const char* name) {
+  (void)ctx;
+#ifdef GDK_WINDOWING_WAYLAND
+  // On Wayland, use EGL
+  if (epoxy_has_egl()) {
+    return reinterpret_cast<void*>(eglGetProcAddress(name));
+  }
+#endif
+#ifdef GDK_WINDOWING_X11
+  // On X11, use GLX
+  return reinterpret_cast<void*>(glXGetProcAddressARB(
+      reinterpret_cast<const GLubyte*>(name)));
+#else
+  // Fallback: try EGL
+  return reinterpret_cast<void*>(eglGetProcAddress(name));
+#endif
+}
+
+namespace mpv {
+
+MpvPlayer::MpvPlayer() {}
+
+MpvPlayer::~MpvPlayer() {
+  Dispose();
+}
+
+bool MpvPlayer::Initialize(GtkGLArea* gl_area) {
+  if (mpv_) {
+    return true;  // Already initialized.
+  }
+
+  gl_area_ = gl_area;
+
+  // Check if GL area is realized
+  if (!gtk_widget_get_realized(GTK_WIDGET(gl_area))) {
+    g_warning("MPV: GL area not realized yet");
+    return false;
+  }
+
+  // MPV requires C locale for numeric formatting
+  std::setlocale(LC_NUMERIC, "C");
+
+  // Create mpv instance.
+  mpv_ = mpv_create();
+  if (!mpv_) {
+    g_warning("MPV: mpv_create() failed");
+    return false;
+  }
+
+  // Configure mpv for embedded playback.
+  mpv_set_option_string(mpv_, "vo", "libmpv");  // Render via mpv_render_context_render()
+  mpv_set_option_string(mpv_, "hwdec", "auto");
+  mpv_set_option_string(mpv_, "keep-open", "yes");
+
+  // HDR tone mapping - ensures HDR content is properly converted to SDR
+  mpv_set_option_string(mpv_, "tone-mapping", "auto");
+  mpv_set_option_string(mpv_, "target-colorspace-hint", "no");
+  mpv_set_option_string(mpv_, "hdr-compute-peak", "auto");
+  mpv_set_option_string(mpv_, "idle", "yes");
+  mpv_set_option_string(mpv_, "input-default-bindings", "no");
+  mpv_set_option_string(mpv_, "input-vo-keyboard", "no");
+  mpv_set_option_string(mpv_, "osc", "no");
+  mpv_set_option_string(mpv_, "terminal", "no");
+
+  // Enable verbose logging for debugging.
+  mpv_request_log_messages(mpv_, "v");
+
+  // Initialize mpv.
+  int err = mpv_initialize(mpv_);
+  if (err < 0) {
+    g_warning("MPV: mpv_initialize() failed: %s", mpv_error_string(err));
+    mpv_destroy(mpv_);
+    mpv_ = nullptr;
+    return false;
+  }
+
+  // Make the GL context current.
+  gtk_gl_area_make_current(gl_area_);
+  if (gtk_gl_area_get_error(gl_area_) != nullptr) {
+    g_warning("MPV: Failed to make GL context current");
+    mpv_terminate_destroy(mpv_);
+    mpv_ = nullptr;
+    return false;
+  }
+
+  // Set up OpenGL parameters for mpv.
+  mpv_opengl_init_params gl_init_params{
+      .get_proc_address = get_opengl_proc_address,
+      .get_proc_address_ctx = nullptr,
+  };
+
+  mpv_render_param params[] = {
+      {MPV_RENDER_PARAM_API_TYPE,
+       const_cast<char*>(MPV_RENDER_API_TYPE_OPENGL)},
+      {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
+      {MPV_RENDER_PARAM_INVALID, nullptr},
+  };
+
+  err = mpv_render_context_create(&mpv_gl_, mpv_, params);
+  if (err < 0) {
+    g_warning("MPV: mpv_render_context_create() failed: %s",
+              mpv_error_string(err));
+    mpv_terminate_destroy(mpv_);
+    mpv_ = nullptr;
+    return false;
+  }
+
+  // Set up event wakeup callback.
+  mpv_set_wakeup_callback(mpv_, OnMpvWakeup, this);
+
+  // Set up render update callback.
+  mpv_render_context_set_update_callback(mpv_gl_, OnMpvRenderUpdate, this);
+
+  g_message("MPV: Initialization successful");
+  return true;
+}
+
+void MpvPlayer::Dispose() {
+  // Guard against multiple dispose calls (double-free protection)
+  if (disposed_.exchange(true)) {
+    return;  // Already disposed
+  }
+
+  // Clear mpv callbacks BEFORE freeing to prevent new callbacks being scheduled
+  if (mpv_gl_) {
+    mpv_render_context_set_update_callback(mpv_gl_, nullptr, nullptr);
+  }
+  if (mpv_) {
+    mpv_set_wakeup_callback(mpv_, nullptr, nullptr);
+  }
+
+  // Remove pending idle callbacks
+  if (event_source_id_ != 0) {
+    g_source_remove(event_source_id_);
+    event_source_id_ = 0;
+  }
+
+  // Now safe to free render context
+  if (mpv_gl_) {
+    mpv_render_context_free(mpv_gl_);
+    mpv_gl_ = nullptr;
+  }
+
+  // And terminate mpv
+  if (mpv_) {
+    mpv_terminate_destroy(mpv_);
+    mpv_ = nullptr;
+  }
+
+  observed_properties_.clear();
+  gl_area_ = nullptr;
+}
+
+void MpvPlayer::Command(const std::vector<std::string>& args) {
+  if (disposed_ || !mpv_) return;
+
+  std::vector<const char*> c_args;
+  c_args.reserve(args.size() + 1);
+  for (const auto& arg : args) {
+    c_args.push_back(arg.c_str());
+  }
+  c_args.push_back(nullptr);
+
+  mpv_command(mpv_, c_args.data());
+}
+
+void MpvPlayer::SetProperty(const std::string& name, const std::string& value) {
+  if (disposed_ || !mpv_) return;
+  mpv_set_property_string(mpv_, name.c_str(), value.c_str());
+}
+
+std::string MpvPlayer::GetProperty(const std::string& name) {
+  if (disposed_ || !mpv_) return "";
+
+  char* value = mpv_get_property_string(mpv_, name.c_str());
+  if (!value) return "";
+
+  std::string result(value);
+  mpv_free(value);
+  return result;
+}
+
+void MpvPlayer::ObserveProperty(const std::string& name,
+                                const std::string& format) {
+  if (disposed_ || !mpv_) return;
+
+  // Check if already observing.
+  if (observed_properties_.find(name) != observed_properties_.end()) {
+    return;
+  }
+
+  mpv_format mpv_fmt = MPV_FORMAT_NONE;
+  if (format == "string") {
+    mpv_fmt = MPV_FORMAT_STRING;
+  } else if (format == "flag" || format == "bool") {
+    mpv_fmt = MPV_FORMAT_FLAG;
+  } else if (format == "int64") {
+    mpv_fmt = MPV_FORMAT_INT64;
+  } else if (format == "double") {
+    mpv_fmt = MPV_FORMAT_DOUBLE;
+  } else if (format == "node") {
+    mpv_fmt = MPV_FORMAT_NODE;
+  }
+
+  uint64_t userdata = next_reply_userdata_++;
+  observed_properties_[name] = userdata;
+  mpv_observe_property(mpv_, userdata, name.c_str(), mpv_fmt);
+}
+
+void MpvPlayer::Render(int width, int height, int fbo) {
+  if (disposed_ || !mpv_gl_) return;
+
+  mpv_opengl_fbo mpv_fbo{
+      .fbo = fbo,
+      .w = width,
+      .h = height,
+      .internal_format = 0,
+  };
+
+  int flip_y = 1;
+
+  mpv_render_param params[] = {
+      {MPV_RENDER_PARAM_OPENGL_FBO, &mpv_fbo},
+      {MPV_RENDER_PARAM_FLIP_Y, &flip_y},
+      {MPV_RENDER_PARAM_INVALID, nullptr},
+  };
+
+  mpv_render_context_render(mpv_gl_, params);
+}
+
+void MpvPlayer::ReportMouseMove(int x, int y) {
+  if (disposed_ || !mpv_) return;
+  std::string x_str = std::to_string(x);
+  std::string y_str = std::to_string(y);
+  const char* args[] = {"mouse", x_str.c_str(), y_str.c_str(), nullptr};
+  mpv_command_async(mpv_, 0, args);
+}
+
+void MpvPlayer::SetEventCallback(EventCallback callback) {
+  std::lock_guard<std::mutex> lock(callback_mutex_);
+  event_callback_ = std::move(callback);
+}
+
+void MpvPlayer::RequestRedraw() {
+  if (disposed_) return;
+
+  needs_redraw_.store(true);
+  if (gl_area_) {
+    // Queue redraw on main thread
+    GtkGLArea* area = gl_area_;
+    g_idle_add(
+        [](gpointer data) -> gboolean {
+          GtkGLArea* area = static_cast<GtkGLArea*>(data);
+          if (GTK_IS_GL_AREA(area)) {
+            gtk_gl_area_queue_render(area);
+          }
+          return G_SOURCE_REMOVE;
+        },
+        area);
+  }
+}
+
+void MpvPlayer::OnMpvWakeup(void* ctx) {
+  auto* player = static_cast<MpvPlayer*>(ctx);
+
+  // Don't schedule if already disposed
+  if (player->disposed_) return;
+
+  // Schedule event processing on the main thread.
+  g_idle_add(
+      [](gpointer data) -> gboolean {
+        auto* player = static_cast<MpvPlayer*>(data);
+        // Check disposed again when callback runs
+        if (!player->disposed_) {
+          player->ProcessEvents();
+        }
+        return G_SOURCE_REMOVE;
+      },
+      player);
+}
+
+void MpvPlayer::OnMpvRenderUpdate(void* ctx) {
+  auto* player = static_cast<MpvPlayer*>(ctx);
+  // RequestRedraw already checks disposed_
+  player->RequestRedraw();
+}
+
+bool MpvPlayer::ProcessEvents() {
+  if (disposed_ || !mpv_) return false;
+
+  while (true) {
+    mpv_event* event = mpv_wait_event(mpv_, 0);
+    if (event->event_id == MPV_EVENT_NONE) {
+      break;
+    }
+    if (event->event_id == MPV_EVENT_SHUTDOWN) {
+      return false;
+    }
+    HandleMpvEvent(event);
+  }
+  return true;
+}
+
+void MpvPlayer::HandleMpvEvent(mpv_event* event) {
+  switch (event->event_id) {
+    case MPV_EVENT_LOG_MESSAGE: {
+      auto* msg = static_cast<mpv_event_log_message*>(event->data);
+      g_message("MPV [%s] %s: %s", msg->level, msg->prefix, msg->text);
+
+      FlValue* data = fl_value_new_map();
+      fl_value_set_string_take(data, "prefix",
+                               fl_value_new_string(msg->prefix ? msg->prefix : ""));
+      fl_value_set_string_take(data, "level",
+                               fl_value_new_string(msg->level ? msg->level : ""));
+      fl_value_set_string_take(data, "text",
+                               fl_value_new_string(msg->text ? msg->text : ""));
+      SendEvent("log-message", data);
+      fl_value_unref(data);
+      break;
+    }
+    case MPV_EVENT_PROPERTY_CHANGE: {
+      auto* prop = static_cast<mpv_event_property*>(event->data);
+      mpv_node node;
+      node.format = prop->format;
+
+      switch (prop->format) {
+        case MPV_FORMAT_STRING:
+          node.u.string =
+              prop->data ? *static_cast<char**>(prop->data) : nullptr;
+          break;
+        case MPV_FORMAT_FLAG:
+          node.u.flag = prop->data ? *static_cast<int*>(prop->data) : 0;
+          break;
+        case MPV_FORMAT_INT64:
+          node.u.int64 = prop->data ? *static_cast<int64_t*>(prop->data) : 0;
+          break;
+        case MPV_FORMAT_DOUBLE:
+          node.u.double_ = prop->data ? *static_cast<double*>(prop->data) : 0.0;
+          break;
+        case MPV_FORMAT_NODE:
+          if (prop->data) {
+            node = *static_cast<mpv_node*>(prop->data);
+          }
+          break;
+        default:
+          node.format = MPV_FORMAT_NONE;
+          break;
+      }
+
+      SendPropertyChange(prop->name, &node);
+      break;
+    }
+    case MPV_EVENT_END_FILE: {
+      auto* end = static_cast<mpv_event_end_file*>(event->data);
+      FlValue* data = fl_value_new_map();
+      fl_value_set_string_take(data, "reason",
+                               fl_value_new_int(static_cast<int>(end->reason)));
+      if (end->reason == MPV_END_FILE_REASON_ERROR) {
+        fl_value_set_string_take(data, "error",
+                                 fl_value_new_int(static_cast<int>(end->error)));
+      }
+      SendEvent("end-file", data);
+      fl_value_unref(data);
+      break;
+    }
+    case MPV_EVENT_FILE_LOADED: {
+      SendEvent("file-loaded");
+      break;
+    }
+    case MPV_EVENT_PLAYBACK_RESTART: {
+      SendEvent("playback-restart");
+      break;
+    }
+    case MPV_EVENT_SEEK: {
+      SendEvent("seek");
+      break;
+    }
+    default:
+      break;
+  }
+}
+
+FlValue* MpvPlayer::NodeToFlValue(mpv_node* node) {
+  if (!node) return fl_value_new_null();
+
+  switch (node->format) {
+    case MPV_FORMAT_STRING:
+      return fl_value_new_string(node->u.string ? node->u.string : "");
+    case MPV_FORMAT_FLAG:
+      return fl_value_new_bool(node->u.flag != 0);
+    case MPV_FORMAT_INT64:
+      return fl_value_new_int(node->u.int64);
+    case MPV_FORMAT_DOUBLE:
+      return fl_value_new_float(node->u.double_);
+    case MPV_FORMAT_NODE_ARRAY: {
+      FlValue* list = fl_value_new_list();
+      for (int i = 0; i < node->u.list->num; i++) {
+        fl_value_append_take(list, NodeToFlValue(&node->u.list->values[i]));
+      }
+      return list;
+    }
+    case MPV_FORMAT_NODE_MAP: {
+      FlValue* map = fl_value_new_map();
+      for (int i = 0; i < node->u.list->num; i++) {
+        fl_value_set_string_take(
+            map, node->u.list->keys[i],
+            NodeToFlValue(&node->u.list->values[i]));
+      }
+      return map;
+    }
+    default:
+      return fl_value_new_null();
+  }
+}
+
+void MpvPlayer::SendPropertyChange(const char* name, mpv_node* data) {
+  FlValue* event_map = fl_value_new_map();
+  fl_value_set_string_take(event_map, "type", fl_value_new_string("property"));
+  fl_value_set_string_take(event_map, "name",
+                           fl_value_new_string(name ? name : ""));
+
+  if (data) {
+    fl_value_set_string_take(event_map, "value", NodeToFlValue(data));
+  } else {
+    fl_value_set_string_take(event_map, "value", fl_value_new_null());
+  }
+
+  std::lock_guard<std::mutex> lock(callback_mutex_);
+  if (event_callback_) {
+    event_callback_(event_map);
+  }
+  fl_value_unref(event_map);
+}
+
+void MpvPlayer::SendEvent(const std::string& name, FlValue* data) {
+  FlValue* event_map = fl_value_new_map();
+  fl_value_set_string_take(event_map, "type", fl_value_new_string("event"));
+  fl_value_set_string_take(event_map, "name", fl_value_new_string(name.c_str()));
+  if (data) {
+    fl_value_set_string_take(event_map, "data", fl_value_ref(data));
+  }
+
+  std::lock_guard<std::mutex> lock(callback_mutex_);
+  if (event_callback_) {
+    event_callback_(event_map);
+  }
+  fl_value_unref(event_map);
+}
+
+}  // namespace mpv
diff --git a/linux/runner/mpv/mpv_player.h b/linux/runner/mpv/mpv_player.h
new file mode 100644
index 00000000..926fc0ff
--- /dev/null
+++ b/linux/runner/mpv/mpv_player.h
@@ -0,0 +1,134 @@
+#ifndef MPV_PLAYER_H_
+#define MPV_PLAYER_H_
+
+#include <mpv/client.h>
+#include <mpv/render.h>
+#include <mpv/render_gl.h>
+#include <gtk/gtk.h>
+#include <epoxy/gl.h>
+
+#include <atomic>
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+// Forward declaration for Flutter types
+struct _FlValue;
+
+namespace mpv {
+
+/// Callback function type for mpv events.
+/// Note: FlValue* is passed from the global namespace, not mpv namespace.
+using EventCallback = std::function<void(::_FlValue*)>;
+
+/// Wrapper for libmpv that handles initialization, OpenGL rendering,
+/// commands, properties, and event dispatching.
+class MpvPlayer {
+ public:
+  MpvPlayer();
+  ~MpvPlayer();
+
+  /// Initializes mpv with OpenGL rendering context.
+  /// Must be called from the GTK main thread after GL context is available.
+  /// @param gl_area The GtkGLArea widget for rendering.
+  /// @return true if initialization succeeded.
+  bool Initialize(GtkGLArea* gl_area);
+
+  /// Disposes mpv and releases resources.
+  void Dispose();
+
+  /// Returns true if mpv is initialized.
+  bool IsInitialized() const { return mpv_ != nullptr && mpv_gl_ != nullptr; }
+
+  /// Executes an mpv command.
+  /// @param args Command arguments (e.g., ["loadfile", "url", "replace"]).
+  void Command(const std::vector<std::string>& args);
+
+  /// Sets an mpv property by name.
+  /// @param name Property name.
+  /// @param value Property value as string.
+  void SetProperty(const std::string& name, const std::string& value);
+
+  /// Gets an mpv property value by name.
+  /// @param name Property name.
+  /// @return Property value as string, or empty if not found.
+  std::string GetProperty(const std::string& name);
+
+  /// Observes an mpv property for changes.
+  /// Changes will be reported via the event callback.
+  /// @param name Property name to observe.
+  /// @param format Format type ("string", "flag", "int64", "double", "node").
+  void ObserveProperty(const std::string& name, const std::string& format);
+
+  /// Renders a frame to the current OpenGL context.
+  /// Must be called from the GTK render callback.
+  /// @param width Viewport width.
+  /// @param height Viewport height.
+  /// @param fbo Framebuffer object to render into (0 for default).
+  void Render(int width, int height, int fbo = 0);
+
+  /// Reports that the mouse has moved.
+  /// This is used to show/hide the cursor.
+  void ReportMouseMove(int x, int y);
+
+  /// Sets the event callback for property changes and events.
+  void SetEventCallback(EventCallback callback);
+
+  /// Returns the GtkGLArea widget.
+  GtkGLArea* GetGLArea() const { return gl_area_; }
+
+  /// Returns true if a redraw is needed.
+  bool NeedsRedraw() const { return needs_redraw_.load(); }
+
+  /// Clears the redraw flag.
+  void ClearRedrawFlag() { needs_redraw_.store(false); }
+
+  /// Request a redraw.
+  void RequestRedraw();
+
+ private:
+  /// MPV event wakeup callback (called from mpv thread).
+  static void OnMpvWakeup(void* ctx);
+
+  /// MPV render update callback (called when frame is ready).
+  static void OnMpvRenderUpdate(void* ctx);
+
+  /// Processes pending mpv events.
+  /// @return true to keep processing, false if shutdown.
+  bool ProcessEvents();
+
+  /// Handles a single mpv event.
+  void HandleMpvEvent(mpv_event* event);
+
+  /// Sends a property change notification.
+  void SendPropertyChange(const char* name, mpv_node* data);
+
+  /// Sends an event notification.
+  void SendEvent(const std::string& name, ::_FlValue* data = nullptr);
+
+  /// Helper to convert mpv_node to FlValue.
+  ::_FlValue* NodeToFlValue(mpv_node* node);
+
+  mpv_handle* mpv_ = nullptr;
+  mpv_render_context* mpv_gl_ = nullptr;
+  GtkGLArea* gl_area_ = nullptr;
+
+  std::atomic<bool> needs_redraw_{false};
+  std::atomic<bool> disposed_{false};
+  EventCallback event_callback_;
+  std::mutex callback_mutex_;
+
+  uint64_t next_reply_userdata_ = 1;
+  std::map<std::string, uint64_t> observed_properties_;
+
+  // GSource for processing events on main thread
+  guint event_source_id_ = 0;
+};
+
+}  // namespace mpv
+
+#endif  // MPV_PLAYER_H_
diff --git a/linux/runner/mpv/mpv_plugin.cc b/linux/runner/mpv/mpv_plugin.cc
new file mode 100644
index 00000000..97105619
--- /dev/null
+++ b/linux/runner/mpv/mpv_plugin.cc
@@ -0,0 +1,404 @@
+#include "mpv_plugin.h"
+
+#include <cstring>
+
+/// Plugin structure definition.
+struct _MpvPlugin {
+  GObject parent_instance;
+
+  FlPluginRegistrar* registrar;
+  FlMethodChannel* method_channel;
+  FlEventChannel* event_channel;
+  FlBasicMessageChannel* event_message_channel;
+
+  GtkOverlay* overlay;
+  GtkGLArea* gl_area;
+  GtkWidget* flutter_view;
+
+  std::unique_ptr<mpv::MpvPlayer> player;
+  gboolean visible;
+  gboolean initialized;
+};
+
+G_DEFINE_TYPE(MpvPlugin, mpv_plugin, G_TYPE_OBJECT)
+
+// Forward declarations
+static void mpv_plugin_handle_method_call(FlMethodChannel* channel,
+                                          FlMethodCall* method_call,
+                                          gpointer user_data);
+static gboolean on_gl_render(GtkGLArea* area,
+                             GdkGLContext* context,
+                             gpointer user_data);
+static void on_gl_realize(GtkGLArea* area, gpointer user_data);
+static void on_gl_unrealize(GtkGLArea* area, gpointer user_data);
+
+static void mpv_plugin_dispose(GObject* object) {
+  MpvPlugin* self = MPV_PLUGIN(object);
+
+  if (self->player) {
+    self->player->Dispose();
+    self->player.reset();
+  }
+
+  g_clear_object(&self->method_channel);
+  g_clear_object(&self->event_channel);
+  g_clear_object(&self->registrar);
+
+  G_OBJECT_CLASS(mpv_plugin_parent_class)->dispose(object);
+}
+
+static void mpv_plugin_class_init(MpvPluginClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose = mpv_plugin_dispose;
+}
+
+static void mpv_plugin_init(MpvPlugin* self) {
+  self->visible = FALSE;
+  self->initialized = FALSE;
+}
+
+/// Send an event through the event channel.
+static void send_event(MpvPlugin* self, FlValue* event) {
+  if (self->event_channel) {
+    g_autoptr(GError) error = nullptr;
+    if (!fl_event_channel_send(self->event_channel, event, nullptr, &error)) {
+      if (error != nullptr) {
+        g_warning("Failed to send event: %s", error->message);
+      }
+    }
+  }
+}
+
+MpvPlugin* mpv_plugin_new(FlPluginRegistrar* registrar,
+                          GtkOverlay* overlay,
+                          GtkGLArea* gl_area,
+                          GtkWidget* flutter_view) {
+  MpvPlugin* self = MPV_PLUGIN(g_object_new(MPV_PLUGIN_TYPE, nullptr));
+
+  self->registrar = FL_PLUGIN_REGISTRAR(g_object_ref(registrar));
+  self->overlay = overlay;
+  self->gl_area = gl_area;
+  self->flutter_view = flutter_view;
+  self->player = std::make_unique<mpv::MpvPlayer>();
+
+  // Create method channel.
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  self->method_channel = fl_method_channel_new(
+      fl_plugin_registrar_get_messenger(registrar),
+      "com.plezy/mpv_player",
+      FL_METHOD_CODEC(codec));
+
+  fl_method_channel_set_method_call_handler(
+      self->method_channel,
+      mpv_plugin_handle_method_call,
+      self,
+      nullptr);
+
+  // Create event channel.
+  self->event_channel = fl_event_channel_new(
+      fl_plugin_registrar_get_messenger(registrar),
+      "com.plezy/mpv_player/events",
+      FL_METHOD_CODEC(codec));
+
+  // Connect GtkGLArea signals.
+  g_signal_connect(gl_area, "render", G_CALLBACK(on_gl_render), self);
+  g_signal_connect(gl_area, "realize", G_CALLBACK(on_gl_realize), self);
+  g_signal_connect(gl_area, "unrealize", G_CALLBACK(on_gl_unrealize), self);
+
+  // Set up auto-render to false - we control when to render.
+  gtk_gl_area_set_auto_render(gl_area, FALSE);
+
+  // Use OpenGL 3.3 core profile.
+  gtk_gl_area_set_required_version(gl_area, 3, 3);
+
+  return self;
+}
+
+// Static reference to keep the plugin alive for the lifetime of the app.
+// The plugin will be disposed when the GL area is unrealized.
+static MpvPlugin* g_mpv_plugin = nullptr;
+
+void mpv_plugin_register_with_registrar(FlPluginRegistrar* registrar,
+                                        GtkOverlay* overlay,
+                                        GtkGLArea* gl_area,
+                                        GtkWidget* flutter_view) {
+  g_mpv_plugin = mpv_plugin_new(registrar, overlay, gl_area, flutter_view);
+  // Keep a reference - the plugin will be cleaned up when the app exits
+}
+
+/// GtkGLArea render callback.
+static gboolean on_gl_render(GtkGLArea* area,
+                             GdkGLContext* context,
+                             gpointer user_data) {
+  (void)context;
+  MpvPlugin* self = MPV_PLUGIN(user_data);
+
+  if (!self->player || !self->player->IsInitialized() || !self->visible) {
+    // Clear to transparent when not showing video.
+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClear(GL_COLOR_BUFFER_BIT);
+    return TRUE;
+  }
+
+  int width = gtk_widget_get_allocated_width(GTK_WIDGET(area));
+  int height = gtk_widget_get_allocated_height(GTK_WIDGET(area));
+
+  // Get the scale factor for HiDPI support.
+  int scale = gtk_widget_get_scale_factor(GTK_WIDGET(area));
+  width *= scale;
+  height *= scale;
+
+  // Get the FBO that GtkGLArea is rendering to.
+  // GtkGLArea uses its own FBO, not the default framebuffer (0).
+  GLint fbo = 0;
+  glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
+
+  // Render the video frame.
+  self->player->Render(width, height, fbo);
+  self->player->ClearRedrawFlag();
+
+  return TRUE;
+}
+
+/// GtkGLArea realize callback.
+static void on_gl_realize(GtkGLArea* area, gpointer user_data) {
+  (void)user_data;
+  gtk_gl_area_make_current(area);
+
+  // Check for GL errors.
+  GError* error = gtk_gl_area_get_error(area);
+  if (error != nullptr) {
+    g_warning("MPV Plugin: GL area error: %s", error->message);
+    return;
+  }
+
+  // Enable blending for transparency support.
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+  g_message("MPV Plugin: GL area realized");
+}
+
+/// GtkGLArea unrealize callback.
+static void on_gl_unrealize(GtkGLArea* area, gpointer user_data) {
+  MpvPlugin* self = MPV_PLUGIN(user_data);
+
+  gtk_gl_area_make_current(area);
+
+  if (self->player) {
+    self->player->Dispose();
+  }
+
+  g_message("MPV Plugin: GL area unrealized");
+}
+
+/// Method call handler.
+static void mpv_plugin_handle_method_call(FlMethodChannel* channel,
+                                          FlMethodCall* method_call,
+                                          gpointer user_data) {
+  (void)channel;
+  MpvPlugin* self = MPV_PLUGIN(user_data);
+  const gchar* method = fl_method_call_get_name(method_call);
+  FlValue* args = fl_method_call_get_args(method_call);
+
+  g_autoptr(FlMethodResponse) response = nullptr;
+
+  if (strcmp(method, "initialize") == 0) {
+    if (self->initialized) {
+      response = FL_METHOD_RESPONSE(
+          fl_method_success_response_new(fl_value_new_bool(TRUE)));
+    } else {
+      // Create player if it was disposed
+      if (!self->player) {
+        self->player = std::make_unique<mpv::MpvPlayer>();
+      }
+
+      // Check if GL area is realized before trying to use it
+      if (!gtk_widget_get_realized(GTK_WIDGET(self->gl_area))) {
+        // Force realization of the GL area
+        gtk_widget_realize(GTK_WIDGET(self->gl_area));
+      }
+
+      // Initialize the player with the GL area.
+      gtk_gl_area_make_current(self->gl_area);
+
+      GError* error = gtk_gl_area_get_error(self->gl_area);
+      if (error != nullptr) {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "GL_ERROR", error->message, nullptr));
+      } else if (self->player->Initialize(self->gl_area)) {
+        self->initialized = TRUE;
+
+        // Set up event callback.
+        self->player->SetEventCallback([self](FlValue* event) {
+          // Send event - must be called from main thread
+          // The event is already created on the main thread via g_idle_add in mpv_player.cc
+          send_event(self, event);
+        });
+
+        response = FL_METHOD_RESPONSE(
+            fl_method_success_response_new(fl_value_new_bool(TRUE)));
+      } else {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "INIT_FAILED", "Failed to initialize MPV player", nullptr));
+      }
+    }
+  } else if (strcmp(method, "dispose") == 0) {
+    if (self->player) {
+      // Make GL context current before disposing mpv GL resources
+      gtk_gl_area_make_current(self->gl_area);
+      self->player->Dispose();
+      self->player.reset();
+    }
+    self->initialized = FALSE;
+    self->visible = FALSE;
+    gtk_widget_set_visible(GTK_WIDGET(self->gl_area), FALSE);
+    // Restore Flutter view opacity to 1.0 (may have been set to 0 by setControlsVisible)
+    if (self->flutter_view != nullptr) {
+      gtk_widget_set_opacity(self->flutter_view, 1.0);
+      // Force Flutter view to redraw
+      gtk_widget_queue_draw(self->flutter_view);
+    }
+    response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+  } else if (strcmp(method, "command") == 0) {
+    if (!self->player || !self->initialized) {
+      response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+          "NOT_INITIALIZED", "Player not initialized", nullptr));
+    } else {
+      FlValue* args_value = fl_value_lookup_string(args, "args");
+      if (args_value == nullptr ||
+          fl_value_get_type(args_value) != FL_VALUE_TYPE_LIST) {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "INVALID_ARGS", "Missing 'args' list", nullptr));
+      } else {
+        std::vector<std::string> command_args;
+        size_t len = fl_value_get_length(args_value);
+        for (size_t i = 0; i < len; i++) {
+          FlValue* item = fl_value_get_list_value(args_value, i);
+          if (fl_value_get_type(item) == FL_VALUE_TYPE_STRING) {
+            command_args.push_back(fl_value_get_string(item));
+          }
+        }
+        self->player->Command(command_args);
+        response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+      }
+    }
+  } else if (strcmp(method, "setProperty") == 0) {
+    if (!self->player || !self->initialized) {
+      response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+          "NOT_INITIALIZED", "Player not initialized", nullptr));
+    } else {
+      FlValue* name_value = fl_value_lookup_string(args, "name");
+      FlValue* value_value = fl_value_lookup_string(args, "value");
+
+      if (name_value == nullptr ||
+          fl_value_get_type(name_value) != FL_VALUE_TYPE_STRING) {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "INVALID_ARGS", "Missing 'name'", nullptr));
+      } else if (value_value == nullptr ||
+                 fl_value_get_type(value_value) != FL_VALUE_TYPE_STRING) {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "INVALID_ARGS", "Missing 'value'", nullptr));
+      } else {
+        self->player->SetProperty(fl_value_get_string(name_value),
+                                  fl_value_get_string(value_value));
+        response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+      }
+    }
+  } else if (strcmp(method, "getProperty") == 0) {
+    if (!self->player || !self->initialized) {
+      response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+          "NOT_INITIALIZED", "Player not initialized", nullptr));
+    } else {
+      FlValue* name_value = fl_value_lookup_string(args, "name");
+
+      if (name_value == nullptr ||
+          fl_value_get_type(name_value) != FL_VALUE_TYPE_STRING) {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "INVALID_ARGS", "Missing 'name'", nullptr));
+      } else {
+        std::string value =
+            self->player->GetProperty(fl_value_get_string(name_value));
+        if (value.empty()) {
+          response =
+              FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+        } else {
+          response = FL_METHOD_RESPONSE(fl_method_success_response_new(
+              fl_value_new_string(value.c_str())));
+        }
+      }
+    }
+  } else if (strcmp(method, "observeProperty") == 0) {
+    if (!self->player || !self->initialized) {
+      response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+          "NOT_INITIALIZED", "Player not initialized", nullptr));
+    } else {
+      FlValue* name_value = fl_value_lookup_string(args, "name");
+      FlValue* format_value = fl_value_lookup_string(args, "format");
+
+      if (name_value == nullptr ||
+          fl_value_get_type(name_value) != FL_VALUE_TYPE_STRING) {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "INVALID_ARGS", "Missing 'name'", nullptr));
+      } else if (format_value == nullptr ||
+                 fl_value_get_type(format_value) != FL_VALUE_TYPE_STRING) {
+        response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+            "INVALID_ARGS", "Missing 'format'", nullptr));
+      } else {
+        self->player->ObserveProperty(fl_value_get_string(name_value),
+                                      fl_value_get_string(format_value));
+        response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+      }
+    }
+  } else if (strcmp(method, "setVisible") == 0) {
+    FlValue* visible_value = fl_value_lookup_string(args, "visible");
+
+    if (visible_value == nullptr ||
+        fl_value_get_type(visible_value) != FL_VALUE_TYPE_BOOL) {
+      response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+          "INVALID_ARGS", "Missing 'visible'", nullptr));
+    } else {
+      gboolean visible = fl_value_get_bool(visible_value);
+      self->visible = visible;
+
+      // Show/hide the GL area.
+      gtk_widget_set_visible(GTK_WIDGET(self->gl_area), visible);
+
+      if (visible) {
+        gtk_gl_area_queue_render(self->gl_area);
+      }
+
+      response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+    }
+  } else if (strcmp(method, "setControlsVisible") == 0) {
+    // Set Flutter view opacity when controls are hidden/shown.
+    // This is a workaround for Flutter's lack of transparency support on Linux.
+    // When controls are hidden, setting opacity to 0 shows only the video
+    // while keeping the widget interactive for mouse events.
+    FlValue* controls_visible_value = fl_value_lookup_string(args, "visible");
+
+    if (controls_visible_value == nullptr ||
+        fl_value_get_type(controls_visible_value) != FL_VALUE_TYPE_BOOL) {
+      response = FL_METHOD_RESPONSE(fl_method_error_response_new(
+          "INVALID_ARGS", "Missing 'visible'", nullptr));
+    } else {
+      gboolean controls_visible = fl_value_get_bool(controls_visible_value);
+
+      // When controls are hidden, set Flutter view opacity to 0.
+      // When controls are visible, set opacity to 1.
+      // Using opacity keeps the widget interactive for mouse events.
+      if (self->flutter_view != nullptr) {
+        gtk_widget_set_opacity(self->flutter_view, controls_visible ? 1.0 : 0.0);
+      }
+
+      response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+    }
+  } else if (strcmp(method, "isInitialized") == 0) {
+    gboolean initialized = self->player && self->initialized;
+    response = FL_METHOD_RESPONSE(
+        fl_method_success_response_new(fl_value_new_bool(initialized)));
+  } else {
+    response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
+  }
+
+  fl_method_call_respond(method_call, response, nullptr);
+}
diff --git a/linux/runner/mpv/mpv_plugin.h b/linux/runner/mpv/mpv_plugin.h
new file mode 100644
index 00000000..ceb55742
--- /dev/null
+++ b/linux/runner/mpv/mpv_plugin.h
@@ -0,0 +1,40 @@
+#ifndef MPV_PLUGIN_H_
+#define MPV_PLUGIN_H_
+
+#include <flutter_linux/flutter_linux.h>
+#include <gtk/gtk.h>
+
+#include <memory>
+
+#include "mpv_player.h"
+
+G_BEGIN_DECLS
+
+/// Plugin for MPV video playback on Linux.
+///
+/// This plugin uses OpenGL rendering via GtkGLArea,
+/// positioned behind the Flutter view using a GtkOverlay.
+
+#define MPV_PLUGIN_TYPE (mpv_plugin_get_type())
+
+G_DECLARE_FINAL_TYPE(MpvPlugin, mpv_plugin, MPV, PLUGIN, GObject)
+
+/// Creates a new MpvPlugin instance.
+/// @param registrar The Flutter plugin registrar.
+/// @param overlay The GtkOverlay containing the GtkGLArea and FlView.
+/// @param gl_area The GtkGLArea widget for video rendering.
+/// @param flutter_view The Flutter view widget (for visibility control).
+MpvPlugin* mpv_plugin_new(FlPluginRegistrar* registrar,
+                          GtkOverlay* overlay,
+                          GtkGLArea* gl_area,
+                          GtkWidget* flutter_view);
+
+/// Registers the plugin with Flutter.
+void mpv_plugin_register_with_registrar(FlPluginRegistrar* registrar,
+                                        GtkOverlay* overlay,
+                                        GtkGLArea* gl_area,
+                                        GtkWidget* flutter_view);
+
+G_END_DECLS
+
+#endif  // MPV_PLUGIN_H_
diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc
index 41942947..dfecf1e7 100644
--- a/linux/runner/my_application.cc
+++ b/linux/runner/my_application.cc
@@ -6,14 +6,34 @@
 #endif
 
 #include "flutter/generated_plugin_registrant.h"
+#include "mpv/mpv_plugin.h"
 
 struct _MyApplication {
   GtkApplication parent_instance;
   char** dart_entrypoint_arguments;
+
+  // MPV-related widgets
+  GtkOverlay* overlay;
+  GtkGLArea* gl_area;
+  FlView* flutter_view;
 };
 
 G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
 
+/// Sets up an RGBA visual for transparency support.
+static void setup_rgba_visual(GtkWidget* widget) {
+  GdkScreen* screen = gtk_widget_get_screen(widget);
+  if (!gdk_screen_is_composited(screen)) {
+    g_warning("Screen is not composited - transparency may not work");
+  }
+  GdkVisual* visual = gdk_screen_get_rgba_visual(screen);
+  if (visual != nullptr) {
+    gtk_widget_set_visual(widget, visual);
+  } else {
+    g_warning("No RGBA visual available");
+  }
+}
+
 // Implements GApplication::activate.
 static void my_application_activate(GApplication* application) {
   MyApplication* self = MY_APPLICATION(application);
@@ -48,31 +68,90 @@ static void my_application_activate(GApplication* application) {
   }
 
   gtk_window_set_default_size(window, 1280, 720);
-  gtk_widget_show(GTK_WIDGET(window));
 
+  // Set up RGBA visual for transparency support.
+  gtk_widget_set_app_paintable(GTK_WIDGET(window), TRUE);
+  setup_rgba_visual(GTK_WIDGET(window));
+
+  // Create the overlay container.
+  // The overlay allows us to layer widgets on top of each other:
+  // - Bottom layer: GtkGLArea for mpv video rendering
+  // - Top layer: FlView (Flutter) with transparent background
+  self->overlay = GTK_OVERLAY(gtk_overlay_new());
+  gtk_widget_show(GTK_WIDGET(self->overlay));
+
+  // Create the GtkGLArea for mpv video rendering.
+  // This will be the bottom layer (behind Flutter).
+  self->gl_area = GTK_GL_AREA(gtk_gl_area_new());
+  gtk_widget_set_hexpand(GTK_WIDGET(self->gl_area), TRUE);
+  gtk_widget_set_vexpand(GTK_WIDGET(self->gl_area), TRUE);
+
+  // Configure GL area for transparency and proper rendering.
+  gtk_gl_area_set_has_alpha(self->gl_area, TRUE);
+  gtk_gl_area_set_has_depth_buffer(self->gl_area, FALSE);
+  gtk_gl_area_set_has_stencil_buffer(self->gl_area, FALSE);
+
+  // Make GL area non-interactive so mouse events pass through to Flutter.
+  gtk_widget_set_can_focus(GTK_WIDGET(self->gl_area), FALSE);
+  gtk_widget_set_sensitive(GTK_WIDGET(self->gl_area), FALSE);
+
+  // Set the GL area as the base widget of the overlay.
+  // Initially hidden - will be shown when video playback starts.
+  gtk_widget_set_visible(GTK_WIDGET(self->gl_area), FALSE);
+  gtk_container_add(GTK_CONTAINER(self->overlay), GTK_WIDGET(self->gl_area));
+
+  // Create the Flutter view.
   g_autoptr(FlDartProject) project = fl_dart_project_new();
-  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
+  fl_dart_project_set_dart_entrypoint_arguments(project,
+                                                self->dart_entrypoint_arguments);
 
-  FlView* view = fl_view_new(project);
-  gtk_widget_show(GTK_WIDGET(view));
-  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
+  self->flutter_view = fl_view_new(project);
+  gtk_widget_set_hexpand(GTK_WIDGET(self->flutter_view), TRUE);
+  gtk_widget_set_vexpand(GTK_WIDGET(self->flutter_view), TRUE);
 
-  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
+  // Enable transparency for the Flutter view.
+  gtk_widget_set_app_paintable(GTK_WIDGET(self->flutter_view), TRUE);
+  setup_rgba_visual(GTK_WIDGET(self->flutter_view));
 
-  gtk_widget_grab_focus(GTK_WIDGET(view));
+  // Enable transparent background for the Flutter view.
+  // This allows the mpv video to show through transparent areas.
+  GdkRGBA transparent = {0.0, 0.0, 0.0, 0.0};
+  fl_view_set_background_color(self->flutter_view, &transparent);
+
+  // Add the Flutter view as an overlay on top of the GL area.
+  gtk_widget_show(GTK_WIDGET(self->flutter_view));
+  gtk_overlay_add_overlay(self->overlay, GTK_WIDGET(self->flutter_view));
+
+  // Add the overlay to the window.
+  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(self->overlay));
+
+  // Register Flutter plugins.
+  fl_register_plugins(FL_PLUGIN_REGISTRY(self->flutter_view));
+
+  // Register the MPV plugin with the GL area and Flutter view for video rendering.
+  FlPluginRegistrar* registrar =
+      fl_plugin_registry_get_registrar_for_plugin(FL_PLUGIN_REGISTRY(self->flutter_view),
+                                                  "MpvPlugin");
+  mpv_plugin_register_with_registrar(registrar, self->overlay, self->gl_area,
+                                     GTK_WIDGET(self->flutter_view));
+
+  gtk_widget_show(GTK_WIDGET(window));
+  gtk_widget_grab_focus(GTK_WIDGET(self->flutter_view));
 }
 
 // Implements GApplication::local_command_line.
-static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+static gboolean my_application_local_command_line(GApplication* application,
+                                                  gchar*** arguments,
+                                                  int* exit_status) {
   MyApplication* self = MY_APPLICATION(application);
   // Strip out the first argument as it is the binary name.
   self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
 
   g_autoptr(GError) error = nullptr;
   if (!g_application_register(application, nullptr, &error)) {
-     g_warning("Failed to register: %s", error->message);
-     *exit_status = 1;
-     return TRUE;
+    g_warning("Failed to register: %s", error->message);
+    *exit_status = 1;
+    return TRUE;
   }
 
   g_application_activate(application);
@@ -83,7 +162,7 @@ static gboolean my_application_local_command_line(GApplication* application, gch
 
 // Implements GApplication::startup.
 static void my_application_startup(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
+  // MyApplication* self = MY_APPLICATION(object);
 
   // Perform any actions required at application startup.
 
@@ -92,7 +171,7 @@ static void my_application_startup(GApplication* application) {
 
 // Implements GApplication::shutdown.
 static void my_application_shutdown(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
+  // MyApplication* self = MY_APPLICATION(object);
 
   // Perform any actions required at application shutdown.
 
@@ -108,13 +187,18 @@ static void my_application_dispose(GObject* object) {
 
 static void my_application_class_init(MyApplicationClass* klass) {
   G_APPLICATION_CLASS(klass)->activate = my_application_activate;
-  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_APPLICATION_CLASS(klass)->local_command_line =
+      my_application_local_command_line;
   G_APPLICATION_CLASS(klass)->startup = my_application_startup;
   G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
   G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
 }
 
-static void my_application_init(MyApplication* self) {}
+static void my_application_init(MyApplication* self) {
+  self->overlay = nullptr;
+  self->gl_area = nullptr;
+  self->flutter_view = nullptr;
+}
 
 MyApplication* my_application_new() {
   // Set the program name to the application ID, which helps various systems
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index aa156acf..245595b6 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,34 +5,38 @@
 import FlutterMacOS
 import Foundation
 
+import connectivity_plus
+import device_info_plus
+import file_picker
+import gamepads_darwin
 import hotkey_manager_macos
 import macos_window_utils
-import media_kit_libs_macos_video
-import media_kit_video
 import os_media_controls
 import package_info_plus
 import path_provider_foundation
 import screen_retriever_macos
 import shared_preferences_foundation
 import sqflite_darwin
+import sqlite3_flutter_libs
 import url_launcher_macos
-import volume_controller
 import wakelock_plus
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
+  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
+  GamepadsDarwinPlugin.register(with: registry.registrar(forPlugin: "GamepadsDarwinPlugin"))
   HotkeyManagerMacosPlugin.register(with: registry.registrar(forPlugin: "HotkeyManagerMacosPlugin"))
   MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
-  MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
-  MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
   OsMediaControlsPlugin.register(with: registry.registrar(forPlugin: "OsMediaControlsPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
+  Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  VolumeControllerPlugin.register(with: registry.registrar(forPlugin: "VolumeControllerPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
   WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
 }
diff --git a/macos/Podfile b/macos/Podfile
index ff5ddb3b..0d122438 100644
--- a/macos/Podfile
+++ b/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.15'
+platform :osx, '14.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index 528496e2..9c0801c5 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -1,15 +1,19 @@
 PODS:
+  - connectivity_plus (0.0.1):
+    - FlutterMacOS
+  - device_info_plus (0.0.1):
+    - FlutterMacOS
+  - file_picker (0.0.1):
+    - FlutterMacOS
   - FlutterMacOS (1.0.0)
+  - gamepads_darwin (0.1.1):
+    - FlutterMacOS
   - HotKey (0.2.1)
   - hotkey_manager_macos (0.0.1):
     - FlutterMacOS
     - HotKey
   - macos_window_utils (1.0.0):
     - FlutterMacOS
-  - media_kit_libs_macos_video (1.0.4):
-    - FlutterMacOS
-  - media_kit_video (0.0.1):
-    - FlutterMacOS
   - os_media_controls (0.0.1):
     - FlutterMacOS
   - package_info_plus (0.0.1):
@@ -25,9 +29,32 @@ PODS:
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
-  - url_launcher_macos (0.0.1):
+  - sqlite3 (3.51.1):
+    - sqlite3/common (= 3.51.1)
+  - sqlite3/common (3.51.1)
+  - sqlite3/dbstatvtab (3.51.1):
+    - sqlite3/common
+  - sqlite3/fts5 (3.51.1):
+    - sqlite3/common
+  - sqlite3/math (3.51.1):
+    - sqlite3/common
+  - sqlite3/perf-threadsafe (3.51.1):
+    - sqlite3/common
+  - sqlite3/rtree (3.51.1):
+    - sqlite3/common
+  - sqlite3/session (3.51.1):
+    - sqlite3/common
+  - sqlite3_flutter_libs (0.0.1):
+    - Flutter
     - FlutterMacOS
-  - volume_controller (0.0.1):
+    - sqlite3 (~> 3.51.1)
+    - sqlite3/dbstatvtab
+    - sqlite3/fts5
+    - sqlite3/math
+    - sqlite3/perf-threadsafe
+    - sqlite3/rtree
+    - sqlite3/session
+  - url_launcher_macos (0.0.1):
     - FlutterMacOS
   - wakelock_plus (0.0.1):
     - FlutterMacOS
@@ -35,37 +62,44 @@ PODS:
     - FlutterMacOS
 
 DEPENDENCIES:
+  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
+  - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
+  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
+  - gamepads_darwin (from `Flutter/ephemeral/.symlinks/plugins/gamepads_darwin/macos`)
   - hotkey_manager_macos (from `Flutter/ephemeral/.symlinks/plugins/hotkey_manager_macos/macos`)
   - macos_window_utils (from `Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos`)
-  - media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`)
-  - media_kit_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos`)
   - os_media_controls (from `Flutter/ephemeral/.symlinks/plugins/os_media_controls/macos`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
   - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`)
+  - sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
-  - volume_controller (from `Flutter/ephemeral/.symlinks/plugins/volume_controller/macos`)
   - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)
   - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)
 
 SPEC REPOS:
   trunk:
     - HotKey
+    - sqlite3
 
 EXTERNAL SOURCES:
+  connectivity_plus:
+    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
+  device_info_plus:
+    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
+  file_picker:
+    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
+  gamepads_darwin:
+    :path: Flutter/ephemeral/.symlinks/plugins/gamepads_darwin/macos
   hotkey_manager_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/hotkey_manager_macos/macos
   macos_window_utils:
     :path: Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos
-  media_kit_libs_macos_video:
-    :path: Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos
-  media_kit_video:
-    :path: Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos
   os_media_controls:
     :path: Flutter/ephemeral/.symlinks/plugins/os_media_controls/macos
   package_info_plus:
@@ -78,33 +112,36 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
   sqflite_darwin:
     :path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin
+  sqlite3_flutter_libs:
+    :path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin
   url_launcher_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
-  volume_controller:
-    :path: Flutter/ephemeral/.symlinks/plugins/volume_controller/macos
   wakelock_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos
   window_manager:
     :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
 
 SPEC CHECKSUMS:
+  connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
+  device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76
+  file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
   FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
+  gamepads_darwin: 643b6a69e20ca678fae83781b7f7fc8f15f5d710
   HotKey: 400beb7caa29054ea8d864c96f5ba7e5b4852277
   hotkey_manager_macos: a4317849af96d2430fa89944d3c58977ca089fbe
   macos_window_utils: 23f54331a0fd51eea9e0ed347253bf48fd379d1d
-  media_kit_libs_macos_video: 85a23e549b5f480e72cae3e5634b5514bc692f65
-  media_kit_video: fa6564e3799a0a28bff39442334817088b7ca758
   os_media_controls: c07c04c4afdf59dda0a3f398457a46823c4ce0ed
   package_info_plus: f0052d280d17aa382b932f399edf32507174e870
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b
+  sqlite3_flutter_libs: d13b8b3003f18f596e542bcb9482d105577eff41
   url_launcher_macos: f87a979182d112f911de6820aefddaf56ee9fbfd
-  volume_controller: 5c068e6d085c80dadd33fc2c918d2114b775b3dd
   wakelock_plus: 917609be14d812ddd9e9528876538b2263aaa03b
   window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
 
-PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009
+PODFILE CHECKSUM: d16f5e5d196d1ca9863d7a71d5885cad7ffa7d2d
 
 COCOAPODS: 1.16.2
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index 08f104b2..8175de2f 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -26,7 +26,10 @@
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+		6AB6B0952EDB27C100EAC8DB /* MPVKit-GPL in Frameworks */ = {isa = PBXBuildFile; productRef = 6AB6B0942EDB27C100EAC8DB /* MPVKit-GPL */; };
 		6AC86ED72EA70B4C0067BC66 /* plezy.icon in Resources */ = {isa = PBXBuildFile; fileRef = 6AC86ED62EA70B4C0067BC66 /* plezy.icon */; };
+		6AD8B1612ED7B50000E9E1B4 /* MpvPlayerCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AD8B1632ED7B50000E9E1B4 /* MpvPlayerCore.swift */; };
+		6AD8B1622ED7B50000E9E1B4 /* MpvPlayerPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AD8B1642ED7B50000E9E1B4 /* MpvPlayerPlugin.swift */; };
 		9AECA605E2E1BECE3CA5BD01 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 78F9F23331B540A25C4A70C7 /* Pods_Runner.framework */; };
 		FE52EE1D2D489FA88507D14E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84260356652A3270E664FED4 /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
@@ -81,6 +84,8 @@
 		4E4BFEE5F31FF1CC308F1693 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		5EBEC2B546108DF45BEB0B00 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		6AC86ED62EA70B4C0067BC66 /* plezy.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = plezy.icon; sourceTree = "<group>"; };
+		6AD8B1632ED7B50000E9E1B4 /* MpvPlayerCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MpvPlayerCore.swift; sourceTree = "<group>"; };
+		6AD8B1642ED7B50000E9E1B4 /* MpvPlayerPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MpvPlayerPlugin.swift; sourceTree = "<group>"; };
 		78F9F23331B540A25C4A70C7 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		84260356652A3270E664FED4 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -104,6 +109,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				9AECA605E2E1BECE3CA5BD01 /* Pods_Runner.framework in Frameworks */,
+				6AB6B0952EDB27C100EAC8DB /* MPVKit-GPL in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -190,6 +196,7 @@
 			children = (
 				33CC10F02044A3C60003C045 /* AppDelegate.swift */,
 				33CC11122044BFA00003C045 /* MainFlutterWindow.swift */,
+				6AD8B1652ED7B50000E9E1B4 /* MpvPlayer */,
 				33E51913231747F40026EE4D /* DebugProfile.entitlements */,
 				33E51914231749380026EE4D /* Release.entitlements */,
 				33CC11242044D66E0003C045 /* Resources */,
@@ -207,6 +214,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		6AD8B1652ED7B50000E9E1B4 /* MpvPlayer */ = {
+			isa = PBXGroup;
+			children = (
+				6AD8B1632ED7B50000E9E1B4 /* MpvPlayerCore.swift */,
+				6AD8B1642ED7B50000E9E1B4 /* MpvPlayerPlugin.swift */,
+			);
+			path = MpvPlayer;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -291,6 +307,9 @@
 				Base,
 			);
 			mainGroup = 33CC10E42044A3C60003C045;
+			packageReferences = (
+				6AB6B0932EDB27C100EAC8DB /* XCRemoteSwiftPackageReference "MPVKit" */,
+			);
 			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -439,6 +458,8 @@
 				33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */,
 				33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */,
 				335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */,
+				6AD8B1612ED7B50000E9E1B4 /* MpvPlayerCore.swift in Sources */,
+				6AD8B1622ED7B50000E9E1B4 /* MpvPlayerPlugin.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -556,7 +577,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -638,7 +659,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -688,7 +709,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -795,6 +816,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		6AB6B0932EDB27C100EAC8DB /* XCRemoteSwiftPackageReference "MPVKit" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/edde746/MPVKit";
+			requirement = {
+				kind = revision;
+				revision = e6afd7fa47b6a0f55c29028bbebb4a05b43e779f;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		6AB6B0942EDB27C100EAC8DB /* MPVKit-GPL */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 6AB6B0932EDB27C100EAC8DB /* XCRemoteSwiftPackageReference "MPVKit" */;
+			productName = "MPVKit-GPL";
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 33CC10E52044A3C60003C045 /* Project object */;
 }
diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..93c870f8
--- /dev/null
+++ b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "originHash" : "c535d3cdb62bd4e11e67f3c9e68290fa7ee9306634c5f56d2b0396eb75ed41ee",
+  "pins" : [
+    {
+      "identity" : "mpvkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/edde746/MPVKit",
+      "state" : {
+        "revision" : "e6afd7fa47b6a0f55c29028bbebb4a05b43e779f"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..93c870f8
--- /dev/null
+++ b/macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "originHash" : "c535d3cdb62bd4e11e67f3c9e68290fa7ee9306634c5f56d2b0396eb75ed41ee",
+  "pins" : [
+    {
+      "identity" : "mpvkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/edde746/MPVKit",
+      "state" : {
+        "revision" : "e6afd7fa47b6a0f55c29028bbebb4a05b43e779f"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig
index 2a199ece..5d40372b 100644
--- a/macos/Runner/Configs/AppInfo.xcconfig
+++ b/macos/Runner/Configs/AppInfo.xcconfig
@@ -8,7 +8,7 @@
 PRODUCT_NAME = Plezy
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication1
+PRODUCT_BUNDLE_IDENTIFIER = com.edde746.plezy
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2025 edde746
diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift
index 3cc05eb2..b77c4b2a 100644
--- a/macos/Runner/MainFlutterWindow.swift
+++ b/macos/Runner/MainFlutterWindow.swift
@@ -4,10 +4,18 @@ import FlutterMacOS
 class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
     let flutterViewController = FlutterViewController()
+
+    // Enable transparency for Metal layer behind Flutter
+    self.backgroundColor = NSColor.clear
+    flutterViewController.backgroundColor = NSColor.clear
+
     let windowFrame = self.frame
     self.contentViewController = flutterViewController
     self.setFrame(windowFrame, display: true)
 
+    // Register MPV player plugin for video playback
+    MpvPlayerPlugin.register(with: flutterViewController.registrar(forPlugin: "MpvPlayerPlugin"))
+
     RegisterGeneratedPlugins(registry: flutterViewController)
 
     super.awakeFromNib()
diff --git a/macos/Runner/MpvPlayer/MpvPlayerCore.swift b/macos/Runner/MpvPlayer/MpvPlayerCore.swift
new file mode 100644
index 00000000..5fdfb6e9
--- /dev/null
+++ b/macos/Runner/MpvPlayer/MpvPlayerCore.swift
@@ -0,0 +1,451 @@
+import Cocoa
+import Libmpv
+
+/// Protocol for receiving player events
+protocol MpvPlayerDelegate: AnyObject {
+    func onPropertyChange(name: String, value: Any?)
+    func onEvent(name: String, data: [String: Any]?)
+}
+
+// Workaround for MoltenVK problems that cause flicker
+// https://github.com/mpv-player/mpv/pull/13651
+private class MetalLayer: CAMetalLayer {
+    override var drawableSize: CGSize {
+        get { return super.drawableSize }
+        set {
+            if Int(newValue.width) > 1 && Int(newValue.height) > 1 {
+                super.drawableSize = newValue
+            }
+        }
+    }
+
+    // Fix for target-colorspace-hint - needs main thread for EDR
+    override var wantsExtendedDynamicRangeContent: Bool {
+        get { return super.wantsExtendedDynamicRangeContent }
+        set {
+            if Thread.isMainThread {
+                super.wantsExtendedDynamicRangeContent = newValue
+            } else {
+                DispatchQueue.main.async {
+                    super.wantsExtendedDynamicRangeContent = newValue
+                }
+            }
+        }
+    }
+}
+
+/// Core MPV player using Metal rendering
+class MpvPlayerCore: NSObject {
+
+    // MARK: - Properties
+
+    private var metalLayer: MetalLayer?
+    private var mpv: OpaquePointer?
+    private weak var window: NSWindow?
+    private lazy var queue = DispatchQueue(label: "mpv", qos: .userInitiated)
+
+    weak var delegate: MpvPlayerDelegate?
+
+    private(set) var isInitialized = false
+
+    // HDR settings
+    private var hdrEnabled = true  // User preference for HDR
+    private var lastSigPeak: Double = 0.0  // Last known sig-peak for re-evaluation
+
+    // MARK: - Initialization
+
+    func initialize(in window: NSWindow) -> Bool {
+        guard !isInitialized else {
+            print("[MpvPlayerCore] Already initialized")
+            return true
+        }
+
+        guard let contentView = window.contentView else {
+            print("[MpvPlayerCore] No content view")
+            return false
+        }
+
+        self.window = window
+
+        // Create Metal layer for video rendering
+        let layer = MetalLayer()
+        layer.frame = contentView.bounds
+        if let screen = window.screen ?? NSScreen.main {
+            layer.contentsScale = screen.backingScaleFactor
+        }
+        layer.framebufferOnly = true
+        layer.autoresizingMask = [.layerWidthSizable, .layerHeightSizable]
+
+        metalLayer = layer
+
+        // Ensure contentView has a layer and add our Metal layer
+        contentView.wantsLayer = true
+        contentView.layer?.addSublayer(layer)
+
+        print("[MpvPlayerCore] Metal layer added, frame: \(layer.frame)")
+
+        // Initialize MPV with this Metal layer
+        guard setupMpv() else {
+            print("[MpvPlayerCore] Failed to setup MPV")
+            layer.removeFromSuperlayer()
+            metalLayer = nil
+            return false
+        }
+
+        isInitialized = true
+        print("[MpvPlayerCore] Initialized successfully with MPV")
+        return true
+    }
+
+    private func setupMpv() -> Bool {
+        guard let metalLayer = metalLayer else { return false }
+
+        mpv = mpv_create()
+        guard mpv != nil else {
+            print("[MpvPlayerCore] Failed to create MPV context")
+            return false
+        }
+
+        // Logging
+        #if DEBUG
+        checkError(mpv_request_log_messages(mpv, "info"))
+        #else
+        checkError(mpv_request_log_messages(mpv, "warn"))
+        #endif
+
+        // Set the Metal layer as the render target (must use local var for &)
+        var layer = metalLayer
+        checkError(mpv_set_option(mpv, "wid", MPV_FORMAT_INT64, &layer))
+
+        // Video output settings for Metal/Vulkan
+        checkError(mpv_set_option_string(mpv, "vo", "gpu-next"))
+        checkError(mpv_set_option_string(mpv, "gpu-api", "vulkan"))
+        checkError(mpv_set_option_string(mpv, "gpu-context", "moltenvk"))
+        checkError(mpv_set_option_string(mpv, "hwdec", "videotoolbox"))
+        checkError(mpv_set_option_string(mpv, "target-colorspace-hint", "yes"))
+
+        // Initialize MPV
+        let initResult = mpv_initialize(mpv)
+        if initResult < 0 {
+            print("[MpvPlayerCore] mpv_initialize failed: \(String(cString: mpv_error_string(initResult)))")
+            mpv_terminate_destroy(mpv)
+            mpv = nil
+            return false
+        }
+
+        // Set up wakeup callback for event handling
+        mpv_set_wakeup_callback(mpv, { ctx in
+            let core = Unmanaged<MpvPlayerCore>.fromOpaque(ctx!).takeUnretainedValue()
+            core.readEvents()
+        }, UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque()))
+
+        // Observe video-params/sig-peak for HDR detection
+        mpv_observe_property(mpv, 0, "video-params/sig-peak", MPV_FORMAT_DOUBLE)
+
+        print("[MpvPlayerCore] MPV initialized successfully")
+        return true
+    }
+
+    // MARK: - MPV Properties and Commands
+
+    func setProperty(_ name: String, value: String) {
+        guard mpv != nil else { return }
+
+        // Handle custom HDR toggle property
+        if name == "hdr-enabled" {
+            let enabled = value == "yes" || value == "true" || value == "1"
+            setHDREnabled(enabled)
+            return
+        }
+
+        mpv_set_property_string(mpv, name, value)
+    }
+
+    /// Enable or disable HDR mode
+    func setHDREnabled(_ enabled: Bool) {
+        hdrEnabled = enabled
+        print("[MpvPlayerCore] HDR enabled: \(enabled)")
+
+        // Update MPV's target-colorspace-hint
+        if mpv != nil {
+            mpv_set_property_string(mpv, "target-colorspace-hint", enabled ? "yes" : "no")
+        }
+
+        // Re-evaluate EDR mode with current sig-peak
+        DispatchQueue.main.async {
+            self.updateEDRMode(sigPeak: self.lastSigPeak)
+        }
+    }
+
+    func getProperty(_ name: String) -> String? {
+        guard mpv != nil else { return nil }
+        let cstr = mpv_get_property_string(mpv, name)
+        defer { mpv_free(cstr) }
+        return cstr.map { String(cString: $0) }
+    }
+
+    func observeProperty(_ name: String, format: String) {
+        guard mpv != nil else { return }
+
+        let mpvFormat: mpv_format
+        switch format {
+        case "double": mpvFormat = MPV_FORMAT_DOUBLE
+        case "flag": mpvFormat = MPV_FORMAT_FLAG
+        case "node": mpvFormat = MPV_FORMAT_NODE
+        case "string": mpvFormat = MPV_FORMAT_STRING
+        default: return
+        }
+
+        mpv_observe_property(mpv, 0, name, mpvFormat)
+    }
+
+    func command(_ args: [String]) {
+        guard mpv != nil, !args.isEmpty else { return }
+        command(args[0], args: Array(args.dropFirst()))
+    }
+
+    // MARK: - Visibility
+
+    func setVisible(_ visible: Bool) {
+        guard let layer = metalLayer else { return }
+
+        if visible {
+            // Re-insert after background layer but before Flutter control views
+            layer.removeFromSuperlayer()
+            if let superlayer = window?.contentView?.layer {
+                superlayer.insertSublayer(layer, at: 1)
+            }
+        }
+
+        layer.isHidden = !visible
+        print("[MpvPlayerCore] setVisible(\(visible))")
+    }
+
+    func updateFrame(_ frame: CGRect? = nil) {
+        guard let metalLayer = metalLayer else { return }
+
+        if let frame = frame {
+            metalLayer.frame = frame
+        } else if let contentView = window?.contentView {
+            metalLayer.frame = contentView.bounds
+        }
+
+        // Update drawable size for proper scaling
+        if let screen = window?.screen ?? NSScreen.main {
+            let scale = screen.backingScaleFactor
+            metalLayer.drawableSize = CGSize(
+                width: metalLayer.frame.width * scale,
+                height: metalLayer.frame.height * scale
+            )
+        }
+
+        print("[MpvPlayerCore] updateFrame: \(metalLayer.frame)")
+    }
+
+    // MARK: - Private Helpers
+
+    private func command(_ cmd: String, args: [String] = []) {
+        guard mpv != nil else { return }
+
+        // Build array of C strings for mpv_command
+        var cargs: [UnsafeMutablePointer<CChar>?] = ([cmd] + args).map { strdup($0) }
+        cargs.append(nil) // null-terminate
+        defer {
+            for ptr in cargs {
+                free(ptr)
+            }
+        }
+
+        // mpv_command expects UnsafePointer, use withUnsafeBufferPointer for the conversion
+        cargs.withUnsafeBufferPointer { buffer in
+            var constPtrs = buffer.map { UnsafePointer($0) }
+            _ = mpv_command(mpv, &constPtrs)
+        }
+    }
+
+    private func readEvents() {
+        queue.async { [weak self] in
+            guard let self = self, let mpv = self.mpv else { return }
+
+            while true {
+                let event = mpv_wait_event(mpv, 0)
+                guard let eventPtr = event else { break }
+
+                if eventPtr.pointee.event_id == MPV_EVENT_NONE {
+                    break
+                }
+
+                self.handleEvent(eventPtr.pointee)
+            }
+        }
+    }
+
+    private func handleEvent(_ event: mpv_event) {
+        switch event.event_id {
+        case MPV_EVENT_PROPERTY_CHANGE:
+            guard let data = event.data else { break }
+            let property = data.assumingMemoryBound(to: mpv_event_property.self).pointee
+            let name = String(cString: property.name)
+            handlePropertyChange(name: name, property: property)
+
+        case MPV_EVENT_FILE_LOADED:
+            DispatchQueue.main.async {
+                self.delegate?.onEvent(name: "file-loaded", data: nil)
+            }
+
+        case MPV_EVENT_END_FILE:
+            DispatchQueue.main.async {
+                self.delegate?.onEvent(name: "end-file", data: nil)
+            }
+
+        case MPV_EVENT_SHUTDOWN:
+            print("[MpvPlayerCore] MPV shutdown event")
+
+        case MPV_EVENT_LOG_MESSAGE:
+            if let msgPtr = event.data?.assumingMemoryBound(to: mpv_event_log_message.self) {
+                let msg = msgPtr.pointee
+                if let prefix = msg.prefix, let level = msg.level, let text = msg.text {
+                    print("[MPV:\(String(cString: prefix))] \(String(cString: level)): \(String(cString: text))", terminator: "")
+                }
+            }
+
+        default:
+            break
+        }
+    }
+
+    private func handlePropertyChange(name: String, property: mpv_event_property) {
+        var value: Any?
+
+        switch property.format {
+        case MPV_FORMAT_DOUBLE:
+            if let ptr = property.data {
+                value = ptr.assumingMemoryBound(to: Double.self).pointee
+            }
+
+        case MPV_FORMAT_FLAG:
+            if let ptr = property.data {
+                value = ptr.assumingMemoryBound(to: Int32.self).pointee != 0
+            }
+
+        case MPV_FORMAT_NODE:
+            if let ptr = property.data {
+                let node = ptr.assumingMemoryBound(to: mpv_node.self).pointee
+                value = convertNode(node)
+            }
+
+        case MPV_FORMAT_STRING:
+            if let ptr = property.data {
+                let cstr = ptr.assumingMemoryBound(to: UnsafePointer<CChar>?.self).pointee
+                value = cstr.map { String(cString: $0) }
+            }
+
+        default:
+            break
+        }
+
+        // Handle sig-peak for HDR/EDR activation
+        if name == "video-params/sig-peak", let sigPeak = value as? Double {
+            lastSigPeak = sigPeak
+            DispatchQueue.main.async {
+                self.updateEDRMode(sigPeak: sigPeak)
+            }
+        }
+
+        DispatchQueue.main.async {
+            self.delegate?.onPropertyChange(name: name, value: value)
+        }
+    }
+
+    // MARK: - HDR/EDR Support
+
+    private func updateEDRMode(sigPeak: Double) {
+        guard let layer = metalLayer else { return }
+
+        // Check if screen supports EDR
+        var edrHeadroom: CGFloat = 1.0
+        if let screen = window?.screen ?? NSScreen.main {
+            edrHeadroom = screen.maximumExtendedDynamicRangeColorComponentValue
+        }
+
+        let isHDRContent = sigPeak > 1.0
+        let screenSupportsEDR = edrHeadroom > 1.0
+        let shouldEnableEDR = hdrEnabled && isHDRContent && screenSupportsEDR
+
+        layer.wantsExtendedDynamicRangeContent = shouldEnableEDR
+
+        print(
+            "[MpvPlayerCore] EDR mode: \(shouldEnableEDR) (hdrEnabled: \(hdrEnabled), sigPeak: \(sigPeak), headroom: \(edrHeadroom))"
+        )
+    }
+
+    private func convertNode(_ node: mpv_node) -> Any? {
+        switch node.format {
+        case MPV_FORMAT_STRING:
+            return node.u.string.map { String(cString: $0) }
+
+        case MPV_FORMAT_FLAG:
+            return node.u.flag != 0
+
+        case MPV_FORMAT_INT64:
+            return node.u.int64
+
+        case MPV_FORMAT_DOUBLE:
+            return node.u.double_
+
+        case MPV_FORMAT_NODE_ARRAY:
+            guard let list = node.u.list?.pointee else { return nil }
+            var array = [Any]()
+            for i in 0..<Int(list.num) {
+                if let item = convertNode(list.values[i]) {
+                    array.append(item)
+                }
+            }
+            return array
+
+        case MPV_FORMAT_NODE_MAP:
+            guard let list = node.u.list?.pointee else { return nil }
+            var dict = [String: Any]()
+            for i in 0..<Int(list.num) {
+                if let key = list.keys?[i].map({ String(cString: $0) }),
+                   let val = convertNode(list.values[i]) {
+                    dict[key] = val
+                }
+            }
+            return dict
+
+        default:
+            return nil
+        }
+    }
+
+    private func checkError(_ status: CInt) {
+        if status < 0 {
+            print("[MpvPlayerCore] MPV error: \(String(cString: mpv_error_string(status)))")
+        }
+    }
+
+    // MARK: - Cleanup
+
+    func dispose() {
+        // Capture handle before clearing to avoid weak captures during deinit
+        let mpvHandle = mpv
+        mpv = nil
+
+        // Tear down on the mpv queue to avoid races with wakeup callbacks still firing
+        queue.sync {
+            if let handle = mpvHandle {
+                mpv_set_wakeup_callback(handle, nil, nil)
+                mpv_terminate_destroy(handle)
+            }
+        }
+        metalLayer?.removeFromSuperlayer()
+        metalLayer = nil
+        isInitialized = false
+        print("[MpvPlayerCore] Disposed")
+    }
+
+    deinit {
+        dispose()
+    }
+}
diff --git a/macos/Runner/MpvPlayer/MpvPlayerPlugin.swift b/macos/Runner/MpvPlayer/MpvPlayerPlugin.swift
new file mode 100644
index 00000000..38f7eb9c
--- /dev/null
+++ b/macos/Runner/MpvPlayer/MpvPlayerPlugin.swift
@@ -0,0 +1,259 @@
+import Cocoa
+import FlutterMacOS
+
+/// Flutter plugin that bridges MPV player to Dart via method and event channels
+class MpvPlayerPlugin: NSObject, FlutterPlugin, FlutterStreamHandler, MpvPlayerDelegate {
+
+    // MARK: - Properties
+
+    private var playerCore: MpvPlayerCore?
+    private var eventSink: FlutterEventSink?
+    private weak var registrar: FlutterPluginRegistrar?
+
+    // MARK: - FlutterPlugin Registration
+
+    static func register(with registrar: FlutterPluginRegistrar) {
+        // Method channel for commands
+        let methodChannel = FlutterMethodChannel(
+            name: "com.plezy/mpv_player",
+            binaryMessenger: registrar.messenger
+        )
+
+        // Event channel for state updates
+        let eventChannel = FlutterEventChannel(
+            name: "com.plezy/mpv_player/events",
+            binaryMessenger: registrar.messenger
+        )
+
+        let instance = MpvPlayerPlugin()
+        instance.registrar = registrar
+
+        registrar.addMethodCallDelegate(instance, channel: methodChannel)
+        eventChannel.setStreamHandler(instance)
+
+        print("[MpvPlayerPlugin] Registered with Flutter")
+    }
+
+    // MARK: - FlutterStreamHandler
+
+    func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
+        self.eventSink = events
+        print("[MpvPlayerPlugin] Event stream connected")
+        return nil
+    }
+
+    func onCancel(withArguments arguments: Any?) -> FlutterError? {
+        self.eventSink = nil
+        print("[MpvPlayerPlugin] Event stream disconnected")
+        return nil
+    }
+
+    // MARK: - FlutterPlugin Method Handler
+
+    func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        switch call.method {
+        case "initialize":
+            handleInitialize(result: result)
+
+        case "dispose":
+            handleDispose(result: result)
+
+        case "setProperty":
+            handleSetProperty(call: call, result: result)
+
+        case "getProperty":
+            handleGetProperty(call: call, result: result)
+
+        case "observeProperty":
+            handleObserveProperty(call: call, result: result)
+
+        case "command":
+            handleCommand(call: call, result: result)
+
+        case "setVisible":
+            handleSetVisible(call: call, result: result)
+
+        case "isInitialized":
+            result(playerCore?.isInitialized ?? false)
+
+        case "updateFrame":
+            handleUpdateFrame(result: result)
+
+        default:
+            result(FlutterMethodNotImplemented)
+        }
+    }
+
+    // MARK: - Method Handlers
+
+    private func handleInitialize(result: @escaping FlutterResult) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else {
+                result(FlutterError(code: "ERROR", message: "Plugin deallocated", details: nil))
+                return
+            }
+
+            // Check if already initialized
+            if self.playerCore?.isInitialized == true {
+                print("[MpvPlayerPlugin] Already initialized")
+                result(true)
+                return
+            }
+
+            // Find the Flutter window
+            guard let (window, _, _) = self.findFlutterWindow() else {
+                print("[MpvPlayerPlugin] Failed to find Flutter window")
+                result(FlutterError(code: "NO_WINDOW", message: "Could not find Flutter window", details: nil))
+                return
+            }
+
+            // Create and initialize player core
+            let core = MpvPlayerCore()
+            core.delegate = self
+
+            guard core.initialize(in: window) else {
+                print("[MpvPlayerPlugin] Failed to initialize MPV")
+                result(FlutterError(code: "MPV_INIT_FAILED", message: "Failed to initialize MPV", details: nil))
+                return
+            }
+
+            self.playerCore = core
+
+            // Start hidden
+            core.setVisible(false)
+
+            print("[MpvPlayerPlugin] Initialized successfully")
+            result(true)
+        }
+    }
+
+    private func handleDispose(result: @escaping FlutterResult) {
+        DispatchQueue.main.async { [weak self] in
+            self?.playerCore?.dispose()
+            self?.playerCore = nil
+            print("[MpvPlayerPlugin] Disposed")
+            result(nil)
+        }
+    }
+
+    private func handleSetProperty(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let name = args["name"] as? String,
+              let value = args["value"] as? String else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'name' or 'value' argument", details: nil))
+            return
+        }
+
+        playerCore?.setProperty(name, value: value)
+        result(nil)
+    }
+
+    private func handleGetProperty(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let name = args["name"] as? String else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'name' argument", details: nil))
+            return
+        }
+
+        let value = playerCore?.getProperty(name)
+        result(value)
+    }
+
+    private func handleObserveProperty(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let name = args["name"] as? String,
+              let format = args["format"] as? String else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'name' or 'format' argument", details: nil))
+            return
+        }
+
+        playerCore?.observeProperty(name, format: format)
+        result(nil)
+    }
+
+    private func handleCommand(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let commandArgs = args["args"] as? [String] else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'args' argument", details: nil))
+            return
+        }
+
+        playerCore?.command(commandArgs)
+        result(nil)
+    }
+
+    private func handleSetVisible(call: FlutterMethodCall, result: @escaping FlutterResult) {
+        guard let args = call.arguments as? [String: Any],
+              let visible = args["visible"] as? Bool else {
+            result(FlutterError(code: "INVALID_ARGS", message: "Missing 'visible' argument", details: nil))
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+            self?.playerCore?.setVisible(visible)
+
+            // Update frame when becoming visible
+            if visible {
+                self?.playerCore?.updateFrame()
+            }
+
+            result(nil)
+        }
+    }
+
+    private func handleUpdateFrame(result: @escaping FlutterResult) {
+        DispatchQueue.main.async { [weak self] in
+            self?.playerCore?.updateFrame()
+            result(nil)
+        }
+    }
+
+    // MARK: - MpvPlayerDelegate
+
+    func onPropertyChange(name: String, value: Any?) {
+        guard let eventSink = eventSink else { return }
+
+        var event: [String: Any] = ["type": "property", "name": name]
+
+        if let value = value {
+            event["value"] = value
+        }
+
+        eventSink(event)
+    }
+
+    func onEvent(name: String, data: [String: Any]?) {
+        guard let eventSink = eventSink else { return }
+
+        var event: [String: Any] = ["type": "event", "name": name]
+        if let data = data {
+            event["data"] = data
+        }
+
+        eventSink(event)
+    }
+
+    // MARK: - Helpers
+
+    private func findFlutterWindow() -> (NSWindow, NSView, NSView)? {
+        for window in NSApplication.shared.windows {
+            if window is MainFlutterWindow,
+               let contentView = window.contentView,
+               let contentVC = window.contentViewController {
+                let flutterView = contentVC.view
+                return (window, contentView, flutterView)
+            }
+        }
+
+        // Fallback
+        for window in NSApplication.shared.windows {
+            if let contentView = window.contentView,
+               let contentVC = window.contentViewController {
+                let flutterView = contentVC.view
+                return (window, contentView, flutterView)
+            }
+        }
+
+        return nil
+    }
+}
diff --git a/maestro/auth.yaml b/maestro/auth.yaml
deleted file mode 100644
index 6082ae20..00000000
--- a/maestro/auth.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-appId: com.edde746.plezy
----
-- tapOn: "Debug: Enter Token"
-- tapOn: "Plex Auth Token"
-- inputText: ${MAESTRO_PLEX_TOKEN}
-- tapOn: "Authenticate"
-- tapOn: ${MAESTRO_PLEX_SERVER_NAME}
diff --git a/maestro/screenshots.yaml b/maestro/screenshots.yaml
deleted file mode 100644
index a4edd921..00000000
--- a/maestro/screenshots.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-appId: com.edde746.plezy
-env:
-  PREFIX: ./${maestro.platform}/
----
-- evalScript: ${output.suffix = '-' + Date.now().toString()}
-- launchApp:
-    clearState: true
-    stopApp: false
-- runFlow: auth.yaml
-- assertVisible:
-    id: "media-hero-${MAESTRO_EPISODE}"
-- tapOn: "Pause auto-scroll"
-- waitForAnimationToEnd
-- tapOn:
-    text: "Play auto-scroll"
-    waitToSettleTimeoutMs: 800
-- takeScreenshot: "${PREFIX}1-home${output.suffix}"
-- tapOn: "Libraries.*"
-- tapOn:
-    text: "TV Shows"
-    waitToSettleTimeoutMs: 200
-- runFlow:
-    when:
-      true: ${MAESTRO_COLLECTION != ""}
-    commands:
-      - tapOn: "Filters"
-      - tapOn: "Collection"
-      - tapOn: "${MAESTRO_COLLECTION}"
-- repeat:
-    while:
-      visible: "skeleton-loader"
-    commands:
-      - assertNotVisible: "skeleton-loader"
-
-- takeScreenshot: "${PREFIX}2-library${output.suffix}"
-- scrollUntilVisible:
-    element:
-      id: "media-card-${MAESTRO_SHOW}"
-- tapOn:
-    id: "media-card-${MAESTRO_SHOW}"
-- waitForAnimationToEnd:
-    timeout: 5000
-- takeScreenshot: "${PREFIX}3-media-card${output.suffix}"
-- scrollUntilVisible:
-    element:
-      id: "media-season-.*"
-- tapOn:
-    id: "media-season-.*"
-- takeScreenshot: "${PREFIX}4-season${output.suffix}"
diff --git a/pubspec.lock b/pubspec.lock
index d49b164d..4b8bf258 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -17,6 +17,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.7.1"
+  analyzer_plugin:
+    dependency: transitive
+    description:
+      name: analyzer_plugin
+      sha256: a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.4"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   archive:
     dependency: transitive
     description:
@@ -137,6 +153,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  chalkdart:
+    dependency: transitive
+    description:
+      name: chalkdart
+      sha256: "7ffc6bd39c81453fb9ba8dbce042a9c960219b75ea1c07196a7fa41c2fab9e86"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.5"
   characters:
     dependency: transitive
     description:
@@ -145,6 +169,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -185,6 +217,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
+  connectivity_plus:
+    dependency: "direct main"
+    description:
+      name: connectivity_plus
+      sha256: b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.5"
+  connectivity_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: connectivity_plus_platform_interface
+      sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   convert:
     dependency: transitive
     description:
@@ -193,14 +241,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
-  crypto:
+  cross_file:
     dependency: transitive
+    description:
+      name: cross_file
+      sha256: "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.5+1"
+  crypto:
+    dependency: "direct main"
     description:
       name: crypto
       sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
       url: "https://pub.dev"
     source: hosted
     version: "3.0.7"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   csv:
     dependency: transitive
     description:
@@ -209,6 +273,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  dart_code_linter:
+    dependency: "direct dev"
+    description:
+      name: dart_code_linter
+      sha256: "9456e0a7508b0d76be301dc2f73be37e601019e85c5f59e6a5cc460af90f7dcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
   dart_style:
     dependency: transitive
     description:
@@ -225,6 +297,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.11"
+  device_info_plus:
+    dependency: "direct main"
+    description:
+      name: device_info_plus
+      sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.5.0"
+  device_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: device_info_plus_platform_interface
+      sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.3"
   dio:
     dependency: "direct main"
     description:
@@ -241,6 +329,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  drift:
+    dependency: "direct main"
+    description:
+      name: drift
+      sha256: "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.28.2"
+  drift_dev:
+    dependency: "direct dev"
+    description:
+      name: drift_dev
+      sha256: "68c138e884527d2bd61df2ade276c3a144df84d1adeb0ab8f3196b5afe021bd4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.28.0"
+  duration:
+    dependency: "direct main"
+    description:
+      name: duration
+      sha256: "13e5d20723c9c1dde8fb318cf86716d10ce294734e81e44ae1a817f3ae714501"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.3"
   fake_async:
     dependency: transitive
     description:
@@ -265,6 +377,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
+  file_picker:
+    dependency: "direct main"
+    description:
+      name: file_picker
+      sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.3.7"
   fixnum:
     dependency: transitive
     description:
@@ -318,6 +438,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.33"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -336,6 +464,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
+  gamepads:
+    dependency: "direct main"
+    description:
+      name: gamepads
+      sha256: "3a8a35502f0b3d28ea55e2c6c42320583389c0514a2bdd92ba0440d0cadd628e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.9"
+  gamepads_android:
+    dependency: transitive
+    description:
+      name: gamepads_android
+      sha256: "7913cd171ff06d5b588cb3e1dae64390c6e1352dd2999ff19a96d822eb7441fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
+  gamepads_darwin:
+    dependency: transitive
+    description:
+      name: gamepads_darwin
+      sha256: "91250975ee196703816c55117502ec53ce4a1b881ca50dec1d0fbcb9fbb75eff"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2+2"
+  gamepads_ios:
+    dependency: transitive
+    description:
+      name: gamepads_ios
+      sha256: "085459e2f677c18c4b15aee5dacc66e0b05491d4ed32bd3041c8328394e00d3a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+1"
+  gamepads_linux:
+    dependency: transitive
+    description:
+      name: gamepads_linux
+      sha256: f4c17915a84400d7f624aadb6371424ada596eedff2a25663121453e65917e0d
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.1+3"
+  gamepads_platform_interface:
+    dependency: transitive
+    description:
+      name: gamepads_platform_interface
+      sha256: ddab8677a4137d92e381b04cc97a8081ae4b75673dc0f24c846618d2b5226c4f
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2+1"
+  gamepads_web:
+    dependency: transitive
+    description:
+      name: gamepads_web
+      sha256: "4885a792f16de023c4975854ffe17ffccacb46beb1e78ac1ecde76fd10edcb22"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  gamepads_windows:
+    dependency: transitive
+    description:
+      name: gamepads_windows
+      sha256: "454320638b8ad73890530545a2f788d83a752471010edade0f00b1636c1b382d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4+1"
   glob:
     dependency: transitive
     description:
@@ -392,6 +584,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.6"
   http:
     dependency: transitive
     description:
@@ -436,10 +636,18 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.6.7"
+  js_interop:
+    dependency: transitive
+    description:
+      name: js_interop
+      sha256: "7ec859c296958ccea34dc770504bd3ff4ae52fdd9e7eeb2bacc7081ad476a1f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.1"
   json2yaml:
     dependency: transitive
     description:
@@ -536,77 +744,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.1"
-  media_kit:
+  material_symbols_icons:
     dependency: "direct main"
     description:
-      path: media_kit
-      ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      resolved-ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      url: "https://github.com/edde746/media-kit"
-    source: git
-    version: "1.2.1"
-  media_kit_libs_android_video:
-    dependency: transitive
-    description:
-      path: "libs/android/media_kit_libs_android_video"
-      ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      resolved-ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      url: "https://github.com/edde746/media-kit"
-    source: git
-    version: "1.3.9"
-  media_kit_libs_ios_video:
-    dependency: transitive
-    description:
-      path: "libs/ios/media_kit_libs_ios_video"
-      ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      resolved-ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      url: "https://github.com/edde746/media-kit"
-    source: git
-    version: "1.1.4"
-  media_kit_libs_linux:
-    dependency: transitive
-    description:
-      path: "libs/linux/media_kit_libs_linux"
-      ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      resolved-ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      url: "https://github.com/edde746/media-kit"
-    source: git
-    version: "1.2.1"
-  media_kit_libs_macos_video:
-    dependency: transitive
-    description:
-      path: "libs/macos/media_kit_libs_macos_video"
-      ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      resolved-ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      url: "https://github.com/edde746/media-kit"
-    source: git
-    version: "1.1.5"
-  media_kit_libs_video:
-    dependency: "direct main"
-    description:
-      path: "libs/universal/media_kit_libs_video"
-      ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      resolved-ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      url: "https://github.com/edde746/media-kit"
-    source: git
-    version: "1.0.7"
-  media_kit_libs_windows_video:
-    dependency: transitive
-    description:
-      path: "libs/windows/media_kit_libs_windows_video"
-      ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      resolved-ref: "9782771486c0356b48c2e31e47365d1ed0b7fcb5"
-      url: "https://github.com/edde746/media-kit"
-    source: git
-    version: "1.0.12"
-  media_kit_video:
-    dependency: "direct main"
-    description:
-      name: media_kit_video
-      sha256: "813858c3fe84eb46679eb698695f60665e2bfbef757766fac4d2e683f926e15a"
+      name: material_symbols_icons
+      sha256: "02555a48e1ec02b16e532dfd4ef13c4f6bf7ec7c20230e58e56641a393433dc3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "4.2892.0"
   meta:
     dependency: transitive
     description:
@@ -631,6 +776,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  nm:
+    dependency: transitive
+    description:
+      name: nm
+      sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
   octo_image:
     dependency: transitive
     description:
@@ -643,11 +796,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "53d803e1c228eb7eab9ca642119d404c21f4a52f"
-      resolved-ref: "53d803e1c228eb7eab9ca642119d404c21f4a52f"
+      ref: "75dc5642cd148c54c03fe96976702b8d31c48599"
+      resolved-ref: "75dc5642cd148c54c03fe96976702b8d31c48599"
       url: "https://github.com/edde746/os-media-controls"
     source: git
-    version: "0.0.2"
+    version: "0.1.0"
   package_config:
     dependency: transitive
     description:
@@ -673,7 +826,7 @@ packages:
     source: hosted
     version: "3.2.1"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
@@ -681,7 +834,7 @@ packages:
     source: hosted
     version: "1.9.1"
   path_provider:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path_provider
       sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
@@ -768,6 +921,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.3"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.5"
   provider:
     dependency: "direct main"
     description:
@@ -784,6 +945,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
+  pub_updater:
+    dependency: transitive
+    description:
+      name: pub_updater
+      sha256: "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
   pubspec_parse:
     dependency: transitive
     description:
@@ -808,6 +977,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
+  rate_limiter:
+    dependency: "direct main"
+    description:
+      name: rate_limiter
+      sha256: "2bae2e961adedf7fc2e8b0305d30e3a3619baf001d050c6907870c5c6235b559"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  recase:
+    dependency: transitive
+    description:
+      name: recase
+      sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   rxdart:
     dependency: transitive
     description:
@@ -816,30 +1001,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
-  safe_local_storage:
-    dependency: transitive
+  saf_stream:
+    dependency: "direct main"
     description:
-      name: safe_local_storage
-      sha256: e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236
+      name: saf_stream
+      sha256: c05449997698c481a03e428162a999f93b1ee1bcc0349d651899a59f7b10230a
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
-  screen_brightness_android:
-    dependency: transitive
+    version: "0.12.3"
+  saf_util:
+    dependency: "direct main"
     description:
-      name: screen_brightness_android
-      sha256: d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96
+      name: saf_util
+      sha256: "219f983e5f17b28998335158cdc97add9d52af9884e38b5a43f10dcc070510ec"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
-  screen_brightness_platform_interface:
-    dependency: transitive
-    description:
-      name: screen_brightness_platform_interface
-      sha256: "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
+    version: "0.11.0"
   screen_retriever:
     dependency: transitive
     description:
@@ -1045,6 +1222,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.0"
+  sqlite3:
+    dependency: transitive
+    description:
+      name: sqlite3
+      sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.9.4"
+  sqlite3_flutter_libs:
+    dependency: "direct main"
+    description:
+      name: sqlite3_flutter_libs
+      sha256: "1e800ebe7f85a80a66adacaa6febe4d5f4d8b75f244e9838a27cb2ffc7aec08d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.41"
+  sqlparser:
+    dependency: transitive
+    description:
+      name: sqlparser
+      sha256: "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.41.2"
   stack_trace:
     dependency: transitive
     description:
@@ -1125,22 +1326,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.3"
-  universal_platform:
-    dependency: transitive
-    description:
-      name: universal_platform
-      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  uri_parser:
-    dependency: transitive
-    description:
-      name: uri_parser
-      sha256: ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1229,16 +1414,8 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "15.0.2"
-  volume_controller:
-    dependency: transitive
-    description:
-      name: volume_controller
-      sha256: d75039e69c0d90e7810bfd47e3eedf29ff8543ea7a10392792e81f9bded7edf5
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.0"
   wakelock_plus:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: wakelock_plus
       sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228"
@@ -1293,6 +1470,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.15.0"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   window_manager:
     dependency: "direct main"
     description:
@@ -1301,6 +1486,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.3"
+  workmanager:
+    dependency: "direct main"
+    description:
+      name: workmanager
+      sha256: "065673b2a465865183093806925419d311a9a5e0995aa74ccf8920fd695e2d10"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.0+3"
+  workmanager_android:
+    dependency: transitive
+    description:
+      name: workmanager_android
+      sha256: "9ae744db4ef891f5fcd2fb8671fccc712f4f96489a487a1411e0c8675e5e8cb7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.0+2"
+  workmanager_apple:
+    dependency: transitive
+    description:
+      name: workmanager_apple
+      sha256: "1cc12ae3cbf5535e72f7ba4fde0c12dd11b757caf493a28e22d684052701f2ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.1+2"
+  workmanager_platform_interface:
+    dependency: transitive
+    description:
+      name: workmanager_platform_interface
+      sha256: f40422f10b970c67abb84230b44da22b075147637532ac501729256fcea10a47
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.1+1"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6f952caa..7790670b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: plezy
 description: "A beautiful Plex client for Flutter"
 publish_to: "none"
-version: 1.6.1+15
+version: 1.10.0+24
 
 environment:
   sdk: ^3.8.1
@@ -13,37 +13,38 @@ dependencies:
   json_annotation: ^4.8.1
   shared_preferences: ^2.2.2
   cached_network_image: ^3.4.1
-  media_kit: ^1.1.10+1
-  media_kit_video: ^1.2.4
-  media_kit_libs_video: ^1.0.4
   macos_window_utils: ^1.9.0
   url_launcher: ^6.3.0
   uuid: ^4.4.0
   window_manager: ^0.4.3
   logger: ^2.0.2
   package_info_plus: ^9.0.0
+  device_info_plus: ^11.0.0
   provider: ^6.1.2
   hotkey_manager: ^0.2.3
   flex_color_picker: ^3.6.0
   qr_flutter: ^4.1.0
   slang: ^3.31.2
   slang_flutter: ^3.31.0
+  duration: ^4.0.3
+  connectivity_plus: ^6.0.5
   os_media_controls:
     git:
       url: https://github.com/edde746/os-media-controls
-      ref: 53d803e1c228eb7eab9ca642119d404c21f4a52f
-
-dependency_overrides:
-  media_kit:
-    git:
-      url: https://github.com/edde746/media-kit
-      ref: 9782771486c0356b48c2e31e47365d1ed0b7fcb5
-      path: media_kit
-  media_kit_libs_video:
-    git:
-      url: https://github.com/edde746/media-kit
-      ref: 9782771486c0356b48c2e31e47365d1ed0b7fcb5
-      path: libs/universal/media_kit_libs_video
+      ref: 75dc5642cd148c54c03fe96976702b8d31c48599
+  rate_limiter: ^1.0.0
+  wakelock_plus: ^1.2.10
+  path_provider: ^2.1.0
+  path: ^1.9.0
+  gamepads: ^0.1.9
+  drift: ^2.28.2
+  sqlite3_flutter_libs: ^0.5.41
+  workmanager: ^0.9.0+3
+  crypto: ^3.0.7
+  file_picker: ^8.0.0
+  saf_util: ^0.11.0
+  saf_stream: ^0.12.2
+  material_symbols_icons: ^4.2892.0
 
 dev_dependencies:
   flutter_test:
@@ -53,13 +54,15 @@ dev_dependencies:
   json_serializable: ^6.7.1
   flutter_launcher_icons: ^0.14.4
   slang_build_runner: ^3.31.0
+  dart_code_linter: ^3.1.1
+  drift_dev: ^2.14.0
 
 flutter:
   uses-material-design: true
   assets:
     - lib/data/iso_639_codes.json
     - assets/plezy.png
-    - assets/droid-sans.ttf
+    - assets/go-noto-current-regular.ttf
 
 flutter_launcher_icons:
   android: true
diff --git a/scripts/android_screenshots.sh b/scripts/android_screenshots.sh
deleted file mode 100755
index 1782a8a1..00000000
--- a/scripts/android_screenshots.sh
+++ /dev/null
@@ -1,396 +0,0 @@
-#!/bin/bash
-
-# Android Screenshot Automation Script
-# Starts emulators, runs Flutter app, executes maestro tests, and organizes screenshots
-
-set -e  # Exit on any error
-
-# Configuration
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
-MAESTRO_DIR="$PROJECT_ROOT/maestro"
-FASTLANE_IMAGES_DIR="$PROJECT_ROOT/android/fastlane/metadata/android/en-GB/images"
-ENV_FILE="$PROJECT_ROOT/.env"
-
-# Source common screenshot functions
-source "${SCRIPT_DIR}/screenshot_common.sh"
-
-# Check if required tools are installed
-check_dependencies() {
-    # Check common dependencies first
-    if ! check_common_dependencies; then
-        exit 1
-    fi
-
-    log_info "Checking Android-specific dependencies..."
-
-    # Try to find emulator binary
-    if ! command -v emulator &> /dev/null; then
-        # Try common Android SDK locations
-        POSSIBLE_PATHS=(
-            "$ANDROID_HOME/emulator/emulator"
-            "$ANDROID_SDK_ROOT/emulator/emulator"
-            "~/Android/Sdk/emulator/emulator"
-            "~/Library/Android/sdk/emulator/emulator"
-        )
-
-        EMULATOR_PATH=""
-        for path in "${POSSIBLE_PATHS[@]}"; do
-            if [ -f "$path" ]; then
-                EMULATOR_PATH="$path"
-                break
-            fi
-        done
-
-        if [ -z "$EMULATOR_PATH" ]; then
-            log_error "Android emulator not found. Please ensure Android SDK is installed and ANDROID_HOME is set."
-            exit 1
-        fi
-
-        # Create an alias for emulator
-        alias emulator="$EMULATOR_PATH"
-    fi
-
-    log_success "All dependencies found"
-}
-
-# Get list of available AVDs
-get_avds() {
-    # Parse flutter emulators output to get Android emulator IDs
-    flutter emulators 2>/dev/null | grep "android$" | awk '{print $1}'
-}
-
-# Stop all running emulators
-stop_emulators() {
-    log_info "Stopping any running emulators..."
-
-    # Get list of running emulators
-    local running_emulators=$(adb devices | grep emulator | cut -f1)
-
-    if [ -n "$running_emulators" ]; then
-        for emulator in $running_emulators; do
-            log_info "Stopping emulator $emulator"
-            adb -s "$emulator" emu kill 2>/dev/null || true
-        done
-
-        # Wait for emulators to fully stop - check periodically
-        log_info "Waiting for emulators to fully shut down..."
-        local timeout=30  # 30 seconds timeout
-        local elapsed=0
-
-        while [ $elapsed -lt $timeout ]; do
-            local still_running=$(adb devices | grep emulator | cut -f1)
-            if [ -z "$still_running" ]; then
-                log_success "All emulators stopped"
-                return 0
-            fi
-            sleep 2
-            elapsed=$((elapsed + 2))
-
-            # Show progress every 6 seconds
-            if [ $((elapsed % 6)) -eq 0 ]; then
-                log_info "Still waiting for emulators to stop... (${elapsed}s elapsed)"
-            fi
-        done
-
-        log_warning "Timeout waiting for emulators to stop completely"
-    else
-        log_info "No emulators are currently running"
-    fi
-}
-
-# Start emulator and wait for it to be ready
-start_emulator() {
-    local avd_name="$1"
-    local device_type="$2"
-
-    log_info "Starting $device_type emulator: $avd_name"
-
-    # Double-check if any emulator is still running
-    local running_emulators=$(adb devices | grep emulator | cut -f1)
-    if [ -n "$running_emulators" ]; then
-        log_warning "Emulator still running: $running_emulators"
-        log_info "Forcing stop before starting new emulator..."
-        stop_emulators
-    fi
-
-    # Start emulator in background with proper output redirection
-    log_info "Launching emulator..."
-    flutter emulators --launch "$avd_name" > /dev/null 2>&1 &
-    local emulator_pid=$!
-
-    log_info "Waiting for $device_type emulator to boot..."
-
-    # Wait for emulator to appear in adb devices
-    local timeout=120  # 2 minutes timeout
-    local elapsed=0
-
-    while [ $elapsed -lt $timeout ]; do
-        if adb devices | grep -q "emulator.*device"; then
-            log_success "$device_type emulator is ready"
-            return 0
-        fi
-        sleep 2
-        elapsed=$((elapsed + 2))
-
-        # Show progress every 10 seconds
-        if [ $((elapsed % 10)) -eq 0 ]; then
-            log_info "Still waiting... (${elapsed}s elapsed)"
-        fi
-    done
-
-    log_error "Timeout waiting for $device_type emulator to start"
-    return 1
-}
-
-# Detect device type based on screen size
-detect_device_type() {
-    local device_id="$1"
-
-    # Get screen density and size
-    local density=$(adb -s "$device_id" shell wm density | cut -d: -f2 | tr -d ' ')
-    local size=$(adb -s "$device_id" shell wm size | cut -d: -f2 | tr -d ' ')
-
-    # Extract width and height
-    local width=$(echo "$size" | cut -d'x' -f1)
-    local height=$(echo "$size" | cut -d'x' -f2)
-
-    # Calculate diagonal in inches (approximate)
-    local diagonal_pixels=$(echo "sqrt($width*$width + $height*$height)" | bc -l)
-    local diagonal_inches=$(echo "$diagonal_pixels / $density" | bc -l)
-
-    # Convert to integer for comparison
-    local diagonal_int=$(echo "$diagonal_inches" | cut -d'.' -f1)
-
-    if [ "$diagonal_int" -ge 9 ]; then
-        echo "tablet"
-    else
-        echo "phone"
-    fi
-}
-
-# Run Flutter app on specified device
-run_flutter_app() {
-    local device_id="$1"
-    local device_type="$2"
-
-    log_info "Running Flutter app on $device_type ($device_id)"
-
-    cd "$PROJECT_ROOT"
-    flutter run -d "$device_id" --hot &
-    local flutter_pid=$!
-
-    # Wait for app to be installed and launched
-    sleep 30
-
-    # Check if app is running
-    if adb -s "$device_id" shell pm list packages | grep -q "com.edde746.plezy"; then
-        log_success "Flutter app is running on $device_type"
-        return 0
-    else
-        log_error "Failed to start Flutter app on $device_type"
-        return 1
-    fi
-}
-
-# Detect device type based on image dimensions
-detect_device_type() {
-    local image_path="$1"
-
-    local dimensions=$(get_image_dimensions "$image_path")
-    if [ -z "$dimensions" ]; then
-        log_warning "Could not get dimensions for $image_path"
-        echo "phone"  # Default to phone
-        return
-    fi
-
-    local width=$(echo "$dimensions" | cut -d',' -f1)
-    local height=$(echo "$dimensions" | cut -d',' -f2)
-
-    # Determine shorter and longer sides
-    local shorter_side=$((width < height ? width : height))
-    local longer_side=$((width > height ? width : height))
-
-    # Calculate diagonal using shell arithmetic (approximate)
-    # For simplicity, we'll use the shorter side as the main criteria
-    # Tablets typically have shorter side >= 1200px
-    # Phones typically have shorter side < 1200px
-
-    if [ "$shorter_side" -ge 1200 ]; then
-        echo "tablet"
-    else
-        echo "phone"
-    fi
-}
-
-# Organize screenshots into correct fastlane folders
-organize_screenshots() {
-    log_info "Organizing screenshots using ffprobe analysis..."
-
-    # Create directories if they don't exist
-    mkdir -p "$FASTLANE_IMAGES_DIR/phoneScreenshots"
-    mkdir -p "$FASTLANE_IMAGES_DIR/sevenInchScreenshots"
-    mkdir -p "$FASTLANE_IMAGES_DIR/tenInchScreenshots"
-
-    # Find all screenshot files generated by maestro
-    local android_screenshots_dir="$MAESTRO_DIR/android"
-    if [ ! -d "$android_screenshots_dir" ]; then
-        log_warning "No Android screenshots directory found at $android_screenshots_dir"
-        return 1
-    fi
-
-    local screenshots=($(find "$android_screenshots_dir" -name "*.png" | sort))
-
-    if [ ${#screenshots[@]} -eq 0 ]; then
-        log_warning "No Android screenshots found in $android_screenshots_dir"
-        return 1
-    fi
-
-    log_info "Found ${#screenshots[@]} screenshots"
-
-    # Group screenshots by device type
-    local phone_screenshots=()
-    local tablet_screenshots=()
-
-    for screenshot in "${screenshots[@]}"; do
-        local device_type=$(detect_device_type "$screenshot")
-        log_image_info "$screenshot" "$device_type"
-
-        if [ "$device_type" = "tablet" ]; then
-            tablet_screenshots+=("$screenshot")
-        else
-            phone_screenshots+=("$screenshot")
-        fi
-    done
-
-    # Copy and rename phone screenshots
-    local phone_count=1
-    for screenshot in "${phone_screenshots[@]}"; do
-        if [ $phone_count -gt 4 ]; then
-            break  # Limit to 4 screenshots
-        fi
-
-        local target_name="${phone_count}_en-GB.png"
-
-        # Copy to phone directory
-        cp "$screenshot" "$FASTLANE_IMAGES_DIR/phoneScreenshots/$target_name"
-
-        # Copy to seven inch directory (phone screenshots go here too)
-        cp "$screenshot" "$FASTLANE_IMAGES_DIR/sevenInchScreenshots/$target_name"
-
-        log_success "Copied phone screenshot $phone_count: $(basename "$screenshot")"
-        phone_count=$((phone_count + 1))
-    done
-
-    # Copy and rename tablet screenshots
-    local tablet_count=1
-    for screenshot in "${tablet_screenshots[@]}"; do
-        if [ $tablet_count -gt 4 ]; then
-            break  # Limit to 4 screenshots
-        fi
-
-        local target_name="${tablet_count}_en-GB.png"
-        cp "$screenshot" "$FASTLANE_IMAGES_DIR/tenInchScreenshots/$target_name"
-
-        log_success "Copied tablet screenshot $tablet_count: $(basename "$screenshot")"
-        tablet_count=$((tablet_count + 1))
-    done
-
-    log_success "Organized $((phone_count-1)) phone screenshots and $((tablet_count-1)) tablet screenshots"
-}
-
-# Cleanup function
-cleanup() {
-    log_info "Cleaning up..."
-
-    # Kill any running Flutter processes
-    pkill -f "flutter run" 2>/dev/null || true
-
-    # Stop emulators using our function
-    stop_emulators
-
-    log_success "Cleanup completed"
-}
-
-# Main execution
-main() {
-    log_info "Starting Android screenshot automation..."
-
-    # Set up cleanup trap
-    trap cleanup EXIT INT TERM
-
-    # Clean up old screenshots at the very beginning
-    clean_old_screenshots "android ios"
-
-    # Check dependencies
-    check_dependencies
-
-    # Stop any running emulators first
-    stop_emulators
-
-    # Get available AVDs
-    log_info "Getting available Android Virtual Devices..."
-
-    # Store AVDs in an array, handling potential spaces in names
-    local avds_raw=$(get_avds)
-    if [ -z "$avds_raw" ]; then
-        log_error "No Android Virtual Devices found. Please create AVDs first."
-        log_info "Create AVDs using: flutter emulators --create"
-        exit 1
-    fi
-
-    # Convert to array (each line is an AVD)
-    IFS=$'\n' read -d '' -r -a avds <<< "$avds_raw" || true
-
-    log_info "Found ${#avds[@]} Android AVD(s): ${avds[*]}"
-
-    # For now, we'll use the first two AVDs as phone and tablet
-    # In a real scenario, you'd want to specify which AVDs to use
-    local phone_avd="${avds[0]}"
-    local tablet_avd="${avds[1]:-${avds[0]}}"  # Use first AVD if only one available
-
-    if [ ${#avds[@]} -eq 1 ]; then
-        log_warning "Only one AVD available. Using it for both phone and tablet tests."
-    fi
-
-    # Start phone emulator
-    start_emulator "$phone_avd" "phone"
-
-    # Get device ID for phone
-    local phone_device=$(adb devices | grep emulator | head -n1 | cut -f1)
-
-    # Run Flutter app on phone
-    run_flutter_app "$phone_device" "phone"
-
-    # Run maestro tests for phone
-    MAESTRO_DEVICE="$phone_device" run_maestro_tests
-
-    # If we have a different tablet AVD, start it
-    if [ "$phone_avd" != "$tablet_avd" ]; then
-        # Stop phone emulator
-        log_info "Switching from phone to tablet emulator"
-        stop_emulators
-
-        # Start tablet emulator
-        start_emulator "$tablet_avd" "tablet"
-
-        # Get device ID for tablet
-        local tablet_device=$(adb devices | grep emulator | head -n1 | cut -f1)
-
-        # Run Flutter app on tablet
-        run_flutter_app "$tablet_device" "tablet"
-
-        # Run maestro tests for tablet
-        MAESTRO_DEVICE="$tablet_device" run_maestro_tests
-    fi
-
-    # Organize screenshots
-    organize_screenshots
-
-    log_success "Android screenshot automation completed successfully!"
-}
-
-# Run main function if script is executed directly
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main "$@"
-fi
\ No newline at end of file
diff --git a/scripts/ios_screenshots.sh b/scripts/ios_screenshots.sh
deleted file mode 100755
index e70d29f8..00000000
--- a/scripts/ios_screenshots.sh
+++ /dev/null
@@ -1,421 +0,0 @@
-#!/bin/bash
-
-# iOS Screenshot Automation Script
-# Starts simulators, runs Flutter app, executes maestro tests, and organizes screenshots
-
-set -e  # Exit on any error
-
-# Configuration
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
-MAESTRO_DIR="$PROJECT_ROOT/maestro"
-FASTLANE_SCREENSHOTS_DIR="$PROJECT_ROOT/ios/fastlane/screenshots/en-US"
-ENV_FILE="$PROJECT_ROOT/.env"
-
-# Source common screenshot functions
-source "${SCRIPT_DIR}/screenshot_common.sh"
-
-# Check if required tools are installed
-check_dependencies() {
-    # Check common dependencies first
-    if ! check_common_dependencies; then
-        exit 1
-    fi
-
-    log_info "Checking iOS-specific dependencies..."
-
-    if ! command -v xcrun &> /dev/null; then
-        log_error "xcrun is not installed - Xcode is required"
-        exit 1
-    fi
-
-    log_success "All dependencies found"
-}
-
-# Get list of available iOS simulators
-get_simulators() {
-    xcrun simctl list devices available -j | python3 -c "
-import sys, json
-data = json.load(sys.stdin)
-for runtime, devices in data['devices'].items():
-    if 'iOS' in runtime and devices:
-        for device in devices:
-            if device['isAvailable']:
-                print(f\"{device['udid']}|{device['name']}\")
-" 2>/dev/null || echo ""
-}
-
-# Stop all running simulators
-stop_simulators() {
-    log_info "Stopping any running simulators..."
-
-    # Get list of running simulators
-    local running_simulators=$(xcrun simctl list devices | grep "Booted" | grep -oE "[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}" || echo "")
-
-    if [ -n "$running_simulators" ]; then
-        while IFS= read -r simulator; do
-            log_info "Stopping simulator $simulator"
-            xcrun simctl shutdown "$simulator" 2>/dev/null || true
-        done <<< "$running_simulators"
-
-        # Wait for simulators to fully stop
-        log_info "Waiting for simulators to fully shut down..."
-        sleep 3
-        log_success "All simulators stopped"
-    else
-        log_info "No simulators are currently running"
-    fi
-}
-
-# Start simulator and wait for it to be ready
-start_simulator() {
-    local simulator_udid="$1"
-    local simulator_name="$2"
-    local device_type="$3"
-
-    log_info "Starting $device_type simulator: $simulator_name"
-
-    # Double-check if any simulator is still running
-    local running_simulators=$(xcrun simctl list devices | grep "Booted" | grep -oE "[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}" || echo "")
-    if [ -n "$running_simulators" ]; then
-        log_warning "Simulator still running"
-        log_info "Forcing stop before starting new simulator..."
-        stop_simulators
-    fi
-
-    # Start simulator
-    log_info "Launching simulator..."
-    xcrun simctl boot "$simulator_udid" 2>/dev/null || log_warning "Simulator may already be booting"
-
-    log_info "Waiting for $device_type simulator to be ready..."
-
-    # Wait for simulator to boot
-    local timeout=120  # 2 minutes timeout
-    local elapsed=0
-
-    while [ $elapsed -lt $timeout ]; do
-        local state=$(xcrun simctl list devices | grep "$simulator_udid" | grep -oE "(Booted|Shutdown)")
-        if [ "$state" = "Booted" ]; then
-            # Give it a bit more time to fully initialize
-            sleep 5
-            log_success "$device_type simulator is ready"
-            return 0
-        fi
-        sleep 2
-        elapsed=$((elapsed + 2))
-
-        # Show progress every 10 seconds
-        if [ $((elapsed % 10)) -eq 0 ]; then
-            log_info "Still waiting... (${elapsed}s elapsed)"
-        fi
-    done
-
-    log_error "Timeout waiting for $device_type simulator to start"
-    return 1
-}
-
-# Rotate simulator to landscape
-rotate_simulator_landscape() {
-    local simulator_udid="$1"
-
-    log_info "Rotating simulator to landscape orientation..."
-
-    # Open Simulator app and bring it to front
-    open -a Simulator
-    sleep 2
-
-    # Use AppleScript to send rotation keyboard shortcut (Cmd+Left arrow rotates counterclockwise)
-    # Key code 123 is left arrow
-    osascript -e 'tell application "Simulator" to activate' \
-              -e 'tell application "System Events" to key code 123 using command down'
-
-    sleep 2
-    log_success "Simulator rotated to landscape"
-}
-
-# Detect device type based on image dimensions for iOS
-detect_ios_device_type() {
-    local image_path="$1"
-
-    local dimensions=$(get_image_dimensions "$image_path")
-    if [ -z "$dimensions" ]; then
-        log_warning "Could not get dimensions for $image_path"
-        echo "iphone_6_5"  # Default
-        return
-    fi
-
-    local width=$(echo "$dimensions" | cut -d',' -f1)
-    local height=$(echo "$dimensions" | cut -d',' -f2)
-
-    # Determine shorter and longer sides (for portrait orientation)
-    local shorter_side=$((width < height ? width : height))
-    local longer_side=$((width > height ? width : height))
-
-    # iOS App Store screenshot sizes (based on shorter side in portrait)
-    # Reference: https://help.apple.com/app-store-connect/#/devd274dd925
-
-    # iPad Pro 12.9" (3rd gen and later): 2048 x 2732
-    if [ "$shorter_side" -ge 2000 ] && [ "$longer_side" -ge 2700 ]; then
-        echo "ipad_pro_12_9_3rd_gen"
-    # iPad Pro 12.9" (2nd gen): 2048 x 2732
-    elif [ "$shorter_side" -ge 2000 ] && [ "$longer_side" -ge 2700 ]; then
-        echo "ipad_pro_12_9_2nd_gen"
-    # iPhone 6.9" display (iPhone Air Pro Max, 16 Pro Max, etc.): 1320 x 2868
-    elif [ "$shorter_side" -ge 1300 ] && [ "$longer_side" -ge 2800 ]; then
-        echo "iphone_6_9"
-    # iPhone 6.7" display (iPhone 14 Pro Max, etc.): 1290 x 2796
-    elif [ "$shorter_side" -ge 1250 ] && [ "$longer_side" -ge 2700 ]; then
-        echo "iphone_6_7"
-    # iPhone 6.3" display (iPhone 17, 16 Pro, 15 Pro, 14 Pro): 1206 x 2622
-    elif [ "$shorter_side" -ge 1200 ] && [ "$shorter_side" -lt 1242 ] && [ "$longer_side" -ge 2600 ] && [ "$longer_side" -lt 2688 ]; then
-        echo "iphone_6_3"
-    # iPhone 6.5" display (iPhone 14 Plus, 13 Pro Max, 11 Pro Max, XS Max, etc.): 1242 x 2688 or 1284 x 2778
-    elif [ "$shorter_side" -ge 1200 ] && [ "$longer_side" -ge 2600 ]; then
-        echo "iphone_6_5"
-    # iPhone 5.5" display (iPhone 8 Plus, etc.): 1242 x 2208
-    elif [ "$shorter_side" -ge 1200 ] && [ "$longer_side" -ge 2200 ]; then
-        echo "iphone_5_5"
-    else
-        # Default to 6.5" for unknown iPhone sizes
-        echo "iphone_6_5"
-    fi
-}
-
-# Run Flutter app on specified device
-run_flutter_app() {
-    local device_id="$1"
-    local device_type="$2"
-
-    log_info "Running Flutter app on $device_type ($device_id)"
-
-    cd "$PROJECT_ROOT"
-    flutter run -d "$device_id" --hot &
-    local flutter_pid=$!
-
-    # Wait for app to be installed and launched
-    log_info "Waiting for Flutter app to launch..."
-    sleep 40  # iOS typically takes longer to launch
-
-    # Check if simulator is still running
-    local state=$(xcrun simctl list devices | grep "$device_id" | grep -oE "(Booted|Shutdown)")
-    if [ "$state" = "Booted" ]; then
-        log_success "Flutter app should be running on $device_type"
-        return 0
-    else
-        log_error "Simulator not running anymore"
-        return 1
-    fi
-}
-
-# Map device type to fastlane naming convention
-get_fastlane_device_name() {
-    local device_type="$1"
-
-    case "$device_type" in
-        ipad_pro_12_9_3rd_gen|ipad_pro_12_9_2nd_gen)
-            echo "IPAD_PRO_3GEN_129"
-            ;;
-        iphone_6_9)
-            echo "IPHONE_69"
-            ;;
-        iphone_6_7)
-            echo "IPHONE_67"
-            ;;
-        iphone_6_5)
-            echo "IPHONE_65"
-            ;;
-        iphone_6_3)
-            echo "IPHONE_63"
-            ;;
-        iphone_5_5)
-            echo "IPHONE_55"
-            ;;
-        *)
-            echo "IPHONE_67"  # Default to 6.7"
-            ;;
-    esac
-}
-
-# Organize screenshots into correct fastlane folders
-organize_screenshots() {
-    log_info "Organizing screenshots using ffprobe analysis..."
-
-    # Ensure target directory exists
-    mkdir -p "$FASTLANE_SCREENSHOTS_DIR"
-
-    # Find all screenshot files generated by maestro
-    local ios_screenshots_dir="$MAESTRO_DIR/ios"
-    if [ ! -d "$ios_screenshots_dir" ]; then
-        log_warning "No iOS screenshots directory found at $ios_screenshots_dir"
-        return 1
-    fi
-
-    local screenshots=($(find "$ios_screenshots_dir" -name "*.png" | sort))
-
-    if [ ${#screenshots[@]} -eq 0 ]; then
-        log_warning "No iOS screenshots found in $ios_screenshots_dir"
-        return 1
-    fi
-
-    log_info "Found ${#screenshots[@]} screenshots"
-
-    # First pass: detect and log all device types
-    local device_types=()
-    for screenshot in "${screenshots[@]}"; do
-        local device_type=$(detect_ios_device_type "$screenshot")
-        log_image_info "$screenshot" "$device_type"
-
-        # Add to device_types if not already present
-        local found=0
-        for dt in "${device_types[@]}"; do
-            if [ "$dt" = "$device_type" ]; then
-                found=1
-                break
-            fi
-        done
-        if [ $found -eq 0 ]; then
-            device_types+=("$device_type")
-        fi
-    done
-
-    # Second pass: copy and rename screenshots for each device type
-    for device_type in "${device_types[@]}"; do
-        local fastlane_name=$(get_fastlane_device_name "$device_type")
-        local count=0
-
-        for screenshot in "${screenshots[@]}"; do
-            local detected_type=$(detect_ios_device_type "$screenshot")
-
-            # Only process screenshots matching this device type
-            if [ "$detected_type" = "$device_type" ]; then
-                # Format: {index}_APP_{DEVICE_TYPE}_{index}.png
-                local target_name="${count}_APP_${fastlane_name}_${count}.png"
-                cp "$screenshot" "$FASTLANE_SCREENSHOTS_DIR/$target_name"
-
-                log_success "Copied $device_type screenshot: $(basename "$screenshot") -> $target_name"
-                count=$((count + 1))
-            fi
-        done
-    done
-
-    log_success "Screenshot organization completed"
-}
-
-# Cleanup function
-cleanup() {
-    log_info "Cleaning up..."
-
-    # Kill any running Flutter processes
-    pkill -f "flutter run" 2>/dev/null || true
-
-    # Stop simulators
-    stop_simulators
-
-    log_success "Cleanup completed"
-}
-
-# Main execution
-main() {
-    log_info "Starting iOS screenshot automation..."
-
-    # Set up cleanup trap
-    trap cleanup EXIT INT TERM
-
-    # Clean up old screenshots at the very beginning
-    clean_old_screenshots "ios"
-
-    # Clean up old fastlane screenshots to prevent mixing old/new with different naming
-    log_info "Cleaning old fastlane screenshots..."
-    if [ -d "$FASTLANE_SCREENSHOTS_DIR" ]; then
-        rm -rf "$FASTLANE_SCREENSHOTS_DIR"/*
-        log_success "Fastlane screenshots directory cleaned"
-    fi
-
-    # Check dependencies
-    check_dependencies
-
-    # Stop any running simulators first
-    stop_simulators
-
-    # Get available simulators
-    log_info "Getting available iOS Simulators..."
-
-    local simulators_raw=$(get_simulators)
-    if [ -z "$simulators_raw" ]; then
-        log_error "No iOS Simulators found. Please install simulators via Xcode."
-        exit 1
-    fi
-
-    # Parse simulators into arrays
-    declare -a simulator_udids
-    declare -a simulator_names
-
-    while IFS='|' read -r udid name; do
-        simulator_udids+=("$udid")
-        simulator_names+=("$name")
-    done <<< "$simulators_raw"
-
-    log_info "Found ${#simulator_udids[@]} iOS Simulator(s)"
-
-    # Find iPhone Air and iPad Pro 13" simulators
-    local iphone_idx=-1
-    local ipad_idx=-1
-
-    for i in "${!simulator_names[@]}"; do
-        if [[ "${simulator_names[$i]}" =~ iPhone\ Air ]] && [ $iphone_idx -eq -1 ]; then
-            iphone_idx=$i
-            log_info "Found iPhone Air: ${simulator_names[$i]}"
-        elif [[ "${simulator_names[$i]}" =~ iPad.*13 ]] && [ $ipad_idx -eq -1 ]; then
-            ipad_idx=$i
-            log_info "Found iPad Pro 13\": ${simulator_names[$i]}"
-        fi
-    done
-
-    if [ $iphone_idx -eq -1 ]; then
-        log_error "iPhone Air simulator not found. Please create it in Xcode."
-        exit 1
-    fi
-
-    if [ $ipad_idx -eq -1 ]; then
-        log_error "iPad Pro 13\" simulator not found. Please create it in Xcode."
-        exit 1
-    fi
-
-    log_info "Using iPhone: ${simulator_names[$iphone_idx]}"
-    log_info "Using iPad: ${simulator_names[$ipad_idx]}"
-
-    # Start iPhone Air simulator
-    start_simulator "${simulator_udids[$iphone_idx]}" "${simulator_names[$iphone_idx]}" "iPhone Air"
-
-    # Run Flutter app on iPhone Air
-    run_flutter_app "${simulator_udids[$iphone_idx]}" "iPhone Air"
-
-    # Run maestro tests for iPhone Air
-    run_maestro_tests "${simulator_udids[$iphone_idx]}"
-
-    # Stop iPhone simulator and switch to iPad
-    log_info "Switching from iPhone Air to iPad Pro 13\" simulator"
-    stop_simulators
-
-    # Start iPad Pro 13" simulator
-    start_simulator "${simulator_udids[$ipad_idx]}" "${simulator_names[$ipad_idx]}" "iPad Pro 13\""
-
-    # Rotate iPad to landscape
-    # rotate_simulator_landscape "${simulator_udids[$ipad_idx]}"
-
-    # Run Flutter app on iPad
-    run_flutter_app "${simulator_udids[$ipad_idx]}" "iPad Pro 13\""
-
-    # Run maestro tests for iPad
-    run_maestro_tests "${simulator_udids[$ipad_idx]}"
-
-    # Organize screenshots
-    organize_screenshots
-
-    log_success "iOS screenshot automation completed successfully!"
-}
-
-# Run main function if script is executed directly
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main "$@"
-fi
diff --git a/scripts/screenshot_common.sh b/scripts/screenshot_common.sh
deleted file mode 100755
index c726bc38..00000000
--- a/scripts/screenshot_common.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-
-# Screenshot Automation Common Functions
-# Shared functionality between Android and iOS screenshot scripts
-
-# This script should be sourced, not executed directly
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    echo "This script should be sourced, not executed directly"
-    exit 1
-fi
-
-# Configuration - these should be set before sourcing this file, but defaults provided
-SCRIPT_DIR="${SCRIPT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
-PROJECT_ROOT="${PROJECT_ROOT:-$(dirname "$SCRIPT_DIR")}"
-MAESTRO_DIR="${MAESTRO_DIR:-$PROJECT_ROOT/maestro}"
-ENV_FILE="${ENV_FILE:-$PROJECT_ROOT/.env}"
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Logging functions
-log_info() {
-    echo -e "${BLUE}[INFO]${NC} $1"
-}
-
-log_success() {
-    echo -e "${GREEN}[SUCCESS]${NC} $1"
-}
-
-log_warning() {
-    echo -e "${YELLOW}[WARNING]${NC} $1"
-}
-
-log_error() {
-    echo -e "${RED}[ERROR]${NC} $1"
-}
-
-# Check common dependencies (flutter, maestro, dotenv, ffprobe)
-check_common_dependencies() {
-    log_info "Checking common dependencies..."
-
-    local all_found=true
-
-    if ! command -v flutter &> /dev/null; then
-        log_error "Flutter is not installed or not in PATH"
-        all_found=false
-    fi
-
-    if ! command -v maestro &> /dev/null; then
-        log_error "Maestro is not installed or not in PATH"
-        all_found=false
-    fi
-
-    if ! command -v dotenv &> /dev/null; then
-        log_error "dotenv is not installed or not in PATH"
-        all_found=false
-    fi
-
-    if ! command -v ffprobe &> /dev/null; then
-        log_error "ffprobe is not installed or not in PATH (part of ffmpeg)"
-        all_found=false
-    fi
-
-    if [ "$all_found" = false ]; then
-        return 1
-    fi
-
-    log_success "Common dependencies found"
-    return 0
-}
-
-# Get image dimensions using ffprobe
-get_image_dimensions() {
-    local image_path="$1"
-    ffprobe -v quiet -select_streams v:0 -show_entries stream=width,height -of csv=p=0 "$image_path" 2>/dev/null
-}
-
-# Log image information for debugging
-log_image_info() {
-    local image_path="$1"
-    local device_type="$2"
-
-    local dimensions=$(get_image_dimensions "$image_path")
-    local filename=$(basename "$image_path")
-
-    if [ -n "$dimensions" ]; then
-        local width=$(echo "$dimensions" | cut -d',' -f1)
-        local height=$(echo "$dimensions" | cut -d',' -f2)
-        log_info "Screenshot: $filename - ${width}x${height} - $device_type"
-    else
-        log_warning "Could not analyze: $filename - assuming $device_type"
-    fi
-}
-
-# Clean up old maestro screenshots for specified platform(s)
-# Usage: clean_old_screenshots "android" or clean_old_screenshots "ios" or clean_old_screenshots "android ios"
-clean_old_screenshots() {
-    local platforms="$1"
-
-    log_info "Cleaning up old screenshots..."
-
-    for platform in $platforms; do
-        local platform_dir="$MAESTRO_DIR/$platform"
-
-        if [ -d "$platform_dir" ]; then
-            local old_count=$(find "$platform_dir" -name "*.png" 2>/dev/null | wc -l)
-            if [ "$old_count" -gt 0 ]; then
-                log_info "Removing $old_count old screenshot(s) from maestro/$platform/"
-                rm -f "$platform_dir"/*.png
-            else
-                log_info "No old screenshots found in maestro/$platform/"
-            fi
-        else
-            log_info "No $platform screenshot directory found"
-        fi
-    done
-
-    log_success "Screenshot cleanup completed"
-}
-
-# Execute maestro tests
-# Usage: run_maestro_tests [device_id]
-run_maestro_tests() {
-    local device_id="${1:-}"
-
-    if [ -n "$device_id" ]; then
-        log_info "Running maestro screenshot tests on device $device_id..."
-    else
-        log_info "Running maestro screenshot tests..."
-    fi
-
-    # Check if .env file exists
-    if [ ! -f "$ENV_FILE" ]; then
-        log_error "Environment file not found at $ENV_FILE"
-        log_info "Please create a .env file with required Maestro variables"
-        return 1
-    fi
-
-    log_info "Using environment file: $ENV_FILE"
-    cd "$MAESTRO_DIR"
-
-    # Run maestro tests with optional device specification
-    if [ -n "$device_id" ]; then
-        log_info "Executing: MAESTRO_DEVICE=$device_id dotenv -f $ENV_FILE run maestro test screenshots.yaml"
-        MAESTRO_DEVICE="$device_id" dotenv -f "$ENV_FILE" run maestro test screenshots.yaml
-    else
-        log_info "Executing: dotenv -f $ENV_FILE run maestro test screenshots.yaml"
-        dotenv -f "$ENV_FILE" run maestro test screenshots.yaml
-    fi
-
-    local maestro_exit_code=$?
-    if [ $maestro_exit_code -eq 0 ]; then
-        log_success "Maestro tests completed successfully"
-        return 0
-    else
-        log_error "Maestro tests failed with exit code $maestro_exit_code"
-        return 1
-    fi
-}
-
-# Run Flutter app on specified device
-# Platform-specific validation should be done in the calling script
-run_flutter_app() {
-    local device_id="$1"
-    local device_type="$2"
-    local wait_time="${3:-30}"  # Optional wait time, default 30s
-
-    log_info "Running Flutter app on $device_type ($device_id)"
-
-    cd "$PROJECT_ROOT"
-    flutter run -d "$device_id" --hot &
-    local flutter_pid=$!
-
-    # Wait for app to be installed and launched
-    log_info "Waiting for Flutter app to launch..."
-    sleep "$wait_time"
-
-    log_success "Flutter app should be running on $device_type"
-    return 0
-}
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
index 3d42510d..b2d25f79 100644
--- a/windows/CMakeLists.txt
+++ b/windows/CMakeLists.txt
@@ -2,6 +2,18 @@
 cmake_minimum_required(VERSION 3.14)
 project(plezy LANGUAGES CXX)
 
+# Download and extract mpv-dev
+include(FetchContent)
+FetchContent_Declare(
+  mpv_dev
+  URL https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20251201/mpv-dev-x86_64-v3-20251201-git-72dbcf1.7z
+  DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+)
+FetchContent_MakeAvailable(mpv_dev)
+
+set(MPV_INCLUDE_DIR "${mpv_dev_SOURCE_DIR}/include")
+set(MPV_LIB_DIR "${mpv_dev_SOURCE_DIR}")
+
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
 set(BINARY_NAME "plezy")
@@ -106,3 +118,8 @@ install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
 install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
   CONFIGURATIONS Profile;Release
   COMPONENT Runtime)
+
+# Install mpv DLL
+install(FILES "${MPV_LIB_DIR}/libmpv-2.dll"
+  DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 4e0884f2..6f4f5bcb 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,30 +6,30 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <gamepads_windows/gamepads_windows_plugin_c_api.h>
 #include <hotkey_manager_windows/hotkey_manager_windows_plugin_c_api.h>
-#include <media_kit_libs_windows_video/media_kit_libs_windows_video_plugin_c_api.h>
-#include <media_kit_video/media_kit_video_plugin_c_api.h>
 #include <os_media_controls/os_media_controls_plugin_c_api.h>
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
+#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
-#include <volume_controller/volume_controller_plugin_c_api.h>
 #include <window_manager/window_manager_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+  GamepadsWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("GamepadsWindowsPluginCApi"));
   HotkeyManagerWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("HotkeyManagerWindowsPluginCApi"));
-  MediaKitLibsWindowsVideoPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("MediaKitLibsWindowsVideoPluginCApi"));
-  MediaKitVideoPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("MediaKitVideoPluginCApi"));
   OsMediaControlsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("OsMediaControlsPluginCApi"));
   ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
+  Sqlite3FlutterLibsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
-  VolumeControllerPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("VolumeControllerPluginCApi"));
   WindowManagerPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("WindowManagerPlugin"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index adfebedf..bcb19105 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,13 +3,13 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus
+  gamepads_windows
   hotkey_manager_windows
-  media_kit_libs_windows_video
-  media_kit_video
   os_media_controls
   screen_retriever_windows
+  sqlite3_flutter_libs
   url_launcher_windows
-  volume_controller
   window_manager
 )
 
diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt
index 394917c0..782241b8 100644
--- a/windows/runner/CMakeLists.txt
+++ b/windows/runner/CMakeLists.txt
@@ -11,6 +11,11 @@ add_executable(${BINARY_NAME} WIN32
   "main.cpp"
   "utils.cpp"
   "win32_window.cpp"
+  "mpv/utils.cpp"
+  "mpv/mpv_container.cpp"
+  "mpv/mpv_core.cpp"
+  "mpv/mpv_player.cpp"
+  "mpv/mpv_plugin.cpp"
   "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
   "Runner.rc"
   "runner.exe.manifest"
@@ -32,9 +37,12 @@ target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
 
 # Add dependency libraries and include directories. Add any application-specific
 # dependencies here.
-target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
-target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
+target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app flutter_wrapper_plugin)
+target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib" "comctl32.lib")
+target_link_libraries(${BINARY_NAME} PRIVATE "${MPV_LIB_DIR}/libmpv.dll.a")
 target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
+target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(${BINARY_NAME} PRIVATE "${MPV_INCLUDE_DIR}")
 
 # Run the Flutter tool portions of the build. This must not be removed.
 add_dependencies(${BINARY_NAME} flutter_assemble)
diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
index 6947dcae..265245f9 100644
--- a/windows/runner/Runner.rc
+++ b/windows/runner/Runner.rc
@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "com.example" "\0"
+            VALUE "CompanyName", "com.edde746" "\0"
             VALUE "FileDescription", "Plezy" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "Plezy" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2025 edde746. All rights reserved." "\0"
             VALUE "OriginalFilename", "Plezy.exe" "\0"
             VALUE "ProductName", "Plezy" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
index 955ee303..2419628d 100644
--- a/windows/runner/flutter_window.cpp
+++ b/windows/runner/flutter_window.cpp
@@ -3,6 +3,7 @@
 #include <optional>
 
 #include "flutter/generated_plugin_registrant.h"
+#include "mpv/mpv_plugin.h"
 
 FlutterWindow::FlutterWindow(const flutter::DartProject& project)
     : project_(project) {}
@@ -25,6 +26,13 @@ bool FlutterWindow::OnCreate() {
     return false;
   }
   RegisterPlugins(flutter_controller_->engine());
+
+  // Register mpv player plugin.
+  OutputDebugStringA("FlutterWindow: About to register MpvPlayerPlugin\n");
+  MpvPlayerPluginRegisterWithRegistrar(
+      flutter_controller_->engine()->GetRegistrarForPlugin("MpvPlayerPlugin"));
+  OutputDebugStringA("FlutterWindow: MpvPlayerPlugin registered\n");
+
   SetChildContent(flutter_controller_->view()->GetNativeWindow());
 
   flutter_controller_->engine()->SetNextFrameCallback([&]() {
diff --git a/windows/runner/mpv/mpv_container.cpp b/windows/runner/mpv/mpv_container.cpp
new file mode 100644
index 00000000..ca7dcd18
--- /dev/null
+++ b/windows/runner/mpv/mpv_container.cpp
@@ -0,0 +1,158 @@
+#include "mpv_container.h"
+
+#include <ShObjIdl.h>
+#include <dwmapi.h>
+#include <fstream>
+
+#include "mpv_core.h"
+#include "utils.h"
+
+static void LogToFile(const char* message) {
+  std::ofstream log("C:\\Users\\admin\\mpv_debug.log", std::ios::app);
+  if (log.is_open()) {
+    log << message << std::endl;
+    log.close();
+  }
+  OutputDebugStringA(message);
+  OutputDebugStringA("\n");
+}
+
+namespace mpv {
+
+MpvContainer* MpvContainer::GetInstance() { return instance_.get(); }
+
+HWND MpvContainer::Create() {
+  LogToFile("MpvContainer::Create called");
+
+  auto window_class = WNDCLASSEX{};
+  ::SecureZeroMemory(&window_class, sizeof(window_class));
+  window_class.cbSize = sizeof(window_class);
+  // Don't use CS_DROPSHADOW, and avoid redraw styles that might cause issues
+  window_class.style = 0;
+  window_class.lpfnWndProc = WindowProc;
+  window_class.hInstance = GetModuleHandle(nullptr);
+  window_class.lpszClassName = kClassName;
+  window_class.hCursor = ::LoadCursorW(nullptr, IDC_ARROW);
+  window_class.hbrBackground = ::CreateSolidBrush(RGB(0, 0, 0));
+
+  ATOM atom = ::RegisterClassExW(&window_class);
+  char msg[256];
+  snprintf(msg, sizeof(msg), "MpvContainer::Create - RegisterClassExW returned: %d", atom);
+  LogToFile(msg);
+
+  // Use WS_POPUP for a borderless window without title bar.
+  // Use WS_EX_TOOLWINDOW | WS_EX_NOREDIRECTIONBITMAP to prevent shadow and DWM effects.
+  handle_ = ::CreateWindowExW(
+      WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE | WS_EX_NOREDIRECTIONBITMAP,
+      kClassName, kWindowName, WS_POPUP,
+      0, 0, 100, 100, nullptr, nullptr,
+      GetModuleHandle(nullptr), nullptr);
+
+  if (!handle_) {
+    DWORD error = GetLastError();
+    snprintf(msg, sizeof(msg), "MpvContainer::Create - CreateWindow failed with error %lu", error);
+    LogToFile(msg);
+  } else {
+    snprintf(msg, sizeof(msg), "MpvContainer::Create - handle_: %p", handle_);
+    LogToFile(msg);
+  }
+
+  // Disable DWM animations on the container.
+  auto disable_window_transitions = TRUE;
+  DwmSetWindowAttribute(handle_, DWMWA_TRANSITIONS_FORCEDISABLED,
+                        &disable_window_transitions,
+                        sizeof(disable_window_transitions));
+
+  return handle_;
+}
+
+HWND MpvContainer::Get(HWND flutter_window) {
+  LogToFile("MpvContainer::Get called");
+  char msg[256];
+  snprintf(msg, sizeof(msg), "MpvContainer::Get - flutter_window: %p, handle_: %p", flutter_window, handle_);
+  LogToFile(msg);
+
+  if (!handle_) {
+    LogToFile("MpvContainer::Get - handle_ is null, calling Create()");
+    Create();
+  }
+
+  RECT window_rect;
+  ::GetWindowRect(flutter_window, &window_rect);
+  snprintf(msg, sizeof(msg), "MpvContainer::Get - window_rect: %ld,%ld,%ld,%ld",
+           window_rect.left, window_rect.top, window_rect.right, window_rect.bottom);
+  LogToFile(msg);
+
+  ::SetWindowPos(handle_, flutter_window, window_rect.left, window_rect.top,
+                 window_rect.right - window_rect.left,
+                 window_rect.bottom - window_rect.top, SWP_NOACTIVATE);
+  ::SetWindowLongPtr(handle_, GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(flutter_window));
+
+  // Remove taskbar entry using ITaskbarList3.
+  ITaskbarList3* taskbar = nullptr;
+  HRESULT hr = ::CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER,
+                                  IID_PPV_ARGS(&taskbar));
+  if (SUCCEEDED(hr) && taskbar) {
+    taskbar->DeleteTab(handle_);
+    taskbar->Release();
+  }
+
+  ::ShowWindow(handle_, SW_SHOWNOACTIVATE);
+  ::SetFocus(flutter_window);
+
+  snprintf(msg, sizeof(msg), "MpvContainer::Get - returning handle_: %p", handle_);
+  LogToFile(msg);
+  return handle_;
+}
+
+LRESULT CALLBACK MpvContainer::WindowProc(HWND const window,
+                                          UINT const message,
+                                          WPARAM const wparam,
+                                          LPARAM const lparam) noexcept {
+  switch (message) {
+    case WM_DESTROY: {
+      ::PostQuitMessage(0);
+      return 0;
+    }
+    case WM_MOUSEMOVE: {
+      // Redirect focus to Flutter window.
+      auto* core = MpvCore::GetInstance();
+      if (core) {
+        core->SetHitTestBehavior(0);
+      }
+      auto user_data = ::GetWindowLongPtr(window, GWLP_USERDATA);
+      if (user_data) {
+        ::SetForegroundWindow(reinterpret_cast<HWND>(user_data));
+      }
+      break;
+    }
+    case WM_ERASEBKGND: {
+      // Prevent erasing to avoid flicker.
+      return 1;
+    }
+    case WM_SIZE:
+    case WM_MOVE:
+    case WM_MOVING:
+    case WM_ACTIVATE:
+    case WM_WINDOWPOSCHANGED: {
+      auto* core = MpvCore::GetInstance();
+      if (core) {
+        core->SetHitTestBehavior(0);
+      }
+      auto user_data = ::GetWindowLongPtr(window, GWLP_USERDATA);
+      if (user_data) {
+        ::SetForegroundWindow(reinterpret_cast<HWND>(user_data));
+      }
+      break;
+    }
+    default:
+      break;
+  }
+  return ::DefWindowProc(window, message, wparam, lparam);
+}
+
+std::unique_ptr<MpvContainer> MpvContainer::instance_ =
+    std::make_unique<MpvContainer>();
+
+}  // namespace mpv
diff --git a/windows/runner/mpv/mpv_container.h b/windows/runner/mpv/mpv_container.h
new file mode 100644
index 00000000..1def5696
--- /dev/null
+++ b/windows/runner/mpv/mpv_container.h
@@ -0,0 +1,44 @@
+#ifndef MPV_CONTAINER_H_
+#define MPV_CONTAINER_H_
+
+#include <Windows.h>
+
+#include <memory>
+
+namespace mpv {
+
+// Forward declaration
+class MpvCore;
+
+// Container window that holds the mpv video window behind Flutter.
+// This is a singleton that creates a hidden window with no taskbar entry.
+class MpvContainer {
+ public:
+  static MpvContainer* GetInstance();
+
+  MpvContainer() = default;
+
+  // Creates the container window.
+  HWND Create();
+
+  // Gets the container window handle, positioning it relative to the Flutter window.
+  HWND Get(HWND flutter_window);
+
+  // Returns the raw handle.
+  HWND handle() const { return handle_; }
+
+ private:
+  static LRESULT CALLBACK WindowProc(HWND window, UINT message, WPARAM wparam,
+                                     LPARAM lparam) noexcept;
+
+  HWND handle_ = nullptr;
+
+  static constexpr wchar_t kClassName[] = L"MPV_CONTAINER";
+  static constexpr wchar_t kWindowName[] = L"";
+
+  static std::unique_ptr<MpvContainer> instance_;
+};
+
+}  // namespace mpv
+
+#endif  // MPV_CONTAINER_H_
diff --git a/windows/runner/mpv/mpv_core.cpp b/windows/runner/mpv/mpv_core.cpp
new file mode 100644
index 00000000..3f57a065
--- /dev/null
+++ b/windows/runner/mpv/mpv_core.cpp
@@ -0,0 +1,259 @@
+#include "mpv_core.h"
+
+#include <fstream>
+
+#include "mpv_container.h"
+#include "utils.h"
+
+static void LogToFile(const char* message) {
+  std::ofstream log("C:\\Users\\admin\\mpv_debug.log", std::ios::app);
+  if (log.is_open()) {
+    log << message << std::endl;
+    log.close();
+  }
+  OutputDebugStringA(message);
+  OutputDebugStringA("\n");
+}
+
+namespace mpv {
+
+MpvCore* MpvCore::GetInstance() { return instance_.get(); }
+
+void MpvCore::SetInstance(std::unique_ptr<MpvCore> instance) {
+  instance_ = std::move(instance);
+}
+
+std::optional<int32_t> MpvCore::GetProcId() { return proc_id_; }
+
+void MpvCore::SetProcId(std::optional<int32_t> proc_id) { proc_id_ = proc_id; }
+
+MpvCore::MpvCore(HWND flutter_window, HWND flutter_child_window)
+    : flutter_window_(flutter_window),
+      flutter_child_window_(flutter_child_window) {}
+
+MpvCore::~MpvCore() {
+  // Close all mpv views.
+  for (const auto& [mpv_view, rect] : mpv_views_) {
+    ::SendMessage(mpv_view, WM_CLOSE, 0, 0);
+  }
+  mpv_views_.clear();
+}
+
+void MpvCore::EnsureInitialized() {
+  LogToFile("MpvCore::EnsureInitialized called");
+  char msg[256];
+  snprintf(msg, sizeof(msg), "MpvCore::EnsureInitialized - flutter_window_: %p", flutter_window_);
+  LogToFile(msg);
+
+  // Enable per-pixel transparency on Flutter window.
+  LogToFile("MpvCore::EnsureInitialized - calling SetWindowComposition");
+  SetWindowComposition(flutter_window_, 6, 0);
+
+  LogToFile("MpvCore::EnsureInitialized - getting container");
+  container_ = MpvContainer::GetInstance()->Get(flutter_window_);
+
+  snprintf(msg, sizeof(msg), "MpvCore::EnsureInitialized - container: %p", container_);
+  LogToFile(msg);
+}
+
+void MpvCore::CreateMpvView(HWND mpv_hwnd, RECT rect,
+                            double device_pixel_ratio) {
+  ::SetParent(mpv_hwnd, container_);
+  ::ShowWindow(mpv_hwnd, SW_SHOW);
+
+  // Remove window decorations.
+  auto style = ::GetWindowLongPtr(mpv_hwnd, GWL_STYLE);
+  style &= ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX |
+             WS_EX_APPWINDOW);
+  ::SetWindowLongPtr(mpv_hwnd, GWL_STYLE, style);
+
+  device_pixel_ratio_ = device_pixel_ratio;
+  mpv_views_[mpv_hwnd] = rect;
+
+  // Position the mpv view behind the Flutter window.
+  auto global_rect =
+      GetGlobalRect(rect.left, rect.top, rect.right, rect.bottom);
+  ::SetWindowPos(mpv_hwnd, flutter_window_, global_rect.left, global_rect.top,
+                 global_rect.right - global_rect.left,
+                 global_rect.bottom - global_rect.top, SWP_NOACTIVATE);
+}
+
+void MpvCore::ResizeMpvView(HWND mpv_hwnd, RECT rect) {
+  mpv_views_[mpv_hwnd] = rect;
+  auto global_rect =
+      GetGlobalRect(rect.left, rect.top, rect.right, rect.bottom);
+  // Use MoveWindow to trigger redraw.
+  ::MoveWindow(mpv_hwnd, global_rect.left, global_rect.top,
+               global_rect.right - global_rect.left,
+               global_rect.bottom - global_rect.top, TRUE);
+}
+
+void MpvCore::DisposeMpvView(HWND mpv_hwnd) {
+  ::SendMessage(mpv_hwnd, WM_CLOSE, 0, 0);
+  mpv_views_.erase(mpv_hwnd);
+}
+
+void MpvCore::SetHitTestBehavior(int32_t hittest_behavior) {
+  LONG ex_style = ::GetWindowLong(flutter_window_, GWL_EXSTYLE);
+  if (hittest_behavior) {
+    ex_style |= (WS_EX_TRANSPARENT | WS_EX_LAYERED);
+  } else {
+    ex_style &= ~(WS_EX_TRANSPARENT | WS_EX_LAYERED);
+  }
+  ::SetWindowLong(flutter_window_, GWL_EXSTYLE, ex_style);
+}
+
+void MpvCore::SetVisible(bool visible) {
+  char msg[256];
+  snprintf(msg, sizeof(msg), "MpvCore::SetVisible - visible: %d, container_: %p", visible, container_);
+  LogToFile(msg);
+
+  visible_ = visible;
+  if (container_) {
+    if (visible) {
+      SetWindowComposition(flutter_window_, 6, 0);
+      ::ShowWindow(container_, SW_SHOWNOACTIVATE);
+      LogToFile("MpvCore::SetVisible - showed container, set composition to 6");
+    } else {
+      SetWindowComposition(flutter_window_, 0, 0);
+      ::ShowWindow(container_, SW_HIDE);
+      LogToFile("MpvCore::SetVisible - hid container, set composition to 0");
+    }
+  }
+}
+
+std::optional<HRESULT> MpvCore::WindowProc(HWND hwnd, UINT message,
+                                           WPARAM wparam, LPARAM lparam) {
+  switch (message) {
+    case WM_ACTIVATE: {
+      RECT window_rect;
+      ::GetWindowRect(flutter_window_, &window_rect);
+      // Position container behind Flutter window.
+      ::SetWindowPos(container_, flutter_window_, window_rect.left,
+                     window_rect.top, window_rect.right - window_rect.left,
+                     window_rect.bottom - window_rect.top, SWP_NOACTIVATE);
+      break;
+    }
+    case WM_SIZE: {
+      char msg[256];
+      snprintf(msg, sizeof(msg), "WM_SIZE - wparam: %llu, last: %llu, visible_: %d, was_hidden: %d",
+               (unsigned long long)wparam, (unsigned long long)last_wm_size_wparam_,
+               visible_, was_window_hidden_due_to_minimize_);
+      LogToFile(msg);
+
+      // Handle Windows's minimize & maximize animations properly.
+      // During these transitions, we hide the container and make Flutter opaque,
+      // then restore after the animation completes.
+      if (wparam != SIZE_RESTORED || last_wm_size_wparam_ == SIZE_MINIMIZED ||
+          last_wm_size_wparam_ == SIZE_MAXIMIZED ||
+          was_window_hidden_due_to_minimize_) {
+        was_window_hidden_due_to_minimize_ = false;
+        SetWindowComposition(flutter_window_, 0, 0);
+        ::ShowWindow(container_, SW_HIDE);
+        LogToFile("WM_SIZE - hiding container, starting delay thread");
+        last_thread_time_ =
+            std::chrono::duration_cast<std::chrono::milliseconds>(
+                std::chrono::system_clock::now().time_since_epoch())
+                .count();
+        std::thread(
+            [this](uint64_t time) {
+              std::this_thread::sleep_for(
+                  std::chrono::milliseconds(kPositionAndShowDelay));
+
+              // Check if this thread is still the latest (another WM_SIZE may have come in)
+              if (time != last_thread_time_) {
+                LogToFile("WM_SIZE thread - superseded by newer thread, skipping");
+                return;
+              }
+
+              char msg2[256];
+              snprintf(msg2, sizeof(msg2), "WM_SIZE thread - after delay, visible_: %d",
+                       visible_);
+              LogToFile(msg2);
+
+              // Update container position to match current Flutter window bounds
+              RECT window_rect;
+              ::GetWindowRect(flutter_window_, &window_rect);
+              snprintf(msg2, sizeof(msg2), "WM_SIZE thread - flutter rect: %ld,%ld,%ld,%ld",
+                       window_rect.left, window_rect.top, window_rect.right, window_rect.bottom);
+              LogToFile(msg2);
+
+              ::SetWindowPos(container_, flutter_window_, window_rect.left,
+                             window_rect.top, window_rect.right - window_rect.left,
+                             window_rect.bottom - window_rect.top, SWP_NOACTIVATE);
+              LogToFile("WM_SIZE thread - updated container position");
+
+              // Always restore transparency if video is visible
+              if (visible_) {
+                SetWindowComposition(flutter_window_, 6, 0);
+                LogToFile("WM_SIZE thread - restored composition to 6");
+                ::ShowWindow(container_, SW_SHOWNOACTIVATE);
+                LogToFile("WM_SIZE thread - showed container");
+              }
+            },
+            last_thread_time_)
+            .detach();
+      }
+      last_wm_size_wparam_ = wparam;
+      break;
+    }
+    case WM_MOVE:
+    case WM_MOVING:
+    case WM_WINDOWPOSCHANGED: {
+      RECT window_rect;
+      ::GetWindowRect(flutter_window_, &window_rect);
+      if (window_rect.right - window_rect.left > 0 &&
+          window_rect.bottom - window_rect.top > 0) {
+        ::SetWindowPos(container_, flutter_window_, window_rect.left,
+                       window_rect.top, window_rect.right - window_rect.left,
+                       window_rect.bottom - window_rect.top, SWP_NOACTIVATE);
+        // Window is minimized (negative coordinates).
+        if (window_rect.left < 0 && window_rect.top < 0 &&
+            window_rect.right < 0 && window_rect.bottom < 0) {
+          SetWindowComposition(flutter_window_, 0, 0);
+          ::ShowWindow(container_, SW_HIDE);
+          was_window_hidden_due_to_minimize_ = true;
+        }
+      }
+      break;
+    }
+    case WM_CLOSE: {
+      ::SendMessage(container_, WM_CLOSE, 0, 0);
+      for (const auto& [mpv_view, rect] : mpv_views_) {
+        ::SendMessage(mpv_view, WM_CLOSE, 0, 0);
+      }
+      mpv_views_.clear();
+      break;
+    }
+    default:
+      break;
+  }
+  return std::nullopt;
+}
+
+void MpvCore::RedrawMpvViews() {
+  ::RedrawWindow(container_, 0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN);
+}
+
+RECT MpvCore::GetGlobalRect(int32_t left, int32_t top, int32_t right,
+                            int32_t bottom) {
+  // Expand client area to prevent transparent gaps.
+  left -= static_cast<int32_t>(ceil(device_pixel_ratio_));
+  top -= static_cast<int32_t>(ceil(device_pixel_ratio_));
+  right += static_cast<int32_t>(ceil(device_pixel_ratio_));
+  bottom += static_cast<int32_t>(ceil(device_pixel_ratio_));
+
+  RECT window_rect;
+  ::GetClientRect(flutter_window_, &window_rect);
+  RECT rect;
+  rect.left = window_rect.left + left;
+  rect.top = window_rect.top + top;
+  rect.right = window_rect.left + right;
+  rect.bottom = window_rect.top + bottom;
+  return rect;
+}
+
+std::unique_ptr<MpvCore> MpvCore::instance_ = nullptr;
+std::optional<int32_t> MpvCore::proc_id_ = std::nullopt;
+
+}  // namespace mpv
diff --git a/windows/runner/mpv/mpv_core.h b/windows/runner/mpv/mpv_core.h
new file mode 100644
index 00000000..2adca0be
--- /dev/null
+++ b/windows/runner/mpv/mpv_core.h
@@ -0,0 +1,71 @@
+#ifndef MPV_CORE_H_
+#define MPV_CORE_H_
+
+#include <Windows.h>
+
+#include <chrono>
+#include <cmath>
+#include <map>
+#include <memory>
+#include <optional>
+#include <thread>
+
+namespace mpv {
+
+// Core class for managing z-order and window positioning for mpv video window.
+// Handles transparency, minimize/maximize animations, and position syncing.
+class MpvCore {
+ public:
+  static constexpr auto kPositionAndShowDelay = 300;
+
+  static MpvCore* GetInstance();
+  static void SetInstance(std::unique_ptr<MpvCore> instance);
+  static std::optional<int32_t> GetProcId();
+  static void SetProcId(std::optional<int32_t> proc_id);
+
+  MpvCore(HWND flutter_window, HWND flutter_child_window);
+  ~MpvCore();
+
+  // Initializes transparency on the Flutter window.
+  void EnsureInitialized();
+
+  // Creates and positions the mpv video view.
+  void CreateMpvView(HWND mpv_hwnd, RECT rect, double device_pixel_ratio);
+
+  // Updates the mpv view position.
+  void ResizeMpvView(HWND mpv_hwnd, RECT rect);
+
+  // Disposes the mpv view.
+  void DisposeMpvView(HWND mpv_hwnd);
+
+  // Sets hit test behavior for mouse passthrough.
+  void SetHitTestBehavior(int32_t hittest_behavior);
+
+  // Shows or hides the mpv view.
+  void SetVisible(bool visible);
+
+  // Window procedure handler for Flutter window messages.
+  std::optional<HRESULT> WindowProc(HWND hwnd, UINT message, WPARAM wparam,
+                                    LPARAM lparam);
+
+ private:
+  void RedrawMpvViews();
+  RECT GetGlobalRect(int32_t left, int32_t top, int32_t right, int32_t bottom);
+
+  HWND flutter_window_ = nullptr;
+  HWND flutter_child_window_ = nullptr;
+  HWND container_ = nullptr;
+  double device_pixel_ratio_ = 1.0;
+  std::map<HWND, RECT> mpv_views_;
+  uint64_t last_thread_time_ = 0;
+  WPARAM last_wm_size_wparam_ = SIZE_RESTORED;
+  bool was_window_hidden_due_to_minimize_ = false;
+  bool visible_ = true;
+
+  static std::unique_ptr<MpvCore> instance_;
+  static std::optional<int32_t> proc_id_;
+};
+
+}  // namespace mpv
+
+#endif  // MPV_CORE_H_
diff --git a/windows/runner/mpv/mpv_player.cpp b/windows/runner/mpv/mpv_player.cpp
new file mode 100644
index 00000000..d390c12c
--- /dev/null
+++ b/windows/runner/mpv/mpv_player.cpp
@@ -0,0 +1,440 @@
+#include "mpv_player.h"
+
+#include <cstring>
+#include <fstream>
+
+static void LogToFile(const char* message) {
+  std::ofstream log("C:\\Users\\admin\\mpv_debug.log", std::ios::app);
+  if (log.is_open()) {
+    log << message << std::endl;
+    log.close();
+  }
+  OutputDebugStringA(message);
+  OutputDebugStringA("\n");
+}
+
+namespace mpv {
+
+MpvPlayer::MpvPlayer() {}
+
+MpvPlayer::~MpvPlayer() { Dispose(); }
+
+bool MpvPlayer::Initialize(HWND container, HWND flutter_window) {
+  LogToFile("MpvPlayer::Initialize called");
+
+  if (mpv_) {
+    LogToFile("MpvPlayer::Initialize - already initialized");
+    return true;  // Already initialized.
+  }
+
+  container_ = container;
+  flutter_window_ = flutter_window;
+  char msg[256];
+  snprintf(msg, sizeof(msg), "MpvPlayer::Initialize - container: %p", container);
+  LogToFile(msg);
+
+  // Create mpv instance.
+  LogToFile("MpvPlayer::Initialize - calling mpv_create()");
+  mpv_ = mpv_create();
+  if (!mpv_) {
+    LogToFile("MPV: mpv_create() failed");
+    return false;
+  }
+  LogToFile("MpvPlayer::Initialize - mpv_create() succeeded");
+
+  // Create a child window for mpv to render into.
+  LogToFile("MpvPlayer::Initialize - creating child window");
+  hwnd_ = ::CreateWindowW(L"STATIC", L"", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100,
+                          container, nullptr, GetModuleHandle(nullptr),
+                          nullptr);
+  if (!hwnd_) {
+    DWORD error = GetLastError();
+    snprintf(msg, sizeof(msg), "MPV: CreateWindowW failed with error %lu", error);
+    LogToFile(msg);
+    mpv_destroy(mpv_);
+    mpv_ = nullptr;
+    return false;
+  }
+  snprintf(msg, sizeof(msg), "MpvPlayer::Initialize - child window created: %p", hwnd_);
+  LogToFile(msg);
+
+  // Set the wid option to embed mpv in our window.
+  int64_t wid = reinterpret_cast<int64_t>(hwnd_);
+  int err = mpv_set_option(mpv_, "wid", MPV_FORMAT_INT64, &wid);
+  if (err < 0) {
+    snprintf(msg, sizeof(msg), "MPV: Failed to set wid option: %d %s", err, mpv_error_string(err));
+    LogToFile(msg);
+  } else {
+    LogToFile("MpvPlayer::Initialize - wid option set successfully");
+  }
+
+  // Configure mpv for embedded playback.
+  LogToFile("MpvPlayer::Initialize - setting mpv options");
+  // hwdec is set from Flutter via setProperty based on user preference
+  mpv_set_option_string(mpv_, "keep-open", "yes");
+  mpv_set_option_string(mpv_, "idle", "yes");
+  mpv_set_option_string(mpv_, "input-default-bindings", "no");
+  mpv_set_option_string(mpv_, "input-vo-keyboard", "no");
+  mpv_set_option_string(mpv_, "osc", "no");
+
+  // HDR passthrough - let mpv handle color space
+  mpv_set_option_string(mpv_, "target-colorspace-hint", "yes");
+
+  // Fallback tone mapping when display doesn't support HDR
+  mpv_set_option_string(mpv_, "tone-mapping", "auto");
+  mpv_set_option_string(mpv_, "hdr-compute-peak", "auto");
+
+  // Enable logging
+  mpv_request_log_messages(mpv_, "v");
+
+  // Initialize mpv.
+  LogToFile("MpvPlayer::Initialize - calling mpv_initialize()");
+  err = mpv_initialize(mpv_);
+  if (err < 0) {
+    snprintf(msg, sizeof(msg), "MPV: mpv_initialize() failed with error %d: %s",
+             err, mpv_error_string(err));
+    LogToFile(msg);
+    ::DestroyWindow(hwnd_);
+    hwnd_ = nullptr;
+    mpv_destroy(mpv_);
+    mpv_ = nullptr;
+    return false;
+  }
+
+  LogToFile("MPV: Initialization successful");
+
+  // Observe video-params/sig-peak for HDR detection
+  mpv_observe_property(mpv_, 0, "video-params/sig-peak", MPV_FORMAT_DOUBLE);
+
+  // Start event loop.
+  StartEventLoop();
+  LogToFile("MpvPlayer::Initialize - event loop started");
+
+  return true;
+}
+
+void MpvPlayer::Dispose() {
+  StopEventLoop();
+
+  if (mpv_) {
+    mpv_terminate_destroy(mpv_);
+    mpv_ = nullptr;
+  }
+
+  if (hwnd_) {
+    ::DestroyWindow(hwnd_);
+    hwnd_ = nullptr;
+  }
+
+  observed_properties_.clear();
+}
+
+void MpvPlayer::Command(const std::vector<std::string>& args) {
+  if (!mpv_) return;
+
+  std::vector<const char*> c_args;
+  c_args.reserve(args.size() + 1);
+  for (const auto& arg : args) {
+    c_args.push_back(arg.c_str());
+  }
+  c_args.push_back(nullptr);
+
+  mpv_command(mpv_, c_args.data());
+}
+
+void MpvPlayer::SetProperty(const std::string& name, const std::string& value) {
+  if (!mpv_) return;
+
+  // Handle custom HDR toggle property (same pattern as iOS/macOS)
+  if (name == "hdr-enabled") {
+    bool enabled = (value == "yes" || value == "true" || value == "1");
+    SetHDREnabled(enabled);
+    return;
+  }
+
+  mpv_set_property_string(mpv_, name.c_str(), value.c_str());
+}
+
+std::string MpvPlayer::GetProperty(const std::string& name) {
+  if (!mpv_) return "";
+
+  char* value = mpv_get_property_string(mpv_, name.c_str());
+  if (!value) return "";
+
+  std::string result(value);
+  mpv_free(value);
+  return result;
+}
+
+void MpvPlayer::ObserveProperty(const std::string& name,
+                                const std::string& format) {
+  if (!mpv_) return;
+
+  // Check if already observing.
+  if (observed_properties_.find(name) != observed_properties_.end()) {
+    return;
+  }
+
+  mpv_format mpv_fmt = MPV_FORMAT_NONE;
+  if (format == "string") {
+    mpv_fmt = MPV_FORMAT_STRING;
+  } else if (format == "flag" || format == "bool") {
+    mpv_fmt = MPV_FORMAT_FLAG;
+  } else if (format == "int64") {
+    mpv_fmt = MPV_FORMAT_INT64;
+  } else if (format == "double") {
+    mpv_fmt = MPV_FORMAT_DOUBLE;
+  } else if (format == "node") {
+    mpv_fmt = MPV_FORMAT_NODE;
+  }
+
+  uint64_t userdata = next_reply_userdata_++;
+  observed_properties_[name] = userdata;
+  mpv_observe_property(mpv_, userdata, name.c_str(), mpv_fmt);
+}
+
+void MpvPlayer::SetRect(RECT rect, double device_pixel_ratio) {
+  rect_ = rect;
+  device_pixel_ratio_ = device_pixel_ratio;
+
+  if (hwnd_ && container_ && flutter_window_) {
+    // The rect from Dart is in Flutter client area coordinates (0,0 is top-left of Flutter content).
+    // The container window is positioned to match the Flutter window's full bounds (including title bar).
+    // We need to offset the mpv window within the container to align with Flutter's client area.
+
+    // Get the Flutter window's window rect (screen coordinates, includes title bar)
+    RECT window_rect;
+    ::GetWindowRect(flutter_window_, &window_rect);
+
+    // Get the Flutter window's client rect (client coordinates, 0,0 based)
+    RECT client_rect;
+    ::GetClientRect(flutter_window_, &client_rect);
+
+    // Convert client area origin to screen coordinates
+    POINT client_origin = {0, 0};
+    ::ClientToScreen(flutter_window_, &client_origin);
+
+    // Calculate the offset from window origin to client area origin
+    int client_offset_x = client_origin.x - window_rect.left;
+    int client_offset_y = client_origin.y - window_rect.top;
+
+    // Position the mpv window within the container, offset by the title bar/border size
+    int left = rect.left + client_offset_x;
+    int top = rect.top + client_offset_y;
+    int width = rect.right - rect.left;
+    int height = rect.bottom - rect.top;
+
+    ::MoveWindow(hwnd_, left, top, width, height, TRUE);
+  }
+}
+
+void MpvPlayer::SetVisible(bool visible) {
+  if (hwnd_) {
+    ::ShowWindow(hwnd_, visible ? SW_SHOW : SW_HIDE);
+  }
+}
+
+void MpvPlayer::SetEventCallback(EventCallback callback) {
+  std::lock_guard<std::mutex> lock(callback_mutex_);
+  event_callback_ = std::move(callback);
+}
+
+void MpvPlayer::StartEventLoop() {
+  running_ = true;
+  event_thread_ = std::thread(&MpvPlayer::EventLoop, this);
+}
+
+void MpvPlayer::StopEventLoop() {
+  running_ = false;
+  if (event_thread_.joinable()) {
+    // Wake up the event loop.
+    if (mpv_) {
+      mpv_wakeup(mpv_);
+    }
+    event_thread_.join();
+  }
+}
+
+void MpvPlayer::EventLoop() {
+  while (running_) {
+    mpv_event* event = mpv_wait_event(mpv_, 0.1);
+    if (event->event_id == MPV_EVENT_NONE) {
+      continue;
+    }
+    if (event->event_id == MPV_EVENT_SHUTDOWN) {
+      break;
+    }
+    HandleMpvEvent(event);
+  }
+}
+
+void MpvPlayer::HandleMpvEvent(mpv_event* event) {
+  switch (event->event_id) {
+    case MPV_EVENT_LOG_MESSAGE: {
+      auto* msg = static_cast<mpv_event_log_message*>(event->data);
+      char log_msg[512];
+      snprintf(log_msg, sizeof(log_msg), "MPV [%s] %s: %s",
+               msg->level, msg->prefix, msg->text);
+      OutputDebugStringA(log_msg);
+
+      flutter::EncodableMap data;
+      data[flutter::EncodableValue("prefix")] =
+          flutter::EncodableValue(msg->prefix ? msg->prefix : "");
+      data[flutter::EncodableValue("level")] =
+          flutter::EncodableValue(msg->level ? msg->level : "");
+      data[flutter::EncodableValue("text")] =
+          flutter::EncodableValue(msg->text ? msg->text : "");
+      SendEvent("log-message", data);
+      break;
+    }
+    case MPV_EVENT_PROPERTY_CHANGE: {
+      auto* prop = static_cast<mpv_event_property*>(event->data);
+      mpv_node node;
+      node.format = prop->format;
+
+      switch (prop->format) {
+        case MPV_FORMAT_STRING:
+          node.u.string = prop->data ? *static_cast<char**>(prop->data) : nullptr;
+          break;
+        case MPV_FORMAT_FLAG:
+          node.u.flag = prop->data ? *static_cast<int*>(prop->data) : 0;
+          break;
+        case MPV_FORMAT_INT64:
+          node.u.int64 = prop->data ? *static_cast<int64_t*>(prop->data) : 0;
+          break;
+        case MPV_FORMAT_DOUBLE:
+          node.u.double_ = prop->data ? *static_cast<double*>(prop->data) : 0.0;
+          break;
+        case MPV_FORMAT_NODE:
+          if (prop->data) {
+            node = *static_cast<mpv_node*>(prop->data);
+          }
+          break;
+        default:
+          node.format = MPV_FORMAT_NONE;
+          break;
+      }
+
+      // Handle sig-peak for HDR detection
+      if (strcmp(prop->name, "video-params/sig-peak") == 0 &&
+          prop->format == MPV_FORMAT_DOUBLE && prop->data) {
+        double sigPeak = *static_cast<double*>(prop->data);
+        last_sig_peak_ = sigPeak;
+        UpdateHDRMode(sigPeak);
+      }
+
+      SendPropertyChange(prop->name, &node);
+      break;
+    }
+    case MPV_EVENT_END_FILE: {
+      auto* end = static_cast<mpv_event_end_file*>(event->data);
+      flutter::EncodableMap data;
+      data[flutter::EncodableValue("reason")] =
+          flutter::EncodableValue(static_cast<int>(end->reason));
+      if (end->reason == MPV_END_FILE_REASON_ERROR) {
+        data[flutter::EncodableValue("error")] =
+            flutter::EncodableValue(static_cast<int>(end->error));
+      }
+      SendEvent("end-file", data);
+      break;
+    }
+    case MPV_EVENT_FILE_LOADED: {
+      SendEvent("file-loaded");
+      break;
+    }
+    case MPV_EVENT_PLAYBACK_RESTART: {
+      SendEvent("playback-restart");
+      break;
+    }
+    case MPV_EVENT_SEEK: {
+      SendEvent("seek");
+      break;
+    }
+    default:
+      break;
+  }
+}
+
+void MpvPlayer::SendPropertyChange(const char* name, mpv_node* data) {
+  flutter::EncodableMap event;
+  event[flutter::EncodableValue("type")] =
+      flutter::EncodableValue("property");
+  event[flutter::EncodableValue("name")] =
+      flutter::EncodableValue(name ? name : "");
+
+  flutter::EncodableValue value;
+  if (data) {
+    switch (data->format) {
+      case MPV_FORMAT_STRING:
+        value = flutter::EncodableValue(
+            data->u.string ? std::string(data->u.string) : std::string());
+        break;
+      case MPV_FORMAT_FLAG:
+        value = flutter::EncodableValue(data->u.flag != 0);
+        break;
+      case MPV_FORMAT_INT64:
+        value = flutter::EncodableValue(data->u.int64);
+        break;
+      case MPV_FORMAT_DOUBLE:
+        value = flutter::EncodableValue(data->u.double_);
+        break;
+      default:
+        value = flutter::EncodableValue();
+        break;
+    }
+  }
+  event[flutter::EncodableValue("value")] = value;
+
+  std::lock_guard<std::mutex> lock(callback_mutex_);
+  if (event_callback_) {
+    event_callback_(event);
+  }
+}
+
+void MpvPlayer::SendEvent(const std::string& name,
+                          const flutter::EncodableMap& data) {
+  flutter::EncodableMap event;
+  event[flutter::EncodableValue("type")] = flutter::EncodableValue("event");
+  event[flutter::EncodableValue("name")] = flutter::EncodableValue(name);
+  if (!data.empty()) {
+    event[flutter::EncodableValue("data")] = flutter::EncodableValue(data);
+  }
+
+  std::lock_guard<std::mutex> lock(callback_mutex_);
+  if (event_callback_) {
+    event_callback_(event);
+  }
+}
+
+void MpvPlayer::SetHDREnabled(bool enabled) {
+  hdr_enabled_ = enabled;
+  char msg[128];
+  snprintf(msg, sizeof(msg), "[MpvPlayer] HDR enabled: %s", enabled ? "true" : "false");
+  LogToFile(msg);
+
+  if (mpv_) {
+    mpv_set_property_string(mpv_, "target-colorspace-hint", enabled ? "yes" : "no");
+  }
+
+  UpdateHDRMode(last_sig_peak_);
+}
+
+void MpvPlayer::UpdateHDRMode(double sigPeak) {
+  bool isHDRContent = sigPeak > 1.0;
+
+  char msg[256];
+  snprintf(msg, sizeof(msg),
+           "[MpvPlayer] HDR mode update (hdrEnabled: %s, sigPeak: %.2f, isHDR: %s)",
+           hdr_enabled_ ? "true" : "false",
+           sigPeak,
+           isHDRContent ? "true" : "false");
+  LogToFile(msg);
+
+  // On Windows, mpv handles HDR passthrough automatically when:
+  // - target-colorspace-hint=yes
+  // - Windows HDR is enabled in Display Settings
+  // - Display supports HDR
+  // No explicit DXGI calls needed - mpv's gpu/d3d11 handles it
+}
+
+}  // namespace mpv
diff --git a/windows/runner/mpv/mpv_player.h b/windows/runner/mpv/mpv_player.h
new file mode 100644
index 00000000..5954eb73
--- /dev/null
+++ b/windows/runner/mpv/mpv_player.h
@@ -0,0 +1,98 @@
+#ifndef MPV_PLAYER_H_
+#define MPV_PLAYER_H_
+
+#include <Windows.h>
+#include <mpv/client.h>
+
+#include <atomic>
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include <flutter/encodable_value.h>
+
+namespace mpv {
+
+// Wrapper for libmpv that handles initialization, commands, properties,
+// and event dispatching.
+class MpvPlayer {
+ public:
+  using EventCallback =
+      std::function<void(const flutter::EncodableMap&)>;
+
+  MpvPlayer();
+  ~MpvPlayer();
+
+  // Initializes mpv and creates the video window.
+  bool Initialize(HWND container, HWND flutter_window);
+
+  // Disposes mpv and the video window.
+  void Dispose();
+
+  // Returns true if mpv is initialized.
+  bool IsInitialized() const { return mpv_ != nullptr; }
+
+  // Executes an mpv command.
+  void Command(const std::vector<std::string>& args);
+
+  // Sets an mpv property.
+  void SetProperty(const std::string& name, const std::string& value);
+
+  // Gets an mpv property.
+  std::string GetProperty(const std::string& name);
+
+  // Observes an mpv property for changes.
+  void ObserveProperty(const std::string& name, const std::string& format);
+
+  // Returns the mpv video window handle.
+  HWND GetHwnd() const { return hwnd_; }
+
+  // Updates the video window position.
+  void SetRect(RECT rect, double device_pixel_ratio);
+
+  // Shows or hides the video window.
+  void SetVisible(bool visible);
+
+  // Sets the event callback for property changes and events.
+  void SetEventCallback(EventCallback callback);
+
+ private:
+  void StartEventLoop();
+  void StopEventLoop();
+  void EventLoop();
+  void HandleMpvEvent(mpv_event* event);
+  void SendPropertyChange(const char* name, mpv_node* data);
+  void SendEvent(const std::string& name,
+                 const flutter::EncodableMap& data = {});
+
+  mpv_handle* mpv_ = nullptr;
+  HWND hwnd_ = nullptr;
+  HWND container_ = nullptr;
+  HWND flutter_window_ = nullptr;
+  double device_pixel_ratio_ = 1.0;
+  RECT rect_ = {0, 0, 0, 0};
+
+  std::thread event_thread_;
+  std::atomic<bool> running_{false};
+  EventCallback event_callback_;
+  std::mutex callback_mutex_;
+
+  uint64_t next_reply_userdata_ = 1;
+  std::map<std::string, uint64_t> observed_properties_;
+
+  // HDR state
+  bool hdr_enabled_ = true;      // User preference
+  double last_sig_peak_ = 0.0;   // Last known sig-peak for HDR content detection
+
+  // HDR methods
+  void SetHDREnabled(bool enabled);
+  void UpdateHDRMode(double sigPeak);
+};
+
+}  // namespace mpv
+
+#endif  // MPV_PLAYER_H_
diff --git a/windows/runner/mpv/mpv_plugin.cpp b/windows/runner/mpv/mpv_plugin.cpp
new file mode 100644
index 00000000..6fbe9102
--- /dev/null
+++ b/windows/runner/mpv/mpv_plugin.cpp
@@ -0,0 +1,380 @@
+#include "mpv_plugin.h"
+
+#include <fstream>
+
+#include "mpv_container.h"
+#include "mpv_core.h"
+
+static void LogToFile(const char* message) {
+  std::ofstream log("C:\\Users\\admin\\mpv_debug.log", std::ios::app);
+  if (log.is_open()) {
+    log << message << std::endl;
+    log.close();
+  }
+  OutputDebugStringA(message);
+  OutputDebugStringA("\n");
+}
+
+void MpvPlayerPluginRegisterWithRegistrar(
+    FlutterDesktopPluginRegistrarRef registrar) {
+  LogToFile("MpvPlayerPlugin: RegisterWithRegistrar called");
+  mpv::MpvPlayerPlugin::RegisterWithRegistrar(
+      flutter::PluginRegistrarManager::GetInstance()
+          ->GetRegistrar<flutter::PluginRegistrarWindows>(registrar));
+  LogToFile("MpvPlayerPlugin: RegisterWithRegistrar completed");
+}
+
+namespace mpv {
+
+void MpvPlayerPlugin::RegisterWithRegistrar(
+    flutter::PluginRegistrarWindows* registrar) {
+  auto plugin = std::make_unique<MpvPlayerPlugin>(registrar);
+  registrar->AddPlugin(std::move(plugin));
+}
+
+MpvPlayerPlugin::MpvPlayerPlugin(flutter::PluginRegistrarWindows* registrar)
+    : registrar_(registrar) {
+  LogToFile("MpvPlayerPlugin: Constructor called");
+
+  // Create method channel.
+  method_channel_ =
+      std::make_unique<flutter::MethodChannel<flutter::EncodableValue>>(
+          registrar->messenger(), "com.plezy/mpv_player",
+          &flutter::StandardMethodCodec::GetInstance());
+
+  LogToFile("MpvPlayerPlugin: Method channel created");
+
+  method_channel_->SetMethodCallHandler(
+      [this](const auto& call, auto result) {
+        char msg[256];
+        snprintf(msg, sizeof(msg), "MpvPlayerPlugin: Method call received: %s",
+                 call.method_name().c_str());
+        LogToFile(msg);
+        HandleMethodCall(call, std::move(result));
+      });
+
+  // Create event channel.
+  event_channel_ =
+      std::make_unique<flutter::EventChannel<flutter::EncodableValue>>(
+          registrar->messenger(), "com.plezy/mpv_player/events",
+          &flutter::StandardMethodCodec::GetInstance());
+
+  auto handler = std::make_unique<
+      flutter::StreamHandlerFunctions<flutter::EncodableValue>>(
+      [this](const flutter::EncodableValue* arguments,
+             std::unique_ptr<flutter::EventSink<flutter::EncodableValue>>&&
+                 events) -> std::unique_ptr<flutter::StreamHandlerError<
+                              flutter::EncodableValue>> {
+        event_sink_ = std::move(events);
+        return nullptr;
+      },
+      [this](const flutter::EncodableValue* arguments)
+          -> std::unique_ptr<
+              flutter::StreamHandlerError<flutter::EncodableValue>> {
+        event_sink_ = nullptr;
+        return nullptr;
+      });
+
+  event_channel_->SetStreamHandler(std::move(handler));
+}
+
+MpvPlayerPlugin::~MpvPlayerPlugin() {
+  // Unregister window proc delegate.
+  if (proc_id_) {
+    registrar_->UnregisterTopLevelWindowProcDelegate(proc_id_.value());
+    proc_id_ = std::nullopt;
+  }
+}
+
+HWND MpvPlayerPlugin::GetChildWindow() {
+  return registrar_->GetView()->GetNativeWindow();
+}
+
+HWND MpvPlayerPlugin::GetWindow() {
+  return ::GetAncestor(GetChildWindow(), GA_ROOT);
+}
+
+void MpvPlayerPlugin::HandleMethodCall(
+    const flutter::MethodCall<flutter::EncodableValue>& method_call,
+    std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
+  const auto& method = method_call.method_name();
+
+  if (method == "initialize") {
+    LogToFile("MPV Plugin: initialize called");
+
+    // Set up MpvCore for z-order management.
+    if (proc_id_) {
+      registrar_->UnregisterTopLevelWindowProcDelegate(proc_id_.value());
+      proc_id_ = std::nullopt;
+    }
+
+    HWND flutter_window = GetWindow();
+    HWND child_window = GetChildWindow();
+
+    char msg[256];
+    snprintf(msg, sizeof(msg), "MPV Plugin: Flutter window: %p, Child window: %p",
+             flutter_window, child_window);
+    LogToFile(msg);
+
+    MpvCore::SetInstance(
+        std::make_unique<MpvCore>(flutter_window, child_window));
+
+    proc_id_ = registrar_->RegisterTopLevelWindowProcDelegate(
+        [](HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
+          auto* core = MpvCore::GetInstance();
+          if (core) {
+            return core->WindowProc(hwnd, message, wparam, lparam);
+          }
+          return std::optional<HRESULT>(std::nullopt);
+        });
+
+    LogToFile("MPV Plugin: Calling EnsureInitialized");
+    MpvCore::GetInstance()->EnsureInitialized();
+
+    // Create player - use the container from MpvCore which was set up by EnsureInitialized
+    player_ = std::make_unique<MpvPlayer>();
+    HWND container = MpvContainer::GetInstance()->handle();
+
+    snprintf(msg, sizeof(msg), "MPV Plugin: Container handle: %p", container);
+    LogToFile(msg);
+
+    if (!container) {
+      LogToFile("MPV Plugin: ERROR - container is null");
+      result->Error("INIT_FAILED", "Failed to create container window");
+      return;
+    }
+
+    LogToFile("MPV Plugin: Initializing player");
+    bool success = player_->Initialize(container, flutter_window);
+
+    if (success) {
+      LogToFile("MPV Plugin: Player initialized successfully");
+      // Set up event callback.
+      player_->SetEventCallback([this](const flutter::EncodableMap& event) {
+        SendEvent(event);
+      });
+
+      // Register the mpv window with core for z-order management.
+      RECT rect = {0, 0, 100, 100};
+      MpvCore::GetInstance()->CreateMpvView(player_->GetHwnd(), rect, 1.0);
+
+      // Start hidden.
+      MpvCore::GetInstance()->SetVisible(false);
+      result->Success(flutter::EncodableValue(true));
+    } else {
+      OutputDebugStringA("MPV Plugin: Player initialization FAILED\n");
+      player_.reset();  // Clear the player so we don't have a half-initialized state
+      result->Error("INIT_FAILED", "Failed to initialize MPV player");
+    }
+  } else if (method == "dispose") {
+    if (player_) {
+      auto hwnd = player_->GetHwnd();
+      player_->Dispose();
+      player_.reset();
+
+      if (MpvCore::GetInstance() && hwnd) {
+        MpvCore::GetInstance()->DisposeMpvView(hwnd);
+      }
+    }
+    result->Success();
+  } else if (method == "command") {
+    if (!player_ || !player_->IsInitialized()) {
+      result->Error("NOT_INITIALIZED", "Player not initialized");
+      return;
+    }
+
+    const auto* args = method_call.arguments();
+    if (!args || !std::holds_alternative<flutter::EncodableMap>(*args)) {
+      result->Error("INVALID_ARGS", "Expected map argument");
+      return;
+    }
+
+    const auto& map = std::get<flutter::EncodableMap>(*args);
+    auto it = map.find(flutter::EncodableValue("args"));
+    if (it == map.end() ||
+        !std::holds_alternative<flutter::EncodableList>(it->second)) {
+      result->Error("INVALID_ARGS", "Missing 'args' list");
+      return;
+    }
+
+    const auto& list = std::get<flutter::EncodableList>(it->second);
+    std::vector<std::string> command_args;
+    for (const auto& item : list) {
+      if (std::holds_alternative<std::string>(item)) {
+        command_args.push_back(std::get<std::string>(item));
+      }
+    }
+
+    player_->Command(command_args);
+    result->Success();
+  } else if (method == "setProperty") {
+    if (!player_ || !player_->IsInitialized()) {
+      result->Error("NOT_INITIALIZED", "Player not initialized");
+      return;
+    }
+
+    const auto* args = method_call.arguments();
+    if (!args || !std::holds_alternative<flutter::EncodableMap>(*args)) {
+      result->Error("INVALID_ARGS", "Expected map argument");
+      return;
+    }
+
+    const auto& map = std::get<flutter::EncodableMap>(*args);
+    auto name_it = map.find(flutter::EncodableValue("name"));
+    auto value_it = map.find(flutter::EncodableValue("value"));
+
+    if (name_it == map.end() ||
+        !std::holds_alternative<std::string>(name_it->second)) {
+      result->Error("INVALID_ARGS", "Missing 'name'");
+      return;
+    }
+    if (value_it == map.end() ||
+        !std::holds_alternative<std::string>(value_it->second)) {
+      result->Error("INVALID_ARGS", "Missing 'value'");
+      return;
+    }
+
+    player_->SetProperty(std::get<std::string>(name_it->second),
+                         std::get<std::string>(value_it->second));
+    result->Success();
+  } else if (method == "getProperty") {
+    if (!player_ || !player_->IsInitialized()) {
+      result->Error("NOT_INITIALIZED", "Player not initialized");
+      return;
+    }
+
+    const auto* args = method_call.arguments();
+    if (!args || !std::holds_alternative<flutter::EncodableMap>(*args)) {
+      result->Error("INVALID_ARGS", "Expected map argument");
+      return;
+    }
+
+    const auto& map = std::get<flutter::EncodableMap>(*args);
+    auto name_it = map.find(flutter::EncodableValue("name"));
+
+    if (name_it == map.end() ||
+        !std::holds_alternative<std::string>(name_it->second)) {
+      result->Error("INVALID_ARGS", "Missing 'name'");
+      return;
+    }
+
+    std::string value =
+        player_->GetProperty(std::get<std::string>(name_it->second));
+    if (value.empty()) {
+      result->Success();
+    } else {
+      result->Success(flutter::EncodableValue(value));
+    }
+  } else if (method == "observeProperty") {
+    if (!player_ || !player_->IsInitialized()) {
+      result->Error("NOT_INITIALIZED", "Player not initialized");
+      return;
+    }
+
+    const auto* args = method_call.arguments();
+    if (!args || !std::holds_alternative<flutter::EncodableMap>(*args)) {
+      result->Error("INVALID_ARGS", "Expected map argument");
+      return;
+    }
+
+    const auto& map = std::get<flutter::EncodableMap>(*args);
+    auto name_it = map.find(flutter::EncodableValue("name"));
+    auto format_it = map.find(flutter::EncodableValue("format"));
+
+    if (name_it == map.end() ||
+        !std::holds_alternative<std::string>(name_it->second)) {
+      result->Error("INVALID_ARGS", "Missing 'name'");
+      return;
+    }
+    if (format_it == map.end() ||
+        !std::holds_alternative<std::string>(format_it->second)) {
+      result->Error("INVALID_ARGS", "Missing 'format'");
+      return;
+    }
+
+    player_->ObserveProperty(std::get<std::string>(name_it->second),
+                             std::get<std::string>(format_it->second));
+    result->Success();
+  } else if (method == "setVisible") {
+    const auto* args = method_call.arguments();
+    if (!args || !std::holds_alternative<flutter::EncodableMap>(*args)) {
+      result->Error("INVALID_ARGS", "Expected map argument");
+      return;
+    }
+
+    const auto& map = std::get<flutter::EncodableMap>(*args);
+    auto visible_it = map.find(flutter::EncodableValue("visible"));
+
+    if (visible_it == map.end() ||
+        !std::holds_alternative<bool>(visible_it->second)) {
+      result->Error("INVALID_ARGS", "Missing 'visible'");
+      return;
+    }
+
+    bool visible = std::get<bool>(visible_it->second);
+
+    if (player_) {
+      player_->SetVisible(visible);
+    }
+    if (MpvCore::GetInstance()) {
+      MpvCore::GetInstance()->SetVisible(visible);
+    }
+
+    result->Success();
+  } else if (method == "setVideoRect") {
+    const auto* args = method_call.arguments();
+    if (!args || !std::holds_alternative<flutter::EncodableMap>(*args)) {
+      result->Error("INVALID_ARGS", "Expected map argument");
+      return;
+    }
+
+    const auto& map = std::get<flutter::EncodableMap>(*args);
+
+    auto get_int = [&map](const char* key) -> int {
+      auto it = map.find(flutter::EncodableValue(key));
+      if (it != map.end()) {
+        if (std::holds_alternative<int32_t>(it->second)) {
+          return std::get<int32_t>(it->second);
+        } else if (std::holds_alternative<int64_t>(it->second)) {
+          return static_cast<int>(std::get<int64_t>(it->second));
+        }
+      }
+      return 0;
+    };
+
+    auto get_double = [&map](const char* key) -> double {
+      auto it = map.find(flutter::EncodableValue(key));
+      if (it != map.end() && std::holds_alternative<double>(it->second)) {
+        return std::get<double>(it->second);
+      }
+      return 1.0;
+    };
+
+    RECT rect;
+    rect.left = get_int("left");
+    rect.top = get_int("top");
+    rect.right = get_int("right");
+    rect.bottom = get_int("bottom");
+    double dpr = get_double("devicePixelRatio");
+
+    if (player_ && MpvCore::GetInstance()) {
+      MpvCore::GetInstance()->ResizeMpvView(player_->GetHwnd(), rect);
+      player_->SetRect(rect, dpr);
+    }
+
+    result->Success();
+  } else if (method == "isInitialized") {
+    bool initialized = player_ && player_->IsInitialized();
+    result->Success(flutter::EncodableValue(initialized));
+  } else {
+    result->NotImplemented();
+  }
+}
+
+void MpvPlayerPlugin::SendEvent(const flutter::EncodableMap& event) {
+  if (event_sink_) {
+    event_sink_->Success(flutter::EncodableValue(event));
+  }
+}
+
+}  // namespace mpv
diff --git a/windows/runner/mpv/mpv_plugin.h b/windows/runner/mpv/mpv_plugin.h
new file mode 100644
index 00000000..45e49655
--- /dev/null
+++ b/windows/runner/mpv/mpv_plugin.h
@@ -0,0 +1,53 @@
+#ifndef MPV_PLUGIN_H_
+#define MPV_PLUGIN_H_
+
+#include <flutter/encodable_value.h>
+#include <flutter/event_channel.h>
+#include <flutter/event_stream_handler_functions.h>
+#include <flutter/method_channel.h>
+#include <flutter/plugin_registrar_windows.h>
+#include <flutter/standard_method_codec.h>
+
+#include <memory>
+#include <optional>
+
+#include "mpv_core.h"
+#include "mpv_player.h"
+
+// C-style registration function for the plugin.
+void MpvPlayerPluginRegisterWithRegistrar(
+    FlutterDesktopPluginRegistrarRef registrar);
+
+namespace mpv {
+
+class MpvPlayerPlugin : public flutter::Plugin {
+ public:
+  static void RegisterWithRegistrar(flutter::PluginRegistrarWindows* registrar);
+
+  MpvPlayerPlugin(flutter::PluginRegistrarWindows* registrar);
+  virtual ~MpvPlayerPlugin();
+
+ private:
+  void HandleMethodCall(
+      const flutter::MethodCall<flutter::EncodableValue>& method_call,
+      std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
+
+  void SendEvent(const flutter::EncodableMap& event);
+
+  HWND GetWindow();
+  HWND GetChildWindow();
+
+  flutter::PluginRegistrarWindows* registrar_;
+  std::unique_ptr<flutter::MethodChannel<flutter::EncodableValue>>
+      method_channel_;
+  std::unique_ptr<flutter::EventChannel<flutter::EncodableValue>>
+      event_channel_;
+  std::unique_ptr<flutter::EventSink<flutter::EncodableValue>> event_sink_;
+
+  std::unique_ptr<MpvPlayer> player_;
+  std::optional<int32_t> proc_id_;
+};
+
+}  // namespace mpv
+
+#endif  // MPV_PLUGIN_H_
diff --git a/windows/runner/mpv/utils.cpp b/windows/runner/mpv/utils.cpp
new file mode 100644
index 00000000..4960d9c1
--- /dev/null
+++ b/windows/runner/mpv/utils.cpp
@@ -0,0 +1,113 @@
+#include "utils.h"
+
+namespace mpv {
+
+typedef enum _WINDOWCOMPOSITIONATTRIB {
+  WCA_UNDEFINED = 0,
+  WCA_NCRENDERING_ENABLED = 1,
+  WCA_NCRENDERING_POLICY = 2,
+  WCA_TRANSITIONS_FORCEDISABLED = 3,
+  WCA_ALLOW_NCPAINT = 4,
+  WCA_CAPTION_BUTTON_BOUNDS = 5,
+  WCA_NONCLIENT_RTL_LAYOUT = 6,
+  WCA_FORCE_ICONIC_REPRESENTATION = 7,
+  WCA_EXTENDED_FRAME_BOUNDS = 8,
+  WCA_HAS_ICONIC_BITMAP = 9,
+  WCA_THEME_ATTRIBUTES = 10,
+  WCA_NCRENDERING_EXILED = 11,
+  WCA_NCADORNMENTINFO = 12,
+  WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
+  WCA_VIDEO_OVERLAY_ACTIVE = 14,
+  WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
+  WCA_DISALLOW_PEEK = 16,
+  WCA_CLOAK = 17,
+  WCA_CLOAKED = 18,
+  WCA_ACCENT_POLICY = 19,
+  WCA_FREEZE_REPRESENTATION = 20,
+  WCA_EVER_UNCLOAKED = 21,
+  WCA_VISUAL_OWNER = 22,
+  WCA_HOLOGRAPHIC = 23,
+  WCA_EXCLUDED_FROM_DDA = 24,
+  WCA_PASSIVEUPDATEMODE = 25,
+  WCA_USEDARKMODECOLORS = 26,
+  WCA_LAST = 27
+} WINDOWCOMPOSITIONATTRIB;
+
+typedef struct _WINDOWCOMPOSITIONATTRIBDATA {
+  WINDOWCOMPOSITIONATTRIB Attrib;
+  PVOID pvData;
+  SIZE_T cbData;
+} WINDOWCOMPOSITIONATTRIBDATA;
+
+typedef enum _ACCENT_STATE {
+  ACCENT_DISABLED = 0,
+  ACCENT_ENABLE_GRADIENT = 1,
+  ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
+  ACCENT_ENABLE_BLURBEHIND = 3,
+  ACCENT_ENABLE_ACRYLICBLURBEHIND = 4,
+  ACCENT_ENABLE_HOSTBACKDROP = 5,
+  ACCENT_INVALID_STATE = 6
+} ACCENT_STATE;
+
+typedef struct _ACCENT_POLICY {
+  ACCENT_STATE AccentState;
+  DWORD AccentFlags;
+  DWORD GradientColor;
+  DWORD AnimationId;
+} ACCENT_POLICY;
+
+typedef BOOL(WINAPI* _SetWindowCompositionAttribute)(
+    HWND, WINDOWCOMPOSITIONATTRIBDATA*);
+
+static _SetWindowCompositionAttribute g_set_window_composition_attribute = NULL;
+static bool g_set_window_composition_attribute_initialized = false;
+
+typedef LONG NTSTATUS, *PNTSTATUS;
+#define STATUS_SUCCESS (0x00000000)
+
+typedef NTSTATUS(WINAPI* RtlGetVersionPtr)(PRTL_OSVERSIONINFOW);
+
+static RTL_OSVERSIONINFOW GetWindowsVersion() {
+  HMODULE hmodule = ::GetModuleHandleW(L"ntdll.dll");
+  if (hmodule) {
+    RtlGetVersionPtr rtl_get_version_ptr =
+        (RtlGetVersionPtr)::GetProcAddress(hmodule, "RtlGetVersion");
+    if (rtl_get_version_ptr != nullptr) {
+      RTL_OSVERSIONINFOW rovi = {0};
+      rovi.dwOSVersionInfoSize = sizeof(rovi);
+      if (STATUS_SUCCESS == rtl_get_version_ptr(&rovi)) {
+        return rovi;
+      }
+    }
+  }
+  RTL_OSVERSIONINFOW rovi = {0};
+  return rovi;
+}
+
+void SetWindowComposition(HWND window, int32_t accent_state,
+                          int32_t gradient_color) {
+  if (GetWindowsVersion().dwBuildNumber >= 18362) {
+    if (!g_set_window_composition_attribute_initialized) {
+      auto user32 = ::GetModuleHandleA("user32.dll");
+      if (user32) {
+        g_set_window_composition_attribute =
+            reinterpret_cast<_SetWindowCompositionAttribute>(
+                ::GetProcAddress(user32, "SetWindowCompositionAttribute"));
+        if (g_set_window_composition_attribute) {
+          g_set_window_composition_attribute_initialized = true;
+        }
+      }
+    }
+    if (g_set_window_composition_attribute) {
+      ACCENT_POLICY accent = {static_cast<ACCENT_STATE>(accent_state), 2,
+                              static_cast<DWORD>(gradient_color), 0};
+      WINDOWCOMPOSITIONATTRIBDATA data;
+      data.Attrib = WCA_ACCENT_POLICY;
+      data.pvData = &accent;
+      data.cbData = sizeof(accent);
+      g_set_window_composition_attribute(window, &data);
+    }
+  }
+}
+
+}  // namespace mpv
diff --git a/windows/runner/mpv/utils.h b/windows/runner/mpv/utils.h
new file mode 100644
index 00000000..5fd07796
--- /dev/null
+++ b/windows/runner/mpv/utils.h
@@ -0,0 +1,19 @@
+#ifndef MPV_UTILS_H_
+#define MPV_UTILS_H_
+
+#include <Windows.h>
+#include <dwmapi.h>
+
+#include <cstdint>
+
+namespace mpv {
+
+// Sets window composition attribute for transparency.
+// accent_state = 6 enables per-pixel transparency.
+// accent_state = 0 makes window opaque.
+void SetWindowComposition(HWND window, int32_t accent_state,
+                          int32_t gradient_color);
+
+}  // namespace mpv
+
+#endif  // MPV_UTILS_H_