3308 changed files with 21304 additions and 134035 deletions
--- a/.github/ISSUE_TEMPLATE/00-bug.yml
+++ b/.github/ISSUE_TEMPLATE/00-bug.yml
@ -1,5 +1,6 @@
 name: "Bug Report"
 description: Report a bug
+title: "[BUG] - <title>"
 labels: [
  "bug"
 ]
@ -22,22 +23,12 @@ body:
        3. See error
    validations:
      required: false
-  - type: dropdown
-    id: experimental
-    attributes:
-      label: Experimental settings
-      description: Do you have experiment settings turn on?
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
  - type: input
    id: app-version
    attributes:
      label: "App Version"
      description: What version of the app?
-      placeholder: "v0.5.1"
+      placeholder: "v0.3.0"
    validations:
      required: true
  - type: input
@ -45,7 +36,7 @@ body:
    attributes:
      label: "Server Version"
      description: What version of the server?
-      placeholder: "10.11.6"
+      placeholder: "10.11.3"
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/01-playback.yml
+++ b/.github/ISSUE_TEMPLATE/01-playback.yml
@ -1,5 +1,6 @@
 name: "Playback Problem"
 description: Report an issue with playback
+title: "[BUG] - <title>"
 labels: [
  "bug", "playback"
 ]
@ -11,14 +12,11 @@ body:
      description: Please enter a description of the playback issue
    validations:
      required: true
-  - type: dropdown
-    id: experimental
+  - type: textarea
+    id: mediainfo
    attributes:
-      label: Experimental settings
-      description: Do you have experiment settings turn on?
-      options:
-        - "Yes"
-        - "No"
+      label: "Media info"
+      description: Please enter details about what media you are trying to play (video or audio codecs, container, etc)
    validations:
      required: true
  - type: dropdown
@ -30,15 +28,6 @@ body:
      options:
        - ExoPlayer (default)
        - MPV
-        - External App (please specify)
-    validations:
-      required: true
-  - type: textarea
-    id: mediainfo
-    attributes:
-      label: "Media info"
-      description: Please enter details about what media you are trying to play (video or audio codecs, container, etc)
-      placeholder: Use mediainfo or "Send media info to server" in the app to gather this
    validations:
      required: true
  - type: input
@ -46,7 +35,7 @@ body:
    attributes:
      label: "App Version"
      description: What version of the app?
-      placeholder: "v0.5.1"
+      placeholder: "v0.3.0"
    validations:
      required: true
  - type: input
@ -54,7 +43,7 @@ body:
    attributes:
      label: "Server Version"
      description: What version of the server?
-      placeholder: "10.11.6"
+      placeholder: "10.11.3"
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/02-new-feature.yml
+++ b/.github/ISSUE_TEMPLATE/02-new-feature.yml
@ -1,4 +1,6 @@
-title: "<title>"
+name: "Feature Request"
+description: Request a new feature
+title: "[FEA] - <title>"
 labels: [
  "enhancement"
 ]
--- a/.github/ISSUE_TEMPLATE/03-question.yml
+++ b/.github/ISSUE_TEMPLATE/03-question.yml
@ -0,0 +1,15 @@
+name: "Question"
+description: Ask a question
+title: "[QST] - <title>"
+labels: [
+  "question"
+]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: "Question"
+      description: Please enter your question
+      placeholder: "How do I...?"
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: New feature / UI suggestion
-    url: https://github.com/damontecres/Wholphin/discussions/new?category=ideas
-    about: Please request new features here
-  - name: Questions
-    url: https://github.com/damontecres/Wholphin/discussions/new?category=q-a
-    about: Please ask questions here
--- a/.github/actions/native-build/action.yml
+++ b/.github/actions/native-build/action.yml
@ -0,0 +1,82 @@
+name: "Native build"
+description: "Performs native builds"
+inputs:
+  cache:
+    description: "Whether to use the cache or not"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Load ffmpeg module cache
+      id: cache_ffmpeg_module
+      if: ${{ inputs.cache }}
+      uses: actions/cache/restore@v5
+      with:
+        path: |
+          app/libs
+        key: ${{ runner.os }}-ffmpeg-${{ hashFiles('**/libs.versions.toml', '**/scripts/ffmpeg/build_ffmpeg_decoder.sh') }}
+    - name: Load libmpv module cache
+      id: cache_libmpv_module
+      if: ${{ inputs.cache }}
+      uses: actions/cache/restore@v5
+      with:
+        path: |
+          app/src/main/libs
+        key: ${{ runner.os }}-libmpv-${{ hashFiles('**/scripts/mpv/*.sh', '**/scripts/mpv/include/*', '**/scripts/mpv/scripts/*', 'app/src/main/jni/*') }}
+    - name: Install dependencies
+      if: steps.cache_ffmpeg_module.outputs.cache-hit != 'true' || steps.cache_libmpv_module.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        python -m pip install --upgrade pip
+        pip install jsonschema jinja2
+        sudo apt update
+        sudo apt install -y build-essential autoconf pkg-config libtool ninja-build unzip wget meson nasm
+
+
+# ffmpeg
+    - name: Build ffmpeg decoder
+      id: ffmpeg-decoder
+      if: steps.cache_ffmpeg_module.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        cd scripts/ffmpeg
+        ./build_ffmpeg_decoder.sh "${{ env.ANDROID_SDK_ROOT }}/ndk/${{ env.NDK_VERSION }}"
+    - name: Save ffmpeg module cache
+      id: cache_ffmpeg_module_save
+      uses: actions/cache/save@v5
+      with:
+        path: |
+          app/libs
+        key: ${{ steps.cache_ffmpeg_module.outputs.cache-primary-key }}
+
+# libmpv
+    - name: Get libmpv dependencies
+      if: steps.cache_libmpv_module.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        cd scripts/mpv
+        ./get_dependencies.sh
+    - name: Build libmpv dependencies
+      if: steps.cache_libmpv_module.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        cd scripts/mpv
+        ./buildall.sh --clean --arch arm64 mpv
+        ./buildall.sh mpv
+        cd ../..
+        env PREFIX32="$(realpath scripts/mpv/prefix/armv7l)" PREFIX64="$(realpath scripts/mpv/prefix/arm64)" ndk-build -C app/src/main -j
+
+    - name: Setup jniLibs
+      shell: bash
+      run: |
+        cd app/src/main
+        mkdir -p jniLibs
+        cp -r libs/* jniLibs
+        #ln -s libs jniLibs
+    - name: Save libmpv module cache
+      id: cache_libmpv_module_save
+      uses: actions/cache/save@v5
+      with:
+        path: |
+          app/src/main/libs
+        key: ${{ steps.cache_libmpv_module.outputs.cache-primary-key }}
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@ -6,11 +6,11 @@ runs:
  steps:
    # Setup the SDKs
    - name: Set up Python
-      uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7
+      uses: actions/setup-python@v6
      with:
        python-version: '3.14'
    - name: Setup JDK
-      uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6
+      uses: actions/setup-java@v5
      with:
        distribution: zulu
        java-version: '21'
@ -21,9 +21,9 @@ runs:
        echo "BUILD_TOOLS_VERSION=36.0.0" >> $GITHUB_ENV
        echo "NDK_VERSION=29.0.14206865" >> $GITHUB_ENV
    - name: Setup Android SDK
-      uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4
+      uses: android-actions/setup-android@v3
      with:
-        packages: "platform-tools build-tools;${{ env.BUILD_TOOLS_VERSION }} ndk;${{ env.NDK_VERSION }}"
+        packages: "tools platform-tools build-tools;${{ env.BUILD_TOOLS_VERSION }} ndk;${{ env.NDK_VERSION }}"
    - name: Add NDK to path
      shell: bash
      run: |
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -16,7 +16,7 @@ concurrency:

 env:
  BRANCH_NAME: ${{ github.ref_name }}
-  GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx12g -XX:MaxMetaspaceSize=1024m'"
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx4g -XX:MaxMetaspaceSize=512m'"

 jobs:
  build:
@ -25,11 +25,15 @@ jobs:
      contents: write
    steps:
      - name: Checkout the code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0 # Need the tags to build
      - name: Setup
        uses: ./.github/actions/setup
+      - name: Native build
+        uses: ./.github/actions/native-build
+        with:
+          cache: true

      - name: Get version names
        run: |
@ -51,12 +55,8 @@ jobs:
          KEY_PASSWORD: "${{ secrets.KEY_PASSWORD }}"
          KEY_STORE_PASSWORD: "${{ secrets.KEY_STORE_PASSWORD }}"
          SIGNING_KEY: "${{ secrets.SIGNING_KEY }}"
-          ORG_GRADLE_PROJECT_WholphinExtensionsUsername: "${{ secrets.EXTENSIONS_USERNAME }}"
-          ORG_GRADLE_PROJECT_WholphinExtensionsPassword: "${{ secrets.EXTENSIONS_PASSWORD }}"
        run: |
-          ./gradlew clean assembleDefaultDebug
-          ./gradlew assembleDefaultRelease
-
+          ./gradlew clean assembleRelease assembleDebug --no-daemon
      - name: Verify signatures
        run: |
          echo "Verify APK signatures"
@ -68,27 +68,20 @@ jobs:
          find app/build/outputs/apk -name '*.apk' -print0 |
            while IFS= read -r -d '' line; do
              # Wholphin-release-0.2.9-62-g5c12e03-16-arm64-v8a.apk => Wholphin-arm64-v8a.apk
-              short_name="$(echo $line | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g[a-fA-F0-9]+-[0-9]+//' | sed -E 's/-default//')"
+              short_name="$(echo $line | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g[a-fA-F0-9]+-[0-9]+//')"
              echo "$line => $short_name"
              cp "$line" "$short_name"
            done
+          apks=$(find app/build/outputs/apk -name '*.apk' -print0 | tr '\0' ',' | sed 's/,$//')
+          echo "apks=$apks" >> "$GITHUB_OUTPUT"
      - name: Checksums
        run: |
          echo "SHA256 checksums:"
          find app/build/outputs/apk -name '*.apk' -print0 | xargs -0 sha256sum
-      - name: Upload mapping files
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
-        with:
-          name: mapping
-          path: |
-            app/build/outputs/**/mapping.txt
-          compression-level: 6
      - name: Delete ${{ env.TAG_NAME }} tag and release
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
-          shopt -s globstar
-
          gh release delete "${{ env.TAG_NAME }}" --cleanup-tag -y || true


@ -105,4 +98,4 @@ jobs:

           gh release create "${{ env.TAG_NAME }}" \
            --latest=false --prerelease --title "${{ env.VERSION_NAME }}" --target "${{ env.BRANCH_NAME }}" -F ci_release_note.txt \
-            app/build/outputs/apk/**/*.apk
+            "app/build/outputs/apk/**/*.apk"
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -9,36 +9,54 @@ defaults:

 env:
  BUILD_DIRS_ARTIFACT: build-dirs
-  GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx12g -XX:MaxMetaspaceSize=1024m'"
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx4g -XX:MaxMetaspaceSize=512m'"

 jobs:
  pre-commit:
    runs-on: ubuntu-latest
    steps:
    - name: Checkout the code
-      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      uses: actions/checkout@v6
      with:
        fetch-depth: 0 # Need the tags to build
    - name: Setup Python
-      uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7
+      uses: actions/setup-python@v6
      with:
        python-version: '3.14'
    - name: Run pre-commit
-      uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
+      uses: pre-commit/action@v3.0.1

  build:
    runs-on: ubuntu-latest
    needs: pre-commit
    steps:
      - name: Checkout the code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0 # Need the tags to build
      - name: Setup
        uses: ./.github/actions/setup
+      - name: Native build
+        uses: ./.github/actions/native-build
+        with:
+          cache: true
      - name: Build app
        id: buildapp
        run: |
-          ./gradlew clean assembleDefaultDebug testDefaultDebugUnitTest --no-daemon
-          apks=$(find app/build/outputs \( -name '*.apk' -or -name '*.aab' \) -print0 | tr '\0' ',' | sed 's/,$//')
+          ./gradlew clean assembleDebug testDebugUnitTest --no-daemon
+          apks=$(find app/build/outputs/apk -name '*.apk' -print0 | tr '\0' ',' | sed 's/,$//')
          echo "apks=$apks" >> "$GITHUB_OUTPUT"
