chore: remove everything related to music

Merge pull request #394 from Ryan0204/enhancement/autohidecontrol
enhancement: auto hide control after 5 seconds
2025-01-12 13:40:01 +01:00 · 2025-01-12 10:16:55 +01:00 · 2025-01-12 10:10:18 +01:00 · 2025-01-12 10:07:49 +01:00 · 2025-01-12 09:37:33 +01:00 · 2025-01-12 09:36:23 +01:00
101 changed files with 2801 additions and 2916 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -43,7 +43,7 @@ body:
      label: Version
      description: What version of Streamyfin are you running?
      options:
-        - 0.24.0
+        - 0.25.0
        - 0.22.0
        - 0.21.0
        - older
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,6 @@ credentials.json
 *.ipa
 .continuerc.json

-.vscode/
+.vscode/
+.idea/
+.ruby-lsp
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
--- a/.idea/caches/deviceStreaming.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -1,329 +0,0 @@
-<?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
@@ -1,6 +0,0 @@
-<?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
@@ -1,8 +0,0 @@
-<?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
@@ -1,9 +0,0 @@
-<?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
@@ -1,6 +0,0 @@
-<?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,7 +8,7 @@ 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=150 src="./assets/images/jellyseerr.PNG"/>
+  <img width=159 src="./assets/images/jellyseerr.PNG"/>
 </div>

 ## 🌟 Features
@@ -70,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'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.
+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.

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

@@ -90,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 you 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 your computer and run the app.

 ## 📄 License

