chore: remove deps

chore: removing deps
chore
2025-01-04 17:08:00 +01:00 · 2025-01-04 16:31:41 +01:00 · 2025-01-02 09:59:22 +01:00 · 2025-01-02 09:57:19 +01:00 · 2025-01-02 09:51:56 +01:00 · 2025-01-02 09:49:57 +01:00
368 changed files with 9423 additions and 27996 deletions
--- a/.env.development
+++ b/.env.development
@@ -1 +0,0 @@
-EXPO_PUBLIC_WRITE_DEBUG=1
--- a/.env.production
+++ b/.env.production
@@ -1 +0,0 @@
-EXPO_PUBLIC_WRITE_DEBUG=0
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-.modules/vlc-player/Frameworks/*.xcframework filter=lfs diff=lfs merge=lfs -text
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -4,7 +4,9 @@ title: "[Bug]: "
 labels:
  - ["❌ bug"]
 projects:
-  - ["streamyfin/3"]
+  - ["fredrikburmester/5"]
+assignees:
+  - fredrikburmester

 body:
  - type: textarea
@@ -43,12 +45,6 @@ body:
      label: Version
      description: What version of Streamyfin are you running?
      options:
-        - 0.28.0
-        - 0.27.0
-        - 0.26.1
-        - 0.26.0
-        - 0.25.0
-        - 0.24.0
        - 0.23.0
        - 0.22.0
        - 0.21.0
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,8 +4,7 @@ about: Suggest an idea for this project
 title: ''
 labels: '✨ enhancement'
 assignees: ''
-projects:
- - streamyfin/3
+
 ---

 **Describe the solution you'd like**
--- a/.github/workflows/build-ios.yaml
+++ b/.github/workflows/build-ios.yaml
@@ -1,49 +0,0 @@
-name: Automatic Build and Deploy
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: macos-15
-    name: Build IOS
-    steps:
-      - uses: actions/checkout@v2
-        name: Check out repository
-      - uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-      - run: |
-          bun i && bun run submodule-reload
-          npx expo prebuild
-      - uses: sparkfabrik/ios-build-action@v2.3.0
-        with:
-          upload-to-testflight: false
-          increment-build-number: false
-          build-pods: true
-          pods-path: "ios/Podfile"
-          configuration: Release
-          # Change later to app-store if wanted
-          export-method: appstore
-          #export-method: ad-hoc
-          workspace-path: "ios/Streamyfin.xcodeproj/project.xcworkspace/"
-          project-path: "ios/Streamyfin.xcodeproj"
-          scheme: Streamyfin
-          apple-key-id: ${{ secrets.APPLE_KEY_ID }}
-          apple-key-issuer-id: ${{ secrets.APPLE_KEY_ISSUER_ID }}
-          apple-key-content: ${{ secrets.APPLE_KEY_CONTENT }}
-          team-id: ${{ secrets.TEAM_ID }}
-          team-name: ${{ secrets.TEAM_NAME }}
-          #match-password: ${{ secrets.MATCH_PASSWORD }}
-          #match-git-url: ${{ secrets.MATCH_GIT_URL }}
-          #match-git-basic-authorization: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
-          #match-build-type: "appstore"
-          #browserstack-upload: true
-          #browserstack-username: ${{ secrets.BROWSERSTACK_USERNAME }}
-          #browserstack-access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-          #fastlane-env: stage
-          ios-app-id: com.stetsed.teststreamyfin
-          output-path: build-${{ github.sha }}.ipa
--- a/.github/workflows/lint-pr.yaml
+++ b/.github/workflows/lint-pr.yaml
@@ -1,41 +0,0 @@
-name: "Lint PR"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-      - reopened
-
-permissions:
-  pull-requests: write
-
-jobs:
-  main:
-    name: Validate PR title
-    runs-on: ubuntu-latest
-    steps:
-      - uses: amannn/action-semantic-pull-request@v5
-        id: lint_pr_title
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: marocchino/sticky-pull-request-comment@v2
-        if: always() && (steps.lint_pr_title.outputs.error_message != null)
-        with:
-          header: pr-title-lint-error
-          message: |
-            Hey there and thank you for opening this pull request! 👋🏼
-            
-            We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted.
-
-            Details:
-            
-            ```
-            ${{ steps.lint_pr_title.outputs.error_message }}
-            ```
-      - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:   
-          header: pr-title-lint-error
-          delete: true
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -1,28 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-    branches: [ develop, master ]
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20.x'
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: latest
-
-      - name: Install dependencies
-        run: bun install
-
-      - name: Run linting checks
-        run: bun run check
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,39 +0,0 @@
-name: Handle Stale Issues
-on:
-  schedule:
-    - cron: "30 1 * * *" # Runs at 1:30 UTC every day
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-
-    steps:
-      - uses: actions/stale@v9
-        with:
-          # Issue specific settings
-          days-before-issue-stale: 90
-          days-before-issue-close: 7
-          stale-issue-label: "stale"
-          stale-issue-message: |
-            This issue has been automatically marked as stale because it has had no activity in the last 30 days.
-
-            If this issue is still relevant, please leave a comment to keep it open. 
-            Otherwise, it will be closed in 7 days if no further activity occurs.
-
-            Thank you for your contributions!
-          close-issue-message: |
-            This issue has been automatically closed because it has been inactive for 7 days since being marked as stale.
-
-            If you believe this issue is still relevant, please feel free to reopen it and add a comment explaining the current status.
-
-          # Pull request settings (disabled)
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-
-          # Other settings
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          operations-per-run: 100
-          exempt-issue-labels: "Roadmap v1,help needed,enhancement"
--- a/.github/workflows/notification.yaml
+++ b/.github/workflows/notification.yaml
@@ -1,18 +0,0 @@
-name: Discord Pull Request Notification
-
-on:
-  pull_request:
-    types: [opened, reopened]
-
-jobs:
-  notify:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: joelwmale/webhook-action@master
-        with:
-          url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          body: |
-            {
-              "content": "New Pull Request: ${{ github.event.pull_request.title }}\nBy: ${{ github.event.pull_request.user.login }}\n\n${{ github.event.pull_request.html_url }}",
-              "avatar_url": "https://avatars.githubusercontent.com/u/193271640"
-            }
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,6 @@ npm-debug.*
 *.orig.*
 web-build/
 modules/vlc-player/android/build
-modules/vlc-player/android/.gradle
-bun.lockb

 # macOS
 .DS_Store
@@ -28,10 +26,6 @@ package-lock.json

 /ios
 /android
-/iostv
-/iosmobile
-/androidmobile
-/androidtv

 modules/player/android

@@ -41,10 +35,4 @@ credentials.json
 *.ipa
 .continuerc.json

-.vscode/
-.idea/
-.ruby-lsp
-modules/hls-downloader/android/build
-streamyfin-4fec1-firebase-adminsdk.json
-.env
-.env.local
+.vscode/
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +0,0 @@
-lint-staged
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
--- a/.idea/caches/deviceStreaming.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceStreaming">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="id" value="comet" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q6q" />
+          <option name="id" value="q6q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1856" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/streamyfin.iml" filepath="$PROJECT_DIR$/.idea/streamyfin.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/streamyfin.iml
+++ b/.idea/streamyfin.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,24 +1,15 @@
 {
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true,
  "[javascript]": {
-    "editor.defaultFormatter": "biomejs.biome",
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.formatOnSave": true
  },
  "[typescriptreact]": {
-    "editor.defaultFormatter": "biomejs.biome",
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.formatOnSave": true
  },
-  "prettier.printWidth": 120,
  "[swift]": {
    "editor.defaultFormatter": "sswg.swift-lang"
-  },
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "biomejs.biome",
-  "[typescript]": {
-    "editor.defaultFormatter": "biomejs.biome",
-    "editor.formatOnSave": true
-  },
-  "[javascriptreact]": {
-    "editor.defaultFormatter": "biomejs.biome",
-    "editor.formatOnSave": true
  }
 }
--- a/6
+++ b/6
@@ -1,6 +0,0 @@
-e2e:
-	maestro start-device --platform android
-	maestro test login.yaml
-
-e2e-setup:
-curl -fsSL "https://get.maestro.mobile.dev" | bash
--- a/README.md
+++ b/README.md
@@ -8,17 +8,16 @@ Welcome to Streamyfin, a simple and user-friendly Jellyfin client built with Exp
  <img width=150 src="./assets/images/screenshots/screenshot1.png" />
  <img width=150 src="./assets/images/screenshots/screenshot3.png" />
  <img width=150 src="./assets/images/screenshots/screenshot2.png" />
-  <img width=159 src="./assets/images/jellyseerr.PNG"/>
+  
 </div>

 ## 🌟 Features

- 🚀 **Skip Intro / Credits Support**
+- 🚀 **Skp intro / credits support**
 - 🖼️ **Trickplay images**: The new golden standard for chapter previews when seeking.
 - 🔊 **Background audio**: Stream music in the background, even when locking the phone.
 - 📥 **Download media** (Experimental): Save your media locally and watch it offline.
 - 📡 **Chromecast** (Experimental): Cast your media to any Chromecast-enabled device.
- 📡 **Settings management** (Experimental): Manage app settings for all your users with a JF plugin.
 - 🤖 **Jellyseerr integration**: Request media directly in the app.

 ## 🧪 Experimental Features
@@ -33,17 +32,22 @@ Downloading works by using ffmpeg to convert an HLS stream into a video file on

 Chromecast support is still in development, and we're working on improving it. Currently, it supports casting videos and audio, but we're working on adding support for subtitles and other features.

-### Streamyfin Plugin
+## Plugins

-The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that hold all settings for the client Streamyfin. This allows you to syncronize settings accross all your users, like:
+In Streamyfin we have built-in support for a few plugins. These plugins are not required to use Streamyfin, but they add some extra functionality.

- Auto log in to Jellyseerr without the user having to do anythin
- Choose the default languages
- Set download method and search provider
- Customize homescreen
- And more...
+### Collection rows

-[Streamyfin Plugin](https://github.com/streamyfin/jellyfin-plugin-streamyfin)
+Jellyfin collections can be shown as rows or carousel on the home screen.
+The following tags can be added to a collection to provide this functionality.
+
+Available tags:
+
+- sf_promoted: will make the collection a row at home
+- sf_carousel: will make the collection a carousel on home.
+
+A plugin exists to create collections based on external sources like mdblist. This make the automatic process of managing collections such as trending, most watched, etc.
+See [Collection Import Plugin](https://github.com/lostb1t/jellyfin-plugin-collection-import) for more info.

 ### Jellysearch

@@ -62,13 +66,13 @@ Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) to
  <a href="https://play.google.com/store/apps/details?id=com.fredrikburmester.streamyfin"><img height=50 alt="Get the beta on Google Play" src="./assets/Google_Play_Store_badge_EN.svg"/></a>
 </div>

-Or download the APKs [here on GitHub](https://github.com/streamyfin/streamyfin/releases) for Android.
+Or download the APKs [here on GitHub](https://github.com/fredrikburmester/streamyfin/releases) for Android.

 ### Beta testing

-To access the Streamyfin beta, you need to subscribe to the Member tier (or higher) on [Patreon](https://www.patreon.com/streamyfin). This will give you immediate access to the ⁠🧪-public-beta channel on Discord and i'll know that you have subscribed. This is where I post APKs and IPAs. This won't give automatic access to the TestFlight, however, so you need to send me a DM with the email you use for Apple so that i can manually add you.
+To access the Streamyfin beta, you need to subscribe to the Member tier (or higher) on [Patreon](https://www.patreon.com/streamyfin). This will give you immediate access to the ⁠🧪-public-beta channel on Discord and i'll know that you have subscribed. This is where i'll post APKs and IPAs. This won't give automatic access to the TestFlight however, so you need to send me a DM with the email you use for Apple so that i can manually add you.

-**Note**: Everyone who is actively contributing to the source code of Streamyfin will have automatic access to the betas.
+ **Note**: Everyone who is actively contributing to the source code of Streamyfin will have automatic access to the betas.

 ## 🚀 Getting Started

@@ -85,15 +89,8 @@ We welcome any help to make Streamyfin better. If you'd like to contribute, plea

 1. Use node `>20`
 2. Install dependencies `bun i && bun run submodule-reload`
-3. Make sure you have xcode and/or android studio installed. (follow the guides for expo: https://docs.expo.dev/workflow/android-studio-emulator/)
-4. Install BiomeJS extension in VSCode/Your IDE (https://biomejs.dev/)
-4. run `npm run prebuild`
-5. Create an expo dev build by running `npm run ios` or `npm run android`. This will open a simulator on your computer and run the app.
-
-For the TV version suffix the npm commands with `:tv`.
-
-`npm run prebuild:tv`  
-`npm run ios:tv or npm run android:tv`
+3. Make sure you have xcode and/or android studio installed.
+4. Create an expo dev build by running `npx expo run:ios` or `npx expo run:android`. This will open a simulator on you computer and run the app.

 ## 📄 License

@@ -111,7 +108,7 @@ Key points of the MPL-2.0:

 ## 🌐 Connect with Us

-Join our Discord: [https://discord.gg/aJvAYeycyY](https://discord.gg/aJvAYeycyY)
+Join our Discord: [https://discord.gg/BuGG9ZNhaE](https://discord.gg/BuGG9ZNhaE)

 If you have questions or need support, feel free to reach out:

@@ -120,93 +117,11 @@ If you have questions or need support, feel free to reach out:

 ## 📝 Credits

-Streamyfin is developed by [Fredrik Burmester](https://github.com/fredrikburmester) and is not affiliated with Jellyfin. The app is built with Expo, React Native, and other open-source libraries.
+Streamyfin is developed by Fredrik Burmester and is not affiliated with Jellyfin. The app is built with Expo, React Native, and other open-source libraries.

 ## ✨ Acknowledgements

-We would like to thank the Jellyfin team for their great software and awesome support on discord.
-
-Special shoutout to the JF official clients for being an inspiration to ours.
-
-### Core Developers
-
-Thanks to the following contributors for their significant contributions:
-
-<table>
-  <tr
-    style="
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      flex-wrap: wrap;
-    "
-  >
-    <td align="center">
-      <a href="https://github.com/Alexk2309">
-        <img src="https://github.com/Alexk2309.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@Alexk2309</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/herrrta">
-        <img src="https://github.com/herrrta.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@herrrta</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/lostb1t">
-        <img src="https://github.com/lostb1t.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@lostb1t</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/Simon-Eklundh">
-        <img src="https://github.com/Simon-Eklundh.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@Simon-Eklundh</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/topiga">
-        <img src="https://github.com/topiga.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@topiga</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/simoncaron">
-        <img src="https://github.com/simoncaron.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@simoncaron</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/jakequade">
-        <img src="https://github.com/jakequade.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@jakequade</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/Ryan0204">
-        <img src="https://github.com/Ryan0204.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@Ryan0204</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/retardgerman">
-        <img src="https://github.com/retardgerman.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@retardgerman</b></sub>
-      </a>
-    </td>
-    <td align="center">
-      <a href="https://github.com/whoopsi-daisy">
-        <img src="https://github.com/whoopsi-daisy.png?size=80" width="80" style="border-radius: 50%;" />
-        <br /><sub><b>@whoopsi-daisy</b></sub>
-      </a>
-    </td>
-  </tr>
-</table>
-
-And all other developers who have contributed to Streamyfin, thank you for your contributions.
-
-I'd also like to thank the following people and projects for their contributions to Streamyfin:
+I'd like to thank the following people and projects for their contributions to Streamyfin:

 - [Reiverr](https://github.com/aleksilassila/reiverr) for great help with understanding the Jellyfin API.
 - [Jellyfin TS SDK](https://github.com/jellyfin/jellyfin-sdk-typescript) for the TypeScript SDK.
@@ -215,4 +130,4 @@ I'd also like to thank the following people and projects for their contributions

 ## Star History

-[![Star History Chart](https://api.star-history.com/svg?repos=streamyfin/streamyfin&type=Date)](https://star-history.com/#streamyfin/streamyfin&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=fredrikburmester/streamyfin&type=Date)](https://star-history.com/#fredrikburmester/streamyfin&Date)
--- a/app.config.js
+++ b/app.config.js
@@ -1,14 +0,0 @@
-module.exports = ({ config }) => {
-  if (process.env.EXPO_TV !== "1") {
-    config.plugins.push([
-      "react-native-google-cast",
-      { useDefaultExpandedMediaControls: true },
-    ]);
-  }
-  return {
-    android: {
-      googleServicesFile: process.env.GOOGLE_SERVICES_JSON,
-    },
-    ...config,
-  };
-};
--- a/app.json
+++ b/app.json
@@ -2,11 +2,16 @@
  "expo": {
    "name": "Streamyfin",
    "slug": "streamyfin",
-    "version": "0.28.0",
+    "version": "0.23.0",
    "orientation": "default",
    "icon": "./assets/images/icon.png",
    "scheme": "streamyfin",
    "userInterfaceStyle": "dark",
+    "splash": {
+      "image": "./assets/images/splash.png",
+      "resizeMode": "contain",
+      "backgroundColor": "#2E2E2E"
+    },
    "jsEngine": "hermes",
    "assetBundlePatterns": ["**/*"],
    "ios": {
@@ -31,34 +36,22 @@
    },
    "android": {
      "jsEngine": "hermes",
-      "versionCode": 54,
+      "versionCode": 49,
      "adaptiveIcon": {
-        "foregroundImage": "./assets/images/adaptive_icon.png",
-        "backgroundColor": "#464646"
+        "foregroundImage": "./assets/images/adaptive_icon.png"
      },
      "package": "com.fredrikburmester.streamyfin",
-      "permissions": [
-        "android.permission.FOREGROUND_SERVICE",
-        "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK",
-        "android.permission.WRITE_SETTINGS"
-      ],
-      "googleServicesFile": "./google-services.json"
+      "permissions": []
    },
    "plugins": [
-      "@react-native-tvos/config-tv",
      "expo-router",
      "expo-font",
+      "@config-plugins/ffmpeg-kit-react-native",
      [
        "react-native-video",
        {
          "enableNotificationControls": true,
-          "enableBackgroundAudio": true,
-          "androidExtensions": {
-            "useExoplayerRtsp": false,
-            "useExoplayerSmoothStreaming": false,
-            "useExoplayerHls": true,
-            "useExoplayerDash": false
-          }
+          "enableBackgroundAudio": true
        }
      ],
      [
@@ -67,66 +60,19 @@
          "ios": {
            "deploymentTarget": "15.6",
            "useFrameworks": "static"
-          },
-          "android": {
-            "compileSdkVersion": 35,
-            "targetSdkVersion": 35,
-            "buildToolsVersion": "35.0.0",
-            "kotlinVersion": "2.0.21",
-            "minSdkVersion": 24,
-            "usesCleartextTraffic": true,
-            "packagingOptions": {
-              "jniLibs": {
-                "useLegacyPackaging": true
-              }
-            },
-            "useAndroidX": true,
-            "enableJetifier": true
          }
        }
      ],
-      [
-        "expo-screen-orientation",
-        {
-          "initialOrientation": "DEFAULT"
-        }
-      ],
      [
        "expo-sensors",
        {
          "motionPermission": "Allow Streamyfin to access your device motion for landscape video watching."
        }
      ],
-      "expo-localization",
      "expo-asset",
-      [
-        "react-native-edge-to-edge",
-        {
-          "android": {
-            "parentTheme": "Material3"
-          }
-        }
-      ],
+      ["react-native-edge-to-edge"],
      ["react-native-bottom-tabs"],
-      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
-      ["./plugins/withAndroidManifest.js"],
-      ["./plugins/withTrustLocalCerts.js"],
-      ["./plugins/withGradleProperties.js"],
-      [
-        "expo-splash-screen",
-        {
-          "backgroundColor": "#2e2e2e",
-          "image": "./assets/images/StreamyFinFinal.png",
-          "imageWidth": 100
-        }
-      ],
-      [
-        "expo-notifications",
-        {
-          "icon": "./assets/images/notification.png",
-          "color": "#9333EA"
-        }
-      ]
+      ["@react-native-tvos/config-tv"]
    ],
    "experiments": {
      "typedRoutes": true
@@ -139,13 +85,12 @@
        "projectId": "e79219d1-797f-4fbe-9fa1-cfd360690a68"
      }
    },
-    "owner": "streamyfin",
+    "owner": "fredrikburmester",
    "runtimeVersion": {
      "policy": "appVersion"
    },
    "updates": {
      "url": "https://u.expo.dev/e79219d1-797f-4fbe-9fa1-cfd360690a68"
-    },
-    "newArchEnabled": false
+    }
  }
 }
--- a/app/(auth)/(tabs)/(custom-links)/_layout.tsx
+++ b/app/(auth)/(tabs)/(custom-links)/_layout.tsx
@@ -1,22 +0,0 @@
-import { Stack } from "expo-router";
-import { useTranslation } from "react-i18next";
-import { Platform } from "react-native";
-
-export default function CustomMenuLayout() {
-  const { t } = useTranslation();
-  return (
-    <Stack>
-      <Stack.Screen
-        name='index'
-        options={{
-          headerShown: true,
-          headerLargeTitle: true,
-          headerTitle: t("tabs.custom_links"),
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
-          headerShadowVisible: false,
-        }}
-      />
-    </Stack>
-  );
-}
--- a/app/(auth)/(tabs)/(custom-links)/index.tsx
+++ b/app/(auth)/(tabs)/(custom-links)/index.tsx
@@ -1,87 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { ListItem } from "@/components/list/ListItem";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import Ionicons from "@expo/vector-icons/Ionicons";
-import { useAtom } from "jotai/index";
-import React, { useCallback, useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Platform } from "react-native";
-import { FlatList, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-const WebBrowser = !Platform.isTV ? require("expo-web-browser") : null;
-
-export interface MenuLink {
-  name: string;
-  url: string;
-  icon: string;
-}
-
-export default function menuLinks() {
-  const [api] = useAtom(apiAtom);
-  const insets = useSafeAreaInsets();
-  const [menuLinks, setMenuLinks] = useState<MenuLink[]>([]);
-  const { t } = useTranslation();
-
-  const getMenuLinks = useCallback(async () => {
-    try {
-      const response = await api?.axiosInstance.get(
-        `${api?.basePath}/web/config.json`,
-      );
-      const config = response?.data;
-
-      if (!config && !Object.hasOwn(config, "menuLinks")) {
-        console.error("Menu links not found");
-        return;
-      }
-
-      setMenuLinks(config?.menuLinks as MenuLink[]);
-    } catch (error) {
-      console.error("Failed to retrieve config:", error);
-    }
-  }, [api]);
-
-  useEffect(() => {
-    getMenuLinks();
-  }, []);
-  return (
-    <FlatList
-      contentInsetAdjustmentBehavior='automatic'
-      contentContainerStyle={{
-        paddingTop: 10,
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-      data={menuLinks}
-      renderItem={({ item }) => (
-        <TouchableOpacity
-          onPress={() => {
-            if (!Platform.isTV) {
-              WebBrowser.openBrowserAsync(item.url);
-            }
-          }}
-        >
-          <ListItem
-            title={item.name}
-            iconAfter={<Ionicons name='link' size={24} color='white' />}
-          />
-        </TouchableOpacity>
-      )}
-      ItemSeparatorComponent={() => (
-        <View
-          style={{
-            width: 10,
-            height: 10,
-          }}
-        />
-      )}
-      ListEmptyComponent={
-        <View className='flex flex-col items-center justify-center h-full'>
-          <Text className='font-bold text-xl text-neutral-500'>
-            {t("custom_links.no_links")}
-          </Text>
-        </View>
-      }
-    />
-  );
-}
--- a/app/(auth)/(tabs)/(favorites)/_layout.tsx
+++ b/app/(auth)/(tabs)/(favorites)/_layout.tsx
@@ -1,29 +0,0 @@
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-import { Stack } from "expo-router";
-import { useTranslation } from "react-i18next";
-import { Platform } from "react-native";
-
-export default function SearchLayout() {
-  const { t } = useTranslation();
-  return (
-    <Stack>
-      <Stack.Screen
-        name='index'
-        options={{
-          headerShown: true,
-          headerLargeTitle: true,
-          headerTitle: t("tabs.favorites"),
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
-          headerShadowVisible: false,
-        }}
-      />
-      {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
-        <Stack.Screen key={name} name={name} options={options} />
-      ))}
-    </Stack>
-  );
-}
--- a/app/(auth)/(tabs)/(favorites)/index.tsx
+++ b/app/(auth)/(tabs)/(favorites)/index.tsx
@@ -1,36 +0,0 @@
-import { Favorites } from "@/components/home/Favorites";
-import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import React, { useCallback, useState } from "react";
-import { RefreshControl, ScrollView, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-export default function favorites() {
-  const invalidateCache = useInvalidatePlaybackProgressCache();
-
-  const [loading, setLoading] = useState(false);
-  const refetch = useCallback(async () => {
-    setLoading(true);
-    await invalidateCache();
-    setLoading(false);
-  }, []);
-  const insets = useSafeAreaInsets();
-
-  return (
-    <ScrollView
-      nestedScrollEnabled
-      contentInsetAdjustmentBehavior='automatic'
-      refreshControl={
-        <RefreshControl refreshing={loading} onRefresh={refetch} />
-      }
-      contentContainerStyle={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-        paddingBottom: 16,
-      }}
-    >
-      <View className='my-4'>
-        <Favorites />
-      </View>
-    </ScrollView>
-  );
-}
--- a/app/(auth)/(tabs)/(home)/_layout.tsx
+++ b/app/(auth)/(tabs)/(home)/_layout.tsx
@@ -1,155 +1,53 @@
 import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-import { Feather, Ionicons } from "@expo/vector-icons";
+import { Feather } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
-import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
-const Chromecast = Platform.isTV ? null : require("@/components/Chromecast");
-import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
-import { userAtom } from "@/providers/JellyfinProvider";
-import { useAtom } from "jotai";

 export default function IndexLayout() {
  const router = useRouter();
-  const [user] = useAtom(userAtom);
-  const { t } = useTranslation();
-
  return (
    <Stack>
      <Stack.Screen
-        name='index'
+        name="index"
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.home"),
+          headerTitle: "Home",
          headerBlurEffect: "prominent",
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
          headerRight: () => (
-            <View className='flex flex-row items-center space-x-2'>
-              {!Platform.isTV && (
-                <>
-                  <Chromecast.Chromecast />
-                  {user?.Policy?.IsAdministrator && <SessionsButton />}
-                  <SettingsButton />
-                </>
-              )}
+            <View className="flex flex-row items-center space-x-2">
+              <TouchableOpacity
+                onPress={() => {
+                  router.push("/(auth)/settings");
+                }}
+              >
+                <Feather name="settings" color={"white"} size={22} />
+              </TouchableOpacity>
            </View>
          ),
        }}
      />
      <Stack.Screen
-        name='downloads/index'
+        name="settings"
        options={{
-          title: t("home.downloads.downloads_title"),
-        }}
-      />
-      <Stack.Screen
-        name='downloads/[seriesId]'
-        options={{
-          title: t("home.downloads.tvseries"),
-        }}
-      />
-      <Stack.Screen
-        name='sessions/index'
-        options={{
-          title: t("home.sessions.title"),
-        }}
-      />
-      <Stack.Screen
-        name='settings'
-        options={{
-          title: t("home.settings.settings_title"),
-        }}
-      />
-      <Stack.Screen
-        name='settings/optimized-server/page'
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name='settings/marlin-search/page'
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name='settings/jellyseerr/page'
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name='settings/hide-libraries/page'
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name='settings/logs/page'
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name='intro/page'
-        options={{
-          headerShown: false,
-          title: "",
-          presentation: "modal",
+          title: "Settings",
        }}
      />
      {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
        <Stack.Screen key={name} name={name} options={options} />
      ))}
      <Stack.Screen
-        name='collections/[collectionId]'
+        name="collections/[collectionId]"
        options={{
          title: "",
          headerShown: true,
          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
        }}
      />
    </Stack>
  );
 }
-
-const SettingsButton = () => {
-  const router = useRouter();
-
-  return (
-    <TouchableOpacity
-      onPress={() => {
-        router.push("/(auth)/settings");
-      }}
-    >
-      <Feather name='settings' color={"white"} size={22} />
-    </TouchableOpacity>
-  );
-};
-
-const SessionsButton = () => {
-  const router = useRouter();
-  const { sessions = [] } = useSessions({} as useSessionsProps);
-
-  return (
-    <TouchableOpacity
-      onPress={() => {
-        router.push("/(auth)/sessions");
-      }}
-    >
-      <View className='mr-4'>
-        <Ionicons
-          name='play-circle'
-          color={sessions.length === 0 ? "white" : "#9333ea"}
-          size={25}
-        />
-      </View>
-    </TouchableOpacity>
-  );
-};
--- a/app/(auth)/(tabs)/(home)/downloads/[seriesId].tsx
+++ b/app/(auth)/(tabs)/(home)/downloads/[seriesId].tsx
@@ -1,132 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { EpisodeCard } from "@/components/downloads/EpisodeCard";
-import {
-  SeasonDropdown,
-  type SeasonIndexState,
-} from "@/components/series/SeasonDropdown";
-import { useDownload } from "@/providers/DownloadProvider";
-import { storage } from "@/utils/mmkv";
-import { Ionicons } from "@expo/vector-icons";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { router, useLocalSearchParams, useNavigation } from "expo-router";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
-
-export default function page() {
-  const navigation = useNavigation();
-  const local = useLocalSearchParams();
-  const { seriesId, episodeSeasonIndex } = local as {
-    seriesId: string;
-    episodeSeasonIndex: number | string | undefined;
-  };
-
-  const [seasonIndexState, setSeasonIndexState] = useState<SeasonIndexState>(
-    {},
-  );
-  const { downloadedFiles, deleteItems } = useDownload();
-
-  const series = useMemo(() => {
-    try {
-      return (
-        downloadedFiles
-          ?.filter((f) => f.item.SeriesId === seriesId)
-          ?.sort(
-            (a, b) => a?.item.ParentIndexNumber! - b.item.ParentIndexNumber!,
-          ) || []
-      );
-    } catch {
-      return [];
-    }
-  }, [downloadedFiles]);
-
-  const seasonIndex =
-    seasonIndexState[series?.[0]?.item?.ParentId ?? ""] ||
-    episodeSeasonIndex ||
-    "";
-
-  const groupBySeason = useMemo<BaseItemDto[]>(() => {
-    const seasons: Record<string, BaseItemDto[]> = {};
-
-    series?.forEach((episode) => {
-      if (!seasons[episode.item.ParentIndexNumber!]) {
-        seasons[episode.item.ParentIndexNumber!] = [];
-      }
-
-      seasons[episode.item.ParentIndexNumber!].push(episode.item);
-    });
-    return (
-      seasons[seasonIndex]?.sort((a, b) => a.IndexNumber! - b.IndexNumber!) ??
-      []
-    );
-  }, [series, seasonIndex]);
-
-  const initialSeasonIndex = useMemo(
-    () =>
-      Object.values(groupBySeason)?.[0]?.ParentIndexNumber ??
-      series?.[0]?.item?.ParentIndexNumber,
-    [groupBySeason],
-  );
-
-  useEffect(() => {
-    if (series.length > 0) {
-      navigation.setOptions({
-        title: series[0].item.SeriesName,
-      });
-    } else {
-      storage.delete(seriesId);
-      router.back();
-    }
-  }, [series]);
-
-  const deleteSeries = useCallback(() => {
-    Alert.alert(
-      "Delete season",
-      "Are you sure you want to delete the entire season?",
-      [
-        {
-          text: "Cancel",
-          style: "cancel",
-        },
-        {
-          text: "Delete",
-          onPress: () => deleteItems(groupBySeason),
-          style: "destructive",
-        },
-      ],
-    );
-  }, [groupBySeason]);
-
-  return (
-    <View className='flex-1'>
-      {series.length > 0 && (
-        <View className='flex flex-row items-center justify-start my-2 px-4'>
-          <SeasonDropdown
-            item={series[0].item}
-            seasons={series.map((s) => s.item)}
-            state={seasonIndexState}
-            initialSeasonIndex={initialSeasonIndex!}
-            onSelect={(season) => {
-              setSeasonIndexState((prev) => ({
-                ...prev,
-                [series[0].item.ParentId ?? ""]: season.ParentIndexNumber,
-              }));
-            }}
-          />
-          <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center ml-2'>
-            <Text className='text-xs font-bold'>{groupBySeason.length}</Text>
-          </View>
-          <View className='bg-neutral-800/80 rounded-full h-9 w-9 flex items-center justify-center ml-auto'>
-            <TouchableOpacity onPress={deleteSeries}>
-              <Ionicons name='trash' size={20} color='white' />
-            </TouchableOpacity>
-          </View>
-        </View>
-      )}
-      <ScrollView key={seasonIndex} className='px-4'>
-        {groupBySeason.map((episode, index) => (
-          <EpisodeCard key={index} item={episode} />
-        ))}
-      </ScrollView>
-    </View>
-  );
-}
--- a/app/(auth)/(tabs)/(home)/downloads/index.tsx
+++ b/app/(auth)/(tabs)/(home)/downloads/index.tsx
@@ -1,271 +0,0 @@
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import { ActiveDownloads } from "@/components/downloads/ActiveDownloads";
-import { DownloadSize } from "@/components/downloads/DownloadSize";
-import { MovieCard } from "@/components/downloads/MovieCard";
-import { SeriesCard } from "@/components/downloads/SeriesCard";
-import { type DownloadedItem, useDownload } from "@/providers/DownloadProvider";
-import { queueAtom } from "@/utils/atoms/queue";
-import { DownloadMethod, useSettings } from "@/utils/atoms/settings";
-import { writeToLog } from "@/utils/log";
-import { Ionicons } from "@expo/vector-icons";
-import {
-  BottomSheetBackdrop,
-  type BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import { useNavigation, useRouter } from "expo-router";
-import { t } from "i18next";
-import { useAtom } from "jotai";
-import React, { useEffect, useMemo, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { toast } from "sonner-native";
-
-export default function page() {
-  const navigation = useNavigation();
-  const { t } = useTranslation();
-  const [queue, setQueue] = useAtom(queueAtom);
-  const { removeProcess, downloadedFiles, deleteFileByType } = useDownload();
-  const router = useRouter();
-  const [settings] = useSettings();
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-
-  const movies = useMemo(() => {
-    try {
-      return downloadedFiles?.filter((f) => f.item.Type === "Movie") || [];
-    } catch {
-      migration_20241124();
-      return [];
-    }
-  }, [downloadedFiles]);
-
-  const groupedBySeries = useMemo(() => {
-    try {
-      const episodes = downloadedFiles?.filter(
-        (f) => f.item.Type === "Episode",
-      );
-      const series: { [key: string]: DownloadedItem[] } = {};
-      episodes?.forEach((e) => {
-        if (!series[e.item.SeriesName!]) series[e.item.SeriesName!] = [];
-        series[e.item.SeriesName!].push(e);
-      });
-      return Object.values(series);
-    } catch {
-      migration_20241124();
-      return [];
-    }
-  }, [downloadedFiles]);
-
-  const insets = useSafeAreaInsets();
-
-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () => (
-        <TouchableOpacity onPress={bottomSheetModalRef.current?.present}>
-          <DownloadSize items={downloadedFiles?.map((f) => f.item) || []} />
-        </TouchableOpacity>
-      ),
-    });
-  }, [downloadedFiles]);
-
-  const deleteMovies = () =>
-    deleteFileByType("Movie")
-      .then(() =>
-        toast.success(
-          t("home.downloads.toasts.deleted_all_movies_successfully"),
-        ),
-      )
-      .catch((reason) => {
-        writeToLog("ERROR", reason);
-        toast.error(t("home.downloads.toasts.failed_to_delete_all_movies"));
-      });
-  const deleteShows = () =>
-    deleteFileByType("Episode")
-      .then(() =>
-        toast.success(
-          t("home.downloads.toasts.deleted_all_tvseries_successfully"),
-        ),
-      )
-      .catch((reason) => {
-        writeToLog("ERROR", reason);
-        toast.error(t("home.downloads.toasts.failed_to_delete_all_tvseries"));
-      });
-  const deleteAllMedia = async () =>
-    await Promise.all([deleteMovies(), deleteShows()]);
-
-  return (
-    <>
-      <ScrollView
-        contentContainerStyle={{
-          paddingLeft: insets.left,
-          paddingRight: insets.right,
-          paddingBottom: 100,
-        }}
-      >
-        <View className='py-4'>
-          <View className='mb-4 flex flex-col space-y-4 px-4'>
-            {settings?.downloadMethod === DownloadMethod.Remux && (
-              <View className='bg-neutral-900 p-4 rounded-2xl'>
-                <Text className='text-lg font-bold'>
-                  {t("home.downloads.queue")}
-                </Text>
-                <Text className='text-xs opacity-70 text-red-600'>
-                  {t("home.downloads.queue_hint")}
-                </Text>
-                <View className='flex flex-col space-y-2 mt-2'>
-                  {queue.map((q, index) => (
-                    <TouchableOpacity
-                      onPress={() =>
-                        router.push(`/(auth)/items/page?id=${q.item.Id}`)
-                      }
-                      className='relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between'
-                      key={index}
-                    >
-                      <View>
-                        <Text className='font-semibold'>{q.item.Name}</Text>
-                        <Text className='text-xs opacity-50'>
-                          {q.item.Type}
-                        </Text>
-                      </View>
-                      <TouchableOpacity
-                        onPress={() => {
-                          removeProcess(q.id);
-                          setQueue((prev) => {
-                            if (!prev) return [];
-                            return [...prev.filter((i) => i.id !== q.id)];
-                          });
-                        }}
-                      >
-                        <Ionicons name='close' size={24} color='red' />
-                      </TouchableOpacity>
-                    </TouchableOpacity>
-                  ))}
-                </View>
-
-                {queue.length === 0 && (
-                  <Text className='opacity-50'>
-                    {t("home.downloads.no_items_in_queue")}
-                  </Text>
-                )}
-              </View>
-            )}
-
-            <ActiveDownloads />
-          </View>
-
-          {movies.length > 0 && (
-            <View className='mb-4'>
-              <View className='flex flex-row items-center justify-between mb-2 px-4'>
-                <Text className='text-lg font-bold'>
-                  {t("home.downloads.movies")}
-                </Text>
-                <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
-                  <Text className='text-xs font-bold'>{movies?.length}</Text>
-                </View>
-              </View>
-              <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-                <View className='px-4 flex flex-row'>
-                  {movies?.map((item) => (
-                    <View className='mb-2 last:mb-0' key={item.item.Id}>
-                      <MovieCard item={item.item} />
-                    </View>
-                  ))}
-                </View>
-              </ScrollView>
-            </View>
-          )}
-          {groupedBySeries.length > 0 && (
-            <View className='mb-4'>
-              <View className='flex flex-row items-center justify-between mb-2 px-4'>
-                <Text className='text-lg font-bold'>
-                  {t("home.downloads.tvseries")}
-                </Text>
-                <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
-                  <Text className='text-xs font-bold'>
-                    {groupedBySeries?.length}
-                  </Text>
-                </View>
-              </View>
-              <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-                <View className='px-4 flex flex-row'>
-                  {groupedBySeries?.map((items) => (
-                    <View
-                      className='mb-2 last:mb-0'
-                      key={items[0].item.SeriesId}
-                    >
-                      <SeriesCard
-                        items={items.map((i) => i.item)}
-                        key={items[0].item.SeriesId}
-                      />
-                    </View>
-                  ))}
-                </View>
-              </ScrollView>
-            </View>
-          )}
-          {downloadedFiles?.length === 0 && (
-            <View className='flex px-4'>
-              <Text className='opacity-50'>
-                {t("home.downloads.no_downloaded_items")}
-              </Text>
-            </View>
-          )}
-        </View>
-      </ScrollView>
-      <BottomSheetModal
-        ref={bottomSheetModalRef}
-        enableDynamicSizing
-        handleIndicatorStyle={{
-          backgroundColor: "white",
-        }}
-        backgroundStyle={{
-          backgroundColor: "#171717",
-        }}
-        backdropComponent={(props: BottomSheetBackdropProps) => (
-          <BottomSheetBackdrop
-            {...props}
-            disappearsOnIndex={-1}
-            appearsOnIndex={0}
-          />
-        )}
-      >
-        <BottomSheetView>
-          <View className='p-4 space-y-4 mb-4'>
-            <Button color='purple' onPress={deleteMovies}>
-              {t("home.downloads.delete_all_movies_button")}
-            </Button>
-            <Button color='purple' onPress={deleteShows}>
-              {t("home.downloads.delete_all_tvseries_button")}
-            </Button>
-            <Button color='red' onPress={deleteAllMedia}>
-              {t("home.downloads.delete_all_button")}
-            </Button>
-          </View>
-        </BottomSheetView>
-      </BottomSheetModal>
-    </>
-  );
-}
-
-function migration_20241124() {
-  const router = useRouter();
-  const { deleteAllFiles } = useDownload();
-  Alert.alert(
-    t("home.downloads.new_app_version_requires_re_download"),
-    t("home.downloads.new_app_version_requires_re_download_description"),
-    [
-      {
-        text: t("home.downloads.back"),
-        onPress: () => router.back(),
-      },
-      {
-        text: t("home.downloads.delete"),
-        style: "destructive",
-        onPress: async () => await deleteAllFiles(),
-      },
-    ],
-  );
-}
--- a/app/(auth)/(tabs)/(home)/index.tsx
+++ b/app/(auth)/(tabs)/(home)/index.tsx
@@ -1,5 +1,371 @@
-import { HomeIndex } from "@/components/settings/HomeIndex";
+import { Button } from "@/components/Button";
+import { Text } from "@/components/common/Text";
+import { LargeMovieCarousel } from "@/components/home/LargeMovieCarousel";
+import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
+import { Loader } from "@/components/Loader";
+import { MediaListSection } from "@/components/medialists/MediaListSection";
+import { Colors } from "@/constants/Colors";
+import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { Feather, Ionicons } from "@expo/vector-icons";
+import { Api } from "@jellyfin/sdk";
+import {
+  BaseItemDto,
+  BaseItemKind,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import {
+  getItemsApi,
+  getSuggestionsApi,
+  getTvShowsApi,
+  getUserLibraryApi,
+  getUserViewsApi,
+} from "@jellyfin/sdk/lib/utils/api";
+import NetInfo from "@react-native-community/netinfo";
+import { QueryFunction, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useNavigation, useRouter } from "expo-router";
+import { useAtomValue } from "jotai";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import {
+  ActivityIndicator,
+  RefreshControl,
+  ScrollView,
+  TouchableOpacity,
+  View,
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";

-export default function page() {
-  return <HomeIndex />;
+type ScrollingCollectionListSection = {
+  type: "ScrollingCollectionList";
+  title?: string;
+  queryKey: (string | undefined | null)[];
+  queryFn: QueryFunction<BaseItemDto[]>;
+  orientation?: "horizontal" | "vertical";
+};
+
+type MediaListSection = {
+  type: "MediaListSection";
+  queryKey: (string | undefined)[];
+  queryFn: QueryFunction<BaseItemDto>;
+};
+
+type Section = ScrollingCollectionListSection | MediaListSection;
+
+export default function index() {
+  const router = useRouter();
+
+  const api = useAtomValue(apiAtom);
+  const user = useAtomValue(userAtom);
+
+  const [loading, setLoading] = useState(false);
+  const [settings, _] = useSettings();
+
+  const [isConnected, setIsConnected] = useState<boolean | null>(null);
+  const [loadingRetry, setLoadingRetry] = useState(false);
+
+  const navigation = useNavigation();
+
+  const insets = useSafeAreaInsets();
+
+  const checkConnection = useCallback(async () => {
+    setLoadingRetry(true);
+    const state = await NetInfo.fetch();
+    setIsConnected(state.isConnected);
+    setLoadingRetry(false);
+  }, []);
+
+  useEffect(() => {
+    const unsubscribe = NetInfo.addEventListener((state) => {
+      if (state.isConnected == false || state.isInternetReachable === false)
+        setIsConnected(false);
+      else setIsConnected(true);
+    });
+
+    NetInfo.fetch().then((state) => {
+      setIsConnected(state.isConnected);
+    });
+
+    return () => {
+      unsubscribe();
+    };
+  }, []);
+
+  const {
+    data: userViews,
+    isError: e1,
+    isLoading: l1,
+  } = useQuery({
+    queryKey: ["home", "userViews", user?.Id],
+    queryFn: async () => {
+      if (!api || !user?.Id) {
+        return null;
+      }
+
+      const response = await getUserViewsApi(api).getUserViews({
+        userId: user.Id,
+      });
+
+      return response.data.Items || null;
+    },
+    enabled: !!api && !!user?.Id,
+    staleTime: 60 * 1000,
+  });
+
+  const {
+    data: mediaListCollections,
+    isError: e2,
+    isLoading: l2,
+  } = useQuery({
+    queryKey: ["home", "sf_promoted", user?.Id, settings?.usePopularPlugin],
+    queryFn: async () => {
+      if (!api || !user?.Id) return [];
+
+      const response = await getItemsApi(api).getItems({
+        userId: user.Id,
+        tags: ["sf_promoted"],
+        recursive: true,
+        fields: ["Tags"],
+        includeItemTypes: ["BoxSet"],
+      });
+
+      return response.data.Items || [];
+    },
+    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
+    staleTime: 60 * 1000,
+  });
+
+  const collections = useMemo(() => {
+    const allow = ["movies", "tvshows"];
+    return (
+      userViews?.filter(
+        (c) => c.CollectionType && allow.includes(c.CollectionType)
+      ) || []
+    );
+  }, [userViews]);
+
+  const invalidateCache = useInvalidatePlaybackProgressCache();
+
+  const refetch = useCallback(async () => {
+    setLoading(true);
+    await invalidateCache();
+    setLoading(false);
+  }, []);
+
+  const createCollectionConfig = useCallback(
+    (
+      title: string,
+      queryKey: string[],
+      includeItemTypes: BaseItemKind[],
+      parentId: string | undefined
+    ): ScrollingCollectionListSection => ({
+      title,
+      queryKey,
+      queryFn: async () => {
+        if (!api) return [];
+        return (
+          (
+            await getUserLibraryApi(api).getLatestMedia({
+              userId: user?.Id,
+              limit: 20,
+              fields: ["PrimaryImageAspectRatio", "Path"],
+              imageTypeLimit: 1,
+              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+              includeItemTypes,
+              parentId,
+            })
+          ).data || []
+        );
+      },
+      type: "ScrollingCollectionList",
+    }),
+    [api, user?.Id]
+  );
+
+  const sections = useMemo(() => {
+    if (!api || !user?.Id) return [];
+
+    const latestMediaViews = collections.map((c) => {
+      const includeItemTypes: BaseItemKind[] =
+        c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
+      const title = "Recently Added in " + c.Name;
+      const queryKey = [
+        "home",
+        "recentlyAddedIn" + c.CollectionType,
+        user?.Id!,
+        c.Id!,
+      ];
+      return createCollectionConfig(
+        title || "",
+        queryKey,
+        includeItemTypes,
+        c.Id
+      );
+    });
+
+    const ss: Section[] = [
+      {
+        title: "Continue Watching",
+        queryKey: ["home", "resumeItems"],
+        queryFn: async () =>
+          (
+            await getItemsApi(api).getResumeItems({
+              userId: user.Id,
+              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+              includeItemTypes: ["Movie", "Series", "Episode"],
+            })
+          ).data.Items || [],
+        type: "ScrollingCollectionList",
+        orientation: "horizontal",
+      },
+      {
+        title: "Next Up",
+        queryKey: ["home", "nextUp-all"],
+        queryFn: async () =>
+          (
+            await getTvShowsApi(api).getNextUp({
+              userId: user?.Id,
+              fields: ["MediaSourceCount"],
+              limit: 20,
+              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+              enableResumable: false,
+            })
+          ).data.Items || [],
+        type: "ScrollingCollectionList",
+        orientation: "horizontal",
+      },
+      ...latestMediaViews,
+      ...(mediaListCollections?.map(
+        (ml) =>
+          ({
+            title: ml.Name,
+            queryKey: ["home", "mediaList", ml.Id!],
+            queryFn: async () => ml,
+            type: "MediaListSection",
+            orientation: "vertical",
+          } as Section)
+      ) || []),
+      {
+        title: "Suggested Movies",
+        queryKey: ["home", "suggestedMovies", user?.Id],
+        queryFn: async () =>
+          (
+            await getSuggestionsApi(api).getSuggestions({
+              userId: user?.Id,
+              limit: 10,
+              mediaType: ["Video"],
+              type: ["Movie"],
+            })
+          ).data.Items || [],
+        type: "ScrollingCollectionList",
+        orientation: "vertical",
+      },
+      {
+        title: "Suggested Episodes",
+        queryKey: ["home", "suggestedEpisodes", user?.Id],
+        queryFn: async () => {
+          try {
+            const suggestions = await getSuggestions(api, user.Id);
+            const nextUpPromises = suggestions.map((series) =>
+              getNextUp(api, user.Id, series.Id)
+            );
+            const nextUpResults = await Promise.all(nextUpPromises);
+
+            return nextUpResults.filter((item) => item !== null) || [];
+          } catch (error) {
+            console.error("Error fetching data:", error);
+            return [];
+          }
+        },
+        type: "ScrollingCollectionList",
+        orientation: "horizontal",
+      },
+    ];
+    return ss;
+  }, [api, user?.Id, collections, mediaListCollections]);
+
+  if (e1 || e2)
+    return (
+      <View className="flex flex-col items-center justify-center h-full -mt-6">
+        <Text className="text-3xl font-bold mb-2">Oops!</Text>
+        <Text className="text-center opacity-70">
+          Something went wrong.{"\n"}Please log out and in again.
+        </Text>
+      </View>
+    );
+
+  if (l1 || l2)
+    return (
+      <View className="justify-center items-center h-full">
+        <Loader />
+      </View>
+    );
+
+  return (
+    <ScrollView
+      nestedScrollEnabled
+      contentInsetAdjustmentBehavior="automatic"
+      refreshControl={
+        <RefreshControl refreshing={loading} onRefresh={refetch} />
+      }
+      contentContainerStyle={{
+        paddingLeft: insets.left,
+        paddingRight: insets.right,
+        paddingBottom: 16,
+      }}
+    >
+      <View className="flex flex-col space-y-4">
+        <LargeMovieCarousel />
+
+        {sections.map((section, index) => {
+          if (section.type === "ScrollingCollectionList") {
+            return (
+              <ScrollingCollectionList
+                key={index}
+                title={section.title}
+                queryKey={section.queryKey}
+                queryFn={section.queryFn}
+                orientation={section.orientation}
+              />
+            );
+          } else if (section.type === "MediaListSection") {
+            return (
+              <MediaListSection
+                key={index}
+                queryKey={section.queryKey}
+                queryFn={section.queryFn}
+              />
+            );
+          }
+          return null;
+        })}
+      </View>
+    </ScrollView>
+  );
+}
+
+// Function to get suggestions
+async function getSuggestions(api: Api, userId: string | undefined) {
+  if (!userId) return [];
+  const response = await getSuggestionsApi(api).getSuggestions({
+    userId,
+    limit: 10,
+    mediaType: ["Unknown"],
+    type: ["Series"],
+  });
+  return response.data.Items ?? [];
+}
+
+// Function to get the next up TV show for a series
+async function getNextUp(
+  api: Api,
+  userId: string | undefined,
+  seriesId: string | undefined
+) {
+  if (!userId || !seriesId) return null;
+  const response = await getTvShowsApi(api).getNextUp({
+    userId,
+    seriesId,
+    limit: 1,
+  });
+  return response.data.Items?.[0] ?? null;
 }
--- a/app/(auth)/(tabs)/(home)/intro/page.tsx
+++ b/app/(auth)/(tabs)/(home)/intro/page.tsx
@@ -1,141 +0,0 @@
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import { storage } from "@/utils/mmkv";
-import { Feather, Ionicons } from "@expo/vector-icons";
-import { Image } from "expo-image";
-import { useFocusEffect, useRouter } from "expo-router";
-import { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { Linking, TouchableOpacity, View } from "react-native";
-
-export default function page() {
-  const router = useRouter();
-  const { t } = useTranslation();
-
-  useFocusEffect(
-    useCallback(() => {
-      storage.set("hasShownIntro", true);
-    }, []),
-  );
-
-  return (
-    <View className='bg-neutral-900 h-full py-16 px-4 space-y-8'>
-      <View>
-        <Text className='text-3xl font-bold text-center mb-2'>
-          {t("home.intro.welcome_to_streamyfin")}
-        </Text>
-        <Text className='text-center'>
-          {t("home.intro.a_free_and_open_source_client_for_jellyfin")}
-        </Text>
-      </View>
-
-      <View>
-        <Text className='text-lg font-bold'>
-          {t("home.intro.features_title")}
-        </Text>
-        <Text className='text-xs'>{t("home.intro.features_description")}</Text>
-        <View className='flex flex-row items-center mt-4'>
-          <Image
-            source={require("@/assets/icons/jellyseerr-logo.svg")}
-            style={{
-              width: 50,
-              height: 50,
-            }}
-          />
-          <View className='shrink ml-2'>
-            <Text className='font-bold mb-1'>Jellyseerr</Text>
-            <Text className='shrink text-xs'>
-              {t("home.intro.jellyseerr_feature_description")}
-            </Text>
-          </View>
-        </View>
-        <View className='flex flex-row items-center mt-4'>
-          <View
-            style={{
-              width: 50,
-              height: 50,
-            }}
-            className='flex items-center justify-center'
-          >
-            <Ionicons name='cloud-download-outline' size={32} color='white' />
-          </View>
-          <View className='shrink ml-2'>
-            <Text className='font-bold mb-1'>
-              {t("home.intro.downloads_feature_title")}
-            </Text>
-            <Text className='shrink text-xs'>
-              {t("home.intro.downloads_feature_description")}
-            </Text>
-          </View>
-        </View>
-        <View className='flex flex-row items-center mt-4'>
-          <View
-            style={{
-              width: 50,
-              height: 50,
-            }}
-            className='flex items-center justify-center'
-          >
-            <Feather name='cast' size={28} color={"white"} />
-          </View>
-          <View className='shrink ml-2'>
-            <Text className='font-bold mb-1'>Chromecast</Text>
-            <Text className='shrink text-xs'>
-              {t("home.intro.chromecast_feature_description")}
-            </Text>
-          </View>
-        </View>
-        <View className='flex flex-row items-center mt-4'>
-          <View
-            style={{
-              width: 50,
-              height: 50,
-            }}
-            className='flex items-center justify-center'
-          >
-            <Feather name='settings' size={28} color={"white"} />
-          </View>
-          <View className='shrink ml-2'>
-            <Text className='font-bold mb-1'>
-              {t("home.intro.centralised_settings_plugin_title")}
-            </Text>
-            <Text className='shrink text-xs'>
-              {t("home.intro.centralised_settings_plugin_description")}{" "}
-              <Text
-                className='text-purple-600'
-                onPress={() => {
-                  Linking.openURL(
-                    "https://github.com/streamyfin/jellyfin-plugin-streamyfin",
-                  );
-                }}
-              >
-                {t("home.intro.read_more")}
-              </Text>
-            </Text>
-          </View>
-        </View>
-      </View>
-      <View>
-        <Button
-          onPress={() => {
-            router.back();
-          }}
-          className='mt-4'
-        >
-          {t("home.intro.done_button")}
-        </Button>
-        <TouchableOpacity
-          onPress={() => {
-            router.back();
-            router.push("/settings");
-          }}
-          className='mt-4'
-        >
-          <Text className='text-purple-600 text-center'>
-            {t("home.intro.go_to_settings_button")}
-          </Text>
-        </TouchableOpacity>
-      </View>
-    </View>
-  );
-}
--- a/app/(auth)/(tabs)/(home)/sessions/index.tsx
+++ b/app/(auth)/(tabs)/(home)/sessions/index.tsx
@@ -1,378 +0,0 @@
-import { Badge } from "@/components/Badge";
-import { Loader } from "@/components/Loader";
-import { Text } from "@/components/common/Text";
-import Poster from "@/components/posters/Poster";
-import { useInterval } from "@/hooks/useInterval";
-import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { formatBitrate } from "@/utils/bitrate";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { formatTimeString } from "@/utils/time";
-import {
-  AntDesign,
-  Entypo,
-  Ionicons,
-  MaterialCommunityIcons,
-} from "@expo/vector-icons";
-import {
-  HardwareAccelerationType,
-  type SessionInfoDto,
-} from "@jellyfin/sdk/lib/generated-client";
-import { FlashList } from "@shopify/flash-list";
-import { useQuery } from "@tanstack/react-query";
-import { useAtomValue } from "jotai";
-import React, { useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-
-export default function page() {
-  const { sessions, isLoading } = useSessions({} as useSessionsProps);
-  const { t } = useTranslation();
-
-  if (isLoading)
-    return (
-      <View className='justify-center items-center h-full'>
-        <Loader />
-      </View>
-    );
-
-  if (!sessions || sessions.length === 0)
-    return (
-      <View className='h-full w-full flex justify-center items-center'>
-        <Text className='text-lg text-neutral-500'>
-          {t("home.sessions.no_active_sessions")}
-        </Text>
-      </View>
-    );
-
-  return (
-    <FlashList
-      contentInsetAdjustmentBehavior='automatic'
-      contentContainerStyle={{
-        paddingTop: 17,
-        paddingHorizontal: 17,
-        paddingBottom: 150,
-      }}
-      data={sessions}
-      renderItem={({ item }) => <SessionCard session={item} />}
-      keyExtractor={(item) => item.Id || ""}
-      estimatedItemSize={200}
-    />
-  );
-}
-
-interface SessionCardProps {
-  session: SessionInfoDto;
-}
-
-const SessionCard = ({ session }: SessionCardProps) => {
-  const api = useAtomValue(apiAtom);
-  const [remainingTicks, setRemainingTicks] = useState<number>(0);
-
-  const tick = () => {
-    if (session.PlayState?.IsPaused) return;
-    setRemainingTicks(remainingTicks - 10000000);
-  };
-
-  const getProgressPercentage = () => {
-    if (!session.NowPlayingItem || !session.NowPlayingItem.RunTimeTicks) {
-      return 0;
-    }
-
-    return Math.round(
-      (100 / session.NowPlayingItem?.RunTimeTicks) *
-        (session.NowPlayingItem?.RunTimeTicks - remainingTicks),
-    );
-  };
-
-  useEffect(() => {
-    const currentTime = session.PlayState?.PositionTicks;
-    const duration = session.NowPlayingItem?.RunTimeTicks;
-    if (
-      duration !== null &&
-      duration !== undefined &&
-      currentTime !== null &&
-      currentTime !== undefined
-    ) {
-      const remainingTimeTicks = duration - currentTime;
-      setRemainingTicks(remainingTimeTicks);
-    }
-  }, [session]);
-
-  const { data: ipInfo } = useQuery({
-    queryKey: ["ipinfo", session.RemoteEndPoint],
-    cacheTime: Number.POSITIVE_INFINITY,
-    queryFn: async () => {
-      const resp = await api.axiosInstance.get(
-        `https://freeipapi.com/api/json/${session.RemoteEndPoint}`,
-      );
-      return resp.data;
-    },
-  });
-
-  useInterval(tick, 1000);
-
-  return (
-    <View className='flex flex-col shadow-md bg-neutral-900 rounded-2xl mb-4'>
-      <View className='flex flex-row p-4'>
-        <View className='w-20 pr-4'>
-          <Poster
-            id={session.NowPlayingItem?.Id}
-            url={getPrimaryImageUrl({ api, item: session.NowPlayingItem })}
-          />
-        </View>
-        <View className='w-full flex-1'>
-          <View className='flex flex-row justify-between'>
-            <View className='flex-1 pr-4'>
-              {session.NowPlayingItem?.Type === "Episode" ? (
-                <>
-                  <Text className='font-bold'>
-                    {session.NowPlayingItem?.Name}
-                  </Text>
-                  <Text numberOfLines={1} className='text-xs opacity-50'>
-                    {`S${session.NowPlayingItem.ParentIndexNumber?.toString()}:E${session.NowPlayingItem.IndexNumber?.toString()}`}
-                    {" - "}
-                    {session.NowPlayingItem.SeriesName}
-                  </Text>
-                </>
-              ) : (
-                <>
-                  <Text className='font-bold'>
-                    {session.NowPlayingItem?.Name}
-                  </Text>
-                  <Text className='text-xs opacity-50'>
-                    {session.NowPlayingItem?.ProductionYear}
-                  </Text>
-                  <Text className='text-xs opacity-50'>
-                    {session.NowPlayingItem?.SeriesName}
-                  </Text>
-                </>
-              )}
-            </View>
-            <Text className='text-xs opacity-50 align-right text-right'>
-              {session.UserName}
-              {"\n"}
-              {session.Client}
-              {"\n"}
-              {session.DeviceName}
-              {"\n"}
-              {ipInfo?.cityName} {ipInfo?.countryCode}
-            </Text>
-          </View>
-          <View className='flex-1' />
-          <View className='flex flex-col align-bottom'>
-            <View className='flex flex-row justify-between align-bottom mb-1'>
-              <Text className='-ml-0.5 text-xs opacity-50 align-left text-left'>
-                {!session.PlayState?.IsPaused ? (
-                  <Ionicons name='play' size={14} color='white' />
-                ) : (
-                  <Ionicons name='pause' size={14} color='white' />
-                )}
-              </Text>
-              <Text className='text-xs opacity-50 align-right text-right'>
-                {formatTimeString(remainingTicks, "tick")} left
-              </Text>
-            </View>
-            <View className='align-bottom bg-gray-800 h-1'>
-              <View
-                className={"bg-purple-600 h-full"}
-                style={{
-                  width: `${getProgressPercentage()}%`,
-                }}
-              />
-            </View>
-          </View>
-        </View>
-      </View>
-      <TranscodingView session={session} />
-    </View>
-  );
-};
-
-interface TranscodingBadgesProps {
-  properties: StreamProps;
-}
-
-const TranscodingBadges = ({ properties }: TranscodingBadgesProps) => {
-  const iconMap = {
-    bitrate: <Ionicons name='speedometer-outline' size={12} color='white' />,
-    codec: <Ionicons name='layers-outline' size={12} color='white' />,
-    videoRange: (
-      <Ionicons name='color-palette-outline' size={12} color='white' />
-    ),
-    resolution: <Ionicons name='film-outline' size={12} color='white' />,
-    language: <Ionicons name='language-outline' size={12} color='white' />,
-    audioChannels: <Ionicons name='mic-outline' size={12} color='white' />,
-    hwType: <Ionicons name='hardware-chip-outline' size={12} color='white' />,
-  } as const;
-
-  const icon = (val: string) => {
-    return (
-      iconMap[val as keyof typeof iconMap] ?? (
-        <Ionicons name='layers-outline' size={12} color='white' />
-      )
-    );
-  };
-
-  const formatVal = (key: string, val: any) => {
-    switch (key) {
-      case "bitrate":
-        return formatBitrate(val);
-      case "hwType":
-        return val === HardwareAccelerationType.None ? "sw" : "hw";
-      default:
-        return val;
-    }
-  };
-
-  return Object.entries(properties)
-    .filter(([_, value]) => value !== undefined && value !== null)
-    .map(([key]) => (
-      <Badge
-        key={key}
-        variant='gray'
-        className='m-0 p-0 pt-0.5 mr-1'
-        text={formatVal(key, properties[key as keyof StreamProps])}
-        iconLeft={icon(key)}
-      />
-    ));
-};
-
-interface StreamProps {
-  hwType?: HardwareAccelerationType | null | undefined;
-  resolution?: string | null | undefined;
-  language?: string | null | undefined;
-  codec?: string | null | undefined;
-  bitrate?: number | null | undefined;
-  videoRange?: string | null | undefined;
-  audioChannels?: string | null | undefined;
-}
-
-interface TranscodingStreamViewProps {
-  title: string | undefined;
-  value?: string;
-  isTranscoding: boolean;
-  transcodeValue?: string | undefined | null;
-  properties: StreamProps;
-  transcodeProperties?: StreamProps;
-}
-
-const TranscodingStreamView = ({
-  title,
-  isTranscoding,
-  properties,
-  transcodeProperties,
-  value,
-  transcodeValue,
-}: TranscodingStreamViewProps) => {
-  return (
-    <View className='flex flex-col pt-2 first:pt-0'>
-      <View className='flex flex-row'>
-        <Text className='text-xs opacity-50 w-20 font-bold text-right pr-4'>
-          {title}
-        </Text>
-        <Text className='flex-1'>
-          <TranscodingBadges properties={properties} />
-        </Text>
-      </View>
-      {isTranscoding && transcodeProperties ? (
-        <>
-          <View className='flex flex-row'>
-            <Text className='-mt-0 text-xs opacity-50 w-20 font-bold text-right pr-4'>
-              <MaterialCommunityIcons
-                name='arrow-right-bottom'
-                size={14}
-                color='white'
-              />
-            </Text>
-            <Text className='flex-1 text-sm mt-1'>
-              <TranscodingBadges properties={transcodeProperties} />
-            </Text>
-          </View>
-        </>
-      ) : null}
-    </View>
-  );
-};
-
-const TranscodingView = ({ session }: SessionCardProps) => {
-  const videoStream = useMemo(() => {
-    return session.NowPlayingItem?.MediaStreams?.filter(
-      (s) => s.Type === "Video",
-    )[0];
-  }, [session]);
-
-  const audioStream = useMemo(() => {
-    const index = session.PlayState?.AudioStreamIndex;
-    return index !== null && index !== undefined
-      ? session.NowPlayingItem?.MediaStreams?.[index]
-      : undefined;
-  }, [session.PlayState?.AudioStreamIndex]);
-
-  const subtitleStream = useMemo(() => {
-    const index = session.PlayState?.SubtitleStreamIndex;
-    return index !== null && index !== undefined
-      ? session.NowPlayingItem?.MediaStreams?.[index]
-      : undefined;
-  }, [session.PlayState?.SubtitleStreamIndex]);
-
-  const isTranscoding = useMemo(() => {
-    return (
-      session.PlayState?.PlayMethod === "Transcode" && session.TranscodingInfo
-    );
-  }, [session.PlayState?.PlayMethod, session.TranscodingInfo]);
-
-  const videoStreamTitle = () => {
-    return videoStream?.DisplayTitle?.split(" ")[0];
-  };
-
-  return (
-    <View className='flex flex-col bg-neutral-800 rounded-b-2xl p-4 pt-2'>
-      <TranscodingStreamView
-        title='Video'
-        properties={{
-          resolution: videoStreamTitle(),
-          bitrate: videoStream?.BitRate,
-          codec: videoStream?.Codec,
-        }}
-        transcodeProperties={{
-          hwType: session.TranscodingInfo?.HardwareAccelerationType,
-          bitrate: session.TranscodingInfo?.Bitrate,
-          codec: session.TranscodingInfo?.VideoCodec,
-        }}
-        isTranscoding={
-          !!(isTranscoding && !session.TranscodingInfo?.IsVideoDirect)
-        }
-      />
-
-      <TranscodingStreamView
-        title='Audio'
-        properties={{
-          language: audioStream?.Language,
-          bitrate: audioStream?.BitRate,
-          codec: audioStream?.Codec,
-          audioChannels: audioStream?.ChannelLayout,
-        }}
-        transcodeProperties={{
-          codec: session.TranscodingInfo?.AudioCodec,
-          audioChannels: session.TranscodingInfo?.AudioChannels?.toString(),
-        }}
-        isTranscoding={
-          !!(isTranscoding && !session.TranscodingInfo?.IsVideoDirect)
-        }
-      />
-
-      {subtitleStream && (
-        <TranscodingStreamView
-          title='Subtitle'
-          isTranscoding={false}
-          properties={{
-            language: subtitleStream?.Language,
-            codec: subtitleStream?.Codec,
-          }}
-          transcodeValue={null}
-        />
-      )}
-    </View>
-  );
-};
--- a/app/(auth)/(tabs)/(home)/settings.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tsx
@@ -1,119 +1,106 @@
+import { Button } from "@/components/Button";
 import { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
-import { ListItem } from "@/components/list/ListItem";
-import { AppLanguageSelector } from "@/components/settings/AppLanguageSelector";
-import { AudioToggles } from "@/components/settings/AudioToggles";
-import { ChromecastSettings } from "@/components/settings/ChromecastSettings";
-import DownloadSettings from "@/components/settings/DownloadSettings";
-import { MediaProvider } from "@/components/settings/MediaContext";
-import { MediaToggles } from "@/components/settings/MediaToggles";
-import { OtherSettings } from "@/components/settings/OtherSettings";
-import { PluginSettings } from "@/components/settings/PluginSettings";
-import { QuickConnect } from "@/components/settings/QuickConnect";
-import { StorageSettings } from "@/components/settings/StorageSettings";
-import { SubtitleToggles } from "@/components/settings/SubtitleToggles";
-import { UserInfo } from "@/components/settings/UserInfo";
-import { useHaptic } from "@/hooks/useHaptic";
-import { useJellyfin } from "@/providers/JellyfinProvider";
-import { userAtom } from "@/providers/JellyfinProvider";
-import { clearLogs } from "@/utils/log";
-import { storage } from "@/utils/mmkv";
-import { useNavigation, useRouter } from "expo-router";
-import { t } from "i18next";
+import { ListItem } from "@/components/ListItem";
+import { SettingToggles } from "@/components/settings/SettingToggles";
+import { apiAtom, useJellyfin, userAtom } from "@/providers/JellyfinProvider";
+import { clearLogs, useLog } from "@/utils/log";
+import { getQuickConnectApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import * as FileSystem from "expo-file-system";
 import { useAtom } from "jotai";
-import React, { useEffect } from "react";
-import { ScrollView, Switch, TouchableOpacity, View } from "react-native";
+import { Alert, ScrollView, View } from "react-native";
+import * as Progress from "react-native-progress";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { toast } from "sonner-native";

 export default function settings() {
-  const router = useRouter();
-  const insets = useSafeAreaInsets();
-  const [user] = useAtom(userAtom);
  const { logout } = useJellyfin();
-  const successHapticFeedback = useHaptic("success");
+  const { logs } = useLog();

-  const onClearLogsClicked = async () => {
-    clearLogs();
-    successHapticFeedback();
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const insets = useSafeAreaInsets();
+
+  const openQuickConnectAuthCodeInput = () => {
+    Alert.prompt(
+      "Quick connect",
+      "Enter the quick connect code",
+      async (text) => {
+        if (text) {
+          try {
+            const res = await getQuickConnectApi(api!).authorizeQuickConnect({
+              code: text,
+              userId: user?.Id,
+            });
+            if (res.status === 200) {
+              Alert.alert("Success", "Quick connect authorized");
+            } else {
+              Alert.alert("Error", "Invalid code");
+            }
+          } catch (e) {
+            Alert.alert("Error", "Invalid code");
+          }
+        }
+      }
+    );
  };

-  const navigation = useNavigation();
-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () => (
-        <TouchableOpacity
-          onPress={() => {
-            logout();
-          }}
-        >
-          <Text className='text-red-600'>
-            {t("home.settings.log_out_button")}
-          </Text>
-        </TouchableOpacity>
-      ),
-    });
-  }, []);
-
  return (
    <ScrollView
      contentContainerStyle={{
        paddingLeft: insets.left,
        paddingRight: insets.right,
+        paddingBottom: 100,
      }}
    >
-      <View className='p-4 flex flex-col gap-y-4'>
-        <UserInfo />
+      <View className="p-4 flex flex-col gap-y-4">
+        <View>
+          <Text className="font-bold text-lg mb-2">User Info</Text>

-        <QuickConnect className='mb-4' />
-
-        <MediaProvider>
-          <MediaToggles className='mb-4' />
-          <AudioToggles className='mb-4' />
-          <SubtitleToggles className='mb-4' />
-        </MediaProvider>
-
-        <OtherSettings />
-
-        <DownloadSettings />
-
-        <PluginSettings />
-
-        <AppLanguageSelector />
-
-        <ChromecastSettings />
-
-        <ListGroup title={"Intro"}>
-          <ListItem
-            onPress={() => {
-              router.push("/intro/page");
-            }}
-            title={t("home.settings.intro.show_intro")}
-          />
-          <ListItem
-            textColor='red'
-            onPress={() => {
-              storage.set("hasShownIntro", false);
-            }}
-            title={t("home.settings.intro.reset_intro")}
-          />
-        </ListGroup>
-
-        <View className='mb-4'>
-          <ListGroup title={t("home.settings.logs.logs_title")}>
-            <ListItem
-              onPress={() => router.push("/settings/logs/page")}
-              showArrow
-              title={t("home.settings.logs.logs_title")}
-            />
-            <ListItem
-              textColor='red'
-              onPress={onClearLogsClicked}
-              title={t("home.settings.logs.delete_all_logs")}
-            />
-          </ListGroup>
+          <View className="flex flex-col rounded-xl overflow-hidden border-neutral-800 divide-y-2 divide-solid divide-neutral-800 ">
+            <ListItem title="User" subTitle={user?.Name} />
+            <ListItem title="Server" subTitle={api?.basePath} />
+            <ListItem title="Token" subTitle={api?.accessToken} />
+          </View>
+          <Button className="my-2.5" color="black" onPress={logout}>
+            Log out
+          </Button>
        </View>

-        <StorageSettings />
+        <View>
+          <Text className="font-bold text-lg mb-2">Quick connect</Text>
+          <Button onPress={openQuickConnectAuthCodeInput} color="black">
+            Authorize
+          </Button>
+        </View>
+
+        <SettingToggles />
+
+        <View>
+          <Text className="font-bold text-lg mb-2">Logs</Text>
+          <View className="flex flex-col space-y-2">
+            {logs?.map((log, index) => (
+              <View key={index} className="bg-neutral-900 rounded-xl p-3">
+                <Text
+                  className={`
+                  mb-1
+              ${log.level === "INFO" && "text-blue-500"}
+              ${log.level === "ERROR" && "text-red-500"}
+                `}
+                >
+                  {log.level}
+                </Text>
+                <Text uiTextView selectable className="text-xs">
+                  {log.message}
+                </Text>
+              </View>
+            ))}
+            {logs?.length === 0 && (
+              <Text className="opacity-50">No logs available</Text>
+            )}
+          </View>
+        </View>
      </View>
    </ScrollView>
  );
--- a/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
@@ -1,67 +0,0 @@
-import { Loader } from "@/components/Loader";
-import { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
-import { ListItem } from "@/components/list/ListItem";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useAtomValue } from "jotai";
-import { useTranslation } from "react-i18next";
-import { Switch, View } from "react-native";
-
-export default function page() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
-  const user = useAtomValue(userAtom);
-  const api = useAtomValue(apiAtom);
-
-  const { t } = useTranslation();
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["user-views", user?.Id],
-    queryFn: async () => {
-      const response = await getUserViewsApi(api!).getUserViews({
-        userId: user?.Id,
-      });
-
-      return response.data.Items || null;
-    },
-  });
-
-  if (!settings) return null;
-
-  if (isLoading)
-    return (
-      <View className='mt-4'>
-        <Loader />
-      </View>
-    );
-
-  return (
-    <DisabledSetting
-      disabled={pluginSettings?.hiddenLibraries?.locked === true}
-      className='px-4'
-    >
-      <ListGroup>
-        {data?.map((view) => (
-          <ListItem key={view.Id} title={view.Name} onPress={() => {}}>
-            <Switch
-              value={settings.hiddenLibraries?.includes(view.Id!) || false}
-              onValueChange={(value) => {
-                updateSettings({
-                  hiddenLibraries: value
-                    ? [...(settings.hiddenLibraries || []), view.Id!]
-                    : settings.hiddenLibraries?.filter((id) => id !== view.Id),
-                });
-              }}
-            />
-          </ListItem>
-        ))}
-      </ListGroup>
-      <Text className='px-4 text-xs text-neutral-500 mt-1'>
-        {t("home.settings.other.select_liraries_you_want_to_hide")}
-      </Text>
-    </DisabledSetting>
-  );
-}
--- a/app/(auth)/(tabs)/(home)/settings/jellyseerr/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/jellyseerr/page.tsx
@@ -1,16 +0,0 @@
-import DisabledSetting from "@/components/settings/DisabledSetting";
-import { JellyseerrSettings } from "@/components/settings/Jellyseerr";
-import { useSettings } from "@/utils/atoms/settings";
-
-export default function page() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
-
-  return (
-    <DisabledSetting
-      disabled={pluginSettings?.jellyseerrServerUrl?.locked === true}
-      className='p-4'
-    >
-      <JellyseerrSettings />
-    </DisabledSetting>
-  );
-}
--- a/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
@@ -1,157 +0,0 @@
-import { Loader } from "@/components/Loader";
-import { Text } from "@/components/common/Text";
-import { FilterButton } from "@/components/filters/FilterButton";
-import { LogLevel, useLog, writeErrorLog } from "@/utils/log";
-import * as FileSystem from "expo-file-system";
-import { useNavigation } from "expo-router";
-import * as Sharing from "expo-sharing";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { ScrollView, TouchableOpacity, View } from "react-native";
-import Collapsible from "react-native-collapsible";
-
-export default function page() {
-  const navigation = useNavigation();
-  const { logs } = useLog();
-  const { t } = useTranslation();
-
-  const defaultLevels: LogLevel[] = ["INFO", "ERROR", "DEBUG", "WARN"];
-  const codeBlockStyle = {
-    backgroundColor: "#000",
-    padding: 10,
-    fontFamily: "monospace",
-    maxHeight: 300,
-  };
-
-  const [loading, setLoading] = useState<boolean>(false);
-  const [state, setState] = useState<Record<string, boolean>>({});
-
-  const [order, setOrder] = useState<"asc" | "desc">("desc");
-  const [levels, setLevels] = useState<LogLevel[]>(defaultLevels);
-
-  const filteredLogs = useMemo(
-    () =>
-      logs
-        ?.filter((log) => levels.includes(log.level))
-        ?.[
-          // Already in asc order as they are recorded. just reverse for desc
-          order === "desc" ? "reverse" : "concat"
-        ]?.(),
-    [logs, order, levels],
-  );
-
-  // Sharing it as txt while its formatted allows us to share it with many more applications
-  const share = useCallback(async () => {
-    const uri = `${FileSystem.documentDirectory}logs.txt`;
-
-    setLoading(true);
-    FileSystem.writeAsStringAsync(uri, JSON.stringify(filteredLogs))
-      .then(() => {
-        setLoading(false);
-        Sharing.shareAsync(uri, { mimeType: "txt", UTI: "txt" });
-      })
-      .catch((e) =>
-        writeErrorLog("Something went wrong attempting to export", e),
-      )
-      .finally(() => setLoading(false));
-  }, [filteredLogs]);
-
-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () =>
-        loading ? (
-          <Loader />
-        ) : (
-          <TouchableOpacity onPress={share}>
-            <Text>{t("home.settings.logs.export_logs")}</Text>
-          </TouchableOpacity>
-        ),
-    });
-  }, [share, loading]);
-
-  return (
-    <>
-      <View className='flex flex-row justify-end py-2 px-4 space-x-2'>
-        <FilterButton
-          id='order'
-          queryKey='log'
-          queryFn={async () => ["asc", "desc"]}
-          set={(values) => setOrder(values[0])}
-          values={[order]}
-          title={t("library.filters.sort_order")}
-          renderItemLabel={(order) => t(`library.filters.${order}`)}
-          showSearch={false}
-        />
-        <FilterButton
-          id='levels'
-          queryKey='log'
-          queryFn={async () => defaultLevels}
-          set={setLevels}
-          values={levels}
-          title={t("home.settings.logs.level")}
-          renderItemLabel={(level) => level}
-          showSearch={false}
-          multiple={true}
-        />
-      </View>
-      <ScrollView className='pb-4 px-4'>
-        <View className='flex flex-col space-y-2'>
-          {filteredLogs?.map((log, index) => (
-            <View className='bg-neutral-900 rounded-xl p-3' key={index}>
-              <TouchableOpacity
-                disabled={!log.data}
-                onPress={() =>
-                  setState((v) => ({
-                    ...v,
-                    [log.timestamp]: !v[log.timestamp],
-                  }))
-                }
-              >
-                <View className='flex flex-row justify-between'>
-                  <Text
-                    className={`mb-1
-                      ${log.level === "INFO" && "text-blue-500"}
-                      ${log.level === "ERROR" && "text-red-500"}
-                      ${log.level === "DEBUG" && "text-purple-500"}
-                    `}
-                  >
-                    {log.level}
-                  </Text>
-
-                  <Text className='text-xs'>
-                    {new Date(log.timestamp).toLocaleString()}
-                  </Text>
-                </View>
-                <Text uiTextView selectable className='text-xs'>
-                  {log.message}
-                </Text>
-              </TouchableOpacity>
-
-              {log.data && (
-                <>
-                  {!state[log.timestamp] && (
-                    <Text className='text-xs mt-0.5'>
-                      {t("home.settings.logs.click_for_more_info")}
-                    </Text>
-                  )}
-                  <Collapsible collapsed={!state[log.timestamp]}>
-                    <View className='mt-2 flex flex-col space-y-2'>
-                      <ScrollView className='rounded-xl' style={codeBlockStyle}>
-                        <Text>{JSON.stringify(log.data, null, 2)}</Text>
-                      </ScrollView>
-                    </View>
-                  </Collapsible>
-                </>
-              )}
-            </View>
-          ))}
-          {filteredLogs?.length === 0 && (
-            <Text className='opacity-50'>
-              {t("home.settings.logs.no_logs_available")}
-            </Text>
-          )}
-        </View>
-      </ScrollView>
-    </>
-  );
-}
--- a/app/(auth)/(tabs)/(home)/settings/marlin-search/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/marlin-search/page.tsx
@@ -1,123 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
-import { ListItem } from "@/components/list/ListItem";
-import { useSettings } from "@/utils/atoms/settings";
-import { useQueryClient } from "@tanstack/react-query";
-import { useNavigation } from "expo-router";
-import { useTranslation } from "react-i18next";
-
-import DisabledSetting from "@/components/settings/DisabledSetting";
-import React, { useEffect, useMemo, useState } from "react";
-import {
-  Linking,
-  Switch,
-  TextInput,
-  TouchableOpacity,
-  View,
-} from "react-native";
-import { toast } from "sonner-native";
-
-export default function page() {
-  const navigation = useNavigation();
-
-  const { t } = useTranslation();
-
-  const [settings, updateSettings, pluginSettings] = useSettings();
-  const queryClient = useQueryClient();
-
-  const [value, setValue] = useState<string>(settings?.marlinServerUrl || "");
-
-  const onSave = (val: string) => {
-    updateSettings({
-      marlinServerUrl: !val.endsWith("/") ? val : val.slice(0, -1),
-    });
-    toast.success(t("home.settings.plugins.marlin_search.toasts.saved"));
-  };
-
-  const handleOpenLink = () => {
-    Linking.openURL("https://github.com/fredrikburmester/marlin-search");
-  };
-
-  const disabled = useMemo(() => {
-    return (
-      pluginSettings?.searchEngine?.locked === true &&
-      pluginSettings?.marlinServerUrl?.locked === true
-    );
-  }, [pluginSettings]);
-
-  useEffect(() => {
-    if (!pluginSettings?.marlinServerUrl?.locked) {
-      navigation.setOptions({
-        headerRight: () => (
-          <TouchableOpacity onPress={() => onSave(value)}>
-            <Text className='text-blue-500'>
-              {t("home.settings.plugins.marlin_search.save_button")}
-            </Text>
-          </TouchableOpacity>
-        ),
-      });
-    }
-  }, [navigation, value]);
-
-  if (!settings) return null;
-
-  return (
-    <DisabledSetting disabled={disabled} className='px-4'>
-      <ListGroup>
-        <DisabledSetting
-          disabled={pluginSettings?.searchEngine?.locked === true}
-          showText={!pluginSettings?.marlinServerUrl?.locked}
-        >
-          <ListItem
-            title={t(
-              "home.settings.plugins.marlin_search.enable_marlin_search",
-            )}
-            onPress={() => {
-              updateSettings({ searchEngine: "Jellyfin" });
-              queryClient.invalidateQueries({ queryKey: ["search"] });
-            }}
-          >
-            <Switch
-              value={settings.searchEngine === "Marlin"}
-              onValueChange={(value) => {
-                updateSettings({ searchEngine: value ? "Marlin" : "Jellyfin" });
-                queryClient.invalidateQueries({ queryKey: ["search"] });
-              }}
-            />
-          </ListItem>
-        </DisabledSetting>
-      </ListGroup>
-
-      <DisabledSetting
-        disabled={pluginSettings?.marlinServerUrl?.locked === true}
-        showText={!pluginSettings?.searchEngine?.locked}
-        className='mt-2 flex flex-col rounded-xl overflow-hidden pl-4 bg-neutral-900 px-4'
-      >
-        <View className={"flex flex-row items-center bg-neutral-900 h-11 pr-4"}>
-          <Text className='mr-4'>
-            {t("home.settings.plugins.marlin_search.url")}
-          </Text>
-          <TextInput
-            editable={settings.searchEngine === "Marlin"}
-            className='text-white'
-            placeholder={t(
-              "home.settings.plugins.marlin_search.server_url_placeholder",
-            )}
-            value={value}
-            keyboardType='url'
-            returnKeyType='done'
-            autoCapitalize='none'
-            textContentType='URL'
-            onChangeText={(text) => setValue(text)}
-          />
-        </View>
-      </DisabledSetting>
-      <Text className='px-4 text-xs text-neutral-500 mt-1'>
-        {t("home.settings.plugins.marlin_search.marlin_search_hint")}{" "}
-        <Text className='text-blue-500' onPress={handleOpenLink}>
-          {t("home.settings.plugins.marlin_search.read_more_about_marlin")}
-        </Text>
-      </Text>
-    </DisabledSetting>
-  );
-}
--- a/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
@@ -1,93 +0,0 @@
-import { Text } from "@/components/common/Text";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-import { OptimizedServerForm } from "@/components/settings/OptimizedServerForm";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getOrSetDeviceId } from "@/utils/device";
-import { getStatistics } from "@/utils/optimize-server";
-import { useMutation } from "@tanstack/react-query";
-import { useNavigation } from "expo-router";
-import { useAtom } from "jotai";
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { ActivityIndicator, TouchableOpacity, View } from "react-native";
-import { toast } from "sonner-native";
-
-export default function page() {
-  const navigation = useNavigation();
-
-  const { t } = useTranslation();
-
-  const [api] = useAtom(apiAtom);
-  const [settings, updateSettings, pluginSettings] = useSettings();
-
-  const [optimizedVersionsServerUrl, setOptimizedVersionsServerUrl] =
-    useState<string>(settings?.optimizedVersionsServerUrl || "");
-
-  const saveMutation = useMutation({
-    mutationFn: async (newVal: string) => {
-      if (newVal.length === 0 || !newVal.startsWith("http")) {
-        toast.error(t("home.settings.toasts.invalid_url"));
-        return;
-      }
-
-      const updatedUrl = newVal.endsWith("/") ? newVal : `${newVal}/`;
-
-      updateSettings({
-        optimizedVersionsServerUrl: updatedUrl,
-      });
-
-      return await getStatistics({
-        url: updatedUrl,
-        authHeader: api?.accessToken,
-        deviceId: getOrSetDeviceId(),
-      });
-    },
-    onSuccess: (data) => {
-      if (data) {
-        toast.success(t("home.settings.toasts.connected"));
-      } else {
-        toast.error(t("home.settings.toasts.could_not_connect"));
-      }
-    },
-    onError: () => {
-      toast.error(t("home.settings.toasts.could_not_connect"));
-    },
-  });
-
-  const onSave = (newVal: string) => {
-    saveMutation.mutate(newVal);
-  };
-
-  useEffect(() => {
-    if (!pluginSettings?.optimizedVersionsServerUrl?.locked) {
-      navigation.setOptions({
-        title: t("home.settings.downloads.optimized_server"),
-        headerRight: () =>
-          saveMutation.isPending ? (
-            <ActivityIndicator size={"small"} color={"white"} />
-          ) : (
-            <TouchableOpacity
-              onPress={() => onSave(optimizedVersionsServerUrl)}
-            >
-              <Text className='text-blue-500'>
-                {t("home.settings.downloads.save_button")}
-              </Text>
-            </TouchableOpacity>
-          ),
-      });
-    }
-  }, [navigation, optimizedVersionsServerUrl, saveMutation.isPending]);
-
-  return (
-    <DisabledSetting
-      disabled={pluginSettings?.optimizedVersionsServerUrl?.locked === true}
-      className='p-4'
-    >
-      <OptimizedServerForm
-        value={optimizedVersionsServerUrl}
-        onChangeValue={setOptimizedVersionsServerUrl}
-      />
-    </DisabledSetting>
-  );
-}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/actors/[actorId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/actors/[actorId].tsx
@@ -10,20 +10,18 @@ import MoviePoster from "@/components/posters/MoviePoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import type { BaseItemDtoQueryResult } from "@jellyfin/sdk/lib/generated-client/models";
+import { BaseItemDtoQueryResult } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
 import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import { View } from "react-native";

 const page: React.FC = () => {
  const local = useLocalSearchParams();
  const { actorId } = local as { actorId: string };
-  const { t } = useTranslation();

  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
@@ -68,7 +66,7 @@ const page: React.FC = () => {

      return response.data;
    },
-    [api, user?.Id, actorId],
+    [api, user?.Id, actorId]
  );

  const backdropUrl = useMemo(
@@ -79,12 +77,12 @@ const page: React.FC = () => {
        quality: 90,
        width: 1000,
      }),
-    [item],
+    [item]
  );

  if (l1)
    return (
-      <View className='justify-center items-center h-full'>
+      <View className="justify-center items-center h-full">
        <Loader />
      </View>
    );
@@ -105,14 +103,14 @@ const page: React.FC = () => {
        />
      }
    >
-      <View className='flex flex-col space-y-4 my-4'>
-        <View className='px-4 mb-4'>
-          <MoviesTitleHeader item={item} className='mb-4' />
+      <View className="flex flex-col space-y-4 my-4">
+        <View className="px-4 mb-4">
+          <MoviesTitleHeader item={item} className="mb-4" />
          <OverviewText text={item.Overview} />
        </View>

-        <Text className='px-4 text-2xl font-bold mb-2 text-neutral-100'>
-          {t("item_card.appeared_in")}
+        <Text className="px-4 text-2xl font-bold mb-2 text-neutral-100">
+          Appeared In
        </Text>
        <InfiniteHorizontalScroll
          height={247}
@@ -133,7 +131,7 @@ const page: React.FC = () => {
          queryFn={fetchItems}
          queryKey={["actor", "movies", actorId]}
        />
-        <View className='h-12' />
+        <View className="h-12"></View>
      </View>
    </ParallaxScrollView>
  );
--- a/app/(auth)/(tabs)/(home,libraries,search)/albums/[albumId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search)/albums/[albumId].tsx
@@ -0,0 +1,117 @@
+import { ItemImage } from "@/components/common/ItemImage";
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import { SongsList } from "@/components/music/SongsList";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import ArtistPoster from "@/components/posters/ArtistPoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import { useEffect, useState } from "react";
+import { ScrollView, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+export default function page() {
+  const searchParams = useLocalSearchParams();
+  const { collectionId, artistId, albumId } = searchParams as {
+    collectionId: string;
+    artistId: string;
+    albumId: string;
+  };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const navigation = useNavigation();
+
+  const { data: album } = useQuery({
+    queryKey: ["album", albumId, artistId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        ids: [albumId],
+      });
+      const data = response.data.Items?.[0];
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!albumId,
+    staleTime: 0,
+  });
+
+  const {
+    data: songs,
+    isLoading,
+    isError,
+  } = useQuery<{
+    Items: BaseItemDto[];
+    TotalRecordCount: number;
+  }>({
+    queryKey: ["songs", artistId, albumId],
+    queryFn: async () => {
+      if (!api)
+        return {
+          Items: [],
+          TotalRecordCount: 0,
+        };
+
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        parentId: albumId,
+        fields: [
+          "ItemCounts",
+          "PrimaryImageAspectRatio",
+          "CanDelete",
+          "MediaSourceCount",
+        ],
+        sortBy: ["ParentIndexNumber", "IndexNumber", "SortName"],
+      });
+
+      const data = response.data.Items;
+
+      return {
+        Items: data || [],
+        TotalRecordCount: response.data.TotalRecordCount || 0,
+      };
+    },
+    enabled: !!api && !!user?.Id,
+  });
+
+  const insets = useSafeAreaInsets();
+
+  if (!album) return null;
+
+  return (
+    <ParallaxScrollView
+      headerHeight={400}
+      headerImage={
+        <ItemImage
+          variant={"Primary"}
+          item={album}
+          style={{
+            width: "100%",
+            height: "100%",
+          }}
+        />
+      }
+    >
+      <View className="px-4 mb-8">
+        <Text className="font-bold text-2xl mb-2">{album?.Name}</Text>
+        <Text className="text-neutral-500">
+          {songs?.TotalRecordCount} songs
+        </Text>
+      </View>
+      <View className="px-4">
+        <SongsList
+          albumId={albumId}
+          songs={songs?.Items}
+          collectionId={collectionId}
+          artistId={artistId}
+        />
+      </View>
+    </ParallaxScrollView>
+  );
+}
--- a/app/(auth)/(tabs)/(home,libraries,search)/artists/[artistId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search)/artists/[artistId].tsx
@@ -0,0 +1,130 @@
+import ArtistPoster from "@/components/posters/ArtistPoster";
+import { Text } from "@/components/common/Text";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import { useEffect, useState } from "react";
+import { FlatList, ScrollView, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { ItemImage } from "@/components/common/ItemImage";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+
+export default function page() {
+  const searchParams = useLocalSearchParams();
+  const { artistId } = searchParams as {
+    artistId: string;
+  };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const navigation = useNavigation();
+
+  const [startIndex, setStartIndex] = useState<number>(0);
+
+  const { data: artist } = useQuery({
+    queryKey: ["album", artistId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        ids: [artistId],
+      });
+      const data = response.data.Items?.[0];
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!artistId,
+    staleTime: 0,
+  });
+
+  const {
+    data: albums,
+    isLoading,
+    isError,
+  } = useQuery<{
+    Items: BaseItemDto[];
+    TotalRecordCount: number;
+  }>({
+    queryKey: ["albums", artistId, startIndex],
+    queryFn: async () => {
+      if (!api)
+        return {
+          Items: [],
+          TotalRecordCount: 0,
+        };
+
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        parentId: artistId,
+        sortOrder: ["Descending", "Descending", "Ascending"],
+        includeItemTypes: ["MusicAlbum"],
+        recursive: true,
+        fields: [
+          "ParentId",
+          "PrimaryImageAspectRatio",
+          "ParentId",
+          "PrimaryImageAspectRatio",
+        ],
+        collapseBoxSetItems: false,
+        albumArtistIds: [artistId],
+        startIndex,
+        limit: 100,
+        sortBy: ["PremiereDate", "ProductionYear", "SortName"],
+      });
+
+      const data = response.data.Items;
+
+      return {
+        Items: data || [],
+        TotalRecordCount: response.data.TotalRecordCount || 0,
+      };
+    },
+    enabled: !!api && !!user?.Id,
+  });
+
+  const insets = useSafeAreaInsets();
+
+  if (!artist || !albums) return null;
+
+  return (
+    <ParallaxScrollView
+      headerHeight={400}
+      headerImage={
+        <ItemImage
+          variant={"Primary"}
+          item={artist}
+          style={{
+            width: "100%",
+            height: "100%",
+          }}
+        />
+      }
+    >
+      <View className="px-4 mb-8">
+        <Text className="font-bold text-2xl mb-2">{artist?.Name}</Text>
+        <Text className="text-neutral-500">
+          {albums.TotalRecordCount} albums
+        </Text>
+      </View>
+      <View className="flex flex-row flex-wrap justify-between px-4">
+        {albums.Items.map((item, idx) => (
+          <TouchableItemRouter
+            item={item}
+            style={{ width: "30%", marginBottom: 20 }}
+            key={idx}
+          >
+            <View className="flex flex-col gap-y-2">
+              <ArtistPoster item={item} />
+              <Text numberOfLines={2}>{item.Name}</Text>
+              <Text className="opacity-50 text-xs">{item.ProductionYear}</Text>
+            </View>
+          </TouchableItemRouter>
+        ))}
+      </View>
+    </ParallaxScrollView>
+  );
+}
--- a/app/(auth)/(tabs)/(home,libraries,search)/artists/index.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search)/artists/index.tsx
@@ -0,0 +1,117 @@
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import ArtistPoster from "@/components/posters/ArtistPoster";
+import MoviePoster from "@/components/posters/MoviePoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getArtistsApi, getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams } from "expo-router";
+import { useAtom } from "jotai";
+import { useMemo, useState } from "react";
+import { FlatList, TouchableOpacity, View } from "react-native";
+
+export default function page() {
+  const searchParams = useLocalSearchParams();
+  const { collectionId } = searchParams as { collectionId: string };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const { data: collection } = useQuery({
+    queryKey: ["collection", collectionId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        ids: [collectionId],
+      });
+      const data = response.data.Items?.[0];
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!collectionId,
+    staleTime: 0,
+  });
+
+  const [startIndex, setStartIndex] = useState<number>(0);
+
+  const { data, isLoading, isError } = useQuery<{
+    Items: BaseItemDto[];
+    TotalRecordCount: number;
+  }>({
+    queryKey: ["collection-items", collection?.Id, startIndex],
+    queryFn: async () => {
+      if (!api || !collectionId)
+        return {
+          Items: [],
+          TotalRecordCount: 0,
+        };
+
+      const response = await getArtistsApi(api).getArtists({
+        sortBy: ["SortName"],
+        sortOrder: ["Ascending"],
+        fields: ["PrimaryImageAspectRatio", "SortName"],
+        imageTypeLimit: 1,
+        enableImageTypes: ["Primary", "Backdrop", "Banner", "Thumb"],
+        parentId: collectionId,
+        userId: user?.Id,
+      });
+
+      const data = response.data.Items;
+
+      return {
+        Items: data || [],
+        TotalRecordCount: response.data.TotalRecordCount || 0,
+      };
+    },
+    enabled: !!collection?.Id && !!api && !!user?.Id,
+  });
+
+  const totalItems = useMemo(() => {
+    return data?.TotalRecordCount;
+  }, [data]);
+
+  if (!data) return null;
+
+  return (
+    <FlatList
+      contentContainerStyle={{
+        padding: 16,
+        paddingBottom: 140,
+      }}
+      ListHeaderComponent={
+        <View className="mb-4">
+          <Text className="font-bold text-3xl mb-2">Artists</Text>
+        </View>
+      }
+      nestedScrollEnabled
+      data={data.Items}
+      numColumns={3}
+      columnWrapperStyle={{
+        justifyContent: "space-between",
+      }}
+      renderItem={({ item, index }) => (
+        <TouchableItemRouter
+          style={{
+            maxWidth: "30%",
+            width: "100%",
+          }}
+          key={index}
+          item={item}
+        >
+          <View className="flex flex-col gap-y-2">
+            {collection?.CollectionType === "movies" && (
+              <MoviePoster item={item} />
+            )}
+            {collection?.CollectionType === "music" && (
+              <ArtistPoster item={item} />
+            )}
+            <Text>{item.Name}</Text>
+            <Text className="opacity-50 text-xs">{item.ProductionYear}</Text>
+          </View>
+        </TouchableItemRouter>
+      )}
+      keyExtractor={(item) => item.Id || ""}
+    />
+  );
+}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/collections/[collectionId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/collections/[collectionId].tsx
@@ -1,23 +1,22 @@
-import { ItemCardText } from "@/components/ItemCardText";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import { FilterButton } from "@/components/filters/FilterButton";
 import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
+import { ItemCardText } from "@/components/ItemCardText";
 import { ItemPoster } from "@/components/posters/ItemPoster";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import {
-  SortByOption,
-  SortOrderOption,
  genreFilterAtom,
  sortByAtom,
+  SortByOption,
  sortOptions,
  sortOrderAtom,
+  SortOrderOption,
  sortOrderOptions,
  tagsFilterAtom,
  yearFilterAtom,
 } from "@/utils/atoms/filters";
-import type {
+import {
  BaseItemDto,
  BaseItemDtoQueryResult,
  ItemSortBy,
@@ -31,9 +30,7 @@ import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
-import type React from "react";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { FlatList, View } from "react-native";

 const page: React.FC = () => {
@@ -43,12 +40,6 @@ const page: React.FC = () => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const navigation = useNavigation();
-  const [orientation, setOrientation] = useState(
-    ScreenOrientation.Orientation.PORTRAIT_UP,
-  );
-
-  const { t } = useTranslation();
-
  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
@@ -112,8 +103,8 @@ const page: React.FC = () => {
        recursive: true,
        genres: selectedGenres,
        tags: selectedTags,
-        years: selectedYears.map((year) => Number.parseInt(year)),
-        includeItemTypes: ["Movie", "Series"],
+        years: selectedYears.map((year) => parseInt(year)),
+        includeItemTypes: ["Movie", "Series", "MusicAlbum"],
      });

      return response.data || null;
@@ -127,7 +118,7 @@ const page: React.FC = () => {
      selectedTags,
      sortBy,
      sortOrder,
-    ],
+    ]
  );

  const { data, isFetching, fetchNextPage, hasNextPage } = useInfiniteQuery({
@@ -152,13 +143,14 @@ const page: React.FC = () => {
      const totalItems = lastPage.TotalRecordCount;
      const accumulatedItems = pages.reduce(
        (acc, curr) => acc + (curr?.Items?.length || 0),
-        0,
+        0
      );

      if (accumulatedItems < totalItems) {
        return lastPage?.Items?.length * pages.length;
+      } else {
+        return undefined;
      }
-      return undefined;
    },
    initialPageParam: 0,
    enabled: !!api && !!user?.Id && !!collection,
@@ -177,8 +169,7 @@ const page: React.FC = () => {
        key={item.Id}
        style={{
          width: "100%",
-          marginBottom:
-            orientation === ScreenOrientation.Orientation.PORTRAIT_UP ? 4 : 16,
+          marginBottom: 16,
        }}
        item={item}
      >
@@ -188,8 +179,8 @@ const page: React.FC = () => {
              index % 3 === 0
                ? "flex-end"
                : (index + 1) % 3 === 0
-                  ? "flex-start"
-                  : "center",
+                ? "flex-start"
+                : "center",
            width: "89%",
          }}
        >
@@ -199,14 +190,14 @@ const page: React.FC = () => {
        </View>
      </TouchableItemRouter>
    ),
-    [orientation],
+    [orientation]
  );

  const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);

  const ListHeaderComponent = useCallback(
    () => (
-      <View className=''>
+      <View className="">
        <FlatList
          horizontal
          showsHorizontalScrollIndicator={false}
@@ -232,13 +223,13 @@ const page: React.FC = () => {
              key: "genre",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={collectionId}
-                  queryKey='genreFilter'
+                  className="mr-1"
+                  collectionId={collectionId}
+                  queryKey="genreFilter"
                  queryFn={async () => {
                    if (!api) return null;
                    const response = await getFilterApi(
-                      api,
+                      api
                    ).getQueryFiltersLegacy({
                      userId: user?.Id,
                      parentId: collectionId,
@@ -247,7 +238,7 @@ const page: React.FC = () => {
                  }}
                  set={setSelectedGenres}
                  values={selectedGenres}
-                  title={t("library.filters.genres")}
+                  title="Genres"
                  renderItemLabel={(item) => item.toString()}
                  searchFilter={(item, search) =>
                    item.toLowerCase().includes(search.toLowerCase())
@@ -259,13 +250,13 @@ const page: React.FC = () => {
              key: "year",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={collectionId}
-                  queryKey='yearFilter'
+                  className="mr-1"
+                  collectionId={collectionId}
+                  queryKey="yearFilter"
                  queryFn={async () => {
                    if (!api) return null;
                    const response = await getFilterApi(
-                      api,
+                      api
                    ).getQueryFiltersLegacy({
                      userId: user?.Id,
                      parentId: collectionId,
@@ -274,7 +265,7 @@ const page: React.FC = () => {
                  }}
                  set={setSelectedYears}
                  values={selectedYears}
-                  title={t("library.filters.years")}
+                  title="Years"
                  renderItemLabel={(item) => item.toString()}
                  searchFilter={(item, search) => item.includes(search)}
                />
@@ -284,13 +275,13 @@ const page: React.FC = () => {
              key: "tags",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={collectionId}
-                  queryKey='tagsFilter'
+                  className="mr-1"
+                  collectionId={collectionId}
+                  queryKey="tagsFilter"
                  queryFn={async () => {
                    if (!api) return null;
                    const response = await getFilterApi(
-                      api,
+                      api
                    ).getQueryFiltersLegacy({
                      userId: user?.Id,
                      parentId: collectionId,
@@ -299,7 +290,7 @@ const page: React.FC = () => {
                  }}
                  set={setSelectedTags}
                  values={selectedTags}
-                  title={t("library.filters.tags")}
+                  title="Tags"
                  renderItemLabel={(item) => item.toString()}
                  searchFilter={(item, search) =>
                    item.toLowerCase().includes(search.toLowerCase())
@@ -311,13 +302,13 @@ const page: React.FC = () => {
              key: "sortBy",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={collectionId}
-                  queryKey='sortBy'
+                  className="mr-1"
+                  collectionId={collectionId}
+                  queryKey="sortBy"
                  queryFn={async () => sortOptions.map((s) => s.key)}
                  set={setSortBy}
                  values={sortBy}
-                  title={t("library.filters.sort_by")}
+                  title="Sort By"
                  renderItemLabel={(item) =>
                    sortOptions.find((i) => i.key === item)?.value || ""
                  }
@@ -331,13 +322,13 @@ const page: React.FC = () => {
              key: "sortOrder",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={collectionId}
-                  queryKey='sortOrder'
+                  className="mr-1"
+                  collectionId={collectionId}
+                  queryKey="sortOrder"
                  queryFn={async () => sortOrderOptions.map((s) => s.key)}
                  set={setSortOrder}
                  values={sortOrder}
-                  title={t("library.filters.sort_order")}
+                  title="Sort Order"
                  renderItemLabel={(item) =>
                    sortOrderOptions.find((i) => i.key === item)?.value || ""
                  }
@@ -368,7 +359,7 @@ const page: React.FC = () => {
      sortOrder,
      setSortOrder,
      isFetching,
-    ],
+    ]
  );

  if (!collection) return null;
@@ -376,10 +367,8 @@ const page: React.FC = () => {
  return (
    <FlashList
      ListEmptyComponent={
-        <View className='flex flex-col items-center justify-center h-full'>
-          <Text className='font-bold text-xl text-neutral-500'>
-            {t("search.no_results")}
-          </Text>
+        <View className="flex flex-col items-center justify-center h-full">
+          <Text className="font-bold text-xl text-neutral-500">No results</Text>
        </View>
      }
      extraData={[
@@ -389,14 +378,12 @@ const page: React.FC = () => {
        sortBy,
        sortOrder,
      ]}
-      contentInsetAdjustmentBehavior='automatic'
+      contentInsetAdjustmentBehavior="automatic"
      data={flatData}
      renderItem={renderItem}
      keyExtractor={keyExtractor}
      estimatedItemSize={255}
-      numColumns={
-        orientation === ScreenOrientation.Orientation.PORTRAIT_UP ? 3 : 5
-      }
+      numColumns={5}
      onEndReached={() => {
        if (hasNextPage) {
          fetchNextPage();
@@ -411,7 +398,7 @@ const page: React.FC = () => {
            width: 10,
            height: 10,
          }}
-        />
+        ></View>
      )}
    />
  );
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx
@@ -1,13 +1,11 @@
-import { ItemContent } from "@/components/ItemContent";
 import { Text } from "@/components/common/Text";
+import { ItemContent } from "@/components/ItemContent";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
-import type React from "react";
-import { useEffect } from "react";
-import { useTranslation } from "react-i18next";
+import React, { useEffect } from "react";
 import { View } from "react-native";
 import Animated, {
  runOnJS,
@@ -20,7 +18,6 @@ const Page: React.FC = () => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const { id } = useLocalSearchParams() as { id: string };
-  const { t } = useTranslation();

  const { data: item, isError } = useQuery({
    queryKey: ["item", id],
@@ -76,36 +73,36 @@ const Page: React.FC = () => {

  if (isError)
    return (
-      <View className='flex flex-col items-center justify-center h-screen w-screen'>
-        <Text>{t("item_card.could_not_load_item")}</Text>
+      <View className="flex flex-col items-center justify-center h-screen w-screen">
+        <Text>Could not load item</Text>
      </View>
    );

  return (
-    <View className='flex flex-1 relative'>
+    <View className="flex flex-1 relative">
      <Animated.View
        pointerEvents={"none"}
        style={[animatedStyle]}
-        className='absolute top-0 left-0 flex flex-col items-start h-screen w-screen px-4 z-50 bg-black'
+        className="absolute top-0 left-0 flex flex-col items-start h-screen w-screen px-4 z-50 bg-black"
      >
        <View
          style={{
            height: item?.Type === "Episode" ? 300 : 450,
          }}
-          className='bg-transparent rounded-lg mb-4 w-full'
-        />
-        <View className='h-6 bg-neutral-900 rounded mb-4 w-14' />
-        <View className='h-10 bg-neutral-900 rounded-lg mb-2 w-1/2' />
-        <View className='h-3 bg-neutral-900 rounded mb-3 w-8' />
-        <View className='flex flex-row space-x-1 mb-8'>
-          <View className='h-6 bg-neutral-900 rounded mb-3 w-14' />
-          <View className='h-6 bg-neutral-900 rounded mb-3 w-14' />
-          <View className='h-6 bg-neutral-900 rounded mb-3 w-14' />
+          className="bg-transparent rounded-lg mb-4 w-full"
+        ></View>
+        <View className="h-6 bg-neutral-900 rounded mb-4 w-14"></View>
+        <View className="h-10 bg-neutral-900 rounded-lg mb-2 w-1/2"></View>
+        <View className="h-3 bg-neutral-900 rounded mb-3 w-8"></View>
+        <View className="flex flex-row space-x-1 mb-8">
+          <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
+          <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
+          <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
        </View>
-        <View className='h-3 bg-neutral-900 rounded w-2/3 mb-1' />
-        <View className='h-10 bg-neutral-900 rounded-lg w-full mb-2' />
-        <View className='h-12 bg-neutral-900 rounded-lg w-full mb-2' />
-        <View className='h-24 bg-neutral-900 rounded-lg mb-1 w-full' />
+        <View className="h-3 bg-neutral-900 rounded w-2/3 mb-1"></View>
+        <View className="h-10 bg-neutral-900 rounded-lg w-full mb-2"></View>
+        <View className="h-12 bg-neutral-900 rounded-lg w-full mb-2"></View>
+        <View className="h-24 bg-neutral-900 rounded-lg mb-1 w-full"></View>
      </Animated.View>
      {item && <ItemContent item={item} />}
    </View>
--- a/app/(auth)/(tabs)/(home,libraries,search)/jellyseerr/page.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search)/jellyseerr/page.tsx
@@ -0,0 +1,320 @@
+import { Button } from "@/components/Button";
+import { Input } from "@/components/common/Input";
+import { Text } from "@/components/common/Text";
+import { GenreTags } from "@/components/GenreTags";
+import { OverviewText } from "@/components/OverviewText";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import { JellyserrRatings } from "@/components/Ratings";
+import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
+import { useJellyseerr } from "@/hooks/useJellyseerr";
+import {
+  IssueType,
+  IssueTypeName,
+} from "@/utils/jellyseerr/server/constants/issue";
+import { MediaType } from "@/utils/jellyseerr/server/constants/media";
+import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
+import { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
+import { Ionicons } from "@expo/vector-icons";
+import {
+  BottomSheetBackdrop,
+  BottomSheetBackdropProps,
+  BottomSheetModal,
+  BottomSheetView,
+} from "@gorhom/bottom-sheet";
+import { useQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useLocalSearchParams } from "expo-router";
+import React, { useCallback, useRef, useState } from "react";
+import { Modal, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+const Page: React.FC = () => {
+  const insets = useSafeAreaInsets();
+  const params = useLocalSearchParams();
+  const {
+    mediaTitle,
+    releaseYear,
+    canRequest: canRequestString,
+    posterSrc,
+    ...result
+  } = params as unknown as {
+    mediaTitle: string;
+    releaseYear: number;
+    canRequest: string;
+    posterSrc: string;
+  } & Partial<MovieResult | TvResult>;
+
+  const canRequest = canRequestString === "true";
+  const { jellyseerrApi, requestMedia } = useJellyseerr();
+
+  const [issueType, setIssueType] = useState<IssueType>();
+  const [issueMessage, setIssueMessage] = useState<string>();
+  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
+  const [isIssueTypeModalVisible, setIsIssueTypeModalVisible] = useState(false);
+
+  const {
+    data: details,
+    isFetching,
+    isLoading,
+  } = useQuery({
+    enabled: !!jellyseerrApi && !!result && !!result.id,
+    queryKey: ["jellyseerr", "detail", result.mediaType, result.id],
+    staleTime: 0,
+    refetchOnMount: true,
+    refetchOnReconnect: true,
+    refetchOnWindowFocus: true,
+    retryOnMount: true,
+    queryFn: async () => {
+      return result.mediaType === MediaType.MOVIE
+        ? jellyseerrApi?.movieDetails(result.id!!)
+        : jellyseerrApi?.tvDetails(result.id!!);
+    },
+  });
+
+  const renderBackdrop = useCallback(
+    (props: BottomSheetBackdropProps) => (
+      <BottomSheetBackdrop
+        {...props}
+        disappearsOnIndex={-1}
+        appearsOnIndex={0}
+      />
+    ),
+    []
+  );
+
+  const submitIssue = useCallback(() => {
+    if (result.id && issueType && issueMessage && details) {
+      jellyseerrApi
+        ?.submitIssue(details.mediaInfo.id, Number(issueType), issueMessage)
+        .then(() => {
+          setIssueType(undefined);
+          setIssueMessage(undefined);
+          bottomSheetModalRef?.current?.close();
+        });
+    }
+  }, [jellyseerrApi, details, result, issueType, issueMessage]);
+
+  const request = useCallback(
+    () =>
+      requestMedia(mediaTitle, {
+        mediaId: Number(result.id!!),
+        mediaType: result.mediaType!!,
+        tvdbId: details?.externalIds?.tvdbId,
+        seasons: (details as TvDetails)?.seasons
+          ?.filter?.((s) => s.seasonNumber !== 0)
+          ?.map?.((s) => s.seasonNumber),
+      }),
+    [details, result, requestMedia]
+  );
+
+  return (
+    <View
+      className="flex-1 relative"
+      style={{
+        paddingLeft: insets.left,
+        paddingRight: insets.right,
+      }}
+    >
+      <ParallaxScrollView
+        className="flex-1 opacity-100"
+        headerHeight={300}
+        headerImage={
+          <View>
+            {result.backdropPath ? (
+              <Image
+                cachePolicy={"memory-disk"}
+                transition={300}
+                style={{
+                  width: "100%",
+                  height: "100%",
+                }}
+                source={{
+                  uri: `https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${result.backdropPath}`,
+                }}
+              />
+            ) : (
+              <View
+                style={{
+                  width: "100%",
+                  height: "100%",
+                }}
+                className="flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900"
+              >
+                <Ionicons
+                  name="image-outline"
+                  size={24}
+                  color="white"
+                  style={{ opacity: 0.4 }}
+                />
+              </View>
+            )}
+          </View>
+        }
+      >
+        <View className="flex flex-col">
+          <View className="space-y-4">
+            <View className="px-4">
+              <View className="flex flex-row justify-between w-full">
+                <View className="flex flex-col w-56">
+                  <JellyserrRatings result={result as MovieResult | TvResult} />
+                  <Text
+                    uiTextView
+                    selectable
+                    className="font-bold text-2xl mb-1"
+                  >
+                    {mediaTitle}
+                  </Text>
+                  <Text className="opacity-50">{releaseYear}</Text>
+                </View>
+                <Image
+                  className="absolute bottom-1 right-1 rounded-lg w-28 aspect-[10/15] border-2 border-neutral-800/50 drop-shadow-2xl"
+                  cachePolicy={"memory-disk"}
+                  transition={300}
+                  source={{
+                    uri: posterSrc,
+                  }}
+                />
+              </View>
+              <View className="mb-4">
+                <GenreTags genres={details?.genres?.map((g) => g.name) || []} />
+              </View>
+              {canRequest ? (
+                <Button color="purple" onPress={request}>
+                  Request
+                </Button>
+              ) : (
+                <Button
+                  className="bg-yellow-500/50 border-yellow-400 ring-yellow-400 text-yellow-100"
+                  color="transparent"
+                  onPress={() => bottomSheetModalRef?.current?.present()}
+                  iconLeft={
+                    <Ionicons name="warning-outline" size={24} color="white" />
+                  }
+                  style={{
+                    borderWidth: 1,
+                    borderStyle: "solid",
+                  }}
+                >
+                  Report issue
+                </Button>
+              )}
+              <OverviewText text={result.overview} className="mt-4" />
+            </View>
+
+            {result.mediaType === MediaType.TV && (
+              <JellyseerrSeasons
+                isLoading={isLoading || isFetching}
+                result={result as TvResult}
+                details={details as TvDetails}
+              />
+            )}
+          </View>
+        </View>
+      </ParallaxScrollView>
+      <BottomSheetModal
+        ref={bottomSheetModalRef}
+        enableDynamicSizing
+        handleIndicatorStyle={{
+          backgroundColor: "white",
+        }}
+        backgroundStyle={{
+          backgroundColor: "#171717",
+        }}
+        backdropComponent={renderBackdrop}
+      >
+        <BottomSheetView>
+          <View className="flex flex-col space-y-4 px-4 pb-8 pt-2">
+            <View>
+              <Text className="font-bold text-2xl text-neutral-100">
+                Whats wrong?
+              </Text>
+            </View>
+            <View className="flex flex-col space-y-2 items-start">
+              <View className="flex flex-col">
+                <View className="flex flex-col">
+                  <Text className="opacity-50 mb-1 text-xs">Issue Type</Text>
+                  <TouchableOpacity
+                    className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between"
+                    onPress={() => setIsIssueTypeModalVisible(true)}
+                  >
+                    <Text className="" numberOfLines={1}>
+                      {issueType ? IssueTypeName[issueType] : "Select an issue"}
+                    </Text>
+                    <Ionicons
+                      name="chevron-down"
+                      size={16}
+                      color="white"
+                      style={{ opacity: 0.5 }}
+                    />
+                  </TouchableOpacity>
+
+                  <Modal
+                    visible={isIssueTypeModalVisible}
+                    transparent
+                    animationType="slide"
+                    onRequestClose={() => setIsIssueTypeModalVisible(false)}
+                  >
+                    <TouchableOpacity
+                      className="flex-1 bg-black/50"
+                      activeOpacity={1}
+                      onPress={() => setIsIssueTypeModalVisible(false)}
+                    >
+                      <View className="mt-auto bg-neutral-900 rounded-t-xl">
+                        <View className="p-4 border-b border-neutral-800">
+                          <Text className="text-lg font-bold text-center">
+                            Select Issue Type
+                          </Text>
+                        </View>
+                        <View className="max-h-[50%]">
+                          {Object.entries(IssueTypeName)
+                            .reverse()
+                            .map(([key, value]) => (
+                              <TouchableOpacity
+                                key={key}
+                                className="p-4 border-b border-neutral-800"
+                                onPress={() => {
+                                  setIssueType(key as unknown as IssueType);
+                                  setIsIssueTypeModalVisible(false);
+                                }}
+                              >
+                                <Text className="text-center">{value}</Text>
+                              </TouchableOpacity>
+                            ))}
+                        </View>
+                        <TouchableOpacity
+                          className="p-4 border-t border-neutral-800"
+                          onPress={() => setIsIssueTypeModalVisible(false)}
+                        >
+                          <Text className="text-center text-purple-400">
+                            Cancel
+                          </Text>
+                        </TouchableOpacity>
+                      </View>
+                    </TouchableOpacity>
+                  </Modal>
+                </View>
+              </View>
+
+              <Input
+                className="w-full"
+                placeholder="(optional) Describe the issue..."
+                value={issueMessage}
+                keyboardType="default"
+                returnKeyType="done"
+                autoCapitalize="none"
+                textContentType="none"
+                maxLength={254}
+                onChangeText={setIssueMessage}
+              />
+            </View>
+            <Button className="mt-auto" onPress={submitIssue} color="purple">
+              Submit
+            </Button>
+          </View>
+        </BottomSheetView>
+      </BottomSheetModal>
+    </View>
+  );
+};
+
+export default Page;
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/_layout.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/_layout.tsx
@@ -3,10 +3,7 @@ import type {
  MaterialTopTabNavigationOptions,
 } from "@react-navigation/material-top-tabs";
 import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs";
-import type {
-  ParamListBase,
-  TabNavigationState,
-} from "@react-navigation/native";
+import { ParamListBase, TabNavigationState } from "@react-navigation/native";
 import { Stack, withLayoutContext } from "expo-router";
 import React from "react";

@@ -24,8 +21,8 @@ const Layout = () => {
    <>
      <Stack.Screen options={{ title: "Live TV" }} />
      <Tab
-        initialRouteName='programs'
-        keyboardDismissMode='none'
+        initialRouteName="programs"
+        keyboardDismissMode="none"
        screenOptions={{
          tabBarBounces: true,
          tabBarLabelStyle: { fontSize: 10 },
@@ -40,10 +37,10 @@ const Layout = () => {
          tabBarScrollEnabled: true,
        }}
      >
-        <Tab.Screen name='programs' />
-        <Tab.Screen name='guide' />
-        <Tab.Screen name='channels' />
-        <Tab.Screen name='recordings' />
+        <Tab.Screen name="programs" />
+        <Tab.Screen name="guide" />
+        <Tab.Screen name="channels" />
+        <Tab.Screen name="recordings" />
      </Tab>
    </>
  );
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/channels.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/channels.tsx
@@ -31,13 +31,13 @@ export default function page() {
  });

  return (
-    <View className='flex flex-1'>
+    <View className="flex flex-1">
      <FlashList
        data={channels?.Items}
        estimatedItemSize={76}
        renderItem={({ item }) => (
-          <View className='flex flex-row items-center px-4 mb-2'>
-            <View className='w-22 mr-4 rounded-lg overflow-hidden'>
+          <View className="flex flex-row items-center px-4 mb-2">
+            <View className="w-22 mr-4 rounded-lg overflow-hidden">
              <ItemImage
                style={{
                  aspectRatio: "1/1",
@@ -47,7 +47,7 @@ export default function page() {
                item={item}
              />
            </View>
-            <Text className='font-bold'>{item.Name}</Text>
+            <Text className="font-bold">{item.Name}</Text>
          </View>
        )}
      />
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/guide.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/guide.tsx
@@ -9,7 +9,6 @@ import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { useAtom } from "jotai";
 import React, { useCallback, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
 import {
  Button,
  Dimensions,
@@ -71,7 +70,7 @@ export default function page() {
          MaxStartDate: endOfDay.toISOString(),
          MinEndDate: isToday ? now.toISOString() : startOfDay.toISOString(),
          ChannelIds: channels?.Items?.map((c) => c.Id).filter(
-            Boolean,
+            Boolean
          ) as string[],
          ImageTypeLimit: 1,
          EnableImages: false,
@@ -100,7 +99,7 @@ export default function page() {
  return (
    <ScrollView
      nestedScrollEnabled
-      contentInsetAdjustmentBehavior='automatic'
+      contentInsetAdjustmentBehavior="automatic"
      key={"home"}
      contentContainerStyle={{
        paddingLeft: insets.left,
@@ -117,16 +116,16 @@ export default function page() {
        }
      />

-      <View className='flex flex-row'>
-        <View className='flex flex-col w-[64px]'>
+      <View className="flex flex-row">
+        <View className="flex flex-col w-[64px]">
          <View
            style={{
              height: HOUR_HEIGHT,
            }}
-            className='bg-neutral-800'
-          />
+            className="bg-neutral-800"
+          ></View>
          {channels?.Items?.map((c, i) => (
-            <View className='h-16 w-16 mr-4 rounded-lg overflow-hidden' key={i}>
+            <View className="h-16 w-16 mr-4 rounded-lg overflow-hidden" key={i}>
              <ItemImage
                style={{
                  width: "100%",
@@ -148,7 +147,7 @@ export default function page() {
            setScrollX(e.nativeEvent.contentOffset.x);
          }}
        >
-          <View className='flex flex-col'>
+          <View className="flex flex-col">
            <HourHeader height={HOUR_HEIGHT} />
            {channels?.Items?.map((c, i) => (
              <MemoizedLiveTVGuideRow
@@ -178,16 +177,15 @@ const PageButtons: React.FC<PageButtonsProps> = ({
  onNextPage,
  isNextDisabled,
 }) => {
-  const { t } = useTranslation();
  return (
-    <View className='flex flex-row justify-between items-center bg-neutral-800 w-full px-4 py-2'>
+    <View className="flex flex-row justify-between items-center bg-neutral-800 w-full px-4 py-2">
      <TouchableOpacity
        onPress={onPrevPage}
        disabled={currentPage === 1}
-        className='flex flex-row items-center'
+        className="flex flex-row items-center"
      >
        <Ionicons
-          name='chevron-back'
+          name="chevron-back"
          size={24}
          color={currentPage === 1 ? "gray" : "white"}
        />
@@ -196,22 +194,22 @@ const PageButtons: React.FC<PageButtonsProps> = ({
            currentPage === 1 ? "text-gray-500" : "text-white"
          }`}
        >
-          {t("live_tv.previous")}
+          Previous
        </Text>
      </TouchableOpacity>
-      <Text className='text-white'>Page {currentPage}</Text>
+      <Text className="text-white">Page {currentPage}</Text>
      <TouchableOpacity
        onPress={onNextPage}
        disabled={isNextDisabled}
-        className='flex flex-row items-center'
+        className="flex flex-row items-center"
      >
        <Text
          className={`mr-1 ${isNextDisabled ? "text-gray-500" : "text-white"}`}
        >
-          {t("live_tv.next")}
+          Next
        </Text>
        <Ionicons
-          name='chevron-forward'
+          name="chevron-forward"
          size={24}
          color={isNextDisabled ? "gray" : "white"}
        />
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/programs.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/programs.tsx
@@ -1,11 +1,10 @@
 import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
 import { TAB_HEIGHT } from "@/constants/Values";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
 import { useAtom } from "jotai";
 import React from "react";
-import { useTranslation } from "react-i18next";
 import { ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";

@@ -14,12 +13,10 @@ export default function page() {
  const [user] = useAtom(userAtom);
  const insets = useSafeAreaInsets();

-  const { t } = useTranslation();
-
  return (
    <ScrollView
      nestedScrollEnabled
-      contentInsetAdjustmentBehavior='automatic'
+      contentInsetAdjustmentBehavior="automatic"
      key={"home"}
      contentContainerStyle={{
        paddingLeft: insets.left,
@@ -28,10 +25,10 @@ export default function page() {
        paddingTop: 8,
      }}
    >
-      <View className='flex flex-col space-y-2'>
+      <View className="flex flex-col space-y-2">
        <ScrollingCollectionList
          queryKey={["livetv", "recommended"]}
-          title={t("live_tv.on_now")}
+          title={"On now"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getRecommendedPrograms({
@@ -45,11 +42,11 @@ export default function page() {
            });
            return res.data.Items || [];
          }}
-          orientation='horizontal'
+          orientation="horizontal"
        />
        <ScrollingCollectionList
          queryKey={["livetv", "shows"]}
-          title={t("live_tv.shows")}
+          title={"Shows"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -67,11 +64,11 @@ export default function page() {
            });
            return res.data.Items || [];
          }}
-          orientation='horizontal'
+          orientation="horizontal"
        />
        <ScrollingCollectionList
          queryKey={["livetv", "movies"]}
-          title={t("live_tv.movies")}
+          title={"Movies"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -85,11 +82,11 @@ export default function page() {
            });
            return res.data.Items || [];
          }}
-          orientation='horizontal'
+          orientation="horizontal"
        />
        <ScrollingCollectionList
          queryKey={["livetv", "sports"]}
-          title={t("live_tv.sports")}
+          title={"Sports"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -103,11 +100,11 @@ export default function page() {
            });
            return res.data.Items || [];
          }}
-          orientation='horizontal'
+          orientation="horizontal"
        />
        <ScrollingCollectionList
          queryKey={["livetv", "kids"]}
-          title={t("live_tv.for_kids")}
+          title={"For Kids"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -121,11 +118,11 @@ export default function page() {
            });
            return res.data.Items || [];
          }}
-          orientation='horizontal'
+          orientation="horizontal"
        />
        <ScrollingCollectionList
          queryKey={["livetv", "news"]}
-          title={t("live_tv.news")}
+          title={"News"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -139,7 +136,7 @@ export default function page() {
            });
            return res.data.Items || [];
          }}
-          orientation='horizontal'
+          orientation="horizontal"
        />
      </View>
    </ScrollView>
--- a/app/(auth)/(tabs)/(home,libraries,search)/livetv/recordings.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search)/livetv/recordings.tsx
@@ -0,0 +1,11 @@
+import { Text } from "@/components/common/Text";
+import React from "react";
+import { View } from "react-native";
+
+export default function page() {
+  return (
+    <View className="flex items-center justify-center h-full -mt-12">
+      <Text>Coming soon</Text>
+    </View>
+  );
+}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx
@@ -1,5 +1,3 @@
-import { AddToFavorites } from "@/components/AddToFavorites";
-import { DownloadItems } from "@/components/DownloadItem";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
 import { NextUp } from "@/components/series/NextUp";
 import { SeasonPicker } from "@/components/series/SeasonPicker";
@@ -14,14 +12,11 @@ import { useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
-import type React from "react";
-import { useEffect, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { Platform, View } from "react-native";
+import React, { useEffect, useMemo } from "react";
+import { View } from "react-native";

 const page: React.FC = () => {
  const navigation = useNavigation();
-  const { t } = useTranslation();
  const params = useLocalSearchParams();
  const { id: seriesId, seasonIndex } = params as {
    id: string;
@@ -39,6 +34,7 @@ const page: React.FC = () => {
        userId: user?.Id,
        itemId: seriesId,
      }),
+    enabled: !!seriesId && !!api,
    staleTime: 60 * 1000,
  });

@@ -50,7 +46,7 @@ const page: React.FC = () => {
        quality: 90,
        width: 1000,
      }),
-    [item],
+    [item]
  );

  const logoUrl = useMemo(
@@ -59,7 +55,7 @@ const page: React.FC = () => {
        api,
        item,
      }),
-    [item],
+    [item]
  );

  const { data: allEpisodes, isLoading } = useQuery({
@@ -77,37 +73,6 @@ const page: React.FC = () => {
    enabled: !!api && !!user?.Id && !!item?.Id,
  });

-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () =>
-        !isLoading &&
-        item &&
-        allEpisodes &&
-        allEpisodes.length > 0 && (
-          <View className='flex flex-row items-center space-x-2'>
-            <AddToFavorites item={item} />
-            {!Platform.isTV && (
-              <DownloadItems
-                size='large'
-                title={t("item_card.download.download_series")}
-                items={allEpisodes || []}
-                MissingDownloadIconComponent={() => (
-                  <Ionicons name='download' size={22} color='white' />
-                )}
-                DownloadedIconComponent={() => (
-                  <Ionicons
-                    name='checkmark-done-outline'
-                    size={24}
-                    color='#9333ea'
-                  />
-                )}
-              />
-            )}
-          </View>
-        ),
-    });
-  }, [allEpisodes, isLoading, item]);
-
  if (!item || !backdropUrl) return null;

  return (
@@ -125,23 +90,25 @@ const page: React.FC = () => {
        />
      }
      logo={
-        logoUrl ? (
-          <Image
-            source={{
-              uri: logoUrl,
-            }}
-            style={{
-              height: 130,
-              width: "100%",
-              resizeMode: "contain",
-            }}
-          />
-        ) : null
+        <>
+          {logoUrl ? (
+            <Image
+              source={{
+                uri: logoUrl,
+              }}
+              style={{
+                height: 130,
+                width: "100%",
+                resizeMode: "contain",
+              }}
+            />
+          ) : null}
+        </>
      }
    >
-      <View className='flex flex-col pt-4'>
+      <View className="flex flex-col pt-4">
        <SeriesHeader item={item} />
-        <View className='mb-4'>
+        <View className="mb-4">
          <NextUp seriesId={seriesId} />
        </View>
        <SeasonPicker item={item} initialSeasonIndex={Number(seasonIndex)} />
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/company/[companyId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/company/[companyId].tsx
@@ -1,107 +0,0 @@
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-import { Endpoints, useJellyseerr } from "@/hooks/useJellyseerr";
-import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
-import {
-  type MovieResult,
-  Results,
-  type TvResult,
-} from "@/utils/jellyseerr/server/models/Search";
-import { COMPANY_LOGO_IMAGE_FILTER } from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams } from "expo-router";
-import { uniqBy } from "lodash";
-import React, { useMemo } from "react";
-
-export default function page() {
-  const local = useLocalSearchParams();
-  const { jellyseerrApi } = useJellyseerr();
-
-  const { companyId, name, image, type } = local as unknown as {
-    companyId: string;
-    name: string;
-    image: string;
-    type: DiscoverSliderType;
-  };
-
-  const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({
-    queryKey: ["jellyseerr", "company", type, companyId],
-    queryFn: async ({ pageParam }) => {
-      const params: any = {
-        page: Number(pageParam),
-      };
-
-      return jellyseerrApi?.discover(
-        `${
-          type === DiscoverSliderType.NETWORKS
-            ? Endpoints.DISCOVER_TV_NETWORK
-            : Endpoints.DISCOVER_MOVIES_STUDIO
-        }/${companyId}`,
-        params,
-      );
-    },
-    enabled: !!jellyseerrApi && !!companyId,
-    initialPageParam: 1,
-    getNextPageParam: (lastPage, pages) =>
-      (lastPage?.page || pages?.findLast((p) => p?.results.length)?.page || 1) +
-      1,
-    staleTime: 0,
-  });
-
-  const flatData = useMemo(
-    () =>
-      uniqBy(
-        data?.pages
-          ?.filter((p) => p?.results.length)
-          .flatMap((p) => p?.results ?? []),
-        "id",
-      ) ?? [],
-    [data],
-  );
-
-  const backdrops = useMemo(
-    () =>
-      jellyseerrApi
-        ? flatData.map((r) =>
-            jellyseerrApi.imageProxy(
-              (r as TvResult | MovieResult).backdropPath,
-              "w1920_and_h800_multi_faces",
-            ),
-          )
-        : [],
-    [jellyseerrApi, flatData],
-  );
-
-  return (
-    <ParallaxSlideShow
-      data={flatData}
-      images={backdrops}
-      listHeader=''
-      keyExtractor={(item) => item.id.toString()}
-      onEndReached={() => {
-        if (hasNextPage) {
-          fetchNextPage();
-        }
-      }}
-      logo={
-        <Image
-          id={companyId}
-          key={companyId}
-          className='bottom-1 w-1/2'
-          source={{
-            uri: jellyseerrApi?.imageProxy(image, COMPANY_LOGO_IMAGE_FILTER),
-          }}
-          cachePolicy={"memory-disk"}
-          contentFit='contain'
-          style={{
-            aspectRatio: "4/3",
-          }}
-        />
-      }
-      renderItem={(item, index) => (
-        <JellyseerrPoster item={item as MovieResult | TvResult} />
-      )}
-    />
-  );
-}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/genre/[genreId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/genre/[genreId].tsx
@@ -1,104 +0,0 @@
-import { Text } from "@/components/common/Text";
-import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import { textShadowStyle } from "@/components/jellyseerr/discover/GenericSlideCard";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-import Poster from "@/components/posters/Poster";
-import { Endpoints, useJellyseerr } from "@/hooks/useJellyseerr";
-import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
-import {
-  type MovieResult,
-  Results,
-  type TvResult,
-} from "@/utils/jellyseerr/server/models/Search";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { router, useLocalSearchParams, useSegments } from "expo-router";
-import { uniqBy } from "lodash";
-import React, { useMemo } from "react";
-import { TouchableOpacity } from "react-native";
-
-export default function page() {
-  const local = useLocalSearchParams();
-  const { jellyseerrApi } = useJellyseerr();
-
-  const { genreId, name, type } = local as unknown as {
-    genreId: string;
-    name: string;
-    type: DiscoverSliderType;
-  };
-
-  const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({
-    queryKey: ["jellyseerr", "company", type, genreId],
-    queryFn: async ({ pageParam }) => {
-      const params: any = {
-        page: Number(pageParam),
-        genre: genreId,
-      };
-
-      return jellyseerrApi?.discover(
-        type === DiscoverSliderType.MOVIE_GENRES
-          ? Endpoints.DISCOVER_MOVIES
-          : Endpoints.DISCOVER_TV,
-        params,
-      );
-    },
-    enabled: !!jellyseerrApi && !!genreId,
-    initialPageParam: 1,
-    getNextPageParam: (lastPage, pages) =>
-      (lastPage?.page || pages?.findLast((p) => p?.results.length)?.page || 1) +
-      1,
-    staleTime: 0,
-  });
-
-  const flatData = useMemo(
-    () =>
-      uniqBy(
-        data?.pages
-          ?.filter((p) => p?.results.length)
-          .flatMap((p) => p?.results ?? []),
-        "id",
-      ) ?? [],
-    [data],
-  );
-
-  const backdrops = useMemo(
-    () =>
-      jellyseerrApi
-        ? flatData.map((r) =>
-            jellyseerrApi.imageProxy(
-              (r as TvResult | MovieResult).backdropPath,
-              "w1920_and_h800_multi_faces",
-            ),
-          )
-        : [],
-    [jellyseerrApi, flatData],
-  );
-
-  return (
-    <ParallaxSlideShow
-      data={flatData}
-      images={backdrops}
-      listHeader=''
-      keyExtractor={(item) => item.id.toString()}
-      onEndReached={() => {
-        if (hasNextPage) {
-          fetchNextPage();
-        }
-      }}
-      logo={
-        <Text
-          className='text-4xl font-bold text-center bottom-1'
-          style={{
-            ...textShadowStyle.shadow,
-            shadowRadius: 10,
-          }}
-        >
-          {name}
-        </Text>
-      }
-      renderItem={(item, index) => (
-        <JellyseerrPoster item={item as MovieResult | TvResult} />
-      )}
-    />
-  );
-}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/page.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/page.tsx
@@ -1,424 +0,0 @@
-import { Button } from "@/components/Button";
-import { GenreTags } from "@/components/GenreTags";
-import { OverviewText } from "@/components/OverviewText";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { JellyserrRatings } from "@/components/Ratings";
-import { Text } from "@/components/common/Text";
-import Cast from "@/components/jellyseerr/Cast";
-import DetailFacts from "@/components/jellyseerr/DetailFacts";
-import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
-import { ItemActions } from "@/components/series/SeriesActions";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
-import {
-  type IssueType,
-  IssueTypeName,
-} from "@/utils/jellyseerr/server/constants/issue";
-import { MediaType } from "@/utils/jellyseerr/server/constants/media";
-import type {
-  MovieResult,
-  TvResult,
-} from "@/utils/jellyseerr/server/models/Search";
-import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
-import { Ionicons } from "@expo/vector-icons";
-import {
-  BottomSheetBackdrop,
-  type BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetTextInput,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams, useNavigation, useRouter } from "expo-router";
-import type React from "react";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Platform, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-import RequestModal from "@/components/jellyseerr/RequestModal";
-import { ANIME_KEYWORD_ID } from "@/utils/jellyseerr/server/api/themoviedb/constants";
-import type { MediaRequestBody } from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
-import type { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
-
-const Page: React.FC = () => {
-  const insets = useSafeAreaInsets();
-  const params = useLocalSearchParams();
-  const { t } = useTranslation();
-  const router = useRouter();
-
-  const { mediaTitle, releaseYear, posterSrc, mediaType, ...result } =
-    params as unknown as {
-      mediaTitle: string;
-      releaseYear: number;
-      canRequest: string;
-      posterSrc: string;
-      mediaType: MediaType;
-    } & Partial<MovieResult | TvResult | MovieDetails | TvDetails>;
-
-  const navigation = useNavigation();
-  const { jellyseerrApi, requestMedia } = useJellyseerr();
-
-  const [issueType, setIssueType] = useState<IssueType>();
-  const [issueMessage, setIssueMessage] = useState<string>();
-  const [requestBody, _setRequestBody] = useState<MediaRequestBody>();
-  const advancedReqModalRef = useRef<BottomSheetModal>(null);
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-
-  const {
-    data: details,
-    isFetching,
-    isLoading,
-    refetch,
-  } = useQuery({
-    enabled: !!jellyseerrApi && !!result && !!result.id,
-    queryKey: ["jellyseerr", "detail", mediaType, result.id],
-    staleTime: 0,
-    refetchOnMount: true,
-    refetchOnReconnect: true,
-    refetchOnWindowFocus: true,
-    retryOnMount: true,
-    refetchInterval: 0,
-    queryFn: async () => {
-      return mediaType === MediaType.MOVIE
-        ? jellyseerrApi?.movieDetails(result.id!)
-        : jellyseerrApi?.tvDetails(result.id!);
-    },
-  });
-
-  const [canRequest, hasAdvancedRequestPermission] =
-    useJellyseerrCanRequest(details);
-
-  const renderBackdrop = useCallback(
-    (props: BottomSheetBackdropProps) => (
-      <BottomSheetBackdrop
-        {...props}
-        disappearsOnIndex={-1}
-        appearsOnIndex={0}
-      />
-    ),
-    [],
-  );
-
-  const submitIssue = useCallback(() => {
-    if (result.id && issueType && issueMessage && details) {
-      jellyseerrApi
-        ?.submitIssue(details.mediaInfo.id, Number(issueType), issueMessage)
-        .then(() => {
-          setIssueType(undefined);
-          setIssueMessage(undefined);
-          bottomSheetModalRef?.current?.close();
-        });
-    }
-  }, [jellyseerrApi, details, result, issueType, issueMessage]);
-
-  const setRequestBody = useCallback(
-    (body: MediaRequestBody) => {
-      _setRequestBody(body);
-      advancedReqModalRef?.current?.present?.();
-    },
-    [requestBody, _setRequestBody, advancedReqModalRef],
-  );
-
-  const request = useCallback(async () => {
-    const body: MediaRequestBody = {
-      mediaId: Number(result.id!),
-      mediaType: mediaType!,
-      tvdbId: details?.externalIds?.tvdbId,
-      seasons: (details as TvDetails)?.seasons
-        ?.filter?.((s) => s.seasonNumber !== 0)
-        ?.map?.((s) => s.seasonNumber),
-    };
-
-    if (hasAdvancedRequestPermission) {
-      setRequestBody(body);
-      return;
-    }
-
-    requestMedia(mediaTitle, body, refetch);
-  }, [details, result, requestMedia, hasAdvancedRequestPermission]);
-
-  const isAnime = useMemo(
-    () =>
-      (details?.keywords.some((k) => k.id === ANIME_KEYWORD_ID) || false) &&
-      mediaType === MediaType.TV,
-    [details],
-  );
-
-  useEffect(() => {
-    if (details) {
-      navigation.setOptions({
-        headerRight: () => (
-          <TouchableOpacity className='rounded-full p-2 bg-neutral-800/80'>
-            <ItemActions item={details} />
-          </TouchableOpacity>
-        ),
-      });
-    }
-  }, [details]);
-
-  return (
-    <View
-      className='flex-1 relative'
-      style={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-    >
-      <ParallaxScrollView
-        className='flex-1 opacity-100'
-        headerHeight={300}
-        headerImage={
-          <View>
-            {result.backdropPath ? (
-              <Image
-                cachePolicy={"memory-disk"}
-                transition={300}
-                style={{
-                  width: "100%",
-                  height: "100%",
-                }}
-                source={{
-                  uri: jellyseerrApi?.imageProxy(
-                    result.backdropPath,
-                    "w1920_and_h800_multi_faces",
-                  ),
-                }}
-              />
-            ) : (
-              <View
-                style={{
-                  width: "100%",
-                  height: "100%",
-                }}
-                className='flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900'
-              >
-                <Ionicons
-                  name='image-outline'
-                  size={24}
-                  color='white'
-                  style={{ opacity: 0.4 }}
-                />
-              </View>
-            )}
-          </View>
-        }
-      >
-        <View className='flex flex-col'>
-          <View className='space-y-4'>
-            <View className='px-4'>
-              <View className='flex flex-row justify-between w-full'>
-                <View className='flex flex-col w-56'>
-                  <JellyserrRatings
-                    result={
-                      result as
-                        | MovieResult
-                        | TvResult
-                        | MovieDetails
-                        | TvDetails
-                    }
-                  />
-                  <Text
-                    uiTextView
-                    selectable
-                    className='font-bold text-2xl mb-1'
-                  >
-                    {mediaTitle}
-                  </Text>
-                  <Text className='opacity-50'>{releaseYear}</Text>
-                </View>
-                <Image
-                  className='absolute bottom-1 right-1 rounded-lg w-28 aspect-[10/15] border-2 border-neutral-800/50 drop-shadow-2xl'
-                  cachePolicy={"memory-disk"}
-                  transition={300}
-                  source={{
-                    uri: posterSrc,
-                  }}
-                />
-              </View>
-              <View>
-                <GenreTags genres={details?.genres?.map((g) => g.name) || []} />
-              </View>
-              {isLoading || isFetching ? (
-                <Button
-                  loading={true}
-                  disabled={true}
-                  color='purple'
-                  className='mt-4'
-                />
-              ) : canRequest ? (
-                <Button color='purple' onPress={request} className='mt-4'>
-                  {t("jellyseerr.request_button")}
-                </Button>
-              ) : (
-                details?.mediaInfo?.jellyfinMediaId && (
-                  <View className='flex flex-row space-x-2 mt-4'>
-                    <Button
-                      className='flex-1 bg-yellow-500/50 border-yellow-400 ring-yellow-400 text-yellow-100'
-                      color='transparent'
-                      onPress={() => bottomSheetModalRef?.current?.present()}
-                      iconLeft={
-                        <Ionicons
-                          name='warning-outline'
-                          size={20}
-                          color='white'
-                        />
-                      }
-                      style={{
-                        borderWidth: 1,
-                        borderStyle: "solid",
-                      }}
-                    >
-                      <Text className='text-sm'>
-                        {t("jellyseerr.report_issue_button")}
-                      </Text>
-                    </Button>
-                    <Button
-                      className='flex-1 bg-purple-600/50 border-purple-400 ring-purple-400 text-purple-100'
-                      onPress={() => {
-                        const url =
-                          mediaType === MediaType.MOVIE
-                            ? `/(auth)/(tabs)/(search)/items/page?id=${details?.mediaInfo.jellyfinMediaId}`
-                            : `/(auth)/(tabs)/(search)/series/${details?.mediaInfo.jellyfinMediaId}`;
-                        // @ts-expect-error
-                        router.push(url);
-                      }}
-                      iconLeft={
-                        <Ionicons name='play-outline' size={20} color='white' />
-                      }
-                      style={{
-                        borderWidth: 1,
-                        borderStyle: "solid",
-                      }}
-                    >
-                      <Text className='text-sm'>Play</Text>
-                    </Button>
-                  </View>
-                )
-              )}
-              <OverviewText text={result.overview} className='mt-4' />
-            </View>
-
-            {mediaType === MediaType.TV && (
-              <JellyseerrSeasons
-                isLoading={isLoading || isFetching}
-                details={details as TvDetails}
-                refetch={refetch}
-                hasAdvancedRequest={hasAdvancedRequestPermission}
-                onAdvancedRequest={(data) => setRequestBody(data)}
-              />
-            )}
-            <DetailFacts
-              className='p-2 border border-neutral-800 bg-neutral-900 rounded-xl'
-              details={details}
-            />
-            <Cast details={details} />
-          </View>
-        </View>
-      </ParallaxScrollView>
-      <RequestModal
-        ref={advancedReqModalRef}
-        requestBody={requestBody}
-        title={mediaTitle}
-        id={result.id!}
-        type={mediaType}
-        isAnime={isAnime}
-        onRequested={() => {
-          _setRequestBody(undefined);
-          advancedReqModalRef?.current?.close();
-          refetch();
-        }}
-        onDismiss={() => _setRequestBody(undefined)}
-      />
-      <BottomSheetModal
-        ref={bottomSheetModalRef}
-        enableDynamicSizing
-        handleIndicatorStyle={{
-          backgroundColor: "white",
-        }}
-        backgroundStyle={{
-          backgroundColor: "#171717",
-        }}
-        backdropComponent={renderBackdrop}
-      >
-        <BottomSheetView>
-          <View className='flex flex-col space-y-4 px-4 pb-8 pt-2'>
-            <View>
-              <Text className='font-bold text-2xl text-neutral-100'>
-                {t("jellyseerr.whats_wrong")}
-              </Text>
-            </View>
-            <View className='flex flex-col space-y-2 items-start'>
-              <View className='flex flex-col'>
-                <DropdownMenu.Root>
-                  <DropdownMenu.Trigger>
-                    <View className='flex flex-col'>
-                      <Text className='opacity-50 mb-1 text-xs'>
-                        {t("jellyseerr.issue_type")}
-                      </Text>
-                      <TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'>
-                        <Text style={{}} className='' numberOfLines={1}>
-                          {issueType
-                            ? IssueTypeName[issueType]
-                            : t("jellyseerr.select_an_issue")}
-                        </Text>
-                      </TouchableOpacity>
-                    </View>
-                  </DropdownMenu.Trigger>
-                  <DropdownMenu.Content
-                    loop={false}
-                    side='bottom'
-                    align='center'
-                    alignOffset={0}
-                    avoidCollisions={true}
-                    collisionPadding={0}
-                    sideOffset={0}
-                  >
-                    <DropdownMenu.Label>
-                      {t("jellyseerr.types")}
-                    </DropdownMenu.Label>
-                    {Object.entries(IssueTypeName)
-                      .reverse()
-                      .map(([key, value], idx) => (
-                        <DropdownMenu.Item
-                          key={value}
-                          onSelect={() =>
-                            setIssueType(key as unknown as IssueType)
-                          }
-                        >
-                          <DropdownMenu.ItemTitle>
-                            {value}
-                          </DropdownMenu.ItemTitle>
-                        </DropdownMenu.Item>
-                      ))}
-                  </DropdownMenu.Content>
-                </DropdownMenu.Root>
-              </View>
-
-              <View className='p-4 border border-neutral-800 rounded-xl bg-neutral-900 w-full'>
-                <BottomSheetTextInput
-                  multiline
-                  maxLength={254}
-                  style={{ color: "white" }}
-                  clearButtonMode='always'
-                  placeholder={t("jellyseerr.describe_the_issue")}
-                  placeholderTextColor='#9CA3AF'
-                  // Issue with multiline + Textinput inside a portal
-                  // https://github.com/callstack/react-native-paper/issues/1668
-                  defaultValue={issueMessage}
-                  onChangeText={setIssueMessage}
-                />
-              </View>
-            </View>
-            <Button className='mt-auto' onPress={submitIssue} color='purple'>
-              {t("jellyseerr.submit_button")}
-            </Button>
-          </View>
-        </BottomSheetView>
-      </BottomSheetModal>
-    </View>
-  );
-};
-
-export default Page;
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx
@@ -1,115 +0,0 @@
-import { OverviewText } from "@/components/OverviewText";
-import { Text } from "@/components/common/Text";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import type { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
-import type {
-  MovieResult,
-  TvResult,
-} from "@/utils/jellyseerr/server/models/Search";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams, useSegments } from "expo-router";
-import { orderBy, uniqBy } from "lodash";
-import React, { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-
-export default function page() {
-  const local = useLocalSearchParams();
-  const { t } = useTranslation();
-
-  const {
-    jellyseerrApi,
-    jellyseerrUser,
-    jellyseerrRegion: region,
-    jellyseerrLocale: locale,
-  } = useJellyseerr();
-
-  const { personId } = local as { personId: string };
-
-  const { data, isLoading, isFetching } = useQuery({
-    queryKey: ["jellyseerr", "person", personId],
-    queryFn: async () => ({
-      details: await jellyseerrApi?.personDetails(personId),
-      combinedCredits: await jellyseerrApi?.personCombinedCredits(personId),
-    }),
-    enabled: !!jellyseerrApi && !!personId,
-  });
-
-  const castedRoles: PersonCreditCast[] = useMemo(
-    () =>
-      uniqBy(
-        orderBy(
-          data?.combinedCredits?.cast,
-          ["voteCount", "voteAverage"],
-          "desc",
-        ),
-        "id",
-      ),
-    [data?.combinedCredits],
-  );
-  const backdrops = useMemo(
-    () =>
-      jellyseerrApi
-        ? castedRoles.map((c) =>
-            jellyseerrApi.imageProxy(
-              c.backdropPath,
-              "w1920_and_h800_multi_faces",
-            ),
-          )
-        : [],
-    [jellyseerrApi, data?.combinedCredits],
-  );
-
-  return (
-    <ParallaxSlideShow
-      data={castedRoles}
-      images={backdrops}
-      listHeader={t("jellyseerr.appearances")}
-      keyExtractor={(item) => item.id.toString()}
-      logo={
-        <Image
-          key={data?.details?.id}
-          id={data?.details?.id.toString()}
-          className='rounded-full bottom-1'
-          source={{
-            uri: jellyseerrApi?.imageProxy(
-              data?.details?.profilePath,
-              "w600_and_h600_bestv2",
-            ),
-          }}
-          cachePolicy={"memory-disk"}
-          contentFit='cover'
-          style={{
-            width: 125,
-            height: 125,
-          }}
-        />
-      }
-      HeaderContent={() => (
-        <>
-          <Text className='font-bold text-2xl mb-1'>{data?.details?.name}</Text>
-          <Text className='opacity-50'>
-            {t("jellyseerr.born")}{" "}
-            {new Date(data?.details?.birthday!).toLocaleDateString(
-              `${locale}-${region}`,
-              {
-                year: "numeric",
-                month: "long",
-                day: "numeric",
-              },
-            )}{" "}
-            | {data?.details?.placeOfBirth}
-          </Text>
-        </>
-      )}
-      MainContent={() => (
-        <OverviewText text={data?.details?.biography} className='mt-4' />
-      )}
-      renderItem={(item, index) => (
-        <JellyseerrPoster item={item as MovieResult | TvResult} />
-      )}
-    />
-  );
-}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/recordings.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/recordings.tsx
@@ -1,13 +0,0 @@
-import { Text } from "@/components/common/Text";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-
-export default function page() {
-  const { t } = useTranslation();
-  return (
-    <View className='flex items-center justify-center h-full -mt-12'>
-      <Text>{t("live_tv.coming_soon")}</Text>
-    </View>
-  );
-}
--- a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
+++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
@@ -1,35 +1,33 @@
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useCallback, useEffect, useMemo } from "react";
-import { FlatList, View, useWindowDimensions } from "react-native";
+import { FlatList, useWindowDimensions, View } from "react-native";

-import { ItemCardText } from "@/components/ItemCardText";
-import { Loader } from "@/components/Loader";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import { FilterButton } from "@/components/filters/FilterButton";
 import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
+import { ItemCardText } from "@/components/ItemCardText";
+import { Loader } from "@/components/Loader";
 import { ItemPoster } from "@/components/posters/ItemPoster";
-import { useOrientation } from "@/hooks/useOrientation";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import {
-  SortByOption,
-  SortOrderOption,
  genreFilterAtom,
  getSortByPreference,
  getSortOrderPreference,
  sortByAtom,
+  SortByOption,
  sortByPreferenceAtom,
  sortOptions,
  sortOrderAtom,
+  SortOrderOption,
  sortOrderOptions,
  sortOrderPreferenceAtom,
  tagsFilterAtom,
  yearFilterAtom,
 } from "@/utils/atoms/filters";
-import type {
+import {
  BaseItemDto,
  BaseItemDtoQueryResult,
  BaseItemKind,
@@ -40,8 +38,8 @@ import {
  getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
-import { useTranslation } from "react-i18next";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { colletionTypeToItemType } from "@/utils/collectionTypeToItemType";

 const Page = () => {
  const searchParams = useLocalSearchParams();
@@ -58,13 +56,9 @@ const Page = () => {
  const [sortOrder, _setSortOrder] = useAtom(sortOrderAtom);
  const [sortByPreference, setSortByPreference] = useAtom(sortByPreferenceAtom);
  const [sortOrderPreference, setOderByPreference] = useAtom(
-    sortOrderPreferenceAtom,
+    sortOrderPreferenceAtom
  );

-  const { orientation } = useOrientation();
-
-  const { t } = useTranslation();
-
  useEffect(() => {
    const sop = getSortOrderPreference(libraryId, sortOrderPreference);
    if (sop) {
@@ -88,7 +82,7 @@ const Page = () => {
      }
      _setSortBy(sortBy);
    },
-    [libraryId, sortByPreference],
+    [libraryId, sortByPreference]
  );

  const setSortOrder = useCallback(
@@ -102,7 +96,7 @@ const Page = () => {
      }
      _setSortOrder(sortOrder);
    },
-    [libraryId, sortOrderPreference],
+    [libraryId, sortOrderPreference]
  );

  const nrOfCols = useMemo(() => {
@@ -169,7 +163,7 @@ const Page = () => {
        fields: ["PrimaryImageAspectRatio", "SortName"],
        genres: selectedGenres,
        tags: selectedTags,
-        years: selectedYears.map((year) => Number.parseInt(year)),
+        years: selectedYears.map((year) => parseInt(year)),
        includeItemTypes: itemType ? [itemType] : undefined,
      });

@@ -185,7 +179,7 @@ const Page = () => {
      selectedTags,
      sortBy,
      sortOrder,
-    ],
+    ]
  );

  const { data, isFetching, fetchNextPage, hasNextPage, isLoading } =
@@ -211,13 +205,14 @@ const Page = () => {
        const totalItems = lastPage.TotalRecordCount;
        const accumulatedItems = pages.reduce(
          (acc, curr) => acc + (curr?.Items?.length || 0),
-          0,
+          0
        );

        if (accumulatedItems < totalItems) {
          return lastPage?.Items?.length * pages.length;
+        } else {
+          return undefined;
        }
-        return undefined;
      },
      initialPageParam: 0,
      enabled: !!api && !!user?.Id && !!library,
@@ -242,14 +237,7 @@ const Page = () => {
      >
        <View
          style={{
-            alignSelf:
-              orientation === ScreenOrientation.OrientationLock.PORTRAIT_UP
-                ? index % nrOfCols === 0
-                  ? "flex-end"
-                  : (index + 1) % nrOfCols === 0
-                    ? "flex-start"
-                    : "center"
-                : "center",
+            alignSelf: "center",
            width: "89%",
          }}
        >
@@ -259,14 +247,14 @@ const Page = () => {
        </View>
      </TouchableItemRouter>
    ),
-    [orientation],
+    [orientation]
  );

  const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);

  const ListHeaderComponent = useCallback(
    () => (
-      <View className=''>
+      <View className="">
        <FlatList
          horizontal
          showsHorizontalScrollIndicator={false}
@@ -285,13 +273,13 @@ const Page = () => {
              key: "genre",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={libraryId}
-                  queryKey='genreFilter'
+                  className="mr-1"
+                  collectionId={libraryId}
+                  queryKey="genreFilter"
                  queryFn={async () => {
                    if (!api) return null;
                    const response = await getFilterApi(
-                      api,
+                      api
                    ).getQueryFiltersLegacy({
                      userId: user?.Id,
                      parentId: libraryId,
@@ -300,7 +288,7 @@ const Page = () => {
                  }}
                  set={setSelectedGenres}
                  values={selectedGenres}
-                  title={t("library.filters.genres")}
+                  title="Genres"
                  renderItemLabel={(item) => item.toString()}
                  searchFilter={(item, search) =>
                    item.toLowerCase().includes(search.toLowerCase())
@@ -312,13 +300,13 @@ const Page = () => {
              key: "year",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={libraryId}
-                  queryKey='yearFilter'
+                  className="mr-1"
+                  collectionId={libraryId}
+                  queryKey="yearFilter"
                  queryFn={async () => {
                    if (!api) return null;
                    const response = await getFilterApi(
-                      api,
+                      api
                    ).getQueryFiltersLegacy({
                      userId: user?.Id,
                      parentId: libraryId,
@@ -327,7 +315,7 @@ const Page = () => {
                  }}
                  set={setSelectedYears}
                  values={selectedYears}
-                  title={t("library.filters.years")}
+                  title="Years"
                  renderItemLabel={(item) => item.toString()}
                  searchFilter={(item, search) => item.includes(search)}
                />
@@ -337,13 +325,13 @@ const Page = () => {
              key: "tags",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={libraryId}
-                  queryKey='tagsFilter'
+                  className="mr-1"
+                  collectionId={libraryId}
+                  queryKey="tagsFilter"
                  queryFn={async () => {
                    if (!api) return null;
                    const response = await getFilterApi(
-                      api,
+                      api
                    ).getQueryFiltersLegacy({
                      userId: user?.Id,
                      parentId: libraryId,
@@ -352,7 +340,7 @@ const Page = () => {
                  }}
                  set={setSelectedTags}
                  values={selectedTags}
-                  title={t("library.filters.tags")}
+                  title="Tags"
                  renderItemLabel={(item) => item.toString()}
                  searchFilter={(item, search) =>
                    item.toLowerCase().includes(search.toLowerCase())
@@ -364,13 +352,13 @@ const Page = () => {
              key: "sortBy",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={libraryId}
-                  queryKey='sortBy'
+                  className="mr-1"
+                  collectionId={libraryId}
+                  queryKey="sortBy"
                  queryFn={async () => sortOptions.map((s) => s.key)}
                  set={setSortBy}
                  values={sortBy}
-                  title={t("library.filters.sort_by")}
+                  title="Sort By"
                  renderItemLabel={(item) =>
                    sortOptions.find((i) => i.key === item)?.value || ""
                  }
@@ -384,13 +372,13 @@ const Page = () => {
              key: "sortOrder",
              component: (
                <FilterButton
-                  className='mr-1'
-                  id={libraryId}
-                  queryKey='sortOrder'
+                  className="mr-1"
+                  collectionId={libraryId}
+                  queryKey="sortOrder"
                  queryFn={async () => sortOrderOptions.map((s) => s.key)}
                  set={setSortOrder}
                  values={sortOrder}
-                  title={t("library.filters.sort_order")}
+                  title="Sort Order"
                  renderItemLabel={(item) =>
                    sortOrderOptions.find((i) => i.key === item)?.value || ""
                  }
@@ -421,29 +409,34 @@ const Page = () => {
      sortOrder,
      setSortOrder,
      isFetching,
-    ],
+    ]
  );

  const insets = useSafeAreaInsets();

  if (isLoading || isLibraryLoading)
    return (
-      <View className='w-full h-full flex items-center justify-center'>
+      <View className="w-full h-full flex items-center justify-center">
        <Loader />
      </View>
    );

+  if (flatData.length === 0)
+    return (
+      <View className="h-full w-full flex justify-center items-center">
+        <Text className="text-lg text-neutral-500">No items found</Text>
+      </View>
+    );
+
  return (
    <FlashList
      key={orientation}
      ListEmptyComponent={
-        <View className='flex flex-col items-center justify-center h-full'>
-          <Text className='font-bold text-xl text-neutral-500'>
-            {t("library.no_results")}
-          </Text>
+        <View className="flex flex-col items-center justify-center h-full">
+          <Text className="font-bold text-xl text-neutral-500">No results</Text>
        </View>
      }
-      contentInsetAdjustmentBehavior='automatic'
+      contentInsetAdjustmentBehavior="automatic"
      data={flatData}
      renderItem={renderItem}
      extraData={[orientation, nrOfCols]}
@@ -468,7 +461,7 @@ const Page = () => {
            width: 10,
            height: 10,
          }}
-        />
+        ></View>
      )}
    />
  );
--- a/app/(auth)/(tabs)/(libraries)/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/_layout.tsx
@@ -1,206 +1,230 @@
+import { Text } from "@/components/common/Text";
 import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
 import { useSettings } from "@/utils/atoms/settings";
 import { Ionicons } from "@expo/vector-icons";
 import { Stack } from "expo-router";
-import { Platform } from "react-native";
-const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-import { useTranslation } from "react-i18next";
+import { useState } from "react";
+import { Modal, Platform, TouchableOpacity, View } from "react-native";

 export default function IndexLayout() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings] = useSettings();
+  const [isMenuVisible, setIsMenuVisible] = useState(false);
+  const [activeSubmenu, setActiveSubmenu] = useState<string | null>(null);

-  const { t } = useTranslation();
+  const MenuItem = ({
+    label,
+    selected,
+    onPress,
+    disabled = false,
+  }: {
+    label: string;
+    selected?: boolean;
+    onPress: () => void;
+    disabled?: boolean;
+  }) => (
+    <TouchableOpacity
+      className={`p-4 border-b border-neutral-800 flex-row items-center justify-between ${
+        disabled ? "opacity-50" : ""
+      }`}
+      onPress={onPress}
+      disabled={disabled}
+    >
+      <Text className="text-base">{label}</Text>
+      {selected && <Ionicons name="checkmark" size={24} color="white" />}
+    </TouchableOpacity>
+  );
+
+  const MenuSection = ({ title }: { title: string }) => (
+    <View className="p-4 border-b border-neutral-800 bg-neutral-800/30">
+      <Text className="text-sm opacity-50 font-medium">{title}</Text>
+    </View>
+  );

  if (!settings?.libraryOptions) return null;

  return (
    <Stack>
      <Stack.Screen
-        name='index'
+        name="index"
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.library"),
+          headerTitle: "Library",
          headerBlurEffect: "prominent",
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
-          headerRight: () =>
-            !pluginSettings?.libraryOptions?.locked &&
-            !Platform.isTV && (
-              <DropdownMenu.Root>
-                <DropdownMenu.Trigger>
-                  <Ionicons
-                    name='ellipsis-horizontal-outline'
-                    size={24}
-                    color='white'
-                  />
-                </DropdownMenu.Trigger>
-                <DropdownMenu.Content
-                  align={"end"}
-                  alignOffset={-10}
-                  avoidCollisions={false}
-                  collisionPadding={0}
-                  loop={false}
-                  side={"bottom"}
-                  sideOffset={10}
-                >
-                  <DropdownMenu.Label>
-                    {t("library.options.display")}
-                  </DropdownMenu.Label>
-                  <DropdownMenu.Group key='display-group'>
-                    <DropdownMenu.Sub>
-                      <DropdownMenu.SubTrigger key='image-style-trigger'>
-                        {t("library.options.display")}
-                      </DropdownMenu.SubTrigger>
-                      <DropdownMenu.SubContent
-                        alignOffset={-10}
-                        avoidCollisions={true}
-                        collisionPadding={0}
-                        loop={true}
-                        sideOffset={10}
-                      >
-                        <DropdownMenu.CheckboxItem
-                          key='display-option-1'
-                          value={settings.libraryOptions.display === "row"}
-                          onValueChange={() =>
-                            updateSettings({
-                              libraryOptions: {
-                                ...settings.libraryOptions,
-                                display: "row",
-                              },
-                            })
-                          }
+          headerRight: () => (
+            <Modal
+              visible={isMenuVisible}
+              transparent
+              animationType="slide"
+              onRequestClose={() => {
+                setIsMenuVisible(false);
+                setActiveSubmenu(null);
+              }}
+            >
+              <TouchableOpacity
+                className="flex-1 bg-black/50"
+                activeOpacity={1}
+                onPress={() => {
+                  setIsMenuVisible(false);
+                  setActiveSubmenu(null);
+                }}
+              >
+                <View className="mt-auto bg-neutral-900 rounded-t-xl">
+                  {!activeSubmenu ? (
+                    <>
+                      <MenuSection title="Display" />
+                      <MenuItem
+                        label="Display"
+                        onPress={() => setActiveSubmenu("display")}
+                      />
+                      <MenuItem
+                        label="Image style"
+                        onPress={() => setActiveSubmenu("imageStyle")}
+                      />
+                      <MenuItem
+                        label="Show titles"
+                        selected={settings.libraryOptions.showTitles}
+                        disabled={
+                          settings.libraryOptions.imageStyle === "poster"
+                        }
+                        onPress={() => {
+                          if (settings.libraryOptions.imageStyle === "poster")
+                            return;
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              showTitles: !settings.libraryOptions.showTitles,
+                            },
+                          });
+                        }}
+                      />
+                      <MenuItem
+                        label="Show stats"
+                        selected={settings.libraryOptions.showStats}
+                        onPress={() => {
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              showStats: !settings.libraryOptions.showStats,
+                            },
+                          });
+                        }}
+                      />
+                    </>
+                  ) : activeSubmenu === "display" ? (
+                    <>
+                      <View className="p-4 border-b border-neutral-800 flex-row items-center">
+                        <TouchableOpacity
+                          onPress={() => setActiveSubmenu(null)}
                        >
-                          <DropdownMenu.ItemIndicator />
-                          <DropdownMenu.ItemTitle key='display-title-1'>
-                            {t("library.options.row")}
-                          </DropdownMenu.ItemTitle>
-                        </DropdownMenu.CheckboxItem>
-                        <DropdownMenu.CheckboxItem
-                          key='display-option-2'
-                          value={settings.libraryOptions.display === "list"}
-                          onValueChange={() =>
-                            updateSettings({
-                              libraryOptions: {
-                                ...settings.libraryOptions,
-                                display: "list",
-                              },
-                            })
-                          }
+                          <Ionicons
+                            name="chevron-back"
+                            size={24}
+                            color="white"
+                          />
+                        </TouchableOpacity>
+                        <Text className="text-lg font-bold ml-2">Display</Text>
+                      </View>
+                      <MenuItem
+                        label="Row"
+                        selected={settings.libraryOptions.display === "row"}
+                        onPress={() => {
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              display: "row",
+                            },
+                          });
+                          setActiveSubmenu(null);
+                        }}
+                      />
+                      <MenuItem
+                        label="List"
+                        selected={settings.libraryOptions.display === "list"}
+                        onPress={() => {
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              display: "list",
+                            },
+                          });
+                          setActiveSubmenu(null);
+                        }}
+                      />
+                    </>
+                  ) : activeSubmenu === "imageStyle" ? (
+                    <>
+                      <View className="p-4 border-b border-neutral-800 flex-row items-center">
+                        <TouchableOpacity
+                          onPress={() => setActiveSubmenu(null)}
                        >
-                          <DropdownMenu.ItemIndicator />
-                          <DropdownMenu.ItemTitle key='display-title-2'>
-                            {t("library.options.list")}
-                          </DropdownMenu.ItemTitle>
-                        </DropdownMenu.CheckboxItem>
-                      </DropdownMenu.SubContent>
-                    </DropdownMenu.Sub>
-                    <DropdownMenu.Sub>
-                      <DropdownMenu.SubTrigger key='image-style-trigger'>
-                        {t("library.options.image_style")}
-                      </DropdownMenu.SubTrigger>
-                      <DropdownMenu.SubContent
-                        alignOffset={-10}
-                        avoidCollisions={true}
-                        collisionPadding={0}
-                        loop={true}
-                        sideOffset={10}
-                      >
-                        <DropdownMenu.CheckboxItem
-                          key='poster-option'
-                          value={
-                            settings.libraryOptions.imageStyle === "poster"
-                          }
-                          onValueChange={() =>
-                            updateSettings({
-                              libraryOptions: {
-                                ...settings.libraryOptions,
-                                imageStyle: "poster",
-                              },
-                            })
-                          }
-                        >
-                          <DropdownMenu.ItemIndicator />
-                          <DropdownMenu.ItemTitle key='poster-title'>
-                            {t("library.options.poster")}
-                          </DropdownMenu.ItemTitle>
-                        </DropdownMenu.CheckboxItem>
-                        <DropdownMenu.CheckboxItem
-                          key='cover-option'
-                          value={settings.libraryOptions.imageStyle === "cover"}
-                          onValueChange={() =>
-                            updateSettings({
-                              libraryOptions: {
-                                ...settings.libraryOptions,
-                                imageStyle: "cover",
-                              },
-                            })
-                          }
-                        >
-                          <DropdownMenu.ItemIndicator />
-                          <DropdownMenu.ItemTitle key='cover-title'>
-                            {t("library.options.cover")}
-                          </DropdownMenu.ItemTitle>
-                        </DropdownMenu.CheckboxItem>
-                      </DropdownMenu.SubContent>
-                    </DropdownMenu.Sub>
-                  </DropdownMenu.Group>
-                  <DropdownMenu.Group key='show-titles-group'>
-                    <DropdownMenu.CheckboxItem
-                      disabled={settings.libraryOptions.imageStyle === "poster"}
-                      key='show-titles-option'
-                      value={settings.libraryOptions.showTitles}
-                      onValueChange={(newValue: string) => {
-                        if (settings.libraryOptions.imageStyle === "poster")
-                          return;
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            showTitles: newValue === "on",
-                          },
-                        });
-                      }}
-                    >
-                      <DropdownMenu.ItemIndicator />
-                      <DropdownMenu.ItemTitle key='show-titles-title'>
-                        {t("library.options.show_titles")}
-                      </DropdownMenu.ItemTitle>
-                    </DropdownMenu.CheckboxItem>
-                    <DropdownMenu.CheckboxItem
-                      key='show-stats-option'
-                      value={settings.libraryOptions.showStats}
-                      onValueChange={(newValue: string) => {
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            showStats: newValue === "on",
-                          },
-                        });
-                      }}
-                    >
-                      <DropdownMenu.ItemIndicator />
-                      <DropdownMenu.ItemTitle key='show-stats-title'>
-                        {t("library.options.show_stats")}
-                      </DropdownMenu.ItemTitle>
-                    </DropdownMenu.CheckboxItem>
-                  </DropdownMenu.Group>
+                          <Ionicons
+                            name="chevron-back"
+                            size={24}
+                            color="white"
+                          />
+                        </TouchableOpacity>
+                        <Text className="text-lg font-bold ml-2">
+                          Image Style
+                        </Text>
+                      </View>
+                      <MenuItem
+                        label="Poster"
+                        selected={
+                          settings.libraryOptions.imageStyle === "poster"
+                        }
+                        onPress={() => {
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              imageStyle: "poster",
+                            },
+                          });
+                          setActiveSubmenu(null);
+                        }}
+                      />
+                      <MenuItem
+                        label="Cover"
+                        selected={
+                          settings.libraryOptions.imageStyle === "cover"
+                        }
+                        onPress={() => {
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              imageStyle: "cover",
+                            },
+                          });
+                          setActiveSubmenu(null);
+                        }}
+                      />
+                    </>
+                  ) : null}

-                  <DropdownMenu.Separator />
-                </DropdownMenu.Content>
-              </DropdownMenu.Root>
-            ),
+                  <TouchableOpacity
+                    className="p-4 border-t border-neutral-800"
+                    onPress={() => {
+                      setIsMenuVisible(false);
+                      setActiveSubmenu(null);
+                    }}
+                  >
+                    <Text className="text-center text-purple-400">Done</Text>
+                  </TouchableOpacity>
+                </View>
+              </TouchableOpacity>
+            </Modal>
+          ),
        }}
      />
      <Stack.Screen
-        name='[libraryId]'
+        name="[libraryId]"
        options={{
          title: "",
          headerShown: true,
          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
        }}
      />
@@ -208,12 +232,12 @@ export default function IndexLayout() {
        <Stack.Screen key={name} name={name} options={options} />
      ))}
      <Stack.Screen
-        name='collections/[collectionId]'
+        name="collections/[collectionId]"
        options={{
          title: "",
          headerShown: true,
          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
        }}
      />
--- a/app/(auth)/(tabs)/(libraries)/index.tsx
+++ b/app/(auth)/(tabs)/(libraries)/index.tsx
@@ -1,6 +1,6 @@
-import { Loader } from "@/components/Loader";
 import { Text } from "@/components/common/Text";
 import { LibraryItemCard } from "@/components/library/LibraryItemCard";
+import { Loader } from "@/components/Loader";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import {
@@ -10,8 +10,7 @@ import {
 import { FlashList } from "@shopify/flash-list";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtom } from "jotai";
-import { useEffect, useMemo } from "react";
-import { useTranslation } from "react-i18next";
+import { useEffect } from "react";
 import { StyleSheet, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";

@@ -21,29 +20,23 @@ export default function index() {
  const queryClient = useQueryClient();
  const [settings] = useSettings();

-  const { t } = useTranslation();
-
-  const { data, isLoading } = useQuery({
+  const { data, isLoading: isLoading } = useQuery({
    queryKey: ["user-views", user?.Id],
    queryFn: async () => {
-      const response = await getUserViewsApi(api!).getUserViews({
-        userId: user?.Id,
+      if (!api || !user?.Id) {
+        return null;
+      }
+
+      const response = await getUserViewsApi(api).getUserViews({
+        userId: user.Id,
      });

      return response.data.Items || null;
    },
-    staleTime: 60,
+    enabled: !!api && !!user?.Id,
+    staleTime: 60 * 1000 * 60,
  });

-  const libraries = useMemo(
-    () =>
-      data
-        ?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!))
-        .filter((l) => l.CollectionType !== "music")
-        .filter((l) => l.CollectionType !== "books") || [],
-    [data, settings?.hiddenLibraries],
-  );
-
  useEffect(() => {
    for (const item of data || []) {
      queryClient.prefetchQuery({
@@ -65,24 +58,22 @@ export default function index() {

  if (isLoading)
    return (
-      <View className='justify-center items-center h-full'>
+      <View className="justify-center items-center h-full">
        <Loader />
      </View>
    );

-  if (!libraries)
+  if (!data)
    return (
-      <View className='h-full w-full flex justify-center items-center'>
-        <Text className='text-lg text-neutral-500'>
-          {t("library.no_libraries_found")}
-        </Text>
+      <View className="h-full w-full flex justify-center items-center">
+        <Text className="text-lg text-neutral-500">No libraries found</Text>
      </View>
    );

  return (
    <FlashList
      extraData={settings}
-      contentInsetAdjustmentBehavior='automatic'
+      contentInsetAdjustmentBehavior="automatic"
      contentContainerStyle={{
        paddingTop: 17,
        paddingHorizontal: settings?.libraryOptions?.display === "row" ? 0 : 17,
@@ -90,7 +81,7 @@ export default function index() {
        paddingLeft: insets.left,
        paddingRight: insets.right,
      }}
-      data={libraries}
+      data={data}
      renderItem={({ item }) => <LibraryItemCard library={item} />}
      keyExtractor={(item) => item.Id || ""}
      ItemSeparatorComponent={() =>
@@ -99,10 +90,10 @@ export default function index() {
            style={{
              height: StyleSheet.hairlineWidth,
            }}
-            className='bg-neutral-800 mx-2 my-4'
-          />
+            className="bg-neutral-800 mx-2 my-4"
+          ></View>
        ) : (
-          <View className='h-4' />
+          <View className="h-4" />
        )
      }
      estimatedItemSize={200}
--- a/app/(auth)/(tabs)/(search)/_layout.tsx
+++ b/app/(auth)/(tabs)/(search)/_layout.tsx
@@ -1,26 +1,18 @@
-import {
-  commonScreenOptions,
-  nestedTabPageScreenOptions,
-} from "@/components/stacks/NestedTabPageStack";
+import {commonScreenOptions, nestedTabPageScreenOptions} from "@/components/stacks/NestedTabPageStack";
 import { Stack } from "expo-router";
-import { useTranslation } from "react-i18next";
 import { Platform } from "react-native";

 export default function SearchLayout() {
-  const { t } = useTranslation();
  return (
    <Stack>
      <Stack.Screen
-        name='index'
+        name="index"
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.search"),
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
+          headerTitle: "Search",
          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
        }}
      />
@@ -28,26 +20,17 @@ export default function SearchLayout() {
        <Stack.Screen key={name} name={name} options={options} />
      ))}
      <Stack.Screen
-        name='collections/[collectionId]'
+        name="collections/[collectionId]"
        options={{
          title: "",
          headerShown: true,
          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
        }}
      />
-      <Stack.Screen name='jellyseerr/page' options={commonScreenOptions} />
      <Stack.Screen
-        name='jellyseerr/person/[personId]'
-        options={commonScreenOptions}
-      />
-      <Stack.Screen
-        name='jellyseerr/company/[companyId]'
-        options={commonScreenOptions}
-      />
-      <Stack.Screen
-        name='jellyseerr/genre/[genreId]'
+        name="jellyseerr/page"
        options={commonScreenOptions}
      />
    </Stack>
--- a/app/(auth)/(tabs)/(search)/index.tsx
+++ b/app/(auth)/(tabs)/(search)/index.tsx
@@ -1,42 +1,42 @@
-import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
-import { Tag } from "@/components/GenreTags";
-import { ItemCardText } from "@/components/ItemCardText";
+import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { FilterButton } from "@/components/filters/FilterButton";
-import {
-  JellyseerrSearchSort,
-  JellyserrIndexPage,
-} from "@/components/jellyseerr/JellyseerrIndexPage";
+import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
+import { ItemCardText } from "@/components/ItemCardText";
+import { Loader } from "@/components/Loader";
+import AlbumCover from "@/components/posters/AlbumCover";
 import MoviePoster from "@/components/posters/MoviePoster";
 import SeriesPoster from "@/components/posters/SeriesPoster";
-import { LoadingSkeleton } from "@/components/search/LoadingSkeleton";
-import { SearchItemWrapper } from "@/components/search/SearchItemWrapper";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
-import { eventBus } from "@/utils/eventBus";
-import type {
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
+import {
  BaseItemDto,
  BaseItemKind,
 } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi, getSearchApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
-import { router, useLocalSearchParams, useNavigation } from "expo-router";
+import { Href, router, useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, {
+  PropsWithChildren,
  useCallback,
  useEffect,
  useLayoutEffect,
  useMemo,
-  useRef,
  useState,
 } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDebounce } from "use-debounce";
+import { useJellyseerr } from "@/hooks/useJellyseerr";
+import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
+import { MediaType } from "@/utils/jellyseerr/server/constants/media";
+import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
+import { Tag } from "@/components/GenreTags";
+import DiscoverSlide from "@/components/jellyseerr/DiscoverSlide";
+import { sortBy } from "lodash";

 type SearchType = "Library" | "Discover";

@@ -53,11 +53,7 @@ export default function search() {
  const params = useLocalSearchParams();
  const insets = useSafeAreaInsets();

-  const [user] = useAtom(userAtom);
-
-  const { t } = useTranslation();
-
-  const { q } = params as { q: string };
+  const { q, prev } = params as { q: string; prev: Href<string> };

  const [searchType, setSearchType] = useState<SearchType>("Library");
  const [search, setSearch] = useState<string>("");
@@ -65,27 +61,17 @@ export default function search() {
  const [debouncedSearch] = useDebounce(search, 500);

  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);

  const [settings] = useSettings();
  const { jellyseerrApi } = useJellyseerr();
-  const [jellyseerrOrderBy, setJellyseerrOrderBy] =
-    useState<JellyseerrSearchSort>(
-      JellyseerrSearchSort[
-        JellyseerrSearchSort.DEFAULT
-      ] as unknown as JellyseerrSearchSort,
-    );
-  const [jellyseerrSortOrder, setJellyseerrSortOrder] = useState<
-    "asc" | "desc"
-  >("desc");

  const searchEngine = useMemo(() => {
    return settings?.searchEngine || "Jellyfin";
  }, [settings]);

  useEffect(() => {
-    if (q && q.length > 0) {
-      setSearch(q);
-    }
+    if (q && q.length > 0) setSearch(q);
  }, [q]);

  const searchFn = useCallback(
@@ -96,94 +82,61 @@ export default function search() {
      types: BaseItemKind[];
      query: string;
    }): Promise<BaseItemDto[]> => {
-      if (!api || !query) {
-        return [];
-      }
+      if (!api || !query) return [];

      try {
        if (searchEngine === "Jellyfin") {
-          const searchApi = await getItemsApi(api).getItems({
+          const searchApi = await getSearchApi(api).getSearchHints({
            searchTerm: query,
            limit: 10,
            includeItemTypes: types,
-            recursive: true,
-            userId: user?.Id,
          });

-          return (searchApi.data.Items as BaseItemDto[]) || [];
+          return (searchApi.data.SearchHints as BaseItemDto[]) || [];
+        } else {
+          if (!settings?.marlinServerUrl) return [];
+          const url = `${
+            settings.marlinServerUrl
+          }/search?q=${encodeURIComponent(query)}&includeItemTypes=${types
+            .map((type) => encodeURIComponent(type))
+            .join("&includeItemTypes=")}`;
+
+          const response1 = await axios.get(url);
+          const ids = response1.data.ids;
+
+          if (!ids || !ids.length) return [];
+
+          const response2 = await getItemsApi(api).getItems({
+            ids,
+            enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+          });
+
+          return (response2.data.Items as BaseItemDto[]) || [];
        }
-        if (!settings?.marlinServerUrl) {
-          return [];
-        }
-
-        const url = `${
-          settings.marlinServerUrl
-        }/search?q=${encodeURIComponent(query)}&includeItemTypes=${types
-          .map((type) => encodeURIComponent(type))
-          .join("&includeItemTypes=")}`;
-
-        const response1 = await axios.get(url);
-
-        const ids = response1.data.ids;
-
-        if (!ids || !ids.length) {
-          return [];
-        }
-
-        const response2 = await getItemsApi(api).getItems({
-          ids,
-          enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-        });
-
-        return (response2.data.Items as BaseItemDto[]) || [];
      } catch (error) {
        console.error("Error during search:", error);
        return []; // Ensure an empty array is returned in case of an error
      }
    },
-    [api, searchEngine, settings],
+    [api, searchEngine, settings]
  );

-  type HeaderSearchBarRef = {
-    focus: () => void;
-    blur: () => void;
-    setText: (text: string) => void;
-    clearText: () => void;
-    cancelSearch: () => void;
-  };
-
-  const searchBarRef = useRef<HeaderSearchBarRef>(null);
  const navigation = useNavigation();
  useLayoutEffect(() => {
-    navigation.setOptions({
-      headerSearchBarOptions: {
-        ref: searchBarRef,
-        placeholder: t("search.search"),
-        onChangeText: (e: any) => {
-          router.setParams({ q: "" });
-          setSearch(e.nativeEvent.text);
+    if (Platform.OS === "ios")
+      navigation.setOptions({
+        headerSearchBarOptions: {
+          placeholder: "Search...",
+          onChangeText: (e: any) => {
+            router.setParams({ q: "" });
+            setSearch(e.nativeEvent.text);
+          },
+          hideWhenScrolling: false,
+          autoFocus: true,
        },
-        hideWhenScrolling: false,
-        autoFocus: false,
-      },
-    });
+      });
  }, [navigation]);

-  useEffect(() => {
-    const unsubscribe = eventBus.on("searchTabPressed", () => {
-      // Screen not active
-      if (!searchBarRef.current) {
-        return;
-      }
-      // Screen is active, focus search bar
-      searchBarRef.current?.focus();
-    });
-
-    return () => {
-      unsubscribe();
-    };
-  }, []);
-
  const { data: movies, isFetching: l1 } = useQuery({
    queryKey: ["search", "movies", debouncedSearch],
    queryFn: () =>
@@ -194,6 +147,48 @@ export default function search() {
    enabled: searchType === "Library" && debouncedSearch.length > 0,
  });

+  const { data: jellyseerrResults, isFetching: j1 } = useQuery({
+    queryKey: ["search", "jellyseerrResults", debouncedSearch],
+    queryFn: async () => {
+      const response = await jellyseerrApi?.search({
+        query: new URLSearchParams(debouncedSearch).toString(),
+        page: 1, // todo: maybe rework page & page-size if first results are not enough...
+        language: "en",
+      });
+
+      return response?.results;
+    },
+    enabled:
+      !!jellyseerrApi &&
+      searchType === "Discover" &&
+      debouncedSearch.length > 0,
+  });
+
+  const { data: jellyseerrDiscoverSettings, isFetching: j2 } = useQuery({
+    queryKey: ["search", "jellyseerrDiscoverSettings", debouncedSearch],
+    queryFn: async () => jellyseerrApi?.discoverSettings(),
+    enabled:
+      !!jellyseerrApi &&
+      searchType === "Discover" &&
+      debouncedSearch.length == 0,
+  });
+
+  const jellyseerrMovieResults: MovieResult[] | undefined = useMemo(
+    () =>
+      jellyseerrResults?.filter(
+        (r) => r.mediaType === MediaType.MOVIE
+      ) as MovieResult[],
+    [jellyseerrResults]
+  );
+
+  const jellyseerrTvResults: TvResult[] | undefined = useMemo(
+    () =>
+      jellyseerrResults?.filter(
+        (r) => r.mediaType === MediaType.TV
+      ) as TvResult[],
+    [jellyseerrResults]
+  );
+
  const { data: series, isFetching: l2 } = useQuery({
    queryKey: ["search", "series", debouncedSearch],
    queryFn: () =>
@@ -234,115 +229,133 @@ export default function search() {
    enabled: searchType === "Library" && debouncedSearch.length > 0,
  });

+  const { data: artists, isFetching: l4 } = useQuery({
+    queryKey: ["search", "artists", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["MusicArtist"],
+      }),
+    enabled: searchType === "Library" && debouncedSearch.length > 0,
+  });
+
+  const { data: albums, isFetching: l5 } = useQuery({
+    queryKey: ["search", "albums", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["MusicAlbum"],
+      }),
+    enabled: searchType === "Library" && debouncedSearch.length > 0,
+  });
+
+  const { data: songs, isFetching: l6 } = useQuery({
+    queryKey: ["search", "songs", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["Audio"],
+      }),
+    enabled: searchType === "Library" && debouncedSearch.length > 0,
+  });
+
  const noResults = useMemo(() => {
    return !(
+      artists?.length ||
+      albums?.length ||
+      songs?.length ||
      movies?.length ||
      episodes?.length ||
      series?.length ||
      collections?.length ||
-      actors?.length
+      actors?.length ||
+      jellyseerrMovieResults?.length ||
+      jellyseerrTvResults?.length
    );
-  }, [episodes, movies, series, collections, actors]);
+  }, [
+    artists,
+    episodes,
+    albums,
+    songs,
+    movies,
+    series,
+    collections,
+    actors,
+    jellyseerrResults,
+  ]);

  const loading = useMemo(() => {
-    return l1 || l2 || l3 || l7 || l8;
-  }, [l1, l2, l3, l7, l8]);
+    return l1 || l2 || l3 || l4 || l5 || l6 || l7 || l8 || j1 || j2;
+  }, [l1, l2, l3, l4, l5, l6, l7, l8, j1, j2]);

  return (
    <>
      <ScrollView
-        keyboardDismissMode='on-drag'
-        contentInsetAdjustmentBehavior='automatic'
+        keyboardDismissMode="on-drag"
+        contentInsetAdjustmentBehavior="automatic"
        contentContainerStyle={{
          paddingLeft: insets.left,
          paddingRight: insets.right,
        }}
      >
-        <View
-          className='flex flex-col'
-          style={{
-            marginTop: Platform.OS === "android" ? 16 : 0,
-          }}
-        >
+        <View className="flex flex-col pt-2">
+          {Platform.OS === "android" && (
+            <View className="mb-4 px-4">
+              <Input
+                autoCorrect={false}
+                returnKeyType="done"
+                keyboardType="web-search"
+                placeholder="Search here..."
+                value={search}
+                onChangeText={(text) => setSearch(text)}
+              />
+            </View>
+          )}
          {jellyseerrApi && (
-            <ScrollView
-              horizontal
-              className='flex flex-row flex-wrap space-x-2 px-4 mb-2'
-            >
+            <View className="flex flex-row flex-wrap space-x-2 px-4 mb-2">
              <TouchableOpacity onPress={() => setSearchType("Library")}>
                <Tag
-                  text={t("search.library")}
-                  textClass='p-1'
+                  text="Library"
+                  textClass="p-1"
                  className={
-                    searchType === "Library" ? "bg-purple-600" : undefined
+                    searchType === "Library" ? "bg-neutral-600" : undefined
                  }
                />
              </TouchableOpacity>
              <TouchableOpacity onPress={() => setSearchType("Discover")}>
                <Tag
-                  text={t("search.discover")}
-                  textClass='p-1'
+                  text="Discover"
+                  textClass="p-1"
                  className={
-                    searchType === "Discover" ? "bg-purple-600" : undefined
+                    searchType === "Discover" ? "bg-neutral-600" : undefined
                  }
                />
              </TouchableOpacity>
-              {searchType === "Discover" &&
-                !loading &&
-                noResults &&
-                debouncedSearch.length > 0 && (
-                  <View className='flex flex-row justify-end items-center space-x-1'>
-                    <FilterButton
-                      id='search'
-                      queryKey='jellyseerr_search'
-                      queryFn={async () =>
-                        Object.keys(JellyseerrSearchSort).filter((v) =>
-                          Number.isNaN(Number(v)),
-                        )
-                      }
-                      set={(value) => setJellyseerrOrderBy(value[0])}
-                      values={[jellyseerrOrderBy]}
-                      title={t("library.filters.sort_by")}
-                      renderItemLabel={(item) =>
-                        t(`home.settings.plugins.jellyseerr.order_by.${item}`)
-                      }
-                      showSearch={false}
-                    />
-                    <FilterButton
-                      id='order'
-                      queryKey='jellysearr_search'
-                      queryFn={async () => ["asc", "desc"]}
-                      set={(value) => setJellyseerrSortOrder(value[0])}
-                      values={[jellyseerrSortOrder]}
-                      title={t("library.filters.sort_order")}
-                      renderItemLabel={(item) => t(`library.filters.${item}`)}
-                      showSearch={false}
-                    />
-                  </View>
-                )}
-            </ScrollView>
+            </View>
          )}
-
-          <View className='mt-2'>
-            <LoadingSkeleton isLoading={loading} />
-          </View>
-
-          {searchType === "Library" ? (
-            <View className={l1 || l2 ? "opacity-0" : "opacity-100"}>
+          {!!q && (
+            <View className="px-4 flex flex-col space-y-2">
+              <Text className="text-neutral-500 ">
+                Results for <Text className="text-purple-600">{q}</Text>
+              </Text>
+            </View>
+          )}
+          {searchType === "Library" && (
+            <>
              <SearchItemWrapper
-                header={t("search.movies")}
+                header="Movies"
                ids={movies?.map((m) => m.Id!)}
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    key={item.Id}
-                    className='flex flex-col w-28 mr-2'
+                    className="flex flex-col w-28 mr-2"
                    item={item}
                  >
                    <MoviePoster item={item} key={item.Id} />
-                    <Text numberOfLines={2} className='mt-2'>
+                    <Text numberOfLines={2} className="mt-2">
                      {item.Name}
                    </Text>
-                    <Text className='opacity-50 text-xs'>
+                    <Text className="opacity-50 text-xs">
                      {item.ProductionYear}
                    </Text>
                  </TouchableItemRouter>
@@ -350,18 +363,18 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={series?.map((m) => m.Id!)}
-                header={t("search.series")}
+                header="Series"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    key={item.Id}
                    item={item}
-                    className='flex flex-col w-28 mr-2'
+                    className="flex flex-col w-28 mr-2"
                  >
                    <SeriesPoster item={item} key={item.Id} />
-                    <Text numberOfLines={2} className='mt-2'>
+                    <Text numberOfLines={2} className="mt-2">
                      {item.Name}
                    </Text>
-                    <Text className='opacity-50 text-xs'>
+                    <Text className="opacity-50 text-xs">
                      {item.ProductionYear}
                    </Text>
                  </TouchableItemRouter>
@@ -369,12 +382,12 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={episodes?.map((m) => m.Id!)}
-                header={t("search.episodes")}
+                header="Episodes"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className='flex flex-col w-44 mr-2'
+                    className="flex flex-col w-44 mr-2"
                  >
                    <ContinueWatchingPoster item={item} />
                    <ItemCardText item={item} />
@@ -383,15 +396,15 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={collections?.map((m) => m.Id!)}
-                header={t("search.collections")}
+                header="Collections"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    key={item.Id}
                    item={item}
-                    className='flex flex-col w-28 mr-2'
+                    className="flex flex-col w-28 mr-2"
                  >
                    <MoviePoster item={item} key={item.Id} />
-                    <Text numberOfLines={2} className='mt-2'>
+                    <Text numberOfLines={2} className="mt-2">
                      {item.Name}
                    </Text>
                  </TouchableItemRouter>
@@ -399,52 +412,180 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={actors?.map((m) => m.Id!)}
-                header={t("search.actors")}
+                header="Actors"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className='flex flex-col w-28 mr-2'
+                    className="flex flex-col w-28 mr-2"
                  >
                    <MoviePoster item={item} />
                    <ItemCardText item={item} />
                  </TouchableItemRouter>
                )}
              />
-            </View>
-          ) : (
-            <JellyserrIndexPage
-              searchQuery={debouncedSearch}
-              sortType={jellyseerrOrderBy}
-              order={jellyseerrSortOrder}
-            />
+              <SearchItemWrapper
+                ids={artists?.map((m) => m.Id!)}
+                header="Artists"
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28 mr-2"
+                  >
+                    <AlbumCover id={item.Id} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
+              <SearchItemWrapper
+                ids={albums?.map((m) => m.Id!)}
+                header="Albums"
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28 mr-2"
+                  >
+                    <AlbumCover id={item.Id} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
+              <SearchItemWrapper
+                ids={songs?.map((m) => m.Id!)}
+                header="Songs"
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28 mr-2"
+                  >
+                    <AlbumCover id={item.AlbumId} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
+            </>
+          )}
+          {searchType === "Discover" && (
+            <>
+              <SearchItemWrapper
+                header="Request Movies"
+                items={jellyseerrMovieResults}
+                renderItem={(item: MovieResult) => (
+                  <JellyseerrPoster item={item} key={item.id} />
+                )}
+              />
+              <SearchItemWrapper
+                header="Request Series"
+                items={jellyseerrTvResults}
+                renderItem={(item: TvResult) => (
+                  <JellyseerrPoster item={item} key={item.id} />
+                )}
+              />
+            </>
          )}

-          {searchType === "Library" &&
-            (!loading && noResults && debouncedSearch.length > 0 ? (
-              <View>
-                <Text className='text-center text-lg font-bold mt-4'>
-                  {t("search.no_results_found_for")}
-                </Text>
-                <Text className='text-xs text-purple-600 text-center'>
-                  "{debouncedSearch}"
-                </Text>
-              </View>
-            ) : debouncedSearch.length === 0 ? (
-              <View className='mt-4 flex flex-col items-center space-y-2'>
-                {exampleSearches.map((e) => (
-                  <TouchableOpacity
-                    onPress={() => setSearch(e)}
-                    key={e}
-                    className='mb-2'
-                  >
-                    <Text className='text-purple-600'>{e}</Text>
-                  </TouchableOpacity>
-                ))}
-              </View>
-            ) : null)}
+          {loading ? (
+            <View className="mt-4 flex justify-center items-center">
+              <Loader />
+            </View>
+          ) : noResults && debouncedSearch.length > 0 ? (
+            <View>
+              <Text className="text-center text-lg font-bold mt-4">
+                No results found for
+              </Text>
+              <Text className="text-xs text-purple-600 text-center">
+                "{debouncedSearch}"
+              </Text>
+            </View>
+          ) : debouncedSearch.length === 0 && searchType === "Library" ? (
+            <View className="mt-4 flex flex-col items-center space-y-2">
+              {exampleSearches.map((e) => (
+                <TouchableOpacity
+                  onPress={() => setSearch(e)}
+                  key={e}
+                  className="mb-2"
+                >
+                  <Text className="text-purple-600">{e}</Text>
+                </TouchableOpacity>
+              ))}
+            </View>
+          ) : debouncedSearch.length === 0 && searchType === "Discover" ? (
+            <View className="flex flex-col px-4">
+              {sortBy?.(
+                jellyseerrDiscoverSettings?.filter((s) => s.enabled),
+                "order"
+              ).map((slide) => (
+                <DiscoverSlide key={slide.id} slide={slide} />
+              ))}
+            </View>
+          ) : null}
        </View>
      </ScrollView>
    </>
  );
 }
+
+type Props<T> = {
+  ids?: string[] | null;
+  items?: T[];
+  renderItem: (item: any) => React.ReactNode;
+  header?: string;
+};
+
+const SearchItemWrapper = <T extends unknown>({
+  ids,
+  items,
+  renderItem,
+  header,
+}: PropsWithChildren<Props<T>>) => {
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const { data, isLoading: l1 } = useQuery({
+    queryKey: ["items", ids],
+    queryFn: async () => {
+      if (!user?.Id || !api || !ids || ids.length === 0) {
+        return [];
+      }
+
+      const itemPromises = ids.map((id) =>
+        getUserItemData({
+          api,
+          userId: user.Id,
+          itemId: id,
+        })
+      );
+
+      const results = await Promise.all(itemPromises);
+
+      // Filter out null items
+      return results.filter(
+        (item) => item !== null
+      ) as unknown as BaseItemDto[];
+    },
+    enabled: !!ids && ids.length > 0 && !!api && !!user?.Id,
+    staleTime: Infinity,
+  });
+
+  if (!data && (!items || items.length === 0)) return null;
+
+  return (
+    <>
+      <Text className="font-bold text-lg px-4 mb-2">{header}</Text>
+      <ScrollView
+        horizontal
+        className="px-4 mb-2"
+        showsHorizontalScrollIndicator={false}
+      >
+        {data && data?.length > 0
+          ? data.map((item) => renderItem(item))
+          : items && items?.length > 0
+          ? items.map((i) => renderItem(i))
+          : undefined}
+      </ScrollView>
+    </>
+  );
+};
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -1,26 +1,24 @@
-import React, { useCallback, useRef } from "react";
-import { useTranslation } from "react-i18next";
+import React from "react";
 import { Platform } from "react-native";

-import { useFocusEffect, useRouter, withLayoutContext } from "expo-router";
+import { withLayoutContext } from "expo-router";

 import {
-  type NativeBottomTabNavigationEventMap,
  createNativeBottomTabNavigator,
+  NativeBottomTabNavigationEventMap,
 } from "@bottom-tabs/react-navigation";

 const { Navigator } = createNativeBottomTabNavigator();
-import type { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
+
+import { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";

 import { Colors } from "@/constants/Colors";
-import { useSettings } from "@/utils/atoms/settings";
-import { eventBus } from "@/utils/eventBus";
-import { storage } from "@/utils/mmkv";
 import type {
  ParamListBase,
  TabNavigationState,
 } from "@react-navigation/native";
 import { SystemBars } from "react-native-edge-to-edge";
+import { useSettings } from "@/utils/atoms/settings";

 export const NativeTabs = withLayoutContext<
  BottomTabNavigationOptions,
@@ -31,118 +29,48 @@ export const NativeTabs = withLayoutContext<

 export default function TabLayout() {
  const [settings] = useSettings();
-  const { t } = useTranslation();
-  const router = useRouter();
-
-  useFocusEffect(
-    useCallback(() => {
-      const hasShownIntro = storage.getBoolean("hasShownIntro");
-      if (!hasShownIntro) {
-        const timer = setTimeout(() => {
-          router.push("/intro/page");
-        }, 1000);
-
-        return () => {
-          clearTimeout(timer);
-        };
-      }
-    }, []),
-  );
-
  return (
    <>
-      <SystemBars hidden={false} style='light' />
+      <SystemBars hidden={false} style="light" />
      <NativeTabs
-        sidebarAdaptable={false}
+        sidebarAdaptable
        ignoresTopSafeArea
-        tabBarStyle={{
-          backgroundColor: "#121212",
-        }}
+        barTintColor={Platform.OS === "android" ? "#121212" : undefined}
        tabBarActiveTintColor={Colors.primary}
-        scrollEdgeAppearance='default'
+        scrollEdgeAppearance="default"
      >
-        <NativeTabs.Screen redirect name='index' />
+        <NativeTabs.Screen redirect name="index" />
        <NativeTabs.Screen
-          listeners={({ navigation }) => ({
-            tabPress: (e) => {
-              eventBus.emit("scrollToTop");
-            },
-          })}
-          name='(home)'
+          name="(home)"
          options={{
-            title: t("tabs.home"),
+            title: "Home",
            tabBarIcon:
-              Platform.OS === "android"
+              Platform.OS == "android"
                ? ({ color, focused, size }) =>
                    require("@/assets/icons/house.fill.png")
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "house.fill" }
-                      : { sfSymbol: "house" },
+                : () => ({ sfSymbol: "house" }),
          }}
        />
        <NativeTabs.Screen
-          listeners={({ navigation }) => ({
-            tabPress: (e) => {
-              eventBus.emit("searchTabPressed");
-            },
-          })}
-          name='(search)'
+          name="(search)"
          options={{
-            title: t("tabs.search"),
+            title: "Search",
            tabBarIcon:
-              Platform.OS === "android"
+              Platform.OS == "android"
                ? ({ color, focused, size }) =>
                    require("@/assets/icons/magnifyingglass.png")
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "magnifyingglass" }
-                      : { sfSymbol: "magnifyingglass" },
+                : () => ({ sfSymbol: "magnifyingglass" }),
          }}
        />
        <NativeTabs.Screen
-          name='(favorites)'
+          name="(libraries)"
          options={{
-            title: t("tabs.favorites"),
+            title: "Library",
            tabBarIcon:
-              Platform.OS === "android"
-                ? ({ color, focused, size }) =>
-                    focused
-                      ? require("@/assets/icons/heart.fill.png")
-                      : require("@/assets/icons/heart.png")
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "heart.fill" }
-                      : { sfSymbol: "heart" },
-          }}
-        />
-        <NativeTabs.Screen
-          name='(libraries)'
-          options={{
-            title: t("tabs.library"),
-            tabBarIcon:
-              Platform.OS === "android"
+              Platform.OS == "android"
                ? ({ color, focused, size }) =>
                    require("@/assets/icons/server.rack.png")
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "rectangle.stack.fill" }
-                      : { sfSymbol: "rectangle.stack" },
-          }}
-        />
-        <NativeTabs.Screen
-          name='(custom-links)'
-          options={{
-            title: t("tabs.custom_links"),
-            // @ts-expect-error
-            tabBarItemHidden: !settings?.showCustomMenuLinks,
-            tabBarIcon:
-              Platform.OS === "android"
-                ? ({ focused }) => require("@/assets/icons/list.png")
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "list.dash.fill" }
-                      : { sfSymbol: "list.dash" },
+                : () => ({ sfSymbol: "rectangle.stack" }),
          }}
        />
      </NativeTabs>
--- a/app/(auth)/player/_layout.tsx
+++ b/app/(auth)/player/_layout.tsx
@@ -1,39 +1,32 @@
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { useSettings } from "@/utils/atoms/settings";
 import { Stack } from "expo-router";
-import React, { useLayoutEffect } from "react";
-import { Platform } from "react-native";
+import React from "react";
 import { SystemBars } from "react-native-edge-to-edge";

 export default function Layout() {
-  const [settings] = useSettings();
-
-  useLayoutEffect(() => {
-    if (Platform.isTV) return;
-
-    if (!settings.followDeviceOrientation && settings.defaultVideoOrientation) {
-      ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
-    }
-
-    return () => {
-      if (Platform.isTV) return;
-
-      if (settings.followDeviceOrientation === true) {
-        ScreenOrientation.unlockAsync();
-      } else {
-        ScreenOrientation.lockAsync(
-          ScreenOrientation.OrientationLock.PORTRAIT_UP,
-        );
-      }
-    };
-  });
-
  return (
    <>
      <SystemBars hidden />
      <Stack>
        <Stack.Screen
-          name='direct-player'
+          name="direct-player"
+          options={{
+            headerShown: false,
+            autoHideHomeIndicator: true,
+            title: "",
+            animation: "fade",
+          }}
+        />
+        <Stack.Screen
+          name="transcoding-player"
+          options={{
+            headerShown: false,
+            autoHideHomeIndicator: true,
+            title: "",
+            animation: "fade",
+          }}
+        />
+        <Stack.Screen
+          name="music-player"
          options={{
            headerShown: false,
            autoHideHomeIndicator: true,
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -1,38 +1,30 @@
 import { BITRATES } from "@/components/BitrateSelector";
-import { Loader } from "@/components/Loader";
 import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
 import { Controls } from "@/components/video-player/controls/Controls";
-import { getDownloadedFileUrl } from "@/hooks/useDownloadedFileOpener";
-import { useHaptic } from "@/hooks/useHaptic";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
 import { useWebSocket } from "@/hooks/useWebsockets";
-import { VlcPlayerView } from "@/modules";
-import type {
-  PipStartedPayload,
+import { VlcPlayerView } from "@/modules/vlc-player";
+import {
  PlaybackStatePayload,
  ProgressUpdatePayload,
  VlcPlayerViewRef,
-} from "@/modules/VlcPlayer.types";
+} from "@/modules/vlc-player/src/VlcPlayer.types";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
+import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { writeToLog } from "@/utils/log";
-import generateDeviceProfile from "@/utils/profiles/native";
+import native from "@/utils/profiles/native";
 import { msToTicks, ticksToSeconds } from "@/utils/time";
-import {
-  type BaseItemDto,
-  type MediaSourceInfo,
-  PlaybackOrder,
-  type PlaybackProgressInfo,
-  PlaybackStartInfo,
-  RepeatMode,
-} from "@jellyfin/sdk/lib/generated-client";
+import { Api } from "@jellyfin/sdk";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import {
  getPlaystateApi,
  getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
-import { activateKeepAwakeAsync, deactivateKeepAwake } from "expo-keep-awake";
-import { useGlobalSearchParams, useNavigation } from "expo-router";
+import { useQuery } from "@tanstack/react-query";
+import { useFocusEffect, useGlobalSearchParams } from "expo-router";
 import { useAtomValue } from "jotai";
 import React, {
  useCallback,
@@ -41,20 +33,13 @@ import React, {
  useRef,
  useState,
 } from "react";
-import { useTranslation } from "react-i18next";
 import { Alert, Platform, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-const downloadProvider = !Platform.isTV
-  ? require("@/providers/DownloadProvider")
-  : null;

 export default function page() {
  const videoRef = useRef<VlcPlayerViewRef>(null);
  const user = useAtomValue(userAtom);
  const api = useAtomValue(apiAtom);
-  const { t } = useTranslation();
-  const navigation = useNavigation();

  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
  const [showControls, _setShowControls] = useState(true);
@@ -62,23 +47,15 @@ export default function page() {
  const [isPlaying, setIsPlaying] = useState(false);
  const [isBuffering, setIsBuffering] = useState(true);
  const [isVideoLoaded, setIsVideoLoaded] = useState(false);
-  const [isPipStarted, setIsPipStarted] = useState(false);

  const progress = useSharedValue(0);
  const isSeeking = useSharedValue(false);
  const cacheProgress = useSharedValue(0);
-  let getDownloadedItem = null;
-  if (!Platform.isTV) {
-    getDownloadedItem = downloadProvider.useDownload();
-  }

  const revalidateProgressCache = useInvalidatePlaybackProgressCache();

-  const lightHapticFeedback = useHaptic("light");
-
  const setShowControls = useCallback((show: boolean) => {
    _setShowControls(show);
-    lightHapticFeedback();
  }, []);

  const {
@@ -87,151 +64,131 @@ export default function page() {
    subtitleIndex: subtitleIndexStr,
    mediaSourceId,
    bitrateValue: bitrateValueStr,
-    offline: offlineStr,
  } = useGlobalSearchParams<{
    itemId: string;
    audioIndex: string;
    subtitleIndex: string;
    mediaSourceId: string;
    bitrateValue: string;
-    offline: string;
  }>();
  const [settings] = useSettings();
-  const insets = useSafeAreaInsets();
-  const offline = offlineStr === "true";

-  const audioIndex = audioIndexStr
-    ? Number.parseInt(audioIndexStr, 10)
-    : undefined;
-  const subtitleIndex = subtitleIndexStr
-    ? Number.parseInt(subtitleIndexStr, 10)
-    : -1;
+  const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
+  const subtitleIndex = subtitleIndexStr ? parseInt(subtitleIndexStr, 10) : -1;
  const bitrateValue = bitrateValueStr
-    ? Number.parseInt(bitrateValueStr, 10)
+    ? parseInt(bitrateValueStr, 10)
    : BITRATES[0].value;

-  const [item, setItem] = useState<BaseItemDto | null>(null);
-  const [itemStatus, setItemStatus] = useState({
-    isLoading: true,
-    isError: false,
-  });
-
-  useEffect(() => {
-    const fetchItemData = async () => {
-      setItemStatus({ isLoading: true, isError: false });
-      try {
-        let fetchedItem: BaseItemDto | null = null;
-        if (offline && !Platform.isTV) {
-          const data = await getDownloadedItem.getDownloadedItem(itemId);
-          if (data) fetchedItem = data.item as BaseItemDto;
-        } else {
-          const res = await getUserLibraryApi(api!).getItem({
-            itemId,
-            userId: user?.Id,
-          });
-          fetchedItem = res.data;
-        }
-        setItem(fetchedItem);
-      } catch (error) {
-        console.error("Failed to fetch item:", error);
-        setItemStatus({ isLoading: false, isError: true });
-      } finally {
-        setItemStatus({ isLoading: false, isError: false });
-      }
-    };
-
-    if (itemId) {
-      fetchItemData();
-    }
-  }, [itemId, offline, api, user?.Id]);
-
-  interface Stream {
-    mediaSource: MediaSourceInfo;
-    sessionId: string;
-    url: string;
-  }
-
-  const [stream, setStream] = useState<Stream | null>(null);
-  const [streamStatus, setStreamStatus] = useState({
-    isLoading: true,
-    isError: false,
-  });
-
-  useEffect(() => {
-    const fetchStreamData = async () => {
-      const native = await generateDeviceProfile();
-      try {
-        let result: Stream | null = null;
-        if (offline && !Platform.isTV) {
-          const data = await getDownloadedItem.getDownloadedItem(itemId);
-          if (!data?.mediaSource) return;
-          const url = await getDownloadedFileUrl(data.item.Id!);
-          if (item) {
-            result = { mediaSource: data.mediaSource, sessionId: "", url };
-          }
-        } else {
-          const res = await getStreamUrl({
-            api,
-            item,
-            startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
-            userId: user?.Id,
-            audioStreamIndex: audioIndex,
-            maxStreamingBitrate: bitrateValue,
-            mediaSourceId: mediaSourceId,
-            subtitleStreamIndex: subtitleIndex,
-            deviceProfile: native,
-          });
-          if (!res) return;
-          const { mediaSource, sessionId, url } = res;
-          if (!sessionId || !mediaSource || !url) {
-            Alert.alert(
-              t("player.error"),
-              t("player.failed_to_get_stream_url"),
-            );
-            return;
-          }
-          result = { mediaSource, sessionId, url };
-        }
-        setStream(result);
-      } catch (error) {
-        console.error("Failed to fetch stream:", error);
-        setStreamStatus({ isLoading: false, isError: true });
-      } finally {
-        setStreamStatus({ isLoading: false, isError: false });
-      }
-    };
-    fetchStreamData();
-  }, [itemId, mediaSourceId, bitrateValue, api, item, user?.Id]);
-
-  useEffect(() => {
-    if (!stream) return;
-
-    const reportPlaybackStart = async () => {
-      await getPlaystateApi(api!).reportPlaybackStart({
-        playbackStartInfo: currentPlayStateInfo() as PlaybackStartInfo,
+  const {
+    data: item,
+    isLoading: isLoadingItem,
+    isError: isErrorItem,
+  } = useQuery({
+    queryKey: ["item", itemId],
+    queryFn: async () => {
+      const res = await getUserLibraryApi(api!).getItem({
+        itemId,
+        userId: user?.Id,
      });
-    };

-    reportPlaybackStart();
-  }, [stream]);
+      return res.data;
+    },
+    enabled: !!itemId,
+    staleTime: 0,
+  });
+
+  const {
+    data: stream,
+    isLoading: isLoadingStreamUrl,
+    isError: isErrorStreamUrl,
+  } = useQuery({
+    queryKey: ["stream-url", itemId, mediaSourceId, bitrateValue],
+    queryFn: async () => {
+      const res = await getStreamUrl({
+        api,
+        item,
+        startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
+        userId: user?.Id,
+        audioStreamIndex: audioIndex,
+        maxStreamingBitrate: bitrateValue,
+        mediaSourceId: mediaSourceId,
+        subtitleStreamIndex: subtitleIndex,
+        deviceProfile: native,
+      });
+
+      if (!res) return null;
+
+      const { mediaSource, sessionId, url } = res;
+
+      if (!sessionId || !mediaSource || !url) {
+        Alert.alert("Error", "Failed to get stream url");
+        return null;
+      }
+
+      return {
+        mediaSource,
+        sessionId,
+        url,
+      };
+    },
+    enabled: !!itemId && !!item,
+    staleTime: 0,
+  });
+
+  const togglePlay = useCallback(async () => {
+    if (!api) return;

-  const togglePlay = async () => {
-    lightHapticFeedback();
-    setIsPlaying(!isPlaying);
    if (isPlaying) {
      await videoRef.current?.pause();
-      reportPlaybackStopped();
+
+      if (stream) {
+        await getPlaystateApi(api).onPlaybackProgress({
+          itemId: item?.Id!,
+          audioStreamIndex: audioIndex ? audioIndex : undefined,
+          subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+          mediaSourceId: mediaSourceId,
+          positionTicks: msToTicks(progress.value),
+          isPaused: true,
+          playMethod: stream.url?.includes("m3u8")
+            ? "Transcode"
+            : "DirectStream",
+          playSessionId: stream.sessionId,
+        });
+      }
+
+      console.log("Actually marked as paused");
    } else {
      videoRef.current?.play();
-      await getPlaystateApi(api!).reportPlaybackStart({
-        playbackStartInfo: currentPlayStateInfo() as PlaybackStartInfo,
-      });
+      if (stream) {
+        await getPlaystateApi(api).onPlaybackProgress({
+          itemId: item?.Id!,
+          audioStreamIndex: audioIndex ? audioIndex : undefined,
+          subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+          mediaSourceId: mediaSourceId,
+          positionTicks: msToTicks(progress.value),
+          isPaused: false,
+          playMethod: stream?.url.includes("m3u8")
+            ? "Transcode"
+            : "DirectStream",
+          playSessionId: stream.sessionId,
+        });
+      }
    }
-  };
+  }, [
+    isPlaying,
+    api,
+    item,
+    stream,
+    videoRef,
+    audioIndex,
+    subtitleIndex,
+    mediaSourceId,
+    progress.value,
+  ]);

  const reportPlaybackStopped = useCallback(async () => {
-    if (offline) return;
-    const currentTimeInTicks = msToTicks(progress.get());
+    const currentTimeInTicks = msToTicks(progress.value);
+
    await getPlaystateApi(api!).onPlaybackStopped({
      itemId: item?.Id!,
      mediaSourceId: mediaSourceId,
@@ -248,185 +205,146 @@ export default function page() {
    videoRef.current?.stop();
  }, [videoRef, reportPlaybackStopped]);

-  useEffect(() => {
-    const beforeRemoveListener = navigation.addListener("beforeRemove", stop);
-    return () => {
-      beforeRemoveListener();
-    };
-  }, [navigation, stop]);
-
-  const currentPlayStateInfo = () => {
+  // TODO: unused should remove.
+  const reportPlaybackStart = useCallback(async () => {
    if (!stream) return;
-    return {
+    await getPlaystateApi(api!).onPlaybackStart({
      itemId: item?.Id!,
      audioStreamIndex: audioIndex ? audioIndex : undefined,
      subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
      mediaSourceId: mediaSourceId,
-      positionTicks: msToTicks(progress.get()),
-      isPaused: !isPlaying,
-      playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
-      playSessionId: stream.sessionId,
-      isMuted: false,
-      canSeek: true,
-      repeatMode: RepeatMode.RepeatNone,
-      playbackOrder: PlaybackOrder.Default,
-    };
-  };
+      playMethod: stream.url?.includes("m3u8") ? "Transcode" : "DirectStream",
+      playSessionId: stream?.sessionId ? stream?.sessionId : undefined,
+    });
+  }, [api, item, mediaSourceId, stream]);

  const onProgress = useCallback(
    async (data: ProgressUpdatePayload) => {
-      if (isSeeking.get() || isPlaybackStopped) return;
+      if (isSeeking.value === true) return;
+      if (isPlaybackStopped === true) return;

      const { currentTime } = data.nativeEvent;
+
      if (isBuffering) {
        setIsBuffering(false);
      }

-      progress.set(currentTime);
+      progress.value = currentTime;

-      if (offline) return;
+      const currentTimeInTicks = msToTicks(currentTime);

      if (!item?.Id || !stream) return;

-      reportPlaybackProgress();
+      await getPlaystateApi(api!).onPlaybackProgress({
+        itemId: item.Id,
+        audioStreamIndex: audioIndex ? audioIndex : undefined,
+        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+        mediaSourceId: mediaSourceId,
+        positionTicks: Math.floor(currentTimeInTicks),
+        isPaused: !isPlaying,
+        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+        playSessionId: stream.sessionId,
+      });
    },
-    [
-      item?.Id,
-      audioIndex,
-      subtitleIndex,
-      mediaSourceId,
-      isPlaying,
-      stream,
-      isSeeking,
-      isPlaybackStopped,
-      isBuffering,
-    ],
+    [item?.Id, isPlaying, api, isPlaybackStopped, audioIndex, subtitleIndex]
  );

-  const onPipStarted = useCallback((e: PipStartedPayload) => {
-    const { pipStarted } = e.nativeEvent;
-    setIsPipStarted(pipStarted);
-  }, []);
-
-  const reportPlaybackProgress = useCallback(async () => {
-    if (!api || offline || !stream) return;
-    await getPlaystateApi(api).reportPlaybackProgress({
-      playbackProgressInfo: currentPlayStateInfo() as PlaybackProgressInfo,
-    });
-  }, [
-    api,
-    isPlaying,
-    offline,
-    stream,
-    item?.Id,
-    audioIndex,
-    subtitleIndex,
-    mediaSourceId,
-    progress,
-  ]);
-
-  const startPosition = useMemo(() => {
-    if (offline) return 0;
-    return item?.UserData?.PlaybackPositionTicks
-      ? ticksToSeconds(item.UserData.PlaybackPositionTicks)
-      : 0;
-  }, [item]);
-
  useWebSocket({
    isPlaying: isPlaying,
    togglePlay: togglePlay,
    stopPlayback: stop,
-    offline,
  });

-  const onPlaybackStateChanged = useCallback(
-    async (e: PlaybackStatePayload) => {
-      const { state, isBuffering, isPlaying } = e.nativeEvent;
-      if (state === "Playing") {
-        setIsPlaying(true);
-        reportPlaybackProgress();
-        if (!Platform.isTV) await activateKeepAwakeAsync();
-        return;
-      }
+  const onPlaybackStateChanged = useCallback((e: PlaybackStatePayload) => {
+    const { state, isBuffering, isPlaying } = e.nativeEvent;

-      if (state === "Paused") {
-        setIsPlaying(false);
-        reportPlaybackProgress();
-        if (!Platform.isTV) await deactivateKeepAwake();
-        return;
-      }
+    if (state === "Playing") {
+      setIsPlaying(true);
+      return;
+    }

-      if (isPlaying) {
-        setIsPlaying(true);
-        setIsBuffering(false);
-      } else if (isBuffering) {
-        setIsBuffering(true);
-      }
-    },
-    [reportPlaybackProgress],
-  );
+    if (state === "Paused") {
+      setIsPlaying(false);
+      return;
+    }

-  const allAudio =
-    stream?.mediaSource.MediaStreams?.filter(
-      (audio) => audio.Type === "Audio",
-    ) || [];
-
-  // Move all the external subtitles last, because vlc places them last.
-  const allSubs =
-    stream?.mediaSource.MediaStreams?.filter(
-      (sub) => sub.Type === "Subtitle",
-    ).sort((a, b) => Number(a.IsExternal) - Number(b.IsExternal)) || [];
-
-  const externalSubtitles = allSubs
-    .filter((sub: any) => sub.DeliveryMethod === "External")
-    .map((sub: any) => ({
-      name: sub.DisplayTitle,
-      DeliveryUrl: api?.basePath + sub.DeliveryUrl,
-    }));
-
-  const textSubs = allSubs.filter((sub) => sub.IsTextSubtitleStream);
-
-  const chosenSubtitleTrack = allSubs.find(
-    (sub) => sub.Index === subtitleIndex,
-  );
-  const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
-
-  const notTranscoding = !stream?.mediaSource.TranscodingUrl;
-  const initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
-  if (
-    chosenSubtitleTrack &&
-    (notTranscoding || chosenSubtitleTrack.IsTextSubtitleStream)
-  ) {
-    const finalIndex = notTranscoding
-      ? allSubs.indexOf(chosenSubtitleTrack)
-      : textSubs.indexOf(chosenSubtitleTrack);
-    initOptions.push(`--sub-track=${finalIndex}`);
-  }
-
-  if (notTranscoding && chosenAudioTrack) {
-    initOptions.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
-  }
-
-  const [isMounted, setIsMounted] = useState(false);
-
-  // Add useEffect to handle mounting
-  useEffect(() => {
-    setIsMounted(true);
-    return () => setIsMounted(false);
+    if (isPlaying) {
+      setIsPlaying(true);
+      setIsBuffering(false);
+    } else if (isBuffering) {
+      setIsBuffering(true);
+    }
  }, []);

-  if (itemStatus.isLoading || streamStatus.isLoading) {
+  const startPosition = useMemo(() => {
+    return item?.UserData?.PlaybackPositionTicks
+      ? ticksToSeconds(item.UserData.PlaybackPositionTicks)
+      : 0;
+  }, [item]);
+
+  useFocusEffect(
+    React.useCallback(() => {
+      return async () => {
+        stop();
+        console.log("Unmounted");
+      };
+    }, [])
+  );
+
+  if (!settings) return null;
+
+  let initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
+  let externalTrack = { name: "", DeliveryUrl: "" };
+
+  const allSubs =
+    stream?.mediaSource.MediaStreams?.filter(
+      (sub) => sub.Type === "Subtitle"
+    ) || [];
+  const chosenSubtitleTrack = allSubs.find(
+    (sub) => sub.Index === subtitleIndex
+  );
+  const allAudio =
+    stream?.mediaSource.MediaStreams?.filter(
+      (audio) => audio.Type === "Audio"
+    ) || [];
+  const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
+
+  // Direct playback CASE
+  if (!bitrateValue) {
+    // If Subtitle is embedded we can use the position to select it straight away.
+    if (chosenSubtitleTrack && !chosenSubtitleTrack.DeliveryUrl) {
+      initOptions.push(`--sub-track=${allSubs.indexOf(chosenSubtitleTrack)}`);
+    } else if (chosenSubtitleTrack && chosenSubtitleTrack.DeliveryUrl) {
+      // If Subtitle is external we need to pass the URL to the player.
+      externalTrack = {
+        name: chosenSubtitleTrack.DisplayTitle || "",
+        DeliveryUrl: `${api?.basePath || ""}${chosenSubtitleTrack.DeliveryUrl}`,
+      };
+    }
+
+    if (chosenAudioTrack)
+      initOptions.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
+  } else {
+    // Transcoded playback CASE
+    if (chosenSubtitleTrack?.DeliveryMethod === "Hls") {
+      externalTrack = {
+        name: `subs ${chosenSubtitleTrack.DisplayTitle}`,
+        DeliveryUrl: "",
+      };
+    }
+  }
+
+  if (!item || isLoadingItem || isLoadingStreamUrl || !stream)
    return (
-      <View className='w-screen h-screen flex flex-col items-center justify-center bg-black'>
+      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
        <Loader />
      </View>
    );
-  }

-  if (!item || !stream || itemStatus.isError || streamStatus.isError)
+  if (isErrorItem || isErrorStreamUrl)
    return (
-      <View className='w-screen h-screen flex flex-col items-center justify-center bg-black'>
-        <Text className='text-white'>{t("player.error")}</Text>
+      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
+        <Text className="text-white">Error</Text>
      </View>
    );

@@ -440,39 +358,38 @@ export default function page() {
          position: "relative",
          flexDirection: "column",
          justifyContent: "center",
-          paddingLeft: ignoreSafeAreas ? 0 : insets.left,
-          paddingRight: ignoreSafeAreas ? 0 : insets.right,
+          opacity: showControls ? (Platform.OS === "android" ? 0.7 : 0.5) : 1,
        }}
      >
        <VlcPlayerView
          ref={videoRef}
          source={{
-            uri: stream?.url || "",
+            uri: stream.url,
            autoplay: true,
            isNetwork: true,
            startPosition,
-            externalSubtitles,
+            externalTrack,
            initOptions,
          }}
          style={{ width: "100%", height: "100%" }}
          onVideoProgress={onProgress}
          progressUpdateInterval={1000}
          onVideoStateChange={onPlaybackStateChanged}
-          onPipStarted={onPipStarted}
+          onVideoLoadStart={() => {}}
          onVideoLoadEnd={() => {
            setIsVideoLoaded(true);
          }}
          onVideoError={(e) => {
            console.error("Video Error:", e.nativeEvent);
            Alert.alert(
-              t("player.error"),
-              t("player.an_error_occured_while_playing_the_video"),
+              "Error",
+              "An error occurred while playing the video. Check logs in settings."
            );
            writeToLog("ERROR", "Video Error", e.nativeEvent);
          }}
        />
      </View>
-      {videoRef.current && !isPipStarted && isMounted === true ? (
+      {videoRef.current && (
        <Controls
          mediaSource={stream?.mediaSource}
          item={item}
@@ -488,20 +405,38 @@ export default function page() {
          setIgnoreSafeAreas={setIgnoreSafeAreas}
          ignoreSafeAreas={ignoreSafeAreas}
          isVideoLoaded={isVideoLoaded}
-          startPictureInPicture={videoRef?.current?.startPictureInPicture}
          play={videoRef.current?.play}
          pause={videoRef.current?.pause}
          seek={videoRef.current?.seekTo}
          enableTrickplay={true}
          getAudioTracks={videoRef.current?.getAudioTracks}
          getSubtitleTracks={videoRef.current?.getSubtitleTracks}
-          offline={offline}
          setSubtitleTrack={videoRef.current.setSubtitleTrack}
          setSubtitleURL={videoRef.current.setSubtitleURL}
          setAudioTrack={videoRef.current.setAudioTrack}
+          stop={stop}
          isVlc
        />
-      ) : null}
+      )}
    </View>
  );
 }
+
+export function usePoster(
+  item: BaseItemDto,
+  api: Api | null
+): string | undefined {
+  const poster = useMemo(() => {
+    if (!item || !api) return undefined;
+    return item.Type === "Audio"
+      ? `${api.basePath}/Items/${item.AlbumId}/Images/Primary?tag=${item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
+      : getBackdropUrl({
+          api,
+          item: item,
+          quality: 70,
+          width: 200,
+        });
+  }, [item, api]);
+
+  return poster ?? undefined;
+}
--- a/app/(auth)/player/music-player.tsx
+++ b/app/(auth)/player/music-player.tsx
@@ -0,0 +1,413 @@
+import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
+import { Controls } from "@/components/video-player/controls/Controls";
+import { useWebSocket } from "@/hooks/useWebsockets";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
+import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import { secondsToTicks } from "@/utils/secondsToTicks";
+import { Api } from "@jellyfin/sdk";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import {
+  getPlaystateApi,
+  getUserLibraryApi,
+} from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
+import { useAtomValue } from "jotai";
+import React, { useCallback, useMemo, useRef, useState } from "react";
+import { Pressable, useWindowDimensions, View } from "react-native";
+import { useSharedValue } from "react-native-reanimated";
+import Video, { OnProgressData, VideoRef } from "react-native-video";
+
+export default function page() {
+  const api = useAtomValue(apiAtom);
+  const user = useAtomValue(userAtom);
+  const [settings] = useSettings();
+  const videoRef = useRef<VideoRef | null>(null);
+  const windowDimensions = useWindowDimensions();
+
+  const firstTime = useRef(true);
+
+  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
+  const [showControls, setShowControls] = useState(true);
+  const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(false);
+  const [isPlaying, setIsPlaying] = useState(false);
+  const [isBuffering, setIsBuffering] = useState(true);
+
+  const progress = useSharedValue(0);
+  const isSeeking = useSharedValue(false);
+  const cacheProgress = useSharedValue(0);
+
+  const {
+    itemId,
+    audioIndex: audioIndexStr,
+    subtitleIndex: subtitleIndexStr,
+    mediaSourceId,
+    bitrateValue: bitrateValueStr,
+  } = useLocalSearchParams<{
+    itemId: string;
+    audioIndex: string;
+    subtitleIndex: string;
+    mediaSourceId: string;
+    bitrateValue: string;
+  }>();
+
+  const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
+  const subtitleIndex = subtitleIndexStr
+    ? parseInt(subtitleIndexStr, 10)
+    : undefined;
+  const bitrateValue = bitrateValueStr
+    ? parseInt(bitrateValueStr, 10)
+    : undefined;
+
+  const {
+    data: item,
+    isLoading: isLoadingItem,
+    isError: isErrorItem,
+  } = useQuery({
+    queryKey: ["item", itemId],
+    queryFn: async () => {
+      if (!api) return;
+      const res = await getUserLibraryApi(api).getItem({
+        itemId,
+        userId: user?.Id,
+      });
+
+      return res.data;
+    },
+    enabled: !!itemId && !!api,
+    staleTime: 0,
+  });
+
+  const {
+    data: stream,
+    isLoading: isLoadingStreamUrl,
+    isError: isErrorStreamUrl,
+  } = useQuery({
+    queryKey: ["stream-url"],
+    queryFn: async () => {
+      if (!api) return;
+      const res = await getStreamUrl({
+        api,
+        item,
+        startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
+        userId: user?.Id,
+        audioStreamIndex: audioIndex,
+        maxStreamingBitrate: bitrateValue,
+        mediaSourceId: mediaSourceId,
+        subtitleStreamIndex: subtitleIndex,
+      });
+
+      if (!res) return null;
+
+      const { mediaSource, sessionId, url } = res;
+
+      if (!sessionId || !mediaSource || !url) return null;
+
+      return {
+        mediaSource,
+        sessionId,
+        url,
+      };
+    },
+  });
+
+  const poster = usePoster(item, api);
+  const videoSource = useVideoSource(item, api, poster, stream?.url);
+
+  const togglePlay = useCallback(
+    async (ticks: number) => {
+      if (isPlaying) {
+        videoRef.current?.pause();
+        await getPlaystateApi(api!).onPlaybackProgress({
+          itemId: item?.Id!,
+          audioStreamIndex: audioIndex ? audioIndex : undefined,
+          subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+          mediaSourceId: mediaSourceId,
+          positionTicks: Math.floor(ticks),
+          isPaused: true,
+          playMethod: stream?.url.includes("m3u8")
+            ? "Transcode"
+            : "DirectStream",
+          playSessionId: stream?.sessionId,
+        });
+      } else {
+        videoRef.current?.resume();
+        await getPlaystateApi(api!).onPlaybackProgress({
+          itemId: item?.Id!,
+          audioStreamIndex: audioIndex ? audioIndex : undefined,
+          subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+          mediaSourceId: mediaSourceId,
+          positionTicks: Math.floor(ticks),
+          isPaused: false,
+          playMethod: stream?.url.includes("m3u8")
+            ? "Transcode"
+            : "DirectStream",
+          playSessionId: stream?.sessionId,
+        });
+      }
+    },
+    [
+      isPlaying,
+      api,
+      item,
+      videoRef,
+      settings,
+      audioIndex,
+      subtitleIndex,
+      mediaSourceId,
+      stream,
+    ]
+  );
+
+  const play = useCallback(() => {
+    console.log("play");
+    videoRef.current?.resume();
+    reportPlaybackStart();
+  }, [videoRef]);
+
+  const pause = useCallback(() => {
+    console.log("play");
+    videoRef.current?.pause();
+  }, [videoRef]);
+
+  const stop = useCallback(() => {
+    console.log("stop");
+    setIsPlaybackStopped(true);
+    videoRef.current?.pause();
+    reportPlaybackStopped();
+  }, [videoRef]);
+
+  const seek = useCallback(
+    (seconds: number) => {
+      videoRef.current?.seek(seconds);
+    },
+    [videoRef]
+  );
+
+  const reportPlaybackStopped = async () => {
+    if (!item?.Id) return;
+    await getPlaystateApi(api!).onPlaybackStopped({
+      itemId: item.Id,
+      mediaSourceId: mediaSourceId,
+      positionTicks: Math.floor(progress.value),
+      playSessionId: stream?.sessionId,
+    });
+  };
+
+  const reportPlaybackStart = async () => {
+    if (!item?.Id) return;
+    await getPlaystateApi(api!).onPlaybackStart({
+      itemId: item?.Id,
+      audioStreamIndex: audioIndex ? audioIndex : undefined,
+      subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+      mediaSourceId: mediaSourceId,
+      playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+      playSessionId: stream?.sessionId,
+    });
+  };
+
+  const onProgress = useCallback(
+    async (data: OnProgressData) => {
+      if (isSeeking.value === true) return;
+      if (isPlaybackStopped === true) return;
+
+      const ticks = data.currentTime * 10000000;
+
+      progress.value = secondsToTicks(data.currentTime);
+      cacheProgress.value = secondsToTicks(data.playableDuration);
+      setIsBuffering(data.playableDuration === 0);
+
+      if (!item?.Id || data.currentTime === 0) return;
+
+      await getPlaystateApi(api!).onPlaybackProgress({
+        itemId: item.Id!,
+        audioStreamIndex: audioIndex ? audioIndex : undefined,
+        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+        mediaSourceId: mediaSourceId,
+        positionTicks: Math.round(ticks),
+        isPaused: !isPlaying,
+        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+        playSessionId: stream?.sessionId,
+      });
+    },
+    [
+      item,
+      isPlaying,
+      api,
+      isPlaybackStopped,
+      audioIndex,
+      subtitleIndex,
+      mediaSourceId,
+      stream,
+    ]
+  );
+
+  useFocusEffect(
+    useCallback(() => {
+      play();
+
+      return () => {
+        stop();
+      };
+    }, [play, stop])
+  );
+
+  useWebSocket({
+    isPlaying: isPlaying,
+    pauseVideo: pause,
+    playVideo: play,
+    stopPlayback: stop,
+  });
+
+  if (isLoadingItem || isLoadingStreamUrl)
+    return (
+      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
+        <Loader />
+      </View>
+    );
+
+  if (isErrorItem || isErrorStreamUrl)
+    return (
+      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
+        <Text className="text-white">Error</Text>
+      </View>
+    );
+
+  if (!item || !stream)
+    return (
+      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
+        <Text className="text-white">Error</Text>
+      </View>
+    );
+
+  return (
+    <View
+      style={{
+        width: windowDimensions.width,
+        height: windowDimensions.height,
+        position: "relative",
+      }}
+      className="flex flex-col items-center justify-center"
+    >
+      <View className="h-screen w-screen top-0 left-0 flex flex-col items-center justify-center p-4 absolute z-0">
+        <Image
+          source={poster}
+          style={{ width: "100%", height: "100%", resizeMode: "contain" }}
+        />
+      </View>
+
+      <Pressable
+        onPress={() => {
+          setShowControls(!showControls);
+        }}
+        className="absolute z-0 h-full w-full opacity-0"
+      >
+        {videoSource && (
+          <Video
+            ref={videoRef}
+            source={videoSource}
+            style={{ width: "100%", height: "100%" }}
+            resizeMode={ignoreSafeAreas ? "cover" : "contain"}
+            onProgress={onProgress}
+            onError={() => {}}
+            onLoad={() => {
+              if (firstTime.current === true) {
+                play();
+                firstTime.current = false;
+              }
+            }}
+            progressUpdateInterval={500}
+            playWhenInactive={true}
+            allowsExternalPlayback={true}
+            playInBackground={true}
+            pictureInPicture={true}
+            showNotificationControls={true}
+            ignoreSilentSwitch="ignore"
+            fullscreen={false}
+            onPlaybackStateChanged={(state) => {
+              setIsPlaying(state.isPlaying);
+            }}
+          />
+        )}
+      </Pressable>
+
+      <Controls
+        item={item}
+        videoRef={videoRef}
+        togglePlay={togglePlay}
+        isPlaying={isPlaying}
+        isSeeking={isSeeking}
+        progress={progress}
+        cacheProgress={cacheProgress}
+        isBuffering={isBuffering}
+        showControls={showControls}
+        setShowControls={setShowControls}
+        setIgnoreSafeAreas={setIgnoreSafeAreas}
+        ignoreSafeAreas={ignoreSafeAreas}
+        enableTrickplay={false}
+        pause={pause}
+        play={play}
+        seek={seek}
+        isVlc={false}
+        stop={stop}
+      />
+    </View>
+  );
+}
+
+export function usePoster(
+  item: BaseItemDto | null | undefined,
+  api: Api | null
+): string | undefined {
+  const poster = useMemo(() => {
+    if (!item || !api) return undefined;
+    return item.Type === "Audio"
+      ? `${api.basePath}/Items/${item.AlbumId}/Images/Primary?tag=${item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
+      : getBackdropUrl({
+          api,
+          item: item,
+          quality: 70,
+          width: 200,
+        });
+  }, [item, api]);
+
+  return poster ?? undefined;
+}
+
+export function useVideoSource(
+  item: BaseItemDto | null | undefined,
+  api: Api | null,
+  poster: string | undefined,
+  url?: string | null
+) {
+  const videoSource = useMemo(() => {
+    if (!item || !api || !url) {
+      return null;
+    }
+
+    const startPosition = item?.UserData?.PlaybackPositionTicks
+      ? Math.round(item.UserData.PlaybackPositionTicks / 10000)
+      : 0;
+
+    return {
+      uri: url,
+      isNetwork: true,
+      startPosition,
+      headers: getAuthHeaders(api),
+      metadata: {
+        artist: item?.AlbumArtist ?? undefined,
+        title: item?.Name || "Unknown",
+        description: item?.Overview ?? undefined,
+        imageUri: poster,
+        subtitle: item?.Album ?? undefined,
+      },
+    };
+  }, [item, api, poster]);
+
+  return videoSource;
+}
--- a/app/(auth)/player/transcoding-player.tsx
+++ b/app/(auth)/player/transcoding-player.tsx
@@ -0,0 +1,551 @@
+import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
+import { Controls } from "@/components/video-player/controls/Controls";
+import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
+import { useWebSocket } from "@/hooks/useWebsockets";
+import { TrackInfo } from "@/modules/vlc-player";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
+import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import transcoding from "@/utils/profiles/transcoding";
+import { secondsToTicks } from "@/utils/secondsToTicks";
+import { Api } from "@jellyfin/sdk";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import {
+  getPlaystateApi,
+  getUserLibraryApi,
+} from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
+import { useAtomValue } from "jotai";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { View } from "react-native";
+import { useSharedValue } from "react-native-reanimated";
+import Video, {
+  OnProgressData,
+  SelectedTrack,
+  SelectedTrackType,
+  VideoRef,
+} from "react-native-video";
+import { SubtitleHelper } from "@/utils/SubtitleHelper";
+
+const Player = () => {
+  const api = useAtomValue(apiAtom);
+  const user = useAtomValue(userAtom);
+  const [settings] = useSettings();
+  const videoRef = useRef<VideoRef | null>(null);
+
+  const firstTime = useRef(true);
+  const revalidateProgressCache = useInvalidatePlaybackProgressCache();
+
+  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
+  const [showControls, _setShowControls] = useState(true);
+  const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(false);
+  const [isPlaying, setIsPlaying] = useState(false);
+  const [isBuffering, setIsBuffering] = useState(true);
+  const [isVideoLoaded, setIsVideoLoaded] = useState(false);
+
+  const setShowControls = useCallback((show: boolean) => {
+    _setShowControls(show);
+  }, []);
+
+  const progress = useSharedValue(0);
+  const isSeeking = useSharedValue(false);
+  const cacheProgress = useSharedValue(0);
+
+  const {
+    itemId,
+    audioIndex: audioIndexStr,
+    subtitleIndex: subtitleIndexStr,
+    mediaSourceId,
+    bitrateValue: bitrateValueStr,
+  } = useLocalSearchParams<{
+    itemId: string;
+    audioIndex: string;
+    subtitleIndex: string;
+    mediaSourceId: string;
+    bitrateValue: string;
+  }>();
+
+  const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
+  const subtitleIndex = subtitleIndexStr
+    ? parseInt(subtitleIndexStr, 10)
+    : undefined;
+  const bitrateValue = bitrateValueStr
+    ? parseInt(bitrateValueStr, 10)
+    : undefined;
+
+  const {
+    data: item,
+    isLoading: isLoadingItem,
+    isError: isErrorItem,
+  } = useQuery({
+    queryKey: ["item", itemId],
+    queryFn: async () => {
+      if (!api) {
+        throw new Error("No api");
+      }
+
+      if (!itemId) {
+        console.warn("No itemId");
+        return null;
+      }
+
+      const res = await getUserLibraryApi(api).getItem({
+        itemId,
+        userId: user?.Id,
+      });
+
+      return res.data;
+    },
+    staleTime: 0,
+  });
+
+  // TODO: NEED TO FIND A WAY TO FROM SWITCHING TO IMAGE BASED TO TEXT BASED SUBTITLES, THERE IS A BUG.
+  // MOST LIKELY LIKELY NEED A MASSIVE REFACTOR.
+  const {
+    data: stream,
+    isLoading: isLoadingStreamUrl,
+    isError: isErrorStreamUrl,
+  } = useQuery({
+    queryKey: ["stream-url", itemId, bitrateValue, mediaSourceId, audioIndex],
+
+    queryFn: async () => {
+      if (!api) {
+        throw new Error("No api");
+      }
+
+      if (!item) {
+        console.warn("No item", itemId, item);
+        return null;
+      }
+
+      const res = await getStreamUrl({
+        api,
+        item,
+        startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
+        userId: user?.Id,
+        audioStreamIndex: audioIndex,
+        maxStreamingBitrate: bitrateValue,
+        mediaSourceId: mediaSourceId,
+        subtitleStreamIndex: subtitleIndex,
+        deviceProfile: transcoding,
+      });
+
+      if (!res) return null;
+
+      const { mediaSource, sessionId, url } = res;
+
+      if (!sessionId || !mediaSource || !url) {
+        console.warn("No sessionId or mediaSource or url", url);
+        return null;
+      }
+
+      return {
+        mediaSource,
+        sessionId,
+        url,
+      };
+    },
+    enabled: !!item,
+    staleTime: 0,
+  });
+
+  const poster = usePoster(item, api);
+  const videoSource = useVideoSource(item, api, poster, stream?.url);
+
+  const togglePlay = useCallback(async () => {
+    if (isPlaying) {
+      videoRef.current?.pause();
+      await getPlaystateApi(api!).onPlaybackProgress({
+        itemId: item?.Id!,
+        audioStreamIndex: audioIndex ? audioIndex : undefined,
+        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+        mediaSourceId: mediaSourceId,
+        positionTicks: Math.floor(progress.value),
+        isPaused: true,
+        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+        playSessionId: stream?.sessionId,
+      });
+    } else {
+      videoRef.current?.resume();
+      await getPlaystateApi(api!).onPlaybackProgress({
+        itemId: item?.Id!,
+        audioStreamIndex: audioIndex ? audioIndex : undefined,
+        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+        mediaSourceId: mediaSourceId,
+        positionTicks: Math.floor(progress.value),
+        isPaused: false,
+        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+        playSessionId: stream?.sessionId,
+      });
+    }
+  }, [
+    isPlaying,
+    api,
+    item,
+    videoRef,
+    settings,
+    stream,
+    audioIndex,
+    subtitleIndex,
+    mediaSourceId,
+  ]);
+
+  const play = useCallback(() => {
+    videoRef.current?.resume();
+    reportPlaybackStart();
+  }, [videoRef]);
+
+  const pause = useCallback(() => {
+    videoRef.current?.pause();
+  }, [videoRef]);
+
+  const seek = useCallback(
+    (seconds: number) => {
+      videoRef.current?.seek(seconds);
+    },
+    [videoRef]
+  );
+
+  const reportPlaybackStopped = async () => {
+    if (!item?.Id) return;
+    await getPlaystateApi(api!).onPlaybackStopped({
+      itemId: item.Id,
+      mediaSourceId: mediaSourceId,
+      positionTicks: Math.floor(progress.value),
+      playSessionId: stream?.sessionId,
+    });
+    revalidateProgressCache();
+  };
+
+  const stop = useCallback(() => {
+    reportPlaybackStopped();
+    videoRef.current?.pause();
+    setIsPlaybackStopped(true);
+  }, [videoRef, reportPlaybackStopped]);
+
+  const reportPlaybackStart = async () => {
+    if (!item?.Id) return;
+    await getPlaystateApi(api!).onPlaybackStart({
+      itemId: item.Id,
+      audioStreamIndex: audioIndex ? audioIndex : undefined,
+      subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+      mediaSourceId: mediaSourceId,
+      playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+      playSessionId: stream?.sessionId,
+    });
+  };
+
+  const onProgress = useCallback(
+    async (data: OnProgressData) => {
+      if (isSeeking.value === true) return;
+      if (isPlaybackStopped === true) return;
+
+      const ticks = secondsToTicks(data.currentTime);
+
+      progress.value = ticks;
+      cacheProgress.value = secondsToTicks(data.playableDuration);
+
+      console.log(
+        "onProgress ~",
+        ticks,
+        isPlaying,
+        `AUDIO index: ${audioIndex} SUB index" ${subtitleIndex}`
+      );
+
+      // TODO: Use this when streaming with HLS url, but NOT when direct playing
+      // TODO: since playable duration is always 0 then.
+      setIsBuffering(data.playableDuration === 0);
+
+      if (!item?.Id || data.currentTime === 0) {
+        return;
+      }
+
+      await getPlaystateApi(api!).onPlaybackProgress({
+        itemId: item.Id,
+        audioStreamIndex: audioIndex ? audioIndex : undefined,
+        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
+        mediaSourceId: mediaSourceId,
+        positionTicks: Math.round(ticks),
+        isPaused: !isPlaying,
+        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+        playSessionId: stream?.sessionId,
+      });
+    },
+    [
+      item,
+      isPlaying,
+      api,
+      isPlaybackStopped,
+      isSeeking,
+      stream,
+      mediaSourceId,
+      audioIndex,
+      subtitleIndex,
+    ]
+  );
+
+  useWebSocket({
+    isPlaying: isPlaying,
+    togglePlay: togglePlay,
+    stopPlayback: stop,
+  });
+
+  const [selectedTextTrack, setSelectedTextTrack] = useState<
+    SelectedTrack | undefined
+  >();
+
+  const [embededTextTracks, setEmbededTextTracks] = useState<
+    {
+      index: number;
+      language?: string | undefined;
+      selected?: boolean | undefined;
+      title?: string | undefined;
+      type: any;
+    }[]
+  >([]);
+
+  const [audioTracks, setAudioTracks] = useState<TrackInfo[]>([]);
+  const [selectedAudioTrack, setSelectedAudioTrack] = useState<
+    SelectedTrack | undefined
+  >(undefined);
+
+  useEffect(() => {
+    if (selectedTextTrack === undefined) {
+      const subtitleHelper = new SubtitleHelper(
+        stream?.mediaSource.MediaStreams ?? []
+      );
+      const embeddedTrackIndex = subtitleHelper.getEmbeddedTrackIndex(
+        subtitleIndex!
+      );
+
+      // Most likely the subtitle is burned in.
+      if (embeddedTrackIndex === -1) return;
+      console.log(
+        "Setting selected text track",
+        subtitleIndex,
+        embeddedTrackIndex
+      );
+      setSelectedTextTrack({
+        type: SelectedTrackType.INDEX,
+        value: embeddedTrackIndex,
+      });
+    }
+  }, [embededTextTracks]);
+
+  const getAudioTracks = (): TrackInfo[] => {
+    return audioTracks.map((t) => ({
+      name: t.name,
+      index: t.index,
+    }));
+  };
+
+  const getSubtitleTracks = (): TrackInfo[] => {
+    return embededTextTracks.map((t) => ({
+      name: t.title ?? "",
+      index: t.index,
+      language: t.language,
+    }));
+  };
+
+  useFocusEffect(
+    React.useCallback(() => {
+      return async () => {
+        stop();
+      };
+    }, [])
+  );
+
+  if (isLoadingItem || isLoadingStreamUrl)
+    return (
+      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
+        <Loader />
+      </View>
+    );
+
+  if (isErrorItem || isErrorStreamUrl)
+    return (
+      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
+        <Text className="text-white">Error</Text>
+      </View>
+    );
+
+  return (
+    <View style={{ flex: 1, backgroundColor: "black" }}>
+      <View
+        style={{
+          display: "flex",
+          width: "100%",
+          height: "100%",
+          position: "relative",
+          flexDirection: "column",
+          justifyContent: "center",
+          opacity: showControls ? 0.5 : 1,
+        }}
+      >
+        {videoSource ? (
+          <>
+            <Video
+              ref={videoRef}
+              source={videoSource}
+              style={{
+                height: "100%",
+                width: "100%",
+              }}
+              resizeMode={ignoreSafeAreas ? "cover" : "contain"}
+              onProgress={onProgress}
+              onError={(e) => {
+                console.error("Error playing video", e);
+              }}
+              onLoad={() => {
+                if (firstTime.current === true) {
+                  play();
+                  firstTime.current = false;
+                }
+              }}
+              progressUpdateInterval={500}
+              playWhenInactive={true}
+              allowsExternalPlayback={true}
+              playInBackground={true}
+              pictureInPicture={true}
+              showNotificationControls={true}
+              ignoreSilentSwitch="ignore"
+              fullscreen={false}
+              onPlaybackStateChanged={(state) => {
+                if (isSeeking.value === false) setIsPlaying(state.isPlaying);
+              }}
+              onTextTracks={(data) => {
+                setEmbededTextTracks(data.textTracks as any);
+              }}
+              onBuffer={(e) => {
+                setIsBuffering(e.isBuffering);
+              }}
+              onAudioTracks={(e) => {
+                console.log("onAudioTracks: ", e.audioTracks);
+                setAudioTracks(
+                  e.audioTracks.map((t) => ({
+                    index: t.index,
+                    name: t.title ?? "",
+                    language: t.language,
+                  }))
+                );
+              }}
+              selectedTextTrack={selectedTextTrack}
+              selectedAudioTrack={selectedAudioTrack}
+            />
+          </>
+        ) : (
+          <Text>No video source...</Text>
+        )}
+      </View>
+
+      {item && (
+        <Controls
+          mediaSource={stream?.mediaSource}
+          videoRef={videoRef}
+          enableTrickplay={true}
+          item={item}
+          togglePlay={togglePlay}
+          isPlaying={isPlaying}
+          isSeeking={isSeeking}
+          progress={progress}
+          cacheProgress={cacheProgress}
+          isBuffering={isBuffering}
+          showControls={showControls}
+          setShowControls={setShowControls}
+          setIgnoreSafeAreas={setIgnoreSafeAreas}
+          ignoreSafeAreas={ignoreSafeAreas}
+          seek={seek}
+          play={play}
+          pause={pause}
+          stop={stop}
+          getSubtitleTracks={getSubtitleTracks}
+          setSubtitleTrack={(i) => {
+            if (i === -1) {
+              setSelectedTextTrack({
+                type: SelectedTrackType.DISABLED,
+                value: undefined,
+              });
+              return;
+            }
+            setSelectedTextTrack({
+              type: SelectedTrackType.INDEX,
+              value: i,
+            });
+          }}
+          getAudioTracks={getAudioTracks}
+          setAudioTrack={(i) => {
+            console.log("setAudioTrack ~", i);
+            setSelectedAudioTrack({
+              type: SelectedTrackType.INDEX,
+              value: i,
+            });
+          }}
+        />
+      )}
+    </View>
+  );
+};
+
+export function usePoster(
+  item: BaseItemDto | null | undefined,
+  api: Api | null
+): string | undefined {
+  const poster = useMemo(() => {
+    if (!item || !api) return undefined;
+    return item.Type === "Audio"
+      ? `${api.basePath}/Items/${item.AlbumId}/Images/Primary?tag=${item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
+      : getBackdropUrl({
+          api,
+          item: item,
+          quality: 70,
+          width: 200,
+        });
+  }, [item, api]);
+
+  return poster ?? undefined;
+}
+
+export function useVideoSource(
+  item: BaseItemDto | null | undefined,
+  api: Api | null,
+  poster: string | undefined,
+  url?: string | null
+) {
+  const videoSource = useMemo(() => {
+    if (!item || !api || !url) {
+      return null;
+    }
+
+    const startPosition = item?.UserData?.PlaybackPositionTicks
+      ? Math.round(item.UserData.PlaybackPositionTicks / 10000)
+      : 0;
+
+    return {
+      uri: url,
+      isNetwork: true,
+      startPosition,
+      headers: getAuthHeaders(api),
+      metadata: {
+        artist: item?.AlbumArtist ?? undefined,
+        title: item?.Name || "Unknown",
+        description: item?.Overview ?? undefined,
+        imageUri: poster,
+        subtitle: item?.Album ?? undefined,
+      },
+    };
+  }, [item, api, poster, url]);
+
+  return videoSource;
+}
+
+export default Player;
--- a/app/(auth)/trailer/page.tsx
+++ b/app/(auth)/trailer/page.tsx
@@ -0,0 +1,46 @@
+import { useGlobalSearchParams } from "expo-router";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { Alert, Dimensions, View } from "react-native";
+import YoutubePlayer, { PLAYER_STATES } from "react-native-youtube-iframe";
+
+export default function page() {
+  const searchParams = useGlobalSearchParams();
+  console.log(searchParams);
+
+  const { url } = searchParams as { url: string };
+
+  const videoId = useMemo(() => {
+    return url.split("v=")[1];
+  }, [url]);
+
+  const [playing, setPlaying] = useState(false);
+
+  const onStateChange = useCallback((state: PLAYER_STATES) => {
+    if (state === "ended") {
+      setPlaying(false);
+      Alert.alert("video has finished playing!");
+    }
+  }, []);
+
+  const togglePlaying = useCallback(() => {
+    setPlaying((prev) => !prev);
+  }, []);
+
+  useEffect(() => {
+    togglePlaying();
+  }, []);
+
+  const screenWidth = Dimensions.get("screen").width;
+
+  return (
+    <View className="flex flex-col bg-black items-center justify-center h-full">
+      <YoutubePlayer
+        height={300}
+        play={playing}
+        videoId={videoId}
+        onChangeState={onStateChange}
+        width={screenWidth}
+      />
+    </View>
+  );
+}
--- a/app/+html.tsx
+++ b/app/+html.tsx
@@ -1,5 +1,5 @@
 import { ScrollViewStyleReset } from "expo-router/html";
-import type { PropsWithChildren } from "react";
+import { type PropsWithChildren } from "react";

 /**
 * This file is web-only and used to configure the root HTML for every web page during static rendering.
@@ -7,13 +7,13 @@ import type { PropsWithChildren } from "react";
 */
 export default function Root({ children }: PropsWithChildren) {
  return (
-    <html lang='en'>
+    <html lang="en">
      <head>
-        <meta charSet='utf-8' />
-        <meta httpEquiv='X-UA-Compatible' content='IE=edge' />
+        <meta charSet="utf-8" />
+        <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
        <meta
-          name='viewport'
-          content='width=device-width, initial-scale=1, shrink-to-fit=no'
+          name="viewport"
+          content="width=device-width, initial-scale=1, shrink-to-fit=no"
        />

        {/*
--- a/app/+not-found.tsx
+++ b/app/+not-found.tsx
@@ -1,17 +1,20 @@
-import { Link, Stack } from "expo-router";
+import { Link, Stack, usePathname } from "expo-router";
 import { StyleSheet } from "react-native";

 import { ThemedText } from "@/components/ThemedText";
 import { ThemedView } from "@/components/ThemedView";
+import { useEffect } from "react";

 export default function NotFoundScreen() {
+  const pathname = usePathname();
+
  return (
    <>
      <Stack.Screen options={{ title: "Oops!" }} />
      <ThemedView style={styles.container}>
-        <ThemedText type='title'>This screen doesn't exist.</ThemedText>
+        <ThemedText type="title">This screen doesn't exist.</ThemedText>
        <Link href={"/home"} style={styles.link}>
-          <ThemedText type='link'>Go to home screen!</ThemedText>
+          <ThemedText type="link">Go to home screen!</ThemedText>
        </Link>
      </ThemedView>
    </>
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -1,278 +1,47 @@
 import "@/augmentations";
-import i18n from "@/i18n";
-import { DownloadProvider } from "@/providers/DownloadProvider";
-import {
-  JellyfinProvider,
-  apiAtom,
-  getOrSetDeviceId,
-  getTokenFromStorage,
-} from "@/providers/JellyfinProvider";
-import { JobQueueProvider } from "@/providers/JobQueueProvider";
+import { JellyfinProvider } from "@/providers/JellyfinProvider";
 import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider";
 import { WebSocketProvider } from "@/providers/WebSocketProvider";
-import { type Settings, useSettings } from "@/utils/atoms/settings";
-import {
-  BACKGROUND_FETCH_TASK,
-  BACKGROUND_FETCH_TASK_SESSIONS,
-  registerBackgroundFetchAsyncSessions,
-} from "@/utils/background-tasks";
-import {
-  LogProvider,
-  writeDebugLog,
-  writeErrorLog,
-  writeToLog,
-} from "@/utils/log";
-import { storage } from "@/utils/mmkv";
-import { cancelJobById, getAllJobsByDeviceId } from "@/utils/optimize-server";
+import { LogProvider } from "@/utils/log";
 import { ActionSheetProvider } from "@expo/react-native-action-sheet";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { Platform } from "react-native";
-const BackGroundDownloader = !Platform.isTV
-  ? require("@kesha-antonov/react-native-background-downloader")
-  : null;
 import { DarkTheme, ThemeProvider } from "@react-navigation/native";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-const BackgroundFetch = !Platform.isTV
-  ? require("expo-background-fetch")
-  : null;
-import * as Device from "expo-device";
-import * as FileSystem from "expo-file-system";
-const Notifications = !Platform.isTV ? require("expo-notifications") : null;
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { Stack, router, useSegments } from "expo-router";
+import { useFonts } from "expo-font";
+import { useKeepAwake } from "expo-keep-awake";
+import { Stack } from "expo-router";
 import * as SplashScreen from "expo-splash-screen";
-const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
-import { getLocales } from "expo-localization";
 import { Provider as JotaiProvider } from "jotai";
-import { useEffect, useRef, useState } from "react";
-import { I18nextProvider } from "react-i18next";
-import { AppState, Appearance } from "react-native";
+import { useEffect } from "react";
+import { Appearance } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import "react-native-reanimated";
-import { userAtom } from "@/providers/JellyfinProvider";
-import { store } from "@/utils/store";
-import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
-import type { EventSubscription } from "expo-modules-core";
-import type {
-  Notification,
-  NotificationResponse,
-} from "expo-notifications/build/Notifications.types";
-import type { ExpoPushToken } from "expo-notifications/build/Tokens.types";
-import { useAtom } from "jotai";
 import { Toaster } from "sonner-native";

-if (!Platform.isTV) {
-  Notifications.setNotificationHandler({
-    handleNotification: async () => ({
-      shouldShowAlert: true,
-      shouldPlaySound: true,
-      shouldSetBadge: false,
-    }),
-  });
-}
-
-// Keep the splash screen visible while we fetch resources
 SplashScreen.preventAutoHideAsync();

-// Set the animation options. This is optional.
-SplashScreen.setOptions({
-  duration: 500,
-  fade: true,
-});
-
-function useNotificationObserver() {
-  if (Platform.isTV) return;
+export default function RootLayout() {
+  const [loaded] = useFonts({
+    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
+  });

  useEffect(() => {
-    let isMounted = true;
-
-    function redirect(notification: typeof Notifications.Notification) {
-      const url = notification.request.content.data?.url;
-      if (url) {
-        router.push(url);
-      }
+    if (loaded) {
+      SplashScreen.hideAsync();
    }
+  }, [loaded]);

-    Notifications.getLastNotificationResponseAsync().then(
-      (response: { notification: any }) => {
-        if (!isMounted || !response?.notification) {
-          return;
-        }
-        redirect(response?.notification);
-      },
-    );
-
-    const subscription = Notifications.addNotificationResponseReceivedListener(
-      (response: { notification: any }) => {
-        redirect(response.notification);
-      },
-    );
-
-    return () => {
-      isMounted = false;
-      subscription.remove();
-    };
-  }, []);
-}
-
-if (!Platform.isTV) {
-  TaskManager.defineTask(BACKGROUND_FETCH_TASK_SESSIONS, async () => {
-    console.log("TaskManager ~ sessions trigger");
-
-    const api = store.get(apiAtom);
-    if (api === null || api === undefined) return;
-
-    const response = await getSessionApi(api).getSessions({
-      activeWithinSeconds: 360,
-    });
-
-    const result = response.data.filter((s) => s.NowPlayingItem);
-    Notifications.setBadgeCountAsync(result.length);
-
-    return BackgroundFetch.BackgroundFetchResult.NewData;
-  });
-
-  TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
-    console.log("TaskManager ~ trigger");
-
-    const now = Date.now();
-
-    const settingsData = storage.getString("settings");
-
-    if (!settingsData) return BackgroundFetch.BackgroundFetchResult.NoData;
-
-    const settings: Partial<Settings> = JSON.parse(settingsData);
-    const url = settings?.optimizedVersionsServerUrl;
-
-    if (!settings?.autoDownload || !url)
-      return BackgroundFetch.BackgroundFetchResult.NoData;
-
-    const token = getTokenFromStorage();
-    const deviceId = getOrSetDeviceId();
-    const baseDirectory = FileSystem.documentDirectory;
-
-    if (!token || !deviceId || !baseDirectory)
-      return BackgroundFetch.BackgroundFetchResult.NoData;
-
-    const jobs = await getAllJobsByDeviceId({
-      deviceId,
-      authHeader: token,
-      url,
-    });
-
-    console.log("TaskManager ~ Active jobs: ", jobs.length);
-
-    for (const job of jobs) {
-      if (job.status === "completed") {
-        const downloadUrl = `${url}download/${job.id}`;
-        const tasks = await BackGroundDownloader.checkForExistingDownloads();
-
-        if (tasks.find((task: { id: string }) => task.id === job.id)) {
-          console.log("TaskManager ~ Download already in progress: ", job.id);
-          continue;
-        }
-
-        BackGroundDownloader.download({
-          id: job.id,
-          url: downloadUrl,
-          destination: `${baseDirectory}${job.item.Id}.mp4`,
-          headers: {
-            Authorization: token,
-          },
-        })
-          .begin(() => {
-            console.log("TaskManager ~ Download started: ", job.id);
-          })
-          .done(() => {
-            console.log("TaskManager ~ Download completed: ", job.id);
-            saveDownloadedItemInfo(job.item);
-            BackGroundDownloader.completeHandler(job.id);
-            cancelJobById({
-              authHeader: token,
-              id: job.id,
-              url: url,
-            });
-            Notifications.scheduleNotificationAsync({
-              content: {
-                title: job.item.Name,
-                body: "Download completed",
-                data: {
-                  url: "/downloads",
-                },
-              },
-              trigger: null,
-            });
-          })
-          .error((error: any) => {
-            console.log("TaskManager ~ Download error: ", job.id, error);
-            BackGroundDownloader.completeHandler(job.id);
-            Notifications.scheduleNotificationAsync({
-              content: {
-                title: job.item.Name,
-                body: "Download failed",
-                data: {
-                  url: "/downloads",
-                },
-              },
-              trigger: null,
-            });
-          });
-      }
-    }
-
-    console.log(`Auto download started: ${new Date(now).toISOString()}`);
-
-    // Be sure to return the successful result type!
-    return BackgroundFetch.BackgroundFetchResult.NewData;
-  });
-}
-
-const checkAndRequestPermissions = async () => {
-  try {
-    const hasAskedBefore = storage.getString(
-      "hasAskedForNotificationPermission",
-    );
-
-    if (hasAskedBefore !== "true") {
-      const { status } = await Notifications.requestPermissionsAsync();
-
-      if (status === "granted") {
-        writeToLog("INFO", "Notification permissions granted.");
-        console.log("Notification permissions granted.");
-      } else {
-        writeToLog("ERROR", "Notification permissions denied.");
-        console.log("Notification permissions denied.");
-      }
-
-      storage.set("hasAskedForNotificationPermission", "true");
-    } else {
-      console.log("Already asked for notification permissions before.");
-    }
-  } catch (error) {
-    writeToLog(
-      "ERROR",
-      "Error checking/requesting notification permissions:",
-      error,
-    );
-    console.error("Error checking/requesting notification permissions:", error);
-  }
-};
-
-export default function RootLayout() {
  Appearance.setColorScheme("dark");

+  if (!loaded) {
+    return null;
+  }
+
  return (
-    <GestureHandlerRootView style={{ flex: 1 }}>
-      <JotaiProvider>
-        <ActionSheetProvider>
-          <I18nextProvider i18n={i18n}>
-            <Layout />
-          </I18nextProvider>
-        </ActionSheetProvider>
-      </JotaiProvider>
-    </GestureHandlerRootView>
+    <JotaiProvider>
+      <Layout />
+    </JotaiProvider>
  );
 }

@@ -289,182 +58,21 @@ const queryClient = new QueryClient({
 });

 function Layout() {
-  const [settings] = useSettings();
-  const [user] = useAtom(userAtom);
-  const [api] = useAtom(apiAtom);
-  const appState = useRef(AppState.currentState);
-  const segments = useSegments();
-
-  useEffect(() => {
-    i18n.changeLanguage(
-      settings?.preferedLanguage ?? getLocales()[0].languageCode ?? "en",
-    );
-  }, [settings?.preferedLanguage, i18n]);
-
-  if (!Platform.isTV) {
-    useNotificationObserver();
-
-    const [expoPushToken, setExpoPushToken] = useState<ExpoPushToken>();
-    const notificationListener = useRef<EventSubscription>();
-    const responseListener = useRef<EventSubscription>();
-
-    useEffect(() => {
-      if (expoPushToken && api && user) {
-        api
-          ?.post("/Streamyfin/device", {
-            token: expoPushToken.data,
-            deviceId: getOrSetDeviceId(),
-            userId: user.Id,
-          })
-          .then((_) => console.log("Posted expo push token"))
-          .catch((_) =>
-            writeErrorLog("Failed to push expo push token to plugin"),
-          );
-      } else console.log("No token available");
-    }, [api, expoPushToken, user]);
-
-    async function registerNotifications() {
-      if (Platform.OS === "android") {
-        console.log("Setting android notification channel 'default'");
-        await Notifications?.setNotificationChannelAsync("default", {
-          name: "default",
-        });
-      }
-
-      await checkAndRequestPermissions();
-
-      if (!Platform.isTV && user && user.Policy?.IsAdministrator) {
-        await registerBackgroundFetchAsyncSessions();
-      }
-
-      // only create push token for real devices (pointless for emulators)
-      if (Device.isDevice) {
-        Notifications?.getExpoPushTokenAsync()
-          .then((token: ExpoPushToken) => token && setExpoPushToken(token))
-          .catch((reason: any) => console.log("Failed to get token", reason));
-      }
-    }
-
-    useEffect(() => {
-      registerNotifications();
-
-      notificationListener.current =
-        Notifications?.addNotificationReceivedListener(
-          (notification: Notification) => {
-            console.log(
-              "Notification received while app running",
-              notification,
-            );
-          },
-        );
-
-      responseListener.current =
-        Notifications?.addNotificationResponseReceivedListener(
-          (response: NotificationResponse) => {
-            // Currently the notifications supported by the plugin will send data for deep links.
-            const { title, data } = response.notification.request.content;
-
-            writeDebugLog(
-              `Notification ${title} opened`,
-              response.notification.request.content,
-            );
-
-            if (data && Object.keys(data).length > 0) {
-              const type = data?.type?.toLower?.();
-              const itemId = data?.id;
-
-              switch (type) {
-                case "movie":
-                  router.push(`/(auth)/(tabs)/home/items/page?id=${itemId}`);
-                  break;
-                case "episode":
-                  // We just clicked a notification for an individual episode.
-                  if (itemId) {
-                    router.push(`/(auth)/(tabs)/home/items/page?id=${itemId}`);
-                  }
-                  // summarized season notification for multiple episodes. Bring them to series season
-                  else {
-                    const seriesId = data.seriesId;
-                    const seasonIndex = data.seasonIndex;
-
-                    if (seasonIndex) {
-                      router.push(
-                        `/(auth)/(tabs)/home/series/${seriesId}?seasonIndex=${seasonIndex}`,
-                      );
-                    } else {
-                      router.push(`/(auth)/(tabs)/home/series/${seriesId}`);
-                    }
-                  }
-                  break;
-              }
-            }
-          },
-        );
-
-      return () => {
-        notificationListener.current &&
-          Notifications?.removeNotificationSubscription(
-            notificationListener.current,
-          );
-        responseListener.current &&
-          Notifications?.removeNotificationSubscription(
-            responseListener.current,
-          );
-      };
-    }, []);
-
-    useEffect(() => {
-      if (Platform.isTV) return;
-      if (segments.includes("direct-player" as never)) {
-        return;
-      }
-
-      // If the user has auto rotate enabled, unlock the orientation
-      if (settings.followDeviceOrientation === true) {
-        ScreenOrientation.unlockAsync();
-      } else {
-        // If the user has auto rotate disabled, lock the orientation to portrait
-        ScreenOrientation.lockAsync(
-          ScreenOrientation.OrientationLock.PORTRAIT_UP,
-        );
-      }
-    }, [settings.followDeviceOrientation, segments]);
-
-    useEffect(() => {
-      const subscription = AppState.addEventListener(
-        "change",
-        (nextAppState) => {
-          if (
-            appState.current.match(/inactive|background/) &&
-            nextAppState === "active"
-          ) {
-            BackGroundDownloader.checkForExistingDownloads();
-          }
-        },
-      );
-
-      BackGroundDownloader.checkForExistingDownloads();
-
-      return () => {
-        subscription.remove();
-      };
-    }, []);
-  }
-
+  useKeepAwake();
  return (
-    <QueryClientProvider client={queryClient}>
-      <JobQueueProvider>
-        <JellyfinProvider>
-          <PlaySettingsProvider>
-            <LogProvider>
-              <WebSocketProvider>
-                <DownloadProvider>
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <QueryClientProvider client={queryClient}>
+        <ActionSheetProvider>
+          <JellyfinProvider>
+            <PlaySettingsProvider>
+              <LogProvider>
+                <WebSocketProvider>
                  <BottomSheetModalProvider>
-                    <SystemBars style='light' hidden={false} />
+                    <SystemBars style="light" hidden={false} />
                    <ThemeProvider value={DarkTheme}>
-                      <Stack initialRouteName='(auth)/(tabs)'>
+                      <Stack initialRouteName="/home">
                        <Stack.Screen
-                          name='(auth)/(tabs)'
+                          name="(auth)/(tabs)"
                          options={{
                            headerShown: false,
                            title: "",
@@ -472,7 +80,7 @@ function Layout() {
                          }}
                        />
                        <Stack.Screen
-                          name='(auth)/player'
+                          name="(auth)/player"
                          options={{
                            headerShown: false,
                            title: "",
@@ -480,14 +88,22 @@ function Layout() {
                          }}
                        />
                        <Stack.Screen
-                          name='login'
+                          name="(auth)/trailer/page"
+                          options={{
+                            headerShown: false,
+                            presentation: "modal",
+                            title: "",
+                          }}
+                        />
+                        <Stack.Screen
+                          name="login"
                          options={{
                            headerShown: true,
                            title: "",
                            headerTransparent: true,
                          }}
                        />
-                        <Stack.Screen name='+not-found' />
+                        <Stack.Screen name="+not-found" />
                      </Stack>
                      <Toaster
                        duration={4000}
@@ -505,33 +121,12 @@ function Layout() {
                      />
                    </ThemeProvider>
                  </BottomSheetModalProvider>
-                </DownloadProvider>
-              </WebSocketProvider>
-            </LogProvider>
-          </PlaySettingsProvider>
-        </JellyfinProvider>
-      </JobQueueProvider>
-    </QueryClientProvider>
+                </WebSocketProvider>
+              </LogProvider>
+            </PlaySettingsProvider>
+          </JellyfinProvider>
+        </ActionSheetProvider>
+      </QueryClientProvider>
+    </GestureHandlerRootView>
  );
 }
-
-function saveDownloadedItemInfo(item: BaseItemDto) {
-  try {
-    const downloadedItems = storage.getString("downloadedItems");
-    const items: BaseItemDto[] = downloadedItems
-      ? JSON.parse(downloadedItems)
-      : [];
-
-    const existingItemIndex = items.findIndex((i) => i.Id === item.Id);
-    if (existingItemIndex !== -1) {
-      items[existingItemIndex] = item;
-    } else {
-      items.push(item);
-    }
-
-    storage.set("downloadedItems", JSON.stringify(items));
-  } catch (error) {
-    writeToLog("ERROR", "Failed to save downloaded item information:", error);
-    console.error("Failed to save downloaded item information:", error);
-  }
-}
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -1,17 +1,13 @@
 import { Button } from "@/components/Button";
-import JellyfinServerDiscovery from "@/components/JellyfinServerDiscovery";
-import { PreviousServersList } from "@/components/PreviousServersList";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
-import { Colors } from "@/constants/Colors";
 import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
-import type { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
+import { Ionicons } from "@expo/vector-icons";
+import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
-import { useAtomValue } from "jotai";
-import type React from "react";
-import { useCallback, useEffect, useState } from "react";
+import { useAtom } from "jotai";
+import React, { useEffect, useState } from "react";
 import {
  Alert,
  KeyboardAvoidingView,
@@ -20,20 +16,18 @@ import {
  TouchableOpacity,
  View,
 } from "react-native";
-import { Keyboard } from "react-native";

-import { t } from "i18next";
 import { z } from "zod";
+
 const CredentialsSchema = z.object({
-  username: z.string().min(1, t("login.username_required")),
+  username: z.string().min(1, "Username is required"),
 });

 const Login: React.FC = () => {
-  const api = useAtomValue(apiAtom);
-  const navigation = useNavigation();
-  const params = useLocalSearchParams();
  const { setServer, login, removeServer, initiateQuickConnect } =
    useJellyfin();
+  const [api] = useAtom(apiAtom);
+  const params = useLocalSearchParams();

  const {
    apiUrl: _apiUrl,
@@ -41,10 +35,9 @@ const Login: React.FC = () => {
    password: _password,
  } = params as { apiUrl: string; username: string; password: string };

-  const [loadingServerCheck, setLoadingServerCheck] = useState<boolean>(false);
-  const [loading, setLoading] = useState<boolean>(false);
  const [serverURL, setServerURL] = useState<string>(_apiUrl);
  const [serverName, setServerName] = useState<string>("");
+  const [error, setError] = useState<string>("");
  const [credentials, setCredentials] = useState<{
    username: string;
    password: string;
@@ -53,13 +46,12 @@ const Login: React.FC = () => {
    password: _password,
  });

-  /**
-   * A way to auto login based on a link
-   */
  useEffect(() => {
    (async () => {
+      // we might re-use the checkUrl function here to check the url as well
+      // however, I don't think it should be necessary for now
      if (_apiUrl) {
-        await setServer({
+        setServer({
          address: _apiUrl,
        });

@@ -73,6 +65,7 @@ const Login: React.FC = () => {
    })();
  }, [_apiUrl, _username, _password]);

+  const navigation = useNavigation();
  useEffect(() => {
    navigation.setOptions({
      headerTitle: serverName,
@@ -82,20 +75,16 @@ const Login: React.FC = () => {
            onPress={() => {
              removeServer();
            }}
-            className='flex flex-row items-center'
          >
-            <Ionicons name='chevron-back' size={18} color={Colors.primary} />
-            <Text className='ml-2 text-purple-600'>
-              {t("login.change_server")}
-            </Text>
+            <Ionicons name="chevron-back" size={24} color="white" />
          </TouchableOpacity>
        ) : null,
    });
  }, [serverName, navigation, api?.basePath]);

-  const handleLogin = async () => {
-    Keyboard.dismiss();
+  const [loading, setLoading] = useState<boolean>(false);

+  const handleLogin = async () => {
    setLoading(true);
    try {
      const result = CredentialsSchema.safeParse(credentials);
@@ -104,18 +93,17 @@ const Login: React.FC = () => {
      }
    } catch (error) {
      if (error instanceof Error) {
-        Alert.alert(t("login.connection_failed"), error.message);
+        setError(error.message);
      } else {
-        Alert.alert(
-          t("login.connection_failed"),
-          t("login.an_unexpected_error_occured"),
-        );
+        setError("An unexpected error occurred");
      }
    } finally {
      setLoading(false);
    }
  };

+  const [loadingServerCheck, setLoadingServerCheck] = useState<boolean>(false);
+
  /**
   * Checks the availability and validity of a Jellyfin server URL.
   *
@@ -131,7 +119,7 @@ const Login: React.FC = () => {
   * - Sets loadingServerCheck state to true at the beginning and false at the end.
   * - Logs errors and timeout information to the console.
   */
-  const checkUrl = useCallback(async (url: string) => {
+  async function checkUrl(url: string) {
    setLoadingServerCheck(true);

    try {
@@ -141,18 +129,15 @@ const Login: React.FC = () => {

      if (response.ok) {
        const data = (await response.json()) as PublicSystemInfo;
-
        setServerName(data.ServerName || "");
        return url;
      }

-      return undefined;
-    } catch {
      return undefined;
    } finally {
      setLoadingServerCheck(false);
    }
-  }, []);
+  }

  /**
   * Handles the connection attempt to a Jellyfin server.
@@ -170,177 +155,159 @@ const Login: React.FC = () => {
   * - Sets the server address using `setServer` if the connection is successful.
   *
   */
-  const handleConnect = useCallback(async (url: string) => {
-    url = url.trim().replace(/\/$/, "");
+  const handleConnect = async (url: string) => {
+    url = url.trim();
+
    const result = await checkUrl(url);

    if (result === undefined) {
      Alert.alert(
-        t("login.connection_failed"),
-        t("login.could_not_connect_to_server"),
+        "Connection failed",
+        "Could not connect to the server. Please check the URL and your network connection."
      );
      return;
    }

-    await setServer({ address: url });
-  }, []);
+    setServer({ address: url });
+  };

  const handleQuickConnect = async () => {
    try {
      const code = await initiateQuickConnect();
      if (code) {
-        Alert.alert(
-          t("login.quick_connect"),
-          t("login.enter_code_to_login", { code: code }),
-          [
-            {
-              text: t("login.got_it"),
-            },
-          ],
-        );
+        Alert.alert("Quick Connect", `Enter code ${code} to login`, [
+          {
+            text: "Got It",
+          },
+        ]);
      }
    } catch (error) {
-      Alert.alert(
-        t("login.error_title"),
-        t("login.failed_to_initiate_quick_connect"),
-      );
+      Alert.alert("Error", "Failed to initiate Quick Connect");
    }
  };

-  return (
-    <SafeAreaView style={{ flex: 1, paddingBottom: 16 }}>
-      <KeyboardAvoidingView
-        behavior={Platform.OS === "ios" ? "padding" : "height"}
-      >
-        {api?.basePath ? (
-          <>
-            <View className='flex flex-col h-full relative items-center justify-center'>
-              <View className='px-4 -mt-20 w-full'>
-                <View className='flex flex-col space-y-2'>
-                  <Text className='text-2xl font-bold -mb-2'>
+  if (api?.basePath) {
+    return (
+      <SafeAreaView style={{ flex: 1 }}>
+        <KeyboardAvoidingView
+          behavior={Platform.OS === "ios" ? "padding" : "height"}
+          style={{ flex: 1, height: "100%" }}
+        >
+          <View className="flex flex-col h-full relative items-center justify-center">
+            <View className="px-4 -mt-20 w-full">
+              <View className="flex flex-col space-y-2">
+                <Text className="text-2xl font-bold -mb-2">
+                  Log in
+                  <>
                    {serverName ? (
                      <>
-                        {`${t("login.login_to_title")} `}
-                        <Text className='text-purple-600'>{serverName}</Text>
+                        {" to "}
+                        <Text className="text-purple-600">{serverName}</Text>
                      </>
-                    ) : (
-                      t("login.login_title")
-                    )}
-                  </Text>
-                  <Text className='text-xs text-neutral-400'>
-                    {api.basePath}
-                  </Text>
-                  <Input
-                    placeholder={t("login.username_placeholder")}
-                    onChangeText={(text) =>
-                      setCredentials({ ...credentials, username: text })
-                    }
-                    value={credentials.username}
-                    keyboardType='default'
-                    returnKeyType='done'
-                    autoCapitalize='none'
-                    // Changed from username to oneTimeCode because it is a known issue in RN
-                    // https://github.com/facebook/react-native/issues/47106#issuecomment-2521270037
-                    textContentType='oneTimeCode'
-                    clearButtonMode='while-editing'
-                    maxLength={500}
-                  />
-
-                  <Input
-                    placeholder={t("login.password_placeholder")}
-                    onChangeText={(text) =>
-                      setCredentials({ ...credentials, password: text })
-                    }
-                    value={credentials.password}
-                    secureTextEntry
-                    keyboardType='default'
-                    returnKeyType='done'
-                    autoCapitalize='none'
-                    textContentType='password'
-                    clearButtonMode='while-editing'
-                    maxLength={500}
-                  />
-                  <View className='flex flex-row items-center justify-between'>
-                    <Button
-                      onPress={handleLogin}
-                      loading={loading}
-                      className='flex-1 mr-2'
-                    >
-                      {t("login.login_button")}
-                    </Button>
-                    <TouchableOpacity
-                      onPress={handleQuickConnect}
-                      className='p-2 bg-neutral-900 rounded-xl h-12 w-12 flex items-center justify-center'
-                    >
-                      <MaterialCommunityIcons
-                        name='cellphone-lock'
-                        size={24}
-                        color='white'
-                      />
-                    </TouchableOpacity>
-                  </View>
-                </View>
-              </View>
-
-              <View className='absolute bottom-0 left-0 w-full px-4 mb-2' />
-            </View>
-          </>
-        ) : (
-          <>
-            <View className='flex flex-col h-full items-center justify-center w-full'>
-              <View className='flex flex-col gap-y-2 px-4 w-full -mt-36'>
-                <Image
-                  style={{
-                    width: 100,
-                    height: 100,
-                    marginLeft: -23,
-                    marginBottom: -20,
-                  }}
-                  source={require("@/assets/images/StreamyFinFinal.png")}
-                />
-                <Text className='text-3xl font-bold'>Streamyfin</Text>
-                <Text className='text-neutral-500'>
-                  {t("server.enter_url_to_jellyfin_server")}
+                    ) : null}
+                  </>
                </Text>
+                <Text className="text-xs text-neutral-400">{serverURL}</Text>
                <Input
-                  aria-label='Server URL'
-                  placeholder={t("server.server_url_placeholder")}
-                  onChangeText={setServerURL}
-                  value={serverURL}
-                  keyboardType='url'
-                  returnKeyType='done'
-                  autoCapitalize='none'
-                  textContentType='URL'
+                  placeholder="Username"
+                  onChangeText={(text) =>
+                    setCredentials({ ...credentials, username: text })
+                  }
+                  value={credentials.username}
+                  autoFocus
+                  secureTextEntry={false}
+                  keyboardType="default"
+                  returnKeyType="done"
+                  autoCapitalize="none"
+                  textContentType="username"
+                  clearButtonMode="while-editing"
                  maxLength={500}
                />
-                <Button
-                  loading={loadingServerCheck}
-                  disabled={loadingServerCheck}
-                  onPress={async () => {
-                    await handleConnect(serverURL);
-                  }}
-                  className='w-full grow'
-                >
-                  {t("server.connect_button")}
-                </Button>
-                <JellyfinServerDiscovery
-                  onServerSelect={async (server) => {
-                    setServerURL(server.address);
-                    if (server.serverName) {
-                      setServerName(server.serverName);
-                    }
-                    await handleConnect(server.address);
-                  }}
-                />
-                <PreviousServersList
-                  onServerSelect={async (s) => {
-                    await handleConnect(s.address);
-                  }}
+
+                <Input
+                  className="mb-2"
+                  placeholder="Password"
+                  onChangeText={(text) =>
+                    setCredentials({ ...credentials, password: text })
+                  }
+                  value={credentials.password}
+                  secureTextEntry
+                  keyboardType="default"
+                  returnKeyType="done"
+                  autoCapitalize="none"
+                  textContentType="password"
+                  clearButtonMode="while-editing"
+                  maxLength={500}
                />
              </View>
+
+              <Text className="text-red-600 mb-2">{error}</Text>
            </View>
-          </>
-        )}
+
+            <View className="absolute bottom-0 left-0 w-full px-4 mb-2">
+              <Button
+                color="black"
+                onPress={handleQuickConnect}
+                className="w-full mb-2"
+              >
+                Use Quick Connect
+              </Button>
+              <Button onPress={handleLogin} loading={loading}>
+                Log in
+              </Button>
+            </View>
+          </View>
+        </KeyboardAvoidingView>
+      </SafeAreaView>
+    );
+  }
+
+  return (
+    <SafeAreaView style={{ flex: 1 }}>
+      <KeyboardAvoidingView
+        behavior={Platform.OS === "ios" ? "padding" : "height"}
+        style={{ flex: 1, height: "100%" }}
+      >
+        <View className="flex flex-col h-full relative items-center justify-center w-full">
+          <View className="flex flex-col gap-y-2 px-4 w-full -mt-36">
+            <Image
+              style={{
+                width: 100,
+                height: 100,
+                marginLeft: -23,
+                marginBottom: -20,
+              }}
+              source={require("@/assets/images/StreamyFinFinal.png")}
+            />
+            <Text className="text-3xl font-bold">Streamyfin</Text>
+            <Text className="text-neutral-500">
+              Enter the URL to your Jellyfin server
+            </Text>
+            <Input
+              placeholder="Server URL"
+              onChangeText={setServerURL}
+              value={serverURL}
+              keyboardType="url"
+              returnKeyType="done"
+              autoCapitalize="none"
+              textContentType="URL"
+              maxLength={500}
+            />
+            <Text className="text-xs text-neutral-500">
+              Make sure to include http or https
+            </Text>
+          </View>
+          <View className="mb-2 absolute bottom-0 left-0 w-full px-4">
+            <Button
+              loading={loadingServerCheck}
+              disabled={loadingServerCheck}
+              onPress={async () => await handleConnect(serverURL)}
+              className="w-full grow"
+            >
+              Connect
+            </Button>
+          </View>
+        </View>
      </KeyboardAvoidingView>
    </SafeAreaView>
  );
--- a/assets/icons/heart.fill.png
+++ b/assets/icons/heart.fill.png
--- a/assets/icons/heart.png
+++ b/assets/icons/heart.png
--- a/assets/icons/jellyseerr-logo.svg
+++ b/assets/icons/jellyseerr-logo.svg
--- a/assets/images/adaptive_icon.png
+++ b/assets/images/adaptive_icon.png
--- a/assets/images/jellyseerr.PNG
+++ b/assets/images/jellyseerr.PNG
--- a/assets/images/notification.png
+++ b/assets/images/notification.png
--- a/augmentations/api.ts
+++ b/augmentations/api.ts
@@ -1,59 +0,0 @@
-import type { StreamyfinPluginConfig } from "@/utils/atoms/settings";
-import { AUTHORIZATION_HEADER, Api } from "@jellyfin/sdk";
-import type { AxiosRequestConfig, AxiosResponse } from "axios";
-
-declare module "@jellyfin/sdk" {
-  interface Api {
-    get<T, D = any>(
-      url: string,
-      config?: AxiosRequestConfig<D>,
-    ): Promise<AxiosResponse<T>>;
-    post<T, D = any>(
-      url: string,
-      data: D,
-      config?: AxiosRequestConfig<D>,
-    ): Promise<AxiosResponse<T>>;
-    delete<T, D = any>(
-      url: string,
-      config?: AxiosRequestConfig<D>,
-    ): Promise<AxiosResponse<T>>;
-    getStreamyfinPluginConfig(): Promise<AxiosResponse<StreamyfinPluginConfig>>;
-  }
-}
-
-Api.prototype.get = function <T, D = any>(
-  url: string,
-  config: AxiosRequestConfig<D> = {},
-): Promise<AxiosResponse<T>> {
-  return this.axiosInstance.get<T>(`${this.basePath}${url}`, {
-    ...(config ?? {}),
-    headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader },
-  });
-};
-
-Api.prototype.post = function <T, D = any>(
-  url: string,
-  data: D,
-  config: AxiosRequestConfig<D>,
-): Promise<AxiosResponse<T>> {
-  return this.axiosInstance.post<T>(`${this.basePath}${url}`, data, {
-    ...(config || {}),
-    headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader },
-  });
-};
-
-Api.prototype.delete = function <T, D = any>(
-  url: string,
-  config: AxiosRequestConfig<D>,
-): Promise<AxiosResponse<T>> {
-  return this.axiosInstance.delete<T>(`${this.basePath}${url}`, {
-    ...(config || {}),
-    headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader },
-  });
-};
-
-Api.prototype.getStreamyfinPluginConfig = function (): Promise<
-  AxiosResponse<StreamyfinPluginConfig>
-> {
-  return this.get<StreamyfinPluginConfig>("/Streamyfin/config");
-};
--- a/augmentations/index.ts
+++ b/augmentations/index.ts
@@ -1,4 +1,3 @@
-export * from "./api";
 export * from "./mmkv";
 export * from "./number";
 export * from "./string";
--- a/augmentations/mmkv.ts
+++ b/augmentations/mmkv.ts
@@ -1,21 +1,17 @@
-import { MMKV } from "react-native-mmkv";
+import {MMKV} from "react-native-mmkv";

 declare module "react-native-mmkv" {
  interface MMKV {
-    get<T>(key: string): T | undefined;
-    setAny(key: string, value: any | undefined): void;
+    get<T>(key: string): T | undefined
+    setAny(key: string, value: any | undefined): void
  }
 }

-MMKV.prototype.get = function <T>(key: string): T | undefined {
+MMKV.prototype.get = function <T> (key: string): T | undefined {
  const serializedItem = this.getString(key);
  return serializedItem ? JSON.parse(serializedItem) : undefined;
-};
+}

 MMKV.prototype.setAny = function (key: string, value: any | undefined): void {
-  if (value === undefined) {
-    this.delete(key);
-  } else {
-    this.set(key, JSON.stringify(value));
-  }
-};
+  this.set(key, JSON.stringify(value));
+}
--- a/augmentations/number.ts
+++ b/augmentations/number.ts
@@ -1,35 +1,37 @@
 declare global {
  interface Number {
-    bytesToReadable(decimals?: number): string;
-    secondsToMilliseconds(): number;
-    minutesToMilliseconds(): number;
-    hoursToMilliseconds(): number;
+    bytesToReadable(): string;
+    secondsToMilliseconds(): number
+    minutesToMilliseconds(): number
+    hoursToMilliseconds(): number
  }
 }

-Number.prototype.bytesToReadable = function (decimals = 2) {
+Number.prototype.bytesToReadable = function () {
  const bytes = this.valueOf();
-  if (bytes === 0) return "0 Bytes";
+  const gb = bytes / 1e9;

-  const k = 1024;
-  const dm = decimals < 0 ? 0 : decimals;
-  const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+  if (gb >= 1) return `${gb.toFixed(2)} GB`;

-  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  const mb = bytes / 1024.0 / 1024.0;
+  if (mb >= 1) return `${mb.toFixed(2)} MB`;

-  return `${Number.parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`;
-};
+  const kb = bytes / 1024.0;
+  if (kb >= 1) return `${kb.toFixed(2)} KB`;
+
+  return `${bytes.toFixed(2)} B`;
+}

 Number.prototype.secondsToMilliseconds = function () {
-  return this.valueOf() * 1000;
-};
+  return this.valueOf() * 1000
+}

 Number.prototype.minutesToMilliseconds = function () {
-  return this.valueOf() * (60).secondsToMilliseconds();
-};
+  return this.valueOf() * (60).secondsToMilliseconds()
+}

 Number.prototype.hoursToMilliseconds = function () {
-  return this.valueOf() * (60).minutesToMilliseconds();
-};
+  return this.valueOf() * (60).minutesToMilliseconds()
+}

-export {};
+export {};
--- a/augmentations/string.ts
+++ b/augmentations/string.ts
@@ -5,10 +5,12 @@ declare global {
 }

 String.prototype.toTitle = function () {
-  return this.replaceAll("_", " ").replace(
-    /\w\S*/g,
-    (text) => text.charAt(0).toUpperCase() + text.substring(1).toLowerCase(),
-  );
-};
+  return this
+    .replaceAll("_", " ")
+    .replace(
+      /\w\S*/g,
+      text => text.charAt(0).toUpperCase() + text.substring(1).toLowerCase()
+    );
+}

-export {};
+export {};
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,4 +1,4 @@
-module.exports = (api) => {
+module.exports = function (api) {
  api.cache(true);
  return {
    presets: ["babel-preset-expo"],
--- a/biome.json
+++ b/biome.json
@@ -1,61 +0,0 @@
-{
-  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
-  "organizeImports": {
-    "enabled": true
-  },
-  "files": {
-    "ignore": [
-      "node_modules",
-      "ios",
-      "android",
-      "Streamyfin.app",
-      "utils/jellyseerr",
-      ".expo"
-    ]
-  },
-  "linter": {
-    "enabled": true,
-    "rules": {
-      "style": {
-        "useImportType": "off",
-        "noNonNullAssertion": "off",
-        "noParameterAssign": "off",
-        "useLiteralEnumMembers": "off"
-      },
-      "complexity": {
-        "noForEach": "off"
-      },
-      "recommended": true,
-      "correctness": { "useExhaustiveDependencies": "off" },
-      "suspicious": {
-        "noExplicitAny": "off",
-        "noArrayIndexKey": "off"
-      }
-    }
-  },
-  "formatter": {
-    "enabled": true,
-    "formatWithErrors": true,
-    "attributePosition": "auto",
-    "indentStyle": "space",
-    "indentWidth": 2,
-    "lineEnding": "lf",
-    "lineWidth": 80
-  },
-  "javascript": {
-    "formatter": {
-      "arrowParentheses": "always",
-      "bracketSameLine": false,
-      "bracketSpacing": true,
-      "jsxQuoteStyle": "single",
-      "quoteProperties": "asNeeded",
-      "semicolons": "always",
-      "lineWidth": 80
-    }
-  },
-  "json": {
-    "formatter": {
-      "trailingCommas": "none"
-    }
-  }
-}
--- a/bun.lock
+++ b/bun.lock
--- a/bun.lockb
+++ b/bun.lockb
--- a/components/AddToFavorites.tsx
+++ b/components/AddToFavorites.tsx
@@ -1,24 +0,0 @@
-import { RoundButton } from "@/components/RoundButton";
-import { useFavorite } from "@/hooks/useFavorite";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import type { FC } from "react";
-import { View, type ViewProps } from "react-native";
-
-interface Props extends ViewProps {
-  item: BaseItemDto;
-}
-
-export const AddToFavorites: FC<Props> = ({ item, ...props }) => {
-  const { isFavorite, toggleFavorite } = useFavorite(item);
-
-  return (
-    <View {...props}>
-      <RoundButton
-        size='large'
-        icon={isFavorite ? "heart" : "heart-outline"}
-        fillColor={isFavorite ? "primary" : undefined}
-        onPress={toggleFavorite}
-      />
-    </View>
-  );
-};
--- a/components/AudioTrackSelector.tsx
+++ b/components/AudioTrackSelector.tsx
@@ -1,8 +1,7 @@
-import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
-import { useMemo } from "react";
-import { Platform, TouchableOpacity, View } from "react-native";
-const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-import { useTranslation } from "react-i18next";
+import { Ionicons } from "@expo/vector-icons";
+import { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
+import { useMemo, useState } from "react";
+import { Modal, TouchableOpacity, View } from "react-native";
 import { Text } from "./common/Text";

 interface Props extends React.ComponentProps<typeof View> {
@@ -17,64 +16,91 @@ export const AudioTrackSelector: React.FC<Props> = ({
  selected,
  ...props
 }) => {
-  if (Platform.isTV) return null;
+  const [isModalVisible, setIsModalVisible] = useState(false);
+
  const audioStreams = useMemo(
    () => source?.MediaStreams?.filter((x) => x.Type === "Audio"),
-    [source],
+    [source]
  );

  const selectedAudioSteam = useMemo(
    () => audioStreams?.find((x) => x.Index === selected),
-    [audioStreams, selected],
+    [audioStreams, selected]
  );
-
-  const { t } = useTranslation();
-
  return (
-    <View
-      className='flex shrink'
-      style={{
-        minWidth: 50,
-      }}
-    >
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <View className='flex flex-col' {...props}>
-            <Text className='opacity-50 mb-1 text-xs'>
-              {t("item_card.audio")}
+    <>
+      <View
+        className="flex shrink"
+        style={{
+          minWidth: 50,
+        }}
+      >
+        <View className="flex flex-col" {...props}>
+          <Text className="opacity-50 mb-1 text-xs">Audio</Text>
+          <TouchableOpacity
+            className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between"
+            onPress={() => setIsModalVisible(true)}
+          >
+            <Text className="" numberOfLines={1}>
+              {selectedAudioSteam?.DisplayTitle}
            </Text>
-            <TouchableOpacity className='bg-neutral-900  h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'>
-              <Text className='' numberOfLines={1}>
-                {selectedAudioSteam?.DisplayTitle}
+            <Ionicons
+              name="chevron-down"
+              size={16}
+              color="white"
+              style={{ opacity: 0.5 }}
+            />
+          </TouchableOpacity>
+        </View>
+      </View>
+
+      <Modal
+        visible={isModalVisible}
+        transparent
+        animationType="slide"
+        onRequestClose={() => setIsModalVisible(false)}
+      >
+        <TouchableOpacity
+          className="flex-1 bg-black/50"
+          activeOpacity={1}
+          onPress={() => setIsModalVisible(false)}
+        >
+          <View className="mt-auto bg-neutral-900 rounded-t-xl">
+            <View className="p-4 border-b border-neutral-800">
+              <Text className="text-lg font-bold text-center">
+                Audio Streams
              </Text>
+            </View>
+
+            <View className="max-h-[50%]">
+              {audioStreams?.map((audio, idx: number) => (
+                <TouchableOpacity
+                  key={idx.toString()}
+                  className={`p-4 border-b border-neutral-800 flex-row items-center justify-between`}
+                  onPress={() => {
+                    if (audio.Index !== null && audio.Index !== undefined) {
+                      onChange(audio.Index);
+                      setIsModalVisible(false);
+                    }
+                  }}
+                >
+                  <Text>{audio.DisplayTitle}</Text>
+                  {audio.Index === selected && (
+                    <Ionicons name="checkmark" size={24} color="white" />
+                  )}
+                </TouchableOpacity>
+              ))}
+            </View>
+
+            <TouchableOpacity
+              className="p-4 border-t border-neutral-800"
+              onPress={() => setIsModalVisible(false)}
+            >
+              <Text className="text-center text-purple-400">Cancel</Text>
            </TouchableOpacity>
          </View>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={true}
-          side='bottom'
-          align='start'
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={8}
-          sideOffset={8}
-        >
-          <DropdownMenu.Label>Audio streams</DropdownMenu.Label>
-          {audioStreams?.map((audio, idx: number) => (
-            <DropdownMenu.Item
-              key={idx.toString()}
-              onSelect={() => {
-                if (audio.Index !== null && audio.Index !== undefined)
-                  onChange(audio.Index);
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {audio.DisplayTitle}
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </View>
+        </TouchableOpacity>
+      </Modal>
+    </>
  );
 };
--- a/components/Badge.tsx
+++ b/components/Badge.tsx
@@ -1,4 +1,4 @@
-import { View, type ViewProps } from "react-native";
+import { View, ViewProps } from "react-native";
 import { Text } from "./common/Text";

 interface Props extends ViewProps {
@@ -22,7 +22,7 @@ export const Badge: React.FC<Props> = ({
      ${variant === "gray" && "bg-neutral-800"}
      `}
    >
-      {iconLeft && <View className='mr-1'>{iconLeft}</View>}
+      {iconLeft && <View className="mr-1">{iconLeft}</View>}
      <Text
        className={`
          text-xs
--- a/components/BitrateSelector.tsx
+++ b/components/BitrateSelector.tsx
@@ -1,8 +1,7 @@
-import { Platform, TouchableOpacity, View } from "react-native";
-const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
+import { TouchableOpacity, View, Modal } from "react-native";
 import { Text } from "./common/Text";
+import { useMemo, useState } from "react";
+import { Ionicons } from "@expo/vector-icons";

 export type Bitrate = {
  key: string;
@@ -28,10 +27,6 @@ export const BITRATES: Bitrate[] = [
    key: "2 Mb/s",
    value: 2000000,
  },
-  {
-    key: "1 Mb/s",
-    value: 1000000,
-  },
  {
    key: "500 Kb/s",
    value: 500000,
@@ -40,11 +35,7 @@ export const BITRATES: Bitrate[] = [
    key: "250 Kb/s",
    value: 250000,
  },
-].sort(
-  (a, b) =>
-    (b.value || Number.POSITIVE_INFINITY) -
-    (a.value || Number.POSITIVE_INFINITY),
-);
+].sort((a, b) => (b.value || Infinity) - (a.value || Infinity));

 interface Props extends React.ComponentProps<typeof View> {
  onChange: (value: Bitrate) => void;
@@ -58,66 +49,91 @@ export const BitrateSelector: React.FC<Props> = ({
  inverted,
  ...props
 }) => {
-  if (Platform.isTV) return null;
+  const [isModalVisible, setIsModalVisible] = useState(false);
+
  const sorted = useMemo(() => {
    if (inverted)
      return BITRATES.sort(
-        (a, b) =>
-          (a.value || Number.POSITIVE_INFINITY) -
-          (b.value || Number.POSITIVE_INFINITY),
+        (a, b) => (a.value || Infinity) - (b.value || Infinity)
      );
    return BITRATES.sort(
-      (a, b) =>
-        (b.value || Number.POSITIVE_INFINITY) -
-        (a.value || Number.POSITIVE_INFINITY),
+      (a, b) => (b.value || Infinity) - (a.value || Infinity)
    );
-  }, []);
-
-  const { t } = useTranslation();
+  }, [inverted]);

  return (
-    <View
-      className='flex shrink'
-      style={{
-        minWidth: 60,
-        maxWidth: 200,
-      }}
-    >
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <View className='flex flex-col' {...props}>
-            <Text className='opacity-50 mb-1 text-xs'>
-              {t("item_card.quality")}
+    <>
+      <View
+        className="flex shrink"
+        style={{
+          minWidth: 60,
+          maxWidth: 200,
+        }}
+      >
+        <View className="flex flex-col" {...props}>
+          <Text className="opacity-50 mb-1 text-xs">Quality</Text>
+          <TouchableOpacity
+            className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between"
+            onPress={() => setIsModalVisible(true)}
+          >
+            <Text className="" numberOfLines={1}>
+              {BITRATES.find((b) => b.value === selected?.value)?.key}
            </Text>
-            <TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'>
-              <Text style={{}} className='' numberOfLines={1}>
-                {BITRATES.find((b) => b.value === selected?.value)?.key}
+            <Ionicons
+              name="chevron-down"
+              size={16}
+              color="white"
+              style={{ opacity: 0.5 }}
+            />
+          </TouchableOpacity>
+        </View>
+      </View>
+
+      <Modal
+        visible={isModalVisible}
+        transparent
+        animationType="slide"
+        onRequestClose={() => setIsModalVisible(false)}
+      >
+        <TouchableOpacity
+          className="flex-1 bg-black/50"
+          activeOpacity={1}
+          onPress={() => setIsModalVisible(false)}
+        >
+          <View className="mt-auto bg-neutral-900 rounded-t-xl">
+            <View className="p-4 border-b border-neutral-800">
+              <Text className="text-lg font-bold text-center">
+                Select Quality
              </Text>
+            </View>
+
+            <View className="max-h-[50%]">
+              {sorted.map((bitrate) => (
+                <TouchableOpacity
+                  key={bitrate.key}
+                  className="p-4 border-b border-neutral-800 flex-row items-center justify-between"
+                  onPress={() => {
+                    onChange(bitrate);
+                    setIsModalVisible(false);
+                  }}
+                >
+                  <Text>{bitrate.key}</Text>
+                  {bitrate.value === selected?.value && (
+                    <Ionicons name="checkmark" size={24} color="white" />
+                  )}
+                </TouchableOpacity>
+              ))}
+            </View>
+
+            <TouchableOpacity
+              className="p-4 border-t border-neutral-800"
+              onPress={() => setIsModalVisible(false)}
+            >
+              <Text className="text-center text-purple-400">Cancel</Text>
            </TouchableOpacity>
          </View>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={false}
-          side='bottom'
-          align='center'
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={0}
-          sideOffset={0}
-        >
-          <DropdownMenu.Label>Bitrates</DropdownMenu.Label>
-          {sorted.map((b) => (
-            <DropdownMenu.Item
-              key={b.key}
-              onSelect={() => {
-                onChange(b);
-              }}
-            >
-              <DropdownMenu.ItemTitle>{b.key}</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </View>
+        </TouchableOpacity>
+      </Modal>
+    </>
  );
 };
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -1,7 +1,5 @@
-import { useHaptic } from "@/hooks/useHaptic";
-import type React from "react";
-import { type PropsWithChildren, type ReactNode, useMemo } from "react";
-import { Platform, Text, TouchableOpacity, View } from "react-native";
+import React, { PropsWithChildren, ReactNode, useMemo } from "react";
+import { Text, TouchableOpacity, View } from "react-native";
 import { Loader } from "./Loader";

 export interface ButtonProps
@@ -38,14 +36,12 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
      case "red":
        return "bg-red-600";
      case "black":
-        return "bg-neutral-900";
+        return "bg-neutral-900 border border-neutral-800";
      case "transparent":
        return "bg-transparent";
    }
  }, [color]);

-  const lightHapticFeedback = useHaptic("light");
-
  return (
    <TouchableOpacity
      className={`
@@ -57,23 +53,20 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
      onPress={() => {
        if (!loading && !disabled && onPress) {
          onPress();
-          lightHapticFeedback();
        }
      }}
      disabled={disabled || loading}
      {...props}
    >
      {loading ? (
-        <View className='p-0.5'>
-          <Loader />
-        </View>
+        <Loader />
      ) : (
        <View
          className={`
            flex flex-row items-center justify-between w-full
            ${justify === "between" ? "justify-between" : "justify-center"}`}
        >
-          {iconLeft ? iconLeft : <View className='w-4' />}
+          {iconLeft ? iconLeft : <View className="w-4"></View>}
          <Text
            className={`
          text-white font-bold text-base
@@ -85,7 +78,7 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
          >
            {children}
          </Text>
-          {iconRight ? iconRight : <View className='w-4' />}
+          {iconRight ? iconRight : <View className="w-4"></View>}
        </View>
      )}
    </TouchableOpacity>
--- a/components/Chromecast.tsx
+++ b/components/Chromecast.tsx
@@ -1,85 +0,0 @@
-import { Feather } from "@expo/vector-icons";
-import React, { useCallback, useEffect } from "react";
-import { Platform, TouchableOpacity, type ViewProps } from "react-native";
-import GoogleCast, {
-  CastButton,
-  CastContext,
-  useCastDevice,
-  useDevices,
-  useMediaStatus,
-  useRemoteMediaClient,
-} from "react-native-google-cast";
-import { RoundButton } from "./RoundButton";
-
-interface Props extends ViewProps {
-  width?: number;
-  height?: number;
-  background?: "blur" | "transparent";
-}
-
-export function Chromecast({
-  width = 48,
-  height = 48,
-  background = "transparent",
-  ...props
-}) {
-  const client = useRemoteMediaClient();
-  const castDevice = useCastDevice();
-  const devices = useDevices();
-  const sessionManager = GoogleCast.getSessionManager();
-  const discoveryManager = GoogleCast.getDiscoveryManager();
-  const mediaStatus = useMediaStatus();
-
-  useEffect(() => {
-    (async () => {
-      if (!discoveryManager) {
-        console.warn("DiscoveryManager is not initialized");
-        return;
-      }
-
-      await discoveryManager.startDiscovery();
-    })();
-  }, [client, devices, castDevice, sessionManager, discoveryManager]);
-
-  // Android requires the cast button to be present for startDiscovery to work
-  const AndroidCastButton = useCallback(
-    () =>
-      Platform.OS === "android" ? (
-        <CastButton tintColor='transparent' />
-      ) : (
-        <></>
-      ),
-    [Platform.OS],
-  );
-
-  if (background === "transparent")
-    return (
-      <RoundButton
-        size='large'
-        className='mr-2'
-        background={false}
-        onPress={() => {
-          if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
-          else CastContext.showCastDialog();
-        }}
-        {...props}
-      >
-        <AndroidCastButton />
-        <Feather name='cast' size={22} color={"white"} />
-      </RoundButton>
-    );
-
-  return (
-    <RoundButton
-      size='large'
-      onPress={() => {
-        if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
-        else CastContext.showCastDialog();
-      }}
-      {...props}
-    >
-      <AndroidCastButton />
-      <Feather name='cast' size={22} color={"white"} />
-    </RoundButton>
-  );
-}
--- a/components/ContextMenu.ts
+++ b/components/ContextMenu.ts
@@ -1 +0,0 @@
-export * from "zeego/context-menu";
--- a/components/ContinueWatchingPoster.tsx
+++ b/components/ContinueWatchingPoster.tsx
@@ -1,12 +1,12 @@
 import { apiAtom } from "@/providers/JellyfinProvider";
-import { Ionicons } from "@expo/vector-icons";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { Image } from "expo-image";
 import { useAtomValue } from "jotai";
 import { useMemo } from "react";
-import type React from "react";
 import { View } from "react-native";
 import { WatchedIndicator } from "./WatchedIndicator";
+import React from "react";
+import { Ionicons } from "@expo/vector-icons";

 type ContinueWatchingPosterProps = {
  item: BaseItemDto;
@@ -27,39 +27,28 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
   * Get horizontal poster for movie and episode, with failover to primary.
   */
  const url = useMemo(() => {
-    if (!api) {
-      return;
-    }
+    if (!api) return;
    if (item.Type === "Episode" && useEpisodePoster) {
      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
    }
    if (item.Type === "Episode") {
-      if (item.ParentBackdropItemId && item.ParentThumbImageTag) {
+      if (item.ParentBackdropItemId && item.ParentThumbImageTag)
        return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
-      }
-
-      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
+      else
+        return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
    }
    if (item.Type === "Movie") {
-      if (item.ImageTags?.Thumb) {
-        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.Thumb}`;
-      }
-
-      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
+      if (item.ImageTags?.["Thumb"])
+        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.["Thumb"]}`;
+      else
+        return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
    }
    if (item.Type === "Program") {
-      if (item.ImageTags?.Thumb) {
-        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.Thumb}`;
-      }
-
-      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
+      if (item.ImageTags?.["Thumb"])
+        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.["Thumb"]}`;
+      else
+        return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
    }
-
-    if (item.ImageTags?.Thumb) {
-      return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.Thumb}`;
-    }
-
-    return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
  }, [item]);

  const progress = useMemo(() => {
@@ -70,20 +59,24 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
      const total = endDate.getTime() - startDate.getTime();
      const elapsed = now.getTime() - startDate.getTime();
      return (elapsed / total) * 100;
+    } else {
+      return item.UserData?.PlayedPercentage || 0;
    }
-    return item.UserData?.PlayedPercentage || 0;
  }, [item]);

  if (!url)
-    return <View className='aspect-video border border-neutral-800 w-44' />;
+    return (
+      <View className="aspect-video border border-neutral-800 w-44"></View>
+    );

  return (
    <View
      className={`
-      relative aspect-video rounded-lg overflow-hidden border border-neutral-800
-      `}
+      relative w-44 aspect-video rounded-lg overflow-hidden border border-neutral-800
+      ${size === "small" ? "w-32" : "w-44"}
+    `}
    >
-      <View className='w-full h-full flex items-center justify-center'>
+      <View className="w-full h-full flex items-center justify-center">
        <Image
          key={item.Id}
          id={item.Id}
@@ -91,12 +84,12 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
            uri: url,
          }}
          cachePolicy={"memory-disk"}
-          contentFit='cover'
-          className='w-full h-full'
+          contentFit="cover"
+          className="w-full h-full"
        />
        {showPlayButton && (
-          <View className='absolute inset-0 flex items-center justify-center'>
-            <Ionicons name='play-circle' size={40} color='white' />
+          <View className="absolute inset-0 flex items-center justify-center">
+            <Ionicons name="play-circle" size={40} color="white" />
          </View>
        )}
      </View>
@@ -104,16 +97,14 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
      {progress > 0 && (
        <>
          <View
-            className={
-              "absolute w-100 bottom-0 left-0 h-1 bg-neutral-700 opacity-80 w-full"
-            }
-          />
+            className={`absolute w-100 bottom-0 left-0 h-1 bg-neutral-700 opacity-80 w-full`}
+          ></View>
          <View
            style={{
              width: `${progress}%`,
            }}
-            className={"absolute bottom-0 left-0 h-1 bg-purple-600 w-full"}
-          />
+            className={`absolute bottom-0 left-0 h-1 bg-purple-600 w-full`}
+          ></View>
        </>
      )}
    </View>
--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -1,409 +0,0 @@
-import { useDownload } from "@/providers/DownloadProvider";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { queueActions, queueAtom } from "@/utils/atoms/queue";
-import { DownloadMethod, useSettings } from "@/utils/atoms/settings";
-import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import { saveDownloadItemInfoToDiskTmp } from "@/utils/optimize-server";
-import download from "@/utils/profiles/download";
-import Ionicons from "@expo/vector-icons/Ionicons";
-import {
-  BottomSheetBackdrop,
-  type BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import type {
-  BaseItemDto,
-  MediaSourceInfo,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import { type Href, router, useFocusEffect } from "expo-router";
-import { t } from "i18next";
-import { useAtom } from "jotai";
-import type React from "react";
-import { useCallback, useMemo, useRef, useState } from "react";
-import { Alert, Platform, View, type ViewProps } from "react-native";
-import { toast } from "sonner-native";
-import { AudioTrackSelector } from "./AudioTrackSelector";
-import { type Bitrate, BitrateSelector } from "./BitrateSelector";
-import { Button } from "./Button";
-import { Loader } from "./Loader";
-import { MediaSourceSelector } from "./MediaSourceSelector";
-import ProgressCircle from "./ProgressCircle";
-import { RoundButton } from "./RoundButton";
-import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
-import { Text } from "./common/Text";
-
-interface DownloadProps extends ViewProps {
-  items: BaseItemDto[];
-  MissingDownloadIconComponent: () => React.ReactElement;
-  DownloadedIconComponent: () => React.ReactElement;
-  title?: string;
-  subtitle?: string;
-  size?: "default" | "large";
-}
-
-export const DownloadItems: React.FC<DownloadProps> = ({
-  items,
-  MissingDownloadIconComponent,
-  DownloadedIconComponent,
-  title = "Download",
-  subtitle = "",
-  size = "default",
-  ...props
-}) => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const [queue, setQueue] = useAtom(queueAtom);
-  const [settings] = useSettings();
-
-  const { processes, startBackgroundDownload, downloadedFiles } = useDownload();
-  //const { startRemuxing } = useRemuxHlsToMp4();
-
-  const [selectedMediaSource, setSelectedMediaSource] = useState<
-    MediaSourceInfo | undefined | null
-  >(undefined);
-  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
-  const [selectedSubtitleStream, setSelectedSubtitleStream] =
-    useState<number>(0);
-  const [maxBitrate, setMaxBitrate] = useState<Bitrate>(
-    settings?.defaultBitrate ?? {
-      key: "Max",
-      value: undefined,
-    },
-  );
-
-  const userCanDownload = useMemo(
-    () => user?.Policy?.EnableContentDownloading,
-    [user],
-  );
-  const usingOptimizedServer = useMemo(
-    () => settings?.downloadMethod === DownloadMethod.Optimized,
-    [settings],
-  );
-
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-
-  const handlePresentModalPress = useCallback(() => {
-    bottomSheetModalRef.current?.present();
-  }, []);
-
-  const handleSheetChanges = useCallback((index: number) => {}, []);
-
-  const closeModal = useCallback(() => {
-    bottomSheetModalRef.current?.dismiss();
-  }, []);
-
-  const itemIds = useMemo(() => items.map((i) => i.Id), [items]);
-
-  const itemsNotDownloaded = useMemo(
-    () =>
-      items.filter((i) => !downloadedFiles?.some((f) => f.item.Id === i.Id)),
-    [items, downloadedFiles],
-  );
-
-  const allItemsDownloaded = useMemo(() => {
-    if (items.length === 0) return false;
-    return itemsNotDownloaded.length === 0;
-  }, [items, itemsNotDownloaded]);
-  const itemsProcesses = useMemo(
-    () => processes?.filter((p) => itemIds.includes(p.item.Id)),
-    [processes, itemIds],
-  );
-
-  const progress = useMemo(() => {
-    if (itemIds.length === 1)
-      return itemsProcesses.reduce((acc, p) => acc + p.progress, 0);
-    return (
-      ((itemIds.length -
-        queue.filter((q) => itemIds.includes(q.item.Id)).length) /
-        itemIds.length) *
-      100
-    );
-  }, [queue, itemsProcesses, itemIds]);
-
-  const itemsQueued = useMemo(() => {
-    return (
-      itemsNotDownloaded.length > 0 &&
-      itemsNotDownloaded.every((p) => queue.some((q) => p.Id === q.item.Id))
-    );
-  }, [queue, itemsNotDownloaded]);
-  const navigateToDownloads = () => router.push("/downloads");
-
-  const onDownloadedPress = () => {
-    const firstItem = items?.[0];
-    router.push(
-      firstItem.Type !== "Episode"
-        ? "/downloads"
-        : ({
-            pathname: `/downloads/${firstItem.SeriesId}`,
-            params: {
-              episodeSeasonIndex: firstItem.ParentIndexNumber,
-            },
-          } as Href),
-    );
-  };
-
-  const acceptDownloadOptions = useCallback(() => {
-    if (userCanDownload === true) {
-      if (itemsNotDownloaded.some((i) => !i.Id)) {
-        throw new Error("No item id");
-      }
-      closeModal();
-
-      initiateDownload(...itemsNotDownloaded);
-    } else {
-      toast.error(
-        t("home.downloads.toasts.you_are_not_allowed_to_download_files"),
-      );
-    }
-  }, [
-    queue,
-    setQueue,
-    itemsNotDownloaded,
-    usingOptimizedServer,
-    userCanDownload,
-    maxBitrate,
-    selectedMediaSource,
-    selectedAudioStream,
-    selectedSubtitleStream,
-  ]);
-
-  const initiateDownload = useCallback(
-    async (...items: BaseItemDto[]) => {
-      if (
-        !api ||
-        !user?.Id ||
-        items.some((p) => !p.Id) ||
-        (itemsNotDownloaded.length === 1 && !selectedMediaSource?.Id)
-      ) {
-        throw new Error(
-          "DownloadItem ~ initiateDownload: No api or user or item",
-        );
-      }
-      let mediaSource = selectedMediaSource;
-      let audioIndex: number | undefined = selectedAudioStream;
-      let subtitleIndex: number | undefined = selectedSubtitleStream;
-
-      for (const item of items) {
-        if (itemsNotDownloaded.length > 1) {
-          const defaults = getDefaultPlaySettings(item, settings!);
-          mediaSource = defaults.mediaSource;
-          audioIndex = defaults.audioIndex;
-          subtitleIndex = defaults.subtitleIndex;
-        }
-
-        const res = await getStreamUrl({
-          api,
-          item,
-          startTimeTicks: 0,
-          userId: user?.Id,
-          audioStreamIndex: audioIndex,
-          maxStreamingBitrate: maxBitrate.value,
-          mediaSourceId: mediaSource?.Id,
-          subtitleStreamIndex: subtitleIndex,
-          deviceProfile: download,
-          download: true,
-          // deviceId: mediaSource?.Id,
-        });
-
-        if (!res) {
-          Alert.alert(
-            t("home.downloads.something_went_wrong"),
-            t("home.downloads.could_not_get_stream_url_from_jellyfin"),
-          );
-          continue;
-        }
-
-        const { mediaSource: source, url } = res;
-
-        if (!url || !source) throw new Error("No url");
-
-        saveDownloadItemInfoToDiskTmp(item, source, url);
-        await startBackgroundDownload(url, item, source, maxBitrate);
-      }
-    },
-    [
-      api,
-      user?.Id,
-      itemsNotDownloaded,
-      selectedMediaSource,
-      selectedAudioStream,
-      selectedSubtitleStream,
-      settings,
-      maxBitrate,
-      usingOptimizedServer,
-      startBackgroundDownload,
-    ],
-  );
-
-  const renderBackdrop = useCallback(
-    (props: BottomSheetBackdropProps) => (
-      <BottomSheetBackdrop
-        {...props}
-        disappearsOnIndex={-1}
-        appearsOnIndex={0}
-      />
-    ),
-    [],
-  );
-  useFocusEffect(
-    useCallback(() => {
-      if (!settings) return;
-      if (itemsNotDownloaded.length !== 1) return;
-      const { bitrate, mediaSource, audioIndex, subtitleIndex } =
-        getDefaultPlaySettings(items[0], settings);
-
-      setSelectedMediaSource(mediaSource ?? undefined);
-      setSelectedAudioStream(audioIndex ?? 0);
-      setSelectedSubtitleStream(subtitleIndex ?? -1);
-      setMaxBitrate(bitrate);
-    }, [items, itemsNotDownloaded, settings]),
-  );
-
-  const renderButtonContent = () => {
-    if (processes.length > 0 && itemsProcesses.length > 0) {
-      return progress === 0 ? (
-        <Loader />
-      ) : (
-        <View className='-rotate-45'>
-          <ProgressCircle
-            size={24}
-            fill={progress}
-            width={4}
-            tintColor='#9334E9'
-            backgroundColor='#bdc3c7'
-          />
-        </View>
-      );
-    }
-
-    if (itemsQueued) {
-      return <Ionicons name='hourglass' size={24} color='white' />;
-    }
-
-    if (allItemsDownloaded) {
-      return <DownloadedIconComponent />;
-    }
-
-    return <MissingDownloadIconComponent />;
-  };
-
-  const onButtonPress = () => {
-    if (processes && itemsProcesses.length > 0) {
-      navigateToDownloads();
-    } else if (itemsQueued) {
-      navigateToDownloads();
-    } else if (allItemsDownloaded) {
-      onDownloadedPress();
-    } else {
-      handlePresentModalPress();
-    }
-  };
-
-  return (
-    <View {...props}>
-      <RoundButton size={size} onPress={onButtonPress}>
-        {renderButtonContent()}
-      </RoundButton>
-      <BottomSheetModal
-        ref={bottomSheetModalRef}
-        enableDynamicSizing
-        handleIndicatorStyle={{
-          backgroundColor: "white",
-        }}
-        backgroundStyle={{
-          backgroundColor: "#171717",
-        }}
-        onChange={handleSheetChanges}
-        backdropComponent={renderBackdrop}
-      >
-        <BottomSheetView>
-          <View className='flex flex-col space-y-4 px-4 pb-8 pt-2'>
-            <View>
-              <Text className='font-bold text-2xl text-neutral-100'>
-                {title}
-              </Text>
-              <Text className='text-neutral-300'>
-                {subtitle ||
-                  t("item_card.download.download_x_item", {
-                    item_count: itemsNotDownloaded.length,
-                  })}
-              </Text>
-            </View>
-            <View className='flex flex-col space-y-2 w-full items-start'>
-              <BitrateSelector
-                inverted
-                onChange={setMaxBitrate}
-                selected={maxBitrate}
-              />
-              {itemsNotDownloaded.length === 1 && (
-                <>
-                  <MediaSourceSelector
-                    item={items[0]}
-                    onChange={setSelectedMediaSource}
-                    selected={selectedMediaSource}
-                  />
-                  {selectedMediaSource && (
-                    <View className='flex flex-col space-y-2'>
-                      <AudioTrackSelector
-                        source={selectedMediaSource}
-                        onChange={setSelectedAudioStream}
-                        selected={selectedAudioStream}
-                      />
-                      <SubtitleTrackSelector
-                        source={selectedMediaSource}
-                        onChange={setSelectedSubtitleStream}
-                        selected={selectedSubtitleStream}
-                      />
-                    </View>
-                  )}
-                </>
-              )}
-            </View>
-            <Button
-              className='mt-auto'
-              onPress={acceptDownloadOptions}
-              color='purple'
-            >
-              {t("item_card.download.download_button")}
-            </Button>
-            <View className='opacity-70 text-center w-full flex items-center'>
-              <Text className='text-xs'>
-                {usingOptimizedServer
-                  ? t("item_card.download.using_optimized_server")
-                  : t("item_card.download.using_default_method")}
-              </Text>
-            </View>
-          </View>
-        </BottomSheetView>
-      </BottomSheetModal>
-    </View>
-  );
-};
-
-export const DownloadSingleItem: React.FC<{
-  size?: "default" | "large";
-  item: BaseItemDto;
-}> = ({ item, size = "default" }) => {
-  if (Platform.isTV) return;
-
-  return (
-    <DownloadItems
-      size={size}
-      title={
-        item.Type === "Episode"
-          ? t("item_card.download.download_episode")
-          : t("item_card.download.download_movie")
-      }
-      subtitle={item.Name!}
-      items={[item]}
-      MissingDownloadIconComponent={() => (
-        <Ionicons name='cloud-download-outline' size={24} color='white' />
-      )}
-      DownloadedIconComponent={() => (
-        <Ionicons name='cloud-download' size={26} color='#9333ea' />
-      )}
-    />
-  );
-};
--- a/components/GenreTags.tsx
+++ b/components/GenreTags.tsx
@@ -1,57 +1,43 @@
 // GenreTags.tsx
-import type React from "react";
-import {
-  type StyleProp,
-  type TextStyle,
-  View,
-  type ViewProps,
-} from "react-native";
+import React from "react";
+import {View, ViewProps} from "react-native";
 import { Text } from "./common/Text";

 interface TagProps {
  tags?: string[];
-  textClass?: ViewProps["className"];
+  textClass?: ViewProps["className"]
 }

-export const Tag: React.FC<
-  {
-    text: string;
-    textClass?: ViewProps["className"];
-    textStyle?: StyleProp<TextStyle>;
-  } & ViewProps
-> = ({ text, textClass, textStyle, ...props }) => {
+export const Tag: React.FC<{ text: string, textClass?: ViewProps["className"]} & ViewProps> = ({
+  text,
+  textClass,
+  ...props
+}) => {
  return (
-    <View className='bg-neutral-800 rounded-full px-2 py-1' {...props}>
-      <Text className={textClass} style={textStyle}>
-        {text}
-      </Text>
+    <View className="bg-neutral-800 rounded-full px-2 py-1" {...props}>
+      <Text className={textClass}>{text}</Text>
    </View>
  );
 };

-export const Tags: React.FC<
-  TagProps & { tagProps?: ViewProps } & ViewProps
-> = ({ tags, textClass = "text-xs", tagProps, ...props }) => {
+export const Tags: React.FC<TagProps & ViewProps> = ({ tags, textClass = "text-xs", ...props }) => {
  if (!tags || tags.length === 0) return null;

  return (
-    <View
-      className={`flex flex-row flex-wrap gap-1 ${props.className}`}
-      {...props}
-    >
+    <View className={`flex flex-row flex-wrap gap-1 ${props.className}`} {...props}>
      {tags.map((tag, idx) => (
-        <View key={idx}>
-          <Tag key={idx} textClass={textClass} text={tag} {...tagProps} />
+        <View>
+          <Tag key={idx} textClass={textClass} text={tag}/>
        </View>
      ))}
    </View>
  );
 };

-export const GenreTags: React.FC<{ genres?: string[] }> = ({ genres }) => {
+export const GenreTags: React.FC<{ genres?: string[]}> = ({ genres }) => {
  return (
-    <View className='mt-2'>
-      <Tags tags={genres} />
+    <View className="mt-2">
+      <Tags tags={genres}/>
    </View>
  );
 };
--- a/components/ItemCardText.tsx
+++ b/components/ItemCardText.tsx
@@ -1,8 +1,8 @@
-import { tc } from "@/utils/textTools";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import type React from "react";
+import React from "react";
 import { View } from "react-native";
 import { Text } from "./common/Text";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { tc } from "@/utils/textTools";

 type ItemCardProps = {
  item: BaseItemDto;
@@ -10,13 +10,13 @@ type ItemCardProps = {

 export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
  return (
-    <View className='mt-2 flex flex-col'>
+    <View className="mt-2 flex flex-col">
      {item.Type === "Episode" ? (
        <>
-          <Text numberOfLines={1} ellipsizeMode='tail' className=''>
+          <Text numberOfLines={1} className="">
            {item.Name}
          </Text>
-          <Text numberOfLines={1} className='text-xs opacity-50'>
+          <Text numberOfLines={1} className="text-xs opacity-50">
            {`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`}
            {" - "}
            {item.SeriesName}
@@ -24,10 +24,8 @@ export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
        </>
      ) : (
        <>
-          <Text numberOfLines={1} ellipsizeMode='tail'>
-            {item.Name}
-          </Text>
-          <Text className='text-xs opacity-50'>{item.ProductionYear}</Text>
+          <Text numberOfLines={2}>{item.Name}</Text>
+          <Text className="text-xs opacity-50">{item.ProductionYear}</Text>
        </>
      )}
    </View>
--- a/components/ItemContent.tsx
+++ b/components/ItemContent.tsx
@@ -1,9 +1,7 @@
 import { AudioTrackSelector } from "@/components/AudioTrackSelector";
-import { type Bitrate, BitrateSelector } from "@/components/BitrateSelector";
-import { DownloadSingleItem } from "@/components/DownloadItem";
+import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
 import { OverviewText } from "@/components/OverviewText";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
-// const PlayButton = !Platform.isTV ? require("@/components/PlayButton") : null;
 import { PlayButton } from "@/components/PlayButton";
 import { PlayedStatus } from "@/components/PlayedStatus";
 import { SimilarItems } from "@/components/SimilarItems";
@@ -13,13 +11,11 @@ import { CastAndCrew } from "@/components/series/CastAndCrew";
 import { CurrentSeries } from "@/components/series/CurrentSeries";
 import { SeasonEpisodesCarousel } from "@/components/series/SeasonEpisodesCarousel";
 import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
-import { useImageColors } from "@/hooks/useImageColors";
-import { useOrientation } from "@/hooks/useOrientation";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom } from "@/providers/JellyfinProvider";
+import { SubtitleHelper } from "@/utils/SubtitleHelper";
 import { useSettings } from "@/utils/atoms/settings";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
-import type {
+import {
  BaseItemDto,
  MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
@@ -27,14 +23,12 @@ import { Image } from "expo-image";
 import { useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useEffect, useMemo, useState } from "react";
-import { Platform, View } from "react-native";
+import { View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { AddToFavorites } from "./AddToFavorites";
 import { ItemHeader } from "./ItemHeader";
 import { ItemTechnicalDetails } from "./ItemTechnicalDetails";
 import { MediaSourceSelector } from "./MediaSourceSelector";
 import { MoreMoviesWithActor } from "./MoreMoviesWithActor";
-const Chromecast = !Platform.isTV ? require("./Chromecast") : null;

 export type SelectedOptions = {
  bitrate: Bitrate;
@@ -47,10 +41,8 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
  ({ item }) => {
    const [api] = useAtom(apiAtom);
    const [settings] = useSettings();
-    const { orientation } = useOrientation();
    const navigation = useNavigation();
    const insets = useSafeAreaInsets();
-    useImageColors({ item });

    const [loadingLogo, setLoadingLogo] = useState(true);
    const [headerHeight, setHeaderHeight] = useState(350);
@@ -81,49 +73,67 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
      defaultMediaSource,
    ]);

-    if (!Platform.isTV) {
-      useEffect(() => {
-        navigation.setOptions({
-          headerRight: () =>
-            item && (
-              <View className='flex flex-row items-center space-x-2'>
-                <Chromecast.Chromecast
-                  background='blur'
-                  width={22}
-                  height={22}
-                />
-                {item.Type !== "Program" && (
-                  <View className='flex flex-row items-center space-x-2'>
-                    {!Platform.isTV && (
-                      <DownloadSingleItem item={item} size='large' />
-                    )}
-                    <PlayedStatus items={[item]} size='large' />
-                    <AddToFavorites item={item} />
-                  </View>
-                )}
-              </View>
-            ),
-        });
-      }, [item]);
-    }
+    useEffect(() => {
+      navigation.setOptions({
+        headerRight: () =>
+          item && (
+            <View className="flex flex-row items-center space-x-2">
+              {item.Type !== "Program" && (
+                <View className="flex flex-row items-center space-x-2">
+                  <PlayedStatus item={item} />
+                </View>
+              )}
+            </View>
+          ),
+      });
+    }, [item]);

    useEffect(() => {
-      if (orientation !== ScreenOrientation.OrientationLock.PORTRAIT_UP)
-        setHeaderHeight(230);
-      else if (item.Type === "Movie") setHeaderHeight(500);
+      if (item.Type === "Movie") setHeaderHeight(500);
      else setHeaderHeight(350);
-    }, [item.Type, orientation]);
+    }, [item.Type]);

    const logoUrl = useMemo(() => getLogoImageUrlById({ api, item }), [item]);

    const loading = useMemo(() => {
      return Boolean(logoUrl && loadingLogo);
    }, [loadingLogo, logoUrl]);
+
+    const [isTranscoding, setIsTranscoding] = useState(false);
+    const [previouslyChosenSubtitleIndex, setPreviouslyChosenSubtitleIndex] =
+      useState<number | undefined>(selectedOptions?.subtitleIndex);
+
+    useEffect(() => {
+      const isTranscoding = Boolean(selectedOptions?.bitrate.value);
+      if (isTranscoding) {
+        setPreviouslyChosenSubtitleIndex(selectedOptions?.subtitleIndex);
+        const subHelper = new SubtitleHelper(
+          selectedOptions?.mediaSource?.MediaStreams ?? []
+        );
+
+        const newSubtitleIndex = subHelper.getMostCommonSubtitleByName(
+          selectedOptions?.subtitleIndex
+        );
+
+        setSelectedOptions((prev) => ({
+          ...prev!,
+          subtitleIndex: newSubtitleIndex ?? -1,
+        }));
+      }
+      if (!isTranscoding && previouslyChosenSubtitleIndex !== undefined) {
+        setSelectedOptions((prev) => ({
+          ...prev!,
+          subtitleIndex: previouslyChosenSubtitleIndex,
+        }));
+      }
+      setIsTranscoding(isTranscoding);
+    }, [selectedOptions?.bitrate]);
+
    if (!selectedOptions) return null;

    return (
      <View
-        className='flex-1 relative'
+        className="flex-1 relative"
        style={{
          paddingLeft: insets.left,
          paddingRight: insets.right,
@@ -147,38 +157,40 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
            </View>
          }
          logo={
-            logoUrl ? (
-              <Image
-                source={{
-                  uri: logoUrl,
-                }}
-                style={{
-                  height: 130,
-                  width: "100%",
-                  resizeMode: "contain",
-                }}
-                onLoad={() => setLoadingLogo(false)}
-                onError={() => setLoadingLogo(false)}
-              />
-            ) : null
+            <>
+              {logoUrl ? (
+                <Image
+                  source={{
+                    uri: logoUrl,
+                  }}
+                  style={{
+                    height: 130,
+                    width: "100%",
+                    resizeMode: "contain",
+                  }}
+                  onLoad={() => setLoadingLogo(false)}
+                  onError={() => setLoadingLogo(false)}
+                />
+              ) : null}
+            </>
          }
        >
-          <View className='flex flex-col bg-transparent shrink'>
-            <View className='flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink'>
-              <ItemHeader item={item} className='mb-4' />
-              {item.Type !== "Program" && !Platform.isTV && (
-                <View className='flex flex-row items-center justify-start w-full h-16'>
+          <View className="flex flex-col bg-transparent shrink">
+            <View className="flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink">
+              <ItemHeader item={item} className="mb-4" />
+              {item.Type !== "Program" && (
+                <View className="flex flex-row items-center justify-start w-full h-16">
                  <BitrateSelector
-                    className='mr-1'
+                    className="mr-1"
                    onChange={(val) =>
                      setSelectedOptions(
-                        (prev) => prev && { ...prev, bitrate: val },
+                        (prev) => prev && { ...prev, bitrate: val }
                      )
                    }
                    selected={selectedOptions.bitrate}
                  />
                  <MediaSourceSelector
-                    className='mr-1'
+                    className="mr-1"
                    item={item}
                    onChange={(val) =>
                      setSelectedOptions(
@@ -186,13 +198,13 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
                          prev && {
                            ...prev,
                            mediaSource: val,
-                          },
+                          }
                      )
                    }
                    selected={selectedOptions.mediaSource}
                  />
                  <AudioTrackSelector
-                    className='mr-1'
+                    className="mr-1"
                    source={selectedOptions.mediaSource}
                    onChange={(val) => {
                      setSelectedOptions(
@@ -200,12 +212,13 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
                          prev && {
                            ...prev,
                            audioIndex: val,
-                          },
+                          }
                      );
                    }}
                    selected={selectedOptions.audioIndex}
                  />
                  <SubtitleTrackSelector
+                    isTranscoding={isTranscoding}
                    source={selectedOptions.mediaSource}
                    onChange={(val) =>
                      setSelectedOptions(
@@ -213,7 +226,7 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
                          prev && {
                            ...prev,
                            subtitleIndex: val,
-                          },
+                          }
                      )
                    }
                    selected={selectedOptions.subtitleIndex}
@@ -222,7 +235,7 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
              )}

              <PlayButton
-                className='grow'
+                className="grow"
                selectedOptions={selectedOptions}
                item={item}
              />
@@ -233,24 +246,24 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
            )}

            <ItemTechnicalDetails source={selectedOptions.mediaSource} />
-            <OverviewText text={item.Overview} className='px-4 mb-4' />
+            <OverviewText text={item.Overview} className="px-4 mb-4" />

            {item.Type !== "Program" && (
              <>
                {item.Type === "Episode" && (
-                  <CurrentSeries item={item} className='mb-4' />
+                  <CurrentSeries item={item} className="mb-4" />
                )}

-                <CastAndCrew item={item} className='mb-4' loading={loading} />
+                <CastAndCrew item={item} className="mb-4" loading={loading} />

                {item.People && item.People.length > 0 && (
-                  <View className='mb-4'>
+                  <View className="mb-4">
                    {item.People.slice(0, 3).map((person, idx) => (
                      <MoreMoviesWithActor
                        currentItem={item}
                        key={idx}
                        actorId={person.Id!}
-                        className='mb-4'
+                        className="mb-4"
                      />
                    ))}
                  </View>
@@ -263,5 +276,5 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
        </ParallaxScrollView>
      </View>
    );
-  },
+  }
 );
--- a/components/ItemHeader.tsx
+++ b/components/ItemHeader.tsx
@@ -1,9 +1,9 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import type React from "react";
-import { View, type ViewProps } from "react-native";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import React from "react";
+import { View, ViewProps } from "react-native";
 import { GenreTags } from "./GenreTags";
-import { Ratings } from "./Ratings";
 import { MoviesTitleHeader } from "./movies/MoviesTitleHeader";
+import { Ratings } from "./Ratings";
 import { EpisodeTitleHeader } from "./series/EpisodeTitleHeader";
 import { ItemActions } from "./series/SeriesActions";

@@ -15,21 +15,21 @@ export const ItemHeader: React.FC<Props> = ({ item, ...props }) => {
  if (!item)
    return (
      <View
-        className='flex flex-col space-y-1.5 w-full items-start h-32'
+        className="flex flex-col space-y-1.5 w-full items-start h-32"
        {...props}
      >
-        <View className='w-1/3 h-6 bg-neutral-900 rounded' />
-        <View className='w-2/3 h-8 bg-neutral-900 rounded' />
-        <View className='w-2/3 h-4 bg-neutral-900 rounded' />
-        <View className='w-1/4 h-4 bg-neutral-900 rounded' />
+        <View className="w-1/3 h-6 bg-neutral-900 rounded" />
+        <View className="w-2/3 h-8 bg-neutral-900 rounded" />
+        <View className="w-2/3 h-4 bg-neutral-900 rounded" />
+        <View className="w-1/4 h-4 bg-neutral-900 rounded" />
      </View>
    );

  return (
-    <View className='flex flex-col' {...props}>
-      <View className='flex flex-col' {...props}>
-        <View className='flex flex-row items-center justify-between'>
-          <Ratings item={item} className='mb-2' />
+    <View className="flex flex-col" {...props}>
+      <View className="flex flex-col" {...props}>
+        <View className="flex flex-row items-center justify-between">
+          <Ratings item={item} className="mb-2" />
          <ItemActions item={item} />
        </View>
        {item.Type === "Episode" && (
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Fredrik Burmester	aa785b0f95	chore: remove deps	2025-01-04 17:08:00 +01:00
Fredrik Burmester	8ea38a3efc	chore: removing deps	2025-01-04 16:31:41 +01:00
Fredrik Burmester	07ad905e16	chore	2025-01-02 09:59:22 +01:00
Fredrik Burmester	3058b866c3	fix: remove app state (?)	2025-01-02 09:57:19 +01:00
Fredrik Burmester	497a1adc26	chore	2025-01-02 09:51:56 +01:00
Fredrik Burmester	093cd94455	fix: remove chromecast	2025-01-02 09:49:57 +01:00
Fredrik Burmester	349a86bcfb	fix: remove anything regarding downloads	2025-01-02 09:44:32 +01:00
Fredrik Burmester	4b81dff0be	wip	2024-12-31 22:32:21 +01:00
				`@@ -1 +0,0 @@`
				`.modules/vlc-player/Frameworks/*.xcframework filter=lfs diff=lfs merge=lfs -text`