chore

2025-01-23 13:37:41 +01:00 · 2025-01-23 13:16:55 +01:00 · 2025-01-23 11:38:42 +01:00 · 2025-01-23 11:34:22 +01:00 · 2025-01-23 11:30:02 +01:00 · 2025-01-03 11:42:18 +01:00
178 changed files with 3704 additions and 6217 deletions
--- 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,8 +45,6 @@ body:
      label: Version
      description: What version of Streamyfin are you running?
      options:
-        - 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/.gitignore
+++ b/.gitignore
@@ -36,5 +36,3 @@ credentials.json
 .continuerc.json

 .vscode/
-.idea/
-.ruby-lsp
--- 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/README.md
+++ b/README.md
@@ -8,12 +8,12 @@ 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.
@@ -32,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

@@ -65,7 +70,7 @@ Or download the APKs [here on GitHub](https://github.com/streamyfin/streamyfin/r

 ### 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.

@@ -85,7 +90,7 @@ 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.
-4. Create an expo dev build by running `npx expo run:ios` or `npx expo run:android`. This will open a simulator on your computer and run the app.
+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

--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
  "expo": {
    "name": "Streamyfin",
    "slug": "streamyfin",
-    "version": "0.25.0",
+    "version": "0.23.0",
    "orientation": "default",
    "icon": "./assets/images/icon.png",
    "scheme": "streamyfin",
@@ -36,7 +36,7 @@
    },
    "android": {
      "jsEngine": "hermes",
-      "versionCode": 50,
+      "versionCode": 49,
      "adaptiveIcon": {
        "foregroundImage": "./assets/images/adaptive_icon.png"
      },
@@ -105,16 +105,13 @@
          "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-bottom-tabs"],
-      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
-      ["./plugins/withGoogleCastActivity.js"],
-      ["./plugins/withTrustLocalCerts.js"]
+      ["./plugins/withChangeNativeAndroidTextToWhite.js"]
    ],
    "experiments": {
      "typedRoutes": true
@@ -133,6 +130,7 @@
    },
    "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,9 +1,7 @@
 import {Stack} from "expo-router";
 import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";

 export default function CustomMenuLayout() {
-  const { t } = useTranslation();
  return (
    <Stack>
      <Stack.Screen
@@ -11,7 +9,7 @@ export default function CustomMenuLayout() {
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.custom_links"),
+          headerTitle: "Custom Links",
          headerBlurEffect: "prominent",
          headerTransparent: Platform.OS === "ios",
          headerShadowVisible: false,
--- a/app/(auth)/(tabs)/(custom-links)/index.tsx
+++ b/app/(auth)/(tabs)/(custom-links)/index.tsx
@@ -7,7 +7,6 @@ import { ListItem } from "@/components/list/ListItem";
 import * as WebBrowser from "expo-web-browser";
 import Ionicons from "@expo/vector-icons/Ionicons";
 import { Text } from "@/components/common/Text";
-import { useTranslation } from "react-i18next";

 export interface MenuLink {
  name: string;
@@ -19,7 +18,6 @@ export default function menuLinks() {
  const [api] = useAtom(apiAtom);
  const insets = useSafeAreaInsets();
  const [menuLinks, setMenuLinks] = useState<MenuLink[]>([]);
-  const { t } = useTranslation();

  const getMenuLinks = useCallback(async () => {
    try {
@@ -69,7 +67,7 @@ export default function menuLinks() {
      )}
      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>
+          <Text className="font-bold text-xl text-neutral-500">No links</Text>
        </View>
      }
    />
--- a/app/(auth)/(tabs)/(favorites)/_layout.tsx
+++ b/app/(auth)/(tabs)/(favorites)/_layout.tsx
@@ -1,10 +1,8 @@
 import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
 import { Stack } from "expo-router";
 import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";

 export default function SearchLayout() {
-  const { t } = useTranslation();
  return (
    <Stack>
      <Stack.Screen
@@ -12,7 +10,7 @@ export default function SearchLayout() {
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.favorites"),
+          headerTitle: "Favorites",
          headerLargeStyle: {
            backgroundColor: "black",
          },
--- a/app/(auth)/(tabs)/(home)/_layout.tsx
+++ b/app/(auth)/(tabs)/(home)/_layout.tsx
@@ -4,11 +4,9 @@ import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageSta
 import { Feather } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
 import { Platform, TouchableOpacity, View } from "react-native";
-import { useTranslation } from "react-i18next";

 export default function IndexLayout() {
  const router = useRouter();
-  const { t } = useTranslation();
  return (
    <Stack>
      <Stack.Screen
@@ -16,7 +14,7 @@ export default function IndexLayout() {
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.home"),
+          headerTitle: "Home",
          headerBlurEffect: "prominent",
          headerLargeStyle: {
            backgroundColor: "black",
@@ -40,19 +38,19 @@ export default function IndexLayout() {
      <Stack.Screen
        name="downloads/index"
        options={{
-          title: t("home.downloads.downloads_title"),
+          title: "Downloads",
        }}
      />
      <Stack.Screen
        name="downloads/[seriesId]"
        options={{
-          title: t("home.downloads.tvseries"),
+          title: "TV-Series",
        }}
      />
      <Stack.Screen
        name="settings"
        options={{
-          title: t("home.settings.settings_title"),
+          title: "Settings",
        }}
      />
      <Stack.Screen
@@ -74,25 +72,11 @@ export default function IndexLayout() {
        }}
      />
      <Stack.Screen
-        name="settings/hide-libraries/page"
+        name="settings/popular-lists/page"
        options={{
          title: "",
        }}
      />
-      <Stack.Screen
-        name="settings/logs/page"
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name="intro/page"
-        options={{
-          headerShown: false,
-          title: "",
-          presentation: "modal",
-        }}
-      />
      {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
        <Stack.Screen key={name} name={name} options={options} />
      ))}
--- a/app/(auth)/(tabs)/(home)/downloads/index.tsx
+++ b/app/(auth)/(tabs)/(home)/downloads/index.tsx
@@ -4,7 +4,7 @@ import { MovieCard } from "@/components/downloads/MovieCard";
 import { SeriesCard } from "@/components/downloads/SeriesCard";
 import { DownloadedItem, useDownload } from "@/providers/DownloadProvider";
 import { queueAtom } from "@/utils/atoms/queue";
-import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
+import { useSettings } from "@/utils/atoms/settings";
 import { Ionicons } from "@expo/vector-icons";
 import { useNavigation, useRouter } from "expo-router";
 import { useAtom } from "jotai";
@@ -12,8 +12,6 @@ import React, { useEffect, useMemo, useRef } from "react";
 import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
 import { Button } from "@/components/Button";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";
-import { t } from 'i18next';
 import { DownloadSize } from "@/components/downloads/DownloadSize";
 import {
  BottomSheetBackdrop,
@@ -26,7 +24,6 @@ import { writeToLog } from "@/utils/log";

 export default function page() {
  const navigation = useNavigation();
-  const { t } = useTranslation();
  const [queue, setQueue] = useAtom(queueAtom);
  const { removeProcess, downloadedFiles, deleteFileByType } = useDownload();
  const router = useRouter();
@@ -73,17 +70,17 @@ export default function page() {

  const deleteMovies = () =>
    deleteFileByType("Movie")
-      .then(() => toast.success(t("home.downloads.toasts.deleted_all_movies_successfully")))
+      .then(() => toast.success("Deleted all movies successfully!"))
      .catch((reason) => {
        writeToLog("ERROR", reason);
-        toast.error(t("home.downloads.toasts.failed_to_delete_all_movies"));
+        toast.error("Failed to delete all movies");
      });
  const deleteShows = () =>
    deleteFileByType("Episode")
-      .then(() => toast.success(t("home.downloads.toasts.deleted_all_tvseries_successfully")))
+      .then(() => toast.success("Deleted all TV-Series successfully!"))
      .catch((reason) => {
        writeToLog("ERROR", reason);
-        toast.error(t("home.downloads.toasts.failed_to_delete_all_tvseries"));
+        toast.error("Failed to delete all TV-Series");
      });
  const deleteAllMedia = async () =>
    await Promise.all([deleteMovies(), deleteShows()]);
@@ -99,11 +96,11 @@ export default function page() {
      >
        <View className="py-4">
          <View className="mb-4 flex flex-col space-y-4 px-4">
-            {settings?.downloadMethod === DownloadMethod.Remux && (
+            {settings?.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-lg font-bold">Queue</Text>
                <Text className="text-xs opacity-70 text-red-600">
-                  {t("home.downloads.queue_hint")}
+                  Queue and active downloads will be lost on app restart
                </Text>
                <View className="flex flex-col space-y-2 mt-2">
                  {queue.map((q, index) => (
@@ -136,7 +133,7 @@ export default function page() {
                </View>

                {queue.length === 0 && (
-                  <Text className="opacity-50">{t("home.downloads.no_items_in_queue")}</Text>
+                  <Text className="opacity-50">No items in queue</Text>
                )}
              </View>
            )}
@@ -147,7 +144,7 @@ export default function page() {
          {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>
+                <Text className="text-lg font-bold">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>
@@ -166,7 +163,7 @@ export default function page() {
          {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>
+                <Text className="text-lg font-bold">TV-Series</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}
@@ -192,7 +189,7 @@ export default function page() {
          )}
          {downloadedFiles?.length === 0 && (
            <View className="flex px-4">
-              <Text className="opacity-50">{t("home.downloads.no_downloaded_items")}</Text>
+              <Text className="opacity-50">No downloaded items</Text>
            </View>
          )}
        </View>
@@ -217,13 +214,13 @@ export default function page() {
        <BottomSheetView>
          <View className="p-4 space-y-4 mb-4">
            <Button color="purple" onPress={deleteMovies}>
-              {t("home.downloads.delete_all_movies_button")}
+              Delete all Movies
            </Button>
            <Button color="purple" onPress={deleteShows}>
-              {t("home.downloads.delete_all_tvseries_button")}
+              Delete all TV-Series
            </Button>
            <Button color="red" onPress={deleteAllMedia}>
-              {t("home.downloads.delete_all_button")}
+              Delete all
            </Button>
          </View>
        </BottomSheetView>
@@ -236,15 +233,15 @@ 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"),
+    "New app version requires re-download",
+    "The new update reqires content to be downloaded again. Please remove all downloaded content and try again.",
    [
      {
-        text: t("home.downloads.back"),
+        text: "Back",
        onPress: () => router.back(),
      },
      {
-        text: t("home.downloads.delete"),
+        text: "Delete",
        style: "destructive",
        onPress: async () => await deleteAllFiles(),
      },
--- a/app/(auth)/(tabs)/(home)/index.tsx
+++ b/app/(auth)/(tabs)/(home)/index.tsx
@@ -8,7 +8,7 @@ import { Colors } from "@/constants/Colors";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
 import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { HomeSectionStyle, useSettings } from "@/utils/atoms/settings";
+import { useSettings } from "@/utils/atoms/settings";
 import { Feather, Ionicons } from "@expo/vector-icons";
 import { Api } from "@jellyfin/sdk";
 import {
@@ -23,11 +23,10 @@ import {
  getUserViewsApi,
 } from "@jellyfin/sdk/lib/utils/api";
 import NetInfo from "@react-native-community/netinfo";
-import { QueryFunction, useQuery } from "@tanstack/react-query";
+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 { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
  RefreshControl,
@@ -56,19 +55,11 @@ type Section = ScrollingCollectionListSection | MediaListSection;
 export default function index() {
  const router = useRouter();

-  const { t } = useTranslation();
-
  const api = useAtomValue(apiAtom);
  const user = useAtomValue(userAtom);

  const [loading, setLoading] = useState(false);
-  const [
-    settings,
-    updateSettings,
-    pluginSettings,
-    setPluginSettings,
-    refreshStreamyfinPluginSettings,
-  ] = useSettings();
+  const [settings, _] = useSettings();

  const [isConnected, setIsConnected] = useState<boolean | null>(null);
  const [loadingRetry, setLoadingRetry] = useState(false);
@@ -119,14 +110,13 @@ export default function index() {
    cleanCacheDirectory().catch((e) =>
      console.error("Something went wrong cleaning cache directory")
    );
-
    return () => {
      unsubscribe();
    };
  }, []);

  const {
-    data,
+    data: userViews,
    isError: e1,
    isLoading: l1,
  } = useQuery({
@@ -146,10 +136,28 @@ export default function index() {
    staleTime: 60 * 1000,
  });

-  const userViews = useMemo(
-    () => data?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)),
-    [data, settings?.hiddenLibraries]
-  );
+  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"];
@@ -164,7 +172,6 @@ export default function index() {

  const refetch = useCallback(async () => {
    setLoading(true);
-    await refreshStreamyfinPluginSettings();
    await invalidateCache();
    setLoading(false);
  }, []);
@@ -199,15 +206,13 @@ export default function index() {
    [api, user?.Id]
  );

-  let sections: Section[] = [];
-  if (!settings?.home || !settings?.home?.sections) {
-    sections = useMemo(() => {
+  const sections = useMemo(() => {
    if (!api || !user?.Id) return [];

    const latestMediaViews = collections.map((c) => {
      const includeItemTypes: BaseItemKind[] =
        c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
-        const title = t("home.recently_added_in", {libraryName: c.Name});
+      const title = "Recently Added in " + c.Name;
      const queryKey = [
        "home",
        "recentlyAddedIn" + c.CollectionType,
@@ -224,7 +229,7 @@ export default function index() {

    const ss: Section[] = [
      {
-          title: t("home.continue_watching"),
+        title: "Continue Watching",
        queryKey: ["home", "resumeItems"],
        queryFn: async () =>
          (
@@ -238,7 +243,7 @@ export default function index() {
        orientation: "horizontal",
      },
      {
-          title: t("home.next_up"),
+        title: "Next Up",
        queryKey: ["home", "nextUp-all"],
        queryFn: async () =>
          (
@@ -254,18 +259,18 @@ export default function index() {
        orientation: "horizontal",
      },
      ...latestMediaViews,
-        // ...(mediaListCollections?.map(
-        //   (ml) =>
-        //     ({
-        //       title: ml.Name,
-        //       queryKey: ["home", "mediaList", ml.Id!],
-        //       queryFn: async () => ml,
-        //       type: "MediaListSection",
-        //       orientation: "vertical",
-        //     } as Section)
-        // ) || []),
+      ...(mediaListCollections?.map(
+        (ml) =>
+          ({
+            title: ml.Name,
+            queryKey: ["home", "mediaList", ml.Id!],
+            queryFn: async () => ml,
+            type: "MediaListSection",
+            orientation: "vertical",
+          } as Section)
+      ) || []),
      {
-          title: t("home.suggested_movies"),
+        title: "Suggested Movies",
        queryKey: ["home", "suggestedMovies", user?.Id],
        queryFn: async () =>
          (
@@ -280,7 +285,7 @@ export default function index() {
        orientation: "vertical",
      },
      {
-          title: t("home.suggested_episodes"),
+        title: "Suggested Episodes",
        queryKey: ["home", "suggestedEpisodes", user?.Id],
        queryFn: async () => {
          try {
@@ -301,58 +306,14 @@ export default function index() {
      },
    ];
    return ss;
-    }, [api, user?.Id, collections]);
-  } else {
-    sections = useMemo(() => {
-      if (!api || !user?.Id) return [];
-      const ss: Section[] = [];
-
-      for (const key in settings.home?.sections) {
-        const section = settings.home?.sections[key];
-        const id = section.title || key;
-        ss.push({
-          title: id,
-          queryKey: ["home", id],
-          queryFn: async () => {
-            if (section.items) {
-              const response = await getItemsApi(api).getItems({
-                userId: user?.Id,
-                limit: section.items?.limit || 25,
-                recursive: true,
-                includeItemTypes: section.items?.includeItemTypes,
-                sortBy: section.items?.sortBy,
-                sortOrder: section.items?.sortOrder,
-                filters: section.items?.filters,
-                parentId: section.items?.parentId,
-              });
-              return response.data.Items || [];
-            } else if (section.nextUp) {
-              const response = await getTvShowsApi(api).getNextUp({
-                userId: user?.Id,
-                fields: ["MediaSourceCount"],
-                limit: section.items?.limit || 25,
-                enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-                enableResumable: section.items?.enableResumable || false,
-                enableRewatching: section.items?.enableRewatching || false,
-              });
-              return response.data.Items || [];
-            }
-            return [];
-          },
-          type: "ScrollingCollectionList",
-          orientation: section?.orientation || "vertical",
-        });
-      }
-      return ss;
-    }, [api, user?.Id, settings.home?.sections]);
-  }
+  }, [api, user?.Id, collections, mediaListCollections]);

  if (isConnected === false) {
    return (
      <View className="flex flex-col items-center justify-center h-full -mt-6 px-8">
-        <Text className="text-3xl font-bold mb-2">{t("home.no_internet")}</Text>
+        <Text className="text-3xl font-bold mb-2">No Internet</Text>
        <Text className="text-center opacity-70">
-        {t("home.no_internet_message")}
+          No worries, you can still watch{"\n"}downloaded content.
        </Text>
        <View className="mt-4">
          <Button
@@ -363,7 +324,7 @@ export default function index() {
              <Ionicons name="arrow-forward" size={20} color="white" />
            }
          >
-            {t("home.go_to_downloads")}
+            Go to downloads
          </Button>
          <Button
            color="black"
@@ -389,15 +350,17 @@ export default function index() {
    );
  }

-  if (e1)
+  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">{t("home.oops")}</Text>
-        <Text className="text-center opacity-70">{t("home.error_message")}</Text>
+        <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)
+  if (l1 || l2)
    return (
      <View className="justify-center items-center h-full">
        <Loader />
--- a/app/(auth)/(tabs)/(home)/intro/page.tsx
+++ b/app/(auth)/(tabs)/(home)/intro/page.tsx
@@ -1,135 +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)/settings.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tsx
@@ -10,27 +10,23 @@ 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 { AppLanguageSelector } from "@/components/settings/AppLanguageSelector";
 import { UserInfo } from "@/components/settings/UserInfo";
 import { useJellyfin } from "@/providers/JellyfinProvider";
 import { clearLogs } from "@/utils/log";
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";
 import { useNavigation, useRouter } from "expo-router";
-import { t } from "i18next";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { storage } from "@/utils/mmkv";

 export default function settings() {
  const router = useRouter();
  const insets = useSafeAreaInsets();
  const { logout } = useJellyfin();
-  const successHapticFeedback = useHaptic("success");

  const onClearLogsClicked = async () => {
    clearLogs();
-    successHapticFeedback();
+    Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
  };

  const navigation = useNavigation();
@@ -42,7 +38,7 @@ export default function settings() {
            logout();
          }}
        >
-          <Text className="text-red-600">{t("home.settings.log_out_button")}</Text>
+          <Text className="text-red-600">Log out</Text>
        </TouchableOpacity>
      ),
    });
@@ -70,35 +66,17 @@ export default function settings() {

        <PluginSettings />

-        <AppLanguageSelector/>
-
-        <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")}>
+          <ListGroup title={"Logs"}>
            <ListItem
              onPress={() => router.push("/settings/logs/page")}
              showArrow
-              title={t("home.settings.logs.logs_title")}
+              title={"Logs"}
            />
            <ListItem
              textColor="red"
              onPress={onClearLogsClicked}
-              title={t("home.settings.logs.delete_all_logs")}
+              title={"Delete All Logs"}
            />
          </ListGroup>
        </View>
--- 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 { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
-import { ListItem } from "@/components/list/ListItem";
-import { Loader } from "@/components/Loader";
-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 { Switch, View } from "react-native";
-import { useTranslation } from "react-i18next"; 
-import DisabledSetting from "@/components/settings/DisabledSetting";
-
-export default function page() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
-  const user = useAtomValue(userAtom);
-  const api = useAtomValue(apiAtom);
-
-  const { t } = useTranslation();
-
-  const { data, isLoading: 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 +1,78 @@
+import { Text } from "@/components/common/Text";
 import { JellyseerrSettings } from "@/components/settings/Jellyseerr";
+import { OptimizedServerForm } from "@/components/settings/OptimizedServerForm";
+import { apiAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
-import DisabledSetting from "@/components/settings/DisabledSetting";
+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 { ActivityIndicator, TouchableOpacity, View } from "react-native";
+import { toast } from "sonner-native";

 export default function page() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const navigation = useNavigation();
+
+  const [api] = useAtom(apiAtom);
+  const [settings, updateSettings] = useSettings();
+
+  const [optimizedVersionsServerUrl, setOptimizedVersionsServerUrl] =
+    useState<string>(settings?.optimizedVersionsServerUrl || "");
+
+  const saveMutation = useMutation({
+    mutationFn: async (newVal: string) => {
+      if (newVal.length === 0 || !newVal.startsWith("http")) {
+        toast.error("Invalid URL");
+        return;
+      }
+
+      const updatedUrl = newVal.endsWith("/") ? newVal : newVal + "/";
+
+      updateSettings({
+        optimizedVersionsServerUrl: updatedUrl,
+      });
+
+      return await getStatistics({
+        url: settings?.optimizedVersionsServerUrl,
+        authHeader: api?.accessToken,
+        deviceId: getOrSetDeviceId(),
+      });
+    },
+    onSuccess: (data) => {
+      if (data) {
+        toast.success("Connected");
+      } else {
+        toast.error("Could not connect");
+      }
+    },
+    onError: () => {
+      toast.error("Could not connect");
+    },
+  });
+
+  const onSave = (newVal: string) => {
+    saveMutation.mutate(newVal);
+  };
+
+  // useEffect(() => {
+  //   navigation.setOptions({
+  //     title: "Optimized Server",
+  //     headerRight: () =>
+  //       saveMutation.isPending ? (
+  //         <ActivityIndicator size={"small"} color={"white"} />
+  //       ) : (
+  //         <TouchableOpacity onPress={() => onSave(optimizedVersionsServerUrl)}>
+  //           <Text className="text-blue-500">Save</Text>
+  //         </TouchableOpacity>
+  //       ),
+  //   });
+  // }, [navigation, optimizedVersionsServerUrl, saveMutation.isPending]);

  return (
-    <DisabledSetting
-      disabled={pluginSettings?.jellyseerrServerUrl?.locked === true}
-      className="p-4"
-    >
+    <View className="p-4">
      <JellyseerrSettings />
-    </DisabledSetting>
+    </View>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
@@ -1,11 +1,9 @@
 import { Text } from "@/components/common/Text";
 import { useLog } from "@/utils/log";
 import { ScrollView, View } from "react-native";
-import { useTranslation } from "react-i18next";

 export default function page() {
  const { logs } = useLog();
-  const { t } = useTranslation();

  return (
    <ScrollView className="p-4">
@@ -27,7 +25,7 @@ export default function page() {
          </View>
        ))}
        {logs?.length === 0 && (
-          <Text className="opacity-50">{t("home.settings.logs.no_logs_available")}</Text>
+          <Text className="opacity-50">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,12 +1,12 @@
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
+import { apiAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { useQueryClient } from "@tanstack/react-query";
 import { useNavigation } from "expo-router";
-import { useTranslation } from "react-i18next";
-
-import React, {useEffect, useMemo, useState} from "react";
+import { useAtom } from "jotai";
+import { useEffect, useState } from "react";
 import {
  Linking,
  Switch,
@@ -15,14 +15,11 @@ import {
  View,
 } from "react-native";
 import { toast } from "sonner-native";
-import DisabledSetting from "@/components/settings/DisabledSetting";

 export default function page() {
  const navigation = useNavigation();

-  const { t } = useTranslation();
-
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings] = useSettings();
  const queryClient = useQueryClient();

  const [value, setValue] = useState<string>(settings?.marlinServerUrl || "");
@@ -31,43 +28,30 @@ export default function page() {
    updateSettings({
      marlinServerUrl: !val.endsWith("/") ? val : val.slice(0, -1),
    });
-    toast.success(t("home.settings.plugins.marlin_search.toasts.saved"));
+    toast.success("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>
+          <Text className="text-blue-500">Save</Text>
        </TouchableOpacity>
      ),
    });
-    }
  }, [navigation, value]);

  if (!settings) return null;

  return (
-    <DisabledSetting
-      disabled={disabled}
-      className="px-4"
-    >
+    <View 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")}
+          title={"Enable Marlin Search"}
          onPress={() => {
            updateSettings({ searchEngine: "Jellyfin" });
            queryClient.invalidateQueries({ queryKey: ["search"] });
@@ -81,22 +65,22 @@ export default function page() {
            }}
          />
        </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={`mt-2 ${
+          settings.searchEngine === "Marlin" ? "" : "opacity-50"
+        }`}
      >
+        <View className="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>
+            <Text className="mr-4">URL</Text>
            <TextInput
              editable={settings.searchEngine === "Marlin"}
              className="text-white"
-            placeholder={t("home.settings.plugins.marlin_search.server_url_placeholder")}
+              placeholder="http(s)://domain.org:port"
              value={value}
              keyboardType="url"
              returnKeyType="done"
@@ -105,13 +89,15 @@ export default function page() {
              onChangeText={(text) => setValue(text)}
            />
          </View>
-      </DisabledSetting>
+        </View>
        <Text className="px-4 text-xs text-neutral-500 mt-1">
-        {t("home.settings.plugins.marlin_search.marlin_search_hint")}{" "}
+          Enter the URL for the Marlin server. The URL should include http or
+          https and optionally the port.{" "}
          <Text className="text-blue-500" onPress={handleOpenLink}>
-          {t("home.settings.plugins.marlin_search.read_more_about_marlin")}
+            Read more about Marlin.
          </Text>
        </Text>
-    </DisabledSetting>
+      </View>
+    </View>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
@@ -10,16 +10,12 @@ import { useAtom } from "jotai";
 import { useEffect, useState } from "react";
 import { ActivityIndicator, TouchableOpacity, View } from "react-native";
 import { toast } from "sonner-native";
-import { useTranslation } from "react-i18next";
-import DisabledSetting from "@/components/settings/DisabledSetting";

 export default function page() {
  const navigation = useNavigation();

-  const { t } = useTranslation();
-
  const [api] = useAtom(apiAtom);
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings] = useSettings();

  const [optimizedVersionsServerUrl, setOptimizedVersionsServerUrl] =
    useState<string>(settings?.optimizedVersionsServerUrl || "");
@@ -27,7 +23,7 @@ export default function page() {
  const saveMutation = useMutation({
    mutationFn: async (newVal: string) => {
      if (newVal.length === 0 || !newVal.startsWith("http")) {
-        toast.error(t("home.settings.toasts.invalid_url"));
+        toast.error("Invalid URL");
        return;
      }

@@ -45,13 +41,13 @@ export default function page() {
    },
    onSuccess: (data) => {
      if (data) {
-        toast.success(t("home.settings.toasts.connected"));
+        toast.success("Connected");
      } else {
-        toast.error(t("home.settings.toasts.could_not_connect"));
+        toast.error("Could not connect");
      }
    },
    onError: () => {
-      toast.error(t("home.settings.toasts.could_not_connect"));
+      toast.error("Could not connect");
    },
  });

@@ -60,30 +56,25 @@ export default function page() {
  };

  useEffect(() => {
-    if (!pluginSettings?.optimizedVersionsServerUrl?.locked) {
    navigation.setOptions({
-        title: t("home.settings.downloads.optimized_server"),
+      title: "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>
+            <Text className="text-blue-500">Save</Text>
          </TouchableOpacity>
        ),
    });
-    }
  }, [navigation, optimizedVersionsServerUrl, saveMutation.isPending]);

  return (
-    <DisabledSetting
-      disabled={pluginSettings?.optimizedVersionsServerUrl?.locked === true}
-      className="p-4"
-    >
+    <View className="p-4">
      <OptimizedServerForm
        value={optimizedVersionsServerUrl}
        onChangeValue={setOptimizedVersionsServerUrl}
      />
-    </DisabledSetting>
+    </View>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/popular-lists/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/popular-lists/page.tsx
@@ -0,0 +1,135 @@
+import { Text } from "@/components/common/Text";
+import { ListGroup } from "@/components/list/ListGroup";
+import { ListItem } from "@/components/list/ListItem";
+import { Loader } from "@/components/Loader";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import { Linking, Switch, View } from "react-native";
+
+export default function page() {
+  const navigation = useNavigation();
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const [settings, updateSettings] = useSettings();
+
+  const handleOpenLink = () => {
+    Linking.openURL(
+      "https://github.com/lostb1t/jellyfin-plugin-collection-import"
+    );
+  };
+
+  const queryClient = useQueryClient();
+
+  const {
+    data: mediaListCollections,
+    isLoading: isLoadingMediaListCollections,
+  } = useQuery({
+    queryKey: ["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: 0,
+  });
+
+  if (!settings) return null;
+
+  return (
+    <View className="px-4 pt-4">
+      <ListGroup title={"Enable plugin"} className="">
+        <ListItem
+          title={"Enable Popular Lists"}
+          onPress={() => {
+            updateSettings({ usePopularPlugin: true });
+            queryClient.invalidateQueries({ queryKey: ["search"] });
+          }}
+        >
+          <Switch
+            value={settings.usePopularPlugin}
+            onValueChange={(value) => {
+              updateSettings({ usePopularPlugin: value });
+            }}
+          />
+        </ListItem>
+      </ListGroup>
+      <Text className="px-4 text-xs text-neutral-500 mt-1">
+        Popular Lists is a plugin that enables you to show custom Jellyfin lists
+        on the Streamyfin home page.{" "}
+        <Text className="text-blue-500" onPress={handleOpenLink}>
+          Read more about Popular Lists.
+        </Text>
+      </Text>
+
+      {settings.usePopularPlugin && (
+        <>
+          {!isLoadingMediaListCollections ? (
+            <>
+              {mediaListCollections?.length === 0 ? (
+                <Text className="text-xs opacity-50 p-4">
+                  No collections found. Add some in Jellyfin.
+                </Text>
+              ) : (
+                <>
+                  <ListGroup title="Media List Collections" className="mt-4">
+                    {mediaListCollections?.map((mlc) => (
+                      <ListItem key={mlc.Id} title={mlc.Name}>
+                        <Switch
+                          value={settings.mediaListCollectionIds?.includes(
+                            mlc.Id!
+                          )}
+                          onValueChange={(value) => {
+                            if (!settings.mediaListCollectionIds) {
+                              updateSettings({
+                                mediaListCollectionIds: [mlc.Id!],
+                              });
+                              return;
+                            }
+
+                            updateSettings({
+                              mediaListCollectionIds:
+                                settings.mediaListCollectionIds.includes(
+                                  mlc.Id!
+                                )
+                                  ? settings.mediaListCollectionIds.filter(
+                                      (id) => id !== mlc.Id
+                                    )
+                                  : [
+                                      ...settings.mediaListCollectionIds,
+                                      mlc.Id!,
+                                    ],
+                            });
+                          }}
+                        />
+                      </ListItem>
+                    ))}
+                  </ListGroup>
+                  <Text className="px-4 text-xs text-neutral-500 mt-1">
+                    Select the lists you want displayed on the home screen.
+                  </Text>
+                </>
+              )}
+            </>
+          ) : (
+            <Loader />
+          )}
+        </>
+      )}
+    </View>
+  );
+}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/actors/[actorId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/actors/[actorId].tsx
@@ -18,12 +18,10 @@ import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
 import { View } from "react-native";
-import { useTranslation } from "react-i18next";

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

  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
@@ -112,7 +110,7 @@ const page: React.FC = () => {
        </View>

        <Text className="px-4 text-2xl font-bold mb-2 text-neutral-100">
-          {t("item_card.appeared_in")}
+          Appeared In
        </Text>
        <InfiniteHorizontalScroll
          height={247}
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/albums/[albumId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/albums/[albumId].tsx
@@ -0,0 +1,128 @@
+import { Chromecast } from "@/components/Chromecast";
+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();
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerRight: () => (
+        <View className="">
+          <Chromecast />
+        </View>
+      ),
+    });
+  });
+
+  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,favorites)/artists/[artistId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/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,favorites)/artists/index.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/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
@@ -33,7 +33,6 @@ import * as ScreenOrientation from "expo-screen-orientation";
 import { useAtom } from "jotai";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { FlatList, View } from "react-native";
-import { useTranslation } from "react-i18next";

 const page: React.FC = () => {
  const searchParams = useLocalSearchParams();
@@ -46,8 +45,6 @@ const page: React.FC = () => {
    ScreenOrientation.Orientation.PORTRAIT_UP
  );

-  const { t } = useTranslation();
-
  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
@@ -112,7 +109,7 @@ const page: React.FC = () => {
        genres: selectedGenres,
        tags: selectedTags,
        years: selectedYears.map((year) => parseInt(year)),
-        includeItemTypes: ["Movie", "Series"],
+        includeItemTypes: ["Movie", "Series", "MusicAlbum"],
      });

      return response.data || null;
@@ -247,7 +244,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())
@@ -274,7 +271,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)}
                />
@@ -299,7 +296,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())
@@ -317,7 +314,7 @@ const page: React.FC = () => {
                  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 || ""
                  }
@@ -337,7 +334,7 @@ const page: React.FC = () => {
                  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 || ""
                  }
@@ -377,7 +374,7 @@ const page: React.FC = () => {
    <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>
+          <Text className="font-bold text-xl text-neutral-500">No results</Text>
        </View>
      }
      extraData={[
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx
@@ -13,13 +13,11 @@ import Animated, {
  useSharedValue,
  withTiming,
 } from "react-native-reanimated";
-import { useTranslation } from "react-i18next";

 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,7 +74,7 @@ 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>
+        <Text>Could not load item</Text>
      </View>
    );

--- 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,95 +0,0 @@
-import {router, useLocalSearchParams, useSegments,} from "expo-router";
-import React, {useMemo,} from "react";
-import {TouchableOpacity} from "react-native";
-import {useInfiniteQuery} from "@tanstack/react-query";
-import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
-import {Text} from "@/components/common/Text";
-import {Image} from "expo-image";
-import Poster from "@/components/posters/Poster";
-import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
-import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
-import {COMPANY_LOGO_IMAGE_FILTER} from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
-import {uniqBy} from "lodash";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-
-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}) => {
-      let 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,87 +0,0 @@
-import {router, useLocalSearchParams, useSegments,} from "expo-router";
-import React, {useMemo,} from "react";
-import {TouchableOpacity} from "react-native";
-import {useInfiniteQuery} from "@tanstack/react-query";
-import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
-import {Text} from "@/components/common/Text";
-import Poster from "@/components/posters/Poster";
-import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
-import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
-import {uniqBy} from "lodash";
-import {textShadowStyle} from "@/components/jellyseerr/discover/GenericSlideCard";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-
-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}) => {
-      let 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,68 +1,61 @@
-import { Button } from "@/components/Button";
+import React, { useCallback, useRef, useState } from "react";
+import { useLocalSearchParams } from "expo-router";
+import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
 import { Text } from "@/components/common/Text";
-import { GenreTags } from "@/components/GenreTags";
-import Cast from "@/components/jellyseerr/Cast";
-import DetailFacts from "@/components/jellyseerr/DetailFacts";
-import { OverviewText } from "@/components/OverviewText";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { JellyserrRatings } from "@/components/Ratings";
-import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
-import { ItemActions } from "@/components/series/SeriesActions";
+import { Image } from "expo-image";
+import { TouchableOpacity, View} from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { OverviewText } from "@/components/OverviewText";
+import { GenreTags } from "@/components/GenreTags";
+import { MediaType } from "@/utils/jellyseerr/server/constants/media";
+import { useQuery } from "@tanstack/react-query";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
+import { Button } from "@/components/Button";
+import {
+  BottomSheetBackdrop,
+  BottomSheetBackdropProps,
+  BottomSheetModal, BottomSheetTextInput,
+  BottomSheetView,
+} from "@gorhom/bottom-sheet";
 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 { useTranslation } from "react-i18next";
-import { Ionicons } from "@expo/vector-icons";
-import {
-  BottomSheetBackdrop,
-  BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetTextInput,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams, useNavigation } from "expo-router";
-import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
-import { TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import * as DropdownMenu from "zeego/dropdown-menu";
-import RequestModal from "@/components/jellyseerr/RequestModal";
-import {ANIME_KEYWORD_ID} from "@/utils/jellyseerr/server/api/themoviedb/constants";
-import {MediaRequestBody} from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
+import { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
+import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
+import { JellyserrRatings } from "@/components/Ratings";

 const Page: React.FC = () => {
  const insets = useSafeAreaInsets();
  const params = useLocalSearchParams();
-  const { t } = useTranslation();
-
-  const { mediaTitle, releaseYear, posterSrc, ...result } =
-    params as unknown as {
+  const {
+    mediaTitle,
+    releaseYear,
+    canRequest: canRequestString,
+    posterSrc,
+    ...result
+  } = params as unknown as {
    mediaTitle: string;
    releaseYear: number;
    canRequest: string;
    posterSrc: string;
  } & Partial<MovieResult | TvResult>;

-  const navigation = useNavigation();
+  const canRequest = canRequestString === "true";
  const { jellyseerrApi, requestMedia } = useJellyseerr();

  const [issueType, setIssueType] = useState<IssueType>();
  const [issueMessage, setIssueMessage] = useState<string>();
-  const advancedReqModalRef = useRef<BottomSheetModal>(null);
  const bottomSheetModalRef = useRef<BottomSheetModal>(null);

  const {
    data: details,
    isFetching,
    isLoading,
-    refetch,
+    refetch
  } = useQuery({
    enabled: !!jellyseerrApi && !!result && !!result.id,
    queryKey: ["jellyseerr", "detail", result.mediaType, result.id],
@@ -79,8 +72,6 @@ const Page: React.FC = () => {
    },
  });

-  const [canRequest, hasAdvancedRequestPermission] = useJellyseerrCanRequest(details);
-
  const renderBackdrop = useCallback(
    (props: BottomSheetBackdropProps) => (
      <BottomSheetBackdrop
@@ -104,40 +95,21 @@ const Page: React.FC = () => {
    }
  }, [jellyseerrApi, details, result, issueType, issueMessage]);

-  const request = useCallback(async () => {
-    const body: MediaRequestBody = {
+  const request = useCallback(
+    async () => {
+      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),
-    }
-
-    if (hasAdvancedRequestPermission) {
-      advancedReqModalRef?.current?.present?.(body)
-      return
-    }
-
-    requestMedia(mediaTitle, body, refetch);
-  }, [details, result, requestMedia, hasAdvancedRequestPermission]);
-
-  const isAnime = useMemo(
-    () => (details?.keywords.some(k => k.id === ANIME_KEYWORD_ID) || false) && result.mediaType === MediaType.TV,
-    [details]
+        },
+        refetch
      )
-
-  useEffect(() => {
-    if (details) {
-      navigation.setOptions({
-        headerRight: () => (
-          <TouchableOpacity className="rounded-full p-2 bg-neutral-800/80">
-            <ItemActions item={details} />
-          </TouchableOpacity>
-        ),
-      });
-    }
-  }, [details]);
+    },
+    [details, result, requestMedia]
+  );

  return (
    <View
@@ -161,10 +133,7 @@ const Page: React.FC = () => {
                  height: "100%",
                }}
                source={{
-                  uri: jellyseerrApi?.imageProxy(
-                    result.backdropPath,
-                    "w1920_and_h800_multi_faces"
-                  ),
+                  uri: `https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${result.backdropPath}`,
                }}
              />
            ) : (
@@ -213,11 +182,9 @@ const Page: React.FC = () => {
              <View className="mb-4">
                <GenreTags genres={details?.genres?.map((g) => g.name) || []} />
              </View>
-              {isLoading || isFetching ? (
-                <Button loading={true} disabled={true} color="purple"></Button>
-              ) : canRequest ? (
+              {canRequest ? (
                <Button color="purple" onPress={request}>
-                  {t("jellyseerr.request_button")}
+                  Request
                </Button>
              ) : (
                <Button
@@ -232,7 +199,7 @@ const Page: React.FC = () => {
                    borderStyle: "solid",
                  }}
                >
-                  {t("jellyseerr.report_issue_button")}
+                  Report issue
                </Button>
              )}
              <OverviewText text={result.overview} className="mt-4" />
@@ -244,31 +211,11 @@ const Page: React.FC = () => {
                result={result as TvResult}
                details={details as TvDetails}
                refetch={refetch}
-                hasAdvancedRequest={hasAdvancedRequestPermission}
-                onAdvancedRequest={(data) =>
-                  advancedReqModalRef?.current?.present(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}
-        title={mediaTitle}
-        id={result.id!!}
-        type={result.mediaType as MediaType}
-        isAnime={isAnime}
-        onRequested={() => {
-          advancedReqModalRef?.current?.close()
-          refetch()
-        }}
-      />
      <BottomSheetModal
        ref={bottomSheetModalRef}
        enableDynamicSizing
@@ -284,7 +231,7 @@ const Page: React.FC = () => {
          <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")}
+                Whats wrong?
              </Text>
            </View>
            <View className="flex flex-col space-y-2 items-start">
@@ -293,13 +240,13 @@ const Page: React.FC = () => {
                  <DropdownMenu.Trigger>
                    <View className="flex flex-col">
                      <Text className="opacity-50 mb-1 text-xs">
-                        {t("jellyseerr.issue_type")}
+                        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")}
+                            : "Select an issue"}
                        </Text>
                      </TouchableOpacity>
                    </View>
@@ -313,7 +260,7 @@ const Page: React.FC = () => {
                    collisionPadding={0}
                    sideOffset={0}
                  >
-                    <DropdownMenu.Label>{t("jellyseerr.types")}</DropdownMenu.Label>
+                    <DropdownMenu.Label>Types</DropdownMenu.Label>
                    {Object.entries(IssueTypeName)
                      .reverse()
                      .map(([key, value], idx) => (
@@ -332,13 +279,15 @@ const Page: React.FC = () => {
                </DropdownMenu.Root>
              </View>

-              <View className="p-4 border border-neutral-800 rounded-xl bg-neutral-900 w-full">
+              <View
+                className="p-4 border border-neutral-800 rounded-xl bg-neutral-900 w-full"
+              >
                <BottomSheetTextInput
                  multiline
                  maxLength={254}
-                  style={{ color: "white" }}
+                  style={{color: "white"}}
                  clearButtonMode="always"
-                  placeholder={t("jellyseerr.describe_the_issue")}
+                  placeholder="(optional) Describe the issue..."
                  placeholderTextColor="#9CA3AF"
                  // Issue with multiline + Textinput inside a portal
                  // https://github.com/callstack/react-native-paper/issues/1668
@@ -348,7 +297,7 @@ const Page: React.FC = () => {
              </View>
            </View>
            <Button className="mt-auto" onPress={submitIssue} color="purple">
-              {t("jellyseerr.submit_button")}
+              Submit
            </Button>
          </View>
        </BottomSheetView>
--- 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,110 +0,0 @@
-import {
-  useLocalSearchParams,
-  useSegments,
-} from "expo-router";
-import React, { useMemo } from "react";
-import { useQuery } from "@tanstack/react-query";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { Text } from "@/components/common/Text";
-import { Image } from "expo-image";
-import { OverviewText } from "@/components/OverviewText";
-import {orderBy, uniqBy} from "lodash";
-import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-import {MovieResult, TvResult} from "@/utils/jellyseerr/server/models/Search";
-import { useTranslation } from "react-i18next";
-
-export default function page() {
-  const local = useLocalSearchParams();
-  const { t } = useTranslation();
-
-  const { jellyseerrApi, jellyseerrUser } = 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 locale = useMemo(() => {
-    return jellyseerrUser?.settings?.locale || "en";
-  }, [jellyseerrUser]);
-
-  const region = useMemo(
-    () => jellyseerrUser?.settings?.region || "US",
-    [jellyseerrUser]
-  );
-
-  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/guide.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/guide.tsx
@@ -17,7 +17,6 @@ import {
  View,
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";

 const HOUR_HEIGHT = 30;
 const ITEMS_PER_PAGE = 20;
@@ -178,7 +177,6 @@ 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">
      <TouchableOpacity
@@ -196,7 +194,7 @@ 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>
@@ -208,7 +206,7 @@ const PageButtons: React.FC<PageButtonsProps> = ({
        <Text
          className={`mr-1 ${isNextDisabled ? "text-gray-500" : "text-white"}`}
        >
-          {t("live_tv.next")}
+          Next
        </Text>
        <Ionicons
          name="chevron-forward"
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/programs.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/programs.tsx
@@ -7,15 +7,12 @@ import { useAtom } from "jotai";
 import React from "react";
 import { ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";

 export default function page() {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const insets = useSafeAreaInsets();

-  const { t } = useTranslation();
-
  return (
    <ScrollView
      nestedScrollEnabled
@@ -31,7 +28,7 @@ export default function page() {
      <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({
@@ -49,7 +46,7 @@ export default function page() {
        />
        <ScrollingCollectionList
          queryKey={["livetv", "shows"]}
-          title={t("live_tv.shows")}
+          title={"Shows"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -71,7 +68,7 @@ export default function page() {
        />
        <ScrollingCollectionList
          queryKey={["livetv", "movies"]}
-          title={t("live_tv.movies")}
+          title={"Movies"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -89,7 +86,7 @@ export default function page() {
        />
        <ScrollingCollectionList
          queryKey={["livetv", "sports"]}
-          title={t("live_tv.sports")}
+          title={"Sports"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
@@ -107,7 +104,7 @@ export default function page() {
        />
        <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({
@@ -125,7 +122,7 @@ export default function page() {
        />
        <ScrollingCollectionList
          queryKey={["livetv", "news"]}
-          title={t("live_tv.news")}
+          title={"News"}
          queryFn={async () => {
            if (!api) return [] as BaseItemDto[];
            const res = await getLiveTvApi(api).getLiveTvPrograms({
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/recordings.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/recordings.tsx
@@ -1,13 +1,11 @@
 import { Text } from "@/components/common/Text";
 import React from "react";
 import { View } from "react-native";
-import { useTranslation } from "react-i18next";

 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>
+      <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
@@ -16,11 +16,9 @@ import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useEffect, useMemo } from "react";
 import { View } from "react-native";
-import { useTranslation } from "react-i18next";

 const page: React.FC = () => {
  const navigation = useNavigation();
-  const { t } = useTranslation();
  const params = useLocalSearchParams();
  const { id: seriesId, seasonIndex } = params as {
    id: string;
@@ -87,7 +85,7 @@ const page: React.FC = () => {
            <AddToFavorites item={item} type="series" />
            <DownloadItems
              size="large"
-              title={t("item_card.download.download_series")}
+              title="Download Series"
              items={allEpisodes || []}
              MissingDownloadIconComponent={() => (
                <Ionicons name="download" size={22} color="white" />
--- a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
+++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
@@ -41,7 +41,6 @@ import {
 } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";

 const Page = () => {
  const searchParams = useLocalSearchParams();
@@ -63,8 +62,6 @@ const Page = () => {

  const { orientation } = useOrientation();

-  const { t } = useTranslation();
-
  useEffect(() => {
    const sop = getSortOrderPreference(libraryId, sortOrderPreference);
    if (sop) {
@@ -153,6 +150,8 @@ const Page = () => {
        itemType = "Series";
      } else if (library.CollectionType === "boxsets") {
        itemType = "BoxSet";
+      } else if (library.CollectionType === "music") {
+        itemType = "MusicAlbum";
      }

      const response = await getItemsApi(api).getItems({
@@ -301,7 +300,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())
@@ -328,7 +327,7 @@ const Page = () => {
                  }}
                  set={setSelectedYears}
                  values={selectedYears}
-                  title={t("library.filters.years")}
+                  title="Years"
                  renderItemLabel={(item) => item.toString()}
                  searchFilter={(item, search) => item.includes(search)}
                />
@@ -353,7 +352,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())
@@ -371,7 +370,7 @@ const Page = () => {
                  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 || ""
                  }
@@ -391,7 +390,7 @@ const Page = () => {
                  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 || ""
                  }
@@ -437,7 +436,7 @@ const Page = () => {
  if (flatData.length === 0)
    return (
      <View className="h-full w-full flex justify-center items-center">
-        <Text className="text-lg text-neutral-500">{t("library.no_items_found")}</Text>
+        <Text className="text-lg text-neutral-500">No items found</Text>
      </View>
    );

@@ -446,7 +445,7 @@ const Page = () => {
      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>
+          <Text className="font-bold text-xl text-neutral-500">No results</Text>
        </View>
      }
      contentInsetAdjustmentBehavior="automatic"
--- a/app/(auth)/(tabs)/(libraries)/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/_layout.tsx
@@ -4,12 +4,9 @@ import { Ionicons } from "@expo/vector-icons";
 import { Stack } from "expo-router";
 import { Platform } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
-import { useTranslation } from "react-i18next";

 export default function IndexLayout() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
-
-  const { t } = useTranslation();
+  const [settings, updateSettings] = useSettings();

  if (!settings?.libraryOptions) return null;

@@ -20,7 +17,7 @@ export default function IndexLayout() {
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.library"),
+          headerTitle: "Library",
          headerBlurEffect: "prominent",
          headerLargeStyle: {
            backgroundColor: "black",
@@ -28,7 +25,6 @@ export default function IndexLayout() {
          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
          headerRight: () => (
-            !pluginSettings?.libraryOptions?.locked &&
            <DropdownMenu.Root>
              <DropdownMenu.Trigger>
                <Ionicons
@@ -46,11 +42,11 @@ export default function IndexLayout() {
                side={"bottom"}
                sideOffset={10}
              >
-                <DropdownMenu.Label>{t("library.options.display")}</DropdownMenu.Label>
+                <DropdownMenu.Label>Display</DropdownMenu.Label>
                <DropdownMenu.Group key="display-group">
                  <DropdownMenu.Sub>
                    <DropdownMenu.SubTrigger key="image-style-trigger">
-                      {t("library.options.display")}
+                      Display
                    </DropdownMenu.SubTrigger>
                    <DropdownMenu.SubContent
                      alignOffset={-10}
@@ -73,7 +69,7 @@ export default function IndexLayout() {
                      >
                        <DropdownMenu.ItemIndicator />
                        <DropdownMenu.ItemTitle key="display-title-1">
-                          {t("library.options.row")}
+                          Row
                        </DropdownMenu.ItemTitle>
                      </DropdownMenu.CheckboxItem>
                      <DropdownMenu.CheckboxItem
@@ -90,14 +86,14 @@ export default function IndexLayout() {
                      >
                        <DropdownMenu.ItemIndicator />
                        <DropdownMenu.ItemTitle key="display-title-2">
-                          {t("library.options.list")}
+                          List
                        </DropdownMenu.ItemTitle>
                      </DropdownMenu.CheckboxItem>
                    </DropdownMenu.SubContent>
                  </DropdownMenu.Sub>
                  <DropdownMenu.Sub>
                    <DropdownMenu.SubTrigger key="image-style-trigger">
-                      {t("library.options.image_style")}
+                      Image style
                    </DropdownMenu.SubTrigger>
                    <DropdownMenu.SubContent
                      alignOffset={-10}
@@ -120,7 +116,7 @@ export default function IndexLayout() {
                      >
                        <DropdownMenu.ItemIndicator />
                        <DropdownMenu.ItemTitle key="poster-title">
-                          {t("library.options.poster")}
+                          Poster
                        </DropdownMenu.ItemTitle>
                      </DropdownMenu.CheckboxItem>
                      <DropdownMenu.CheckboxItem
@@ -137,7 +133,7 @@ export default function IndexLayout() {
                      >
                        <DropdownMenu.ItemIndicator />
                        <DropdownMenu.ItemTitle key="cover-title">
-                          {t("library.options.cover")}
+                          Cover
                        </DropdownMenu.ItemTitle>
                      </DropdownMenu.CheckboxItem>
                    </DropdownMenu.SubContent>
@@ -161,7 +157,7 @@ export default function IndexLayout() {
                  >
                    <DropdownMenu.ItemIndicator />
                    <DropdownMenu.ItemTitle key="show-titles-title">
-                      {t("library.options.show_titles")}
+                      Show titles
                    </DropdownMenu.ItemTitle>
                  </DropdownMenu.CheckboxItem>
                  <DropdownMenu.CheckboxItem
@@ -178,7 +174,7 @@ export default function IndexLayout() {
                  >
                    <DropdownMenu.ItemIndicator />
                    <DropdownMenu.ItemTitle key="show-stats-title">
-                      {t("library.options.show_stats")}
+                      Show stats
                    </DropdownMenu.ItemTitle>
                  </DropdownMenu.CheckboxItem>
                </DropdownMenu.Group>
--- a/app/(auth)/(tabs)/(libraries)/index.tsx
+++ b/app/(auth)/(tabs)/(libraries)/index.tsx
@@ -10,10 +10,9 @@ import {
 import { FlashList } from "@shopify/flash-list";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtom } from "jotai";
-import { useEffect, useMemo } from "react";
+import { useEffect } from "react";
 import { StyleSheet, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";

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

-  const { t } = useTranslation();
-
  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({
@@ -70,10 +63,10 @@ export default function index() {
      </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>
+        <Text className="text-lg text-neutral-500">No libraries found</Text>
      </View>
    );

@@ -88,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={() =>
--- a/app/(auth)/(tabs)/(search)/_layout.tsx
+++ b/app/(auth)/(tabs)/(search)/_layout.tsx
@@ -4,10 +4,8 @@ import {
 } from "@/components/stacks/NestedTabPageStack";
 import { Stack } from "expo-router";
 import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";

 export default function SearchLayout() {
-  const { t } = useTranslation();
  return (
    <Stack>
      <Stack.Screen
@@ -15,7 +13,7 @@ export default function SearchLayout() {
        options={{
          headerShown: true,
          headerLargeTitle: true,
-          headerTitle: t("tabs.search"),
+          headerTitle: "Search",
          headerLargeStyle: {
            backgroundColor: "black",
          },
@@ -38,9 +36,6 @@ export default function SearchLayout() {
        }}
      />
      <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]" options={commonScreenOptions} />
    </Stack>
  );
 }
--- a/app/(auth)/(tabs)/(search)/index.tsx
+++ b/app/(auth)/(tabs)/(search)/index.tsx
@@ -2,16 +2,14 @@ import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
-import { Tag } from "@/components/GenreTags";
 import { ItemCardText } from "@/components/ItemCardText";
-import { JellyserrIndexPage } from "@/components/jellyseerr/JellyseerrIndexPage";
+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 { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
 import {
  BaseItemDto,
  BaseItemKind,
@@ -22,6 +20,7 @@ import axios from "axios";
 import { Href, router, useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, {
+  PropsWithChildren,
  useCallback,
  useEffect,
  useLayoutEffect,
@@ -31,7 +30,13 @@ import React, {
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDebounce } from "use-debounce";
-import { useTranslation } from "react-i18next";
+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";

@@ -48,8 +53,6 @@ export default function search() {
  const params = useLocalSearchParams();
  const insets = useSafeAreaInsets();

-  const { t } = useTranslation();
-
  const { q, prev } = params as { q: string; prev: Href<string> };

  const [searchType, setSearchType] = useState<SearchType>("Library");
@@ -125,7 +128,7 @@ export default function search() {
    if (Platform.OS === "ios")
      navigation.setOptions({
        headerSearchBarOptions: {
-          placeholder: t("search.search"),
+          placeholder: "Search...",
          onChangeText: (e: any) => {
            router.setParams({ q: "" });
            setSearch(e.nativeEvent.text);
@@ -146,6 +149,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: () =>
@@ -186,19 +231,64 @@ 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 (
    <>
@@ -210,14 +300,14 @@ export default function search() {
          paddingRight: insets.right,
        }}
      >
-        <View className="flex flex-col">
+        <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={t("search.search_here")}
+                placeholder="Search here..."
                value={search}
                onChangeText={(text) => setSearch(text)}
              />
@@ -227,7 +317,7 @@ export default function search() {
            <View className="flex flex-row flex-wrap space-x-2 px-4 mb-2">
              <TouchableOpacity onPress={() => setSearchType("Library")}>
                <Tag
-                  text={t("search.library")}
+                  text="Library"
                  textClass="p-1"
                  className={
                    searchType === "Library" ? "bg-purple-600" : undefined
@@ -236,7 +326,7 @@ export default function search() {
              </TouchableOpacity>
              <TouchableOpacity onPress={() => setSearchType("Discover")}>
                <Tag
-                  text={t("search.discover")}
+                  text="Discover"
                  textClass="p-1"
                  className={
                    searchType === "Discover" ? "bg-purple-600" : undefined
@@ -245,15 +335,17 @@ export default function search() {
              </TouchableOpacity>
            </View>
          )}
-
-          <View className="mt-2">
-            <LoadingSkeleton isLoading={loading} />
+          {!!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" ? (
-            <View className={l1 || l2 ? "opacity-0" : "opacity-100"}>
+          )}
+          {searchType === "Library" && (
+            <>
              <SearchItemWrapper
-                header={t("search.movies")}
+                header="Movies"
                ids={movies?.map((m) => m.Id!)}
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
@@ -273,7 +365,7 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={series?.map((m) => m.Id!)}
-                header={t("search.series")}
+                header="Series"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    key={item.Id}
@@ -292,7 +384,7 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={episodes?.map((m) => m.Id!)}
-                header={t("search.episodes")}
+                header="Episodes"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    item={item}
@@ -306,7 +398,7 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={collections?.map((m) => m.Id!)}
-                header={t("search.collections")}
+                header="Collections"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    key={item.Id}
@@ -322,7 +414,7 @@ export default function search() {
              />
              <SearchItemWrapper
                ids={actors?.map((m) => m.Id!)}
-                header={t("search.actors")}
+                header="Actors"
                renderItem={(item: BaseItemDto) => (
                  <TouchableItemRouter
                    item={item}
@@ -334,23 +426,83 @@ export default function search() {
                  </TouchableItemRouter>
                )}
              />
-            </View>
-          ) : (
-            <JellyserrIndexPage searchQuery={debouncedSearch} />
+              <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 ? (
+          {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">
-                    {t("search.no_results_found_for")}
+                No results found for
              </Text>
              <Text className="text-xs text-purple-600 text-center">
                "{debouncedSearch}"
              </Text>
            </View>
-              ) : debouncedSearch.length === 0 ? (
+          ) : debouncedSearch.length === 0 && searchType === "Library" ? (
            <View className="mt-4 flex flex-col items-center space-y-2">
              {exampleSearches.map((e) => (
                <TouchableOpacity
@@ -362,11 +514,80 @@ export default function search() {
                </TouchableOpacity>
              ))}
            </View>
+          ) : debouncedSearch.length === 0 && searchType === "Discover" ? (
+            <View className="flex flex-col">
+              {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,8 +1,7 @@
-import React, { useCallback, useRef } from "react";
+import React from "react";
 import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";

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

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

 import { Colors } from "@/constants/Colors";
-import { useSettings } from "@/utils/atoms/settings";
-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,29 +29,11 @@ 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" />
      <NativeTabs
-        sidebarAdaptable={false}
+        sidebarAdaptable
        ignoresTopSafeArea
        barTintColor={Platform.OS === "android" ? "#121212" : undefined}
        tabBarActiveTintColor={Colors.primary}
@@ -63,7 +43,7 @@ export default function TabLayout() {
        <NativeTabs.Screen
          name="(home)"
          options={{
-            title: t("tabs.home"),
+            title: "Home",
            tabBarIcon:
              Platform.OS == "android"
                ? ({ color, focused, size }) =>
@@ -77,7 +57,7 @@ export default function TabLayout() {
        <NativeTabs.Screen
          name="(search)"
          options={{
-            title: t("tabs.search"),
+            title: "Search",
            tabBarIcon:
              Platform.OS == "android"
                ? ({ color, focused, size }) =>
@@ -91,7 +71,7 @@ export default function TabLayout() {
        <NativeTabs.Screen
          name="(favorites)"
          options={{
-            title: t("tabs.favorites"),
+            title: "Favorites",
            tabBarIcon:
              Platform.OS == "android"
                ? ({ color, focused, size }) =>
@@ -107,7 +87,7 @@ export default function TabLayout() {
        <NativeTabs.Screen
          name="(libraries)"
          options={{
-            title: t("tabs.library"),
+            title: "Library",
            tabBarIcon:
              Platform.OS == "android"
                ? ({ color, focused, size }) =>
@@ -121,7 +101,7 @@ export default function TabLayout() {
        <NativeTabs.Screen
          name="(custom-links)"
          options={{
-            title: t("tabs.custom_links"),
+            title: "Custom Links",
            // @ts-expect-error
            tabBarItemHidden: settings?.showCustomMenuLinks ? false : true,
            tabBarIcon:
--- a/app/(auth)/player/_layout.tsx
+++ b/app/(auth)/player/_layout.tsx
@@ -25,6 +25,15 @@ export default function Layout() {
            animation: "fade",
          }}
        />
+        <Stack.Screen
+          name="music-player"
+          options={{
+            headerShown: false,
+            autoHideHomeIndicator: true,
+            title: "",
+            animation: "fade",
+          }}
+        />
      </Stack>
    </>
  );
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -27,7 +27,7 @@ import {
  getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";
 import { useFocusEffect, useGlobalSearchParams } from "expo-router";
 import { useAtomValue } from "jotai";
 import React, {
@@ -48,14 +48,11 @@ import {
 import { useSharedValue } from "react-native-reanimated";
 import settings from "../(tabs)/(home)/settings";
 import { useSettings } from "@/utils/atoms/settings";
-import { useTranslation } from "react-i18next";
-import { useSafeAreaInsets } from "react-native-safe-area-context";

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

  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
  const [showControls, _setShowControls] = useState(true);
@@ -71,11 +68,9 @@ export default function page() {
  const { getDownloadedItem } = useDownload();
  const revalidateProgressCache = useInvalidatePlaybackProgressCache();

-  const lightHapticFeedback = useHaptic("light");
-
  const setShowControls = useCallback((show: boolean) => {
    _setShowControls(show);
-    lightHapticFeedback();
+    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
  }, []);

  const {
@@ -163,7 +158,7 @@ export default function page() {
      const { mediaSource, sessionId, url } = res;

      if (!sessionId || !mediaSource || !url) {
-        Alert.alert(t("player.error"), t("player.failed_to_get_stream_url"));
+        Alert.alert("Error", "Failed to get stream url");
        return null;
      }

@@ -180,7 +175,7 @@ export default function page() {
  const togglePlay = useCallback(async () => {
    if (!api) return;

-    lightHapticFeedback();
+    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
    if (isPlaying) {
      await videoRef.current?.pause();

@@ -416,8 +411,6 @@ export default function page() {
    }
  }

-  const insets = useSafeAreaInsets();
-
  if (!item || isLoadingItem || isLoadingStreamUrl || !stream)
    return (
      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
@@ -428,7 +421,7 @@ export default function page() {
  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>
+        <Text className="text-white">Error</Text>
      </View>
    );

@@ -442,8 +435,7 @@ 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
@@ -467,8 +459,8 @@ export default function page() {
          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);
          }}
--- a/app/(auth)/player/music-player.tsx
+++ b/app/(auth)/player/music-player.tsx
@@ -0,0 +1,417 @@
+import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
+import { Controls } from "@/components/video-player/controls/Controls";
+import { useOrientation } from "@/hooks/useOrientation";
+import { useOrientationSettings } from "@/hooks/useOrientationSettings";
+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 * as Haptics from "expo-haptics";
+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) => {
+      Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
+      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(() => {
+    videoRef.current?.resume();
+    reportPlaybackStart();
+  }, [videoRef]);
+
+  const pause = useCallback(() => {
+    videoRef.current?.pause();
+  }, [videoRef]);
+
+  const stop = useCallback(() => {
+    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])
+  );
+
+  useOrientation();
+  useOrientationSettings();
+
+  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
@@ -20,7 +20,7 @@ import {
  getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";
 import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import { useAtomValue } from "jotai";
 import React, {
@@ -39,18 +39,15 @@ import Video, {
  VideoRef,
 } from "react-native-video";
 import { SubtitleHelper } from "@/utils/SubtitleHelper";
-import { useTranslation } from "react-i18next";

 const Player = () => {
  const api = useAtomValue(apiAtom);
  const user = useAtomValue(userAtom);
  const [settings] = useSettings();
  const videoRef = useRef<VideoRef | null>(null);
-  const { t } = useTranslation();

  const firstTime = useRef(true);
  const revalidateProgressCache = useInvalidatePlaybackProgressCache();
-  const lightHapticFeedback = useHaptic("light");

  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
  const [showControls, _setShowControls] = useState(true);
@@ -61,7 +58,7 @@ const Player = () => {

  const setShowControls = useCallback((show: boolean) => {
    _setShowControls(show);
-    lightHapticFeedback();
+    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
  }, []);

  const progress = useSharedValue(0);
@@ -170,7 +167,7 @@ const Player = () => {
  const videoSource = useVideoSource(item, api, poster, stream?.url);

  const togglePlay = useCallback(async () => {
-    lightHapticFeedback();
+    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
    if (isPlaying) {
      videoRef.current?.pause();
      await getPlaystateApi(api!).onPlaybackProgress({
@@ -376,7 +373,7 @@ const Player = () => {
  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>
+        <Text className="text-white">Error</Text>
      </View>
    );

@@ -390,6 +387,7 @@ const Player = () => {
          position: "relative",
          flexDirection: "column",
          justifyContent: "center",
+          opacity: showControls ? 0.5 : 1,
        }}
      >
        {videoSource ? (
@@ -416,6 +414,7 @@ const Player = () => {
              playWhenInactive={true}
              allowsExternalPlayback={true}
              playInBackground={true}
+              pictureInPicture={true}
              showNotificationControls={true}
              ignoreSilentSwitch="ignore"
              fullscreen={false}
@@ -442,7 +441,7 @@ const Player = () => {
            />
          </>
        ) : (
-          <Text>{t("player.no_video_source")}</Text>
+          <Text>No video source...</Text>
        )}
      </View>

@@ -533,6 +532,7 @@ export function useVideoSource(
      startPosition,
      headers: getAuthHeaders(api),
      metadata: {
+        artist: item?.AlbumArtist ?? undefined,
        title: item?.Name || "Unknown",
        description: item?.Overview ?? undefined,
        imageUri: poster,
--- a/app/+not-found.tsx
+++ b/app/+not-found.tsx
@@ -1,10 +1,13 @@
-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!" }} />
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -40,9 +40,6 @@ import { useEffect, useRef } from "react";
 import { Appearance, AppState, TouchableOpacity } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
-import { I18nextProvider, useTranslation } from "react-i18next";
-import i18n from "@/i18n";
-import { getLocales } from "expo-localization";
 import "react-native-reanimated";
 import { Toaster } from "sonner-native";

@@ -231,9 +228,7 @@ export default function RootLayout() {

  return (
    <JotaiProvider>
-      <I18nextProvider i18n={i18n}>
      <Layout />
-      </I18nextProvider>
    </JotaiProvider>
  );
 }
@@ -257,8 +252,6 @@ function Layout() {
  useKeepAwake();
  useNotificationObserver();

-  const { i18n } = useTranslation();
-
  useEffect(() => {
    checkAndRequestPermissions();
  }, []);
@@ -272,12 +265,6 @@ function Layout() {
      );
  }, [settings]);

-  useEffect(() => {
-    i18n.changeLanguage(
-      settings?.preferedLanguage ?? getLocales()[0].languageCode ?? "en"
-    );
-  }, [settings?.preferedLanguage, i18n]);
-
  const appState = useRef(AppState.currentState);

  useEffect(() => {
@@ -332,7 +319,7 @@ function Layout() {
                      <BottomSheetModalProvider>
                        <SystemBars style="light" hidden={false} />
                        <ThemeProvider value={DarkTheme}>
-                          <Stack initialRouteName="/home">
+                          <Stack>
                            <Stack.Screen
                              name="(auth)/(tabs)"
                              options={{
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -1,12 +1,11 @@
 import { Button } from "@/components/Button";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
-import JellyfinServerDiscovery from "@/components/JellyfinServerDiscovery";
 import { PreviousServersList } from "@/components/PreviousServersList";
-import { Colors } from "@/constants/Colors";
 import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { Ionicons } from "@expo/vector-icons";
 import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
+import { getSystemApi } from "@jellyfin/sdk/lib/utils/api";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
@@ -21,11 +20,12 @@ import {
 } from "react-native";

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

-  const Login: React.FC = () => {
+const CredentialsSchema = z.object({
+  username: z.string().min(1, "Username is required"),
+});
+
+const Login: React.FC = () => {
  const { setServer, login, removeServer, initiateQuickConnect } =
    useJellyfin();
  const [api] = useAtom(apiAtom);
@@ -39,6 +39,7 @@ const CredentialsSchema = z.object({

  const [serverURL, setServerURL] = useState<string>(_apiUrl);
  const [serverName, setServerName] = useState<string>("");
+  const [error, setError] = useState<string>("");
  const [credentials, setCredentials] = useState<{
    username: string;
    password: string;
@@ -76,10 +77,8 @@ const CredentialsSchema = z.object({
            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,
    });
@@ -96,9 +95,9 @@ const CredentialsSchema = z.object({
      }
    } 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);
@@ -137,8 +136,6 @@ const CredentialsSchema = z.object({
        return url;
      }

-      return undefined;
-    } catch {
      return undefined;
    } finally {
      setLoadingServerCheck(false);
@@ -162,13 +159,14 @@ const CredentialsSchema = z.object({
   *
   */
  const handleConnect = useCallback(async (url: string) => {
-    url = url.trim().replace(/\/$/, "");
+    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;
    }
@@ -180,42 +178,41 @@ const CredentialsSchema = z.object({
    try {
      const code = await initiateQuickConnect();
      if (code) {
-        Alert.alert(t("login.quick_connect"), t("login.enter_code_to_login", {code: code}), [
+        Alert.alert("Quick Connect", `Enter code ${code} to login`, [
          {
-            text: t("login.got_it"),
+            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");
    }
  };

+  if (api?.basePath) {
    return (
-    <SafeAreaView style={{ flex: 1, paddingBottom: 16 }}>
+      <SafeAreaView style={{ flex: 1 }}>
        <KeyboardAvoidingView
          behavior={Platform.OS === "ios" ? "padding" : "height"}
+          style={{ flex: 1, height: "100%" }}
        >
-        {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">
+                  Log in
                  <>
                    {serverName ? (
                      <>
-                        {t("login.login_to_title") + " "}
+                        {" to "}
                        <Text className="text-purple-600">{serverName}</Text>
                      </>
-                    ) : t("login.login_title")}
+                    ) : null}
                  </>
                </Text>
-                  <Text className="text-xs text-neutral-400">
-                    {api.basePath}
-                  </Text>
+                <Text className="text-xs text-neutral-400">{api.basePath}</Text>
                <Input
-                    placeholder={t("login.username_placeholder")}
+                  placeholder="Username"
                  onChangeText={(text) =>
                    setCredentials({ ...credentials, username: text })
                  }
@@ -231,7 +228,8 @@ const CredentialsSchema = z.object({
                />

                <Input
-                    placeholder={t("login.password_placeholder")}
+                  className="mb-2"
+                  placeholder="Password"
                  onChangeText={(text) =>
                    setCredentials({ ...credentials, password: text })
                  }
@@ -244,34 +242,36 @@ const CredentialsSchema = z.object({
                  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>
+              <Text className="text-red-600 mb-2">{error}</Text>
            </View>
-          </>
-        ) : (
-          <>
-            <View className="flex flex-col h-full items-center justify-center w-full">
+
+            <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={{
@@ -284,11 +284,10 @@ const CredentialsSchema = z.object({
            />
            <Text className="text-3xl font-bold">Streamyfin</Text>
            <Text className="text-neutral-500">
-                  {t("server.enter_url_to_jellyfin_server")}
+              Enter the URL to your Jellyfin server
            </Text>
            <Input
-                  aria-label="Server URL"
-                  placeholder={t("server.server_url_placeholder")}
+              placeholder="Server URL"
              onChangeText={setServerURL}
              value={serverURL}
              keyboardType="url"
@@ -297,32 +296,26 @@ const CredentialsSchema = z.object({
              textContentType="URL"
              maxLength={500}
            />
-                <Button
-                  loading={loadingServerCheck}
-                  disabled={loadingServerCheck}
-                  onPress={async () => await handleConnect(serverURL)}
-                  className="w-full grow"
-                >
-                  {t("server.connect_button")}
-                </Button>
-                <JellyfinServerDiscovery
-                  onServerSelect={(server) => {
-                    setServerURL(server.address);
-                    if (server.serverName) {
-                      setServerName(server.serverName);
-                    }
-                    handleConnect(server.address);
-                  }}
-                />
+            <Text className="text-xs text-neutral-500 ml-4">
+              Make sure to include http or https
+            </Text>
            <PreviousServersList
              onServerSelect={(s) => {
                handleConnect(s.address);
              }}
            />
          </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/jellyseerr-logo.svg
+++ b/assets/icons/jellyseerr-logo.svg
--- a/assets/images/jellyseerr.PNG
+++ b/assets/images/jellyseerr.PNG
--- a/augmentations/api.ts
+++ b/augmentations/api.ts
@@ -1,46 +0,0 @@
-import { Api, AUTHORIZATION_HEADER } from "@jellyfin/sdk";
-import { AxiosRequestConfig, AxiosResponse } from "axios";
-import { StreamyfinPluginConfig } from "@/utils/atoms/settings";
-
-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>>;
-    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}`, {
-    ...(config || {}),
-    data,
-    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
@@ -13,10 +13,5 @@ MMKV.prototype.get = function <T> (key: string): T | undefined {
 }

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

-Number.prototype.bytesToReadable = function (decimals: number = 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(0)} GB`;

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

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

 Number.prototype.secondsToMilliseconds = function () {
--- a/bun.lockb
+++ b/bun.lockb
--- a/components/AudioTrackSelector.tsx
+++ b/components/AudioTrackSelector.tsx
@@ -3,7 +3,6 @@ import { useMemo } from "react";
 import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
-import { useTranslation } from "react-i18next";

 interface Props extends React.ComponentProps<typeof View> {
  source?: MediaSourceInfo;
@@ -27,8 +26,6 @@ export const AudioTrackSelector: React.FC<Props> = ({
    [audioStreams, selected]
  );

-  const { t } = useTranslation();
-
  return (
    <View
      className="flex shrink"
@@ -39,7 +36,7 @@ export const AudioTrackSelector: React.FC<Props> = ({
      <DropdownMenu.Root>
        <DropdownMenu.Trigger>
          <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">{t("item_card.audio")}</Text>
+            <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">
              <Text className="" numberOfLines={1}>
                {selectedAudioSteam?.DisplayTitle}
--- a/components/BitrateSelector.tsx
+++ b/components/BitrateSelector.tsx
@@ -2,7 +2,6 @@ import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";

 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,
@@ -64,8 +59,6 @@ export const BitrateSelector: React.FC<Props> = ({
    );
  }, []);

-  const { t } = useTranslation();
-
  return (
    <View
      className="flex shrink"
@@ -77,7 +70,7 @@ export const BitrateSelector: React.FC<Props> = ({
      <DropdownMenu.Root>
        <DropdownMenu.Trigger>
          <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">{t("item_card.quality")}</Text>
+            <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">
              <Text style={{}} className="" numberOfLines={1}>
                {BITRATES.find((b) => b.value === selected?.value)?.key}
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -1,4 +1,4 @@
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";
 import React, { PropsWithChildren, ReactNode, useMemo } from "react";
 import { Text, TouchableOpacity, View } from "react-native";
 import { Loader } from "./Loader";
@@ -37,14 +37,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={`
@@ -56,16 +54,14 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
      onPress={() => {
        if (!loading && !disabled && onPress) {
          onPress();
-          lightHapticFeedback();
+          Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
        }
      }}
      disabled={disabled || loading}
      {...props}
    >
      {loading ? (
-        <View className="p-0.5">
        <Loader />
-        </View>
      ) : (
        <View
          className={`
--- a/components/ContinueWatchingPoster.tsx
+++ b/components/ContinueWatchingPoster.tsx
@@ -49,11 +49,6 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
      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"]}`;
-    else
-      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
  }, [item]);

  const progress = useMemo(() => {
--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -2,7 +2,7 @@ import { useRemuxHlsToMp4 } from "@/hooks/useRemuxHlsToMp4";
 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 { useSettings } from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { saveDownloadItemInfoToDiskTmp } from "@/utils/optimize-server";
@@ -32,7 +32,6 @@ import { MediaSourceSelector } from "./MediaSourceSelector";
 import ProgressCircle from "./ProgressCircle";
 import { RoundButton } from "./RoundButton";
 import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
-import { t } from "i18next";

 interface DownloadProps extends ViewProps {
  items: BaseItemDto[];
@@ -56,7 +55,6 @@ export const DownloadItems: React.FC<DownloadProps> = ({
  const [user] = useAtom(userAtom);
  const [queue, setQueue] = useAtom(queueAtom);
  const [settings] = useSettings();
-
  const { processes, startBackgroundDownload, downloadedFiles } = useDownload();
  const { startRemuxing } = useRemuxHlsToMp4();

@@ -76,7 +74,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
    [user]
  );
  const usingOptimizedServer = useMemo(
-    () => settings?.downloadMethod === DownloadMethod.Optimized,
+    () => settings?.downloadMethod === "optimized",
    [settings]
  );

@@ -162,7 +160,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
        );
      }
    } else {
-      toast.error(t("home.downloads.toasts.you_are_not_allowed_to_download_files"));
+      toast.error("You are not allowed to download files.");
    }
  }, [
    queue,
@@ -214,8 +212,8 @@ export const DownloadItems: React.FC<DownloadProps> = ({

        if (!res) {
          Alert.alert(
-            t("home.downloads.something_went_wrong"),
-            t("home.downloads.could_not_get_stream_url_from_jellyfin")
+            "Something went wrong",
+            "Could not get stream url from Jellyfin"
          );
          continue;
        }
@@ -332,7 +330,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
                {title}
              </Text>
              <Text className="text-neutral-300">
-                {subtitle || t("item_card.download.download_x_item", {item_count: itemsNotDownloaded.length})}
+                {subtitle || `Download ${itemsNotDownloaded.length} items`}
              </Text>
            </View>
            <View className="flex flex-col space-y-2 w-full items-start">
@@ -370,13 +368,13 @@ export const DownloadItems: React.FC<DownloadProps> = ({
              onPress={acceptDownloadOptions}
              color="purple"
            >
-              {t("item_card.download.download_button")}
+              Download
            </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")}
+                  ? "Using optimized server"
+                  : "Using default method"}
              </Text>
            </View>
          </View>
@@ -393,9 +391,7 @@ export const DownloadSingleItem: React.FC<{
  return (
    <DownloadItems
      size={size}
-      title={item.Type == "Episode"
-        ? t("item_card.download.download_episode")
-        : t("item_card.download.download_movie")}
+      title="Download Episode"
      subtitle={item.Name!}
      items={[item]}
      MissingDownloadIconComponent={() => (
--- a/components/GenreTags.tsx
+++ b/components/GenreTags.tsx
@@ -1,6 +1,6 @@
 // GenreTags.tsx
 import React from "react";
-import {StyleProp, TextStyle, View, ViewProps} from "react-native";
+import {View, ViewProps} from "react-native";
 import { Text } from "./common/Text";

 interface TagProps {
@@ -8,15 +8,14 @@ interface TagProps {
  textClass?: ViewProps["className"]
 }

-export const Tag: React.FC<{ text: string, textClass?: ViewProps["className"], textStyle?: StyleProp<TextStyle>} & ViewProps> = ({
+export const Tag: React.FC<{ text: string, textClass?: ViewProps["className"]} & ViewProps> = ({
  text,
  textClass,
-  textStyle,
  ...props
 }) => {
  return (
    <View className="bg-neutral-800 rounded-full px-2 py-1" {...props}>
-      <Text className={textClass} style={textStyle}>{text}</Text>
+      <Text className={textClass}>{text}</Text>
    </View>
  );
 };
--- a/components/ItemTechnicalDetails.tsx
+++ b/components/ItemTechnicalDetails.tsx
@@ -15,7 +15,6 @@ import {
  BottomSheetScrollView,
 } from "@gorhom/bottom-sheet";
 import { Button } from "./Button";
-import { useTranslation } from "react-i18next";

 interface Props {
  source?: MediaSourceInfo;
@@ -23,16 +22,15 @@ interface Props {

 export const ItemTechnicalDetails: React.FC<Props> = ({ source, ...props }) => {
  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-  const { t } = useTranslation();

  return (
    <View className="px-4 mt-2 mb-4">
-      <Text className="text-lg font-bold mb-4">{t("item_card.video")}</Text>
+      <Text className="text-lg font-bold mb-4">Video</Text>
      <TouchableOpacity onPress={() => bottomSheetModalRef.current?.present()}>
        <View className="flex flex-row space-x-2">
          <VideoStreamInfo source={source} />
        </View>
-        <Text className="text-purple-600">{t("item_card.more_details")}</Text>
+        <Text className="text-purple-600">More details</Text>
      </TouchableOpacity>
      <BottomSheetModal
        ref={bottomSheetModalRef}
@@ -54,14 +52,14 @@ export const ItemTechnicalDetails: React.FC<Props> = ({ source, ...props }) => {
        <BottomSheetScrollView>
          <View className="flex flex-col space-y-2 p-4 mb-4">
            <View className="">
-              <Text className="text-lg font-bold mb-4">{t("item_card.video")}</Text>
+              <Text className="text-lg font-bold mb-4">Video</Text>
              <View className="flex flex-row space-x-2">
                <VideoStreamInfo source={source} />
              </View>
            </View>

            <View className="">
-              <Text className="text-lg font-bold mb-2">{t("item_card.audio")}</Text>
+              <Text className="text-lg font-bold mb-2">Audio</Text>
              <AudioStreamInfo
                audioStreams={
                  source?.MediaStreams?.filter(
@@ -72,7 +70,7 @@ export const ItemTechnicalDetails: React.FC<Props> = ({ source, ...props }) => {
            </View>

            <View className="">
-              <Text className="text-lg font-bold mb-2">{t("item_card.subtitles")}</Text>
+              <Text className="text-lg font-bold mb-2">Subtitles</Text>
              <SubtitleStreamInfo
                subtitleStreams={
                  source?.MediaStreams?.filter(
--- a/components/JellyfinServerDiscovery.tsx
+++ b/components/JellyfinServerDiscovery.tsx
@@ -1,46 +0,0 @@
-import React from "react";
-import { View, Text, TouchableOpacity } from "react-native";
-import { useJellyfinDiscovery } from "@/hooks/useJellyfinDiscovery";
-import { Button } from "./Button";
-import { ListGroup } from "./list/ListGroup";
-import { ListItem } from "./list/ListItem";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  onServerSelect?: (server: { address: string; serverName?: string }) => void;
-}
-
-const JellyfinServerDiscovery: React.FC<Props> = ({ onServerSelect }) => {
-  const { servers, isSearching, startDiscovery } = useJellyfinDiscovery();
-  const { t } = useTranslation();
-
-  return (
-    <View className="mt-2">
-      <Button onPress={startDiscovery} color="black">
-        <Text className="text-white text-center">
-          {isSearching ? t("server.searching") : t("server.search_for_local_servers")}
-        </Text>
-      </Button>
-
-      {servers.length ? (
-        <ListGroup title={t("server.servers")} className="mt-4">
-          {servers.map((server) => (
-            <ListItem
-              key={server.address}
-              onPress={() =>
-                onServerSelect?.({
-                  address: server.address,
-                  serverName: server.serverName,
-                })
-              }
-              title={server.address}
-              showArrow
-            />
-          ))}
-        </ListGroup>
-      ) : null}
-    </View>
-  );
-};
-
-export default JellyfinServerDiscovery;
--- a/components/MediaSourceSelector.tsx
+++ b/components/MediaSourceSelector.tsx
@@ -1,12 +1,13 @@
+import { tc } from "@/utils/textTools";
 import {
  BaseItemDto,
  MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
 import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
-import { useTranslation } from "react-i18next";
+import { convertBitsToMegabitsOrGigabits } from "@/utils/bToMb";

 interface Props extends React.ComponentProps<typeof View> {
  item: BaseItemDto;
@@ -28,29 +29,6 @@ export const MediaSourceSelector: React.FC<Props> = ({
    [item, selected]
  );

-  const { t } = useTranslation();
-
-  const commonPrefix = useMemo(() => {
-    const mediaSources = item.MediaSources || [];
-    if (!mediaSources.length) return "";
-
-    let commonPrefix = "";
-    for (let i = 0; i < mediaSources[0].Name!.length; i++) {
-      const char = mediaSources[0].Name![i];
-      if (mediaSources.every((source) => source.Name![i] === char)) {
-        commonPrefix += char;
-      } else {
-        commonPrefix = commonPrefix.slice(0, -1);
-        break;
-      }
-    }
-    return commonPrefix;
-  }, [item.MediaSources]);
-
-  const name = (name?: string | null) => {
-    return name?.replace(commonPrefix, "").toLowerCase();
-  };
-
  return (
    <View
      className="flex shrink"
@@ -61,7 +39,7 @@ export const MediaSourceSelector: React.FC<Props> = ({
      <DropdownMenu.Root>
        <DropdownMenu.Trigger>
          <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">{t("item_card.video")}</Text>
+            <Text className="opacity-50 mb-1 text-xs">Video</Text>
            <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center">
              <Text numberOfLines={1}>{selectedName}</Text>
            </TouchableOpacity>
@@ -85,7 +63,9 @@ export const MediaSourceSelector: React.FC<Props> = ({
              }}
            >
              <DropdownMenu.ItemTitle>
-                {`${name(source.Name)}`}
+                {`${name(source.Name)} - ${convertBitsToMegabitsOrGigabits(
+                  source.Size
+                )}`}
              </DropdownMenu.ItemTitle>
            </DropdownMenu.Item>
          ))}
@@ -94,3 +74,9 @@ export const MediaSourceSelector: React.FC<Props> = ({
    </View>
  );
 };
+
+const name = (name?: string | null) => {
+  if (name && name.length > 40)
+    return name.substring(0, 20) + " [...] " + name.substring(name.length - 20);
+  return name;
+};
--- a/components/MoreMoviesWithActor.tsx
+++ b/components/MoreMoviesWithActor.tsx
@@ -11,7 +11,6 @@ import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useQuery } from "@tanstack/react-query";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { useTranslation } from "react-i18next";

 interface Props extends ViewProps {
  actorId: string;
@@ -25,7 +24,6 @@ export const MoreMoviesWithActor: React.FC<Props> = ({
 }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const { t } = useTranslation();

  const { data: actor } = useQuery({
    queryKey: ["actor", actorId],
@@ -78,7 +76,7 @@ export const MoreMoviesWithActor: React.FC<Props> = ({
  return (
    <View {...props}>
      <Text className="text-lg font-bold mb-2 px-4">
-        {t("item_card.more_with", {name: actor?.Name})}
+        More with {actor?.Name}
      </Text>
      <HorizontalScroll
        data={items}
--- a/components/OverviewText.tsx
+++ b/components/OverviewText.tsx
@@ -2,7 +2,6 @@ import { TouchableOpacity, View, ViewProps } from "react-native";
 import { Text } from "@/components/common/Text";
 import { tc } from "@/utils/textTools";
 import { useState } from "react";
-import { useTranslation } from "react-i18next";

 interface Props extends ViewProps {
  text?: string | null;
@@ -15,13 +14,12 @@ export const OverviewText: React.FC<Props> = ({
  ...props
 }) => {
  const [limit, setLimit] = useState(characterLimit);
-  const { t } = useTranslation();

  if (!text) return null;

  return (
    <View className="flex flex-col" {...props}>
-      <Text className="text-lg font-bold mb-2">{t("item_card.overview")}</Text>
+      <Text className="text-lg font-bold mb-2">Overview</Text>
      <TouchableOpacity
        onPress={() =>
          setLimit((prev) =>
@@ -33,7 +31,7 @@ export const OverviewText: React.FC<Props> = ({
          <Text>{tc(text, limit)}</Text>
          {text.length > characterLimit && (
            <Text className="text-purple-600 mt-1">
-              {limit === characterLimit ? t("item_card.show_more") : t("item_card.show_less")}
+              {limit === characterLimit ? "Show more" : "Show less"}
            </Text>
          )}
        </View>
--- a/components/ParallaxPage.tsx
+++ b/components/ParallaxPage.tsx
@@ -1,6 +1,6 @@
 import { LinearGradient } from "expo-linear-gradient";
 import { type PropsWithChildren, type ReactElement } from "react";
-import {NativeScrollEvent, NativeSyntheticEvent, View, ViewProps} from "react-native";
+import { View, ViewProps } from "react-native";
 import Animated, {
  interpolate,
  useAnimatedRef,
@@ -13,7 +13,6 @@ interface Props extends ViewProps {
  logo?: ReactElement;
  episodePoster?: ReactElement;
  headerHeight?: number;
-  onEndReached?: (() => void) | null | undefined;
 }

 export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
@@ -22,7 +21,6 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
  episodePoster,
  headerHeight = 400,
  logo,
-  onEndReached,
  ...props
 }: Props) => {
  const scrollRef = useAnimatedRef<Animated.ScrollView>();
@@ -49,11 +47,6 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
    };
  });

-
-  function isCloseToBottom({layoutMeasurement, contentOffset, contentSize}: NativeScrollEvent) {
-    return layoutMeasurement.height + contentOffset.y >= contentSize.height - 20;
-  }
-
  return (
    <View className="flex-1" {...props}>
      <Animated.ScrollView
@@ -62,10 +55,6 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
        }}
        ref={scrollRef}
        scrollEventThrottle={16}
-        onScroll={e => {
-          if (isCloseToBottom(e.nativeEvent))
-            onEndReached?.()
-        }}
      >
        {logo && (
          <View
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -32,8 +32,7 @@ import Animated, {
 import { Button } from "./Button";
 import { SelectedOptions } from "./ItemContent";
 import { chromecastProfile } from "@/utils/profiles/chromecast";
-import { useTranslation } from "react-i18next";
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";

 interface Props extends React.ComponentProps<typeof Button> {
  item: BaseItemDto;
@@ -51,7 +50,6 @@ export const PlayButton: React.FC<Props> = ({
  const { showActionSheetWithOptions } = useActionSheet();
  const client = useRemoteMediaClient();
  const mediaStatus = useMediaStatus();
-  const { t } = useTranslation();

  const [colorAtom] = useAtom(itemThemeColorAtom);
  const api = useAtomValue(apiAtom);
@@ -66,7 +64,6 @@ export const PlayButton: React.FC<Props> = ({
  const widthProgress = useSharedValue(0);
  const colorChangeProgress = useSharedValue(0);
  const [settings] = useSettings();
-  const lightHapticFeedback = useHaptic("light");

  const goToPlayer = useCallback(
    (q: string, bitrateValue: number | undefined) => {
@@ -82,7 +79,7 @@ export const PlayButton: React.FC<Props> = ({
  const onPress = useCallback(async () => {
    if (!item) return;

-    lightHapticFeedback();
+    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);

    const queryParams = new URLSearchParams({
      itemId: item.Id!,
@@ -134,8 +131,8 @@ export const PlayButton: React.FC<Props> = ({
                if (!data?.url) {
                  console.warn("No URL returned from getStreamUrl", data);
                  Alert.alert(
-                    t("player.client_error"),
-                    t("player.could_not_create_stream_for_chromecast")
+                    "Client error",
+                    "Could not create stream for Chromecast"
                  );
                  return;
                }
--- a/components/PreviousServersList.tsx
+++ b/components/PreviousServersList.tsx
@@ -3,7 +3,6 @@ import { View } from "react-native";
 import { useMMKVString } from "react-native-mmkv";
 import { ListGroup } from "./list/ListGroup";
 import { ListItem } from "./list/ListItem";
-import { useTranslation } from "react-i18next";

 interface Server {
  address: string;
@@ -23,13 +22,11 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
    return JSON.parse(_previousServers || "[]") as Server[];
  }, [_previousServers]);

-  const { t } = useTranslation();
-
  if (!previousServers.length) return null;

  return (
    <View>
-      <ListGroup title={t("server.previous_servers")} className="mt-4">
+      <ListGroup title="previous servers" className="mt-4">
        {previousServers.map((s) => (
          <ListItem
            key={s.address}
@@ -42,7 +39,7 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
          onPress={() => {
            setPreviousServers("[]");
          }}
-          title={t("server.clear_button")}
+          title={"Clear"}
          textColor="red"
        />
      </ListGroup>
--- a/components/RoundButton.tsx
+++ b/components/RoundButton.tsx
@@ -6,7 +6,7 @@ import {
  TouchableOpacity,
  TouchableOpacityProps,
 } from "react-native";
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";

 interface Props extends TouchableOpacityProps {
  onPress?: () => void;
@@ -29,11 +29,10 @@ export const RoundButton: React.FC<PropsWithChildren<Props>> = ({
 }) => {
  const buttonSize = size === "large" ? "h-10 w-10" : "h-9 w-9";
  const fillColorClass = fillColor === "primary" ? "bg-purple-600" : "";
-  const lightHapticFeedback = useHaptic("light");

  const handlePress = () => {
    if (hapticFeedback) {
-      lightHapticFeedback();
+      Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
    }
    onPress?.();
  };
--- a/components/SimilarItems.tsx
+++ b/components/SimilarItems.tsx
@@ -12,7 +12,6 @@ import { ItemCardText } from "./ItemCardText";
 import { Loader } from "./Loader";
 import { HorizontalScroll } from "./common/HorrizontalScroll";
 import { TouchableItemRouter } from "./common/TouchableItemRouter";
-import { useTranslation } from "react-i18next";

 interface SimilarItemsProps extends ViewProps {
  itemId?: string | null;
@@ -24,7 +23,6 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({
 }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const { t } = useTranslation();

  const { data: similarItems, isLoading } = useQuery<BaseItemDto[]>({
    queryKey: ["similarItems", itemId],
@@ -49,12 +47,12 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({

  return (
    <View {...props}>
-      <Text className="px-4 text-lg font-bold mb-2">{t("item_card.similar_items")}</Text>
+      <Text className="px-4 text-lg font-bold mb-2">Similar items</Text>
      <HorizontalScroll
        data={movies}
        loading={isLoading}
        height={247}
-        noItemsText={t("item_card.no_similar_items_found")}
+        noItemsText="No similar items found"
        renderItem={(item: BaseItemDto, idx: number) => (
          <TouchableItemRouter
            key={idx}
--- a/components/SubtitleTrackSelector.tsx
+++ b/components/SubtitleTrackSelector.tsx
@@ -5,7 +5,6 @@ import { Platform, TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { SubtitleHelper } from "@/utils/SubtitleHelper";
-import { useTranslation } from "react-i18next";

 interface Props extends React.ComponentProps<typeof View> {
  source?: MediaSourceInfo;
@@ -38,8 +37,6 @@ export const SubtitleTrackSelector: React.FC<Props> = ({

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

-  const { t } = useTranslation();
-
  return (
    <View
      className="flex col shrink justify-start place-self-start items-start"
@@ -51,12 +48,12 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
      <DropdownMenu.Root>
        <DropdownMenu.Trigger>
          <View className="flex flex-col " {...props}>
-            <Text className="opacity-50 mb-1 text-xs">{t("item_card.subtitles")}</Text>
+            <Text className="opacity-50 mb-1 text-xs">Subtitle</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=" ">
                {selectedSubtitleSteam
                  ? tc(selectedSubtitleSteam?.DisplayTitle, 7)
-                  : t("item_card.none")}
+                  : "None"}
              </Text>
            </TouchableOpacity>
          </View>
--- a/components/tests/ThemedText-test.tsx
+++ b/components/tests/ThemedText-test.tsx
@@ -1,10 +0,0 @@
-import * as React from 'react';
-import renderer from 'react-test-renderer';
-
-import { ThemedText } from '../ThemedText';
-
-it(`renders correctly`, () => {
-  const tree = renderer.create(<ThemedText>Snapshot test!</ThemedText>).toJSON();
-
-  expect(tree).toMatchSnapshot();
-});
--- a/components/tests/snapshots/ThemedText-test.tsx.snap
+++ b/components/tests/snapshots/ThemedText-test.tsx.snap
@@ -1,24 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders correctly 1`] = `
-<Text
-  style={
-    [
-      {
-        "color": "#11181C",
-      },
-      {
-        "fontSize": 16,
-        "lineHeight": 24,
-      },
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-    ]
-  }
->
-  Snapshot test!
-</Text>
-`;
--- a/components/common/Dropdown.tsx
+++ b/components/common/Dropdown.tsx
@@ -1,108 +0,0 @@
-import * as DropdownMenu from "zeego/dropdown-menu";
-import {TouchableOpacity, View, ViewProps} from "react-native";
-import {Text} from "@/components/common/Text";
-import React, {PropsWithChildren, ReactNode, useEffect, useState} from "react";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-
-interface Props<T> {
-  data: T[]
-  disabled?: boolean
-  placeholderText?: string,
-  keyExtractor: (item: T) => string
-  titleExtractor: (item: T) => string | undefined
-  title: string | ReactNode,
-  label: string,
-  onSelected: (...item: T[]) => void
-  multi?: boolean
-}
-
-const Dropdown =  <T extends unknown>({
-  data,
-  disabled,
-  placeholderText,
-  keyExtractor,
-  titleExtractor,
-  title,
-  label,
-  onSelected,
-  multi = false,
-  ...props
-}: PropsWithChildren<Props<T> & ViewProps>) => {
-  const [selected, setSelected] = useState<T[]>();
-
-  useEffect(() => {
-    if (selected !== undefined) {
-      onSelected(...selected)
-    }
-  }, [selected]);
-
-  return (
-    <DisabledSetting
-      disabled={disabled === true}
-      showText={false}
-      {...props}
-    >
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          {typeof title === 'string' ? (
-            <View className="flex flex-col">
-              <Text className="opacity-50 mb-1 text-xs">
-                {title}
-              </Text>
-              <TouchableOpacity
-                className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
-                <Text style={{}} className="" numberOfLines={1}>
-                  {selected?.length !== undefined ? selected.map(titleExtractor).join(",") : placeholderText}
-                </Text>
-              </TouchableOpacity>
-            </View>
-          ) : (
-            <>
-              {title}
-            </>
-          )}
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={false}
-          side="bottom"
-          align="center"
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={0}
-          sideOffset={0}
-        >
-          <DropdownMenu.Label>{label}</DropdownMenu.Label>
-          {data.map((item, idx) => (
-            multi ? (
-                <DropdownMenu.CheckboxItem
-                  value={selected?.some(s => keyExtractor(s) == keyExtractor(item)) ? 'on' : 'off'}
-                  key={keyExtractor(item)}
-                  onValueChange={(next, previous) =>
-                    setSelected((p) => {
-                      const prev = p || []
-                      if (next == 'on') {
-                        return [...prev, item]
-                      }
-                      return [...prev.filter(p => keyExtractor(p) !== keyExtractor(item))]
-                    })
-                  }
-                >
-                  <DropdownMenu.ItemTitle>{titleExtractor(item)}</DropdownMenu.ItemTitle>
-                </DropdownMenu.CheckboxItem>
-              )
-              : (
-                <DropdownMenu.Item
-                  key={keyExtractor(item)}
-                  onSelect={() => setSelected([item])}
-                >
-                  <DropdownMenu.ItemTitle>{titleExtractor(item)}</DropdownMenu.ItemTitle>
-                </DropdownMenu.Item>
-              )
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </DisabledSetting>
-  )
-};
-
-export default Dropdown;
--- a/components/common/InfiniteHorrizontalScroll.tsx
+++ b/components/common/InfiniteHorrizontalScroll.tsx
@@ -15,7 +15,6 @@ import Animated, {
 } from "react-native-reanimated";
 import { Loader } from "../Loader";
 import { Text } from "./Text";
-import { t } from "i18next";

 interface HorizontalScrollProps
  extends Omit<FlashListProps<BaseItemDto>, "renderItem" | "data" | "style"> {
@@ -137,7 +136,7 @@ export function InfiniteHorizontalScroll({
        showsHorizontalScrollIndicator={false}
        ListEmptyComponent={
          <View className="flex-1 justify-center items-center">
-            <Text className="text-center text-gray-500">{t("item_card.no_data_available")}</Text>
+            <Text className="text-center text-gray-500">No data available</Text>
          </View>
        }
        {...props}
--- a/components/common/Input.tsx
+++ b/components/common/Input.tsx
@@ -7,7 +7,7 @@ export function Input(props: TextInputProps) {
  return (
    <TextInput
      ref={inputRef}
-      className="p-4  rounded-xl bg-neutral-900"
+      className="p-4 border border-neutral-800 rounded-xl bg-neutral-900"
      allowFontScaling={false}
      style={[{ color: "white" }, style]}
      placeholderTextColor={"#9CA3AF"}
--- a/components/common/JellyseerrItemRouter.tsx
+++ b/components/common/JellyseerrItemRouter.tsx
@@ -1,11 +1,12 @@
-import {useRouter, useSegments} from "expo-router";
-import React, {PropsWithChildren, useCallback, useMemo} from "react";
-import {TouchableOpacity, TouchableOpacityProps} from "react-native";
-import * as ContextMenu from "zeego/context-menu";
-import {MovieResult, TvResult} from "@/utils/jellyseerr/server/models/Search";
-import {useJellyseerr} from "@/hooks/useJellyseerr";
-import {hasPermission, Permission} from "@/utils/jellyseerr/server/lib/permissions";
-import {MediaType} from "@/utils/jellyseerr/server/constants/media";
+import { useJellyseerr } from "@/hooks/useJellyseerr";
+import {
+  hasPermission,
+  Permission,
+} from "@/utils/jellyseerr/server/lib/permissions";
+import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
+import { useRouter, useSegments } from "expo-router";
+import React, { PropsWithChildren, useCallback, useMemo } from "react";
+import { TouchableOpacity, TouchableOpacityProps } from "react-native";

 interface Props extends TouchableOpacityProps {
  result: MovieResult | TvResult;
@@ -26,78 +27,49 @@ export const TouchableJellyseerrRouter: React.FC<PropsWithChildren<Props>> = ({
 }) => {
  const router = useRouter();
  const segments = useSegments();
-  const {jellyseerrApi, jellyseerrUser, requestMedia} = useJellyseerr()
+  const { jellyseerrApi, jellyseerrUser, requestMedia } = useJellyseerr();

  const from = segments[2];

  const autoApprove = useMemo(() => {
-    return jellyseerrUser && hasPermission(
-      Permission.AUTO_APPROVE,
-      jellyseerrUser.permissions,
-      {type: 'or'}
-    )
-  }, [jellyseerrApi, jellyseerrUser])
+    return (
+      jellyseerrUser &&
+      hasPermission(Permission.AUTO_APPROVE, jellyseerrUser.permissions, {
+        type: "or",
+      })
+    );
+  }, [jellyseerrApi, jellyseerrUser]);

-  const request = useCallback(() =>
+  const request = useCallback(
+    () =>
      requestMedia(mediaTitle, {
        mediaId: result.id,
-        mediaType: result.mediaType
-      }
-    ),
+        mediaType: result.mediaType,
+      }),
    [jellyseerrApi, result]
-  )
+  );

  if (from === "(home)" || from === "(search)" || from === "(libraries)")
    return (
      <>
-        <ContextMenu.Root>
-          <ContextMenu.Trigger>
        <TouchableOpacity
          onPress={() => {
-                // @ts-ignore
-                router.push({pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`, params: {...result, mediaTitle, releaseYear, canRequest, posterSrc}});
+            router.push({
+              pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
+              params: {
+                ...result,
+                mediaTitle,
+                releaseYear,
+                // @ts-expect-error
+                canRequest,
+                posterSrc,
+              },
+            });
          }}
          {...props}
        >
          {children}
        </TouchableOpacity>
-          </ContextMenu.Trigger>
-          <ContextMenu.Content
-            avoidCollisions
-            alignOffset={0}
-            collisionPadding={0}
-            loop={false}
-            key={"content"}
-          >
-            <ContextMenu.Label key="label-1">Actions</ContextMenu.Label>
-            {canRequest && result.mediaType === MediaType.MOVIE && (
-                <ContextMenu.Item
-                  key="item-1"
-                  onSelect={() => {
-                    if (autoApprove) {
-                      request()
-                    }
-                  }}
-                  shouldDismissMenuOnSelect
-                >
-                  <ContextMenu.ItemTitle key="item-1-title">Request</ContextMenu.ItemTitle>
-                  <ContextMenu.ItemIcon
-                    ios={{
-                      name: "arrow.down.to.line",
-                      pointSize: 18,
-                      weight: "semibold",
-                      scale: "medium",
-                      hierarchicalColor: {
-                        dark: "purple",
-                        light: "purple",
-                      },
-                    }}
-                    androidIconName="download"
-                  />
-                </ContextMenu.Item>
-              )}
-          </ContextMenu.Content>
-        </ContextMenu.Root>
      </>
    );
 };
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -4,11 +4,8 @@ import {
  BaseItemPerson,
 } from "@jellyfin/sdk/lib/generated-client/models";
 import { useRouter, useSegments } from "expo-router";
-import { PropsWithChildren, useCallback } from "react";
+import { PropsWithChildren } from "react";
 import { TouchableOpacity, TouchableOpacityProps } from "react-native";
-import * as ContextMenu from "zeego/context-menu";
-import { useActionSheet } from "@expo/react-native-action-sheet";
-import * as Haptics from "expo-haptics";

 interface Props extends TouchableOpacityProps {
  item: BaseItemDto;
@@ -26,6 +23,18 @@ export const itemRouter = (
    return `/(auth)/(tabs)/${from}/series/${item.Id}`;
  }

+  if (item.Type === "MusicAlbum") {
+    return `/(auth)/(tabs)/${from}/albums/${item.Id}`;
+  }
+
+  if (item.Type === "Audio") {
+    return `/(auth)/(tabs)/${from}/albums/${item.AlbumId}`;
+  }
+
+  if (item.Type === "MusicArtist") {
+    return `/(auth)/(tabs)/${from}/artists/${item.Id}`;
+  }
+
  if (item.Type === "Person" || item.Type === "Actor") {
    return `/(auth)/(tabs)/${from}/actors/${item.Id}`;
  }
@@ -56,33 +65,10 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
 }) => {
  const router = useRouter();
  const segments = useSegments();
-  const { showActionSheetWithOptions } = useActionSheet();
-  const markAsPlayedStatus = useMarkAsPlayed(item);

  const from = segments[2];

-  const showActionSheet = useCallback(() => {
-    if (!(item.Type === "Movie" || item.Type === "Episode")) return;
-
-    const options = ["Mark as Played", "Mark as Not Played", "Cancel"];
-    const cancelButtonIndex = 2;
-
-    showActionSheetWithOptions(
-      {
-        options,
-        cancelButtonIndex,
-      },
-      async (selectedIndex) => {
-        if (selectedIndex === 0) {
-          await markAsPlayedStatus(true);
-          Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
-        } else if (selectedIndex === 1) {
-          await markAsPlayedStatus(false);
-          Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
-        }
-      }
-    );
-  }, [showActionSheetWithOptions, markAsPlayedStatus]);
+  const markAsPlayedStatus = useMarkAsPlayed(item);

  if (
    from === "(home)" ||
@@ -92,10 +78,9 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
  )
    return (
      <TouchableOpacity
-        onLongPress={showActionSheet}
        onPress={() => {
          const url = itemRouter(item, from);
-          // @ts-expect-error
+          // @ts-ignore
          router.push(url);
        }}
        {...props}
--- a/components/downloads/ActiveDownloads.tsx
+++ b/components/downloads/ActiveDownloads.tsx
@@ -1,6 +1,7 @@
 import { Text } from "@/components/common/Text";
 import { useDownload } from "@/providers/DownloadProvider";
-import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
 import { JobStatus } from "@/utils/optimize-server";
 import { formatTimeString } from "@/utils/time";
 import { Ionicons } from "@expo/vector-icons";
@@ -8,6 +9,7 @@ import { checkForExistingDownloads } from "@kesha-antonov/react-native-backgroun
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useRouter } from "expo-router";
 import { FFmpegKit } from "ffmpeg-kit-react-native";
+import { useAtom } from "jotai";
 import {
  ActivityIndicator,
  TouchableOpacity,
@@ -20,7 +22,6 @@ import { Button } from "../Button";
 import { Image } from "expo-image";
 import { useMemo } from "react";
 import { storage } from "@/utils/mmkv";
-import { t } from "i18next";

 interface Props extends ViewProps {}

@@ -29,14 +30,14 @@ export const ActiveDownloads: React.FC<Props> = ({ ...props }) => {
  if (processes?.length === 0)
    return (
      <View {...props} className="bg-neutral-900 p-4 rounded-2xl">
-        <Text className="text-lg font-bold">{t("home.downloads.active_download")}</Text>
-        <Text className="opacity-50">{t("home.downloads.no_active_downloads")}</Text>
+        <Text className="text-lg font-bold">Active download</Text>
+        <Text className="opacity-50">No active downloads</Text>
      </View>
    );

  return (
    <View {...props} className="bg-neutral-900 p-4 rounded-2xl">
-      <Text className="text-lg font-bold mb-2">{t("home.downloads.active_downloads")}</Text>
+      <Text className="text-lg font-bold mb-2">Active downloads</Text>
      <View className="space-y-2">
        {processes?.map((p) => (
          <DownloadCard key={p.item.Id} process={p} />
@@ -61,7 +62,7 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
    mutationFn: async (id: string) => {
      if (!process) throw new Error("No active download");

-      if (settings?.downloadMethod === DownloadMethod.Optimized) {
+      if (settings?.downloadMethod === "optimized") {
        try {
          const tasks = await checkForExistingDownloads();
          for (const task of tasks) {
@@ -81,11 +82,11 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
      }
    },
    onSuccess: () => {
-      toast.success(t("home.downloads.toasts.download_cancelled"));
+      toast.success("Download canceled");
    },
    onError: (e) => {
      console.error(e);
-      toast.error(t("home.downloads.toasts.could_not_cancel_download"));
+      toast.error("Could not cancel download");
    },
  });

@@ -152,7 +153,7 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
                <Text className="text-xs">{process.speed?.toFixed(2)}x</Text>
              )}
              {eta(process) && (
-                <Text className="text-xs">{t("home.downloads.eta", {eta: eta(process)})}</Text>
+                <Text className="text-xs">ETA {eta(process)}</Text>
              )}
            </View>

--- a/components/downloads/EpisodeCard.tsx
+++ b/components/downloads/EpisodeCard.tsx
@@ -1,5 +1,5 @@
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";
 import React, { useCallback, useMemo } from "react";
 import { TouchableOpacity, TouchableOpacityProps, View } from "react-native";
 import {
@@ -26,7 +26,6 @@ export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item, ...props }) => {
  const { deleteFile } = useDownload();
  const { openFile } = useDownloadedFileOpener();
  const { showActionSheetWithOptions } = useActionSheet();
-  const successHapticFeedback = useHaptic("success");

  const base64Image = useMemo(() => {
    return storage.getString(item.Id!);
@@ -42,7 +41,7 @@ export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item, ...props }) => {
  const handleDeleteFile = useCallback(() => {
    if (item.Id) {
      deleteFile(item.Id);
-      successHapticFeedback();
+      Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
    }
  }, [deleteFile, item.Id]);

--- a/components/downloads/MovieCard.tsx
+++ b/components/downloads/MovieCard.tsx
@@ -3,7 +3,7 @@ import {
  useActionSheet,
 } from "@expo/react-native-action-sheet";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";
 import React, { useCallback, useMemo } from "react";
 import { TouchableOpacity, View } from "react-native";

@@ -28,7 +28,6 @@ export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
  const { deleteFile } = useDownload();
  const { openFile } = useDownloadedFileOpener();
  const { showActionSheetWithOptions } = useActionSheet();
-  const successHapticFeedback = useHaptic("success");

  const handleOpenFile = useCallback(() => {
    openFile(item);
@@ -44,7 +43,7 @@ export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
  const handleDeleteFile = useCallback(() => {
    if (item.Id) {
      deleteFile(item.Id);
-      successHapticFeedback();
+      Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
    }
  }, [deleteFile, item.Id]);

--- a/components/filters/FilterButton.tsx
+++ b/components/filters/FilterButton.tsx
@@ -1,7 +1,7 @@
 import { Text } from "@/components/common/Text";
 import { FontAwesome, Ionicons } from "@expo/vector-icons";
 import { useQuery } from "@tanstack/react-query";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { TouchableOpacity, View, ViewProps } from "react-native";
 import { FilterSheet } from "./FilterSheet";

--- a/components/filters/FilterSheet.tsx
+++ b/components/filters/FilterSheet.tsx
@@ -19,7 +19,6 @@ import { StyleSheet, TouchableOpacity, View, ViewProps } from "react-native";
 import { Ionicons } from "@expo/vector-icons";
 import { Button } from "../Button";
 import { Input } from "../common/Input";
-import { useTranslation } from "react-i18next";

 interface Props<T> extends ViewProps {
  open: boolean;
@@ -77,7 +76,6 @@ export const FilterSheet = <T,>({
 }: Props<T>) => {
  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
  const snapPoints = useMemo(() => ["80%"], []);
-  const { t } = useTranslation();

  const [data, setData] = useState<T[]>([]);
  const [offset, setOffset] = useState<number>(0);
@@ -155,10 +153,10 @@ export const FilterSheet = <T,>({
      >
        <View className="px-4 mt-2 mb-8">
          <Text className="font-bold text-2xl">{title}</Text>
-          <Text className="mb-2 text-neutral-500">{t("search.items", {count: _data?.length})}</Text>
+          <Text className="mb-2 text-neutral-500">{_data?.length} items</Text>
          {showSearch && (
            <Input
-              placeholder={t("search.search")}
+              placeholder="Search..."
              className="my-2"
              value={search}
              onChangeText={(text) => {
--- a/components/home/Favorites.tsx
+++ b/components/home/Favorites.tsx
@@ -5,7 +5,6 @@ import { View } from "react-native";
 import { ScrollingCollectionList } from "./ScrollingCollectionList";
 import { useCallback } from "react";
 import { BaseItemKind } from "@jellyfin/sdk/lib/generated-client";
-import { t } from "i18next";

 export const Favorites = () => {
  const [api] = useAtom(apiAtom);
@@ -55,44 +54,64 @@ export const Favorites = () => {
    () => fetchFavoritesByType("Playlist"),
    [fetchFavoritesByType]
  );
+  const fetchFavoriteMusicAlbum = useCallback(
+    () => fetchFavoritesByType("MusicAlbum"),
+    [fetchFavoritesByType]
+  );
+  const fetchFavoriteAudio = useCallback(
+    () => fetchFavoritesByType("Audio"),
+    [fetchFavoritesByType]
+  );

  return (
    <View className="flex flex-co gap-y-4">
      <ScrollingCollectionList
        queryFn={fetchFavoriteSeries}
        queryKey={["home", "favorites", "series"]}
-        title={t("favorites.series")}
+        title="Series"
        hideIfEmpty
      />
      <ScrollingCollectionList
        queryFn={fetchFavoriteMovies}
        queryKey={["home", "favorites", "movies"]}
-        title={t("favorites.movies")}
+        title="Movies"
        hideIfEmpty
        orientation="vertical"
      />
      <ScrollingCollectionList
        queryFn={fetchFavoriteEpisodes}
        queryKey={["home", "favorites", "episodes"]}
-        title={t("favorites.episodes")}
+        title="Episodes"
        hideIfEmpty
      />
      <ScrollingCollectionList
        queryFn={fetchFavoriteVideos}
        queryKey={["home", "favorites", "videos"]}
-        title={t("favorites.videos")}
+        title="Videos"
        hideIfEmpty
      />
      <ScrollingCollectionList
        queryFn={fetchFavoriteBoxsets}
        queryKey={["home", "favorites", "boxsets"]}
-        title={t("favorites.boxsets")}
+        title="Boxsets"
        hideIfEmpty
      />
      <ScrollingCollectionList
        queryFn={fetchFavoritePlaylists}
        queryKey={["home", "favorites", "playlists"]}
-        title={t("favorites.playlists")}
+        title="Playlists"
+        hideIfEmpty
+      />
+      <ScrollingCollectionList
+        queryFn={fetchFavoriteMusicAlbum}
+        queryKey={["home", "favorites", "musicAlbums"]}
+        title="Music Albums"
+        hideIfEmpty
+      />
+      <ScrollingCollectionList
+        queryFn={fetchFavoriteAudio}
+        queryKey={["home", "favorites", "audio"]}
+        title="Audio"
        hideIfEmpty
      />
    </View>
--- a/components/home/LargeMovieCarousel.tsx
+++ b/components/home/LargeMovieCarousel.tsx
@@ -1,4 +1,3 @@
-import { useHaptic } from "@/hooks/useHaptic";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
@@ -7,11 +6,9 @@ import { BaseItemDto } 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 { useRouter, useSegments } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useCallback, useMemo } from "react";
-import { Dimensions, View, ViewProps } from "react-native";
-import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import { Dimensions, TouchableOpacity, View, ViewProps } from "react-native";
 import Animated, {
  runOnJS,
  useSharedValue,
@@ -21,7 +18,11 @@ import Carousel, {
  ICarouselInstance,
  Pagination,
 } from "react-native-reanimated-carousel";
-import { itemRouter } from "../common/TouchableItemRouter";
+import { itemRouter, TouchableItemRouter } from "../common/TouchableItemRouter";
+import { Loader } from "../Loader";
+import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import { useRouter, useSegments } from "expo-router";
+import * as Haptics from "expo-haptics";

 interface Props extends ViewProps {}

@@ -127,7 +128,6 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
  const [api] = useAtom(apiAtom);
  const router = useRouter();
  const screenWidth = Dimensions.get("screen").width;
-  const lightHapticFeedback = useHaptic("light");

  const uri = useMemo(() => {
    if (!api) return null;
@@ -153,7 +153,7 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
  const handleRoute = useCallback(() => {
    if (!from) return;
    const url = itemRouter(item, from);
-    lightHapticFeedback();
+    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
    // @ts-ignore
    if (url) router.push(url);
  }, [item, from]);
@@ -161,7 +161,7 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
  const tap = Gesture.Tap()
    .maxDuration(2000)
    .onBegin(() => {
-      opacity.value = withTiming(0.8, { duration: 100 });
+      opacity.value = withTiming(0.5, { duration: 100 });
    })
    .onEnd(() => {
      runOnJS(handleRoute)();
--- a/components/home/ScrollingCollectionList.tsx
+++ b/components/home/ScrollingCollectionList.tsx
@@ -11,7 +11,6 @@ import ContinueWatchingPoster from "../ContinueWatchingPoster";
 import { ItemCardText } from "../ItemCardText";
 import { TouchableItemRouter } from "../common/TouchableItemRouter";
 import SeriesPoster from "../posters/SeriesPoster";
-import { useTranslation } from "react-i18next";

 interface Props extends ViewProps {
  title?: string | null;
@@ -40,10 +39,9 @@ export const ScrollingCollectionList: React.FC<Props> = ({
    refetchOnReconnect: true,
  });

-  const { t } = useTranslation();
+  if (disabled || !title) return null;

  if (hideIfEmpty === true && data?.length === 0) return null;
-  if (disabled || !title) return null;

  return (
    <View {...props}>
@@ -52,7 +50,7 @@ export const ScrollingCollectionList: React.FC<Props> = ({
      </Text>
      {isLoading === false && data?.length === 0 && (
        <View className="px-4">
-          <Text className="text-neutral-500">{t("home.no_items")}</Text>
+          <Text className="text-neutral-500">No items</Text>
        </View>
      )}
      {isLoading ? (
@@ -106,12 +104,7 @@ export const ScrollingCollectionList: React.FC<Props> = ({
                {item.Type === "Movie" && orientation === "vertical" && (
                  <MoviePoster item={item} />
                )}
-                {item.Type === "Series" && orientation === "vertical" && (
-                  <SeriesPoster item={item} />
-                )}
-                {item.Type === "Series" && orientation === "horizontal" && (
-                  <ContinueWatchingPoster item={item} />
-                )}
+                {item.Type === "Series" && <SeriesPoster item={item} />}
                {item.Type === "Program" && (
                  <ContinueWatchingPoster item={item} />
                )}
--- a/components/jellyseerr/JellyseerrStatusIcon.tsx
+++ b/components/jellyseerr/JellyseerrStatusIcon.tsx
@@ -2,6 +2,7 @@ import {useEffect, useState} from "react";
 import {MediaStatus} from "@/utils/jellyseerr/server/constants/media";
 import {MaterialCommunityIcons} from "@expo/vector-icons";
 import {TouchableOpacity, View, ViewProps} from "react-native";
+import {MovieResult, TvResult} from "@/utils/jellyseerr/server/models/Search";

 interface Props {
  mediaStatus?: MediaStatus;
@@ -9,7 +10,7 @@ interface Props {
  onPress?: () => void;
 }

-const JellyseerrStatusIcon: React.FC<Props & ViewProps> = ({
+const JellyseerrIconStatus: React.FC<Props & ViewProps> = ({
  mediaStatus,
  showRequestIcon,
  onPress,
@@ -68,4 +69,4 @@ const JellyseerrStatusIcon: React.FC<Props & ViewProps> = ({
  )
 }

-export default JellyseerrStatusIcon;
+export default JellyseerrIconStatus;
--- a/components/inputs/Stepper.tsx
+++ b/components/inputs/Stepper.tsx
@@ -1,10 +1,8 @@
 import {TouchableOpacity, View} from "react-native";
 import {Text} from "@/components/common/Text";
-import DisabledSetting from "@/components/settings/DisabledSetting";

 interface StepperProps {
  value: number,
-  disabled?: boolean,
  step: number,
  min: number,
  max: number,
@@ -14,7 +12,6 @@ interface StepperProps {

 export const Stepper: React.FC<StepperProps> = ({
  value,
-  disabled,
  step,
  min,
  max,
@@ -22,11 +19,7 @@ export const Stepper: React.FC<StepperProps> = ({
  appendValue
 }) => {
  return (
-    <DisabledSetting
-      disabled={disabled === true}
-      showText={false}
-      className="flex flex-row items-center"
-    >
+    <View className="flex flex-row items-center">
      <TouchableOpacity
        onPress={() => onUpdate(Math.max(min, value - step))}
        className="w-8 h-8 bg-neutral-800 rounded-l-lg flex items-center justify-center"
@@ -46,6 +39,6 @@ export const Stepper: React.FC<StepperProps> = ({
      >
        <Text>+</Text>
      </TouchableOpacity>
-    </DisabledSetting>
+    </View>
  )
 }
--- a/components/jellyseerr/Cast.tsx
+++ b/components/jellyseerr/Cast.tsx
@@ -1,41 +0,0 @@
-import { View, ViewProps } from "react-native";
-import { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
-import { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
-import React from "react";
-import { FlashList } from "@shopify/flash-list";
-import { Text } from "@/components/common/Text";
-import PersonPoster from "@/components/jellyseerr/PersonPoster";
-import { useTranslation } from "react-i18next";
-
-const CastSlide: React.FC<
-  { details?: MovieDetails | TvDetails } & ViewProps
-> = ({ details, ...props }) => {
-  const { t } = useTranslation();
-  return (
-    details?.credits?.cast &&
-    details?.credits?.cast?.length > 0 && (
-      <View {...props}>
-        <Text className="text-lg font-bold mb-2 px-4">{t("jellyseerr.cast")}</Text>
-        <FlashList
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          data={details?.credits.cast}
-          ItemSeparatorComponent={() => <View className="w-2" />}
-          estimatedItemSize={15}
-          keyExtractor={(item) => item?.id?.toString()}
-          contentContainerStyle={{ paddingHorizontal: 16 }}
-          renderItem={({ item }) => (
-            <PersonPoster
-              id={item.id.toString()}
-              posterPath={item.profilePath}
-              name={item.name}
-              subName={item.character}
-            />
-          )}
-        />
-      </View>
-    )
-  );
-};
-
-export default CastSlide;
--- a/components/jellyseerr/DetailFacts.tsx
+++ b/components/jellyseerr/DetailFacts.tsx
@@ -1,220 +0,0 @@
-import { View, ViewProps } from "react-native";
-import { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
-import { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
-import { Text } from "@/components/common/Text";
-import { useMemo } from "react";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { uniqBy } from "lodash";
-import { TmdbRelease } from "@/utils/jellyseerr/server/api/themoviedb/interfaces";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
-import CountryFlag from "react-native-country-flag";
-import { ANIME_KEYWORD_ID } from "@/utils/jellyseerr/server/api/themoviedb/constants";
-import { useTranslation } from "react-i18next";
-
-interface Release {
-  certification: string;
-  iso_639_1?: string;
-  note?: string;
-  release_date: string;
-  type: number;
-}
-
-const dateOpts: Intl.DateTimeFormatOptions = {
-  year: "numeric",
-  month: "long",
-  day: "numeric",
-};
-
-const Facts: React.FC<
-  { title: string; facts?: string[] | React.ReactNode[] } & ViewProps
-> = ({ title, facts, ...props }) =>
-  facts &&
-  facts?.length > 0 && (
-    <View className="flex flex-col justify-between py-2" {...props}>
-      <Text className="font-bold text-start">{title}</Text>
-
-      <View className="flex flex-col items-end">
-        {facts.map((f, idx) =>
-          typeof f === "string" ? <Text key={idx}>{f}</Text> : f
-        )}
-      </View>
-    </View>
-  );
-
-const Fact: React.FC<{ title: string; fact?: string | null } & ViewProps> = ({
-  title,
-  fact,
-  ...props
-}) => fact && <Facts title={title} facts={[fact]} {...props} />;
-
-const DetailFacts: React.FC<
-  { details?: MovieDetails | TvDetails } & ViewProps
-> = ({ details, className, ...props }) => {
-  const { jellyseerrUser } = useJellyseerr();
-  const { t } = useTranslation();
-
-  const locale = useMemo(() => {
-    return jellyseerrUser?.settings?.locale || "en";
-  }, [jellyseerrUser]);
-
-  const region = useMemo(
-    () => jellyseerrUser?.settings?.region || "US",
-    [jellyseerrUser]
-  );
-
-  const releases = useMemo(
-    () =>
-      (details as MovieDetails)?.releases?.results.find(
-        (r: TmdbRelease) => r.iso_3166_1 === region
-      )?.release_dates as TmdbRelease["release_dates"],
-    [details]
-  );
-
-  // Release date types:
-  // 1. Premiere
-  // 2. Theatrical (limited)
-  // 3. Theatrical
-  // 4. Digital
-  // 5. Physical
-  // 6. TV
-  const filteredReleases = useMemo(
-    () =>
-      uniqBy(
-        releases?.filter((r: Release) => r.type > 2 && r.type < 6),
-        "type"
-      ),
-    [releases]
-  );
-
-  const firstAirDate = useMemo(() => {
-    const firstAirDate = (details as TvDetails)?.firstAirDate;
-    if (firstAirDate) {
-      return new Date(firstAirDate).toLocaleDateString(
-        `${locale}-${region}`,
-        dateOpts
-      );
-    }
-  }, [details]);
-
-  const nextAirDate = useMemo(() => {
-    const firstAirDate = (details as TvDetails)?.firstAirDate;
-    const nextAirDate = (details as TvDetails)?.nextEpisodeToAir?.airDate;
-    if (nextAirDate && firstAirDate !== nextAirDate) {
-      return new Date(nextAirDate).toLocaleDateString(
-        `${locale}-${region}`,
-        dateOpts
-      );
-    }
-  }, [details]);
-
-  const revenue = useMemo(
-    () =>
-      (details as MovieDetails)?.revenue?.toLocaleString?.(
-        `${locale}-${region}`,
-        { style: "currency", currency: "USD" }
-      ),
-    [details]
-  );
-
-  const budget = useMemo(
-    () =>
-      (details as MovieDetails)?.budget?.toLocaleString?.(
-        `${locale}-${region}`,
-        { style: "currency", currency: "USD" }
-      ),
-    [details]
-  );
-
-  const streamingProviders = useMemo(
-    () =>
-      details?.watchProviders?.find(
-        (provider) => provider.iso_3166_1 === region
-      )?.flatrate,
-    [details]
-  );
-
-  const networks = useMemo(() => (details as TvDetails)?.networks, [details]);
-
-  const spokenLanguage = useMemo(
-    () =>
-      details?.spokenLanguages.find(
-        (lng) => lng.iso_639_1 === details.originalLanguage
-      )?.name,
-    [details]
-  );
-
-  return (
-    details && (
-      <View className="p-4">
-        <Text className="text-lg font-bold">{t("jellyseerr.details")}</Text>
-        <View
-          className={`${className} flex flex-col justify-center divide-y-2 divide-neutral-800`}
-          {...props}
-        >
-          <Fact title={t("jellyseerr.status")} fact={details?.status} />
-          <Fact
-            title={t("jellyseerr.original_title")}
-            fact={(details as TvDetails)?.originalName}
-          />
-          {details.keywords.some(
-            (keyword) => keyword.id === ANIME_KEYWORD_ID
-          ) && <Fact title={t("jellyseerr.series_type")} fact="Anime" />}
-          <Facts
-            title={t("jellyseerr.release_dates")}
-            facts={filteredReleases?.map?.((r: Release, idx) => (
-              <View key={idx} className="flex flex-row space-x-2 items-center">
-                {r.type === 3 ? (
-                  // Theatrical
-                  <Ionicons name="ticket" size={16} color="white" />
-                ) : r.type === 4 ? (
-                  // Digital
-                  <Ionicons name="cloud" size={16} color="white" />
-                ) : (
-                  // Physical
-                  <MaterialCommunityIcons
-                    name="record-circle-outline"
-                    size={16}
-                    color="white"
-                  />
-                )}
-                <Text>
-                  {new Date(r.release_date).toLocaleDateString(
-                    `${locale}-${region}`,
-                    dateOpts
-                  )}
-                </Text>
-              </View>
-            ))}
-          />
-          <Fact title={t("jellyseerr.first_air_date")} fact={firstAirDate} />
-          <Fact title={t("jellyseerr.next_air_date")} fact={nextAirDate} />
-          <Fact title={t("jellyseerr.revenue")} fact={revenue} />
-          <Fact title={t("jellyseerr.budget")} fact={budget} />
-          <Fact title={t("jellyseerr.original_language")} fact={spokenLanguage} />
-          <Facts
-            title={t("jellyseerr.production_country")}
-            facts={details?.productionCountries?.map((n, idx) => (
-              <View key={idx} className="flex flex-row items-center space-x-2">
-                <CountryFlag isoCode={n.iso_3166_1} size={10} />
-                <Text>{n.name}</Text>
-              </View>
-            ))}
-          />
-          <Facts
-            title={t("jellyseerr.studios")}
-            facts={uniqBy(details?.productionCompanies, "name")?.map(
-              (n) => n.name
-            )}
-          />
-          <Facts title={t("jellyseerr.network")}facts={networks?.map((n) => n.name)} />
-          <Facts
-            title={t("jellyseerr.currently_streaming_on")}
-            facts={streamingProviders?.map((s) => s.name)}
-          />
-        </View>
-      </View>
-    )
-  );
-};
-
-export default DetailFacts;
--- a/components/jellyseerr/discover/MovieTvSlide.tsx
+++ b/components/jellyseerr/discover/MovieTvSlide.tsx
@@ -1,4 +1,5 @@
-import React, {useMemo} from "react";
+import React, { useMemo } from "react";
+import DiscoverSlider from "@/utils/jellyseerr/server/entity/DiscoverSlider";
 import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
 import {
  DiscoverEndpoint,
@@ -8,13 +9,17 @@ import {
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
 import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-import Slide, {SlideProps} from "@/components/jellyseerr/discover/Slide";
-import {ViewProps} from "react-native";
+import { Text } from "@/components/common/Text";
+import { FlashList } from "@shopify/flash-list";
+import { View } from "react-native";

-const MovieTvSlide: React.FC<SlideProps & ViewProps> = ({ slide, ...props }) => {
+interface Props {
+  slide: DiscoverSlider;
+}
+const DiscoverSlide: React.FC<Props> = ({ slide }) => {
  const { jellyseerrApi } = useJellyseerr();

-  const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({
+  const { data, isFetching, fetchNextPage, hasNextPage } = useInfiniteQuery({
    queryKey: ["jellyseerr", "discover", slide.id],
    queryFn: async ({ pageParam }) => {
      let endpoint: DiscoverEndpoint | undefined = undefined;
@@ -57,28 +62,42 @@ const MovieTvSlide: React.FC<SlideProps & ViewProps> = ({ slide, ...props }) =>
  });

  const flatData = useMemo(
-    () => data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results),
+    () =>
+      data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results),
    [data]
  );

  return (
    flatData &&
    flatData?.length > 0 && (
-      <Slide
-        {...props}
-        slide={slide}
-        data={flatData}
-        keyExtractor={(item) => item!!.id.toString()}
-        onEndReached={() => {
-          if (hasNextPage)
-            fetchNextPage()
+      <View className="mb-4">
+        <Text className="font-bold text-lg mb-2 px-4">
+          {DiscoverSliderType[slide.type].toString().toTitle()}
+        </Text>
+        <FlashList
+          horizontal
+          contentContainerStyle={{
+            paddingLeft: 16,
          }}
-        renderItem={(item) =>
+          showsHorizontalScrollIndicator={false}
+          keyExtractor={(item) => item!!.id.toString()}
+          estimatedItemSize={250}
+          data={flatData}
+          onEndReachedThreshold={1}
+          onEndReached={() => {
+            if (hasNextPage) fetchNextPage();
+          }}
+          renderItem={({ item }) =>
+            item ? (
              <JellyseerrPoster item={item as MovieResult | TvResult} />
+            ) : (
+              <></>
+            )
          }
        />
+      </View>
    )
  );
 };

-export default MovieTvSlide;
+export default DiscoverSlide;
--- a/components/jellyseerr/JellyseerrIndexPage.tsx
+++ b/components/jellyseerr/JellyseerrIndexPage.tsx
@@ -1,161 +0,0 @@
-import Discover from "@/components/jellyseerr/discover/Discover";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { MediaType } from "@/utils/jellyseerr/server/constants/media";
-import {
-  MovieResult,
-  PersonResult,
-  TvResult,
-} from "@/utils/jellyseerr/server/models/Search";
-import { useReactNavigationQuery } from "@/utils/useReactNavigationQuery";
-import React, { useMemo } from "react";
-import { View, ViewProps } from "react-native";
-import {
-  useAnimatedReaction,
-  useAnimatedStyle,
-  useSharedValue,
-  withTiming,
-} from "react-native-reanimated";
-import { Text } from "../common/Text";
-import JellyseerrPoster from "../posters/JellyseerrPoster";
-import { LoadingSkeleton } from "../search/LoadingSkeleton";
-import { SearchItemWrapper } from "../search/SearchItemWrapper";
-import PersonPoster from "./PersonPoster";
-import { useTranslation } from "react-i18next";
-
-interface Props extends ViewProps {
-  searchQuery: string;
-}
-
-export const JellyserrIndexPage: React.FC<Props> = ({ searchQuery }) => {
-  const { jellyseerrApi } = useJellyseerr();
-  const opacity = useSharedValue(1);
-  const { t } = useTranslation();
-
-  const {
-    data: jellyseerrDiscoverSettings,
-    isFetching: f1,
-    isLoading: l1,
-  } = useReactNavigationQuery({
-    queryKey: ["search", "jellyseerr", "discoverSettings", searchQuery],
-    queryFn: async () => jellyseerrApi?.discoverSettings(),
-    enabled: !!jellyseerrApi && searchQuery.length == 0,
-  });
-
-  const {
-    data: jellyseerrResults,
-    isFetching: f2,
-    isLoading: l2,
-  } = useReactNavigationQuery({
-    queryKey: ["search", "jellyseerr", "results", searchQuery],
-    queryFn: async () => {
-      const response = await jellyseerrApi?.search({
-        query: new URLSearchParams(searchQuery).toString(),
-        page: 1,
-        language: "en",
-      });
-      return response?.results;
-    },
-    enabled: !!jellyseerrApi && searchQuery.length > 0,
-  });
-
-  const animatedStyle = useAnimatedStyle(() => {
-    return {
-      opacity: opacity.value,
-    };
-  });
-
-  useAnimatedReaction(
-    () => f1 || f2 || l1 || l2,
-    (isLoading) => {
-      if (isLoading) {
-        opacity.value = withTiming(1, { duration: 200 });
-      } else {
-        opacity.value = withTiming(0, { duration: 200 });
-      }
-    }
-  );
-
-  const jellyseerrMovieResults = useMemo(
-    () =>
-      jellyseerrResults?.filter(
-        (r) => r.mediaType === MediaType.MOVIE
-      ) as MovieResult[],
-    [jellyseerrResults]
-  );
-
-  const jellyseerrTvResults = useMemo(
-    () =>
-      jellyseerrResults?.filter(
-        (r) => r.mediaType === MediaType.TV
-      ) as TvResult[],
-    [jellyseerrResults]
-  );
-
-  const jellyseerrPersonResults = useMemo(
-    () =>
-      jellyseerrResults?.filter(
-        (r) => r.mediaType === "person"
-      ) as PersonResult[],
-    [jellyseerrResults]
-  );
-
-  if (!searchQuery.length)
-    return (
-      <View className="flex flex-col">
-        <Discover sliders={jellyseerrDiscoverSettings} />
-      </View>
-    );
-
-  return (
-    <View>
-      <LoadingSkeleton isLoading={f1 || f2 || l1 || l2} />
-
-      {!jellyseerrMovieResults?.length &&
-        !jellyseerrTvResults?.length &&
-        !jellyseerrPersonResults?.length &&
-        !f1 &&
-        !f2 &&
-        !l1 &&
-        !l2 && (
-          <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">
-              "{searchQuery}"
-            </Text>
-          </View>
-        )}
-
-      <View className={f1 || f2 || l1 || l2 ? "opacity-0" : "opacity-100"}>
-        <SearchItemWrapper
-          header={t("search.request_movies")}
-          items={jellyseerrMovieResults}
-          renderItem={(item: MovieResult) => (
-            <JellyseerrPoster item={item} key={item.id} />
-          )}
-        />
-        <SearchItemWrapper
-          header={t("search.request_series")}
-          items={jellyseerrTvResults}
-          renderItem={(item: TvResult) => (
-            <JellyseerrPoster item={item} key={item.id} />
-          )}
-        />
-        <SearchItemWrapper
-          header={t("search.actors")}
-          items={jellyseerrPersonResults}
-          renderItem={(item: PersonResult) => (
-            <PersonPoster
-              className="mr-2"
-              key={item.id}
-              id={item.id.toString()}
-              name={item.name}
-              posterPath={item.profilePath}
-            />
-          )}
-        />
-      </View>
-    </View>
-  );
-};
--- a/components/jellyseerr/JellyseerrMediaIcon.tsx
+++ b/components/jellyseerr/JellyseerrMediaIcon.tsx
@@ -1,37 +0,0 @@
-import {useMemo} from "react";
-import {MediaType} from "@/utils/jellyseerr/server/constants/media";
-import {Feather, MaterialCommunityIcons} from "@expo/vector-icons";
-import {View, ViewProps} from "react-native";
-
-const JellyseerrMediaIcon: React.FC<{ mediaType: "tv" | "movie" } & ViewProps> = ({
-  mediaType,
-  className,
-  ...props
-}) => {
-  const style = useMemo(
-    () => mediaType === MediaType.MOVIE
-      ? 'bg-blue-600/90 border-blue-400/40'
-      : 'bg-purple-600/90 border-purple-400/40',
-    [mediaType]
-  );
-  return (
-    mediaType &&
-    <View className={`${className} border ${style} rounded-full p-1`} {...props}>
-      {mediaType === MediaType.MOVIE ? (
-        <MaterialCommunityIcons
-          name="movie-open"
-          size={16}
-          color="white"
-        />
-      ) : (
-        <Feather
-          size={16}
-          name="tv"
-          color="white"
-        />
-      )}
-    </View>
-  )
-}
-
-export default JellyseerrMediaIcon;
--- a/components/jellyseerr/ParallaxSlideShow.tsx
+++ b/components/jellyseerr/ParallaxSlideShow.tsx
@@ -1,160 +0,0 @@
-import React, {
-  PropsWithChildren,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
-import {Dimensions, View, ViewProps} from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { Text } from "@/components/common/Text";
-import { Animated } from "react-native";
-import { FlashList } from "@shopify/flash-list";
-import {useFocusEffect} from "expo-router";
-
-const ANIMATION_ENTER = 250;
-const ANIMATION_EXIT = 250;
-const BACKDROP_DURATION = 5000;
-
-type Render = React.ComponentType<any>
-  | React.ReactElement
-  | null
-  | undefined;
-
-interface Props<T> {
-  data: T[]
-  images: string[];
-  logo?: React.ReactElement;
-  HeaderContent?: () => React.ReactElement;
-  MainContent?: () => React.ReactElement;
-  listHeader: string;
-  renderItem: (item: T, index: number) => Render;
-  keyExtractor: (item: T) => string;
-  onEndReached?: (() => void) | null | undefined;
-}
-
-const ParallaxSlideShow = <T extends unknown>({
-  data,
-  images,
-  logo,
-  HeaderContent,
-  MainContent,
-  listHeader,
-  renderItem,
-  keyExtractor,
-  onEndReached,
-  ...props
-}: PropsWithChildren<Props<T> & ViewProps>
-) => {
-  const insets = useSafeAreaInsets();
-
-  const [currentIndex, setCurrentIndex] = useState(0);
-  const fadeAnim = useRef(new Animated.Value(0)).current;
-
-  const enterAnimation = useCallback(
-    () =>
-      Animated.timing(fadeAnim, {
-        toValue: 1,
-        duration: ANIMATION_ENTER,
-        useNativeDriver: true,
-      }),
-    [fadeAnim]
-  );
-
-  const exitAnimation = useCallback(
-    () =>
-      Animated.timing(fadeAnim, {
-        toValue: 0,
-        duration: ANIMATION_EXIT,
-        useNativeDriver: true,
-      }),
-    [fadeAnim]
-  );
-
-  useEffect(() => {
-    if (images?.length) {
-      enterAnimation().start();
-
-      const intervalId = setInterval(() => {
-        Animated.sequence([
-          enterAnimation(),
-          exitAnimation()
-        ]).start(() => {
-          fadeAnim.setValue(0);
-          setCurrentIndex((prevIndex) => (prevIndex + 1) % images?.length);
-        })
-      }, BACKDROP_DURATION);
-
-      return () => {
-        clearInterval(intervalId)
-      };
-    }
-  }, [fadeAnim, images, enterAnimation, exitAnimation, setCurrentIndex, currentIndex]);
-
-  return (
-    <View
-      className="flex-1 relative"
-      style={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-    >
-      <ParallaxScrollView
-        className="flex-1 opacity-100"
-        headerHeight={300}
-        onEndReached={onEndReached}
-        headerImage={
-          <Animated.Image
-            key={images?.[currentIndex]}
-            id={images?.[currentIndex]}
-            source={{
-              uri: images?.[currentIndex],
-            }}
-            style={{
-              width: "100%",
-              height: "100%",
-              opacity: fadeAnim,
-            }}
-          />
-        }
-        logo={logo}
-      >
-        <View className="flex flex-col space-y-4 px-4">
-          <View className="flex flex-row justify-between w-full">
-            <View className="flex flex-col w-full">
-              {HeaderContent && HeaderContent()}
-            </View>
-          </View>
-          {MainContent && MainContent()}
-          <View>
-            <FlashList
-              data={data}
-              ListEmptyComponent={
-                <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"
-              ListHeaderComponent={
-                <Text className="text-lg font-bold my-2">{listHeader}</Text>
-              }
-              nestedScrollEnabled
-              showsVerticalScrollIndicator={false}
-              //@ts-ignore
-              renderItem={({ item, index}) => renderItem(item, index)}
-              keyExtractor={keyExtractor}
-              numColumns={3}
-              estimatedItemSize={214}
-              ItemSeparatorComponent={() => <View className="h-2 w-2" />}
-            />
-          </View>
-        </View>
-      </ParallaxScrollView>
-    </View>
-  );
-}
-
-export default ParallaxSlideShow;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Fredrik Burmester	b4d9552401	chore	2025-01-23 13:37:41 +01:00
Fredrik Burmester	c74336a1a1	chore	2025-01-23 13:16:55 +01:00
Fredrik Burmester	17257ece85	chore	2025-01-23 11:38:42 +01:00
Fredrik Burmester	d5c634b74b	Revert "Merge branch 'develop' into chore/expo-52" This reverts commit `933f3f2f7c`, reversing changes made to `f92fee4158`.	2025-01-23 11:34:22 +01:00
Fredrik Burmester	933f3f2f7c	Merge branch 'develop' into chore/expo-52	2025-01-23 11:30:02 +01:00
Fredrik Burmester	f92fee4158	wip	2025-01-03 11:42:18 +01:00