--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
  "expo": {
    "name": "Streamyfin",
    "slug": "streamyfin",
-    "version": "0.24.0",
+    "version": "0.25.0",
    "orientation": "default",
    "icon": "./assets/images/icon.png",
    "scheme": "streamyfin",
--- 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 { useSettings } from "@/utils/atoms/settings";
+import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
 import { Ionicons } from "@expo/vector-icons";
 import { useNavigation, useRouter } from "expo-router";
 import { useAtom } from "jotai";
@@ -96,7 +96,7 @@ export default function page() {
      >
        <View className="py-4">
          <View className="mb-4 flex flex-col space-y-4 px-4">
-            {settings?.downloadMethod === "remux" && (
+            {settings?.downloadMethod === DownloadMethod.Remux && (
              <View className="bg-neutral-900 p-4 rounded-2xl">
                <Text className="text-lg font-bold">Queue</Text>
                <Text className="text-xs opacity-70 text-red-600">
--- a/app/(auth)/(tabs)/(home)/intro/page.tsx
+++ b/app/(auth)/(tabs)/(home)/intro/page.tsx
@@ -5,7 +5,7 @@ import { Feather, Ionicons } from "@expo/vector-icons";
 import { Image } from "expo-image";
 import { useFocusEffect, useRouter } from "expo-router";
 import { useCallback } from "react";
-import { TouchableOpacity, View } from "react-native";
+import { Linking, TouchableOpacity, View } from "react-native";

 export default function page() {
  const router = useRouter();
@@ -17,7 +17,7 @@ export default function page() {
  );

  return (
-    <View className="bg-neutral-900 h-full py-32 px-4 space-y-4">
+    <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">
          Welcome to Streamyfin
@@ -85,25 +85,55 @@ export default function page() {
            </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">Centralised Settings Plugin</Text>
+            <Text className="shrink text-xs">
+              Configure settings from a centralised location on your Jellyfin
+              server. All client settings for all users will be synced
+              automatically.{" "}
+              <Text
+                className="text-purple-600"
+                onPress={() => {
+                  Linking.openURL(
+                    "https://github.com/streamyfin/jellyfin-plugin-streamyfin"
+                  );
+                }}
+              >
+                Read more
+              </Text>
+            </Text>
+          </View>
+        </View>
+      </View>
+      <View>
+        <Button
+          onPress={() => {
+            router.back();
+          }}
+          className="mt-4"
+        >
+          Done
+        </Button>
+        <TouchableOpacity
+          onPress={() => {
+            router.back();
+            router.push("/settings");
+          }}
+          className="mt-4"
+        >
+          <Text className="text-purple-600 text-center">Go to settings</Text>
+        </TouchableOpacity>
      </View>
-
-      <Button
-        onPress={() => {
-          router.back();
-        }}
-        className="mt-4"
-      >
-        Done
-      </Button>
-      <TouchableOpacity
-        onPress={() => {
-          router.back();
-          router.push("/settings");
-        }}
-        className="mt-4"
-      >
-        <Text className="text-purple-600 text-center">Go to settings</Text>
-      </TouchableOpacity>
    </View>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tsx
@@ -15,7 +15,7 @@ import { useJellyfin } from "@/providers/JellyfinProvider";
 import { clearLogs } from "@/utils/log";
 import { useHaptic } from "@/hooks/useHaptic";
 import { useNavigation, useRouter } from "expo-router";
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 import { ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { storage } from "@/utils/mmkv";
--- a/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
@@ -8,9 +8,10 @@ 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 DisabledSetting from "@/components/settings/DisabledSetting";

 export default function page() {
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings();
  const user = useAtomValue(userAtom);
  const api = useAtomValue(apiAtom);

@@ -35,7 +36,10 @@ export default function page() {
    );

  return (
-    <View className="px-4">
+    <DisabledSetting
+      disabled={pluginSettings?.hiddenLibraries?.locked === true}
+      className="px-4"
+    >
      <ListGroup>
        {data?.map((view) => (
          <ListItem key={view.Id} title={view.Name} onPress={() => {}}>
@@ -56,6 +60,6 @@ export default function page() {
        Select the libraries you want to hide from the Library tab and home page
        sections.
      </Text>
-    </View>
+    </DisabledSetting>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/jellyseerr/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/jellyseerr/page.tsx
@@ -1,78 +1,16 @@
-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 { 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";
+import DisabledSetting from "@/components/settings/DisabledSetting";

 export default function page() {
-  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]);
+  const [settings, updateSettings, pluginSettings] = useSettings();

  return (
-    <View className="p-4">
+    <DisabledSetting
+      disabled={pluginSettings?.jellyseerrServerUrl?.locked === true}
+      className="p-4"
+    >
      <JellyseerrSettings />
-    </View>
+    </DisabledSetting>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/marlin-search/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/marlin-search/page.tsx
@@ -1,12 +1,10 @@
 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 { useAtom } from "jotai";
-import { useEffect, useState } from "react";
+import React, {useEffect, useMemo, useState} from "react";
 import {
  Linking,
  Switch,
@@ -15,11 +13,12 @@ import {
  View,
 } from "react-native";
 import { toast } from "sonner-native";
+import DisabledSetting from "@/components/settings/DisabledSetting";

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

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

  const [value, setValue] = useState<string>(settings?.marlinServerUrl || "");
@@ -35,69 +34,81 @@ export default function page() {
    Linking.openURL("https://github.com/fredrikburmester/marlin-search");
  };

+  const disabled = useMemo(() => {
+    return pluginSettings?.searchEngine?.locked === true && pluginSettings?.marlinServerUrl?.locked === true
+  }, [pluginSettings]);
+
  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () => (
-        <TouchableOpacity onPress={() => onSave(value)}>
-          <Text className="text-blue-500">Save</Text>
-        </TouchableOpacity>
-      ),
-    });
+    if (!pluginSettings?.marlinServerUrl?.locked) {
+      navigation.setOptions({
+        headerRight: () => (
+          <TouchableOpacity onPress={() => onSave(value)}>
+            <Text className="text-blue-500">Save</Text>
+          </TouchableOpacity>
+        ),
+      });
+    }
  }, [navigation, value]);

  if (!settings) return null;

  return (
-    <View className="px-4">
+    <DisabledSetting
+      disabled={disabled}
+      className="px-4"
+    >
      <ListGroup>
-        <ListItem
-          title={"Enable Marlin Search"}
-          onPress={() => {
-            updateSettings({ searchEngine: "Jellyfin" });
-            queryClient.invalidateQueries({ queryKey: ["search"] });
-          }}
+        <DisabledSetting
+          disabled={pluginSettings?.searchEngine?.locked === true}
+          showText={!pluginSettings?.marlinServerUrl?.locked}
        >
-          <Switch
-            value={settings.searchEngine === "Marlin"}
-            onValueChange={(value) => {
-              updateSettings({ searchEngine: value ? "Marlin" : "Jellyfin" });
+          <ListItem
+            title={"Enable Marlin Search"}
+            onPress={() => {
+              updateSettings({ searchEngine: "Jellyfin" });
              queryClient.invalidateQueries({ queryKey: ["search"] });
            }}
-          />
-        </ListItem>
+          >
+            <Switch
+              value={settings.searchEngine === "Marlin"}
+              onValueChange={(value) => {
+                updateSettings({ searchEngine: value ? "Marlin" : "Jellyfin" });
+                queryClient.invalidateQueries({ queryKey: ["search"] });
+              }}
+            />
+          </ListItem>
+        </DisabledSetting>
      </ListGroup>

-      <View
-        className={`mt-2 ${
-          settings.searchEngine === "Marlin" ? "" : "opacity-50"
-        }`}
+      <DisabledSetting
+        disabled={pluginSettings?.marlinServerUrl?.locked === true}
+        showText={!pluginSettings?.searchEngine?.locked}
+        className="mt-2 flex flex-col rounded-xl overflow-hidden pl-4 bg-neutral-900 px-4"
      >
-        <View className="flex flex-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">URL</Text>
-            <TextInput
-              editable={settings.searchEngine === "Marlin"}
-              className="text-white"
-              placeholder="http(s)://domain.org:port"
-              value={value}
-              keyboardType="url"
-              returnKeyType="done"
-              autoCapitalize="none"
-              textContentType="URL"
-              onChangeText={(text) => setValue(text)}
-            />
-          </View>
+        <View
+          className={`flex flex-row items-center bg-neutral-900 h-11 pr-4`}
+        >
+          <Text className="mr-4">URL</Text>
+          <TextInput
+            editable={settings.searchEngine === "Marlin"}
+            className="text-white"
+            placeholder="http(s)://domain.org:port"
+            value={value}
+            keyboardType="url"
+            returnKeyType="done"
+            autoCapitalize="none"
+            textContentType="URL"
+            onChangeText={(text) => setValue(text)}
+          />
        </View>
-        <Text className="px-4 text-xs text-neutral-500 mt-1">
-          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}>
-            Read more about Marlin.
-          </Text>
+      </DisabledSetting>
+      <Text className="px-4 text-xs text-neutral-500 mt-1">
+        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}>
+          Read more about Marlin.
        </Text>
-      </View>
-    </View>
+      </Text>
+    </DisabledSetting>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
@@ -10,12 +10,13 @@ import { useAtom } from "jotai";
 import { useEffect, useState } from "react";
 import { ActivityIndicator, TouchableOpacity, View } from "react-native";
 import { toast } from "sonner-native";
+import DisabledSetting from "@/components/settings/DisabledSetting";

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

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

  const [optimizedVersionsServerUrl, setOptimizedVersionsServerUrl] =
    useState<string>(settings?.optimizedVersionsServerUrl || "");
@@ -56,25 +57,30 @@ export default function page() {
  };

  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>
-        ),
-    });
+    if (!pluginSettings?.optimizedVersionsServerUrl?.locked) {
+      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 (
-    <View className="p-4">
+    <DisabledSetting
+      disabled={pluginSettings?.optimizedVersionsServerUrl?.locked === true}
+      className="p-4"
+    >
      <OptimizedServerForm
        value={optimizedVersionsServerUrl}
        onChangeValue={setOptimizedVersionsServerUrl}
      />
-    </View>
+    </DisabledSetting>
  );
 }
--- a/app/(auth)/(tabs)/(home)/settings/popular-lists/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/popular-lists/page.tsx
@@ -9,6 +9,8 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import { Linking, Switch, View } from "react-native";
+import {useMemo} from "react";
+import DisabledSetting from "@/components/settings/DisabledSetting";

 export default function page() {
  const navigation = useNavigation();
@@ -16,7 +18,7 @@ export default function page() {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);

-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings();

  const handleOpenLink = () => {
    Linking.openURL(
@@ -48,13 +50,22 @@ export default function page() {
    staleTime: 0,
  });

+  const disabled = useMemo(() => (
+    pluginSettings?.usePopularPlugin?.locked === true &&
+    pluginSettings?.mediaListCollectionIds?.locked === true
+  ), [pluginSettings]);
+
  if (!settings) return null;

  return (
-    <View className="px-4 pt-4">
+    <DisabledSetting
+      disabled={disabled}
+      className="px-4 pt-4"
+    >
      <ListGroup title={"Enable plugin"} className="">
        <ListItem
          title={"Enable Popular Lists"}
+          disabled={pluginSettings?.usePopularPlugin?.locked}
          onPress={() => {
            updateSettings({ usePopularPlugin: true });
            queryClient.invalidateQueries({ queryKey: ["search"] });
@@ -62,9 +73,10 @@ export default function page() {
        >
          <Switch
            value={settings.usePopularPlugin}
-            onValueChange={(value) => {
-              updateSettings({ usePopularPlugin: value });
-            }}
+            disabled={pluginSettings?.usePopularPlugin?.locked}
+            onValueChange={(usePopularPlugin) =>
+              updateSettings({ usePopularPlugin })
+          }
          />
        </ListItem>
      </ListGroup>
@@ -88,11 +100,14 @@ export default function page() {
                <>
                  <ListGroup title="Media List Collections" className="mt-4">
                    {mediaListCollections?.map((mlc) => (
-                      <ListItem key={mlc.Id} title={mlc.Name}>
+                      <ListItem
+                        key={mlc.Id}
+                        title={mlc.Name}
+                        disabled={pluginSettings?.mediaListCollectionIds?.locked}
+                      >
                        <Switch
-                          value={settings.mediaListCollectionIds?.includes(
-                            mlc.Id!
-                          )}
+                          disabled={pluginSettings?.mediaListCollectionIds?.locked}
+                          value={settings.mediaListCollectionIds?.includes(mlc.Id!)}
                          onValueChange={(value) => {
                            if (!settings.mediaListCollectionIds) {
                              updateSettings({
@@ -130,6 +145,6 @@ export default function page() {
          )}
        </>
      )}
-    </View>
+    </DisabledSetting>
  );
 }
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/albums/[albumId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/albums/[albumId].tsx
@@ -1,128 +0,0 @@
-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
@@ -1,130 +0,0 @@
-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
@@ -1,117 +0,0 @@
-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
@@ -109,7 +109,7 @@ const page: React.FC = () => {
        genres: selectedGenres,
        tags: selectedTags,
        years: selectedYears.map((year) => parseInt(year)),
-        includeItemTypes: ["Movie", "Series", "MusicAlbum"],
+        includeItemTypes: ["Movie", "Series"],
      });

      return response.data || null;
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/[personId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/[personId].tsx
@@ -1,247 +0,0 @@
-import {
-  router,
-  useLocalSearchParams,
-  useNavigation,
-  useSegments,
-} from "expo-router";
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { TouchableOpacity, View } from "react-native";
-import { useQuery } from "@tanstack/react-query";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-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 { Image } from "expo-image";
-import { OverviewText } from "@/components/OverviewText";
-import { orderBy } from "lodash";
-import { FlashList } from "@shopify/flash-list";
-import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
-import Poster from "@/components/posters/Poster";
-import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
-
-const ANIMATION_ENTER = 250;
-const ANIMATION_EXIT = 250;
-const BACKDROP_DURATION = 5000;
-
-export default function page() {
-  const insets = useSafeAreaInsets();
-  const local = useLocalSearchParams();
-  const segments = useSegments();
-  const { jellyseerrApi, jellyseerrUser } = useJellyseerr();
-
-  const { personId } = local as { personId: string };
-  const from = segments[2];
-
-  const [currentIndex, setCurrentIndex] = useState(0);
-  const fadeAnim = useRef(new Animated.Value(0)).current;
-
-  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(
-    () =>
-      orderBy(
-        data?.combinedCredits?.cast,
-        ["voteCount", "voteAverage"],
-        "desc"
-      ),
-    [data?.combinedCredits]
-  );
-
-  const backdrops = useMemo(
-    () => castedRoles.map((c) => c.backdropPath),
-    [data?.combinedCredits]
-  );
-
-  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 (backdrops?.length) {
-      enterAnimation().start();
-      const intervalId = setInterval(() => {
-        exitAnimation().start((end) => {
-          if (end.finished)
-            setCurrentIndex((prevIndex) => (prevIndex + 1) % backdrops?.length);
-        });
-      }, BACKDROP_DURATION);
-
-      return () => clearInterval(intervalId);
-    }
-  }, [backdrops, enterAnimation, exitAnimation, setCurrentIndex, currentIndex]);
-
-  const viewDetails = (credit: PersonCreditCast) => {
-    router.push({
-      //@ts-ignore
-      pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
-      //@ts-ignore
-      params: {
-        ...credit,
-        mediaTitle: credit.title,
-        releaseYear: new Date(credit.releaseDate).getFullYear(),
-        canRequest: "false",
-        posterSrc: jellyseerrApi?.imageProxy(
-          credit.posterPath,
-          "w300_and_h450_face"
-        ),
-      },
-    });
-  };
-
-  return (
-    <View
-      className="flex-1 relative"
-      style={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-    >
-      <ParallaxScrollView
-        className="flex-1 opacity-100"
-        headerHeight={300}
-        headerImage={
-          <Animated.Image
-            source={{
-              uri: jellyseerrApi?.imageProxy(
-                backdrops?.[currentIndex],
-                "w1920_and_h800_multi_faces"
-              ),
-            }}
-            style={{
-              width: "100%",
-              height: "100%",
-              opacity: fadeAnim,
-            }}
-          />
-        }
-        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,
-            }}
-          />
-        }
-      >
-        <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">
-              <Text className="font-bold text-2xl mb-1">
-                {data?.details?.name}
-              </Text>
-              <Text className="opacity-50">
-                Born{" "}
-                {new Date(data?.details?.birthday!!).toLocaleDateString(
-                  `${locale}-${region}`,
-                  {
-                    year: "numeric",
-                    month: "long",
-                    day: "numeric",
-                  }
-                )}{" "}
-                | {data?.details?.placeOfBirth}
-              </Text>
-            </View>
-          </View>
-          <OverviewText text={data?.details?.biography} className="mt-4" />
-
-          <View>
-            <FlashList
-              data={castedRoles}
-              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">Appearances</Text>
-              }
-              renderItem={({ item }) => (
-                <TouchableOpacity
-                  className="w-full flex flex-col pr-2"
-                  onPress={() => viewDetails(item)}
-                >
-                  <Poster
-                    id={item.id.toString()}
-                    url={jellyseerrApi?.imageProxy(item.posterPath)}
-                  />
-                  <JellyseerrMediaIcon
-                    className="absolute top-1 left-1"
-                    mediaType={item.mediaType as "movie" | "tv"}
-                  />
-                  {/*<Text numberOfLines={1}>{item.title}</Text>*/}
-                  {item.character && (
-                    <Text
-                      className="text-xs opacity-50 align-bottom mt-1"
-                      numberOfLines={1}
-                    >
-                      as {item.character}
-                    </Text>
-                  )}
-                </TouchableOpacity>
-              )}
-              keyExtractor={(item) => item.id.toString()}
-              estimatedItemSize={255}
-              numColumns={3}
-              contentContainerStyle={{ paddingBottom: 24 }}
-              ItemSeparatorComponent={() => <View className="h-2 w-2" />}
-            />
-          </View>
-        </View>
-      </ParallaxScrollView>
-    </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
@@ -0,0 +1,95 @@
+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
@@ -0,0 +1,87 @@
+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,28 +1,23 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { useLocalSearchParams, useNavigation } from "expo-router";
-import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
-import { Text } from "@/components/common/Text";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-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 {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from "@/utils/jellyseerr/server/constants/media";
-import { useQuery } from "@tanstack/react-query";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { Button } from "@/components/Button";
+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 { useJellyseerr } from "@/hooks/useJellyseerr";
+import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
+import {
+  IssueType,
+  IssueTypeName,
+} from "@/utils/jellyseerr/server/constants/issue";
+import { MediaType } from "@/utils/jellyseerr/server/constants/media";
+import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
+import { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
+import { Ionicons } from "@expo/vector-icons";
 import {
  BottomSheetBackdrop,
  BottomSheetBackdropProps,
@@ -30,19 +25,16 @@ import {
  BottomSheetTextInput,
  BottomSheetView,
 } from "@gorhom/bottom-sheet";
-import {
-  IssueType,
-  IssueTypeName,
-} from "@/utils/jellyseerr/server/constants/issue";
+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 { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
-import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
-import { JellyserrRatings } from "@/components/Ratings";
-import MediaRequest from "@/utils/jellyseerr/server/entity/MediaRequest";
-import DetailFacts from "@/components/jellyseerr/DetailFacts";
-import { ItemActions } from "@/components/series/SeriesActions";
-import Cast from "@/components/jellyseerr/Cast";
-import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
+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";

 const Page: React.FC = () => {
  const insets = useSafeAreaInsets();
@@ -60,6 +52,7 @@ const Page: React.FC = () => {

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

  const {
@@ -83,7 +76,7 @@ const Page: React.FC = () => {
    },
  });

-  const canRequest = useJellyseerrCanRequest(details);
+  const [canRequest, hasAdvancedRequestPermission] = useJellyseerrCanRequest(details);

  const renderBackdrop = useCallback(
    (props: BottomSheetBackdropProps) => (
@@ -109,19 +102,27 @@ const Page: React.FC = () => {
  }, [jellyseerrApi, details, result, issueType, issueMessage]);

  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),
-      },
-      refetch
-    );
-  }, [details, result, requestMedia]);
+    const body: MediaRequestBody = {
+      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]
+  )

  useEffect(() => {
    if (details) {
@@ -240,6 +241,10 @@ const Page: React.FC = () => {
                result={result as TvResult}
                details={details as TvDetails}
                refetch={refetch}
+                hasAdvancedRequest={hasAdvancedRequestPermission}
+                onAdvancedRequest={(data) =>
+                  advancedReqModalRef?.current?.present(data)
+              }
              />
            )}
            <DetailFacts
@@ -250,6 +255,17 @@ const Page: React.FC = () => {
          </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
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx
@@ -0,0 +1,107 @@
+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";
+
+export default function page() {
+  const local = useLocalSearchParams();
+  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="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">
+            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)/(libraries)/[libraryId].tsx
+++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
@@ -150,8 +150,6 @@ const Page = () => {
        itemType = "Series";
      } else if (library.CollectionType === "boxsets") {
        itemType = "BoxSet";
-      } else if (library.CollectionType === "music") {
-        itemType = "MusicAlbum";
      }

      const response = await getItemsApi(api).getItems({
--- a/app/(auth)/(tabs)/(libraries)/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/_layout.tsx
@@ -6,7 +6,7 @@ import { Platform } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";

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

  if (!settings?.libraryOptions) return null;

@@ -25,6 +25,7 @@ export default function IndexLayout() {
          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
          headerRight: () => (
+            !pluginSettings?.libraryOptions?.locked &&
            <DropdownMenu.Root>
              <DropdownMenu.Trigger>
                <Ionicons
--- a/app/(auth)/(tabs)/(libraries)/index.tsx
+++ b/app/(auth)/(tabs)/(libraries)/index.tsx
@@ -33,7 +33,11 @@ export default function index() {
  });

  const libraries = useMemo(
-    () => data?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)),
+    () =>
+      data
+        ?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!))
+        .filter((l) => l.CollectionType !== "music")
+        .filter((l) => l.CollectionType !== "books") || [],
    [data, settings?.hiddenLibraries]
  );

--- a/app/(auth)/(tabs)/(search)/_layout.tsx
+++ b/app/(auth)/(tabs)/(search)/_layout.tsx
@@ -36,7 +36,9 @@ export default function SearchLayout() {
        }}
      />
      <Stack.Screen name="jellyseerr/page" options={commonScreenOptions} />
-      <Stack.Screen name="jellyseerr/[personId]" 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,14 +2,16 @@ 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 { Loader } from "@/components/Loader";
-import AlbumCover from "@/components/posters/AlbumCover";
+import { JellyserrIndexPage } from "@/components/jellyseerr/JellyseerrIndexPage";
 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,
@@ -20,7 +22,6 @@ import axios from "axios";
 import { Href, router, useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, {
-  PropsWithChildren,
  useCallback,
  useEffect,
  useLayoutEffect,
@@ -30,19 +31,6 @@ import React, {
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDebounce } from "use-debounce";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import {
-  MovieResult,
-  PersonResult,
-  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";
-import PersonPoster from "@/components/jellyseerr/PersonPoster";
-import { useReactNavigationQuery } from "@/utils/useReactNavigationQuery";

 type SearchType = "Library" | "Discover";

@@ -155,57 +143,6 @@ export default function search() {
    enabled: searchType === "Library" && debouncedSearch.length > 0,
  });

-  const { data: jellyseerrResults, isFetching: j1 } = useReactNavigationQuery({
-    queryKey: ["search", "jellyseerr", "results", 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 } =
-    useReactNavigationQuery({
-      queryKey: ["search", "jellyseerr", "discoverSettings", 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 jellyseerrPersonResults: PersonResult[] | undefined = useMemo(
-    () =>
-      jellyseerrResults?.filter(
-        (r) => r.mediaType === "person"
-      ) as PersonResult[],
-    [jellyseerrResults]
-  );
-
  const { data: series, isFetching: l2 } = useQuery({
    queryKey: ["search", "series", debouncedSearch],
    queryFn: () =>
@@ -246,64 +183,19 @@ 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 ||
-      jellyseerrMovieResults?.length ||
-      jellyseerrTvResults?.length
+      actors?.length
    );
-  }, [
-    artists,
-    episodes,
-    albums,
-    songs,
-    movies,
-    series,
-    collections,
-    actors,
-    jellyseerrResults,
-  ]);
+  }, [episodes, movies, series, collections, actors]);

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

  return (
    <>
@@ -350,15 +242,13 @@ export default function search() {
              </TouchableOpacity>
            </View>
          )}
-          {!!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="mt-2">
+            <LoadingSkeleton isLoading={loading} />
+          </View>
+
+          {searchType === "Library" ? (
+            <View className={l1 || l2 ? "opacity-0" : "opacity-100"}>
              <SearchItemWrapper
                header="Movies"
                ids={movies?.map((m) => m.Id!)}
@@ -441,181 +331,39 @@ export default function search() {
                  </TouchableItemRouter>
                )}
              />
-              <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} />
-                )}
-              />
-              <SearchItemWrapper
-                header="Actors"
-                items={jellyseerrPersonResults}
-                renderItem={(item: PersonResult) => (
-                  <PersonPoster
-                    className="mr-2"
-                    key={item.id}
-                    id={item.id.toString()}
-                    name={item.name}
-                    posterPath={item.profilePath}
-                  />
-                )}
-              />
-            </>
+            </View>
+          ) : (
+            <JellyserrIndexPage searchQuery={debouncedSearch} />
          )}

-          {loading ? (
-            <View className="mt-4 flex justify-center items-center">
-              <Loader />
-            </View>
-          ) : noResults && debouncedSearch.length > 0 ? (
-            <View>
-              <Text className="text-center text-lg font-bold mt-4">
-                No results found for
-              </Text>
-              <Text className="text-xs text-purple-600 text-center">
-                "{debouncedSearch}"
-              </Text>
-            </View>
-          ) : debouncedSearch.length === 0 && searchType === "Library" ? (
-            <View className="mt-4 flex flex-col items-center space-y-2">
-              {exampleSearches.map((e) => (
-                <TouchableOpacity
-                  onPress={() => setSearch(e)}
-                  key={e}
-                  className="mb-2"
-                >
-                  <Text className="text-purple-600">{e}</Text>
-                </TouchableOpacity>
-              ))}
-            </View>
-          ) : debouncedSearch.length === 0 && searchType === "Discover" ? (
-            <View className="flex flex-col">
-              {sortBy?.(
-                jellyseerrDiscoverSettings?.filter((s) => s.enabled),
-                "order"
-              ).map((slide) => (
-                <DiscoverSlide key={slide.id} slide={slide} />
-              ))}
-            </View>
-          ) : null}
+          {searchType === "Library" && (
+            <>
+              {!loading && noResults && debouncedSearch.length > 0 ? (
+                <View>
+                  <Text className="text-center text-lg font-bold mt-4">
+                    No results found for
+                  </Text>
+                  <Text className="text-xs text-purple-600 text-center">
+                    "{debouncedSearch}"
+                  </Text>
+                </View>
+              ) : debouncedSearch.length === 0 ? (
+                <View className="mt-4 flex flex-col items-center space-y-2">
+                  {exampleSearches.map((e) => (
+                    <TouchableOpacity
+                      onPress={() => setSearch(e)}
+                      key={e}
+                      className="mb-2"
+                    >
+                      <Text className="text-purple-600">{e}</Text>
+                    </TouchableOpacity>
+                  ))}
+                </View>
+              ) : null}
+            </>
+          )}
        </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
@@ -51,7 +51,7 @@ export default function TabLayout() {
    <>
      <SystemBars hidden={false} style="light" />
      <NativeTabs
-        sidebarAdaptable
+        sidebarAdaptable={false}
        ignoresTopSafeArea
        barTintColor={Platform.OS === "android" ? "#121212" : undefined}
        tabBarActiveTintColor={Colors.primary}
--- a/app/(auth)/player/_layout.tsx
+++ b/app/(auth)/player/_layout.tsx
@@ -25,15 +25,6 @@ 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
@@ -48,6 +48,7 @@ import {
 import { useSharedValue } from "react-native-reanimated";
 import settings from "../(tabs)/(home)/settings";
 import { useSettings } from "@/utils/atoms/settings";
+import { useSafeAreaInsets } from "react-native-safe-area-context";

 export default function page() {
  const videoRef = useRef<VlcPlayerViewRef>(null);
@@ -413,6 +414,8 @@ 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">
@@ -437,6 +440,8 @@ export default function page() {
          position: "relative",
          flexDirection: "column",
          justifyContent: "center",
+          paddingLeft: ignoreSafeAreas ? 0 : insets.left,
+          paddingRight: ignoreSafeAreas ? 0 : insets.right,
        }}
      >
        <VlcPlayerView
--- a/app/(auth)/player/music-player.tsx
+++ b/app/(auth)/player/music-player.tsx
@@ -1,419 +0,0 @@
-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 { useHaptic } from "@/hooks/useHaptic";
-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 lightHapticFeedback = useHaptic("light");
-
-  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) => {
-      lightHapticFeedback();
-      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
@@ -414,7 +414,6 @@ const Player = () => {
              playWhenInactive={true}
              allowsExternalPlayback={true}
              playInBackground={true}
-              pictureInPicture={true}
              showNotificationControls={true}
              ignoreSilentSwitch="ignore"
              fullscreen={false}
@@ -532,7 +531,6 @@ export function useVideoSource(
      startPosition,
      headers: getAuthHeaders(api),
      metadata: {
-        artist: item?.AlbumArtist ?? undefined,
        title: item?.Name || "Unknown",
        description: item?.Overview ?? undefined,
        imageUri: poster,
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -1,16 +1,12 @@
 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,
-  MaterialIcons,
-} from "@expo/vector-icons";
+import { Ionicons, MaterialCommunityIcons } 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";
@@ -313,6 +309,15 @@ const Login: React.FC = () => {
                >
                  Connect
                </Button>
+                <JellyfinServerDiscovery
+                  onServerSelect={(server) => {
+                    setServerURL(server.address);
+                    if (server.serverName) {
+                      setServerName(server.serverName);
+                    }
+                    handleConnect(server.address);
+                  }}
+                />
                <PreviousServersList
                  onServerSelect={(s) => {
                    handleConnect(s.address);
--- a/augmentations/api.ts
+++ b/augmentations/api.ts
@@ -0,0 +1,46 @@
+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,3 +1,4 @@
+export * from "./api";
 export * from "./mmkv";
 export * from "./number";
 export * from "./string";
--- a/augmentations/mmkv.ts
+++ b/augmentations/mmkv.ts
@@ -13,5 +13,10 @@ MMKV.prototype.get = function <T> (key: string): T | undefined {
 }

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

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

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

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

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

 Number.prototype.secondsToMilliseconds = function () {
--- a/bun.lockb
+++ b/bun.lockb
--- a/components/BitrateSelector.tsx
+++ b/components/BitrateSelector.tsx
@@ -27,6 +27,10 @@ export const BITRATES: Bitrate[] = [
    key: "2 Mb/s",
    value: 2000000,
  },
+  {
+    key: "1 Mb/s",
+    value: 1000000,
+  },
  {
    key: "500 Kb/s",
    value: 500000,
--- 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 { useSettings } from "@/utils/atoms/settings";
+import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { saveDownloadItemInfoToDiskTmp } from "@/utils/optimize-server";
@@ -74,7 +74,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
    [user]
  );
  const usingOptimizedServer = useMemo(
-    () => settings?.downloadMethod === "optimized",
+    () => settings?.downloadMethod === DownloadMethod.Optimized,
    [settings]
  );

--- a/components/JellyfinServerDiscovery.tsx
+++ b/components/JellyfinServerDiscovery.tsx
@@ -0,0 +1,44 @@
+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";
+
+interface Props {
+  onServerSelect?: (server: { address: string; serverName?: string }) => void;
+}
+
+const JellyfinServerDiscovery: React.FC<Props> = ({ onServerSelect }) => {
+  const { servers, isSearching, startDiscovery } = useJellyfinDiscovery();
+
+  return (
+    <View className="mt-2">
+      <Button onPress={startDiscovery} color="black">
+        <Text className="text-white text-center">
+          {isSearching ? "Searching..." : "Search for local servers"}
+        </Text>
+      </Button>
+
+      {servers.length ? (
+        <ListGroup title="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
@@ -29,6 +29,27 @@ export const MediaSourceSelector: React.FC<Props> = ({
    [item, selected]
  );

+  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"
@@ -63,9 +84,7 @@ export const MediaSourceSelector: React.FC<Props> = ({
              }}
            >
              <DropdownMenu.ItemTitle>
-                {`${name(source.Name)} - ${convertBitsToMegabitsOrGigabits(
-                  source.Size
-                )}`}
+                {`${name(source.Name)}`}
              </DropdownMenu.ItemTitle>
            </DropdownMenu.Item>
          ))}
@@ -74,9 +93,3 @@ 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/ParallaxPage.tsx
+++ b/components/ParallaxPage.tsx
@@ -1,6 +1,6 @@
 import { LinearGradient } from "expo-linear-gradient";
 import { type PropsWithChildren, type ReactElement } from "react";
-import { View, ViewProps } from "react-native";
+import {NativeScrollEvent, NativeSyntheticEvent, View, ViewProps} from "react-native";
 import Animated, {
  interpolate,
  useAnimatedRef,
@@ -13,6 +13,7 @@ interface Props extends ViewProps {
  logo?: ReactElement;
  episodePoster?: ReactElement;
  headerHeight?: number;
+  onEndReached?: (() => void) | null | undefined;
 }

 export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
@@ -21,6 +22,7 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
  episodePoster,
  headerHeight = 400,
  logo,
+  onEndReached,
  ...props
 }: Props) => {
  const scrollRef = useAnimatedRef<Animated.ScrollView>();
@@ -47,6 +49,11 @@ 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
@@ -55,6 +62,10 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
        }}
        ref={scrollRef}
        scrollEventThrottle={16}
+        onScroll={e => {
+          if (isCloseToBottom(e.nativeEvent))
+            onEndReached?.()
+        }}
      >
        {logo && (
          <View
--- a/components/common/Dropdown.tsx
+++ b/components/common/Dropdown.tsx
@@ -0,0 +1,108 @@
+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/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -26,18 +26,6 @@ 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}`;
  }
--- a/components/downloads/ActiveDownloads.tsx
+++ b/components/downloads/ActiveDownloads.tsx
@@ -1,7 +1,6 @@
 import { Text } from "@/components/common/Text";
 import { useDownload } from "@/providers/DownloadProvider";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
+import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
 import { JobStatus } from "@/utils/optimize-server";
 import { formatTimeString } from "@/utils/time";
 import { Ionicons } from "@expo/vector-icons";
@@ -9,7 +8,6 @@ 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,
@@ -62,7 +60,7 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
    mutationFn: async (id: string) => {
      if (!process) throw new Error("No active download");

-      if (settings?.downloadMethod === "optimized") {
+      if (settings?.downloadMethod === DownloadMethod.Optimized) {
        try {
          const tasks = await checkForExistingDownloads();
          for (const task of tasks) {
--- a/components/home/Favorites.tsx
+++ b/components/home/Favorites.tsx
@@ -54,14 +54,6 @@ 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">
@@ -102,18 +94,6 @@ export const Favorites = () => {
        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,3 +1,4 @@
+import { useHaptic } from "@/hooks/useHaptic";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
@@ -6,9 +7,11 @@ 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, TouchableOpacity, View, ViewProps } from "react-native";
+import { Dimensions, View, ViewProps } from "react-native";
+import { Gesture, GestureDetector } from "react-native-gesture-handler";
 import Animated, {
  runOnJS,
  useSharedValue,
@@ -18,11 +21,7 @@ import Carousel, {
  ICarouselInstance,
  Pagination,
 } from "react-native-reanimated-carousel";
-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 { useHaptic } from "@/hooks/useHaptic";
+import { itemRouter } from "../common/TouchableItemRouter";

 interface Props extends ViewProps {}

--- a/components/inputs/Stepper.tsx
+++ b/components/inputs/Stepper.tsx
@@ -1,8 +1,10 @@
 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,
@@ -12,6 +14,7 @@ interface StepperProps {

 export const Stepper: React.FC<StepperProps> = ({
  value,
+  disabled,
  step,
  min,
  max,
@@ -19,7 +22,11 @@ export const Stepper: React.FC<StepperProps> = ({
  appendValue
 }) => {
  return (
-    <View className="flex flex-row items-center">
+    <DisabledSetting
+      disabled={disabled === true}
+      showText={false}
+      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"
@@ -39,6 +46,6 @@ export const Stepper: React.FC<StepperProps> = ({
      >
        <Text>+</Text>
      </TouchableOpacity>
-    </View>
+    </DisabledSetting>
  )
 }
--- a/components/jellyseerr/Cast.tsx
+++ b/components/jellyseerr/Cast.tsx
@@ -10,7 +10,7 @@ const CastSlide: React.FC<
  { details?: MovieDetails | TvDetails } & ViewProps
 > = ({ details, ...props }) => {
  return (
-    details?.credits?.cast?.length &&
+    details?.credits?.cast &&
    details?.credits?.cast?.length > 0 && (
      <View {...props}>
        <Text className="text-lg font-bold mb-2 px-4">Cast</Text>
--- a/components/jellyseerr/DetailFacts.tsx
+++ b/components/jellyseerr/DetailFacts.tsx
@@ -29,8 +29,8 @@ const Facts: React.FC<
 > = ({ title, facts, ...props }) =>
  facts &&
  facts?.length > 0 && (
-    <View className="flex flex-row justify-between py-2" {...props}>
-      <Text className="font-bold">{title}</Text>
+    <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) =>
--- a/components/jellyseerr/JellyseerrIndexPage.tsx
+++ b/components/jellyseerr/JellyseerrIndexPage.tsx
@@ -0,0 +1,159 @@
+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";
+
+interface Props extends ViewProps {
+  searchQuery: string;
+}
+
+export const JellyserrIndexPage: React.FC<Props> = ({ searchQuery }) => {
+  const { jellyseerrApi } = useJellyseerr();
+  const opacity = useSharedValue(1);
+
+  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">
+              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="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} />
+          )}
+        />
+        <SearchItemWrapper
+          header="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/ParallaxSlideShow.tsx
+++ b/components/jellyseerr/ParallaxSlideShow.tsx
@@ -0,0 +1,160 @@
+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/components/jellyseerr/PersonPoster.tsx
+++ b/components/jellyseerr/PersonPoster.tsx
@@ -26,7 +26,7 @@ const PersonPoster: React.FC<Props & ViewProps> = ({

  if (from === "(home)" || from === "(search)" || from === "(libraries)")
    return (
-      <TouchableOpacity onPress={() => router.push(`/(auth)/(tabs)/${from}/jellyseerr/${id}`)}>
+      <TouchableOpacity onPress={() => router.push(`/(auth)/(tabs)/${from}/jellyseerr/person/${id}`)}>
        <View className="flex flex-col w-28" {...props}>
          <Poster
            id={id}
--- a/components/jellyseerr/RequestModal.tsx
+++ b/components/jellyseerr/RequestModal.tsx
@@ -0,0 +1,233 @@
+import React, {forwardRef, useCallback, useMemo, useState} from "react";
+import {View, ViewProps} from "react-native";
+import {useJellyseerr} from "@/hooks/useJellyseerr";
+import {useQuery} from "@tanstack/react-query";
+import {MediaType} from "@/utils/jellyseerr/server/constants/media";
+import {BottomSheetBackdrop, BottomSheetBackdropProps, BottomSheetModal, BottomSheetView} from "@gorhom/bottom-sheet";
+import Dropdown from "@/components/common/Dropdown";
+import {QualityProfile, RootFolder, Tag} from "@/utils/jellyseerr/server/api/servarr/base";
+import {MediaRequestBody} from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
+import {BottomSheetModalMethods} from "@gorhom/bottom-sheet/lib/typescript/types";
+import {Button} from "@/components/Button";
+import {Text} from "@/components/common/Text";
+
+interface Props {
+  id: number;
+  title: string,
+  type: MediaType;
+  isAnime?: boolean;
+  is4k?: boolean;
+  onRequested?: () => void;
+}
+
+const RequestModal = forwardRef<BottomSheetModalMethods, Props & Omit<ViewProps, 'id'>>(({
+  id,
+  title,
+  type,
+  isAnime = false,
+  onRequested,
+  ...props
+}, ref) => {
+  const {jellyseerrApi, jellyseerrUser, requestMedia} = useJellyseerr();
+  const [requestOverrides, setRequestOverrides] =
+    useState<MediaRequestBody>({
+      mediaId: Number(id),
+      mediaType: type,
+      userId: jellyseerrUser?.id
+    });
+
+  const [modalRequestProps, setModalRequestProps] = useState<MediaRequestBody>();
+
+  const {data: serviceSettings} = useQuery({
+    queryKey: ["jellyseerr", "request", type, 'service'],
+    queryFn: async () => jellyseerrApi?.service(type == 'movie' ? 'radarr' : 'sonarr'),
+    enabled: !!jellyseerrApi && !!jellyseerrUser,
+    refetchOnMount: 'always'
+  });
+
+  const {data: users} = useQuery({
+    queryKey: ["jellyseerr", "users"],
+    queryFn: async () => jellyseerrApi?.user({take: 1000, sort: 'displayname'}),
+    enabled: !!jellyseerrApi && !!jellyseerrUser,
+    refetchOnMount: 'always'
+  });
+
+  const defaultService = useMemo(
+    () => serviceSettings?.find?.(v => v.isDefault),
+    [serviceSettings]
+  );
+
+  const {data: defaultServiceDetails} = useQuery({
+    queryKey: ["jellyseerr", "request", type, 'service', 'details', defaultService?.id],
+    queryFn: async () => {
+      setRequestOverrides((prev) => ({
+        ...prev,
+        serverId: defaultService?.id
+      }))
+      return jellyseerrApi?.serviceDetails(type === 'movie' ? 'radarr' : 'sonarr', defaultService!!.id)
+    },
+    enabled: !!jellyseerrApi && !!jellyseerrUser && !!defaultService,
+    refetchOnMount: 'always',
+  });
+
+  const defaultProfile: QualityProfile = useMemo(
+    () => defaultServiceDetails?.profiles
+      .find(p =>
+        p.id === (isAnime ? defaultServiceDetails.server?.activeAnimeProfileId : defaultServiceDetails.server?.activeProfileId)
+      ),
+    [defaultServiceDetails]
+  );
+
+  const defaultFolder: RootFolder = useMemo(
+    () => defaultServiceDetails?.rootFolders
+      .find(f =>
+        f.path === (isAnime ? defaultServiceDetails?.server.activeAnimeDirectory : defaultServiceDetails.server?.activeDirectory)
+    ),
+    [defaultServiceDetails]
+  );
+
+  const defaultTags: Tag[] = useMemo(
+    () => {
+      const tags =  defaultServiceDetails?.tags
+        .filter(t =>
+          (isAnime
+            ? defaultServiceDetails?.server.activeAnimeTags
+            : defaultServiceDetails?.server.activeTags
+          )?.includes(t.id)
+        ) ?? []
+
+      console.log(tags)
+      return tags
+    },
+    [defaultServiceDetails]
+  );
+
+  const seasonTitle = useMemo(
+    () => modalRequestProps?.seasons?.length ? `Season (${modalRequestProps?.seasons})` : undefined,
+    [modalRequestProps?.seasons]
+  );
+
+  const request = useCallback(() => {requestMedia(
+      seasonTitle ? `${title}, ${seasonTitle}` : title,
+      {
+        is4k: defaultService?.is4k || defaultServiceDetails?.server.is4k,
+        profileId: defaultProfile.id,
+        rootFolder: defaultFolder.path,
+        tags: defaultTags.map(t => t.id),
+        ...modalRequestProps,
+        ...requestOverrides
+      },
+      onRequested
+    )
+  }, [requestOverrides, defaultProfile, defaultFolder, defaultTags]);
+
+  const pathTitleExtractor = (item: RootFolder) => `${item.path} (${item.freeSpace.bytesToReadable()})`;
+
+  return (
+    <BottomSheetModal
+      ref={ref}
+      enableDynamicSizing
+      enableDismissOnClose
+      onDismiss={() => setModalRequestProps(undefined)}
+      handleIndicatorStyle={{
+        backgroundColor: "white",
+      }}
+      backgroundStyle={{
+        backgroundColor: "#171717",
+      }}
+      backdropComponent={(sheetProps: BottomSheetBackdropProps) =>
+        <BottomSheetBackdrop
+          {...sheetProps}
+          disappearsOnIndex={-1}
+          appearsOnIndex={0}
+        />
+      }
+    >
+      {(data) => {
+        setModalRequestProps(data?.data as MediaRequestBody)
+        return <BottomSheetView>
+          <View className="flex flex-col space-y-4 px-4 pb-8 pt-2">
+            <View>
+              <Text className="font-bold text-2xl text-neutral-100">Advanced</Text>
+              {seasonTitle &&
+                  <Text className="text-neutral-300">{seasonTitle}</Text>
+              }
+            </View>
+            <View className="flex flex-col space-y-2">
+              {(defaultService && defaultServiceDetails && users) && (
+                <>
+                  <Dropdown
+                    data={defaultServiceDetails.profiles}
+                    titleExtractor={(item) => item.name}
+                    placeholderText={defaultProfile.name}
+                    keyExtractor={(item) => item.id.toString()}
+                    label={"Quality Profile"}
+                    onSelected={(item) =>
+                      item && setRequestOverrides((prev) => ({
+                        ...prev,
+                        profileId: item?.id
+                      }))
+                    }
+                    title={"Quality Profile"}
+                  />
+                  <Dropdown
+                    data={defaultServiceDetails.rootFolders}
+                    titleExtractor={pathTitleExtractor}
+                    placeholderText={defaultFolder ? pathTitleExtractor(defaultFolder) : ""}
+                    keyExtractor={(item) => item.id.toString()}
+                    label={"Root Folder"}
+                    onSelected={(item) =>
+                      item && setRequestOverrides((prev) => ({
+                        ...prev,
+                        rootFolder: item.path
+                      }))}
+                    title={"Root Folder"}
+                  />
+                  <Dropdown
+                    multi={true}
+                    data={defaultServiceDetails.tags}
+                    titleExtractor={(item) => item.label}
+                    placeholderText={defaultTags.map(t => t.label).join(",")}
+                    keyExtractor={(item) => item.id.toString()}
+                    label={"Tags"}
+                    onSelected={(...item) =>
+                      item && setRequestOverrides((prev) => ({
+                        ...prev,
+                        tags: item.map(i => i.id)
+                      }))
+                    }
+                    title={"Tags"}
+                  />
+                  <Dropdown
+                    data={users}
+                    titleExtractor={(item) => item.displayName}
+                    placeholderText={jellyseerrUser!!.displayName}
+                    keyExtractor={(item) => item.id.toString() || ""}
+                    label={"Request As"}
+                    onSelected={(item) =>
+                      item && setRequestOverrides((prev) => ({
+                        ...prev,
+                        userId: item?.id
+                      }))
+                    }
+                    title={"Request As"}
+                  />
+                </>
+              )
+              }
+            </View>
+            <Button
+              className="mt-auto"
+              onPress={request}
+              color="purple"
+            >
+              Request
+            </Button>
+          </View>
+        </BottomSheetView>
+      }}
+    </BottomSheetModal>
+  );
+});
+
+export default RequestModal;
--- a/components/jellyseerr/discover/CompanySlide.tsx
+++ b/components/jellyseerr/discover/CompanySlide.tsx
@@ -0,0 +1,41 @@
+import React, {useCallback} from "react";
+import {
+  useJellyseerr,
+} from "@/hooks/useJellyseerr";
+import {TouchableOpacity, ViewProps} from "react-native";
+import Slide, {SlideProps} from "@/components/jellyseerr/discover/Slide";
+import {COMPANY_LOGO_IMAGE_FILTER, Network} from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
+import GenericSlideCard from "@/components/jellyseerr/discover/GenericSlideCard";
+import {Studio} from "@/utils/jellyseerr/src/components/Discover/StudioSlider";
+import {router, useSegments} from "expo-router";
+
+const CompanySlide: React.FC<{data: Network[] | Studio[]} & SlideProps & ViewProps> = ({ slide, data, ...props }) => {
+  const segments = useSegments();
+  const { jellyseerrApi } = useJellyseerr();
+  const from = segments[2];
+
+  const navigate = useCallback(({id, image, name}: Network | Studio) => router.push({
+    pathname: `/(auth)/(tabs)/${from}/jellyseerr/company/${id}`,
+    params: {id, image, name, type: slide.type }
+  }), [slide]);
+
+  return (
+    <Slide
+      {...props}
+      slide={slide}
+      data={data}
+      keyExtractor={(item) => item.id.toString()}
+      renderItem={(item, index) => (
+        <TouchableOpacity className="mr-2" onPress={() => navigate(item)}>
+          <GenericSlideCard
+            className="w-28 rounded-lg overflow-hidden border border-neutral-900 p-4"
+            id={item.id.toString()}
+            url={jellyseerrApi?.imageProxy(item.image, COMPANY_LOGO_IMAGE_FILTER)}
+          />
+        </TouchableOpacity>
+      )}
+    />
+  );
+};
+
+export default CompanySlide;
--- a/components/jellyseerr/discover/Discover.tsx
+++ b/components/jellyseerr/discover/Discover.tsx
@@ -0,0 +1,47 @@
+import React, {useMemo} from "react";
+import DiscoverSlider from "@/utils/jellyseerr/server/entity/DiscoverSlider";
+import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
+import {sortBy} from "lodash";
+import MovieTvSlide from "@/components/jellyseerr/discover/MovieTvSlide";
+import CompanySlide from "@/components/jellyseerr/discover/CompanySlide";
+import {View} from "react-native";
+import {networks} from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
+import {studios} from "@/utils/jellyseerr/src/components/Discover/StudioSlider";
+import GenreSlide from "@/components/jellyseerr/discover/GenreSlide";
+
+interface Props {
+  sliders?: DiscoverSlider[];
+}
+const Discover: React.FC<Props> = ({ sliders }) => {
+  if (!sliders)
+    return;
+
+  const sortedSliders = useMemo(
+    () => sortBy(sliders.filter((s) => s.enabled), 'order', 'asc'),
+    [sliders]
+  );
+
+  return (
+    <View className="flex flex-col space-y-4 mb-8">
+      {sortedSliders.map(slide => {
+        switch (slide.type) {
+          case DiscoverSliderType.NETWORKS:
+            return <CompanySlide key={slide.id} slide={slide} data={networks}/>
+          case DiscoverSliderType.STUDIOS:
+            return <CompanySlide key={slide.id} slide={slide} data={studios}/>
+          case DiscoverSliderType.MOVIE_GENRES:
+          case DiscoverSliderType.TV_GENRES:
+            return <GenreSlide key={slide.id} slide={slide} />
+          case DiscoverSliderType.TRENDING:
+          case DiscoverSliderType.POPULAR_MOVIES:
+          case DiscoverSliderType.UPCOMING_MOVIES:
+          case DiscoverSliderType.POPULAR_TV:
+          case DiscoverSliderType.UPCOMING_TV:
+            return <MovieTvSlide key={slide.id} slide={slide}/>
+        }
+      })}
+    </View>
+  )
+};
+
+export default Discover;
--- a/components/jellyseerr/discover/GenericSlideCard.tsx
+++ b/components/jellyseerr/discover/GenericSlideCard.tsx
@@ -0,0 +1,59 @@
+import React from "react";
+import {StyleSheet, View, ViewProps} from "react-native";
+import {Image, ImageContentFit} from "expo-image";
+import {Text} from "@/components/common/Text";
+import {LinearGradient} from "expo-linear-gradient";
+
+export const textShadowStyle = StyleSheet.create({
+  shadow: {
+    shadowColor: "#000",
+    shadowOffset: {
+      width: 1,
+      height: 1,
+    },
+    shadowOpacity: 1,
+    shadowRadius: .5,
+
+    elevation: 6,
+  }
+})
+
+const GenericSlideCard: React.FC<{id: string; url?: string, title?: string, colors?: string[], contentFit?: ImageContentFit} & ViewProps> = ({
+  id,
+  url,
+  title,
+  colors = ['#9333ea', 'transparent'],
+  contentFit = "contain",
+  ...props
+}) => (
+  <>
+    <LinearGradient
+      colors={colors}
+      start={{x: 0.5, y: 1.75}}
+      end={{x: 0.5, y: 0}}
+      className="rounded-xl"
+    >
+      <View className="rounded-xl" {...props}>
+        <Image
+          key={id}
+          id={id}
+          source={url ? {uri: url} : null}
+          cachePolicy={"memory-disk"}
+          contentFit={contentFit}
+          style={{
+            aspectRatio: "4/3",
+          }}
+        />
+        {title &&
+            <View
+                className="absolute justify-center top-0 left-0 right-0 bottom-0 items-center"
+            >
+                <Text className="text-center font-bold" style={textShadowStyle.shadow}>{title}</Text>
+            </View>
+        }
+      </View>
+    </LinearGradient>
+  </>
+);
+
+export default GenericSlideCard;
--- a/components/jellyseerr/discover/GenreSlide.tsx
+++ b/components/jellyseerr/discover/GenreSlide.tsx
@@ -0,0 +1,56 @@
+import React, {useCallback} from "react";
+import {Endpoints, useJellyseerr,} from "@/hooks/useJellyseerr";
+import {TouchableOpacity, ViewProps} from "react-native";
+import Slide, {SlideProps} from "@/components/jellyseerr/discover/Slide";
+import GenericSlideCard from "@/components/jellyseerr/discover/GenericSlideCard";
+import {router, useSegments} from "expo-router";
+import {useQuery} from "@tanstack/react-query";
+import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
+import {genreColorMap} from "@/utils/jellyseerr/src/components/Discover/constants";
+import {GenreSliderItem} from "@/utils/jellyseerr/server/interfaces/api/discoverInterfaces";
+
+const GenreSlide: React.FC<SlideProps & ViewProps> = ({ slide, ...props }) => {
+  const segments = useSegments();
+  const { jellyseerrApi } = useJellyseerr();
+  const from = segments[2];
+
+  const navigate = useCallback((genre: GenreSliderItem) => router.push({
+    pathname: `/(auth)/(tabs)/${from}/jellyseerr/genre/${genre.id}`,
+    params: {type: slide.type, name: genre.name}
+  }), [slide]);
+
+  const {data, isFetching, isLoading } = useQuery({
+    queryKey: ['jellyseerr', 'discover', slide.type, slide.id],
+    queryFn: async () => {
+      return jellyseerrApi?.getGenreSliders(
+        slide.type == DiscoverSliderType.MOVIE_GENRES
+          ? Endpoints.MOVIE
+          : Endpoints.TV
+      )
+    },
+    enabled: !!jellyseerrApi
+  })
+
+  return (
+    data && <Slide
+      {...props}
+      slide={slide}
+      data={data}
+      keyExtractor={(item) => item.id.toString()}
+      renderItem={(item, index) => (
+        <TouchableOpacity className="mr-2" onPress={() => navigate(item)}>
+          <GenericSlideCard
+            className="w-28 rounded-lg overflow-hidden border border-neutral-900"
+            id={item.id.toString()}
+            title={item.name}
+            colors={[]}
+            contentFit={"cover"}
+            url={jellyseerrApi?.imageProxy(item.backdrops?.[0], `w780_filter(duotone,${genreColorMap[item.id] ?? genreColorMap[0]})`)}
+          />
+        </TouchableOpacity>
+      )}
+    />
+  );
+};
+
+export default GenreSlide;
--- a/components/jellyseerr/discover/MovieTvSlide.tsx
+++ b/components/jellyseerr/discover/MovieTvSlide.tsx
@@ -1,5 +1,4 @@
-import React, { useMemo } from "react";
-import DiscoverSlider from "@/utils/jellyseerr/server/entity/DiscoverSlider";
+import React, {useMemo} from "react";
 import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
 import {
  DiscoverEndpoint,
@@ -9,17 +8,13 @@ import {
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
 import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-import { Text } from "@/components/common/Text";
-import { FlashList } from "@shopify/flash-list";
-import { View } from "react-native";
+import Slide, {SlideProps} from "@/components/jellyseerr/discover/Slide";
+import {ViewProps} from "react-native";

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

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

  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 && (
-      <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,
-          }}
-          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>
+      <Slide
+        {...props}
+        slide={slide}
+        data={flatData}
+        keyExtractor={(item) => item!!.id.toString()}
+        onEndReached={() => {
+          if (hasNextPage)
+            fetchNextPage()
+        }}
+        renderItem={(item) =>
+          <JellyseerrPoster item={item as MovieResult | TvResult} />
+      }
+      />
    )
  );
 };

-export default DiscoverSlide;
+export default MovieTvSlide;
--- a/components/jellyseerr/discover/Slide.tsx
+++ b/components/jellyseerr/discover/Slide.tsx
@@ -0,0 +1,55 @@
+import React, {PropsWithChildren} from "react";
+import DiscoverSlider from "@/utils/jellyseerr/server/entity/DiscoverSlider";
+import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
+import { Text } from "@/components/common/Text";
+import { FlashList } from "@shopify/flash-list";
+import {View, ViewProps} from "react-native";
+
+export interface SlideProps {
+  slide: DiscoverSlider;
+}
+
+interface Props<T> extends SlideProps {
+  data: T[]
+  renderItem: (item: T, index: number) =>
+    | React.ComponentType<any>
+    | React.ReactElement
+    | null
+    | undefined;
+  keyExtractor: (item: T) => string;
+  onEndReached?: (() => void) | null | undefined;
+}
+
+const Slide = <T extends unknown>({
+  data,
+  slide,
+  renderItem,
+  keyExtractor,
+  onEndReached,
+  ...props
+}: PropsWithChildren<Props<T> & ViewProps>
+) => {
+  return (
+    <View {...props}>
+      <Text className="font-bold text-lg mb-2 px-4">
+        {DiscoverSliderType[slide.type].toString().toTitle()}
+      </Text>
+      <FlashList
+        horizontal
+        contentContainerStyle={{
+          paddingHorizontal: 16,
+        }}
+        showsHorizontalScrollIndicator={false}
+        keyExtractor={keyExtractor}
+        estimatedItemSize={250}
+        data={data}
+        onEndReachedThreshold={1}
+        onEndReached={onEndReached}
+        //@ts-ignore
+        renderItem={({item, index}) => item ? renderItem(item, index) : <></>}
+      />
+    </View>
+  );
+};
+
+export default Slide;
--- a/components/library/LibraryItemCard.tsx
+++ b/components/library/LibraryItemCard.tsx
@@ -60,8 +60,6 @@ export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
      _itemType = "Series";
    } else if (library.CollectionType === "boxsets") {
      _itemType = "BoxSet";
-    } else if (library.CollectionType === "music") {
-      _itemType = "MusicAlbum";
    }

    return _itemType;
@@ -76,8 +74,6 @@ export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
      nameStr = "series";
    } else if (library.CollectionType === "boxsets") {
      nameStr = "box sets";
-    } else if (library.CollectionType === "music") {
-      nameStr = "albums";
    } else {
      nameStr = "items";
    }
--- a/components/music/SongsList.tsx
+++ b/components/music/SongsList.tsx
@@ -1,35 +0,0 @@
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useRouter } from "expo-router";
-import { View, ViewProps } from "react-native";
-import { SongsListItem } from "./SongsListItem";
-
-interface Props extends ViewProps {
-  songs?: BaseItemDto[] | null;
-  collectionId: string;
-  artistId: string;
-  albumId: string;
-}
-
-export const SongsList: React.FC<Props> = ({
-  collectionId,
-  artistId,
-  albumId,
-  songs = [],
-  ...props
-}) => {
-  const router = useRouter();
-  return (
-    <View className="flex flex-col space-y-2" {...props}>
-      {songs?.map((item: BaseItemDto, index: number) => (
-        <SongsListItem
-          key={item.Id}
-          item={item}
-          index={index}
-          collectionId={collectionId}
-          artistId={artistId}
-          albumId={albumId}
-        />
-      ))}
-    </View>
-  );
-};
--- a/components/music/SongsListItem.tsx
+++ b/components/music/SongsListItem.tsx
@@ -1,128 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { usePlaySettings } from "@/providers/PlaySettingsProvider";
-import { runtimeTicksToSeconds } from "@/utils/time";
-import { useActionSheet } from "@expo/react-native-action-sheet";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useRouter } from "expo-router";
-import { useAtom } from "jotai";
-import { useCallback } from "react";
-import { TouchableOpacity, TouchableOpacityProps, View } from "react-native";
-import CastContext, {
-  PlayServicesState,
-  useCastDevice,
-  useRemoteMediaClient,
-} from "react-native-google-cast";
-
-interface Props extends TouchableOpacityProps {
-  collectionId: string;
-  artistId: string;
-  albumId: string;
-  item: BaseItemDto;
-  index: number;
-}
-
-export const SongsListItem: React.FC<Props> = ({
-  collectionId,
-  artistId,
-  albumId,
-  item,
-  index,
-  ...props
-}) => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const castDevice = useCastDevice();
-  const router = useRouter();
-  const client = useRemoteMediaClient();
-  const { showActionSheetWithOptions } = useActionSheet();
-
-  const { setPlaySettings } = usePlaySettings();
-
-  const openSelect = () => {
-    if (!castDevice?.deviceId) {
-      play("device");
-      return;
-    }
-
-    const options = ["Chromecast", "Device", "Cancel"];
-    const cancelButtonIndex = 2;
-
-    showActionSheetWithOptions(
-      {
-        options,
-        cancelButtonIndex,
-      },
-      (selectedIndex: number | undefined) => {
-        switch (selectedIndex) {
-          case 0:
-            play("cast");
-            break;
-          case 1:
-            play("device");
-            break;
-          case cancelButtonIndex:
-            break;
-        }
-      }
-    );
-  };
-
-  const play = useCallback(async (type: "device" | "cast") => {
-    if (!user?.Id || !api || !item.Id) {
-      console.warn("No user, api or item", user, api, item.Id);
-      return;
-    }
-
-    const data = await setPlaySettings({
-      item,
-    });
-
-    if (!data?.url) {
-      throw new Error("play-music ~ No stream url");
-    }
-
-    if (type === "cast" && client) {
-      await CastContext.getPlayServicesState().then((state) => {
-        if (state && state !== PlayServicesState.SUCCESS)
-          CastContext.showPlayServicesErrorDialog(state);
-        else {
-          client.loadMedia({
-            mediaInfo: {
-              contentUrl: data.url!,
-              contentType: "video/mp4",
-              metadata: {
-                type: item.Type === "Episode" ? "tvShow" : "movie",
-                title: item.Name || "",
-                subtitle: item.Overview || "",
-              },
-            },
-            startTime: 0,
-          });
-        }
-      });
-    } else {
-      console.log("Playing on device", data.url, item.Id);
-      router.push("/music-player");
-    }
-  }, []);
-
-  return (
-    <TouchableOpacity
-      onPress={() => {
-        openSelect();
-      }}
-      {...props}
-    >
-      <View className="flex flex-row items-center space-x-4 bg-neutral-900 border-neutral-800 px-4 py-4 rounded-xl">
-        <Text className="opacity-50">{index + 1}</Text>
-        <View>
-          <Text className="mb-0.5 font-semibold">{item.Name}</Text>
-          <Text className="opacity-50 text-xs">
-            {runtimeTicksToSeconds(item.RunTimeTicks)}
-          </Text>
-        </View>
-      </View>
-    </TouchableOpacity>
-  );
-};
--- a/components/posters/AlbumCover.tsx
+++ b/components/posters/AlbumCover.tsx
@@ -1,82 +0,0 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { getPrimaryImageUrlById } from "@/utils/jellyfin/image/getPrimaryImageUrlById";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { Image } from "expo-image";
-import { useAtom } from "jotai";
-import { useMemo } from "react";
-import { View } from "react-native";
-
-type ArtistPosterProps = {
-  item?: BaseItemDto | null;
-  id?: string | null;
-  showProgress?: boolean;
-};
-
-const AlbumCover: React.FC<ArtistPosterProps> = ({ item, id }) => {
-  const [api] = useAtom(apiAtom);
-
-  const url = useMemo(() => {
-    const u = getPrimaryImageUrl({
-      api,
-      item,
-    });
-    return u;
-  }, [item]);
-
-  const url2 = useMemo(() => {
-    const u = getPrimaryImageUrlById({
-      api,
-      id,
-      quality: 85,
-      width: 300,
-    });
-    return u;
-  }, [item]);
-
-  if (!item && id)
-    return (
-      <View className="relative rounded-lg overflow-hidden border border-neutral-900">
-        <Image
-          key={id}
-          id={id}
-          source={
-            url2
-              ? {
-                  uri: url2,
-                }
-              : null
-          }
-          cachePolicy={"memory-disk"}
-          contentFit="cover"
-          style={{
-            aspectRatio: "1/1",
-          }}
-        />
-      </View>
-    );
-
-  if (item)
-    return (
-      <View className="relative rounded-md overflow-hidden border border-neutral-900">
-        <Image
-          key={item.Id}
-          id={item.Id}
-          source={
-            url
-              ? {
-                  uri: url,
-                }
-              : null
-          }
-          cachePolicy={"memory-disk"}
-          contentFit="cover"
-          style={{
-            aspectRatio: "1/1",
-          }}
-        />
-      </View>
-    );
-};
-
-export default AlbumCover;
--- a/components/posters/ArtistPoster.tsx
+++ b/components/posters/ArtistPoster.tsx
@@ -1,57 +0,0 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { Image } from "expo-image";
-import { useAtom } from "jotai";
-import { useMemo } from "react";
-import { View } from "react-native";
-
-type ArtistPosterProps = {
-  item: BaseItemDto;
-  showProgress?: boolean;
-};
-
-const ArtistPoster: React.FC<ArtistPosterProps> = ({
-  item,
-  showProgress = false,
-}) => {
-  const [api] = useAtom(apiAtom);
-
-  const url = useMemo(
-    () =>
-      getPrimaryImageUrl({
-        api,
-        item,
-      }),
-    [item]
-  );
-
-  if (!url)
-    return (
-      <View
-        className="rounded-lg overflow-hidden border border-neutral-900"
-        style={{
-          aspectRatio: "1/1",
-        }}
-      ></View>
-    );
-
-  return (
-    <View className="relative rounded-md overflow-hidden border border-neutral-900">
-      <Image
-        key={item.Id}
-        id={item.Id}
-        source={{
-          uri: url,
-        }}
-        cachePolicy={"memory-disk"}
-        contentFit="cover"
-        style={{
-          aspectRatio: "1/1",
-        }}
-      />
-    </View>
-  );
-};
-
-export default ArtistPoster;
--- a/components/posters/JellyseerrPoster.tsx
+++ b/components/posters/JellyseerrPoster.tsx
@@ -1,36 +1,52 @@
-import { View, ViewProps } from "react-native";
-import { Image } from "expo-image";
-import { Text } from "@/components/common/Text";
-import { useMemo } from "react";
-import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
-import {
-  MediaStatus,
-  MediaType,
-} from "@/utils/jellyseerr/server/constants/media";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import {
-  hasPermission,
-  Permission,
-} from "@/utils/jellyseerr/server/lib/permissions";
 import { TouchableJellyseerrRouter } from "@/components/common/JellyseerrItemRouter";
-import JellyseerrStatusIcon from "@/components/jellyseerr/JellyseerrStatusIcon";
+import { Text } from "@/components/common/Text";
 import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
+import JellyseerrStatusIcon from "@/components/jellyseerr/JellyseerrStatusIcon";
+import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
+import { MediaType } from "@/utils/jellyseerr/server/constants/media";
+import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
+import { Image } from "expo-image";
+import { useMemo } from "react";
+import { View, ViewProps } from "react-native";
+import Animated, {
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from "react-native-reanimated";
+
 interface Props extends ViewProps {
  item: MovieResult | TvResult;
 }

 const JellyseerrPoster: React.FC<Props> = ({ item, ...props }) => {
  const { jellyseerrApi } = useJellyseerr();
+  const loadingOpacity = useSharedValue(1);
+  const imageOpacity = useSharedValue(0);
+
+  const loadingAnimatedStyle = useAnimatedStyle(() => ({
+    opacity: loadingOpacity.value,
+  }));
+
+  const imageAnimatedStyle = useAnimatedStyle(() => ({
+    opacity: imageOpacity.value,
+  }));
+
+  const handleImageLoad = () => {
+    loadingOpacity.value = withTiming(0, { duration: 200 });
+    imageOpacity.value = withTiming(1, { duration: 300 });
+  };

  const imageSrc = useMemo(
    () => jellyseerrApi?.imageProxy(item.posterPath, "w300_and_h450_face"),
    [item, jellyseerrApi]
  );
+
  const title = useMemo(
    () => (item.mediaType === MediaType.MOVIE ? item.title : item.name),
    [item]
  );
+
  const releaseYear = useMemo(
    () =>
      new Date(
@@ -41,7 +57,7 @@ const JellyseerrPoster: React.FC<Props> = ({ item, ...props }) => {
    [item]
  );

-  const canRequest = useJellyseerrCanRequest(item);
+  const [canRequest] = useJellyseerrCanRequest(item);

  return (
    <TouchableJellyseerrRouter
@@ -53,23 +69,25 @@ const JellyseerrPoster: React.FC<Props> = ({ item, ...props }) => {
    >
      <View className="flex flex-col w-28 mr-2">
        <View className="relative rounded-lg overflow-hidden border border-neutral-900 w-28 aspect-[10/15]">
-          <Image
-            key={item.id}
-            id={item.id.toString()}
-            source={{ uri: imageSrc }}
-            cachePolicy={"memory-disk"}
-            contentFit="cover"
-            style={{
-              aspectRatio: "10/15",
-              width: "100%",
-            }}
-          />
+          <Animated.View style={imageAnimatedStyle}>
+            <Image
+              key={item.id}
+              id={item.id.toString()}
+              source={{ uri: imageSrc }}
+              cachePolicy={"memory-disk"}
+              contentFit="cover"
+              style={{
+                aspectRatio: "10/15",
+                width: "100%",
+              }}
+              onLoad={handleImageLoad}
+            />
+          </Animated.View>
          <JellyseerrStatusIcon
            className="absolute bottom-1 right-1"
            showRequestIcon={canRequest}
            mediaStatus={item?.mediaInfo?.status}
          />
-
          <JellyseerrMediaIcon
            className="absolute top-1 left-1"
            mediaType={item?.mediaType}
--- a/components/search/LoadingSkeleton.tsx
+++ b/components/search/LoadingSkeleton.tsx
@@ -0,0 +1,66 @@
+import { View } from "react-native";
+import { Text } from "../common/Text";
+import Animated, {
+  useAnimatedStyle,
+  useAnimatedReaction,
+  useSharedValue,
+  withTiming,
+} from "react-native-reanimated";
+
+interface Props {
+  isLoading: boolean;
+}
+
+export const LoadingSkeleton: React.FC<Props> = ({ isLoading }) => {
+  const opacity = useSharedValue(1);
+
+  const animatedStyle = useAnimatedStyle(() => {
+    return {
+      opacity: opacity.value,
+    };
+  });
+
+  useAnimatedReaction(
+    () => isLoading,
+    (loading) => {
+      if (loading) {
+        opacity.value = withTiming(1, { duration: 200 });
+      } else {
+        opacity.value = withTiming(0, { duration: 200 });
+      }
+    }
+  );
+
+  return (
+    <Animated.View style={animatedStyle} className="mt-2 absolute w-full">
+      {[1, 2, 3].map((s) => (
+        <View className="px-4 mb-4" key={s}>
+          <View className="w-1/2 bg-neutral-900 h-6 mb-2 rounded-lg"></View>
+          <View className="flex flex-row gap-2">
+            {[1, 2, 3].map((i) => (
+              <View className="w-28" key={i}>
+                <View className="bg-neutral-900 h-40 w-full rounded-md mb-1"></View>
+                <View className="rounded-md overflow-hidden mb-1 self-start">
+                  <Text
+                    className="text-neutral-900 bg-neutral-900 rounded-md"
+                    numberOfLines={1}
+                  >
+                    Nisi mollit voluptate amet.
+                  </Text>
+                </View>
+                <View className="rounded-md overflow-hidden self-start mb-1">
+                  <Text
+                    className="text-neutral-900 bg-neutral-900 text-xs rounded-md"
+                    numberOfLines={1}
+                  >
+                    Lorem ipsum
+                  </Text>
+                </View>
+              </View>
+            ))}
+          </View>
+        </View>
+      ))}
+    </Animated.View>
+  );
+};
--- a/components/search/SearchItemWrapper.tsx
+++ b/components/search/SearchItemWrapper.tsx
@@ -0,0 +1,70 @@
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import { useQuery } from "@tanstack/react-query";
+import { useAtom } from "jotai";
+import { PropsWithChildren } from "react";
+import { ScrollView } from "react-native";
+import { Text } from "../common/Text";
+
+type SearchItemWrapperProps<T> = {
+  ids?: string[] | null;
+  items?: T[];
+  renderItem: (item: any) => React.ReactNode;
+  header?: string;
+};
+
+export const SearchItemWrapper = <T extends unknown>({
+  ids,
+  items,
+  renderItem,
+  header,
+}: PropsWithChildren<SearchItemWrapperProps<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/components/series/JellyseerrSeasons.tsx
+++ b/components/series/JellyseerrSeasons.tsx
@@ -21,6 +21,7 @@ import { Image } from "expo-image";
 import MediaRequest from "@/utils/jellyseerr/server/entity/MediaRequest";
 import { Loader } from "../Loader";
 import {MovieDetails} from "@/utils/jellyseerr/server/models/Movie";
+import {MediaRequestBody} from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";

 const JellyseerrSeasonEpisodes: React.FC<{
  details: TvDetails;
@@ -101,8 +102,17 @@ const JellyseerrSeasons: React.FC<{
  isLoading: boolean;
  result?: TvResult;
  details?: TvDetails;
+  hasAdvancedRequest?: boolean,
+  onAdvancedRequest?: (data: MediaRequestBody) => void;
  refetch:  (options?: (RefetchOptions | undefined)) => Promise<QueryObserverResult<TvDetails | MovieDetails | undefined, Error>>;
-}> = ({ isLoading, result, details, refetch }) => {
+}> = ({
+  isLoading,
+  result,
+  details,
+  refetch,
+  hasAdvancedRequest,
+  onAdvancedRequest,
+}) => {
  if (!details) return null;

  const { jellyseerrApi, requestMedia } = useJellyseerr();
@@ -142,7 +152,7 @@ const JellyseerrSeasons: React.FC<{

  const requestAll = useCallback(() => {
    if (details && jellyseerrApi) {
-      requestMedia(result?.name!!, {
+      const body: MediaRequestBody = {
        mediaId: details.id,
        mediaType: MediaType.TV,
        tvdbId: details.externalIds?.tvdbId,
@@ -151,9 +161,15 @@ const JellyseerrSeasons: React.FC<{
            (s) => s.status === MediaStatus.UNKNOWN && s.seasonNumber !== 0
          )
          .map((s) => s.seasonNumber),
-      });
+      }
+
+      if (hasAdvancedRequest) {
+        return onAdvancedRequest?.(body)
+      }
+
+      requestMedia(result?.name!!, body, refetch);
    }
-  }, [jellyseerrApi, seasons, details]);
+  }, [jellyseerrApi, seasons, details, hasAdvancedRequest, onAdvancedRequest]);

  const promptRequestAll = useCallback(
    () =>
@@ -172,18 +188,20 @@ const JellyseerrSeasons: React.FC<{

  const requestSeason = useCallback(async (canRequest: Boolean, seasonNumber: number) => {
    if (canRequest) {
-      requestMedia(
-        `${result?.name!!}, Season ${seasonNumber}`,
-        {
-          mediaId: details.id,
-          mediaType: MediaType.TV,
-          tvdbId: details.externalIds?.tvdbId,
-          seasons: [seasonNumber],
-        },
-        refetch
-      )
+      const body: MediaRequestBody = {
+        mediaId: details.id,
+        mediaType: MediaType.TV,
+        tvdbId: details.externalIds?.tvdbId,
+        seasons: [seasonNumber],
+      }
+
+      if (hasAdvancedRequest) {
+        return onAdvancedRequest?.(body)
+      }
+
+      requestMedia(`${result?.name!!}, Season ${seasonNumber}`, body, refetch);
    }
-  }, [requestMedia]);
+  }, [requestMedia, hasAdvancedRequest, onAdvancedRequest]);

  if (isLoading)
    return (
--- a/components/settings/AudioToggles.tsx
+++ b/components/settings/AudioToggles.tsx
@@ -6,11 +6,13 @@ import { Switch } from "react-native-gesture-handler";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 import { Ionicons } from "@expo/vector-icons";
+import {useSettings} from "@/utils/atoms/settings";

 interface Props extends ViewProps {}

 export const AudioToggles: React.FC<Props> = ({ ...props }) => {
  const media = useMedia();
+  const [_, __, pluginSettings] = useSettings();
  const { settings, updateSettings } = media;
  const cultures = media.cultures;

@@ -26,9 +28,13 @@ export const AudioToggles: React.FC<Props> = ({ ...props }) => {
          </Text>
        }
      >
-        <ListItem title={"Set Audio Track From Previous Item"}>
+        <ListItem
+          title={"Set Audio Track From Previous Item"}
+          disabled={pluginSettings?.rememberAudioSelections?.locked}
+        >
          <Switch
            value={settings.rememberAudioSelections}
+            disabled={pluginSettings?.rememberAudioSelections?.locked}
            onValueChange={(value) =>
              updateSettings({ rememberAudioSelections: value })
            }
--- a/components/settings/DisabledSetting.tsx
+++ b/components/settings/DisabledSetting.tsx
@@ -0,0 +1,26 @@
+import {View, ViewProps} from "react-native";
+import {Text} from "@/components/common/Text";
+
+const DisabledSetting: React.FC<{disabled: boolean, showText?: boolean, text?: string} & ViewProps> = ({
+  disabled = false,
+  showText = true,
+  text,
+  children,
+  ...props
+}) => (
+  <View
+    pointerEvents={disabled ? "none" : "auto"}
+    style={{
+      opacity: disabled ? 0.5 : 1,
+    }}
+  >
+    <View {...props}>
+      {disabled && showText &&
+          <Text className="text-center text-red-700 my-4">{text ?? "Currently disabled by admin."}</Text>
+      }
+      {children}
+    </View>
+  </View>
+)
+
+export default DisabledSetting;
--- a/components/settings/DownloadSettings.tsx
+++ b/components/settings/DownloadSettings.tsx
@@ -1,33 +1,45 @@
 import { Stepper } from "@/components/inputs/Stepper";
 import { useDownload } from "@/providers/DownloadProvider";
-import { Settings, useSettings } from "@/utils/atoms/settings";
+import { DownloadMethod, Settings, useSettings } from "@/utils/atoms/settings";
 import { Ionicons } from "@expo/vector-icons";
 import { useQueryClient } from "@tanstack/react-query";
 import { useRouter } from "expo-router";
-import React from "react";
-import { Switch, TouchableOpacity, View } from "react-native";
+import React, { useMemo } from "react";
+import { Switch, TouchableOpacity } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
+import DisabledSetting from "@/components/settings/DisabledSetting";

 export const DownloadSettings: React.FC = ({ ...props }) => {
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings();
  const { setProcesses } = useDownload();
  const router = useRouter();
  const queryClient = useQueryClient();

+  const allDisabled = useMemo(
+    () =>
+      pluginSettings?.downloadMethod?.locked === true &&
+      pluginSettings?.remuxConcurrentLimit?.locked === true &&
+      pluginSettings?.autoDownload.locked === true,
+    [pluginSettings]
+  );
+
  if (!settings) return null;

  return (
-    <View {...props} className="mb-4">
+    <DisabledSetting disabled={allDisabled} {...props} className="mb-4">
      <ListGroup title="Downloads">
-        <ListItem title="Download method">
+        <ListItem
+          title="Download method"
+          disabled={pluginSettings?.downloadMethod?.locked}
+        >
          <DropdownMenu.Root>
            <DropdownMenu.Trigger>
              <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
                <Text className="mr-1 text-[#8E8D91]">
-                  {settings.downloadMethod === "remux"
+                  {settings.downloadMethod === DownloadMethod.Remux
                    ? "Default"
                    : "Optimized"}
                </Text>
@@ -51,7 +63,7 @@ export const DownloadSettings: React.FC = ({ ...props }) => {
              <DropdownMenu.Item
                key="1"
                onSelect={() => {
-                  updateSettings({ downloadMethod: "remux" });
+                  updateSettings({ downloadMethod: DownloadMethod.Remux });
                  setProcesses([]);
                }}
              >
@@ -60,7 +72,7 @@ export const DownloadSettings: React.FC = ({ ...props }) => {
              <DropdownMenu.Item
                key="2"
                onSelect={() => {
-                  updateSettings({ downloadMethod: "optimized" });
+                  updateSettings({ downloadMethod: DownloadMethod.Optimized });
                  setProcesses([]);
                  queryClient.invalidateQueries({ queryKey: ["search"] });
                }}
@@ -73,7 +85,10 @@ export const DownloadSettings: React.FC = ({ ...props }) => {

        <ListItem
          title="Remux max download"
-          disabled={settings.downloadMethod !== "remux"}
+          disabled={
+            pluginSettings?.remuxConcurrentLimit?.locked ||
+            settings.downloadMethod !== DownloadMethod.Remux
+          }
        >
          <Stepper
            value={settings.remuxConcurrentLimit}
@@ -90,22 +105,31 @@ export const DownloadSettings: React.FC = ({ ...props }) => {

        <ListItem
          title="Auto download"
-          disabled={settings.downloadMethod !== "optimized"}
+          disabled={
+            pluginSettings?.autoDownload?.locked ||
+            settings.downloadMethod !== DownloadMethod.Optimized
+          }
        >
          <Switch
-            disabled={settings.downloadMethod !== "optimized"}
+            disabled={
+              pluginSettings?.autoDownload?.locked ||
+              settings.downloadMethod !== DownloadMethod.Optimized
+            }
            value={settings.autoDownload}
            onValueChange={(value) => updateSettings({ autoDownload: value })}
          />
        </ListItem>

        <ListItem
-          disabled={settings.downloadMethod !== "optimized"}
+          disabled={
+            pluginSettings?.optimizedVersionsServerUrl?.locked ||
+            settings.downloadMethod !== DownloadMethod.Optimized
+          }
          onPress={() => router.push("/settings/optimized-server/page")}
          showArrow
          title="Optimized Versions Server"
        ></ListItem>
      </ListGroup>
-    </View>
+    </DisabledSetting>
  );
 };
--- a/components/settings/Jellyseerr.tsx
+++ b/components/settings/Jellyseerr.tsx
@@ -21,7 +21,7 @@ export const JellyseerrSettings = () => {
  } = useJellyseerr();

  const [user] = useAtom(userAtom);
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings();

  const [promptForJellyseerrPass, setPromptForJellyseerrPass] =
    useState<boolean>(false);
--- a/components/settings/MediaToggles.tsx
+++ b/components/settings/MediaToggles.tsx
@@ -1,72 +1,61 @@
-import React from "react";
-import { TouchableOpacity, View, ViewProps } from "react-native";
+import React, {useMemo} from "react";
+import { ViewProps } from "react-native";
 import { useSettings } from "@/utils/atoms/settings";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
-import { Text } from "../common/Text";
+import DisabledSetting from "@/components/settings/DisabledSetting";
+import {Stepper} from "@/components/inputs/Stepper";

 interface Props extends ViewProps {}

 export const MediaToggles: React.FC<Props> = ({ ...props }) => {
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings();

  if (!settings) return null;

-  const renderSkipControl = (
-    value: number,
-    onDecrease: () => void,
-    onIncrease: () => void
-  ) => (
-    <View className="flex flex-row items-center">
-      <TouchableOpacity
-        onPress={onDecrease}
-        className="w-8 h-8 bg-neutral-800 rounded-l-lg flex items-center justify-center"
-      >
-        <Text>-</Text>
-      </TouchableOpacity>
-      <Text className="w-12 h-8 bg-neutral-800 first-letter:px-3 py-2 flex items-center justify-center">
-        {value}s
-      </Text>
-      <TouchableOpacity
-        className="w-8 h-8 bg-neutral-800 rounded-r-lg flex items-center justify-center"
-        onPress={onIncrease}
-      >
-        <Text>+</Text>
-      </TouchableOpacity>
-    </View>
-  );
+  const disabled = useMemo(() => (
+      pluginSettings?.forwardSkipTime?.locked === true &&
+      pluginSettings?.rewindSkipTime?.locked === true
+    ),
+    [pluginSettings]
+  )

  return (
-    <View {...props}>
+    <DisabledSetting
+      disabled={disabled}
+      {...props}
+    >
      <ListGroup title="Media Controls">
-        <ListItem title="Forward Skip Length">
-          {renderSkipControl(
-            settings.forwardSkipTime,
-            () =>
-              updateSettings({
-                forwardSkipTime: Math.max(0, settings.forwardSkipTime - 5),
-              }),
-            () =>
-              updateSettings({
-                forwardSkipTime: Math.min(60, settings.forwardSkipTime + 5),
-              })
-          )}
+        <ListItem
+          title="Forward Skip Length"
+          disabled={pluginSettings?.forwardSkipTime?.locked}
+        >
+          <Stepper
+            value={settings.forwardSkipTime}
+            disabled={pluginSettings?.forwardSkipTime?.locked}
+            step={5}
+            appendValue="s"
+            min={0}
+            max={60}
+            onUpdate={(forwardSkipTime) => updateSettings({forwardSkipTime})}
+          />
        </ListItem>

-        <ListItem title="Rewind Length">
-          {renderSkipControl(
-            settings.rewindSkipTime,
-            () =>
-              updateSettings({
-                rewindSkipTime: Math.max(0, settings.rewindSkipTime - 5),
-              }),
-            () =>
-              updateSettings({
-                rewindSkipTime: Math.min(60, settings.rewindSkipTime + 5),
-              })
-          )}
+        <ListItem
+          title="Rewind Length"
+          disabled={pluginSettings?.rewindSkipTime?.locked}
+        >
+          <Stepper
+            value={settings.rewindSkipTime}
+            disabled={pluginSettings?.rewindSkipTime?.locked}
+            step={5}
+            appendValue="s"
+            min={0}
+            max={60}
+            onUpdate={(rewindSkipTime) => updateSettings({rewindSkipTime})}
+          />
        </ListItem>
      </ListGroup>
-    </View>
+    </DisabledSetting>
  );
 };
--- a/components/settings/OtherSettings.tsx
+++ b/components/settings/OtherSettings.tsx
@@ -9,19 +9,18 @@ import * as BackgroundFetch from "expo-background-fetch";
 import { useRouter } from "expo-router";
 import * as ScreenOrientation from "expo-screen-orientation";
 import * as TaskManager from "expo-task-manager";
-import React, { useEffect } from "react";
-import { Linking, Switch, TouchableOpacity, ViewProps } from "react-native";
+import React, {useEffect, useMemo} from "react";
+import { Linking, Switch, TouchableOpacity } from "react-native";
 import { toast } from "sonner-native";
-import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
-
-interface Props extends ViewProps {}
+import DisabledSetting from "@/components/settings/DisabledSetting";
+import Dropdown from "@/components/common/Dropdown";

 export const OtherSettings: React.FC = () => {
  const router = useRouter();
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings();

  /********************
   * Background task
@@ -53,146 +52,114 @@ export const OtherSettings: React.FC = () => {
  /**********************
   *********************/

+  const disabled = useMemo(() => (
+    pluginSettings?.autoRotate?.locked === true &&
+    pluginSettings?.defaultVideoOrientation?.locked === true &&
+    pluginSettings?.safeAreaInControlsEnabled?.locked === true &&
+    pluginSettings?.showCustomMenuLinks?.locked === true &&
+    pluginSettings?.hiddenLibraries?.locked === true &&
+    pluginSettings?.disableHapticFeedback?.locked === true
+  ), [pluginSettings]);
+
+  const orientations = [
+    ScreenOrientation.OrientationLock.DEFAULT,
+    ScreenOrientation.OrientationLock.PORTRAIT_UP,
+    ScreenOrientation.OrientationLock.LANDSCAPE_LEFT,
+    ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT
+  ]
+
  if (!settings) return null;

  return (
-    <ListGroup title="Other" className="">
-      <ListItem title="Auto rotate">
-        <Switch
-          value={settings.autoRotate}
-          onValueChange={(value) => updateSettings({ autoRotate: value })}
-        />
-      </ListItem>
+    <DisabledSetting
+      disabled={disabled}
+    >
+      <ListGroup title="Other" className="">
+        <ListItem
+          title="Auto rotate"
+          disabled={pluginSettings?.autoRotate?.locked}
+        >
+          <Switch
+            value={settings.autoRotate}
+            disabled={pluginSettings?.autoRotate?.locked}
+            onValueChange={(value) => updateSettings({autoRotate: value})}
+          />
+        </ListItem>

-      <ListItem title="Video orientation" disabled={settings.autoRotate}>
-        <DropdownMenu.Root>
-          <DropdownMenu.Trigger>
-            <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
-              <Text className="mr-1 text-[#8E8D91]">
-                {ScreenOrientationEnum[settings.defaultVideoOrientation]}
-              </Text>
-              <Ionicons name="chevron-expand-sharp" size={18} color="#5A5960" />
-            </TouchableOpacity>
-          </DropdownMenu.Trigger>
-          <DropdownMenu.Content
-            loop={true}
-            side="bottom"
-            align="start"
-            alignOffset={0}
-            avoidCollisions={true}
-            collisionPadding={8}
-            sideOffset={8}
-          >
-            <DropdownMenu.Label>Orientation</DropdownMenu.Label>
-            <DropdownMenu.Item
-              key="1"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.DEFAULT,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.DEFAULT
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="2"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.PORTRAIT_UP,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.PORTRAIT_UP
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="3"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.LANDSCAPE_LEFT,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.LANDSCAPE_LEFT
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="4"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          </DropdownMenu.Content>
-        </DropdownMenu.Root>
-      </ListItem>
+        <ListItem
+          title="Video orientation"
+          disabled={pluginSettings?.defaultVideoOrientation?.locked || settings.autoRotate}
+        >
+          <Dropdown
+            data={orientations}
+            disabled={pluginSettings?.defaultVideoOrientation?.locked || settings.autoRotate}
+            keyExtractor={String}
+            titleExtractor={(item) =>
+              ScreenOrientationEnum[item]
+            }
+            title={
+              <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
+                <Text className="mr-1 text-[#8E8D91]">
+                  {ScreenOrientationEnum[settings.defaultVideoOrientation]}
+                </Text>
+                <Ionicons name="chevron-expand-sharp" size={18} color="#5A5960"/>
+              </TouchableOpacity>
+            }
+            label="Orientation"
+            onSelected={(defaultVideoOrientation) =>
+              updateSettings({defaultVideoOrientation})
+            }
+          />
+        </ListItem>

-      <ListItem title="Safe area in controls">
-        <Switch
-          value={settings.safeAreaInControlsEnabled}
-          onValueChange={(value) =>
-            updateSettings({ safeAreaInControlsEnabled: value })
-          }
-        />
-      </ListItem>
+        <ListItem
+          title="Safe area in controls"
+          disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
+        >
+          <Switch
+            value={settings.safeAreaInControlsEnabled}
+            disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
+            onValueChange={(value) =>
+              updateSettings({safeAreaInControlsEnabled: value})
+            }
+          />
+        </ListItem>

-      <ListItem
-        title="Show Custom Menu Links"
-        onPress={() =>
-          Linking.openURL(
-            "https://jellyfin.org/docs/general/clients/web-config/#custom-menu-links"
-          )
-        }
-      >
-        <Switch
-          value={settings.showCustomMenuLinks}
-          onValueChange={(value) =>
-            updateSettings({ showCustomMenuLinks: value })
+        <ListItem
+          title="Show Custom Menu Links"
+          disabled={pluginSettings?.showCustomMenuLinks?.locked}
+          onPress={() =>
+            Linking.openURL(
+              "https://jellyfin.org/docs/general/clients/web-config/#custom-menu-links"
+            )
          }
+        >
+          <Switch
+            value={settings.showCustomMenuLinks}
+            disabled={pluginSettings?.showCustomMenuLinks?.locked}
+            onValueChange={(value) =>
+              updateSettings({showCustomMenuLinks: value})
+            }
+          />
+        </ListItem>
+        <ListItem
+          onPress={() => router.push("/settings/hide-libraries/page")}
+          title="Hide Libraries"
+          showArrow
        />
-      </ListItem>
-      <ListItem
-        onPress={() => router.push("/settings/hide-libraries/page")}
-        title="Hide Libraries"
-        showArrow
-      />
-      <ListItem title="Disable Haptic Feedback">
-        <Switch
-          value={settings.disableHapticFeedback}
-          onValueChange={(value) =>
-            updateSettings({ disableHapticFeedback: value })
-          }
-        />
-      </ListItem>
-    </ListGroup>
+        <ListItem
+          title="Disable Haptic Feedback"
+          disabled={pluginSettings?.disableHapticFeedback?.locked}
+        >
+          <Switch
+            value={settings.disableHapticFeedback}
+            disabled={pluginSettings?.disableHapticFeedback?.locked}
+            onValueChange={(disableHapticFeedback) =>
+              updateSettings({disableHapticFeedback})
+            }
+          />
+        </ListItem>
+      </ListGroup>
+    </DisabledSetting>
  );
 };
--- a/components/settings/SubtitleToggles.tsx
+++ b/components/settings/SubtitleToggles.tsx
@@ -7,11 +7,15 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 import { Ionicons } from "@expo/vector-icons";
 import { SubtitlePlaybackMode } from "@jellyfin/sdk/lib/generated-client";
+import {useSettings} from "@/utils/atoms/settings";
+import {Stepper} from "@/components/inputs/Stepper";
+import Dropdown from "@/components/common/Dropdown";

 interface Props extends ViewProps {}

 export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
  const media = useMedia();
+  const [_, __, pluginSettings] = useSettings();
  const { settings, updateSettings } = media;
  const cultures = media.cultures;

@@ -36,8 +40,11 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
        }
      >
        <ListItem title="Subtitle language">
-          <DropdownMenu.Root>
-            <DropdownMenu.Trigger>
+          <Dropdown
+            data={[{DisplayName: "None", ThreeLetterISOLanguageName: "none-subs" },...(cultures ?? [])]}
+            keyExtractor={(item) => item?.ThreeLetterISOLanguageName ?? "unknown"}
+            titleExtractor={(item) => item?.DisplayName}
+            title={
              <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
                <Text className="mr-1 text-[#8E8D91]">
                  {settings?.defaultSubtitleLanguage?.DisplayName || "None"}
@@ -48,48 +55,28 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
                  color="#5A5960"
                />
              </TouchableOpacity>
-            </DropdownMenu.Trigger>
-            <DropdownMenu.Content
-              loop={true}
-              side="bottom"
-              align="start"
-              alignOffset={0}
-              avoidCollisions={true}
-              collisionPadding={8}
-              sideOffset={8}
-            >
-              <DropdownMenu.Label>Languages</DropdownMenu.Label>
-              <DropdownMenu.Item
-                key={"none-subs"}
-                onSelect={() => {
-                  updateSettings({
-                    defaultSubtitleLanguage: null,
-                  });
-                }}
-              >
-                <DropdownMenu.ItemTitle>None</DropdownMenu.ItemTitle>
-              </DropdownMenu.Item>
-              {cultures?.map((l) => (
-                <DropdownMenu.Item
-                  key={l?.ThreeLetterISOLanguageName ?? "unknown"}
-                  onSelect={() => {
-                    updateSettings({
-                      defaultSubtitleLanguage: l,
-                    });
-                  }}
-                >
-                  <DropdownMenu.ItemTitle>
-                    {l.DisplayName}
-                  </DropdownMenu.ItemTitle>
-                </DropdownMenu.Item>
-              ))}
-            </DropdownMenu.Content>
-          </DropdownMenu.Root>
+            }
+            label="Languages"
+            onSelected={(defaultSubtitleLanguage) =>
+              updateSettings({
+                defaultSubtitleLanguage: defaultSubtitleLanguage.DisplayName === "None"
+                  ? null
+                  : defaultSubtitleLanguage
+              })
+          }
+          />
        </ListItem>

-        <ListItem title="Subtitle Mode">
-          <DropdownMenu.Root>
-            <DropdownMenu.Trigger>
+        <ListItem
+          title="Subtitle Mode"
+          disabled={pluginSettings?.subtitleMode?.locked}
+        >
+          <Dropdown
+            data={subtitleModes}
+            disabled={pluginSettings?.subtitleMode?.locked}
+            keyExtractor={String}
+            titleExtractor={String}
+            title={
              <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
                <Text className="mr-1 text-[#8E8D91]">
                  {settings?.subtitleMode || "Loading"}
@@ -100,68 +87,39 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
                  color="#5A5960"
                />
              </TouchableOpacity>
-            </DropdownMenu.Trigger>
-            <DropdownMenu.Content
-              loop={true}
-              side="bottom"
-              align="start"
-              alignOffset={0}
-              avoidCollisions={true}
-              collisionPadding={8}
-              sideOffset={8}
-            >
-              <DropdownMenu.Label>Subtitle Mode</DropdownMenu.Label>
-              {subtitleModes?.map((l) => (
-                <DropdownMenu.Item
-                  key={l}
-                  onSelect={() => {
-                    updateSettings({
-                      subtitleMode: l,
-                    });
-                  }}
-                >
-                  <DropdownMenu.ItemTitle>{l}</DropdownMenu.ItemTitle>
-                </DropdownMenu.Item>
-              ))}
-            </DropdownMenu.Content>
-          </DropdownMenu.Root>
+            }
+            label="Subtitle Mode"
+            onSelected={(subtitleMode) =>
+              updateSettings({subtitleMode})
+            }
+          />
        </ListItem>

-        <ListItem title="Set Subtitle Track From Previous Item">
+        <ListItem
+          title="Set Subtitle Track From Previous Item"
+          disabled={pluginSettings?.rememberSubtitleSelections?.locked}
+        >
          <Switch
            value={settings.rememberSubtitleSelections}
+            disabled={pluginSettings?.rememberSubtitleSelections?.locked}
            onValueChange={(value) =>
              updateSettings({ rememberSubtitleSelections: value })
            }
          />
        </ListItem>

-        <ListItem title="Subtitle Size">
-          <View className="flex flex-row items-center">
-            <TouchableOpacity
-              onPress={() =>
-                updateSettings({
-                  subtitleSize: Math.max(0, settings.subtitleSize - 5),
-                })
-              }
-              className="w-8 h-8 bg-neutral-800 rounded-l-lg flex items-center justify-center"
-            >
-              <Text>-</Text>
-            </TouchableOpacity>
-            <Text className="w-12 h-8 bg-neutral-800 px-3 py-2 flex items-center justify-center">
-              {settings.subtitleSize}
-            </Text>
-            <TouchableOpacity
-              className="w-8 h-8 bg-neutral-800 rounded-r-lg flex items-center justify-center"
-              onPress={() =>
-                updateSettings({
-                  subtitleSize: Math.min(120, settings.subtitleSize + 5),
-                })
-              }
-            >
-              <Text>+</Text>
-            </TouchableOpacity>
-          </View>
+        <ListItem
+          title="Subtitle Size"
+          disabled={pluginSettings?.subtitleSize?.locked}
+        >
+          <Stepper
+            value={settings.subtitleSize}
+            disabled={pluginSettings?.subtitleSize?.locked}
+            step={5}
+            min={0}
+            max={120}
+            onUpdate={(subtitleSize) => updateSettings({subtitleSize})}
+          />
        </ListItem>
      </ListGroup>
    </View>
--- a/components/stacks/NestedTabPageStack.tsx
+++ b/components/stacks/NestedTabPageStack.tsx
@@ -17,14 +17,7 @@ export const commonScreenOptions: ICommonScreenOptions = {
  headerLeft: () => <HeaderBackButton />,
 };

-const routes = [
-  "actors/[actorId]",
-  "albums/[albumId]",
-  "artists/index",
-  "artists/[artistId]",
-  "items/page",
-  "series/[id]",
-];
+const routes = ["actors/[actorId]", "items/page", "series/[id]"];

 export const nestedTabPageScreenOptions: Record<string, ICommonScreenOptions> =
  Object.fromEntries(routes.map((route) => [route, commonScreenOptions]));
--- a/components/video-player/controls/Controls.tsx
+++ b/components/video-player/controls/Controls.tsx
@@ -1,8 +1,8 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
 import { useAdjacentItems } from "@/hooks/useAdjacentEpisodes";
 import { useCreditSkipper } from "@/hooks/useCreditSkipper";
+import { useHaptic } from "@/hooks/useHaptic";
 import { useIntroSkipper } from "@/hooks/useIntroSkipper";
 import { useTrickplay } from "@/hooks/useTrickplay";
 import {
@@ -29,12 +29,13 @@ import {
  BaseItemDto,
  MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client";
-import { useHaptic } from "@/hooks/useHaptic";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useRouter } from "expo-router";
+import * as ScreenOrientation from "expo-screen-orientation";
 import { useAtom } from "jotai";
 import { debounce } from "lodash";
-import { Dimensions, Pressable, TouchableOpacity, View } from "react-native";
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import { TouchableOpacity, useWindowDimensions, View } from "react-native";
 import { Slider } from "react-native-awesome-slider";
 import {
  runOnJS,
@@ -42,10 +43,7 @@ import {
  useAnimatedReaction,
  useSharedValue,
 } from "react-native-reanimated";
-import {
-  SafeAreaView,
-  useSafeAreaInsets,
-} from "react-native-safe-area-context";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { VideoRef } from "react-native-video";
 import AudioSlider from "./AudioSlider";
 import BrightnessSlider from "./BrightnessSlider";
@@ -56,6 +54,8 @@ import DropdownViewTranscoding from "./dropdown/DropdownViewTranscoding";
 import { EpisodeList } from "./EpisodeList";
 import NextEpisodeCountDownButton from "./NextEpisodeCountDownButton";
 import SkipButton from "./SkipButton";
+import { useControlsTimeout } from "./useControlsTimeout";
+import { VideoTouchOverlay } from "./VideoTouchOverlay";

 interface Props {
  item: BaseItemDto;
@@ -86,6 +86,8 @@ interface Props {
  isVlc?: boolean;
 }

+const CONTROLS_TIMEOUT = 4000;
+
 export const Controls: React.FC<Props> = ({
  item,
  seek,
@@ -118,6 +120,13 @@ export const Controls: React.FC<Props> = ({
  const insets = useSafeAreaInsets();
  const [api] = useAtom(apiAtom);

+  const [episodeView, setEpisodeView] = useState(false);
+  const [isSliding, setIsSliding] = useState(false);
+
+  // Used when user changes audio through audio button on device.
+  const [showAudioSlider, setShowAudioSlider] = useState(false);
+
+  const { height: screenHeight, width: screenWidth } = useWindowDimensions();
  const { previousItem, nextItem } = useAdjacentItems({ item });
  const {
    trickPlayUrl,
@@ -135,6 +144,23 @@ export const Controls: React.FC<Props> = ({
  const wasPlayingRef = useRef(false);
  const lastProgressRef = useRef<number>(0);

+  const lightHapticFeedback = useHaptic("light");
+
+  useEffect(() => {
+    prefetchAllTrickplayImages();
+  }, []);
+
+  useEffect(() => {
+    if (item) {
+      progress.value = isVlc
+        ? ticksToMs(item?.UserData?.PlaybackPositionTicks)
+        : item?.UserData?.PlaybackPositionTicks || 0;
+      max.value = isVlc
+        ? ticksToMs(item.RunTimeTicks || 0)
+        : item.RunTimeTicks || 0;
+    }
+  }, [item, isVlc]);
+
  const { bitrateValue, subtitleIndex, audioIndex } = useLocalSearchParams<{
    bitrateValue: string;
    audioIndex: string;
@@ -157,8 +183,6 @@ export const Controls: React.FC<Props> = ({
    isVlc
  );

-  const lightHapticFeedback = useHaptic("light");
-
  const goToPreviousItem = useCallback(() => {
    if (!previousItem || !settings) return;

@@ -262,20 +286,19 @@ export const Controls: React.FC<Props> = ({
    [updateTimes]
  );

-  useEffect(() => {
-    if (item) {
-      progress.value = isVlc
-        ? ticksToMs(item?.UserData?.PlaybackPositionTicks)
-        : item?.UserData?.PlaybackPositionTicks || 0;
-      max.value = isVlc
-        ? ticksToMs(item.RunTimeTicks || 0)
-        : item.RunTimeTicks || 0;
-    }
-  }, [item, isVlc]);
-
-  useEffect(() => {
-    prefetchAllTrickplayImages();
+  const hideControls = useCallback(() => {
+    setShowControls(false);
+    setShowAudioSlider(false);
  }, []);
+
+  const { handleControlsInteraction } = useControlsTimeout({
+    showControls,
+    isSliding,
+    episodeView,
+    onHideControls: hideControls,
+    timeout: CONTROLS_TIMEOUT,
+  });
+
  const toggleControls = () => {
    if (showControls) {
      setShowAudioSlider(false);
@@ -296,16 +319,13 @@ export const Controls: React.FC<Props> = ({
    isSeeking.value = true;
  }, [showControls, isPlaying]);

-  const [isSliding, setIsSliding] = useState(false);
  const handleSliderComplete = useCallback(
    async (value: number) => {
      isSeeking.value = false;
      progress.value = value;
      setIsSliding(false);

-      await seek(
-        Math.max(0, Math.floor(isVlc ? value : ticksToSeconds(value)))
-      );
+      seek(Math.max(0, Math.floor(isVlc ? value : ticksToSeconds(value))));
      if (wasPlayingRef.current === true) play();
    },
    [isVlc]
@@ -335,7 +355,7 @@ export const Controls: React.FC<Props> = ({
        const newTime = isVlc
          ? Math.max(0, curr - secondsToMs(settings.rewindSkipTime))
          : Math.max(0, ticksToSeconds(curr) - settings.rewindSkipTime);
-        await seek(newTime);
+        seek(newTime);
        if (wasPlayingRef.current === true) play();
      }
    } catch (error) {
@@ -353,7 +373,7 @@ export const Controls: React.FC<Props> = ({
        const newTime = isVlc
          ? curr + secondsToMs(settings.forwardSkipTime)
          : ticksToSeconds(curr) + settings.forwardSkipTime;
-        await seek(Math.max(0, newTime));
+        seek(Math.max(0, newTime));
        if (wasPlayingRef.current === true) play();
      }
    } catch (error) {
@@ -361,81 +381,6 @@ export const Controls: React.FC<Props> = ({
    }
  }, [settings, isPlaying, isVlc]);

-  const toggleIgnoreSafeAreas = useCallback(() => {
-    setIgnoreSafeAreas((prev) => !prev);
-    lightHapticFeedback();
-  }, []);
-
-  const memoizedRenderBubble = useCallback(() => {
-    if (!trickPlayUrl || !trickplayInfo) {
-      return null;
-    }
-    const { x, y, url } = trickPlayUrl;
-    const tileWidth = 150;
-    const tileHeight = 150 / trickplayInfo.aspectRatio!;
-
-    return (
-      <View
-        style={{
-          position: "absolute",
-          left: -57,
-          bottom: 15,
-          paddingTop: 30,
-          paddingBottom: 5,
-          width: tileWidth * 1.5,
-          backgroundColor: "rgba(0, 0, 0, 0.6)",
-          justifyContent: "center",
-          alignItems: "center",
-        }}
-      >
-        <View
-          style={{
-            width: tileWidth,
-            height: tileHeight,
-            alignSelf: "center",
-            transform: [{ scale: 1.4 }],
-            borderRadius: 5,
-          }}
-          className="bg-neutral-800 overflow-hidden"
-        >
-          <Image
-            cachePolicy={"memory-disk"}
-            style={{
-              width: 150 * trickplayInfo?.data.TileWidth!,
-              height:
-                (150 / trickplayInfo.aspectRatio!) *
-                trickplayInfo?.data.TileHeight!,
-              transform: [
-                { translateX: -x * tileWidth },
-                { translateY: -y * tileHeight },
-              ],
-              resizeMode: "cover",
-            }}
-            source={{ uri: url }}
-            contentFit="cover"
-          />
-        </View>
-        <Text
-          style={{
-            marginTop: 30,
-            fontSize: 16,
-          }}
-        >
-          {`${time.hours > 0 ? `${time.hours}:` : ""}${
-            time.minutes < 10 ? `0${time.minutes}` : time.minutes
-          }:${time.seconds < 10 ? `0${time.seconds}` : time.seconds}`}
-        </Text>
-      </View>
-    );
-  }, [trickPlayUrl, trickplayInfo, time]);
-
-  const [EpisodeView, setEpisodeView] = useState(false);
-
-  const switchOnEpisodeMode = () => {
-    setEpisodeView(true);
-    if (isPlaying) togglePlay();
-  };
-
  const goToItem = useCallback(
    async (itemId: string) => {
      try {
@@ -482,8 +427,77 @@ export const Controls: React.FC<Props> = ({
    [settings, subtitleIndex, audioIndex]
  );

-  // Used when user changes audio through audio button on device.
-  const [showAudioSlider, setShowAudioSlider] = useState(false);
+  const toggleIgnoreSafeAreas = useCallback(() => {
+    setIgnoreSafeAreas((prev) => !prev);
+    lightHapticFeedback();
+  }, []);
+
+  const switchOnEpisodeMode = useCallback(() => {
+    setEpisodeView(true);
+    if (isPlaying) togglePlay();
+  }, [isPlaying, togglePlay]);
+
+  const memoizedRenderBubble = useCallback(() => {
+    if (!trickPlayUrl || !trickplayInfo) {
+      return null;
+    }
+    const { x, y, url } = trickPlayUrl;
+    const tileWidth = 150;
+    const tileHeight = 150 / trickplayInfo.aspectRatio!;
+
+    return (
+      <View
+        style={{
+          position: "absolute",
+          left: -62,
+          bottom: 0,
+          paddingTop: 30,
+          paddingBottom: 5,
+          width: tileWidth * 1.5,
+          justifyContent: "center",
+          alignItems: "center",
+        }}
+      >
+        <View
+          style={{
+            width: tileWidth,
+            height: tileHeight,
+            alignSelf: "center",
+            transform: [{ scale: 1.4 }],
+            borderRadius: 5,
+          }}
+          className="bg-neutral-800 overflow-hidden"
+        >
+          <Image
+            cachePolicy={"memory-disk"}
+            style={{
+              width: 150 * trickplayInfo?.data.TileWidth!,
+              height:
+                (150 / trickplayInfo.aspectRatio!) *
+                trickplayInfo?.data.TileHeight!,
+              transform: [
+                { translateX: -x * tileWidth },
+                { translateY: -y * tileHeight },
+              ],
+              resizeMode: "cover",
+            }}
+            source={{ uri: url }}
+            contentFit="cover"
+          />
+        </View>
+        <Text
+          style={{
+            marginTop: 30,
+            fontSize: 16,
+          }}
+        >
+          {`${time.hours > 0 ? `${time.hours}:` : ""}${
+            time.minutes < 10 ? `0${time.minutes}` : time.minutes
+          }:${time.seconds < 10 ? `0${time.seconds}` : time.seconds}`}
+        </Text>
+      </View>
+    );
+  }, [trickPlayUrl, trickplayInfo, time]);

  return (
    <ControlProvider
@@ -491,7 +505,7 @@ export const Controls: React.FC<Props> = ({
      mediaSource={mediaSource}
      isVideoLoaded={isVideoLoaded}
    >
-      {EpisodeView ? (
+      {episodeView ? (
        <EpisodeList
          item={item}
          close={() => setEpisodeView(false)}
@@ -499,19 +513,12 @@ export const Controls: React.FC<Props> = ({
        />
      ) : (
        <>
-          <Pressable
-            onPressIn={() => {
-              toggleControls();
-            }}
-            style={{
-              position: "absolute",
-              width: Dimensions.get("window").width,
-              height: Dimensions.get("window").height,
-              backgroundColor: "black",
-              opacity: showControls ? 0.5 : 0,
-            }}
-          ></Pressable>
-
+          <VideoTouchOverlay
+            screenWidth={screenWidth}
+            screenHeight={screenHeight}
+            showControls={showControls}
+            onToggleControls={toggleControls}
+          />
          <View
            style={[
              {
@@ -519,13 +526,13 @@ export const Controls: React.FC<Props> = ({
                top: settings?.safeAreaInControlsEnabled ? insets.top : 0,
                right: settings?.safeAreaInControlsEnabled ? insets.right : 0,
                width: settings?.safeAreaInControlsEnabled
-                  ? Dimensions.get("window").width - insets.left - insets.right
-                  : Dimensions.get("window").width,
+                  ? screenWidth - insets.left - insets.right
+                  : screenWidth,
                opacity: showControls ? 1 : 0,
              },
            ]}
            pointerEvents={showControls ? "auto" : "none"}
-            className={`flex flex-row w-full p-4 `}
+            className={`flex flex-row w-full pt-2`}
          >
            <View className="mr-auto">
              <VideoProvider
@@ -549,7 +556,7 @@ export const Controls: React.FC<Props> = ({
                  onPress={() => {
                    switchOnEpisodeMode();
                  }}
-                  className="aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2"
+                  className="aspect-square flex flex-col rounded-xl items-center justify-center p-2"
                >
                  <Ionicons name="list" size={24} color="white" />
                </TouchableOpacity>
@@ -557,7 +564,7 @@ export const Controls: React.FC<Props> = ({
              {previousItem && !offline && (
                <TouchableOpacity
                  onPress={goToPreviousItem}
-                  className="aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2"
+                  className="aspect-square flex flex-col rounded-xl items-center justify-center p-2"
                >
                  <Ionicons name="play-skip-back" size={24} color="white" />
                </TouchableOpacity>
@@ -566,30 +573,33 @@ export const Controls: React.FC<Props> = ({
              {nextItem && !offline && (
                <TouchableOpacity
                  onPress={goToNextItem}
-                  className="aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2"
+                  className="aspect-square flex flex-col rounded-xl items-center justify-center p-2"
                >
                  <Ionicons name="play-skip-forward" size={24} color="white" />
                </TouchableOpacity>
              )}

-              {mediaSource?.TranscodingUrl && (
-                <TouchableOpacity
-                  onPress={toggleIgnoreSafeAreas}
-                  className="aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2"
-                >
-                  <Ionicons
-                    name={ignoreSafeAreas ? "contract-outline" : "expand"}
-                    size={24}
-                    color="white"
-                  />
-                </TouchableOpacity>
-              )}
+              {/* {mediaSource?.TranscodingUrl && ( */}
+              <TouchableOpacity
+                onPress={toggleIgnoreSafeAreas}
+                className="aspect-square flex flex-col rounded-xl items-center justify-center p-2"
+              >
+                <Ionicons
+                  name={ignoreSafeAreas ? "contract-outline" : "expand"}
+                  size={24}
+                  color="white"
+                />
+              </TouchableOpacity>
+              {/* )} */}
              <TouchableOpacity
                onPress={async () => {
                  lightHapticFeedback();
+                  await ScreenOrientation.lockAsync(
+                    ScreenOrientation.OrientationLock.PORTRAIT_UP
+                  );
                  router.back();
                }}
-                className="aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2"
+                className="aspect-square flex flex-col rounded-xl items-center justify-center p-2"
              >
                <Ionicons name="close" size={24} color="white" />
              </TouchableOpacity>
@@ -719,10 +729,11 @@ export const Controls: React.FC<Props> = ({
                bottom: settings?.safeAreaInControlsEnabled ? insets.bottom : 0,
              },
            ]}
-            className={`flex flex-col p-4`}
+            className={`flex flex-col px-2`}
+            onTouchStart={handleControlsInteraction}
          >
            <View
-              className="shrink flex flex-col justify-center h-full mb-2"
+              className="shrink flex flex-col justify-center h-full"
              style={{
                flexDirection: "row",
                justifyContent: "space-between",
@@ -736,10 +747,12 @@ export const Controls: React.FC<Props> = ({
                }}
                pointerEvents={showControls ? "box-none" : "none"}
              >
-                <Text className="font-bold">{item?.Name}</Text>
                {item?.Type === "Episode" && (
-                  <Text className="opacity-50">{item.SeriesName}</Text>
+                  <Text className="opacity-50">
+                    {`${item.SeriesName} - ${item.SeasonName} Episode ${item.IndexNumber}`}
+                  </Text>
                )}
+                <Text className="font-bold text-xl">{item?.Name}</Text>
                {item?.Type === "Movie" && (
                  <Text className="text-xs opacity-50">
                    {item?.ProductionYear}
@@ -774,7 +787,7 @@ export const Controls: React.FC<Props> = ({
              </View>
            </View>
            <View
-              className={`flex flex-col-reverse py-4 pb-1 px-4 rounded-lg items-center  bg-neutral-800`}
+              className={`flex flex-col-reverse rounded-lg items-center my-2`}
              style={{
                opacity: showControls ? 1 : 0,
              }}
@@ -790,19 +803,7 @@ export const Controls: React.FC<Props> = ({
                    bubbleTextColor: "#666",
                    heartbeatColor: "#999",
                  }}
-                  renderThumb={() => (
-                    <View
-                      style={{
-                        width: 18,
-                        height: 18,
-                        left: -2,
-                        borderRadius: 10,
-                        backgroundColor: "#fff",
-                        justifyContent: "center",
-                        alignItems: "center",
-                      }}
-                    />
-                  )}
+                  renderThumb={() => null}
                  cache={cacheProgress}
                  onSlidingStart={handleSliderStart}
                  onSlidingComplete={handleSliderComplete}
@@ -817,7 +818,7 @@ export const Controls: React.FC<Props> = ({
                  minimumValue={min}
                  maximumValue={max}
                />
-                <View className="flex flex-row items-center justify-between mt-0.5">
+                <View className="flex flex-row items-center justify-between mt-2">
                  <Text className="text-[12px] text-neutral-400">
                    {formatTimeString(currentTime, isVlc ? "ms" : "s")}
                  </Text>
--- a/components/video-player/controls/VideoTouchOverlay.tsx
+++ b/components/video-player/controls/VideoTouchOverlay.tsx
@@ -0,0 +1,38 @@
+import { Pressable } from "react-native";
+import { useTapDetection } from "./useTapDetection";
+
+interface Props {
+  screenWidth: number;
+  screenHeight: number;
+  showControls: boolean;
+  onToggleControls: () => void;
+}
+
+export const VideoTouchOverlay = ({
+  screenWidth,
+  screenHeight,
+  showControls,
+  onToggleControls,
+}: Props) => {
+  const { handleTouchStart, handleTouchEnd } = useTapDetection({
+    onValidTap: onToggleControls,
+  });
+
+  return (
+    <Pressable
+      onTouchStart={handleTouchStart}
+      onTouchEnd={handleTouchEnd}
+      style={{
+        position: "absolute",
+        width: screenWidth,
+        height: screenHeight,
+        backgroundColor: "black",
+        left: 0,
+        right: 0,
+        top: 0,
+        bottom: 0,
+        opacity: showControls ? 0.75 : 0,
+      }}
+    />
+  );
+};
--- a/components/video-player/controls/dropdown/DropdownViewDirect.tsx
+++ b/components/video-player/controls/dropdown/DropdownViewDirect.tsx
@@ -74,7 +74,7 @@ const DropdownViewDirect: React.FC<DropdownViewDirectProps> = ({
  return (
    <DropdownMenu.Root>
      <DropdownMenu.Trigger>
-        <TouchableOpacity className="aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2">
+        <TouchableOpacity className="aspect-square flex flex-col rounded-xl items-center justify-center p-2">
          <Ionicons name="ellipsis-horizontal" size={24} color={"white"} />
        </TouchableOpacity>
      </DropdownMenu.Trigger>
--- a/components/video-player/controls/dropdown/DropdownViewTranscoding.tsx
+++ b/components/video-player/controls/dropdown/DropdownViewTranscoding.tsx
@@ -121,7 +121,7 @@ const DropdownView: React.FC<DropdownViewProps> = ({ showControls }) => {
    <View>
      <DropdownMenu.Root>
        <DropdownMenu.Trigger>
-          <TouchableOpacity className="aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2">
+          <TouchableOpacity className="aspect-square flex flex-col rounded-xl items-center justify-center p-2">
            <Ionicons name="ellipsis-horizontal" size={24} color={"white"} />
          </TouchableOpacity>
        </DropdownMenu.Trigger>
--- a/components/video-player/controls/useControlsTimeout.ts
+++ b/components/video-player/controls/useControlsTimeout.ts
@@ -0,0 +1,56 @@
+import { useEffect, useRef } from "react";
+
+interface UseControlsTimeoutProps {
+  showControls: boolean;
+  isSliding: boolean;
+  episodeView: boolean;
+  onHideControls: () => void;
+  timeout?: number;
+}
+
+export const useControlsTimeout = ({
+  showControls,
+  isSliding,
+  episodeView,
+  onHideControls,
+  timeout = 4000,
+}: UseControlsTimeoutProps) => {
+  const controlsTimeoutRef = useRef<NodeJS.Timeout>();
+
+  useEffect(() => {
+    const resetControlsTimeout = () => {
+      if (controlsTimeoutRef.current) {
+        clearTimeout(controlsTimeoutRef.current);
+      }
+
+      if (showControls && !isSliding && !episodeView) {
+        controlsTimeoutRef.current = setTimeout(() => {
+          onHideControls();
+        }, timeout);
+      }
+    };
+
+    resetControlsTimeout();
+
+    return () => {
+      if (controlsTimeoutRef.current) {
+        clearTimeout(controlsTimeoutRef.current);
+      }
+    };
+  }, [showControls, isSliding, episodeView, timeout, onHideControls]);
+
+  const handleControlsInteraction = () => {
+    if (showControls) {
+      if (controlsTimeoutRef.current) {
+        clearTimeout(controlsTimeoutRef.current);
+      }
+      controlsTimeoutRef.current = setTimeout(() => {
+        onHideControls();
+      }, timeout);
+    }
+  };
+
+  return {
+    handleControlsInteraction,
+  };
+};
--- a/components/video-player/controls/useTapDetection.tsx
+++ b/components/video-player/controls/useTapDetection.tsx
@@ -0,0 +1,48 @@
+import { useRef } from "react";
+import { GestureResponderEvent } from "react-native";
+
+interface TapDetectionOptions {
+  maxDuration?: number;
+  maxDistance?: number;
+  onValidTap?: () => void;
+}
+
+export const useTapDetection = ({
+  maxDuration = 200,
+  maxDistance = 10,
+  onValidTap,
+}: TapDetectionOptions = {}) => {
+  const touchStartTime = useRef(0);
+  const touchStartPosition = useRef({ x: 0, y: 0 });
+
+  const handleTouchStart = (event: GestureResponderEvent) => {
+    touchStartTime.current = Date.now();
+    touchStartPosition.current = {
+      x: event.nativeEvent.pageX,
+      y: event.nativeEvent.pageY,
+    };
+  };
+
+  const handleTouchEnd = (event: GestureResponderEvent) => {
+    const touchEndTime = Date.now();
+    const touchEndPosition = {
+      x: event.nativeEvent.pageX,
+      y: event.nativeEvent.pageY,
+    };
+
+    const touchDuration = touchEndTime - touchStartTime.current;
+    const touchDistance = Math.sqrt(
+      Math.pow(touchEndPosition.x - touchStartPosition.current.x, 2) +
+        Math.pow(touchEndPosition.y - touchStartPosition.current.y, 2)
+    );
+
+    if (touchDuration < maxDuration && touchDistance < maxDistance) {
+      onValidTap?.();
+    }
+  };
+
+  return {
+    handleTouchStart,
+    handleTouchEnd,
+  };
+};
--- a/eas.json
+++ b/eas.json
@@ -22,13 +22,13 @@
      }
    },
    "production": {
-      "channel": "0.24.0",
+      "channel": "0.25.0",
      "android": {
        "image": "latest"
      }
    },
    "production-apk": {
-      "channel": "0.24.0",
+      "channel": "0.25.0",
      "android": {
        "buildType": "apk",
        "image": "latest"
--- a/hooks/useJellyfinDiscovery.tsx
+++ b/hooks/useJellyfinDiscovery.tsx
@@ -0,0 +1,106 @@
+import { useState, useCallback } from "react";
+import dgram from "react-native-udp";
+
+const JELLYFIN_DISCOVERY_PORT = 7359;
+const DISCOVERY_MESSAGE = "Who is JellyfinServer?";
+
+interface ServerInfo {
+  address: string;
+  port: number;
+  serverId?: string;
+  serverName?: string;
+}
+
+export const useJellyfinDiscovery = () => {
+  const [servers, setServers] = useState<ServerInfo[]>([]);
+  const [isSearching, setIsSearching] = useState(false);
+
+  const startDiscovery = useCallback(() => {
+    setIsSearching(true);
+    setServers([]);
+
+    const discoveredServers = new Set<string>();
+    let discoveryTimeout: NodeJS.Timeout;
+
+    const socket = dgram.createSocket({
+      type: "udp4",
+      reusePort: true,
+      debug: __DEV__,
+    });
+
+    socket.on("error", (err) => {
+      console.error("Socket error:", err);
+      socket.close();
+      setIsSearching(false);
+    });
+
+    socket.bind(0, () => {
+      console.log("UDP socket bound successfully");
+
+      try {
+        socket.setBroadcast(true);
+        const messageBuffer = new TextEncoder().encode(DISCOVERY_MESSAGE);
+
+        socket.send(
+          messageBuffer,
+          0,
+          messageBuffer.length,
+          JELLYFIN_DISCOVERY_PORT,
+          "255.255.255.255",
+          (err) => {
+            if (err) {
+              console.error("Failed to send discovery message:", err);
+              return;
+            }
+            console.log("Discovery message sent successfully");
+          }
+        );
+
+        discoveryTimeout = setTimeout(() => {
+          setIsSearching(false);
+          socket.close();
+        }, 5000);
+      } catch (error) {
+        console.error("Error during discovery:", error);
+        setIsSearching(false);
+      }
+    });
+
+    socket.on("message", (msg, rinfo: any) => {
+      if (discoveredServers.has(rinfo.address)) {
+        return;
+      }
+
+      try {
+        const response = new TextDecoder().decode(msg);
+        const serverInfo = JSON.parse(response);
+        discoveredServers.add(rinfo.address);
+
+        const newServer: ServerInfo = {
+          address: `http://${rinfo.address}:${serverInfo.Port || 8096}`,
+          port: serverInfo.Port || 8096,
+          serverId: serverInfo.Id,
+          serverName: serverInfo.Name,
+        };
+
+        setServers((prev) => [...prev, newServer]);
+      } catch (error) {
+        console.error("Error parsing server response:", error);
+      }
+    });
+
+    return () => {
+      clearTimeout(discoveryTimeout);
+      if (isSearching) {
+        setIsSearching(false);
+      }
+      socket.close();
+    };
+  }, []);
+
+  return {
+    servers,
+    isSearching,
+    startDiscovery,
+  };
+};
--- a/hooks/useJellyseerr.ts
+++ b/hooks/useJellyseerr.ts
@@ -33,6 +33,12 @@ import {
  PersonDetails,
 } from "@/utils/jellyseerr/server/models/Person";
 import { useQueryClient } from "@tanstack/react-query";
+import {GenreSliderItem} from "@/utils/jellyseerr/server/interfaces/api/discoverInterfaces";
+import {UserResultsResponse} from "@/utils/jellyseerr/server/interfaces/api/userInterfaces";
+import {
+  ServiceCommonServer,
+  ServiceCommonServerWithDetails
+} from "@/utils/jellyseerr/server/interfaces/api/serviceInterfaces";

 interface SearchParams {
  query: string;
@@ -65,16 +71,24 @@ export enum Endpoints {
  MOVIE = "/movie",
  RATINGS = "/ratings",
  ISSUE = "/issue",
+  USER = "/user",
+  SERVICE = "/service",
  TV = "/tv",
  SETTINGS = "/settings",
+  NETWORK = "/network",
+  STUDIO = "/studio",
+  GENRE_SLIDER = "/genreslider",
  DISCOVER = "/discover",
  DISCOVER_TRENDING = DISCOVER + "/trending",
  DISCOVER_MOVIES = DISCOVER + "/movies",
  DISCOVER_TV = DISCOVER + TV,
+  DISCOVER_TV_NETWORK = DISCOVER + TV + NETWORK,
+  DISCOVER_MOVIES_STUDIO = DISCOVER + `${MOVIE}s` + STUDIO,
  AUTH_JELLYFIN = "/auth/jellyfin",
 }

 export type DiscoverEndpoint =
+  | Endpoints.DISCOVER_TV_NETWORK
  | Endpoints.DISCOVER_TRENDING
  | Endpoints.DISCOVER_MOVIES
  | Endpoints.DISCOVER_TV;
@@ -181,7 +195,7 @@ export class JellyseerrApi {
  }

  async discover(
-    endpoint: DiscoverEndpoint,
+    endpoint: DiscoverEndpoint | string,
    params: any
  ): Promise<SearchResults> {
    return this.axios
@@ -189,6 +203,15 @@ export class JellyseerrApi {
      .then(({ data }) => data);
  }

+  async getGenreSliders(
+    endpoint: Endpoints.TV | Endpoints.MOVIE,
+    params: any = undefined
+  ): Promise<GenreSliderItem[]> {
+    return this.axios
+      ?.get<GenreSliderItem[]>(Endpoints.API_V1 + Endpoints.DISCOVER + Endpoints.GENRE_SLIDER + endpoint, { params })
+      .then(({ data }) => data);
+  }
+
  async search(params: SearchParams): Promise<SearchResults> {
    const response = await this.axios?.get<SearchResults>(
      Endpoints.API_V1 + Endpoints.SEARCH,
@@ -266,9 +289,15 @@ export class JellyseerrApi {
      });
  }

+  async user(params: any) {
+    return this.axios
+      ?.get<UserResultsResponse>(`${Endpoints.API_V1}${Endpoints.USER}`, { params })
+      .then(({data}) =>  data.results)
+  }
+
  imageProxy(
    path?: string,
-    tmdbPath: string = "original",
+    filter: string = "original",
    width: number = 1920,
    quality: number = 75
  ) {
@@ -276,7 +305,7 @@ export class JellyseerrApi {
      ? this.axios.defaults.baseURL +
          `/_next/image?` +
          new URLSearchParams(
-            `url=https://image.tmdb.org/t/p/${tmdbPath}/${path}&w=${width}&q=${quality}`
+            `url=https://image.tmdb.org/t/p/${filter}/${path}&w=${width}&q=${quality}`
          ).toString()
      : this.axios?.defaults.baseURL +
          `/images/overseerr_poster_not_found_logo_top.png`;
@@ -299,6 +328,18 @@ export class JellyseerrApi {
      });
  }

+  async service(type: 'radarr' | 'sonarr') {
+    return this.axios
+      ?.get<ServiceCommonServer[]>(Endpoints.API_V1 + Endpoints.SERVICE + `/${type}`)
+      .then(({data}) => data);
+  }
+
+  async serviceDetails(type: 'radarr' | 'sonarr', id: number) {
+    return this.axios
+      ?.get<ServiceCommonServerWithDetails>(Endpoints.API_V1 + Endpoints.SERVICE + `/${type}` + `/${id}`)
+      .then(({data}) => data);
+  }
+
  private setInterceptors() {
    this.axios.interceptors.response.use(
      async (response) => {
--- a/hooks/useOrientationSettings.ts
+++ b/hooks/useOrientationSettings.ts
@@ -7,7 +7,9 @@ export const useOrientationSettings = () => {

  useEffect(() => {
    if (settings?.autoRotate) {
-      // Don't need to do anything
+      ScreenOrientation.lockAsync(
+        ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT
+      );
    } else if (settings?.defaultVideoOrientation) {
      ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
    }
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
  "version": "1.0.0",
  "scripts": {
    "submodule-reload": "git submodule update --init --remote --recursive",
+    "clean": "echo y | expo prebuild --clean",
    "start": "bun run submodule-reload && expo start",
    "reset-project": "node ./scripts/reset-project.js",
    "android": "bun run submodule-reload && expo run:android",
@@ -17,14 +18,15 @@
    "preset": "jest-expo"
  },
  "dependencies": {
-    "@bottom-tabs/react-navigation": "^0.7.1",
+    "@bottom-tabs/react-navigation": "0.7.8",
+    "react-native-bottom-tabs": "0.7.8",
    "@config-plugins/ffmpeg-kit-react-native": "^8.0.0",
    "@expo/react-native-action-sheet": "^4.1.0",
    "@expo/vector-icons": "^14.0.4",
    "@futurejj/react-native-visibility-sensor": "^1.3.5",
    "@gorhom/bottom-sheet": "^4.6.4",
    "@jellyfin/sdk": "^0.11.0",
-    "@kesha-antonov/react-native-background-downloader": "3.1.2",
+    "@kesha-antonov/react-native-background-downloader": "3.2.6",
    "@react-native-async-storage/async-storage": "1.23.1",
    "@react-native-community/netinfo": "11.3.1",
    "@react-native-menu/menu": "^1.1.6",
@@ -72,7 +74,6 @@
    "react-dom": "18.2.0",
    "react-native": "0.74.5",
    "react-native-awesome-slider": "^2.5.6",
-    "react-native-bottom-tabs": "0.7.1",
    "react-native-circular-progress": "^1.4.1",
    "react-native-compressor": "^1.9.0",
    "react-native-country-flag": "^2.0.2",
@@ -93,6 +94,7 @@
    "react-native-screens": "3.31.1",
    "react-native-svg": "15.2.0",
    "react-native-tab-view": "^3.5.2",
+    "react-native-udp": "^4.1.7",
    "react-native-uitextview": "^1.4.0",
    "react-native-url-polyfill": "^2.0.0",
    "react-native-uuid": "^2.0.2",
--- a/providers/DownloadProvider.tsx
+++ b/providers/DownloadProvider.tsx
@@ -1,4 +1,4 @@
-import { useSettings } from "@/utils/atoms/settings";
+import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
 import { getOrSetDeviceId } from "@/utils/device";
 import { useLog, writeToLog } from "@/utils/log";
 import {
@@ -106,7 +106,7 @@ function useDownloadProvider() {
      const url = settings?.optimizedVersionsServerUrl;

      if (
-        settings?.downloadMethod !== "optimized" ||
+        settings?.downloadMethod !== DownloadMethod.Optimized ||
        !url ||
        !deviceId ||
        !authHeader
@@ -166,7 +166,7 @@ function useDownloadProvider() {
    },
    staleTime: 0,
    refetchInterval: 2000,
-    enabled: settings?.downloadMethod === "optimized",
+    enabled: settings?.downloadMethod === DownloadMethod.Optimized,
  });

  useEffect(() => {
--- a/providers/JellyfinProvider.tsx
+++ b/providers/JellyfinProvider.tsx
@@ -1,3 +1,4 @@
+import "@/augmentations";
 import { useInterval } from "@/hooks/useInterval";
 import { storage } from "@/utils/mmkv";
 import { Api, Jellyfin } from "@jellyfin/sdk";
@@ -19,7 +20,8 @@ import React, {
 import { Platform } from "react-native";
 import uuid from "react-native-uuid";
 import { getDeviceName } from "react-native-device-info";
-import { toast } from "sonner-native";
+import { useSettings } from "@/utils/atoms/settings";
+import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";

 interface Server {
  address: string;
@@ -55,7 +57,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
      setJellyfin(
        () =>
          new Jellyfin({
-            clientInfo: { name: "Streamyfin", version: "0.24.0" },
+            clientInfo: { name: "Streamyfin", version: "0.25.0" },
            deviceInfo: {
              name: deviceName,
              id,
@@ -70,6 +72,14 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
  const [user, setUser] = useAtom(userAtom);
  const [isPolling, setIsPolling] = useState<boolean>(false);
  const [secret, setSecret] = useState<string | null>(null);
+  const [
+    settings,
+    updateSettings,
+    pluginSettings,
+    setPluginSettings,
+    refreshStreamyfinPluginSettings,
+  ] = useSettings();
+  const { clearAllJellyseerData, setJellyseerrUser } = useJellyseerr();

  useQuery({
    queryKey: ["user", api],
@@ -92,7 +102,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    return {
      authorization: `MediaBrowser Client="Streamyfin", Device=${
        Platform.OS === "android" ? "Android" : "iOS"
-      }, DeviceId="${deviceId}", Version="0.24.0"`,
+      }, DeviceId="${deviceId}", Version="0.25.0"`,
    };
  }, [deviceId]);

@@ -226,6 +236,18 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
          storage.set("user", JSON.stringify(auth.data.User));
          setApi(jellyfin.createApi(api?.basePath, auth.data?.AccessToken));
          storage.set("token", auth.data?.AccessToken);
+
+          const recentPluginSettings = await refreshStreamyfinPluginSettings();
+          if (recentPluginSettings?.jellyseerrServerUrl?.value) {
+            const jellyseerrApi = new JellyseerrApi(
+              recentPluginSettings.jellyseerrServerUrl.value
+            );
+            await jellyseerrApi.test().then((result) => {
+              if (result.isValid && result.requiresPass) {
+                jellyseerrApi.login(username, password).then(setJellyseerrUser);
+              }
+            });
+          }
        }
      } catch (error) {
        if (axios.isAxiosError(error)) {
@@ -262,6 +284,8 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    mutationFn: async () => {
      storage.delete("token");
      setUser(null);
+      setPluginSettings(undefined);
+      await clearAllJellyseerData();
    },
    onError: (error) => {
      console.error("Logout failed:", error);
--- a/providers/PlaySettingsProvider.tsx
+++ b/providers/PlaySettingsProvider.tsx
@@ -38,7 +38,6 @@ type PlaySettingsContextType = {
  setPlayUrl: React.Dispatch<React.SetStateAction<string | null>>;
  playSessionId?: string | null;
  setOfflineSettings: (data: PlaybackType) => void;
-  setMusicPlaySettings: (item: BaseItemDto, url: string) => void;
 };

 const PlaySettingsContext = createContext<PlaySettingsContextType | undefined>(
@@ -61,13 +60,6 @@ export const PlaySettingsProvider: React.FC<{ children: React.ReactNode }> = ({
    _setPlaySettings(data);
  }, []);

-  const setMusicPlaySettings = (item: BaseItemDto, url: string) => {
-    setPlaySettings({
-      item: item,
-    });
-    setPlayUrl(url);
-  };
-
  const setPlaySettings = useCallback(
    async (
      dataOrUpdater:
@@ -147,7 +139,6 @@ export const PlaySettingsProvider: React.FC<{ children: React.ReactNode }> = ({
        setPlaySettings,
        playUrl,
        setPlayUrl,
-        setMusicPlaySettings,
        setOfflineSettings,
        playSessionId,
        mediaSource,
--- a/utils/_jellyseerr/useJellyseerrCanRequest.ts
+++ b/utils/_jellyseerr/useJellyseerrCanRequest.ts
@@ -48,5 +48,20 @@ export const useJellyseerrCanRequest = (
    return userHasPermission && !canNotRequest;
  }, [item, jellyseerrUser]);

-  return canRequest;
+  const hasAdvancedRequestPermission = useMemo(() => {
+      if (!jellyseerrUser) return false;
+
+      return hasPermission(
+        [
+          Permission.REQUEST_ADVANCED,
+          Permission.MANAGE_REQUESTS
+        ],
+        jellyseerrUser.permissions,
+        {type: 'or'}
+      )
+    },
+    [jellyseerrUser]
+  );
+
+  return [canRequest, hasAdvancedRequestPermission];
 };
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -1,12 +1,19 @@
 import { atom, useAtom } from "jotai";
-import { useEffect } from "react";
+import {useCallback, useEffect, useMemo} from "react";
 import * as ScreenOrientation from "expo-screen-orientation";
 import { storage } from "../mmkv";
 import { Platform } from "react-native";
 import {
  CultureDto,
+  PluginStatus,
  SubtitlePlaybackMode,
 } from "@jellyfin/sdk/lib/generated-client";
+import {apiAtom} from "@/providers/JellyfinProvider";
+import {getPluginsApi} from "@jellyfin/sdk/lib/utils/api";
+import {writeErrorLog} from "@/utils/log";
+
+const STREAMYFIN_PLUGIN_ID = "1e9e5d386e6746158719e98a5c34f004"
+const STREAMYFIN_PLUGIN_SETTINGS = "STREAMYFIN_PLUGIN_SETTINGS"

 export type DownloadQuality = "original" | "high" | "low";

@@ -59,6 +66,11 @@ export type DefaultLanguageOption = {
  label: string;
 };

+export enum DownloadMethod {
+  Remux = "remux",
+  Optimized = "optimized"
+}
+
 export type Settings = {
  autoRotate?: boolean;
  forceLandscapeInVideoPlayer?: boolean;
@@ -81,7 +93,7 @@ export type Settings = {
  forwardSkipTime: number;
  rewindSkipTime: number;
  optimizedVersionsServerUrl?: string | null;
-  downloadMethod: "optimized" | "remux";
+  downloadMethod: DownloadMethod;
  autoDownload: boolean;
  showCustomMenuLinks: boolean;
  disableHapticFeedback: boolean;
@@ -92,6 +104,16 @@ export type Settings = {
  hiddenLibraries?: string[];
 };

+export interface Lockable<T> {
+  locked: boolean;
+  value: T
+}
+
+export type PluginLockableSettings = { [K in keyof Settings]: Lockable<Settings[K]> };
+export type StreamyfinPluginConfig = {
+  settings: PluginLockableSettings
+}
+
 const loadSettings = (): Settings => {
  const defaultValues: Settings = {
    autoRotate: true,
@@ -121,7 +143,7 @@ const loadSettings = (): Settings => {
    forwardSkipTime: 30,
    rewindSkipTime: 10,
    optimizedVersionsServerUrl: null,
-    downloadMethod: "remux",
+    downloadMethod: DownloadMethod.Remux,
    autoDownload: false,
    showCustomMenuLinks: false,
    disableHapticFeedback: false,
@@ -150,16 +172,76 @@ const saveSettings = (settings: Settings) => {
 };

 export const settingsAtom = atom<Settings | null>(null);
+export const pluginSettingsAtom = atom(storage.get<PluginLockableSettings>(STREAMYFIN_PLUGIN_SETTINGS));

 export const useSettings = () => {
-  const [settings, setSettings] = useAtom(settingsAtom);
+  const [api] = useAtom(apiAtom);
+  const [_settings, setSettings] = useAtom(settingsAtom);
+  const [pluginSettings, _setPluginSettings] = useAtom(pluginSettingsAtom);

  useEffect(() => {
-    if (settings === null) {
+    if (_settings === null) {
      const loadedSettings = loadSettings();
      setSettings(loadedSettings);
    }
-  }, [settings, setSettings]);
+  }, [_settings, setSettings]);
+
+  const setPluginSettings = useCallback((settings: PluginLockableSettings | undefined) => {
+    storage.setAny(STREAMYFIN_PLUGIN_SETTINGS, settings)
+      _setPluginSettings(settings)
+    },
+    [_setPluginSettings]
+  )
+
+  const refreshStreamyfinPluginSettings = useCallback(
+    async () => {
+      if (!api)
+        return
+
+      const plugins = await getPluginsApi(api).getPlugins().then(({data}) => data);
+
+      if (plugins && plugins.length > 0) {
+        const streamyfinPlugin = plugins.find(plugin => plugin.Id === STREAMYFIN_PLUGIN_ID);
+
+        if (!streamyfinPlugin || streamyfinPlugin.Status != PluginStatus.Active) {
+          writeErrorLog(
+            "Streamyfin plugin is currently not active.\n" +
+            `Current status is: ${streamyfinPlugin?.Status}`
+          );
+          setPluginSettings(undefined);
+          return;
+        }
+
+        const settings = await api.getStreamyfinPluginConfig()
+          .then(({data}) => data.settings)
+
+        setPluginSettings(settings);
+        return settings;
+      }
+    },
+    [api]
+  )
+
+  // We do not want to save over users pre-existing settings in case admin ever removes/unlocks a setting.
+  // If admin sets locked to false but provides a value,
+  //  use user settings first and fallback on admin setting if required.
+  const settings: Settings = useMemo(() => {
+    const overrideSettings = Object.entries(pluginSettings || {})
+      .reduce((acc, [key, setting]) => {
+        if (setting) {
+          const {value, locked} = setting
+          acc = Object.assign(acc, {
+            [key]: locked ? value : _settings?.[key as keyof Settings] ?? value
+          })
+        }
+        return acc
+      }, {} as Settings)
+
+    return {
+      ..._settings,
+      ...overrideSettings
+    }
+  }, [_settings, setSettings, pluginSettings, _setPluginSettings, setPluginSettings])

  const updateSettings = (update: Partial<Settings>) => {
    if (settings) {
@@ -170,5 +252,5 @@ export const useSettings = () => {
    }
  };

-  return [settings, updateSettings] as const;
+  return [settings, updateSettings, pluginSettings, setPluginSettings, refreshStreamyfinPluginSettings] as const;
 };
--- a/utils/collectionTypeToItemType.ts
+++ b/utils/collectionTypeToItemType.ts
@@ -10,8 +10,6 @@ import {
 *  readonly Unknown: "unknown";
    readonly Movies: "movies";
    readonly Tvshows: "tvshows";
-    readonly Music: "music";
-    readonly Musicvideos: "musicvideos";
    readonly Trailers: "trailers";
    readonly Homevideos: "homevideos";
    readonly Boxsets: "boxsets";
@@ -33,8 +31,6 @@ export const colletionTypeToItemType = (
      return BaseItemKind.Series;
    case CollectionType.Homevideos:
      return BaseItemKind.Video;
-    case CollectionType.Musicvideos:
-      return BaseItemKind.MusicVideo;
    case CollectionType.Books:
      return BaseItemKind.Book;
    case CollectionType.Playlists:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Fredrik Burmester	7c77c70024	chore: remove everything related to music	2025-01-12 13:40:01 +01:00
Fredrik Burmester	2495a318eb	Merge pull request #394 from Ryan0204/enhancement/autohidecontrol enhancement: auto hide control after 5 seconds	2025-01-12 10:16:55 +01:00
Fredrik Burmester	7832ea4d0a	chore: deps	2025-01-12 10:10:18 +01:00
Fredrik Burmester	4a0a51ef1d	chore: refactor	2025-01-12 10:07:49 +01:00
Fredrik Burmester	8cc551d906	Merge pull request #416 from streamyfin/feat/server-discovery feat: server discovery during login	2025-01-12 09:37:33 +01:00
Fredrik Burmester	c8da365a00	fix: issues listed in pr	2025-01-12 09:36:23 +01:00
Fredrik Burmester	74b7cbc530	Merge pull request #417 from whoopsi-daisy/patch-1 Update README.md	2025-01-12 09:33:38 +01:00
𝐂𝐡𝐫𝐢𝐬	a14063a736	Update README.md Adjusted the Jellyseerr screenshot height to match the others and corrected a typo, along with rephrasing a sentence for clarity	2025-01-12 00:52:17 +08:00
Fredrik Burmester	a3307a90a3	feat: server discovery during login	2025-01-11 11:21:36 +01:00
Fredrik Burmester	a2145fd7e8	chore: update deps	2025-01-11 10:20:20 +01:00
Fredrik Burmester	cab5e4d980	chore: rename var	2025-01-11 10:10:00 +01:00
Fredrik Burmester	ab603e6997	feat: add centralised plugin info	2025-01-11 10:09:53 +01:00
ryan0204	957348fe19	prevent opening control when user swipe on screen	2025-01-11 16:41:41 +08:00
herrrta	444bd040b0	Merge pull request #402 from streamyfin/feat/401 Streamyfin Plugin App Management solution	2025-01-11 00:20:35 -05:00
herrrta	d0ae63235d	feat: [StreamyfinPlugin] Library Options settings	2025-01-11 00:16:26 -05:00
herrrta	1727125ea7	feat: [StreamyfinPlugin] Popular Plugin settings	2025-01-11 00:16:25 -05:00
herrrta	dc498d62d8	feat: [StreamyfinPlugin] Other settings	2025-01-11 00:16:25 -05:00
herrrta	455bf08213	feat: [StreamyfinPlugin] Subtitle Toggles settings - Used stepper & dropdown components to simplify page	2025-01-11 00:16:20 -05:00
herrrta	0f974ef2a3	feat: [StreamyfinPlugin] Audio Toggles settings	2025-01-10 23:26:53 -05:00
herrrta	2d9aaccfe0	feat: [StreamyfinPlugin] Media Toggles settings	2025-01-10 23:26:44 -05:00
herrrta	2c6823eb53	feat: [StreamyfinPlugin] Jellyseerr, Search Engine, & Download settings - Added DisabledSetting.tsx component - Added DownloadMethod enum - cleanup	2025-01-10 23:26:32 -05:00
herrrta	9dfcc01f17	chore	2025-01-10 20:39:32 -05:00
Fredrik Burmester	38aad9610b	Merge branch 'feat/401' of https://github.com/streamyfin/streamyfin into feat/401	2025-01-09 15:49:02 +01:00
herrrta	54af64abef	api augmentations & added streamyfin plugin id	2025-01-09 09:35:24 -05:00
herrrta	e1720a00da	initial changes	2025-01-09 09:33:55 -05:00
herrrta	882d0ea188	api augmentations & added streamyfin plugin id	2025-01-09 08:51:53 -05:00
Fredrik Burmester	f3b539232f	Merge pull request #403 from streamyfin/feature/mediasourcenames Feature: Remove duplicate names from media sources	2025-01-09 11:33:06 +01:00
sarendsen	33ea657a5c	Filter out duplicate names in media sources	2025-01-09 10:13:57 +01:00
herrrta	75820adcbc	initial changes	2025-01-08 21:52:31 -05:00
herrrta	76cdb2b3f8	fix cast npe	2025-01-08 17:31:39 -05:00
Fredrik Burmester	0a2ea33635	Merge pull request #397 from topiga/master	2025-01-08 18:50:02 +01:00
Théo FORTIN	aad6093852	Added 1 Mb/s as bitrate	2025-01-08 15:22:11 +01:00
herrrta	c553cff9d1	Added clean script	2025-01-08 08:05:06 -05:00
herrrta	dcd458bd3d	[Jellyseerr] "Currently Streaming On" misaligned text fixes #392	2025-01-08 08:04:48 -05:00
Fredrik Burmester	05dc61d17d	Merge pull request #395 from streamyfin/feat/331 [Jellyseerr] Show media configuration for admins	2025-01-08 11:40:07 +01:00
Fredrik Burmester	e4de11127f	chore	2025-01-08 11:39:50 +01:00
herrrta	2dc49735f4	[Jellyseerr] Show media configuration for admins implements #331	2025-01-07 23:53:10 -05:00
ryan0204	0ebacd4bd3	Auto hide control after 5 seconds	2025-01-08 11:29:49 +08:00
Fredrik Burmester	ef42207174	Merge pull request #383 from Ryan0204/master Change ScreenOrientation to landscape right by default and added toggleSafeArea for all videos	2025-01-07 11:01:43 +01:00
Fredrik Burmester	efa5638b12	fix: remove tab sidebar	2025-01-07 10:59:21 +01:00
Fredrik Burmester	c63cea891d	chore: remove imports	2025-01-07 10:27:56 +01:00
Fredrik Burmester	4e80f58823	fix: backdrop not filling screen	2025-01-07 10:27:30 +01:00
ryan0204	cfe39d504c	Rotate ScreenOrientation back on exit player	2025-01-07 14:13:22 +08:00
herrrta	cf43d1a657	cleanup	2025-01-06 20:56:59 -05:00
herrrta	cbe3b18226	fix enter animation	2025-01-06 20:55:50 -05:00
herrrta	b637a0f7d2	use JellyseerrPoster component	2025-01-06 20:55:48 -05:00
Fredrik Burmester	a0ce7cc6d0	chore	2025-01-06 22:58:11 +01:00
Fredrik Burmester	a640df30bc	chore	2025-01-06 22:32:27 +01:00
Fredrik Burmester	062e6e6c23	chore	2025-01-06 22:21:27 +01:00
Fredrik Burmester	d709e3b13e	Merge pull request #389 from streamyfin/feat/326 [Jellyseerr] Show genre/studio/network discover sliders	2025-01-06 20:57:10 +01:00
herrrta	b232bebd73	[Jellyseerr] Show genre/studio/network discover sliders implements #326	2025-01-06 14:25:14 -05:00
Fredrik Burmester	90ef8ef6f9	feat: fade in images	2025-01-06 17:38:59 +01:00
Fredrik Burmester	0df6b8e2a0	chore	2025-01-06 17:33:49 +01:00
Fredrik Burmester	f48b26076d	feat: loading skeleton for search (including jellyseerr)	2025-01-06 17:33:27 +01:00
ryan0204	c86a8438e5	Bring back toggleSafeArea button for all videos	2025-01-06 23:15:00 +08:00
Ryan	faa2baae68	Merge branch 'streamyfin:master' into master	2025-01-06 20:28:12 +08:00
ryan0204	ed42371353	Change ScreenOrientation to landscape right by default	2025-01-06 20:27:34 +08:00