+      - name: Tar build dirs
+        run: |
+          tar -czf build.tgz ./app/.
+      - uses: actions/upload-artifact@v6
+        id: upload-build-dirs
+        with:
+          name: "${{ env.BUILD_DIRS_ARTIFACT }}"
+          path: build.tgz
+          if-no-files-found: error
+      - uses: actions/upload-artifact@v6
+        with:
+          name: APKs
+          path: "${{ steps.buildapp.outputs.apks }}"
+          compression-level: 0
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -11,7 +11,7 @@ defaults:

 env:
  APK_SHORT_NAME: Wholphin.apk
-  GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx12g -XX:MaxMetaspaceSize=1024m'"
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs='-Xmx4g -XX:MaxMetaspaceSize=512m'"
  TAG_NAME: ${{ github.ref_name }}

 jobs:
@ -21,11 +21,15 @@ jobs:
      contents: write
    steps:
      - name: Checkout the code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0 # Need the tags to build
      - name: Setup
        uses: ./.github/actions/setup
+      - name: Native build
+        uses: ./.github/actions/native-build
+        with:
+          cache: false
      - name: Build app
        id: buildapp
        env:
@ -33,51 +37,33 @@ jobs:
          KEY_PASSWORD: "${{ secrets.KEY_PASSWORD }}"
          KEY_STORE_PASSWORD: "${{ secrets.KEY_STORE_PASSWORD }}"
          SIGNING_KEY: "${{ secrets.SIGNING_KEY }}"
-          ORG_GRADLE_PROJECT_WholphinExtensionsUsername: "${{ secrets.EXTENSIONS_USERNAME }}"
-          ORG_GRADLE_PROJECT_WholphinExtensionsPassword: "${{ secrets.EXTENSIONS_PASSWORD }}"
        run: |
-          ./gradlew clean bundleAppstoreRelease
-          ./gradlew bundleFiretvRelease
-          ./gradlew assembleDefaultRelease
+          ./gradlew clean assembleRelease --no-daemon
      - name: Verify signatures
        run: |
          echo "Verify APK signatures"
-          find app/build/outputs \( -name '*.apk' -or -name '*.aab' \)
-          find app/build/outputs \( -name '*.apk' \) -print0 | xargs -0 -n1 ${{env.ANDROID_SDK_ROOT}}/build-tools/${{ env.BUILD_TOOLS_VERSION }}/apksigner verify --verbose --print-certs
+          find app/build/outputs/apk -name '*.apk'
+          find app/build/outputs/apk -name '*.apk' -print0 | xargs -0 -n1 ${{env.ANDROID_SDK_ROOT}}/build-tools/${{ env.BUILD_TOOLS_VERSION }}/apksigner verify --verbose --print-certs
      - name: Copy APK to shorter names
        id: apks
        run: |
          find app/build/outputs/apk -name '*.apk' -print0 |
            while IFS= read -r -d '' line; do
-              # Wholphin-default-release-0.2.9-62-g5c12e03-16-arm64-v8a.apk => Wholphin-arm64-v8a.apk
-              short_name="$(echo $line | sed -E 's/-default-release-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g[a-fA-F0-9]+-[0-9]+//')"
+              # Wholphin-release-0.2.9-62-g5c12e03-16-arm64-v8a.apk => Wholphin-arm64-v8a.apk
+              short_name="$(echo $line | sed -E 's/-release-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g[a-fA-F0-9]+-[0-9]+//')"
              echo "$line => $short_name"
              cp "$line" "$short_name"
            done
+          apks=$(find app/build/outputs/apk -name '*.apk' -print0 | tr '\0' ',' | sed 's/,$//')
+          echo "apks=$apks" >> "$GITHUB_OUTPUT"
      - name: Checksums
        run: |
          echo "SHA256 checksums:"
-          find app/build/outputs \( -name '*.apk' -or -name '*.aab' \) -print0 | xargs -0 sha256sum
-      - name: Upload AAB
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
-        with:
-          name: AAB
-          path: |
-            app/build/outputs/bundle/**/*.aab
-          compression-level: 0
-      - name: Upload mapping files
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
-        with:
-          name: mapping
-          path: |
-            app/build/outputs/**/mapping.txt
-          compression-level: 6
+          find app/build/outputs/apk -name '*.apk' -print0 | xargs -0 sha256sum
      - name: Create GitHub release
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
-          shopt -s globstar
-
          gh release create "${{ env.TAG_NAME }}" \
-            --latest --title "${{ env.TAG_NAME }}" --verify-tag -n "" --draft \
-            app/build/outputs/apk/**/*.apk
+            --latest --title "${{ env.TAG_NAME }}" --verify-tag -n "Placeholder" --draft \
+            "app/build/outputs/apk/**/*.apk"
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@ -14,7 +14,6 @@ The app uses:
 * [Room](https://developer.android.com/training/data-storage/room) & [DataStore](https://developer.android.com/topic/libraries/architecture/datastore) for local data storage
 * [Hilt](https://developer.android.com/training/dependency-injection/hilt-android) for dependency injection
 * [Media3/ExoPlayer](https://developer.android.com/media/media3/exoplayer) for media playback
-* [MPV/libmpv](https://github.com/mpv-player/mpv) for media playback
 * [Coil](https://coil-kt.github.io/coil/) for image loading
 * [OkHttp](https://square.github.io/okhttp/) for HTTP requests

@ -34,16 +33,6 @@ Also, it's recommend to add an extra ruleset jar for Compose-specific KtLint: ht

 Also setup [pre-commit](https://github.com/pre-commit/pre-commit) which will run `ktlint` as well on each commit, plus check for other common issues.

-#### Extensions
-
-Wholphin uses several native components for extra playback compatibility. This includes Media3 ffmpeg/av1 decoders and `libmpv`. These extensions are not required to build the app, but without them some functionality will not work.
-
-If you want to include these in a local build, see the [instructions here](https://github.com/damontecres/wholphin-extensions?tab=readme-ov-file#usage) for configuring the repository.
-
-You can also build the extensions locally from https://github.com/damontecres/wholphin-extensions and include them in `app/libs`. The gradle build dependency resolution prefers these local files over fetching from the remote maven registry.
-
-Finally, if no `wholphin-mpv` implementation is found, `wholphin-mpv-stub` will be used. This allows the app to compile, but any runtime usage of MPV will throw an exception.
-
 ## Code organization

 Code is split into several packages:
@ -53,22 +42,29 @@ Code is split into several packages:
 - `ui` - User interface code and ViewModels
 - `util` - Utility classes and functions

-### Settings
+### Native components

-There are a few different ways user settings are stored:
-1. `AppPreferences` via DataStore
-2. Room database
-3. Key-Value DataStore
+#### FFmpeg decoder module

-#### App preferences
+Wholphin ships with [media3 ffmpeg decoder module](https://github.com/androidx/media/blob/release/libraries/decoder_ffmpeg/README.md).

-These are generally settings that apply across the whole app regardless of the currently active user.
+It is not required to build the extension in order to build the app locally.

-The `AppPreferences` object can be retrieved from the `UserPreferencesService` or directly via injecting `DataStore<AppPreferences>`.
+You can build the module on MacOS or Linux with the [`build_ffmpeg_decoder.sh`](./scripts/ffmpeg/build_ffmpeg_decoder.sh) script.

-The `AppPreference` (note the `s` differences) objects are used to create the UI for configuring settings using the composable functions in `com.github.damontecres.wholphin.ui.preferences`.
+#### MPV player backend

-##### How to add a new app setting
+Wholphin has a playback engine that uses [`libmpv`](https://github.com/mpv-player/mpv). The app uses JNI code from [`mpv-android`](https://github.com/mpv-android/mpv-android) and has an implementation of `androidx.media3.common.Player` to swap out for `ExoPlayer`.
+
+See the [build scripts](scripts/mpv/) for details on building this component.
+
+### App settings
+
+App settings are available with the `AppPreferences` object and defined by different `AppPreference` objects (note the `s` differences).
+
+The `AppPreference` objects are used to create the UI for configuring settings using the composable functions in `com.github.damontecres.wholphin.ui.preferences`.
+
+#### How to add a new app setting

 1. Add entry in `WholphinDataStore.proto` & build to generate classes
 2. Add new `AppPreference` object in `AppPreference.kt`
@ -76,30 +72,3 @@ The `AppPreference` (note the `s` differences) objects are used to create the UI
 4. Update `AppPreferencesSerializer` to set the default value for new installs
 5. If needed, update `AppUpgradeHandler` to set the default value for app upgrades
    - Since preferences use proto3, the [default values](https://protobuf.dev/programming-guides/proto3/#default) are zero, false, or the first enum, so only need this step if the default value is different
-
-#### Room settings
-
-These are settings were generally are applied per user. They are stored in several different tables. The entities are defined in `com.github.damontecres.wholphin.data.model`.
-
-Additionally, all server and user info for both Jellyfin and Seerr are stored in Room tables.
-
-Some examples are:
- `JellyfinServer`
- `JellyfinUser`
- `SeerrServer`
- `LibraryDisplayInfo`
- `ItemPlayback`
-
-Some of the models, such as `GetItemsFilter` or `ViewOptions`, are stored as JSON in a column instead of defined entities. This should be used sparingly.
-
-#### Key-value settings
-
-These settings are similar to Room ones and are usually stored per user. These can be accessed via `KeyValueService`. The values are `@Serializable` objects saved as JSON.
-
-This should be used sparingly.
-
-#### Experimental
-
-Some settings are considered "experimental". These may cause instabilities or may need further testing. They may be changed or removed any time.
-
-These are stored in the `ExperimentalPreferences` object in `AppPreferences`. Accessing them should always be gated with `ExperimentalPreferences.enabled`. There are a few helper functions for this purpose.
--- a/Intents.md
+++ b/Intents.md
@ -1,168 +0,0 @@
-# Intents
-
-> [!IMPORTANT]
-> This feature is experimental and the exact behaviors and/or parameters may change at any time
-
-Wholphin accepts [intents](https://developer.android.com/guide/components/intents-filters) to load or play specified media.
-
-Parameters can be specified as "extras" (eg `--es query value`) or as query parameters to the data URI (eg `-d wholphin://search?query=value`).
-
-UUID parameters can be specified with or without hyphens.
-
-If using data URI query parameters on the command line, you need to escape ampersands: `itemId=...\&userId=...`
-
-## Server/user switching
-
-You can choose a server and user to switch to with the `serverId` and `userId` UUID parameters. If the profile is not protected, the app will switch to it.
-
-If not specified, the app will use the current user if auto sign in is enabled.
-
-## Search
-
-Action: `android.intent.action.SEARCH`
-
-Shorthand action: `search`
-
-Parameters:
- `query` - Optional, prepopulate the search field
-
-
-### Examples
-
-Full format
-```bash
-adb shell am start \
-  -a android.intent.action.SEARCH \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es query "Avengers"
-```
-
-URI based
-```bash
-adb shell am start -d 'wholphin://search?query=Avengers'
-```
-
-Multi-word query:
-```bash
-# Whole shell command is wrapped in double quotes
-adb shell "am start \
-  -a android.intent.action.SEARCH \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es query 'Avengers Endgame'"
-
-adb shell am start -d 'wholphin://search?query=Avengers+Endgame'
-adb shell am start -d 'wholphin://search?query=Avengers%20Endgame'
-```
-
-## View
-
-This opens the app to the specified item such as an episode or movie
-
-Action: `android.intent.action.VIEW`
-
-Shorthand action: `view`
-
-Parameters:
- `itemId` - Optional, the UUID of the media item, if not set, goes to home screen
-
-
-### Examples
-
-Full format
-```bash
-adb shell am start \
-  -a android.intent.action.VIEW \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d"
-```
-
-URI based
-```bash
-adb shell am start -d 'wholphin://view?itemId=5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d'
-```
-
-## Playback
-
-Action: `com.github.damontecres.wholphin.PLAYBACK`
-
-Shorthand action: `play`
-
-Parameters:
- `itemId` - Required, the UUID of the media item
- `position` - Optional, the start position for playback in milliseconds
- `shuffle` - Optional, whether to shuffle the resulting items
-
-### Examples
-
-Full format
-```bash
-adb shell am start \
-  -a com.github.damontecres.wholphin.PLAYBACK \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d"
-```
-
-URI based
-```bash
-adb shell am start -d 'wholphin://play?itemId=5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d'
-```
-
-Start at 4m30s:
-```bash
-adb shell am start \
-  -a com.github.damontecres.wholphin.PLAYBACK \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d" \
-  --el position 270000
-
-adb shell am start -d 'wholphin://play?itemId=5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d\&position=270000'
-```
-
-Shuffle a series (`itemId` is the Series ID):
-```bash
-adb shell am start \
-  -a com.github.damontecres.wholphin.PLAYBACK \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d" \
-  --ez shuffle true
-
-adb shell am start -d 'wholphin://play?itemId=5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d\&shuffle=true'
-```
-
-## More examples
-
-### Switch user
-
-Full format
-```bash
-# Switch user, go to item
-adb shell am start \
-  -a android.intent.action.VIEW \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d" \
-  --es serverId "341880f9-ca88-4038-8718-f6b2407950b1" \
-  --es userId "5c8575e0-468d-44fb-8c70-00aa79160587"
-
-# Switch user, go to home screen
-adb shell am start \
-  -a android.intent.action.VIEW \
-  -n 'org.justinvisser.wolfskin.tv/com.github.damontecres.wholphin.MainActivity' \
-  --es serverId "341880f9-ca88-4038-8718-f6b2407950b1" \
-  --es userId "5c8575e0-468d-44fb-8c70-00aa79160587"
-```
-
-URI based
-```bash
-adb shell am start -d 'wholphin://view?itemId=66c80aaac9c17d3761782d2205520229\&serverId=341880f9-ca88-4038-8718-f6b2407950b1\&userId=5c8575e0-468d-44fb-8c70-00aa79160587'
-```
-
-### Debug build
-
-Debug builds have a different package, so you must specify the component by its full name:
-
-```bash
-adb shell am start \
-  -a android.intent.action.VIEW \
-  -n 'org.justinvisser.wolfskin.tv.debug/com.github.damontecres.wholphin.MainActivity' \
-  --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d"
-```
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-.DEFAULT_GOAL := apk
-WOLFSKIN_BUILD_IMAGE ?= wolfskin-build:sdk37-jdk21
-WOLFSKIN_GRADLE_VOLUME ?= wolfskin-gradle
-WOLFSKIN_SECRETS_DIR ?= /opt/stacks/ventoy/machine-parity/manifest-tank/secrets/wolfskin
-export WOLFSKIN_BUILD_IMAGE WOLFSKIN_GRADLE_VOLUME WOLFSKIN_SECRETS_DIR
-
-.PHONY: build-image apk apk-debug test release-tag
-build-image:
-	docker build --platform linux/amd64 --tag "$(WOLFSKIN_BUILD_IMAGE)" docker
-
-apk: build-image
-	@bash docker/gradle.sh release clean assembleDefaultRelease
-
-apk-debug: build-image
-	@bash docker/gradle.sh debug assembleDefaultDebug
-
-test: build-image
-	@bash docker/gradle.sh debug testDefaultDebugUnitTest
-
-release-tag:
-	@bash docker/release-tag.sh
--- a/README.md
+++ b/README.md
@ -1,15 +1,3 @@
-# Wolfskin
-
-Wolfskin is a personal fork of [Wholphin](https://github.com/damontecres/Wholphin) by damontecres.
-
-Licensed under GPL-2.0, the same licence as upstream (see [LICENSE](LICENSE)).
-
-Wolfskin is an Android TV client for one household. It is released through Forgejo releases on this repo, and it tracks upstream by merging each upstream release tag.
-
-The app uses Wolfskin launcher artwork and a lilac-on-`#07070a` theme by default on a fresh install. Existing theme choices and all upstream colour themes remain available under Settings → App theme. Settings → About credits and links to Wholphin by damontecres.
-
---
-
 # Wholphin - an OSS Android TV client for Jellyfin

 > "Never half-phin two jellies. Always wholphin one jelly."
@ -36,49 +24,39 @@ This is not a fork of the [official client](https://github.com/jellyfin/jellyfin

 </p>

-![v0_5_1_home](https://github.com/user-attachments/assets/62bb1703-abdf-4154-9054-e00b6ceb57b5)
+<img width="1280" height="720" alt="0_3_5_home" src="https://github.com/user-attachments/assets/a485c015-ec21-442d-a757-1f18381bf799" />

 ## Features

 ### User interface

- Customize the home page to see the content you are interested in
-    - Use poster or thumb images, show/hide titles, add/remove/re-order different types of rows!
-    - Option to combine the Continue Watching & Next Up into a single row
-    - Pin collections, playlists, favorites, genres, and studios
-    - Remove series from next up
 - A navigation drawer for quick access to libraries, favorites, search, and settings from almost anywhere in the app
- Integration with [Seerr](https://github.com/seerr-team/seerr) to discover new movies and TV shows
-    - Note: only available when installed from [GitHub](https://github.com/damontecres/Wholphin/releases/latest) or the [Play store](https://play.google.com/store/apps/details?id=com.github.damontecres.wholphin)
- Customize library display
-  - Option to show Movie/TV Show titles
-  - Choose image types & size
-  - Choose from grid or list layouts
+- Integration with [Jellyseerr](https://github.com/seerr-team/seerr) to discover new movies and TV shows
+- Option to combine Continue Watching & Next Up rows
+- Show Movie/TV Show titles when browsing libraries
 - Play theme music, if available
- Customize subtitle style for plain text subtitles with separate HDR settings
+- Customize subtitle style for plain text subtitles
 - Search & download subtitles (requires compatible server plugin such as [OpenSubtitles](https://github.com/jellyfin/jellyfin-plugin-opensubtitles))
+- Customize layout grids for libraries
 - Multiple app color themes
- Protect user profile switches with PIN code or require server login
- Change the user interface language per user
- In-app & Android OS screensaver support
+- Protect user profile switches with PIN code

 ### Playback

 - Different media playback engines:
-  - **ExoPlayer** w/ optional extra audio, SSA/ASS, & AV1 software decoding
-  - **MPV** for direct playing anything with great SSA/ASS subtitle support
+  - **ExoPlayer** w/ optional extra audio & AV1 software decoding
+  - **MPV** for direct playing anything plus ASS subtitle support
 - Plex inspired playback controls:
  - Using D-Pad left/right for seeking during playback
  - Quickly access video chapters & queue during playback
  - Optionally skip back a few seconds when resuming playback
 - Live TV & DVR support
- Music & music video support
- Cinema mode/pre-roll intro support (requires compatible server plugin such as [Intros](https://github.com/jellyfin/jellyfin-plugin-intros))
 - Auto play next episodes with pass out protection
 - Option for automatic refresh rate & resolution switching on supported displays
- Trickplay (video preview) support
+- Trickplay support
 - Subtly show playback position along the bottom of the screen while seeking w/ D-Pad

+
 ### Roadmap

 See [here for the roadmap](https://github.com/damontecres/Wholphin/wiki#roadmap)
@ -115,7 +93,7 @@ Requires Android 6+ (or Fire TV OS 6+) and Jellyfin server `10.10.x` or `10.11.x

 The app is tested on a variety of Android TV/Fire TV OS devices, but if you encounter issues, please file an issue!

-Seerr integration is generally tested with the latest stable version. Older versions may not work as expected. The Seerr server should configured with integration to your Jellyfin server for full compatibility.
+Jellyseerr integration is tested with `v2.7.3`. Older versions may not work.

 ## Contributions

@ -134,21 +112,14 @@ You can [help translate Wholphin](https://translate.codeberg.org/engage/wholphin

 ## Additional screenshots

-### Customized home page
-![customize_home_example](https://github.com/user-attachments/assets/9a4f04b7-9604-4ea7-b352-50f2b15dc2f1)
-
 ### Movie library browsing
-![v0_5_1_library](https://github.com/user-attachments/assets/fad0424b-0631-4438-a8bc-d4fbb95a5bf3)
+<img width="1280" height="771" alt="0 3 0_movies" src="https://github.com/user-attachments/assets/a49829b5-bc2c-4af9-8d5d-2f7d0973ce01" />

 ### Movie page
-![v0_5_1_movie](https://github.com/user-attachments/assets/849aad34-49d5-4864-8de7-005bbcb68ac6)
+<img width="1280" height="720" alt="0_3_5_movie" src="https://github.com/user-attachments/assets/86af5889-6761-426a-8649-422f9d0a1dc0" />

 ### Series page
-![v0_5_1_series](https://github.com/user-attachments/assets/655389e1-6a6f-43bc-85e1-e2feffb20429)
-
-### Genres in library
-![v0_5_1_genres](https://github.com/user-attachments/assets/5bbcbeb6-edc9-42c7-a1d8-d92fa432a498)
-
+<img width="1280" height="720" alt="0_3_5_series" src="https://github.com/user-attachments/assets/2dcb2260-53ce-49d6-9088-72cbd4563c48" />

 ### Playlist
-![v0_5_1_playlist](https://github.com/user-attachments/assets/98268f7d-479d-41c6-b47b-3e67bbe661bc)
+<img width="1280" height="771" alt="0 3 0_playlist" src="https://github.com/user-attachments/assets/7ca589ab-9c88-483a-b769-35ffb5663d9e" />
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -1,17 +1,13 @@
-import com.android.build.api.artifact.SingleArtifact
-import com.android.build.api.dsl.ApplicationExtension
-import com.android.build.api.dsl.ProductFlavor
-import com.android.build.api.variant.FilterConfiguration
 import com.google.protobuf.gradle.id
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.io.File
 import java.util.Base64
 import java.util.Properties

 plugins {
    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.ksp)
    alias(libs.plugins.kotlin.compose)
    alias(libs.plugins.hilt)
@ -22,27 +18,10 @@ plugins {
    alias(libs.plugins.openapi.generator)
 }

-val isCI = providers.environmentVariable("CI").orElse("false").map { it.toBoolean() }
-val shouldSign =
-    isCI.zip(
-        providers.environmentVariable("KEY_ALIAS").orElse("").map { it.isNotBlank() },
-    ) { isCI, hasKey ->
-        isCI && hasKey
-    }
-val ffmpegModuleExists =
-    providers.provider { project.file("libs/lib-decoder-ffmpeg-release.aar").exists() }
-val av1ModuleExists =
-    providers.provider { project.file("libs/lib-decoder-av1-release.aar").exists() }
-val mpvModuleExists =
-    providers.provider { project.file("libs/wholphin-mpv-release.aar").exists() }
-val extensionsRepoActive =
-    providers.provider { project.hasProperty("WholphinExtensionsUsername") }
-
-// See https://issuetracker.google.com/issues/402800800
-val isBuildingBundle =
-    providers.provider {
-        gradle.startParameter.taskNames.any { it.lowercase().contains("bundle") }
-    }
+val isCI = if (System.getenv("CI") != null) System.getenv("CI").toBoolean() else false
+val shouldSign = isCI && System.getenv("KEY_ALIAS") != null
+val ffmpegModuleExists = project.file("libs/lib-decoder-ffmpeg-release.aar").exists()
+val av1ModuleExists = project.file("libs/lib-decoder-av1-release.aar").exists()

 val gitTags =
    providers
@ -56,37 +35,54 @@ val gitDescribe =
        .standardOutput.asText
        .getOrElse("v0.0.0")

-kotlin {
-    compilerOptions {
-        languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3
-        jvmTarget = JvmTarget.JVM_11
-        javaParameters = true
-
-        // Workaround for https://github.com/google/ksp/issues/2964
-        moduleName = "${project.group}_${project.name}"
-    }
-}
-
-private fun Provider<String>.getInt() = get().toInt()
-
-configure<ApplicationExtension> {
+android {
    namespace = "com.github.damontecres.wholphin"
-    compileSdk = libs.versions.compileSdk.getInt()
+    compileSdk = 36

    defaultConfig {
-        applicationId = "org.justinvisser.wolfskin.tv"
-        minSdk = libs.versions.minSdk.getInt()
-        targetSdk = libs.versions.targetSdk.getInt()
+        applicationId = "com.github.damontecres.wholphin"
+        minSdk = 23
+        targetSdk = 36
        versionCode = gitTags.trim().lines().size
        versionName = gitDescribe.trim().removePrefix("v").ifBlank { "0.0.0" }
-        testInstrumentationRunner = "com.github.damontecres.wholphin.test.WholphinTestRunner"
-
-        buildConfigField("long", "BUILD_TIME", System.currentTimeMillis().toString())
-        buildConfigField("String", "CONDUCTARR_BASE_URL", "\"https://wolfskin-tv.justinvisser.org\"")
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }

+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+            isDebuggable = false
+        }
+        debug {
+            isMinifyEnabled = false
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+        isCoreLibraryDesugaringEnabled = true
+    }
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+            javaParameters = true
+        }
+    }
+    buildFeatures {
+        buildConfig = true
+        compose = true
+    }
+    room {
+        schemaDirectory("$projectDir/schemas")
+    }
    signingConfigs {
-        if (shouldSign.get()) {
+        if (shouldSign) {
            create("ci") {
                file("ci.keystore").writeBytes(
                    Base64.getDecoder().decode(System.getenv("SIGNING_KEY")),
@ -102,17 +98,15 @@ configure<ApplicationExtension> {
            }
        }
    }
-
    buildTypes {
        release {
-            isMinifyEnabled = true
-            isShrinkResources = true
+            isMinifyEnabled = false
+
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro",
            )
-            isDebuggable = false
-            if (shouldSign.get()) {
+            if (shouldSign) {
                signingConfig = signingConfigs.getByName("ci")
            } else {
                val localPropertiesFile = project.rootProject.file("local.properties")
@ -126,170 +120,39 @@ configure<ApplicationExtension> {
                }
            }
        }
-
        debug {
-            isMinifyEnabled = false
-            isShrinkResources = false
-            isDebuggable = true
-            applicationIdSuffix = ".debug"
+            if (shouldSign) {
+                signingConfig = signingConfigs.getByName("ci")
+            }
        }

-        create("optimized") {
-            initWith(getByName("release"))
-            signingConfig = signingConfigs.getByName("debug")
-            applicationIdSuffix = ".opt"
-            matchingFallbacks += "release"
+        applicationVariants.all {
+            val variant = this
+            variant.outputs
+                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+                .forEach { output ->
+                    val abi = output.getFilter("ABI").let { if (it != null) "-$it" else "" }
+                    val outputFileName =
+                        "Wholphin-${variant.baseName}-${variant.versionName}-${variant.versionCode}$abi.apk"
+                    output.outputFileName = outputFileName
+                }
        }
    }
-    flavorDimensions += "version"
-    productFlavors {
-        val featureLeanback = "leanback"
-        val featureUpdate = "UPDATING_ENABLED"
-        val featureDiscover = "DISCOVER_ENABLED"
-
-        fun ProductFlavor.setFeatureFlag(
-            name: String,
-            enabled: Boolean,
-        ) {
-            this.buildConfigField("boolean", name, "Boolean.parseBoolean(\"${enabled}\")")
-        }
-        create("default") {
-            dimension = "version"
-            isDefault = true
-            manifestPlaceholders += mapOf(featureLeanback to false)
-            setFeatureFlag(featureUpdate, true)
-            setFeatureFlag(featureDiscover, true)
-        }
-        create("appstore") {
-            dimension = "version"
-            manifestPlaceholders += mapOf(featureLeanback to true)
-            setFeatureFlag(featureUpdate, false)
-            setFeatureFlag(featureDiscover, true)
-        }
-        create("firetv") {
-            dimension = "version"
-            manifestPlaceholders += mapOf(featureLeanback to true)
-            setFeatureFlag(featureUpdate, false)
-            setFeatureFlag(featureDiscover, false)
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-        isCoreLibraryDesugaringEnabled = true
-    }
-
-    buildFeatures {
-        buildConfig = true
-        compose = true
-    }

    splits {
        abi {
-            // Disable split abis when building bundles
-            isEnable = !isBuildingBundle.get()
-
+            isEnable = true
            reset()
-            include("armeabi-v7a", "arm64-v8a", "x86_64")
+            include("armeabi-v7a", "arm64-v8a")
            isUniversalApk = true
        }
    }
-    packaging {
-        jniLibs {
-            // Work around because libass-android & wholphin-mpv both (incorrectly) package libc++_shared.so
-            pickFirsts += "lib/*/libc++_shared.so"
-        }
-    }

    sourceSets {
        getByName("main") {
-            kotlin.directories += "$buildDir/generated/seerr_api/src/main/kotlin"
-            kotlin.directories += "src/wolfskin/java"
-        }
-        getByName("optimized") {
-            kotlin.directories += "src/release/java"
-            baselineProfiles.directories += "src/optimized/baselineProfiles"
+            kotlin.srcDirs("$buildDir/generated/seerr_api/src/main/kotlin")
        }
    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-    }
-
-    lint {
-        disable.add("MissingTranslation")
-    }
-    androidResources {
-        generateLocaleConfig = true
-    }
-}
-
-androidComponents {
-    onVariants(selector().all()) { variant ->
-        variant.outputs
-            .map { it as com.android.build.api.variant.impl.VariantOutputImpl }
-            .forEach { output ->
-                val abi =
-                    output
-                        .getFilter(FilterConfiguration.FilterType.ABI)
-                        .let { if (it != null) "-${it.identifier}" else "" }
-                val outputFileName =
-                    "Wholphin-${variant.flavorName}-${variant.buildType}-${output.versionName.get()}-${output.versionCode.get()}$abi.apk"
-                output.outputFileName = outputFileName
-            }
-        if (variant.name == "defaultOptimized") {
-            tasks.withType<Test>().configureEach {
-                systemProperty("wolfskin.optimizedVersionName", variant.outputs.first().versionName.get())
-            }
-        }
-        if (variant.name == "defaultDebug") {
-            val packagedApks = variant.artifacts.get(SingleArtifact.APK)
-            val artifactLoader = variant.artifacts.getBuiltArtifactsLoader()
-            val aapt2 = sdkComponents.aapt2.flatMap { it.executable }
-            val checkWolfskinBranding = tasks.register("checkWolfskinBranding") {
-                inputs.dir(packagedApks)
-                inputs.file(aapt2)
-                doLast {
-                    val artifacts = checkNotNull(artifactLoader.load(packagedApks.get())) {
-                        "Packaged default/debug APK metadata was not found; branding is unverified"
-                    }.elements
-                    check(artifacts.isNotEmpty()) { "No default/debug APKs were found; branding is unverified" }
-                    val header = Regex("""^\s*resource 0x[\da-fA-F]+ (?:[^\s:]+:)?([^\s/]+)/([^\s]+)""")
-                    val visibleTypes = setOf("string", "plurals", "array")
-                    // Upstream legal attribution and its project URL must survive the branding cutover.
-                    val legalNames = setOf("wolfskin_upstream_credit", "wolfskin_upstream_url")
-                    val violations = sortedSetOf<String>()
-                    artifacts.forEach { artifact ->
-                        val dump = providers.exec {
-                            commandLine(aapt2.get().asFile, "dump", "resources", artifact.outputFile)
-                        }.standardOutput.asText.get()
-                        var currentName: String? = null
-                        var inspected = 0
-                        dump.lineSequence().forEach { line ->
-                            val resource = header.find(line)
-                            if (resource != null) {
-                                currentName = resource.groupValues[2].takeIf { resource.groupValues[1] in visibleTypes }
-                                if (currentName != null) inspected++
-                            } else if (currentName != null && currentName !in legalNames && line.contains("Wholphin", ignoreCase = true)) {
-                                violations += "${File(artifact.outputFile).name}:$currentName"
-                            }
-                        }
-                        check(inspected > 0) { "No packaged string resources were decoded; branding is unverified" }
-                        logger.lifecycle("Inspected $inspected string/plural/array resources in ${File(artifact.outputFile).name}")
-                    }
-                    check(violations.isEmpty()) { "User-visible upstream branding remains: ${violations.joinToString()}" }
-                    logger.lifecycle("Wolfskin branding check passed (${artifacts.size} packaged debug APKs; legal attribution preserved)")
-                }
-            }
-            tasks.matching { it.name == "assembleDefaultDebug" }.configureEach { dependsOn(checkWolfskinBranding) }
-        }
-    }
-}
-
-room {
-    schemaDirectory("$projectDir/schemas")
 }

 protobuf {
@ -349,8 +212,6 @@ tasks.named("preBuild") {
 }

 dependencies {
-    implementation(project(":wolfskin-design"))
-    implementation(project(":conductarr-client"))
    implementation(libs.androidx.core.ktx)
    implementation(libs.androidx.appcompat)
    implementation(platform(libs.androidx.compose.bom))
@ -358,17 +219,17 @@ dependencies {
    implementation(libs.androidx.compose.ui.graphics)
    implementation(libs.androidx.compose.ui.tooling.preview)
    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.compose.runtime.livedata)
    implementation(libs.androidx.tv.foundation)
    implementation(libs.androidx.tv.material)
    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.livedata.ktx)
    implementation(libs.androidx.activity.compose)
    implementation(libs.androidx.datastore)
-    implementation(libs.androidx.datastore.preferences)
    implementation(libs.protobuf.kotlin.lite)
    implementation(libs.androidx.tvprovider)
    implementation(libs.androidx.work.runtime.ktx)
    implementation(libs.androidx.hilt.work)
-    implementation(libs.androidx.profileinstaller)

    implementation(libs.androidx.media3.exoplayer)
    implementation(libs.androidx.media3.session)
@ -377,8 +238,6 @@ dependencies {
    implementation(libs.androidx.media3.exoplayer.dash)
    implementation(libs.androidx.media3.ui)
    implementation(libs.androidx.media3.ui.compose)
-    implementation(libs.ass.media)
-    implementation(libs.exoplayerhdrutils)

    implementation(libs.coil.core)
    implementation(libs.coil.compose)
@ -402,12 +261,12 @@ dependencies {
    implementation(libs.androidx.room.common.jvm)
    implementation(libs.androidx.room.ktx)
    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
    implementation(libs.androidx.hilt.navigation.compose)
    implementation(libs.androidx.preference.ktx)
    implementation(libs.androidx.room.testing)
    implementation(libs.androidx.palette.ktx)
    implementation(libs.androidx.media3.effect)
-    implementation(libs.androidx.runner)
    ksp(libs.androidx.room.compiler)
    ksp(libs.hilt.android.compiler)
    ksp(libs.androidx.hilt.compiler)
@ -429,59 +288,21 @@ dependencies {
    implementation(libs.kache)
    implementation(libs.kache.file)

-    coreLibraryDesugaring(libs.desugar.jdk.libs)
-
-    if (ffmpegModuleExists.get()) {
-        logger.info("Using local ffmpeg decoder")
-        implementation(files("libs/lib-decoder-ffmpeg-release.aar"))
-    } else if (extensionsRepoActive.get()) {
-        logger.info("Using prebuilt ffmpeg decoder")
-        implementation(libs.wholphin.extensions.ffmpeg)
-    } else {
-        logger.warn("Media3 ffmpeg decoder was NOT found")
-    }
-    if (av1ModuleExists.get()) {
-        logger.info("Using local av1 decoder")
-        implementation(files("libs/lib-decoder-av1-release.aar"))
-    } else if (extensionsRepoActive.get()) {
-        logger.info("Using prebuilt av1 decoder")
-        implementation(libs.wholphin.extensions.av1)
-    } else {
-        logger.warn("Media3 av1 decoder was NOT found")
-    }
-    if (mpvModuleExists.get()) {
-        logger.info("Using local libMPV build")
-        implementation(files("libs/wholphin-mpv-release.aar"))
-    } else if (extensionsRepoActive.get()) {
-        logger.info("Using prebuilt libMPV")
-        implementation(libs.wholphin.extensions.mpv)
-    } else {
-        logger.warn("libMPV was NOT found, using stub library")
-        implementation(project(":wholphin-mpv-stub"))
-    }
-
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+    if (ffmpegModuleExists || isCI) {
+        implementation(files("libs/lib-decoder-ffmpeg-release.aar"))
+    }
+    if (av1ModuleExists || isCI) {
+        implementation(files("libs/lib-decoder-av1-release.aar"))
+    }
+
    testImplementation(libs.mockk.android)
    testImplementation(libs.mockk.agent)
    testImplementation(libs.kotlinx.coroutines.test)
-    testImplementation("com.squareup.okhttp3:mockwebserver3")
    testImplementation(libs.androidx.core.testing)
    testImplementation(libs.robolectric)
-    testImplementation(libs.hilt.android.testing)
-    testImplementation(libs.androidx.compose.ui.test.junit4)
-    testImplementation("io.github.takahirom.roborazzi:roborazzi:1.77.0")
-    testImplementation("io.github.takahirom.roborazzi:roborazzi-compose:1.77.0")
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.mockk.android)
-    androidTestImplementation(libs.hilt.android.testing)
-    androidTestImplementation(libs.androidx.compose.ui.test.manifest)
-}
-
-tasks.withType<Test>().configureEach {
-    dependsOn(":wolfskin-design:testDebugUnitTest")
-    systemProperty("robolectric.dependency.dir", project(":wolfskin-design").layout.buildDirectory.dir("robolectric-sdk").get().asFile.absolutePath)
-    systemProperty("robolectric.offline", "true")
-    systemProperty("roborazzi.test.record", "true")
-    systemProperty("wolfskin.captureDirectory", rootProject.layout.buildDirectory.dir("wolfskin-captures").get().asFile.absolutePath)
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -1,27 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
 -keepattributes SourceFile,LineNumberTable

-keep class com.github.damontecres.wholphin.mpv.MPVLib { *; }
-
-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
-  <fields>;
-  <methods>;
-}
-dontwarn com.google.protobuf.**
-
-# TODO investigate using smaller scope
-keep class com.google.common.cache.** { *; }
-
-# Media3SubtitleOverride uses reflection to access/modify these fields
-keep class androidx.media3.ui.SubtitleView {
-  private androidx.media3.ui.SubtitleView$Output output;
-}
-keep class androidx.media3.ui.CanvasSubtitleOutput {
-  private final java.util.List painters;
-}
-keep class androidx.media3.ui.SubtitlePainter {
-  private final float outlineWidth;
-}
-
-# Keep external/native functions
-keep class com.suyashbelekar.exoplayerhdrutils.libdovi.LibDovi { *; }
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/31.json
+++ b/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/31.json
@ -1,642 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 31,
-    "identityHash": "c6829d764ec85321ab3be9905d6c0e3a",
-    "entities": [
-      {
-        "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT, `url` TEXT NOT NULL, `version` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id` TEXT NOT NULL, `name` TEXT, `serverId` TEXT NOT NULL, `accessToken` TEXT, `pin` TEXT, FOREIGN KEY(`serverId`) REFERENCES `servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessToken",
-            "columnName": "accessToken",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pin",
-            "columnName": "pin",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_users_id_serverId",
-            "unique": true,
-            "columnNames": [
-              "id",
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_users_id_serverId` ON `${TABLE_NAME}` (`id`, `serverId`)"
-          },
-          {
-            "name": "index_users_id",
-            "unique": false,
-            "columnNames": [
-              "id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_id` ON `${TABLE_NAME}` (`id`)"
-          },
-          {
-            "name": "index_users_serverId",
-            "unique": false,
-            "columnNames": [
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_serverId` ON `${TABLE_NAME}` (`serverId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemPlayback",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sourceId` TEXT, `audioIndex` INTEGER NOT NULL, `subtitleIndex` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourceId",
-            "columnName": "sourceId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioIndex",
-            "columnName": "audioIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subtitleIndex",
-            "columnName": "subtitleIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ItemPlayback_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ItemPlayback_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "NavDrawerPinnedItem",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `order` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "-1"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LibraryDisplayInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sort` TEXT NOT NULL, `direction` TEXT NOT NULL, `filter` TEXT NOT NULL DEFAULT '{}', `viewOptions` TEXT, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sort",
-            "columnName": "sort",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "direction",
-            "columnName": "direction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filter",
-            "columnName": "filter",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'{}'"
-          },
-          {
-            "fieldPath": "viewOptions",
-            "columnName": "viewOptions",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_LibraryDisplayInfo_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LibraryDisplayInfo_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playback_effects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `rotation` INTEGER NOT NULL, `brightness` INTEGER NOT NULL, `contrast` INTEGER NOT NULL, `saturation` INTEGER NOT NULL, `hue` INTEGER NOT NULL, `red` INTEGER NOT NULL, `green` INTEGER NOT NULL, `blue` INTEGER NOT NULL, `blur` INTEGER NOT NULL, PRIMARY KEY(`jellyfinUserRowId`, `itemId`, `type`))",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.rotation",
-            "columnName": "rotation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.brightness",
-            "columnName": "brightness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.contrast",
-            "columnName": "contrast",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.saturation",
-            "columnName": "saturation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.hue",
-            "columnName": "hue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.red",
-            "columnName": "red",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.green",
-            "columnName": "green",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blue",
-            "columnName": "blue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blur",
-            "columnName": "blur",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "itemId",
-            "type"
-          ]
-        }
-      },
-      {
-        "tableName": "PlaybackLanguageChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `seriesId` TEXT NOT NULL, `itemId` TEXT, `audioLanguage` TEXT, `subtitleLanguage` TEXT, `subtitlesDisabled` INTEGER, PRIMARY KEY(`userId`, `seriesId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "seriesId",
-            "columnName": "seriesId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioLanguage",
-            "columnName": "audioLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitleLanguage",
-            "columnName": "subtitleLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitlesDisabled",
-            "columnName": "subtitlesDisabled",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "seriesId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemTrackModification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `trackIndex` INTEGER NOT NULL, `delayMs` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`, `trackIndex`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackIndex",
-            "columnName": "trackIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "delayMs",
-            "columnName": "delayMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId",
-            "trackIndex"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT NOT NULL, `name` TEXT, `version` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_seerr_servers_url",
-            "unique": true,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_seerr_servers_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `serverId` INTEGER NOT NULL, `authMethod` TEXT NOT NULL, `username` TEXT, `password` TEXT, `credential` TEXT, PRIMARY KEY(`jellyfinUserRowId`, `serverId`), FOREIGN KEY(`serverId`) REFERENCES `seerr_servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`jellyfinUserRowId`) REFERENCES `users`(`rowId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authMethod",
-            "columnName": "authMethod",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "credential",
-            "columnName": "credential",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "serverId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "seerr_servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "jellyfinUserRowId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c6829d764ec85321ab3be9905d6c0e3a')"
-    ]
-  }
-}
--- a/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/32.json
+++ b/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/32.json
@ -1,659 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 32,
-    "identityHash": "934c38e7f4eb68c9a223ddb5c7e3e35d",
-    "entities": [
-      {
-        "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT, `url` TEXT NOT NULL, `version` TEXT, `lastUsed` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id` TEXT NOT NULL, `name` TEXT, `serverId` TEXT NOT NULL, `accessToken` TEXT, `pin` TEXT, `requireLogin` INTEGER NOT NULL DEFAULT false, `lastUsed` TEXT, FOREIGN KEY(`serverId`) REFERENCES `servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessToken",
-            "columnName": "accessToken",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pin",
-            "columnName": "pin",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "requireLogin",
-            "columnName": "requireLogin",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_users_id_serverId",
-            "unique": true,
-            "columnNames": [
-              "id",
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_users_id_serverId` ON `${TABLE_NAME}` (`id`, `serverId`)"
-          },
-          {
-            "name": "index_users_id",
-            "unique": false,
-            "columnNames": [
-              "id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_id` ON `${TABLE_NAME}` (`id`)"
-          },
-          {
-            "name": "index_users_serverId",
-            "unique": false,
-            "columnNames": [
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_serverId` ON `${TABLE_NAME}` (`serverId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemPlayback",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sourceId` TEXT, `audioIndex` INTEGER NOT NULL, `subtitleIndex` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourceId",
-            "columnName": "sourceId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioIndex",
-            "columnName": "audioIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subtitleIndex",
-            "columnName": "subtitleIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ItemPlayback_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ItemPlayback_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "NavDrawerPinnedItem",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `order` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "-1"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LibraryDisplayInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sort` TEXT NOT NULL, `direction` TEXT NOT NULL, `filter` TEXT NOT NULL DEFAULT '{}', `viewOptions` TEXT, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sort",
-            "columnName": "sort",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "direction",
-            "columnName": "direction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filter",
-            "columnName": "filter",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'{}'"
-          },
-          {
-            "fieldPath": "viewOptions",
-            "columnName": "viewOptions",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_LibraryDisplayInfo_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LibraryDisplayInfo_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playback_effects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `rotation` INTEGER NOT NULL, `brightness` INTEGER NOT NULL, `contrast` INTEGER NOT NULL, `saturation` INTEGER NOT NULL, `hue` INTEGER NOT NULL, `red` INTEGER NOT NULL, `green` INTEGER NOT NULL, `blue` INTEGER NOT NULL, `blur` INTEGER NOT NULL, PRIMARY KEY(`jellyfinUserRowId`, `itemId`, `type`))",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.rotation",
-            "columnName": "rotation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.brightness",
-            "columnName": "brightness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.contrast",
-            "columnName": "contrast",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.saturation",
-            "columnName": "saturation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.hue",
-            "columnName": "hue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.red",
-            "columnName": "red",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.green",
-            "columnName": "green",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blue",
-            "columnName": "blue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blur",
-            "columnName": "blur",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "itemId",
-            "type"
-          ]
-        }
-      },
-      {
-        "tableName": "PlaybackLanguageChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `seriesId` TEXT NOT NULL, `itemId` TEXT, `audioLanguage` TEXT, `subtitleLanguage` TEXT, `subtitlesDisabled` INTEGER, PRIMARY KEY(`userId`, `seriesId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "seriesId",
-            "columnName": "seriesId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioLanguage",
-            "columnName": "audioLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitleLanguage",
-            "columnName": "subtitleLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitlesDisabled",
-            "columnName": "subtitlesDisabled",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "seriesId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemTrackModification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `trackIndex` INTEGER NOT NULL, `delayMs` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`, `trackIndex`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackIndex",
-            "columnName": "trackIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "delayMs",
-            "columnName": "delayMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId",
-            "trackIndex"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT NOT NULL, `name` TEXT, `version` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_seerr_servers_url",
-            "unique": true,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_seerr_servers_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `serverId` INTEGER NOT NULL, `authMethod` TEXT NOT NULL, `username` TEXT, `password` TEXT, `credential` TEXT, PRIMARY KEY(`jellyfinUserRowId`, `serverId`), FOREIGN KEY(`serverId`) REFERENCES `seerr_servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`jellyfinUserRowId`) REFERENCES `users`(`rowId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authMethod",
-            "columnName": "authMethod",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "credential",
-            "columnName": "credential",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "serverId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "seerr_servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "jellyfinUserRowId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '934c38e7f4eb68c9a223ddb5c7e3e35d')"
-    ]
-  }
-}
--- a/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/33.json
+++ b/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/33.json
@ -1,664 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 33,
-    "identityHash": "a65eec85c027fac13948a0dd6f99d3cb",
-    "entities": [
-      {
-        "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT, `url` TEXT NOT NULL, `version` TEXT, `lastUsed` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id` TEXT NOT NULL, `name` TEXT, `serverId` TEXT NOT NULL, `accessToken` TEXT, `pin` TEXT, `requireLogin` INTEGER NOT NULL DEFAULT false, `lastUsed` TEXT, `uiLanguage` TEXT, FOREIGN KEY(`serverId`) REFERENCES `servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessToken",
-            "columnName": "accessToken",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pin",
-            "columnName": "pin",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "requireLogin",
-            "columnName": "requireLogin",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "uiLanguage",
-            "columnName": "uiLanguage",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_users_id_serverId",
-            "unique": true,
-            "columnNames": [
-              "id",
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_users_id_serverId` ON `${TABLE_NAME}` (`id`, `serverId`)"
-          },
-          {
-            "name": "index_users_id",
-            "unique": false,
-            "columnNames": [
-              "id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_id` ON `${TABLE_NAME}` (`id`)"
-          },
-          {
-            "name": "index_users_serverId",
-            "unique": false,
-            "columnNames": [
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_serverId` ON `${TABLE_NAME}` (`serverId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemPlayback",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sourceId` TEXT, `audioIndex` INTEGER NOT NULL, `subtitleIndex` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourceId",
-            "columnName": "sourceId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioIndex",
-            "columnName": "audioIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subtitleIndex",
-            "columnName": "subtitleIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ItemPlayback_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ItemPlayback_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "NavDrawerPinnedItem",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `order` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "-1"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LibraryDisplayInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sort` TEXT NOT NULL, `direction` TEXT NOT NULL, `filter` TEXT NOT NULL DEFAULT '{}', `viewOptions` TEXT, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sort",
-            "columnName": "sort",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "direction",
-            "columnName": "direction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filter",
-            "columnName": "filter",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'{}'"
-          },
-          {
-            "fieldPath": "viewOptions",
-            "columnName": "viewOptions",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_LibraryDisplayInfo_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LibraryDisplayInfo_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playback_effects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `rotation` INTEGER NOT NULL, `brightness` INTEGER NOT NULL, `contrast` INTEGER NOT NULL, `saturation` INTEGER NOT NULL, `hue` INTEGER NOT NULL, `red` INTEGER NOT NULL, `green` INTEGER NOT NULL, `blue` INTEGER NOT NULL, `blur` INTEGER NOT NULL, PRIMARY KEY(`jellyfinUserRowId`, `itemId`, `type`))",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.rotation",
-            "columnName": "rotation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.brightness",
-            "columnName": "brightness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.contrast",
-            "columnName": "contrast",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.saturation",
-            "columnName": "saturation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.hue",
-            "columnName": "hue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.red",
-            "columnName": "red",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.green",
-            "columnName": "green",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blue",
-            "columnName": "blue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blur",
-            "columnName": "blur",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "itemId",
-            "type"
-          ]
-        }
-      },
-      {
-        "tableName": "PlaybackLanguageChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `seriesId` TEXT NOT NULL, `itemId` TEXT, `audioLanguage` TEXT, `subtitleLanguage` TEXT, `subtitlesDisabled` INTEGER, PRIMARY KEY(`userId`, `seriesId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "seriesId",
-            "columnName": "seriesId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioLanguage",
-            "columnName": "audioLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitleLanguage",
-            "columnName": "subtitleLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitlesDisabled",
-            "columnName": "subtitlesDisabled",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "seriesId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemTrackModification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `trackIndex` INTEGER NOT NULL, `delayMs` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`, `trackIndex`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackIndex",
-            "columnName": "trackIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "delayMs",
-            "columnName": "delayMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId",
-            "trackIndex"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT NOT NULL, `name` TEXT, `version` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_seerr_servers_url",
-            "unique": true,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_seerr_servers_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `serverId` INTEGER NOT NULL, `authMethod` TEXT NOT NULL, `username` TEXT, `password` TEXT, `credential` TEXT, PRIMARY KEY(`jellyfinUserRowId`, `serverId`), FOREIGN KEY(`serverId`) REFERENCES `seerr_servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`jellyfinUserRowId`) REFERENCES `users`(`rowId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authMethod",
-            "columnName": "authMethod",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "credential",
-            "columnName": "credential",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "serverId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "seerr_servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "jellyfinUserRowId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a65eec85c027fac13948a0dd6f99d3cb')"
-    ]
-  }
-}
--- a/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/34.json
+++ b/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/34.json
@ -1,720 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 34,
-    "identityHash": "278e485064fc9f184a2181599f0f8efb",
-    "entities": [
-      {
-        "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT, `url` TEXT NOT NULL, `version` TEXT, `lastUsed` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id` TEXT NOT NULL, `name` TEXT, `serverId` TEXT NOT NULL, `accessToken` TEXT, `pin` TEXT, `requireLogin` INTEGER NOT NULL DEFAULT false, `lastUsed` TEXT, `uiLanguage` TEXT, FOREIGN KEY(`serverId`) REFERENCES `servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessToken",
-            "columnName": "accessToken",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pin",
-            "columnName": "pin",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "requireLogin",
-            "columnName": "requireLogin",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "uiLanguage",
-            "columnName": "uiLanguage",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_users_id_serverId",
-            "unique": true,
-            "columnNames": [
-              "id",
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_users_id_serverId` ON `${TABLE_NAME}` (`id`, `serverId`)"
-          },
-          {
-            "name": "index_users_id",
-            "unique": false,
-            "columnNames": [
-              "id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_id` ON `${TABLE_NAME}` (`id`)"
-          },
-          {
-            "name": "index_users_serverId",
-            "unique": false,
-            "columnNames": [
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_serverId` ON `${TABLE_NAME}` (`serverId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemPlayback",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sourceId` TEXT, `audioIndex` INTEGER NOT NULL, `subtitleIndex` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourceId",
-            "columnName": "sourceId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioIndex",
-            "columnName": "audioIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subtitleIndex",
-            "columnName": "subtitleIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ItemPlayback_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ItemPlayback_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "NavDrawerPinnedItem",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `order` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "-1"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LibraryDisplayInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sort` TEXT NOT NULL, `direction` TEXT NOT NULL, `filter` TEXT NOT NULL DEFAULT '{}', `viewOptions` TEXT, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sort",
-            "columnName": "sort",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "direction",
-            "columnName": "direction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filter",
-            "columnName": "filter",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'{}'"
-          },
-          {
-            "fieldPath": "viewOptions",
-            "columnName": "viewOptions",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_LibraryDisplayInfo_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LibraryDisplayInfo_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playback_effects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `rotation` INTEGER NOT NULL, `brightness` INTEGER NOT NULL, `contrast` INTEGER NOT NULL, `saturation` INTEGER NOT NULL, `hue` INTEGER NOT NULL, `red` INTEGER NOT NULL, `green` INTEGER NOT NULL, `blue` INTEGER NOT NULL, `blur` INTEGER NOT NULL, PRIMARY KEY(`jellyfinUserRowId`, `itemId`, `type`))",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.rotation",
-            "columnName": "rotation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.brightness",
-            "columnName": "brightness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.contrast",
-            "columnName": "contrast",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.saturation",
-            "columnName": "saturation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.hue",
-            "columnName": "hue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.red",
-            "columnName": "red",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.green",
-            "columnName": "green",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blue",
-            "columnName": "blue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blur",
-            "columnName": "blur",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "itemId",
-            "type"
-          ]
-        }
-      },
-      {
-        "tableName": "PlaybackLanguageChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `seriesId` TEXT NOT NULL, `itemId` TEXT, `audioLanguage` TEXT, `subtitleLanguage` TEXT, `subtitlesDisabled` INTEGER, PRIMARY KEY(`userId`, `seriesId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "seriesId",
-            "columnName": "seriesId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioLanguage",
-            "columnName": "audioLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitleLanguage",
-            "columnName": "subtitleLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitlesDisabled",
-            "columnName": "subtitlesDisabled",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "seriesId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemTrackModification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `trackIndex` INTEGER NOT NULL, `delayMs` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`, `trackIndex`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackIndex",
-            "columnName": "trackIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "delayMs",
-            "columnName": "delayMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId",
-            "trackIndex"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT NOT NULL, `name` TEXT, `version` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_seerr_servers_url",
-            "unique": true,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_seerr_servers_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `serverId` INTEGER NOT NULL, `authMethod` TEXT NOT NULL, `username` TEXT, `password` TEXT, `credential` TEXT, PRIMARY KEY(`jellyfinUserRowId`, `serverId`), FOREIGN KEY(`serverId`) REFERENCES `seerr_servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`jellyfinUserRowId`) REFERENCES `users`(`rowId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authMethod",
-            "columnName": "authMethod",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "credential",
-            "columnName": "credential",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "serverId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "seerr_servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "jellyfinUserRowId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "RememberedTab",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "index",
-            "columnName": "index",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_RememberedTab_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_RememberedTab_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '278e485064fc9f184a2181599f0f8efb')"
-    ]
-  }
-}
--- a/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/35.json
+++ b/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/35.json
@ -1,741 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 35,
-    "identityHash": "ff9ade58d4ac39e36335ac0df1405a5f",
-    "entities": [
-      {
-        "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT, `url` TEXT NOT NULL, `version` TEXT, `lastUsed` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id` TEXT NOT NULL, `name` TEXT, `serverId` TEXT NOT NULL, `accessToken` TEXT, `pin` TEXT, `requireLogin` INTEGER NOT NULL DEFAULT false, `lastUsed` TEXT, `uiLanguage` TEXT, `preferredAudioLanguage` TEXT NOT NULL DEFAULT '', `preferredSubtitleLanguage` TEXT NOT NULL DEFAULT '', `subtitleMode` TEXT NOT NULL DEFAULT 'USE_USER_PROFILE', FOREIGN KEY(`serverId`) REFERENCES `servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessToken",
-            "columnName": "accessToken",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pin",
-            "columnName": "pin",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "requireLogin",
-            "columnName": "requireLogin",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "uiLanguage",
-            "columnName": "uiLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "appPreferences.preferredAudioLanguage",
-            "columnName": "preferredAudioLanguage",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "appPreferences.preferredSubtitleLanguage",
-            "columnName": "preferredSubtitleLanguage",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "appPreferences.subtitleMode",
-            "columnName": "subtitleMode",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'USE_USER_PROFILE'"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_users_id_serverId",
-            "unique": true,
-            "columnNames": [
-              "id",
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_users_id_serverId` ON `${TABLE_NAME}` (`id`, `serverId`)"
-          },
-          {
-            "name": "index_users_id",
-            "unique": false,
-            "columnNames": [
-              "id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_id` ON `${TABLE_NAME}` (`id`)"
-          },
-          {
-            "name": "index_users_serverId",
-            "unique": false,
-            "columnNames": [
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_serverId` ON `${TABLE_NAME}` (`serverId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemPlayback",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sourceId` TEXT, `audioIndex` INTEGER NOT NULL, `subtitleIndex` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourceId",
-            "columnName": "sourceId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioIndex",
-            "columnName": "audioIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subtitleIndex",
-            "columnName": "subtitleIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ItemPlayback_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ItemPlayback_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "NavDrawerPinnedItem",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `order` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "-1"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LibraryDisplayInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sort` TEXT NOT NULL, `direction` TEXT NOT NULL, `filter` TEXT NOT NULL DEFAULT '{}', `viewOptions` TEXT, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sort",
-            "columnName": "sort",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "direction",
-            "columnName": "direction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filter",
-            "columnName": "filter",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'{}'"
-          },
-          {
-            "fieldPath": "viewOptions",
-            "columnName": "viewOptions",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_LibraryDisplayInfo_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LibraryDisplayInfo_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playback_effects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `rotation` INTEGER NOT NULL, `brightness` INTEGER NOT NULL, `contrast` INTEGER NOT NULL, `saturation` INTEGER NOT NULL, `hue` INTEGER NOT NULL, `red` INTEGER NOT NULL, `green` INTEGER NOT NULL, `blue` INTEGER NOT NULL, `blur` INTEGER NOT NULL, PRIMARY KEY(`jellyfinUserRowId`, `itemId`, `type`))",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.rotation",
-            "columnName": "rotation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.brightness",
-            "columnName": "brightness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.contrast",
-            "columnName": "contrast",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.saturation",
-            "columnName": "saturation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.hue",
-            "columnName": "hue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.red",
-            "columnName": "red",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.green",
-            "columnName": "green",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blue",
-            "columnName": "blue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blur",
-            "columnName": "blur",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "itemId",
-            "type"
-          ]
-        }
-      },
-      {
-        "tableName": "PlaybackLanguageChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `seriesId` TEXT NOT NULL, `itemId` TEXT, `audioLanguage` TEXT, `subtitleLanguage` TEXT, `subtitlesDisabled` INTEGER, PRIMARY KEY(`userId`, `seriesId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "seriesId",
-            "columnName": "seriesId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioLanguage",
-            "columnName": "audioLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitleLanguage",
-            "columnName": "subtitleLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitlesDisabled",
-            "columnName": "subtitlesDisabled",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "seriesId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemTrackModification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `trackIndex` INTEGER NOT NULL, `delayMs` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`, `trackIndex`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackIndex",
-            "columnName": "trackIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "delayMs",
-            "columnName": "delayMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId",
-            "trackIndex"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT NOT NULL, `name` TEXT, `version` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_seerr_servers_url",
-            "unique": true,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_seerr_servers_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `serverId` INTEGER NOT NULL, `authMethod` TEXT NOT NULL, `username` TEXT, `password` TEXT, `credential` TEXT, PRIMARY KEY(`jellyfinUserRowId`, `serverId`), FOREIGN KEY(`serverId`) REFERENCES `seerr_servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`jellyfinUserRowId`) REFERENCES `users`(`rowId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authMethod",
-            "columnName": "authMethod",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "credential",
-            "columnName": "credential",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "serverId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "seerr_servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "jellyfinUserRowId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "RememberedTab",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "index",
-            "columnName": "index",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_RememberedTab_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_RememberedTab_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ff9ade58d4ac39e36335ac0df1405a5f')"
-    ]
-  }
-}
--- a/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/40.json
+++ b/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/40.json
@ -1,834 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 40,
-    "identityHash": "b297c087485321c3ee8282ad1ff675a0",
-    "entities": [
-      {
-        "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT, `url` TEXT NOT NULL, `version` TEXT, `lastUsed` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id` TEXT NOT NULL, `name` TEXT, `serverId` TEXT NOT NULL, `accessToken` TEXT, `pin` TEXT, `requireLogin` INTEGER NOT NULL DEFAULT false, `lastUsed` TEXT, `uiLanguage` TEXT, `preferredAudioLanguage` TEXT NOT NULL DEFAULT '', `preferredSubtitleLanguage` TEXT NOT NULL DEFAULT '', `subtitleMode` TEXT NOT NULL DEFAULT 'USE_USER_PROFILE', FOREIGN KEY(`serverId`) REFERENCES `servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessToken",
-            "columnName": "accessToken",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pin",
-            "columnName": "pin",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "requireLogin",
-            "columnName": "requireLogin",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "uiLanguage",
-            "columnName": "uiLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "appPreferences.preferredAudioLanguage",
-            "columnName": "preferredAudioLanguage",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "appPreferences.preferredSubtitleLanguage",
-            "columnName": "preferredSubtitleLanguage",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "appPreferences.subtitleMode",
-            "columnName": "subtitleMode",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'USE_USER_PROFILE'"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_users_id_serverId",
-            "unique": true,
-            "columnNames": [
-              "id",
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_users_id_serverId` ON `${TABLE_NAME}` (`id`, `serverId`)"
-          },
-          {
-            "name": "index_users_id",
-            "unique": false,
-            "columnNames": [
-              "id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_id` ON `${TABLE_NAME}` (`id`)"
-          },
-          {
-            "name": "index_users_serverId",
-            "unique": false,
-            "columnNames": [
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_serverId` ON `${TABLE_NAME}` (`serverId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemPlayback",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sourceId` TEXT, `audioIndex` INTEGER NOT NULL, `subtitleIndex` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourceId",
-            "columnName": "sourceId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioIndex",
-            "columnName": "audioIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subtitleIndex",
-            "columnName": "subtitleIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ItemPlayback_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ItemPlayback_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "NavDrawerPinnedItem",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `order` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "-1"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LibraryDisplayInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sort` TEXT NOT NULL, `direction` TEXT NOT NULL, `filter` TEXT NOT NULL DEFAULT '{}', `viewOptions` TEXT, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sort",
-            "columnName": "sort",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "direction",
-            "columnName": "direction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filter",
-            "columnName": "filter",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'{}'"
-          },
-          {
-            "fieldPath": "viewOptions",
-            "columnName": "viewOptions",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_LibraryDisplayInfo_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LibraryDisplayInfo_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playback_effects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `rotation` INTEGER NOT NULL, `brightness` INTEGER NOT NULL, `contrast` INTEGER NOT NULL, `saturation` INTEGER NOT NULL, `hue` INTEGER NOT NULL, `red` INTEGER NOT NULL, `green` INTEGER NOT NULL, `blue` INTEGER NOT NULL, `blur` INTEGER NOT NULL, PRIMARY KEY(`jellyfinUserRowId`, `itemId`, `type`))",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.rotation",
-            "columnName": "rotation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.brightness",
-            "columnName": "brightness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.contrast",
-            "columnName": "contrast",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.saturation",
-            "columnName": "saturation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.hue",
-            "columnName": "hue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.red",
-            "columnName": "red",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.green",
-            "columnName": "green",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blue",
-            "columnName": "blue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blur",
-            "columnName": "blur",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "itemId",
-            "type"
-          ]
-        }
-      },
-      {
-        "tableName": "PlaybackLanguageChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `seriesId` TEXT NOT NULL, `itemId` TEXT, `audioLanguage` TEXT, `subtitleLanguage` TEXT, `subtitlesDisabled` INTEGER, PRIMARY KEY(`userId`, `seriesId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "seriesId",
-            "columnName": "seriesId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioLanguage",
-            "columnName": "audioLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitleLanguage",
-            "columnName": "subtitleLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitlesDisabled",
-            "columnName": "subtitlesDisabled",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "seriesId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemTrackModification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `trackIndex` INTEGER NOT NULL, `delayMs` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`, `trackIndex`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackIndex",
-            "columnName": "trackIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "delayMs",
-            "columnName": "delayMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId",
-            "trackIndex"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT NOT NULL, `name` TEXT, `version` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_seerr_servers_url",
-            "unique": true,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_seerr_servers_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `serverId` INTEGER NOT NULL, `authMethod` TEXT NOT NULL, `username` TEXT, `password` TEXT, `credential` TEXT, PRIMARY KEY(`jellyfinUserRowId`, `serverId`), FOREIGN KEY(`serverId`) REFERENCES `seerr_servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`jellyfinUserRowId`) REFERENCES `users`(`rowId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authMethod",
-            "columnName": "authMethod",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "credential",
-            "columnName": "credential",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "serverId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "seerr_servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "jellyfinUserRowId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "RememberedTab",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "index",
-            "columnName": "index",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_RememberedTab_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_RememberedTab_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SeriesTrackChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `parentId` TEXT NOT NULL, `type` TEXT NOT NULL, `parentType` TEXT NOT NULL, `itemId` TEXT, `language` TEXT, `activation` TEXT NOT NULL, `trackFlags` INTEGER NOT NULL, `codec` TEXT, `relativeTrackIndex` INTEGER, `title` TEXT, `audioChannels` INTEGER, PRIMARY KEY(`userId`, `parentId`, `type`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentType",
-            "columnName": "parentType",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "language",
-            "columnName": "language",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "activation",
-            "columnName": "activation",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackFlags",
-            "columnName": "trackFlags",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "codec",
-            "columnName": "codec",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "relativeTrackIndex",
-            "columnName": "relativeTrackIndex",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioChannels",
-            "columnName": "audioChannels",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "parentId",
-            "type"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b297c087485321c3ee8282ad1ff675a0')"
-    ]
-  }
-}
--- a/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/41.json
+++ b/app/schemas/com.github.damontecres.wholphin.data.AppDatabase/41.json
@ -1,841 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 41,
-    "identityHash": "1f2fe7912f9e3ab83b77029e07488e84",
-    "entities": [
-      {
-        "tableName": "servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT, `url` TEXT NOT NULL, `version` TEXT, `lastUsed` TEXT, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `id` TEXT NOT NULL, `name` TEXT, `serverId` TEXT NOT NULL, `accessToken` TEXT, `pin` TEXT, `requireLogin` INTEGER NOT NULL DEFAULT false, `lastUsed` TEXT, `uiLanguage` TEXT, `preferredAudioLanguage` TEXT NOT NULL DEFAULT '', `preferredSubtitleLanguage` TEXT NOT NULL DEFAULT '', `subtitleMode` TEXT NOT NULL DEFAULT 'USE_USER_PROFILE', `c_homeSettingsSource` TEXT NOT NULL DEFAULT 'UNSET', FOREIGN KEY(`serverId`) REFERENCES `servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessToken",
-            "columnName": "accessToken",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "pin",
-            "columnName": "pin",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "requireLogin",
-            "columnName": "requireLogin",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "lastUsed",
-            "columnName": "lastUsed",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "uiLanguage",
-            "columnName": "uiLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "appPreferences.preferredAudioLanguage",
-            "columnName": "preferredAudioLanguage",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "appPreferences.preferredSubtitleLanguage",
-            "columnName": "preferredSubtitleLanguage",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "appPreferences.subtitleMode",
-            "columnName": "subtitleMode",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'USE_USER_PROFILE'"
-          },
-          {
-            "fieldPath": "config.homeSettingsSource",
-            "columnName": "c_homeSettingsSource",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'UNSET'"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_users_id_serverId",
-            "unique": true,
-            "columnNames": [
-              "id",
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_users_id_serverId` ON `${TABLE_NAME}` (`id`, `serverId`)"
-          },
-          {
-            "name": "index_users_id",
-            "unique": false,
-            "columnNames": [
-              "id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_id` ON `${TABLE_NAME}` (`id`)"
-          },
-          {
-            "name": "index_users_serverId",
-            "unique": false,
-            "columnNames": [
-              "serverId"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_users_serverId` ON `${TABLE_NAME}` (`serverId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemPlayback",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`rowId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sourceId` TEXT, `audioIndex` INTEGER NOT NULL, `subtitleIndex` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "rowId",
-            "columnName": "rowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sourceId",
-            "columnName": "sourceId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioIndex",
-            "columnName": "audioIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subtitleIndex",
-            "columnName": "subtitleIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "rowId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_ItemPlayback_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ItemPlayback_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "NavDrawerPinnedItem",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `order` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "order",
-            "columnName": "order",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "-1"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LibraryDisplayInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `sort` TEXT NOT NULL, `direction` TEXT NOT NULL, `filter` TEXT NOT NULL DEFAULT '{}', `viewOptions` TEXT, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sort",
-            "columnName": "sort",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "direction",
-            "columnName": "direction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "filter",
-            "columnName": "filter",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'{}'"
-          },
-          {
-            "fieldPath": "viewOptions",
-            "columnName": "viewOptions",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_LibraryDisplayInfo_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LibraryDisplayInfo_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playback_effects",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `type` TEXT NOT NULL, `rotation` INTEGER NOT NULL, `brightness` INTEGER NOT NULL, `contrast` INTEGER NOT NULL, `saturation` INTEGER NOT NULL, `hue` INTEGER NOT NULL, `red` INTEGER NOT NULL, `green` INTEGER NOT NULL, `blue` INTEGER NOT NULL, `blur` INTEGER NOT NULL, PRIMARY KEY(`jellyfinUserRowId`, `itemId`, `type`))",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.rotation",
-            "columnName": "rotation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.brightness",
-            "columnName": "brightness",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.contrast",
-            "columnName": "contrast",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.saturation",
-            "columnName": "saturation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.hue",
-            "columnName": "hue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.red",
-            "columnName": "red",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.green",
-            "columnName": "green",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blue",
-            "columnName": "blue",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "videoFilter.blur",
-            "columnName": "blur",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "itemId",
-            "type"
-          ]
-        }
-      },
-      {
-        "tableName": "PlaybackLanguageChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `seriesId` TEXT NOT NULL, `itemId` TEXT, `audioLanguage` TEXT, `subtitleLanguage` TEXT, `subtitlesDisabled` INTEGER, PRIMARY KEY(`userId`, `seriesId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "seriesId",
-            "columnName": "seriesId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioLanguage",
-            "columnName": "audioLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitleLanguage",
-            "columnName": "subtitleLanguage",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "subtitlesDisabled",
-            "columnName": "subtitlesDisabled",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "seriesId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "ItemTrackModification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `trackIndex` INTEGER NOT NULL, `delayMs` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`, `trackIndex`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackIndex",
-            "columnName": "trackIndex",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "delayMs",
-            "columnName": "delayMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId",
-            "trackIndex"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_servers",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT NOT NULL, `name` TEXT, `version` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "version",
-            "columnName": "version",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_seerr_servers_url",
-            "unique": true,
-            "columnNames": [
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_seerr_servers_url` ON `${TABLE_NAME}` (`url`)"
-          }
-        ]
-      },
-      {
-        "tableName": "seerr_users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`jellyfinUserRowId` INTEGER NOT NULL, `serverId` INTEGER NOT NULL, `authMethod` TEXT NOT NULL, `username` TEXT, `password` TEXT, `credential` TEXT, PRIMARY KEY(`jellyfinUserRowId`, `serverId`), FOREIGN KEY(`serverId`) REFERENCES `seerr_servers`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`jellyfinUserRowId`) REFERENCES `users`(`rowId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "jellyfinUserRowId",
-            "columnName": "jellyfinUserRowId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serverId",
-            "columnName": "serverId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "authMethod",
-            "columnName": "authMethod",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "password",
-            "columnName": "password",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "credential",
-            "columnName": "credential",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "jellyfinUserRowId",
-            "serverId"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "seerr_servers",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "serverId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "jellyfinUserRowId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "RememberedTab",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `itemId` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`userId`, `itemId`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "index",
-            "columnName": "index",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "itemId"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_RememberedTab_userId_itemId",
-            "unique": true,
-            "columnNames": [
-              "userId",
-              "itemId"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_RememberedTab_userId_itemId` ON `${TABLE_NAME}` (`userId`, `itemId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "SeriesTrackChoice",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `parentId` TEXT NOT NULL, `type` TEXT NOT NULL, `parentType` TEXT NOT NULL, `itemId` TEXT, `language` TEXT, `activation` TEXT NOT NULL, `trackFlags` INTEGER NOT NULL, `codec` TEXT, `relativeTrackIndex` INTEGER, `title` TEXT, `audioChannels` INTEGER, PRIMARY KEY(`userId`, `parentId`, `type`), FOREIGN KEY(`userId`) REFERENCES `users`(`rowId`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentId",
-            "columnName": "parentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentType",
-            "columnName": "parentType",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "itemId",
-            "columnName": "itemId",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "language",
-            "columnName": "language",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "activation",
-            "columnName": "activation",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trackFlags",
-            "columnName": "trackFlags",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "codec",
-            "columnName": "codec",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "relativeTrackIndex",
-            "columnName": "relativeTrackIndex",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "audioChannels",
-            "columnName": "audioChannels",
-            "affinity": "INTEGER"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "userId",
-            "parentId",
-            "type"
-          ]
-        },
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "rowId"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1f2fe7912f9e3ab83b77029e07488e84')"
-    ]
-  }
-}
--- a/app/src/androidTest/java/com/github/damontecres/wholphin/test/InstrumentedBasicUiTests.kt
+++ b/app/src/androidTest/java/com/github/damontecres/wholphin/test/InstrumentedBasicUiTests.kt
@ -1,78 +0,0 @@
-package com.github.damontecres.wholphin.test
-
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.test.ExperimentalTestApi
-import androidx.compose.ui.test.SemanticsNodeInteraction
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performKeyInput
-import androidx.compose.ui.test.pressKey
-import androidx.navigation3.runtime.NavBackStack
-import com.github.damontecres.wholphin.MainContent
-import com.github.damontecres.wholphin.services.NavigationManager
-import com.github.damontecres.wholphin.services.ScreensaverService
-import com.github.damontecres.wholphin.services.ScreensaverState
-import com.github.damontecres.wholphin.services.SetupDestination
-import com.github.damontecres.wholphin.ui.nav.Destination
-import com.github.damontecres.wholphin.ui.theme.WholphinTheme
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.every
-import io.mockk.mockk
-import kotlinx.coroutines.flow.MutableStateFlow
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-
-@HiltAndroidTest
-class InstrumentedBasicUiTests {
-    @get:Rule(order = 0)
-    var hiltRule = HiltAndroidRule(this)
-
-    @get:Rule(order = 1)
-    val composeTestRule = createAndroidComposeRule<TestActivity>()
-
-    lateinit var screensaverService: ScreensaverService
-
-    @Before
-    fun setup() {
-        screensaverService = mockk(relaxed = true)
-        every { screensaverService.state } returns MutableStateFlow(ScreensaverState(false, false, false, false))
-    }
-
-    @OptIn(ExperimentalTestApi::class)
-    @Test
-    fun myTest() {
-        val navigationManager = NavigationManager()
-        navigationManager.backStack = NavBackStack(Destination.Home())
-        // Start the app
-        composeTestRule.setContent {
-            WholphinTheme {
-                MainContent(
-                    backStack = mutableListOf(SetupDestination.ServerList),
-                    navigationManager = navigationManager,
-                    appPreferences = mockk(relaxed = true),
-                    backdropService = mockk(relaxed = true),
-                    screensaverService = screensaverService,
-                    modifier = Modifier,
-                )
-            }
-        }
-
-        composeTestRule.onNodeWithText("Add Server").assertExists()
-        composeTestRule.onNodeWithTag("add_server").performKeyInput {
-            pressKey(Key.DirectionDown) // TODO
-        }
-        composeTestRule.onNodeWithTag("add_server").performClickEnter()
-
-        composeTestRule.onNodeWithText("Discovered Servers").assertExists()
-    }
-}
-
-@OptIn(ExperimentalTestApi::class)
-fun SemanticsNodeInteraction.performClickEnter() =
-    performKeyInput {
-        pressKey(Key.DirectionCenter)
-    }
--- a/app/src/androidTest/java/com/github/damontecres/wholphin/test/TestActivity.kt
+++ b/app/src/androidTest/java/com/github/damontecres/wholphin/test/TestActivity.kt
@ -1,7 +0,0 @@
-package com.github.damontecres.wholphin.test
-
-import androidx.activity.ComponentActivity
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class TestActivity : ComponentActivity()
--- a/app/src/androidTest/java/com/github/damontecres/wholphin/test/WholphinTestRunner.kt
+++ b/app/src/androidTest/java/com/github/damontecres/wholphin/test/WholphinTestRunner.kt
@ -1,14 +0,0 @@
-package com.github.damontecres.wholphin.test
-
-import android.app.Application
-import android.content.Context
-import androidx.test.runner.AndroidJUnitRunner
-import dagger.hilt.android.testing.HiltTestApplication
-
-class WholphinTestRunner : AndroidJUnitRunner() {
-    override fun newApplication(
-        cl: ClassLoader?,
-        name: String?,
-        context: Context?,
-    ): Application = super.newApplication(cl, HiltTestApplication::class.java.name, context)
-}
--- a/app/src/appstore/AndroidManifest.xml
+++ b/app/src/appstore/AndroidManifest.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
-    <uses-permission
-        android:name="com.amazon.permission.media.session.voicecommandcontrol"
-        tools:node="remove" />
-
-</manifest>
--- a/app/src/debug/assets/library/assets/movie-101-dalmatians-ii-patch-s-london-adventure-2003-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-101-dalmatians-ii-patch-s-london-adventure-2003-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-12-years-a-slave-2013-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-12-years-a-slave-2013-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-a-bronx-tale-1993-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-a-bronx-tale-1993-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-a-silent-voice-the-movie-2016-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-a-silent-voice-the-movie-2016-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-absolution-2024-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-absolution-2024-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-across-the-hall-2009-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-across-the-hall-2009-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-addicted-2014-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-addicted-2014-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-adulterers-2016-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-adulterers-2016-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-all-the-money-in-the-world-2017-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-all-the-money-in-the-world-2017-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-alone-with-her-2006-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-alone-with-her-2006-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-american-gangster-2007-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-american-gangster-2007-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-annie-hall-1977-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-annie-hall-1977-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-ant-man-and-the-wasp-quantumania-2023-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-ant-man-and-the-wasp-quantumania-2023-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-apocalypse-now-1979-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-apocalypse-now-1979-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-appleseed-alpha-2014-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-appleseed-alpha-2014-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-aquaman-and-the-lost-kingdom-2023-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-aquaman-and-the-lost-kingdom-2023-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-arctic-dogs-2019-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-arctic-dogs-2019-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-arrival-2016-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-arrival-2016-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-avatar-aang-the-last-airbender-2026-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-avatar-aang-the-last-airbender-2026-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-avengers-age-of-ultron-2015-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-avengers-age-of-ultron-2015-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-avengers-confidential-black-widow-punisher-2014-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-avengers-confidential-black-widow-punisher-2014-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-avengers-infinity-war-2018-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-avengers-infinity-war-2018-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-awake-2007-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-awake-2007-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-batman-ninja-2018-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-batman-ninja-2018-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-batman-the-dark-knight-returns-part-1-2012-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-batman-the-dark-knight-returns-part-1-2012-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-batman-v-superman-dawn-of-justice-2016-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-batman-v-superman-dawn-of-justice-2016-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-black-adam-2022-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-black-adam-2022-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-black-bear-2020-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-black-bear-2020-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-black-panther-2018-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-black-panther-2018-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-black-panther-wakanda-forever-2022-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-black-panther-wakanda-forever-2022-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-blame-2017-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-blame-2017-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-bleach-the-movie-fade-to-black-2008-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-bleach-the-movie-fade-to-black-2008-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-bohemian-rhapsody-2018-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-bohemian-rhapsody-2018-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-braveheart-1995-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-braveheart-1995-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-butterfly-on-a-wheel-2007-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-butterfly-on-a-wheel-2007-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-by-any-means-2026-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-by-any-means-2026-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-captain-america-civil-war-2016-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-captain-america-civil-war-2016-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-captain-america-the-first-avenger-2011-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-captain-america-the-first-avenger-2011-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-captain-america-the-winter-soldier-2014-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-captain-america-the-winter-soldier-2014-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-careful-what-you-wish-for-2015-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-careful-what-you-wish-for-2015-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-castle-in-the-sky-1986-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-castle-in-the-sky-1986-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-chicago-2002-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-chicago-2002-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-citizen-kane-1941-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-citizen-kane-1941-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-coherence-2014-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-coherence-2014-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-conclave-2024-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-conclave-2024-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-crime-of-passion-1956-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-crime-of-passion-1956-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-deep-water-2022-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-deep-water-2022-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-derailed-2005-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-derailed-2005-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-die-my-love-2025-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-die-my-love-2025-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-dream-house-2011-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-dream-house-2011-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-dream-lover-1994-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-dream-lover-1994-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-drop-2025-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-drop-2025-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-eastern-promises-2007-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-eastern-promises-2007-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-easy-a-2010-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-easy-a-2010-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-el-camino-a-breaking-bad-movie-2019-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-el-camino-a-breaking-bad-movie-2019-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-emancipation-2022-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-emancipation-2022-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-faces-1968-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-faces-1968-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-fatale-2020-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-fatale-2020-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-fighting-with-my-family-2019-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-fighting-with-my-family-2019-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-force-of-nature-the-dry-2-2024-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-force-of-nature-the-dry-2-2024-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-free-state-of-jones-2016-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-free-state-of-jones-2016-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-from-up-on-poppy-hill-2011-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-from-up-on-poppy-hill-2011-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-ghost-in-the-shell-1995-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-ghost-in-the-shell-1995-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-ghost-in-the-shell-2-innocence-2004-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-ghost-in-the-shell-2-innocence-2004-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-gosford-park-2001-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-gosford-park-2001-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-grave-of-the-fireflies-1988-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-grave-of-the-fireflies-1988-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-howl-s-moving-castle-2004-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-howl-s-moving-castle-2004-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-in-the-heights-2021-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-in-the-heights-2021-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-jennifer-s-body-2009-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-jennifer-s-body-2009-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-kiki-s-delivery-service-1989-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-kiki-s-delivery-service-1989-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-lemony-snicket-s-a-series-of-unfortunate-events-2004-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-lemony-snicket-s-a-series-of-unfortunate-events-2004-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-locke-2014-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-locke-2014-poster.jpg
--- a/app/src/debug/assets/library/assets/movie-look-who-s-back-2015-poster.jpg
+++ b/app/src/debug/assets/library/assets/movie-look-who-s-back-2015-poster.jpg
--- a/Show more
+++ b/Show more