fix(mediarequest): optimise more typeorm lifecycle triggers

This is related to #1218. This should fix more typeorm lifcycle trigger issues fix #513
2025-12-24 10:49:30 -05:00 · 2025-02-21 02:09:09 +08:00
131 changed files with 3255 additions and 6844 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -94,8 +94,7 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/345752?v=4",
      "profile": "https://github.com/jab416171",
      "contributions": [
-        "doc",
-        "code"
+        "doc"
      ]
    },
    {
@@ -339,8 +338,7 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
      "profile": "https://gauthierth.fr/",
      "contributions": [
-        "code",
-        "maintenance"
+        "code"
      ]
    },
    {
@@ -612,105 +610,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "michaelhthomas",
-      "name": "Michael Thomas",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18223295?v=4",
-      "profile": "http://michaelt.xyz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "j0srisk",
-      "name": "Joseph Risk",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
-      "profile": "http://josephrisk.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Loetwiek",
-      "name": "Loetwiek",
-      "avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
-      "profile": "https://github.com/Loetwiek",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Fuochi",
-      "name": "Fuochi",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
-      "profile": "https://github.com/Fuochi",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "demrich",
-      "name": "David Emrich",
-      "avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
-      "profile": "https://github.com/demrich",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "maxnatamo",
-      "name": "Max T. Kristiansen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
-      "profile": "https://maxtrier.dk",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "DamsDev1",
-      "name": "Damien Fajole",
-      "avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
-      "profile": "https://damsdev.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "AhmedNSidd",
-      "name": "Ahmed Siddiqui",
-      "avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
-      "profile": "https://github.com/AhmedNSidd",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "JackW6809",
-      "name": "JackOXI",
-      "avatar_url": "https://avatars.githubusercontent.com/u/53652452?v=4",
-      "profile": "https://github.com/JackW6809",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "StancuFlorin",
-      "name": "Stancu Florin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1199404?v=4",
-      "profile": "http://indicus.ro",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "RankWeis",
-      "name": "RankWeis",
-      "avatar_url": "https://avatars.githubusercontent.com/u/733691?v=4",
-      "profile": "https://github.com/RankWeis",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -36,11 +36,3 @@ jobs:
          # Fix test titles in cypress dashboard
          COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
          COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
-      - name: Upload video files
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: cypress-videos
-          path: |
-            cypress/videos
-            cypress/screenshots
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,27 +58,12 @@ All help is welcome and greatly appreciated! If you would like to contribute to

   - Be sure to follow both the [code](#contributing-code) and [UI text](#ui-text-style) guidelines.
   - Should you need to update your fork, you can do so by rebasing from `upstream`:
-
     ```bash
     git fetch upstream
     git rebase upstream/develop
     git push origin BRANCH_NAME -f
     ```

-### Helm Chart  
-
-Tools Required:
-
- [Helm](https://helm.sh/docs/intro/install/)  
- [helm-docs](https://github.com/norwoodj/helm-docs)  
-
-Steps:
-
-1. Make the necessary changes.  
-2. Test your changes.  
-3. Update the `version` in `charts/jellyseerr-chart/Chart.yaml` following [Semantic Versioning (SemVer)](https://semver.org/).  
-4. Run the `helm-docs` command to regenerate the chart's README.
-
 ### Contributing Code

 - If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/fallenbagel/jellyseerr/issues) to avoid multiple people working on the same thing.
@@ -112,7 +97,7 @@ When adding new UI text, please try to adhere to the following guidelines:

 ## Translation

-We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Jellyseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).
+We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).

 <a href="https://jellyseerr.borgcube.de/engage/jellysseerr/"><img src="https://jellyseerr.borgcube.de/widget/jellyseerr/multi-auto.svg" alt="Translation status" /></a>

--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 <a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-77-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-66-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 **Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.
@@ -96,7 +96,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
    </tr>
    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/CyferShepard"><img src="https://avatars.githubusercontent.com/u/24864904?v=4?s=100" width="100px;" alt="Thegan Govender"/><br /><sub><b>Thegan Govender</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=CyferShepard" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jab416171"><img src="https://avatars.githubusercontent.com/u/345752?v=4?s=100" width="100px;" alt="jab416171"/><br /><sub><b>jab416171</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=jab416171" title="Documentation">📖</a> <a href="https://github.com/fallenbagel/jellyseerr/commits?author=jab416171" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jab416171"><img src="https://avatars.githubusercontent.com/u/345752?v=4?s=100" width="100px;" alt="jab416171"/><br /><sub><b>jab416171</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=jab416171" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://nvds.be"><img src="https://avatars.githubusercontent.com/u/5257222?v=4?s=100" width="100px;" alt="Nicolai Van der Storm"/><br /><sub><b>Nicolai Van der Storm</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=NicolaiVdS" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Smexhy"><img src="https://avatars.githubusercontent.com/u/4880625?v=4?s=100" width="100px;" alt="Smexhy"/><br /><sub><b>Smexhy</b></sub></a><br /><a href="#translation-Smexhy" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://dd06-dev.fr"><img src="https://avatars.githubusercontent.com/u/58089504?v=4?s=100" width="100px;" alt="dd060606"/><br /><sub><b>dd060606</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=dd060606" title="Code">💻</a></td>
@@ -131,7 +131,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://www.boniface.me"><img src="https://avatars.githubusercontent.com/u/4031396?v=4?s=100" width="100px;" alt="Joshua M. Boniface"/><br /><sub><b>Joshua M. Boniface</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=joshuaboniface" title="Code">💻</a></td>
    </tr>
    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a> <a href="#maintenance-gauthier-th" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Kara-Zor-El"><img src="https://avatars.githubusercontent.com/u/69772087?v=4?s=100" width="100px;" alt="Kara"/><br /><sub><b>Kara</b></sub></a><br /><a href="#infra-Kara-Zor-El" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
@@ -170,19 +170,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/methbkts"><img src="https://avatars.githubusercontent.com/u/30674934?v=4?s=100" width="100px;" alt="Metin Bektas"/><br /><sub><b>Metin Bektas</b></sub></a><br /><a href="#infra-methbkts" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrewkolda"><img src="https://avatars.githubusercontent.com/u/158614532?v=4?s=100" width="100px;" alt="andrewkolda"/><br /><sub><b>andrewkolda</b></sub></a><br /><a href="#design-andrewkolda" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://ishanjain.me"><img src="https://avatars.githubusercontent.com/u/7921368?v=4?s=100" width="100px;" alt="Ishan Jain"/><br /><sub><b>Ishan Jain</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=ishanjain28" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://michaelt.xyz"><img src="https://avatars.githubusercontent.com/u/18223295?v=4?s=100" width="100px;" alt="Michael Thomas"/><br /><sub><b>Michael Thomas</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=michaelhthomas" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/demrich"><img src="https://avatars.githubusercontent.com/u/30092389?v=4?s=100" width="100px;" alt="David Emrich"/><br /><sub><b>David Emrich</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=demrich" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://maxtrier.dk"><img src="https://avatars.githubusercontent.com/u/5898152?v=4?s=100" width="100px;" alt="Max T. Kristiansen"/><br /><sub><b>Max T. Kristiansen</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=maxnatamo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://damsdev.me"><img src="https://avatars.githubusercontent.com/u/60252259?v=4?s=100" width="100px;" alt="Damien Fajole"/><br /><sub><b>Damien Fajole</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=DamsDev1" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JackW6809"><img src="https://avatars.githubusercontent.com/u/53652452?v=4?s=100" width="100px;" alt="JackOXI"/><br /><sub><b>JackOXI</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JackW6809" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RankWeis"><img src="https://avatars.githubusercontent.com/u/733691?v=4?s=100" width="100px;" alt="RankWeis"/><br /><sub><b>RankWeis</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=RankWeis" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -300,7 +287,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/byakurau"><img src="https://avatars.githubusercontent.com/u/1811683?v=4?s=100" width="100px;" alt="byakurau"/><br /><sub><b>byakurau</b></sub></a><br /><a href="#translation-byakurau" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/miknii"><img src="https://avatars.githubusercontent.com/u/109232569?v=4?s=100" width="100px;" alt="miknii"/><br /><sub><b>miknii</b></sub></a><br /><a href="#translation-miknii" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Eclipseop"><img src="https://avatars.githubusercontent.com/u/5846213?v=4?s=100" width="100px;" alt="Mackenzie"/><br /><sub><b>Mackenzie</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Eclipseop" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/s0up4200"><img src="https://avatars.githubusercontent.com/u/18177310?v=4?s=100" width="100px;" alt="soup"/><br /><sub><b>soup</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=s0up4200" title="Documentation">📖</a> <a href="https://github.com/sct/overseerr/commits?author=s0up4200" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/s0up4200"><img src="https://avatars.githubusercontent.com/u/18177310?v=4?s=100" width="100px;" alt="soup"/><br /><sub><b>soup</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=s0up4200" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ceptonit"><img src="https://avatars.githubusercontent.com/u/12678743?v=4?s=100" width="100px;" alt="ceptonit"/><br /><sub><b>ceptonit</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=ceptonit" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/aedelbro"><img src="https://avatars.githubusercontent.com/u/36162221?v=4?s=100" width="100px;" alt="aedelbro"/><br /><sub><b>aedelbro</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=aedelbro" title="Code">💻</a></td>
    </tr>
@@ -333,8 +320,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
    </tr>
    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JackW6809"><img src="https://avatars.githubusercontent.com/u/53652452?v=4?s=100" width="100px;" alt="JackOXI"/><br /><sub><b>JackOXI</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=JackW6809" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
--- a/charts/jellyseerr-chart/Chart.yaml
+++ b/charts/jellyseerr-chart/Chart.yaml
@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
 name: jellyseerr-chart
 description: Jellyseerr helm chart for Kubernetes
 type: application
-version: 2.3.2
-appVersion: "2.5.1"
+version: 2.1.1
+appVersion: "2.3.0"
 maintainers:
  - name: Jellyseerr
    url: https://github.com/Fallenbagel/jellyseerr
--- a/charts/jellyseerr-chart/README.md
+++ b/charts/jellyseerr-chart/README.md
@@ -1,6 +1,6 @@
 # jellyseerr-chart

-![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.1](https://img.shields.io/badge/AppVersion-2.5.1-informational?style=flat-square)
+![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)

 Jellyseerr helm chart for Kubernetes

--- a/charts/jellyseerr-chart/templates/persistentvolumeclaim.yaml
+++ b/charts/jellyseerr-chart/templates/persistentvolumeclaim.yaml
@@ -4,10 +4,6 @@ metadata:
  name: {{ include "jellyseerr.configPersistenceName" . }}
  labels:
    {{- include "jellyseerr.labels" . | nindent 4 }}
-  {{- with .Values.config.persistence.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
  {{- with .Values.config.persistence.accessModes }}
  accessModes:
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -4,7 +4,6 @@ export default defineConfig({
  projectId: 'xkm1b4',
  e2e: {
    baseUrl: 'http://localhost:5055',
-    video: true,
    experimentalSessionAndOrigin: true,
  },
  env: {
--- a/cypress/config/settings.cypress.json
+++ b/cypress/config/settings.cypress.json
@@ -4,7 +4,7 @@
  "vapidPublic": "BK_EpP8NDm9waor2zn6_S28o3ZYv4kCkJOfYpO3pt3W6jnPmxrgTLANUBNbbyaNatPnSQ12De9CeqSYQrqWzHTs",
  "main": {
    "apiKey": "testkey",
-    "applicationTitle": "Jellyseerr",
+    "applicationTitle": "Overseerr",
    "applicationUrl": "",
    "csrfProtection": false,
    "cacheImages": false,
@@ -24,6 +24,7 @@
    "partialRequestsEnabled": true,
    "enableSpecialEpisodes": false,
    "forceIpv4First": false,
+    "dnsServers": "",
    "locale": "en"
  },
  "plex": {
@@ -70,7 +71,7 @@
          "ignoreTls": false,
          "requireTls": false,
          "allowSelfSigned": false,
-          "senderName": "Jellyseerr"
+          "senderName": "Overseerr"
        }
      },
      "discord": {
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -6,6 +6,7 @@ Cypress.Commands.add('login', (email, password) => {
    [email, password],
    () => {
      cy.visit('/login');
+      cy.contains('Use your Overseerr account').click();

      cy.get('[data-testid=email]').type(email);
      cy.get('[data-testid=password]').type(password);
--- a/docs/getting-started/buildfromsource.mdx
+++ b/docs/getting-started/buildfromsource.mdx
@@ -255,8 +255,7 @@ To run jellyseerr as a service:
 1. Download the [Non-Sucking Service Manager](https://nssm.cc/download)
 2. Install NSSM:
 ```powershell
-nssm install Jellyseerr "C:\Program Files\nodejs\node.exe" "C:\jellyseerr\dist\index.js"
-nssm set Jellyseerr AppDirectory "C:\jellyseerr"
+nssm install Jellyseerr "C:\Program Files\nodejs\node.exe" ["C:\jellyseerr\dist\index.js"]
 nssm set Jellyseerr AppEnvironmentExtra NODE_ENV=production
 ```
 3. Start the service:
--- a/docs/troubleshooting.mdx
+++ b/docs/troubleshooting.mdx
@@ -24,12 +24,6 @@ or for Cloudflare's DNS:
 ```bash
 --dns=1.1.1.1
 ```
-or for Quad9 DNS:
-```bash
--dns=9.9.9.9
-```
-
-You can try them all and see which one works for your network.

  </TabItem>

@@ -51,16 +45,6 @@ services:
    dns:
      - 1.1.1.1
 ```
-or for Quad9's DNS:
-```yaml
---
-services:
-  jellyseerr:
-    dns:
-      - 9.9.9.9
-```
-
-You can try them all and see which one works for your network.

  </TabItem>

@@ -72,7 +56,7 @@ You can try them all and see which one works for your network.
 4. Click on Change adapter settings.
 5. Right-click the network interface connected to the internet and select Properties.
 6. Select Internet Protocol Version 4 (TCP/IPv4) and click Properties.
-7. Select Use the following DNS server addresses and enter `8.8.8.8` for Google's DNS or `1.1.1.1` for Cloudflare's DNS or `9.9.9.9` for Quad9's DNS.
+7. Select Use the following DNS server addresses and enter `8.8.8.8` for Google's DNS or `1.1.1.1` for Cloudflare's DNS.

  </TabItem>

@@ -89,10 +73,6 @@ You can try them all and see which one works for your network.
    ```bash
    nameserver 1.1.1.1
    ```
-    or for Quad9's DNS:
-    ```bash
-    nameserver 9.9.9.9
-    ```

  </TabItem>
 </Tabs>
@@ -101,7 +81,7 @@ You can try them all and see which one works for your network.

 Sometimes there are configuration issues with IPV6 that prevent the hostname resolution from working correctly.

-You can try to force the resolution to use IPV4 first by going to `Settings > Networking > Advanced Networking` and enabling `Force IPv4 Resolution First` setting and restarting. You can also add the environment variable, `FORCE_IPV4_FIRST=true`:
+You can try to force the resolution to use IPV4 first by setting the `FORCE_IPV4_FIRST` environment variable to `true`:

 <Tabs groupId="methods" queryString>
  <TabItem value="docker-cli" label="Docker CLI">
--- a/docs/using-jellyseerr/settings/users.md
+++ b/docs/using-jellyseerr/settings/users.md
@@ -14,14 +14,6 @@ When disabled, your mediaserver OAuth becomes the only sign-in option, and any "

 This setting is **enabled** by default.

-## Enable Jellyfin/Emby/Plex Sign-In
-
-When enabled, users will be able to sign in to Jellyseerr using their Jellyfin/Emby/Plex credentials, provided they have linked their media server accounts.
-
-When disabled, users will only be able to sign in using their email address. Users without a password set will not be able to sign in to Jellyseerr.
-
-This setting is **enabled** by default.
-
 ## Enable New Jellyfin/Emby/Plex Sign-In

 When enabled, users with access to your media server will be able to sign in to Jellyseerr even if they have not yet been imported. Users will be automatically assigned the permissions configured in the [Default Permissions](#default-permissions) setting upon first sign-in.
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />

 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.
--- a/jellyseerr-api.yml
+++ b/jellyseerr-api.yml
@@ -1,19 +1,19 @@
 openapi: '3.0.2'
 info:
-  title: 'Jellyseerr API'
+  title: 'Overseerr API'
  version: '1.0.0'
  description: |
-    This is the documentation for the Jellyseerr API backend.
+    This is the documentation for the Overseerr API backend.

    Two primary authentication methods are supported:

    - **Cookie Authentication**: A valid sign-in to the `/auth/plex` or `/auth/local` will generate a valid authentication cookie.
-    - **API Key Authentication**: Sign-in is also possible by passing an `X-Api-Key` header along with a valid API Key generated by Jellyseerr.
+    - **API Key Authentication**: Sign-in is also possible by passing an `X-Api-Key` header along with a valid API Key generated by Overseerr.
 tags:
  - name: public
    description: Public API endpoints requiring no authentication.
  - name: settings
-    description: Endpoints related to Jellyseerr's settings and configuration.
+    description: Endpoints related to Overseerr's settings and configuration.
  - name: auth
    description: Endpoints related to logging in or out, and the currently authenticated user.
  - name: users
@@ -160,7 +160,7 @@ components:
          example: en
        applicationTitle:
          type: string
-          example: Jellyseerr
+          example: Overseerr
        applicationUrl:
          type: string
          example: https://os.example.com
@@ -194,6 +194,9 @@ components:
        forceIpv4First:
          type: boolean
          example: false
+        dnsServers:
+          type: string
+          example: '1.1.1.1'
        trustProxy:
          type: boolean
          example: true
@@ -1435,7 +1438,7 @@ components:
              example: no-reply@example.com
            senderName:
              type: string
-              example: Jellyseerr
+              example: Overseerr
            smtpHost:
              type: string
              example: 127.0.0.1
@@ -1966,8 +1969,8 @@ components:
 paths:
  /status:
    get:
-      summary: Get Jellyseerr status
-      description: Returns the current Jellyseerr status in a JSON object.
+      summary: Get Overseerr status
+      description: Returns the current Overseerr status in a JSON object.
      security: []
      tags:
        - public
@@ -3812,11 +3815,6 @@ paths:
          required: false
          schema:
            type: string
-        - in: query
-          name: includeIds
-          required: false
-          schema:
-            type: string
      responses:
        '200':
          description: A JSON array of all users
@@ -4425,104 +4423,6 @@ paths:
      responses:
        '204':
          description: User password updated
-  /user/{userId}/settings/linked-accounts/plex:
-    post:
-      summary: Link the provided Plex account to the current user
-      description: Logs in to Plex with the provided auth token, then links the associated Plex account with the user's account. Users can only link external accounts to their own account.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                authToken:
-                  type: string
-              required:
-                - authToken
-      responses:
-        '204':
-          description: Linking account succeeded
-        '403':
-          description: Invalid credentials
-        '422':
-          description: Account already linked to a user
-    delete:
-      summary: Remove the linked Plex account for a user
-      description: Removes the linked Plex account for a specific user. Requires `MANAGE_USERS` permission if editing other users.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-      responses:
-        '204':
-          description: Unlinking account succeeded
-        '400':
-          description: Unlink request invalid
-        '404':
-          description: User does not exist
-  /user/{userId}/settings/linked-accounts/jellyfin:
-    post:
-      summary: Link the provided Jellyfin account to the current user
-      description: Logs in to Jellyfin with the provided credentials, then links the associated Jellyfin account with the user's account. Users can only link external accounts to their own account.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                username:
-                  type: string
-                  example: 'Mr User'
-                password:
-                  type: string
-                  example: 'supersecret'
-      responses:
-        '204':
-          description: Linking account succeeded
-        '403':
-          description: Invalid credentials
-        '422':
-          description: Account already linked to a user
-    delete:
-      summary: Remove the linked Jellyfin account for a user
-      description: Removes the linked Jellyfin account for a specific user. Requires `MANAGE_USERS` permission if editing other users.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-      responses:
-        '204':
-          description: Unlinking account succeeded
-        '400':
-          description: Unlink request invalid
-        '404':
-          description: User does not exist
  /user/{userId}/settings/notifications:
    get:
      summary: Get notification settings for a user
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "scripts": {
    "preinstall": "npx only-allow pnpm",
    "postinstall": "node postinstall-win.js",
-    "dev": "nodemon -e ts --watch server --watch jellyseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
+    "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
    "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
    "build:next": "next build",
    "build": "pnpm build:next && pnpm build:server",
@@ -32,7 +32,6 @@
  },
  "license": "MIT",
  "dependencies": {
-    "@dr.pogodin/csurf": "^1.14.1",
    "@formatjs/intl-displaynames": "6.2.6",
    "@formatjs/intl-locale": "3.1.1",
    "@formatjs/intl-pluralrules": "5.1.10",
@@ -48,15 +47,16 @@
    "bcrypt": "5.1.0",
    "bowser": "2.11.0",
    "connect-typeorm": "1.1.4",
-    "cookie-parser": "1.4.7",
+    "cookie-parser": "1.4.6",
    "copy-to-clipboard": "3.3.3",
    "country-flag-icons": "1.5.5",
    "cronstrue": "2.23.0",
+    "csurf": "1.11.0",
    "date-fns": "2.29.3",
    "dayjs": "1.11.7",
-    "email-templates": "12.0.1",
+    "email-templates": "9.0.0",
    "email-validator": "2.0.4",
-    "express": "4.21.2",
+    "express": "4.18.2",
    "express-openapi-validator": "4.13.8",
    "express-rate-limit": "6.7.0",
    "express-session": "1.17.3",
@@ -64,15 +64,15 @@
    "gravatar-url": "3.1.0",
    "lodash": "4.17.21",
    "mime": "3",
-    "next": "^14.2.24",
+    "next": "^14.2.4",
    "node-cache": "5.1.2",
    "node-gyp": "9.3.1",
    "node-schedule": "2.1.1",
-    "nodemailer": "6.10.0",
-    "openpgp": "5.11.2",
+    "nodemailer": "6.9.1",
+    "openpgp": "5.7.0",
    "pg": "8.11.0",
    "plex-api": "5.3.2",
-    "pug": "3.0.3",
+    "pug": "3.0.2",
    "react": "^18.3.1",
    "react-ace": "10.1.0",
    "react-animate-height": "2.1.2",
@@ -86,19 +86,17 @@
    "react-spring": "9.7.1",
    "react-tailwindcss-datepicker-sct": "1.3.4",
    "react-toast-notifications": "2.5.1",
-    "react-transition-group": "^4.4.5",
    "react-truncate-markup": "5.1.2",
    "react-use-clipboard": "1.0.9",
    "reflect-metadata": "0.1.13",
    "secure-random-password": "0.2.3",
-    "semver": "7.7.1",
+    "semver": "7.3.8",
    "sharp": "^0.33.4",
-    "sqlite3": "5.1.7",
+    "sqlite3": "5.1.4",
    "swagger-ui-express": "4.6.2",
    "swr": "2.2.5",
-    "tailwind-merge": "^2.6.0",
    "typeorm": "0.3.11",
-    "undici": "^7.3.0",
+    "undici": "^6.20.1",
    "web-push": "3.5.0",
    "wink-jaro-distance": "^2.0.0",
    "winston": "3.8.2",
@@ -106,7 +104,7 @@
    "xml2js": "0.4.23",
    "yamljs": "0.3.0",
    "yup": "0.32.11",
-    "zod": "3.24.2"
+    "zod": "3.20.6"
  },
  "devDependencies": {
    "@commitlint/cli": "17.4.4",
@@ -116,8 +114,8 @@
    "@semantic-release/exec": "6.0.3",
    "@semantic-release/git": "10.0.1",
    "@tailwindcss/aspect-ratio": "0.4.2",
-    "@tailwindcss/forms": "0.5.10",
-    "@tailwindcss/typography": "0.5.16",
+    "@tailwindcss/forms": "0.5.3",
+    "@tailwindcss/typography": "0.5.9",
    "@types/bcrypt": "5.0.0",
    "@types/cookie-parser": "1.4.3",
    "@types/country-flag-icons": "1.2.0",
@@ -146,7 +144,7 @@
    "commitizen": "4.3.0",
    "copyfiles": "2.4.1",
    "cy-mobile-commands": "0.3.0",
-    "cypress": "14.1.0",
+    "cypress": "12.7.0",
    "cz-conventional-changelog": "3.3.0",
    "eslint": "8.35.0",
    "eslint-config-next": "^14.2.4",
@@ -159,8 +157,8 @@
    "eslint-plugin-react-hooks": "4.6.0",
    "husky": "8.0.3",
    "lint-staged": "13.1.2",
-    "nodemon": "3.1.9",
-    "postcss": "8.4.31",
+    "nodemon": "2.0.20",
+    "postcss": "8.4.21",
    "prettier": "2.8.4",
    "prettier-plugin-organize-imports": "3.2.2",
    "prettier-plugin-tailwindcss": "0.2.3",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/public/images/jellyseerr_poster_not_found.png
+++ b/public/images/jellyseerr_poster_not_found.png
--- a/public/images/jellyseerr_poster_not_found_logo_center.png
+++ b/public/images/jellyseerr_poster_not_found_logo_center.png
--- a/public/images/jellyseerr_poster_not_found_logo_top.png
+++ b/public/images/jellyseerr_poster_not_found_logo_top.png
--- a/public/sw.js
+++ b/public/sw.js
@@ -3,7 +3,7 @@
 // previously cached resources to be updated from the network.
 // This variable is intentionally declared and unused.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const OFFLINE_VERSION = 4;
+const OFFLINE_VERSION = 3;
 const CACHE_NAME = 'offline';
 // Customize this with a different URL if needed.
 const OFFLINE_URL = '/offline.html';
@@ -107,25 +107,6 @@ self.addEventListener('push', (event) => {
    );
  }

-  // Set the badge with the amount of pending requests
-  // Only update the badge if the payload confirms they are the admin
-  if (
-    (payload.notificationType === 'MEDIA_APPROVED' ||
-      payload.notificationType === 'MEDIA_DECLINED') &&
-    payload.isAdmin
-  ) {
-    if ('setAppBadge' in navigator) {
-      navigator.setAppBadge(payload.pendingRequestsCount);
-    }
-    return;
-  }
-
-  if (payload.notificationType === 'MEDIA_PENDING') {
-    if ('setAppBadge' in navigator) {
-      navigator.setAppBadge(payload.pendingRequestsCount);
-    }
-  }
-
  event.waitUntil(self.registration.showNotification(payload.subject, options));
 });

--- a/server/api/github.ts
+++ b/server/api/github.ts
@@ -72,7 +72,7 @@ class GithubAPI extends ExternalAPI {
    );
  }

-  public async getJellyseerrReleases({
+  public async getOverseerrReleases({
    take = 20,
  }: {
    take?: number;
@@ -88,14 +88,14 @@ class GithubAPI extends ExternalAPI {
      return data;
    } catch (e) {
      logger.warn(
-        "Failed to retrieve GitHub releases. This may be an issue on GitHub's end. Jellyseerr can't check if it's on the latest version.",
+        "Failed to retrieve GitHub releases. This may be an issue on GitHub's end. Overseerr can't check if it's on the latest version.",
        { label: 'GitHub API', errorMessage: e.message }
      );
      return [];
    }
  }

-  public async getJellyseerrCommits({
+  public async getOverseerrCommits({
    take = 20,
    branch = 'develop',
  }: {
@@ -114,7 +114,7 @@ class GithubAPI extends ExternalAPI {
      return data;
    } catch (e) {
      logger.warn(
-        "Failed to retrieve GitHub commits. This may be an issue on GitHub's end. Jellyseerr can't check if it's on the latest version.",
+        "Failed to retrieve GitHub commits. This may be an issue on GitHub's end. Overseerr can't check if it's on the latest version.",
        { label: 'GitHub API', errorMessage: e.message }
      );
      return [];
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -1,9 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import ExternalAPI from '@server/api/externalapi';
 import { ApiErrorCode } from '@server/constants/error';
-import { MediaServerType } from '@server/constants/server';
 import availabilitySync from '@server/lib/availabilitySync';
-import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { ApiError } from '@server/types/error';
 import { getAppVersion } from '@server/utils/appVersion';
@@ -94,22 +92,10 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
  DateCreated?: string;
 }

-export interface JellyfinItemsReponse {
-  Items: JellyfinLibraryItemExtended[];
-  TotalRecordCount: number;
-  StartIndex: number;
-}
-
 class JellyfinAPI extends ExternalAPI {
  private userId?: string;
-  private mediaServerType: MediaServerType;

-  constructor(
-    jellyfinHost: string,
-    authToken?: string | null,
-    deviceId?: string | null
-  ) {
-    const settings = getSettings();
+  constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
    let authHeaderVal: string;
    if (authToken) {
      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
@@ -126,8 +112,6 @@ class JellyfinAPI extends ExternalAPI {
        },
      }
    );
-
-    this.mediaServerType = settings.main.mediaServerType;
  }

  public async login(
@@ -308,15 +292,18 @@ class JellyfinAPI extends ExternalAPI {

  public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
    try {
-      const libraryItemsResponse = await this.get<any>(`/Items`, {
-        SortBy: 'SortName',
-        SortOrder: 'Ascending',
-        IncludeItemTypes: 'Series,Movie,Others',
-        Recursive: 'true',
-        StartIndex: '0',
-        ParentId: id,
-        collapseBoxSetItems: 'false',
-      });
+      const libraryItemsResponse = await this.get<any>(
+        `/Users/${this.userId}/Items`,
+        {
+          SortBy: 'SortName',
+          SortOrder: 'Ascending',
+          IncludeItemTypes: 'Series,Movie,Others',
+          Recursive: 'true',
+          StartIndex: '0',
+          ParentId: id,
+          collapseBoxSetItems: 'false',
+        }
+      );

      return libraryItemsResponse.Items.filter(
        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
@@ -333,22 +320,13 @@ class JellyfinAPI extends ExternalAPI {

  public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
    try {
-      const endpoint =
-        this.mediaServerType === MediaServerType.JELLYFIN
-          ? `/Items/Latest`
-          : `/Users/${this.userId}/Items/Latest`;
-
-      const baseParams = {
-        Limit: '12',
-        ParentId: id,
-      };
-
-      const params =
-        this.mediaServerType === MediaServerType.JELLYFIN
-          ? { ...baseParams, userId: this.userId ?? `Me` }
-          : baseParams;
-
-      const itemResponse = await this.get<any>(endpoint, params);
+      const itemResponse = await this.get<any>(
+        `/Users/${this.userId}/Items/Latest`,
+        {
+          Limit: '12',
+          ParentId: id,
+        }
+      );

      return itemResponse;
    } catch (e) {
@@ -365,12 +343,11 @@ class JellyfinAPI extends ExternalAPI {
    id: string
  ): Promise<JellyfinLibraryItemExtended | undefined> {
    try {
-      const itemResponse = await this.get<JellyfinItemsReponse>(`/Items`, {
-        ids: id,
-        fields: 'ProviderIds,MediaSources,Width,Height,IsHD,DateCreated',
-      });
+      const itemResponse = await this.get<any>(
+        `/Users/${this.userId}/Items/${id}`
+      );

-      return itemResponse.Items?.[0];
+      return itemResponse;
    } catch (e) {
      if (availabilitySync.running) {
        if (e.cause?.status === 500) {
--- a/server/api/plexapi.ts
+++ b/server/api/plexapi.ts
@@ -92,7 +92,7 @@ class PlexAPI {
    plexSettings,
    timeout,
  }: {
-    plexToken?: string | null;
+    plexToken?: string;
    plexSettings?: PlexSettings;
    timeout?: number;
  }) {
@@ -107,7 +107,7 @@ class PlexAPI {
      port: settingsPlex.port,
      https: settingsPlex.useSsl,
      timeout: timeout,
-      token: plexToken ?? undefined,
+      token: plexToken,
      authenticator: {
        authenticate: (
          _plexApi,
@@ -124,9 +124,9 @@ class PlexAPI {
      // },
      options: {
        identifier: settings.clientId,
-        product: 'Jellyseerr',
-        deviceName: 'Jellyseerr',
-        platform: 'Jellyseerr',
+        product: 'Overseerr',
+        deviceName: 'Overseerr',
+        platform: 'Overseerr',
      },
    });
  }
--- a/server/api/themoviedb/index.ts
+++ b/server/api/themoviedb/index.ts
@@ -256,7 +256,6 @@ class TheMovieDb extends ExternalAPI {
          language,
          append_to_response:
            'credits,external_ids,videos,keywords,release_dates,watch/providers',
-          include_video_language: language + ', en',
        },
        43200
      );
@@ -281,7 +280,6 @@ class TheMovieDb extends ExternalAPI {
          language,
          append_to_response:
            'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
-          include_video_language: language + ', en',
        },
        43200
      );
--- a/server/constants/error.ts
+++ b/server/constants/error.ts
@@ -7,6 +7,5 @@ export enum ApiErrorCode {
  NoAdminUser = 'NO_ADMIN_USER',
  SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
  SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
-  Unauthorized = 'UNAUTHORIZED',
  Unknown = 'UNKNOWN',
 }
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -999,7 +999,7 @@ export class MediaRequest {
                radarrMovie.id,
              [this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']:
                radarrMovie.titleSlug,
-              [this.is4k ? 'serviceId4k' : 'serviceId']: radarrSettings?.id,
+              [this.is4k ? 'serviceId4k' : 'serviceId']: radarrMovie?.id,
            };

            await mediaRepository.update({ id: this.media.id }, updateFields);
--- a/server/entity/User.ts
+++ b/server/entity/User.ts
@@ -56,11 +56,11 @@ export class User {
  })
  public email: string;

-  @Column({ type: 'varchar', nullable: true })
-  public plexUsername?: string | null;
+  @Column({ nullable: true })
+  public plexUsername?: string;

-  @Column({ type: 'varchar', nullable: true })
-  public jellyfinUsername?: string | null;
+  @Column({ nullable: true })
+  public jellyfinUsername?: string;

  @Column({ nullable: true })
  public username?: string;
@@ -77,20 +77,20 @@ export class User {
  @Column({ type: 'integer', default: UserType.PLEX })
  public userType: UserType;

-  @Column({ type: 'integer', nullable: true, select: true })
-  public plexId?: number | null;
+  @Column({ nullable: true, select: true })
+  public plexId?: number;

-  @Column({ type: 'varchar', nullable: true })
-  public jellyfinUserId?: string | null;
+  @Column({ nullable: true })
+  public jellyfinUserId?: string;

-  @Column({ type: 'varchar', nullable: true, select: false })
-  public jellyfinDeviceId?: string | null;
+  @Column({ nullable: true, select: false })
+  public jellyfinDeviceId?: string;

-  @Column({ type: 'varchar', nullable: true, select: false })
-  public jellyfinAuthToken?: string | null;
+  @Column({ nullable: true, select: false })
+  public jellyfinAuthToken?: string;

-  @Column({ type: 'varchar', nullable: true, select: false })
-  public plexToken?: string | null;
+  @Column({ nullable: true, select: false })
+  public plexToken?: string;

  @Column({ type: 'integer', default: 0 })
  public permissions = 0;
--- a/server/index.ts
+++ b/server/index.ts
@@ -1,4 +1,3 @@
-import csurf from '@dr.pogodin/csurf';
 import PlexAPI from '@server/api/plexapi';
 import dataSource, { getRepository, isPgsql } from '@server/datasource';
 import DiscoverSlider from '@server/entity/DiscoverSlider';
@@ -29,6 +28,7 @@ import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
 import { TypeormStore } from 'connect-typeorm/out';
 import cookieParser from 'cookie-parser';
+import csurf from 'csurf';
 import type { NextFunction, Request, Response } from 'express';
 import express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
@@ -41,9 +41,9 @@ import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';

-const API_SPEC_PATH = path.join(__dirname, '../jellyseerr-api.yml');
+const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');

-logger.info(`Starting Jellyseerr version ${getAppVersion()}`);
+logger.info(`Starting Overseerr version ${getAppVersion()}`);
 const dev = process.env.NODE_ENV !== 'production';
 const app = next({ dev });
 const handle = app.getRequestHandler();
@@ -83,6 +83,12 @@ app
      net.setDefaultAutoSelectFamily(false);
    }

+    if (settings.network.dnsServers.trim() !== '') {
+      dns.setServers(
+        settings.network.dnsServers.split(',').map((server) => server.trim())
+      );
+    }
+
    // Register HTTP proxy
    if (settings.network.proxy.enabled) {
      await createCustomProxyAgent(settings.network.proxy);
--- a/server/interfaces/api/settingsInterfaces.ts
+++ b/server/interfaces/api/settingsInterfaces.ts
@@ -30,7 +30,6 @@ export interface PublicSettingsResponse {
  applicationUrl: string;
  hideAvailable: boolean;
  localLogin: boolean;
-  mediaServerLogin: boolean;
  movie4kEnabled: boolean;
  series4kEnabled: boolean;
  discoverRegion: string;
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -404,34 +404,6 @@ class AvailabilitySync {
            });
          }

-          if (
-            !showExists &&
-            (media.status === MediaStatus.AVAILABLE ||
-              media.status === MediaStatus.PARTIALLY_AVAILABLE ||
-              media.seasons.some(
-                (season) => season.status === MediaStatus.AVAILABLE
-              ) ||
-              media.seasons.some(
-                (season) => season.status === MediaStatus.PARTIALLY_AVAILABLE
-              ))
-          ) {
-            await this.mediaUpdater(media, false, mediaServerType);
-          }
-
-          if (
-            !showExists4k &&
-            (media.status4k === MediaStatus.AVAILABLE ||
-              media.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
-              media.seasons.some(
-                (season) => season.status4k === MediaStatus.AVAILABLE
-              ) ||
-              media.seasons.some(
-                (season) => season.status4k === MediaStatus.PARTIALLY_AVAILABLE
-              ))
-          ) {
-            await this.mediaUpdater(media, true, mediaServerType);
-          }
-
          // TODO: Figure out how to run seasonUpdater for each season

          if ([...finalSeasons.values()].includes(false)) {
@@ -451,6 +423,22 @@ class AvailabilitySync {
              mediaServerType
            );
          }
+
+          if (
+            !showExists &&
+            (media.status === MediaStatus.AVAILABLE ||
+              media.status === MediaStatus.PARTIALLY_AVAILABLE)
+          ) {
+            await this.mediaUpdater(media, false, mediaServerType);
+          }
+
+          if (
+            !showExists4k &&
+            (media.status4k === MediaStatus.AVAILABLE ||
+              media.status4k === MediaStatus.PARTIALLY_AVAILABLE)
+          ) {
+            await this.mediaUpdater(media, true, mediaServerType);
+          }
        }
      }
    } catch (ex) {
@@ -478,10 +466,6 @@ class AvailabilitySync {
      { status: MediaStatus.PARTIALLY_AVAILABLE },
      { status4k: MediaStatus.AVAILABLE },
      { status4k: MediaStatus.PARTIALLY_AVAILABLE },
-      { seasons: { status: MediaStatus.AVAILABLE } },
-      { seasons: { status: MediaStatus.PARTIALLY_AVAILABLE } },
-      { seasons: { status4k: MediaStatus.AVAILABLE } },
-      { seasons: { status4k: MediaStatus.PARTIALLY_AVAILABLE } },
    ];

    let mediaPage: Media[];
--- a/server/lib/email/index.ts
+++ b/server/lib/email/index.ts
@@ -50,7 +50,6 @@ class PreparedEmail extends Email {
      },
      send: true,
      transport: transport,
-      preview: false,
    });
  }
 }
--- a/server/lib/notifications/agents/agent.ts
+++ b/server/lib/notifications/agents/agent.ts
@@ -19,8 +19,6 @@ export interface NotificationPayload {
  request?: MediaRequest;
  issue?: Issue;
  comment?: IssueComment;
-  pendingRequestsCount?: number;
-  isAdmin?: boolean;
 }

 export abstract class BaseAgent<T extends NotificationAgentConfig> {
--- a/server/lib/notifications/agents/gotify.ts
+++ b/server/lib/notifications/agents/gotify.ts
@@ -47,11 +47,10 @@ class GotifyAgent
    const title = payload.event
      ? `${payload.event} - ${payload.subject}`
      : payload.subject;
-
-    let message = payload.message ? `${payload.message}  \n\n` : '';
+    let message = payload.message ?? '';

    if (payload.request) {
-      message += `\n**Requested By:** ${payload.request.requestedBy.displayName}  `;
+      message += `\n\nRequested By: ${payload.request.requestedBy.displayName}`;

      let status = '';
      switch (type) {
@@ -74,18 +73,16 @@ class GotifyAgent
      }

      if (status) {
-        message += `\n**Request Status:** ${status}  `;
+        message += `\nRequest Status: ${status}`;
      }
    } else if (payload.comment) {
-      message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}  `;
+      message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}`;
    } else if (payload.issue) {
-      message += `\n\n**Reported By:** ${payload.issue.createdBy.displayName}  `;
-      message += `\n**Issue Type:** ${
-        IssueTypeName[payload.issue.issueType]
-      }  `;
-      message += `\n**Issue Status:** ${
+      message += `\n\nReported By: ${payload.issue.createdBy.displayName}`;
+      message += `\nIssue Type: ${IssueTypeName[payload.issue.issueType]}`;
+      message += `\nIssue Status: ${
        payload.issue.status === IssueStatus.OPEN ? 'Open' : 'Resolved'
-      }  `;
+      }`;

      if (type == Notification.ISSUE_CREATED) {
        priority = 1;
@@ -93,14 +90,12 @@ class GotifyAgent
    }

    for (const extra of payload.extra ?? []) {
-      message += `\n\n**${extra.name}**\n${extra.value}  `;
+      message += `\n\n**${extra.name}**\n${extra.value}`;
    }

    if (applicationUrl && payload.media) {
      const actionUrl = `${applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
-      const displayUrl =
-        actionUrl.length > 40 ? `${actionUrl.slice(0, 41)}...` : actionUrl;
-      message += `\n\n**Open in ${applicationTitle}:** [${displayUrl}](${actionUrl})  `;
+      message += `\n\nOpen in ${applicationTitle}(${actionUrl})`;
    }

    return {
--- a/server/lib/notifications/agents/slack.ts
+++ b/server/lib/notifications/agents/slack.ts
@@ -188,7 +188,7 @@ class SlackAgent
        type: 'actions',
        elements: [
          {
-            action_id: 'open-in-jellyseerr',
+            action_id: 'open-in-overseerr',
            type: 'button',
            url,
            text: {
--- a/server/lib/notifications/agents/webpush.ts
+++ b/server/lib/notifications/agents/webpush.ts
@@ -1,7 +1,6 @@
 import { IssueType, IssueTypeName } from '@server/constants/issue';
-import { MediaRequestStatus, MediaType } from '@server/constants/media';
+import { MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
-import MediaRequest from '@server/entity/MediaRequest';
 import { User } from '@server/entity/User';
 import { UserPushSubscription } from '@server/entity/UserPushSubscription';
 import type { NotificationAgentConfig } from '@server/lib/settings';
@@ -20,8 +19,6 @@ interface PushNotificationPayload {
  actionUrl?: string;
  actionUrlTitle?: string;
  requestId?: number;
-  pendingRequestsCount?: number;
-  isAdmin?: boolean;
 }

 class WebPushAgent
@@ -132,8 +129,6 @@ class WebPushAgent
      requestId: payload.request?.id,
      actionUrl,
      actionUrlTitle,
-      pendingRequestsCount: payload.pendingRequestsCount,
-      isAdmin: payload.isAdmin,
    };
  }

@@ -157,51 +152,6 @@ class WebPushAgent

    const mainUser = await userRepository.findOne({ where: { id: 1 } });

-    const requestRepository = getRepository(MediaRequest);
-
-    const pendingRequests = await requestRepository.find({
-      where: { status: MediaRequestStatus.PENDING },
-    });
-
-    const webPushNotification = async (
-      pushSub: UserPushSubscription,
-      notificationPayload: Buffer
-    ) => {
-      logger.debug('Sending web push notification', {
-        label: 'Notifications',
-        recipient: pushSub.user.displayName,
-        type: Notification[type],
-        subject: payload.subject,
-      });
-
-      try {
-        await webpush.sendNotification(
-          {
-            endpoint: pushSub.endpoint,
-            keys: {
-              auth: pushSub.auth,
-              p256dh: pushSub.p256dh,
-            },
-          },
-          notificationPayload
-        );
-      } catch (e) {
-        logger.error(
-          'Error sending web push notification; removing subscription',
-          {
-            label: 'Notifications',
-            recipient: pushSub.user.displayName,
-            type: Notification[type],
-            subject: payload.subject,
-            errorMessage: e.message,
-          }
-        );
-
-        // Failed to send notification so we need to remove the subscription
-        userPushSubRepository.remove(pushSub);
-      }
-    };
-
    if (
      payload.notifyUser &&
      // Check if user has webpush notifications enabled and fallback to true if undefined
@@ -219,11 +169,7 @@ class WebPushAgent
      pushSubs.push(...notifySubs);
    }

-    if (
-      payload.notifyAdmin ||
-      type === Notification.MEDIA_APPROVED ||
-      type === Notification.MEDIA_DECLINED
-    ) {
+    if (payload.notifyAdmin) {
      const users = await userRepository.find();

      const manageUsers = users.filter(
@@ -246,42 +192,7 @@ class WebPushAgent
        })
        .getMany();

-      // We only want to send the custom notification when type is approved or declined
-      // Otherwise, default to the normal notification
-      if (
-        type === Notification.MEDIA_APPROVED ||
-        type === Notification.MEDIA_DECLINED
-      ) {
-        if (mainUser && allSubs.length > 0) {
-          webpush.setVapidDetails(
-            `mailto:${mainUser.email}`,
-            settings.vapidPublic,
-            settings.vapidPrivate
-          );
-
-          // Custom payload only for updating the app badge
-          const notificationBadgePayload = Buffer.from(
-            JSON.stringify(
-              this.getNotificationPayload(type, {
-                subject: payload.subject,
-                notifySystem: false,
-                notifyAdmin: true,
-                isAdmin: true,
-                pendingRequestsCount: pendingRequests.length,
-              })
-            ),
-            'utf-8'
-          );
-
-          await Promise.all(
-            allSubs.map(async (sub) => {
-              webPushNotification(sub, notificationBadgePayload);
-            })
-          );
-        }
-      } else {
-        pushSubs.push(...allSubs);
-      }
+      pushSubs.push(...allSubs);
    }

    if (mainUser && pushSubs.length > 0) {
@@ -291,10 +202,6 @@ class WebPushAgent
        settings.vapidPrivate
      );

-      if (type === Notification.MEDIA_PENDING) {
-        payload = { ...payload, pendingRequestsCount: pendingRequests.length };
-      }
-
      const notificationPayload = Buffer.from(
        JSON.stringify(this.getNotificationPayload(type, payload)),
        'utf-8'
@@ -302,7 +209,39 @@ class WebPushAgent

      await Promise.all(
        pushSubs.map(async (sub) => {
-          webPushNotification(sub, notificationPayload);
+          logger.debug('Sending web push notification', {
+            label: 'Notifications',
+            recipient: sub.user.displayName,
+            type: Notification[type],
+            subject: payload.subject,
+          });
+
+          try {
+            await webpush.sendNotification(
+              {
+                endpoint: sub.endpoint,
+                keys: {
+                  auth: sub.auth,
+                  p256dh: sub.p256dh,
+                },
+              },
+              notificationPayload
+            );
+          } catch (e) {
+            logger.error(
+              'Error sending web push notification; removing subscription',
+              {
+                label: 'Notifications',
+                recipient: sub.user.displayName,
+                type: Notification[type],
+                subject: payload.subject,
+                errorMessage: e.message,
+              }
+            );
+
+            // Failed to send notification so we need to remove the subscription
+            userPushSubRepository.remove(sub);
+          }
        })
      );
    }
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -123,7 +123,6 @@ export interface MainSettings {
  };
  hideAvailable: boolean;
  localLogin: boolean;
-  mediaServerLogin: boolean;
  newPlexLogin: boolean;
  discoverRegion: string;
  streamingRegion: string;
@@ -137,6 +136,7 @@ export interface MainSettings {
 export interface NetworkSettings {
  csrfProtection: boolean;
  forceIpv4First: boolean;
+  dnsServers: string;
  trustProxy: boolean;
  proxy: ProxySettings;
 }
@@ -150,7 +150,6 @@ interface FullPublicSettings extends PublicSettings {
  applicationUrl: string;
  hideAvailable: boolean;
  localLogin: boolean;
-  mediaServerLogin: boolean;
  movie4kEnabled: boolean;
  series4kEnabled: boolean;
  discoverRegion: string;
@@ -344,7 +343,6 @@ class Settings {
        },
        hideAvailable: false,
        localLogin: true,
-        mediaServerLogin: true,
        newPlexLogin: true,
        discoverRegion: '',
        streamingRegion: '',
@@ -509,6 +507,7 @@ class Settings {
        csrfProtection: false,
        trustProxy: false,
        forceIpv4First: false,
+        dnsServers: '',
        proxy: {
          enabled: false,
          hostname: '',
@@ -589,8 +588,6 @@ class Settings {
      applicationUrl: this.data.main.applicationUrl,
      hideAvailable: this.data.main.hideAvailable,
      localLogin: this.data.main.localLogin,
-      mediaServerLogin: this.data.main.mediaServerLogin,
-      jellyfinExternalHost: this.data.jellyfin.externalHostname,
      jellyfinForgotPasswordUrl: this.data.jellyfin.jellyfinForgotPasswordUrl,
      movie4kEnabled: this.data.radarr.some(
        (radarr) => radarr.is4k && radarr.isDefault
--- a/server/lib/settings/migrations/0005_migrate_network_settings.ts
+++ b/server/lib/settings/migrations/0005_migrate_network_settings.ts
@@ -10,6 +10,7 @@ const migrateNetworkSettings = (settings: any): AllSettings => {
    csrfProtection: settings.main.csrfProtection ?? false,
    trustProxy: settings.main.trustProxy ?? false,
    forceIpv4First: settings.main.forceIpv4First ?? false,
+    dnsServers: settings.main.dnsServers ?? '',
    proxy: settings.main.proxy ?? {
      enabled: false,
      hostname: '',
@@ -24,6 +25,7 @@ const migrateNetworkSettings = (settings: any): AllSettings => {
  delete settings.main.csrfProtection;
  delete settings.main.trustProxy;
  delete settings.main.forceIpv4First;
+  delete settings.main.dnsServers;
  delete settings.main.proxy;
  return newSettings;
 };
--- a/server/lib/watchlistsync.ts
+++ b/server/lib/watchlistsync.ts
@@ -130,7 +130,7 @@ class WatchlistSync {

        switch (e.constructor) {
          // During watchlist sync, these errors aren't necessarily
-          // a problem with Jellyseerr. Since we are auto syncing these constantly, it's
+          // a problem with Overseerr. Since we are auto syncing these constantly, it's
          // possible they are unexpectedly at their quota limit, for example. So we'll
          // instead log these as debug messages.
          case RequestPermissionError:
--- a/server/logger.ts
+++ b/server/logger.ts
@@ -43,14 +43,14 @@ const logger = winston.createLogger({
    }),
    new winston.transports.DailyRotateFile({
      filename: process.env.CONFIG_DIRECTORY
-        ? `${process.env.CONFIG_DIRECTORY}/logs/jellyseerr-%DATE%.log`
-        : path.join(__dirname, '../config/logs/jellyseerr-%DATE%.log'),
+        ? `${process.env.CONFIG_DIRECTORY}/logs/overseerr-%DATE%.log`
+        : path.join(__dirname, '../config/logs/overseerr-%DATE%.log'),
      datePattern: 'YYYY-MM-DD',
      zippedArchive: true,
      maxSize: '20m',
      maxFiles: '7d',
      createSymlink: true,
-      symlinkName: 'jellyseerr.log',
+      symlinkName: 'overseerr.log',
    }),
    new winston.transports.DailyRotateFile({
      filename: process.env.CONFIG_DIRECTORY
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -56,9 +56,8 @@ authRoutes.post('/plex', async (req, res, next) => {
  }

  if (
-    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
-    (settings.main.mediaServerLogin === false ||
-      settings.main.mediaServerType != MediaServerType.PLEX)
+    settings.main.mediaServerType != MediaServerType.PLEX &&
+    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
  ) {
    return res.status(500).json({ error: 'Plex login is disabled' });
  }
@@ -158,7 +157,7 @@ authRoutes.post('/plex', async (req, res, next) => {
          });
        } else {
          logger.info(
-            'Sign-in attempt from Plex user with access to the media server; creating new Jellyseerr user',
+            'Sign-in attempt from Plex user with access to the media server; creating new Overseerr user',
            {
              label: 'API',
              ip: req.ip,
@@ -232,13 +231,10 @@ authRoutes.post('/jellyfin', async (req, res, next) => {

  //Make sure jellyfin login is enabled, but only if jellyfin && Emby is not already configured
  if (
-    // media server not configured, allow login for setup
+    settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
+    settings.main.mediaServerType !== MediaServerType.EMBY &&
    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
-    (settings.main.mediaServerLogin === false ||
-      // media server is neither jellyfin or emby
-      (settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-        settings.main.mediaServerType !== MediaServerType.EMBY &&
-        settings.jellyfin.ip !== ''))
+    settings.jellyfin.ip !== ''
  ) {
    return res.status(500).json({ error: 'Jellyfin login is disabled' });
  }
@@ -274,7 +270,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    if (user) {
      deviceId = user.jellyfinDeviceId ?? '';
    } else {
-      deviceId = Buffer.from(`BOT_jellyseerr_${body.username ?? ''}`).toString(
+      deviceId = Buffer.from(`BOT_overseerr_${body.username ?? ''}`).toString(
        'base64'
      );
    }
@@ -446,7 +442,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      });
    } else if (!user) {
      logger.info(
-        'Sign-in attempt from Jellyfin user with access to the media server; creating new Jellyseerr user',
+        'Sign-in attempt from Jellyfin user with access to the media server; creating new Overseerr user',
        {
          label: 'API',
          ip: req.ip,
@@ -584,7 +580,7 @@ authRoutes.post('/local', async (req, res, next) => {
      .getOne();

    if (!user || !(await user.passwordMatch(body.password))) {
-      logger.warn('Failed sign-in attempt using invalid Jellyseerr password', {
+      logger.warn('Failed sign-in attempt using invalid Overseerr password', {
        label: 'API',
        ip: req.ip,
        email: body.email,
@@ -674,7 +670,7 @@ authRoutes.post('/local', async (req, res, next) => {
    return res.status(200).json(user?.filter() ?? {});
  } catch (e) {
    logger.error(
-      'Something went wrong authenticating with Jellyseerr password',
+      'Something went wrong authenticating with Overseerr password',
      {
        label: 'API',
        errorMessage: e.message,
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -837,8 +837,7 @@ discoverRoutes.get<Record<string, unknown>, WatchlistResponse>(
      select: ['id', 'plexToken'],
    });

-    if (activeUser && !activeUser?.plexToken) {
-      // Non-Plex users can only see their own watchlist
+    if (activeUser) {
      const [result, total] = await getRepository(Watchlist).findAndCount({
        where: { requestedBy: { id: activeUser?.id } },
        relations: {
@@ -867,7 +866,6 @@ discoverRoutes.get<Record<string, unknown>, WatchlistResponse>(
      });
    }

-    // List watchlist from Plex
    const plexTV = new PlexTvAPI(activeUser.plexToken);

    const watchlist = await plexTV.getWatchlist({ offset });
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -55,7 +55,7 @@ router.get<unknown, StatusResponse>('/status', async (req, res) => {
  let commitsBehind = 0;

  if (currentVersion.startsWith('develop-') && commitTag !== 'local') {
-    const commits = await githubApi.getJellyseerrCommits();
+    const commits = await githubApi.getOverseerrCommits();

    if (commits.length) {
      const filteredCommits = commits.filter(
@@ -74,7 +74,7 @@ router.get<unknown, StatusResponse>('/status', async (req, res) => {
      }
    }
  } else if (commitTag !== 'local') {
-    const releases = await githubApi.getJellyseerrReleases();
+    const releases = await githubApi.getOverseerrReleases();

    if (releases.length) {
      const latestVersion = releases[0];
@@ -403,7 +403,7 @@ router.get('/watchproviders/tv', async (req, res, next) => {

 router.get('/', (_req, res) => {
  return res.status(200).json({
-    api: 'Jellyseerr API',
+    api: 'Overseerr API',
    version: '1.0',
  });
 });
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -237,19 +237,6 @@ mediaRoutes.delete(
      }

      if (isMovie) {
-        // check if the movie exists
-        try {
-          await (service as RadarrAPI).getMovie({
-            id: parseInt(
-              is4k
-                ? (media.externalServiceSlug4k as string)
-                : (media.externalServiceSlug as string)
-            ),
-          });
-        } catch {
-          return res.status(204).send();
-        }
-        // remove the movie
        await (service as RadarrAPI).removeMovie(
          parseInt(
            is4k
@@ -264,13 +251,6 @@ mediaRoutes.delete(
        if (!tvdbId) {
          throw new Error('TVDB ID not found');
        }
-        // check if the series exists
-        try {
-          await (service as SonarrAPI).getSeriesByTvdbId(tvdbId);
-        } catch {
-          return res.status(204).send();
-        }
-        // remove the series
        await (service as SonarrAPI).removeSerie(tvdbId);
      }

--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -352,7 +352,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
      const account = await jellyfinClient.getUser();

      // Automatic Library grouping is not supported when user views are used to get library
-      if (account.Configuration.GroupedFolders?.length > 0) {
+      if (account.Configuration.GroupedFolders.length > 0) {
        return next({
          status: 501,
          message: ApiErrorCode.SyncErrorGroupedFolders,
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -32,14 +32,7 @@ const router = Router();

 router.get('/', async (req, res, next) => {
  try {
-    const includeIds = [
-      ...new Set(
-        req.query.includeIds ? req.query.includeIds.toString().split(',') : []
-      ),
-    ];
-    const pageSize = req.query.take
-      ? Number(req.query.take)
-      : Math.max(10, includeIds.length);
+    const pageSize = req.query.take ? Number(req.query.take) : 10;
    const skip = req.query.skip ? Number(req.query.skip) : 0;
    const q = req.query.q ? req.query.q.toString().toLowerCase() : '';
    let query = getRepository(User).createQueryBuilder('user');
@@ -51,33 +44,27 @@ router.get('/', async (req, res, next) => {
      );
    }

-    if (includeIds.length > 0) {
-      query.andWhereInIds(includeIds);
-    }
-
    switch (req.query.sort) {
      case 'updated':
        query = query.orderBy('user.updatedAt', 'DESC');
        break;
      case 'displayname':
-        query = query
-          .addSelect(
-            `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
-              CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
-                CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
-                  "user"."email"
-                ELSE
-                  LOWER(user.jellyfinUsername)
-                END)
-              ELSE
-                LOWER(user.jellyfinUsername)
-              END)
-            ELSE
-              LOWER(user.username)
-            END`,
-            'displayname_sort_key'
-          )
-          .orderBy('displayname_sort_key', 'ASC');
+        query = query.orderBy(
+          `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
+             CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
+               CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
+                 "user"."email"
+               ELSE
+                 LOWER(user.jellyfinUsername)
+               END)
+             ELSE
+               LOWER(user.jellyfinUsername)
+             END)
+           ELSE
+             LOWER(user.username)
+           END`,
+          'ASC'
+        );
        break;
      case 'requests':
        query = query
@@ -97,7 +84,6 @@ router.get('/', async (req, res, next) => {
    const [users, userCount] = await query
      .take(pageSize)
      .skip(skip)
-      .distinct(true)
      .getManyAndCount();

    return res.status(200).json({
--- a/server/routes/user/usersettings.ts
+++ b/server/routes/user/usersettings.ts
@@ -1,7 +1,4 @@
-import JellyfinAPI from '@server/api/jellyfin';
-import PlexTvAPI from '@server/api/plextv';
 import { ApiErrorCode } from '@server/constants/error';
-import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
@@ -15,23 +12,9 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { ApiError } from '@server/types/error';
-import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
-import net from 'net';
 import { canMakePermissionsChange } from '.';

-const isOwnProfile = (): Middleware => {
-  return (req, res, next) => {
-    if (req.user?.id !== Number(req.params.id)) {
-      return next({
-        status: 403,
-        message: "You do not have permission to view this user's settings.",
-      });
-    }
-    next();
-  };
-};
-
 const isOwnProfileOrAdmin = (): Middleware => {
  const authMiddleware: Middleware = (req, res, next) => {
    if (
@@ -119,10 +102,28 @@ userSettingsRoutes.post<
    }

    const oldEmail = user.email;
+    const oldUsername = user.username;
    user.username = req.body.username;
-    if (user.userType !== UserType.PLEX) {
+    if (user.jellyfinUsername) {
      user.email = req.body.email || user.jellyfinUsername || user.email;
    }
+    // Edge case for local users, because they have no Jellyfin username to fall back on
+    // if the email is not provided
+    if (user.userType === UserType.LOCAL) {
+      if (req.body.email) {
+        user.email = req.body.email;
+        if (
+          !user.username &&
+          user.email !== oldEmail &&
+          !oldEmail.includes('@')
+        ) {
+          user.username = oldEmail;
+        }
+      } else if (req.body.username) {
+        user.email = oldUsername || user.email;
+        user.username = req.body.username;
+      }
+    }

    const existingUser = await userRepository.findOne({
      where: { email: user.email },
@@ -182,8 +183,9 @@ userSettingsRoutes.post<
        status: e.statusCode,
        message: e.errorCode,
      });
+    } else {
+      return next({ status: 500, message: e.message });
    }
-    return next({ status: 500, message: e.message });
  }
 });

@@ -288,260 +290,6 @@ userSettingsRoutes.post<
  }
 });

-userSettingsRoutes.post<{ authToken: string }>(
-  '/linked-accounts/plex',
-  isOwnProfile(),
-  async (req, res) => {
-    const settings = getSettings();
-    const userRepository = getRepository(User);
-
-    if (!req.user) {
-      return res.status(404).json({ code: ApiErrorCode.Unauthorized });
-    }
-    // Make sure Plex login is enabled
-    if (settings.main.mediaServerType !== MediaServerType.PLEX) {
-      return res.status(500).json({ message: 'Plex login is disabled' });
-    }
-
-    // First we need to use this auth token to get the user's email from plex.tv
-    const plextv = new PlexTvAPI(req.body.authToken);
-    const account = await plextv.getUser();
-
-    // Do not allow linking of an already linked account
-    if (await userRepository.exist({ where: { plexId: account.id } })) {
-      return res.status(422).json({
-        message: 'This Plex account is already linked to a Jellyseerr user',
-      });
-    }
-
-    const user = req.user;
-
-    // Emails do not match
-    if (user.email !== account.email) {
-      return res.status(422).json({
-        message:
-          'This Plex account is registered under a different email address.',
-      });
-    }
-
-    // valid plex user found, link to current user
-    user.userType = UserType.PLEX;
-    user.plexId = account.id;
-    user.plexUsername = account.username;
-    user.plexToken = account.authToken;
-    await userRepository.save(user);
-
-    return res.status(204).send();
-  }
-);
-
-userSettingsRoutes.delete<{ id: string }>(
-  '/linked-accounts/plex',
-  isOwnProfileOrAdmin(),
-  async (req, res) => {
-    const settings = getSettings();
-    const userRepository = getRepository(User);
-
-    // Make sure Plex login is enabled
-    if (settings.main.mediaServerType !== MediaServerType.PLEX) {
-      return res.status(500).json({ message: 'Plex login is disabled' });
-    }
-
-    try {
-      const user = await userRepository
-        .createQueryBuilder('user')
-        .addSelect('user.password')
-        .where({
-          id: Number(req.params.id),
-        })
-        .getOne();
-
-      if (!user) {
-        return res.status(404).json({ message: 'User not found.' });
-      }
-
-      if (user.id === 1) {
-        return res.status(400).json({
-          message:
-            'Cannot unlink media server accounts for the primary administrator.',
-        });
-      }
-
-      if (!user.email || !user.password) {
-        return res.status(400).json({
-          message: 'User does not have a local email or password set.',
-        });
-      }
-
-      user.userType = UserType.LOCAL;
-      user.plexId = null;
-      user.plexUsername = null;
-      user.plexToken = null;
-      await userRepository.save(user);
-
-      return res.status(204).send();
-    } catch (e) {
-      return res.status(500).json({ message: e.message });
-    }
-  }
-);
-
-userSettingsRoutes.post<{ username: string; password: string }>(
-  '/linked-accounts/jellyfin',
-  isOwnProfile(),
-  async (req, res) => {
-    const settings = getSettings();
-    const userRepository = getRepository(User);
-
-    if (!req.user) {
-      return res.status(401).json({ code: ApiErrorCode.Unauthorized });
-    }
-    // Make sure jellyfin login is enabled
-    if (
-      settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-      settings.main.mediaServerType !== MediaServerType.EMBY
-    ) {
-      return res
-        .status(500)
-        .json({ message: 'Jellyfin/Emby login is disabled' });
-    }
-
-    // Do not allow linking of an already linked account
-    if (
-      await userRepository.exist({
-        where: { jellyfinUsername: req.body.username },
-      })
-    ) {
-      return res.status(422).json({
-        message: 'The specified account is already linked to a Jellyseerr user',
-      });
-    }
-
-    const hostname = getHostname();
-    const deviceId = Buffer.from(
-      `BOT_jellyseerr_${req.user.username ?? ''}`
-    ).toString('base64');
-
-    const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
-
-    const ip = req.ip;
-    let clientIp: string | undefined;
-    if (ip) {
-      if (net.isIPv4(ip)) {
-        clientIp = ip;
-      } else if (net.isIPv6(ip)) {
-        clientIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
-      }
-    }
-
-    try {
-      const account = await jellyfinserver.login(
-        req.body.username,
-        req.body.password,
-        clientIp
-      );
-
-      // Do not allow linking of an already linked account
-      if (
-        await userRepository.exist({
-          where: { jellyfinUserId: account.User.Id },
-        })
-      ) {
-        return res.status(422).json({
-          message:
-            'The specified account is already linked to a Jellyseerr user',
-        });
-      }
-
-      const user = req.user;
-
-      // valid jellyfin user found, link to current user
-      user.userType =
-        settings.main.mediaServerType === MediaServerType.EMBY
-          ? UserType.EMBY
-          : UserType.JELLYFIN;
-      user.jellyfinUserId = account.User.Id;
-      user.jellyfinUsername = account.User.Name;
-      user.jellyfinAuthToken = account.AccessToken;
-      user.jellyfinDeviceId = deviceId;
-      await userRepository.save(user);
-
-      return res.status(204).send();
-    } catch (e) {
-      logger.error('Failed to link account to user.', {
-        label: 'API',
-        ip: req.ip,
-        error: e,
-      });
-      if (
-        e instanceof ApiError &&
-        e.errorCode === ApiErrorCode.InvalidCredentials
-      ) {
-        return res.status(401).json({ code: e.errorCode });
-      }
-
-      return res.status(500).send();
-    }
-  }
-);
-
-userSettingsRoutes.delete<{ id: string }>(
-  '/linked-accounts/jellyfin',
-  isOwnProfileOrAdmin(),
-  async (req, res) => {
-    const settings = getSettings();
-    const userRepository = getRepository(User);
-
-    // Make sure jellyfin login is enabled
-    if (
-      settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-      settings.main.mediaServerType !== MediaServerType.EMBY
-    ) {
-      return res
-        .status(500)
-        .json({ message: 'Jellyfin/Emby login is disabled' });
-    }
-
-    try {
-      const user = await userRepository
-        .createQueryBuilder('user')
-        .addSelect('user.password')
-        .where({
-          id: Number(req.params.id),
-        })
-        .getOne();
-
-      if (!user) {
-        return res.status(404).json({ message: 'User not found.' });
-      }
-
-      if (user.id === 1) {
-        return res.status(400).json({
-          message:
-            'Cannot unlink media server accounts for the primary administrator.',
-        });
-      }
-
-      if (!user.email || !user.password) {
-        return res.status(400).json({
-          message: 'User does not have a local email or password set.',
-        });
-      }
-
-      user.userType = UserType.LOCAL;
-      user.jellyfinUserId = null;
-      user.jellyfinUsername = null;
-      user.jellyfinAuthToken = null;
-      user.jellyfinDeviceId = null;
-      await userRepository.save(user);
-
-      return res.status(204).send();
-    } catch (e) {
-      return res.status(500).json({ message: e.message });
-    }
-  }
-);
-
 userSettingsRoutes.get<{ id: string }, UserSettingsNotificationsResponse>(
  '/notifications',
  isOwnProfileOrAdmin(),
--- a/server/types/custom.d.ts
+++ b/server/types/custom.d.ts
@@ -1,4 +0,0 @@
-declare module '@dr.pogodin/csurf' {
-  import csrf = require('csurf');
-  export = csrf;
-}
--- a/server/utils/customProxyAgent.ts
+++ b/server/utils/customProxyAgent.ts
@@ -8,9 +8,8 @@ export default async function createCustomProxyAgent(
 ) {
  const defaultAgent = new Agent({ keepAliveTimeout: 5000 });

-  const skipUrl = (url: string | URL) => {
-    const hostname =
-      typeof url === 'string' ? new URL(url).hostname : url.hostname;
+  const skipUrl = (url: string) => {
+    const hostname = new URL(url).hostname;

    if (proxySettings.bypassLocalAddresses && isLocalAddress(hostname)) {
      return true;
@@ -39,7 +38,8 @@ export default async function createCustomProxyAgent(
    dispatch: Dispatcher['dispatch']
  ): Dispatcher['dispatch'] => {
    return (opts, handler) => {
-      return opts.origin && skipUrl(opts.origin)
+      const url = opts.origin?.toString();
+      return url && skipUrl(url)
        ? defaultAgent.dispatch(opts, handler)
        : dispatch(opts, handler);
    };
@@ -60,10 +60,13 @@ export default async function createCustomProxyAgent(
        ':' +
        proxySettings.port,
      token,
+      interceptors: {
+        Client: [noProxyInterceptor],
+      },
      keepAliveTimeout: 5000,
    });

-    setGlobalDispatcher(proxyAgent.compose(noProxyInterceptor));
+    setGlobalDispatcher(proxyAgent);
  } catch (e) {
    logger.error('Failed to connect to the proxy: ' + e.message, {
      label: 'Proxy',
@@ -92,11 +95,7 @@ export default async function createCustomProxyAgent(
 }

 function isLocalAddress(hostname: string) {
-  if (
-    hostname === 'localhost' ||
-    hostname === '127.0.0.1' ||
-    hostname === '::1'
-  ) {
+  if (hostname === 'localhost' || hostname === '127.0.0.1') {
    return true;
  }

--- a/server/utils/restartFlag.ts
+++ b/server/utils/restartFlag.ts
@@ -18,7 +18,8 @@ class RestartFlag {
      this.networkSettings.csrfProtection !== networkSettings.csrfProtection ||
      this.networkSettings.trustProxy !== networkSettings.trustProxy ||
      this.networkSettings.proxy.enabled !== networkSettings.proxy.enabled ||
-      this.networkSettings.forceIpv4First !== networkSettings.forceIpv4First
+      this.networkSettings.forceIpv4First !== networkSettings.forceIpv4First ||
+      this.networkSettings.dnsServers !== networkSettings.dnsServers
    );
  }
 }
--- a/src/assets/services/jellyfin-icon.svg
+++ b/src/assets/services/jellyfin-icon.svg
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-  - Part of the Jellyfin project (https://jellyfin.media)
-  - 
-  - All copyright belongs to the Jellyfin contributors; a full list can
-  - be found in the file CONTRIBUTORS.md
-  - 
-  - This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
-  - To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
- ***** END LICENSE BLOCK ***** -->
-<svg version="1.1" id="icon-transparent" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512">
-	<defs>
-		<linearGradient id="linear-gradient" gradientUnits="userSpaceOnUse" x1="110.25" y1="213.3" x2="496.14" y2="436.09">
-			<stop offset="0" style="stop-color:#AA5CC3"/>
-			<stop offset="1" style="stop-color:#00A4DC"/>
-		</linearGradient>
-	</defs>
-	<title>icon-transparent</title>
-	<g id="icon-transparent">
-		<path id="inner-shape" d="M256,201.6c-20.4,0-86.2,119.3-76.2,139.4s142.5,19.9,152.4,0S276.5,201.6,256,201.6z" fill="url(#linear-gradient)"/>
-		<path id="outer-shape" d="M256,23.3c-61.6,0-259.8,359.4-229.6,420.1s429.3,60,459.2,0S317.6,23.3,256,23.3z
-		M406.5,390.8c-19.6,39.3-281.1,39.8-300.9,0s110.1-275.3,150.4-275.3S426.1,351.4,406.5,390.8z" fill="url(#linear-gradient)"/>
-	</g>
-</svg>
--- a/src/assets/services/plex.svg
+++ b/src/assets/services/plex.svg
@@ -1,43 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 361 157">
-  <defs>
-    <style>
-      .cls-1 {
-      fill: #fff;
-      }
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-      .cls-2 {
-      fill: #eaaf20;
-      }
-    </style>
-  </defs>
-  <!-- Generator: Adobe Illustrator 28.7.1, SVG Export Plug-In . SVG Version: 1.2.0 Build 142)  -->
-  <g>
-    <g id="Layer_1">
-      <path id="path4" class="cls-1"
-        d="M60.6,28.8c-14.3,0-23.5,3.9-31.3,13v-10H1.6v123.7s.5.2,1.9.5c1.9.5,12.1,2.5,19.6-3.4,6.5-5.3,8-11.4,8-18.3v-17.8c8,8,17,11.4,29.6,11.4,27.2,0,48-20.8,48-48.4s-20.1-50.7-48.3-50.7h0ZM55.2,104.3c-15.3,0-27.4-11.9-27.4-26.3s14.3-25.6,27.4-25.6,27.4,11.2,27.4,25.8-12.1,26-27.4,26Z" />
-      <path id="path6" class="cls-1"
-        d="M148.1,76.5c0,10.7,1.2,23.7,12.4,37.9.2.2.7.9.7.9-4.6,7.3-10.2,12.3-17.7,12.3s-11.6-3-16.5-8c-5.1-5.5-7.5-12.6-7.5-20.1V.9h28.4l.2,75.6Z" />
-      <polygon id="polygon8" class="cls-2"
-        points="287.6 78.3 254.1 31.7 288.6 31.7 321.8 78.3 288.6 124.6 254.1 124.6 287.6 78.3" />
-      <polygon id="polygon10" class="cls-1"
-        points="330.8 73 360.6 31.7 326.2 31.7 313.8 48.9 330.8 73" />
-      <path id="path12" class="cls-1"
-        d="M313.8,107.7l5.8,7.5c5.6,8.2,12.9,12.3,21.3,12.3,9-.2,15.3-7.5,17.7-10.3,0,0-4.4-3.7-9.9-9.8-7.5-8.2-17.5-23.3-17.7-24l-17.2,24.2Z" />
-      <path id="path16" class="cls-1"
-        d="M228.7,97.9c-5.8,5-9.7,7.8-17.7,7.8-14.3,0-22.6-9.6-23.8-20.1h75.9c.5-1.4.7-3.2.7-6.2,0-29-22.6-50.7-52.2-50.7s-51.2,22.1-51.2,49.8,23,49.1,51.9,49.1,37.6-10.7,47.1-29.7h-30.8ZM211.9,50.7c12.6,0,22.1,7.8,24.3,18h-48c2.4-10.7,11.4-18,23.8-18h0Z" />
-      <path id="path4-2" data-name="path4" class="cls-1"
-        d="M59.3,28.2c-14.3,0-23.5,3.9-31.3,13v-10H.4v123.7s.5.2,1.9.5c1.9.5,12.1,2.5,19.6-3.4,6.5-5.3,8-11.4,8-18.3v-17.8c8,8,17,11.4,29.6,11.4,27.2,0,48-20.8,48-48.4s-20.1-50.7-48.3-50.7h0ZM54,103.8c-15.3,0-27.4-11.9-27.4-26.3s14.3-25.6,27.4-25.6,27.4,11.2,27.4,25.8-12.1,26-27.4,26Z" />
-      <path id="path6-2" data-name="path6" class="cls-1"
-        d="M146.9,75.9c0,10.7,1.2,23.7,12.4,37.9.2.2.7.9.7.9-4.6,7.3-10.2,12.3-17.7,12.3s-11.6-3-16.5-8c-5.1-5.5-7.5-12.6-7.5-20.1V.4h28.4l.2,75.6Z" />
-      <polygon id="polygon8-2" data-name="polygon8" class="cls-2"
-        points="286.4 77.8 252.9 31.2 287.3 31.2 320.6 77.8 287.3 124.1 252.9 124.1 286.4 77.8" />
-      <polygon id="polygon10-2" data-name="polygon10" class="cls-1"
-        points="329.5 72.5 359.4 31.2 324.9 31.2 312.6 48.3 329.5 72.5" />
-      <path id="path12-2" data-name="path12" class="cls-1"
-        d="M312.6,107.2l5.8,7.5c5.6,8.2,12.9,12.3,21.3,12.3,9-.2,15.3-7.5,17.7-10.3,0,0-4.4-3.7-9.9-9.8-7.5-8.2-17.5-23.3-17.7-24l-17.2,24.2Z" />
-      <path id="path16-2" data-name="path16" class="cls-1"
-        d="M227.4,97.4c-5.8,5-9.7,7.8-17.7,7.8-14.3,0-22.6-9.6-23.8-20.1h75.9c.5-1.4.7-3.2.7-6.2,0-29-22.6-50.7-52.2-50.7s-51.2,22.1-51.2,49.8,23,49.1,51.9,49.1,37.6-10.7,47.1-29.7h-30.8ZM210.7,50.1c12.6,0,22.1,7.8,24.3,18h-48c2.4-10.7,11.4-18,23.8-18h0Z" />
-    </g>
-  </g>
+<svg
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:cc="http://creativecommons.org/ns#"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+  version="1.1"
+  id="plex-logo"
+  x="0px"
+  y="0px"
+  viewBox="0 0 1000 460.89727"
+  xml:space="preserve"
+  sodipodi:docname="plex-logo.svg"
+  inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+   id="metadata25"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs23">
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#111111"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview21"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="0.27956081"
+   inkscape:cx="783.06912"
+   inkscape:cy="-132.85701"
+   inkscape:window-x="1912"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="plex-logo" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#EBAF00;}
+</style>
+<path
+   class="st0"
+   d="m 164.18919,82.43243 c -39.86487,0 -65.540543,11.48648 -87.162163,38.51351 V 91.21621 H 0 v 366.21621 c 0,0 1.3513514,0.67567 5.4054053,1.35135 5.4054057,1.35135 33.7837827,7.43243 54.7297287,-10.13514 18.243244,-15.54054 22.297295,-33.78378 22.297295,-54.05405 v -52.7027 c 22.297301,23.64864 47.297301,33.78378 82.432431,33.78378 75.67567,0 133.78378,-61.48648 133.78378,-143.24323 0,-88.51352 -56.08108,-150 -134.45945,-150 z m -14.86487,223.64864 c -42.56756,0 -76.351351,-35.13513 -76.351351,-77.7027 0,-41.89189 39.864871,-75.67567 76.351351,-75.67567 43.24324,0 76.35135,33.1081 76.35135,76.35135 0,43.24324 -33.78378,77.02702 -76.35135,77.02702 z"
+   id="path4"
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke-width:6.75675678" /><path
+   class="st0"
+   d="m 408.1081,223.64864 c 0,31.75676 3.37838,70.27027 34.45946,112.16216 0.67567,0.67567 2.02702,2.7027 2.02702,2.7027 -12.83783,21.62162 -28.37837,36.48648 -49.32432,36.48648 -16.21622,0 -32.43243,-8.78378 -45.94595,-23.64864 -14.18918,-16.21622 -20.94594,-37.16216 -20.94594,-59.45946 V 0 h 79.05405 z"
+   id="path6"
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke-width:6.75675678" /><polygon
+   class="st1"
+   points="117.9,33.9 104.1,13.5 118.3,13.5 132,33.9 118.3,54.2 104.1,54.2 "
+   id="polygon8"
+   style="fill:#ebaf00"
+   transform="scale(6.7567568)" /><polygon
+   class="st0"
+   points="135.7,31.6 148,13.5 133.8,13.5 128.7,21 "
+   id="polygon10"
+   style="fill:#ffffff"
+   transform="scale(6.7567568)" /><path
+   class="st0"
+   d="m 869.59458,316.2162 c 0,0 16.2162,22.2973 16.2162,22.2973 15.54058,24.32432 35.8108,36.48648 59.45949,36.48648 25,-0.67567 42.56752,-22.29729 49.3243,-30.4054 0,0 -12.16218,-10.81081 -27.7027,-29.05405 -20.94598,-24.32432 -48.64868,-68.91892 -49.3243,-70.94594 z"
+   id="path12"
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke-width:6.75675678" /><path
+   style="fill:#ffffff;stroke-width:6.75675678"
+   inkscape:connector-curvature="0"
+   id="path16"
+   d="m 632.43242,287.16215 c -16.21622,14.86486 -27.02703,22.97297 -49.32432,22.97297 -39.86487,0 -62.83784,-28.37837 -66.21622,-59.45945 h 211.4865 c 1.35131,-4.05406 2.027,-9.45946 2.027,-18.24324 0,-85.81082 -62.83783,-150 -145.27026,-150 -78.37837,0 -142.56756,65.54054 -142.56756,147.29729 0,81.08108 64.18919,145.27026 144.59459,145.27026 56.08108,0 104.72973,-31.75675 131.08105,-87.83783 z M 585.8108,147.29729 c 35.13513,0 61.48648,22.97297 67.56756,53.37838 H 519.59458 c 6.75676,-31.75676 31.75676,-53.37838 66.21622,-53.37838 z"
+   class="st0" />
 </svg>
--- a/src/components/AirDateBadge/index.tsx
+++ b/src/components/AirDateBadge/index.tsx
@@ -17,10 +17,13 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
  const dAirDate = new Date(airDate);
  const nowDate = new Date();
  const alreadyAired = dAirDate.getTime() < nowDate.getTime();
+
  const compareWeek = new Date(
    alreadyAired ? Date.now() - WEEK : Date.now() + WEEK
  );
+
  let showRelative = false;
+
  if (
    (alreadyAired && dAirDate.getTime() > compareWeek.getTime()) ||
    (!alreadyAired && dAirDate.getTime() < compareWeek.getTime())
@@ -28,10 +31,6 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
    showRelative = true;
  }

-  const diffInDays = Math.round(
-    (dAirDate.getTime() - nowDate.getTime()) / (1000 * 60 * 60 * 24)
-  );
-
  return (
    <div className="flex items-center space-x-2">
      <Badge badgeType="light">
@@ -49,9 +48,9 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
            {
              relativeTime: (
                <FormattedRelativeTime
-                  value={diffInDays}
-                  unit="day"
+                  value={(dAirDate.getTime() - Date.now()) / 1000}
                  numeric="auto"
+                  updateIntervalInSeconds={1}
                />
              ),
            }
--- a/src/components/Blacklist/index.tsx
+++ b/src/components/Blacklist/index.tsx
@@ -298,7 +298,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
              src={
                title?.posterPath
                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                  : '/images/jellyseerr_poster_not_found.png'
+                  : '/images/overseerr_poster_not_found.png'
              }
              alt=""
              sizes="100vw"
--- a/src/components/CollectionDetails/index.tsx
+++ b/src/components/CollectionDetails/index.tsx
@@ -233,7 +233,7 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
            src={
              data.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
-                : '/images/jellyseerr_poster_not_found.png'
+                : '/images/overseerr_poster_not_found.png'
            }
            alt=""
            sizes="100vw"
--- a/src/components/Common/Button/index.tsx
+++ b/src/components/Common/Button/index.tsx
@@ -1,6 +1,5 @@
 import type { ForwardedRef } from 'react';
 import React from 'react';
-import { twMerge } from 'tailwind-merge';

 export type ButtonType =
  | 'default'
@@ -98,7 +97,7 @@ function Button<P extends ElementTypes = 'button'>(
  if (as === 'a') {
    return (
      <a
-        className={twMerge(buttonStyle)}
+        className={buttonStyle.join(' ')}
        {...(props as React.ComponentProps<'a'>)}
        ref={ref as ForwardedRef<HTMLAnchorElement>}
      >
@@ -108,7 +107,7 @@ function Button<P extends ElementTypes = 'button'>(
  } else {
    return (
      <button
-        className={twMerge(buttonStyle)}
+        className={buttonStyle.join(' ')}
        {...(props as React.ComponentProps<'button'>)}
        ref={ref as ForwardedRef<HTMLButtonElement>}
      >
--- a/src/components/Common/ButtonWithDropdown/index.tsx
+++ b/src/components/Common/ButtonWithDropdown/index.tsx
@@ -1,29 +1,77 @@
-import Dropdown from '@app/components/Common/Dropdown';
+import useClickOutside from '@app/hooks/useClickOutside';
 import { withProperties } from '@app/utils/typeHelpers';
-import { Menu } from '@headlessui/react';
+import { Transition } from '@headlessui/react';
 import { ChevronDownIcon } from '@heroicons/react/24/solid';
-import type { AnchorHTMLAttributes, ButtonHTMLAttributes } from 'react';
+import type {
+  AnchorHTMLAttributes,
+  ButtonHTMLAttributes,
+  RefObject,
+} from 'react';
+import { Fragment, useRef, useState } from 'react';

-type ButtonWithDropdownProps = {
+interface DropdownItemProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
+  buttonType?: 'primary' | 'ghost';
+}
+
+const DropdownItem = ({
+  children,
+  buttonType = 'primary',
+  ...props
+}: DropdownItemProps) => {
+  let styleClass = 'button-md text-white';
+
+  switch (buttonType) {
+    case 'ghost':
+      styleClass +=
+        ' bg-transparent rounded hover:bg-gradient-to-br from-indigo-600 to-purple-600 text-white focus:border-gray-500 focus:text-white';
+      break;
+    default:
+      styleClass +=
+        ' bg-indigo-600 rounded hover:bg-indigo-500 focus:border-indigo-700 focus:text-white';
+  }
+  return (
+    <a
+      className={`flex cursor-pointer items-center px-4 py-2 text-sm leading-5 focus:outline-none ${styleClass}`}
+      {...props}
+    >
+      {children}
+    </a>
+  );
+};
+
+interface ButtonWithDropdownProps {
  text: React.ReactNode;
  dropdownIcon?: React.ReactNode;
  buttonType?: 'primary' | 'ghost';
-} & (
-  | ({ as?: 'button' } & ButtonHTMLAttributes<HTMLButtonElement>)
-  | ({ as: 'a' } & AnchorHTMLAttributes<HTMLAnchorElement>)
-);
+}
+interface ButtonProps
+  extends ButtonHTMLAttributes<HTMLButtonElement>,
+    ButtonWithDropdownProps {
+  as?: 'button';
+}
+interface AnchorProps
+  extends AnchorHTMLAttributes<HTMLAnchorElement>,
+    ButtonWithDropdownProps {
+  as: 'a';
+}

 const ButtonWithDropdown = ({
+  as,
  text,
  children,
  dropdownIcon,
  className,
  buttonType = 'primary',
  ...props
-}: ButtonWithDropdownProps) => {
+}: ButtonProps | AnchorProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const buttonRef = useRef<HTMLButtonElement | HTMLAnchorElement>(null);
+  useClickOutside(buttonRef, () => setIsOpen(false));
+
  const styleClasses = {
    mainButtonClasses: 'button-md text-white border',
    dropdownSideButtonClasses: 'button-md border',
+    dropdownClasses: 'button-md',
  };

  switch (buttonType) {
@@ -31,40 +79,72 @@ const ButtonWithDropdown = ({
      styleClasses.mainButtonClasses +=
        ' bg-transparent border-gray-600 hover:border-gray-200 focus:border-gray-100 active:border-gray-100';
      styleClasses.dropdownSideButtonClasses = styleClasses.mainButtonClasses;
+      styleClasses.dropdownClasses +=
+        ' bg-gray-800 border border-gray-700 bg-opacity-80 p-1 backdrop-blur';
      break;
    default:
      styleClasses.mainButtonClasses +=
        ' bg-indigo-600 border-indigo-500 bg-opacity-80 hover:bg-opacity-100 hover:border-indigo-500 active:bg-indigo-700 active:border-indigo-700 focus:ring-blue';
      styleClasses.dropdownSideButtonClasses +=
        ' bg-indigo-600 bg-opacity-80 border-indigo-500 hover:bg-opacity-100 active:bg-opacity-100 focus:ring-blue';
+      styleClasses.dropdownClasses += ' bg-indigo-600 p-1';
  }

-  const TriggerElement = props.as ?? 'button';
-
  return (
-    <Menu as="div" className="relative z-10 inline-flex">
-      <TriggerElement
-        type="button"
-        className={`relative z-10 inline-flex h-full items-center px-4 py-2 text-sm font-medium leading-5 transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none ${
-          styleClasses.mainButtonClasses
-        } ${children ? 'rounded-l-md' : 'rounded-md'} ${className}`}
-        {...(props as Record<string, string>)}
-      >
-        {text}
-      </TriggerElement>
+    <span className="relative inline-flex h-full rounded-md shadow-sm">
+      {as === 'a' ? (
+        <a
+          className={`relative z-10 inline-flex h-full items-center px-4 py-2 text-sm font-medium leading-5 transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none ${
+            styleClasses.mainButtonClasses
+          } ${children ? 'rounded-l-md' : 'rounded-md'} ${className}`}
+          ref={buttonRef as RefObject<HTMLAnchorElement>}
+          {...(props as AnchorHTMLAttributes<HTMLAnchorElement>)}
+        >
+          {text}
+        </a>
+      ) : (
+        <button
+          type="button"
+          className={`relative z-10 inline-flex h-full items-center px-4 py-2 text-sm font-medium leading-5 transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none ${
+            styleClasses.mainButtonClasses
+          } ${children ? 'rounded-l-md' : 'rounded-md'} ${className}`}
+          ref={buttonRef as RefObject<HTMLButtonElement>}
+          {...(props as ButtonHTMLAttributes<HTMLButtonElement>)}
+        >
+          {text}
+        </button>
+      )}
      {children && (
        <span className="relative -ml-px block">
-          <Menu.Button
+          <button
            type="button"
            className={`relative z-10 inline-flex h-full items-center rounded-r-md px-2 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out hover:z-20 focus:z-20 ${styleClasses.dropdownSideButtonClasses}`}
            aria-label="Expand"
+            onClick={() => setIsOpen((state) => !state)}
          >
            {dropdownIcon ? dropdownIcon : <ChevronDownIcon />}
-          </Menu.Button>
-          <Dropdown.Items dropdownType={buttonType}>{children}</Dropdown.Items>
+          </button>
+          <Transition
+            as={Fragment}
+            show={isOpen}
+            enter="transition ease-out duration-100"
+            enterFrom="opacity-0 scale-95"
+            enterTo="opacity-100 scale-100"
+            leave="transition ease-in duration-75"
+            leaveFrom="opacity-100 scale-100"
+            leaveTo="opacity-0 scale-95"
+          >
+            <div className="absolute right-0 z-40 mt-2 -mr-1 w-56 origin-top-right rounded-md shadow-lg">
+              <div
+                className={`rounded-md ring-1 ring-black ring-opacity-5 ${styleClasses.dropdownClasses}`}
+              >
+                <div className="py-1">{children}</div>
+              </div>
+            </div>
+          </Transition>
        </span>
      )}
-    </Menu>
+    </span>
  );
 };
-export default withProperties(ButtonWithDropdown, { Item: Dropdown.Item });
+export default withProperties(ButtonWithDropdown, { Item: DropdownItem });
--- a/src/components/Common/Dropdown/index.tsx
+++ b/src/components/Common/Dropdown/index.tsx
@@ -1,117 +0,0 @@
-import { withProperties } from '@app/utils/typeHelpers';
-import { Menu, Transition } from '@headlessui/react';
-import { ChevronDownIcon } from '@heroicons/react/24/solid';
-import {
-  Fragment,
-  useRef,
-  type AnchorHTMLAttributes,
-  type ButtonHTMLAttributes,
-  type HTMLAttributes,
-} from 'react';
-
-interface DropdownItemProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
-  buttonType?: 'primary' | 'ghost';
-}
-
-const DropdownItem = ({
-  children,
-  buttonType = 'primary',
-  ...props
-}: DropdownItemProps) => {
-  return (
-    <Menu.Item>
-      <a
-        className={[
-          'button-md flex cursor-pointer items-center rounded px-4 py-2 text-sm leading-5 text-white focus:text-white focus:outline-none',
-          buttonType === 'ghost'
-            ? 'bg-transparent from-indigo-600 to-purple-600 hover:bg-gradient-to-br focus:border-gray-500'
-            : 'bg-indigo-600 hover:bg-indigo-500 focus:border-indigo-700',
-        ].join(' ')}
-        {...props}
-      >
-        {children}
-      </a>
-    </Menu.Item>
-  );
-};
-
-type DropdownItemsProps = HTMLAttributes<HTMLDivElement> & {
-  dropdownType: 'primary' | 'ghost';
-};
-
-const DropdownItems = ({
-  children,
-  className,
-  dropdownType,
-  ...props
-}: DropdownItemsProps) => {
-  return (
-    <Transition
-      as={Fragment}
-      enter="transition ease-out duration-100"
-      enterFrom="opacity-0 scale-95"
-      enterTo="opacity-100 scale-100"
-      leave="transition ease-in duration-75"
-      leaveFrom="opacity-100 scale-100"
-      leaveTo="opacity-0 scale-95"
-    >
-      <Menu.Items
-        className={[
-          'absolute right-0 z-40 mt-2 -mr-1 w-56 origin-top-right rounded-md p-1 shadow-lg',
-          dropdownType === 'ghost'
-            ? 'border border-gray-700 bg-gray-800 bg-opacity-80 backdrop-blur'
-            : 'bg-indigo-600',
-          className,
-        ].join(' ')}
-        {...props}
-      >
-        <div className="py-1">{children}</div>
-      </Menu.Items>
-    </Transition>
-  );
-};
-
-interface DropdownProps extends ButtonHTMLAttributes<HTMLButtonElement> {
-  text: React.ReactNode;
-  dropdownIcon?: React.ReactNode;
-  buttonType?: 'primary' | 'ghost';
-}
-
-const Dropdown = ({
-  text,
-  children,
-  dropdownIcon,
-  className,
-  buttonType = 'primary',
-  ...props
-}: DropdownProps) => {
-  const buttonRef = useRef<HTMLButtonElement>(null);
-
-  return (
-    <Menu as="div" className="relative z-10">
-      <Menu.Button
-        type="button"
-        className={[
-          'button-md inline-flex h-full items-center space-x-2 rounded-md border px-4 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out hover:z-20 focus:z-20 focus:outline-none',
-          buttonType === 'ghost'
-            ? 'border-gray-600 bg-transparent hover:border-gray-200 focus:border-gray-100 active:border-gray-100'
-            : 'focus:ring-blue border-indigo-500 bg-indigo-600 bg-opacity-80 hover:border-indigo-500 hover:bg-opacity-100 active:border-indigo-700 active:bg-indigo-700',
-          className,
-        ].join(' ')}
-        ref={buttonRef}
-        disabled={!children}
-        {...props}
-      >
-        <span>{text}</span>
-        {children && (dropdownIcon ? dropdownIcon : <ChevronDownIcon />)}
-      </Menu.Button>
-      {children && (
-        <DropdownItems dropdownType={buttonType}>{children}</DropdownItems>
-      )}
-    </Menu>
-  );
-};
-export default withProperties(Dropdown, {
-  Item: DropdownItem,
-  Items: DropdownItems,
-});
--- a/src/components/Common/LabeledCheckbox/index.tsx
+++ b/src/components/Common/LabeledCheckbox/index.tsx
@@ -1,44 +0,0 @@
-import { Field } from 'formik';
-import { twMerge } from 'tailwind-merge';
-
-interface LabeledCheckboxProps {
-  id: string;
-  className?: string;
-  label: string;
-  description: string;
-  onChange: () => void;
-  children?: React.ReactNode;
-}
-
-const LabeledCheckbox: React.FC<LabeledCheckboxProps> = ({
-  id,
-  className,
-  label,
-  description,
-  onChange,
-  children,
-}) => {
-  return (
-    <>
-      <div className={twMerge('relative flex items-start', className)}>
-        <div className="flex h-6 items-center">
-          <Field type="checkbox" id={id} name={id} onChange={onChange} />
-        </div>
-        <div className="ml-3 text-sm leading-6">
-          <label htmlFor="localLogin" className="block">
-            <div className="flex flex-col">
-              <span className="font-medium text-white">{label}</span>
-              <span className="font-normal text-gray-400">{description}</span>
-            </div>
-          </label>
-        </div>
-      </div>
-      {
-        /* can hold child checkboxes */
-        children && <div className="mt-4 pl-10">{children}</div>
-      }
-    </>
-  );
-};
-
-export default LabeledCheckbox;
--- a/src/components/Common/Modal/index.tsx
+++ b/src/components/Common/Modal/index.tsx
@@ -29,16 +29,11 @@ interface ModalProps {
  secondaryDisabled?: boolean;
  tertiaryDisabled?: boolean;
  tertiaryButtonType?: ButtonType;
-  okButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
-  cancelButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
-  secondaryButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
-  tertiaryButtonProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
  disableScrollLock?: boolean;
  backgroundClickable?: boolean;
  loading?: boolean;
  backdrop?: string;
  children?: React.ReactNode;
-  dialogClass?: string;
 }

 const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
@@ -66,11 +61,6 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
      loading = false,
      onTertiary,
      backdrop,
-      dialogClass,
-      okButtonProps,
-      cancelButtonProps,
-      secondaryButtonProps,
-      tertiaryButtonProps,
    },
    parentRef
  ) => {
@@ -116,7 +106,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
          </div>
        </Transition>
        <Transition
-          className={`hide-scrollbar relative inline-block w-full overflow-auto bg-gray-800 px-4 pt-4 pb-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle ${dialogClass}`}
+          className="hide-scrollbar relative inline-block w-full overflow-auto bg-gray-800 px-4 pt-4 pb-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle"
          role="dialog"
          aria-modal="true"
          aria-labelledby="modal-headline"
@@ -199,7 +189,6 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                  className="ml-3"
                  disabled={okDisabled}
                  data-testid="modal-ok-button"
-                  {...okButtonProps}
                >
                  {okText ? okText : 'Ok'}
                </Button>
@@ -211,7 +200,6 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                  className="ml-3"
                  disabled={secondaryDisabled}
                  data-testid="modal-secondary-button"
-                  {...secondaryButtonProps}
                >
                  {secondaryText}
                </Button>
@@ -222,7 +210,6 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                  onClick={onTertiary}
                  className="ml-3"
                  disabled={tertiaryDisabled}
-                  {...tertiaryButtonProps}
                >
                  {tertiaryText}
                </Button>
@@ -233,7 +220,6 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
                  onClick={onCancel}
                  className="ml-3 sm:ml-0"
                  data-testid="modal-cancel-button"
-                  {...cancelButtonProps}
                >
                  {cancelText
                    ? cancelText
--- a/src/components/Common/SensitiveInput/index.tsx
+++ b/src/components/Common/SensitiveInput/index.tsx
@@ -25,11 +25,6 @@ const SensitiveInput = ({ as = 'input', ...props }: SensitiveInputProps) => {
  return (
    <>
      <Component
-        autoComplete="off"
-        data-form-type="other"
-        data-1pignore="true"
-        data-lpignore="true"
-        data-bwignore="true"
        {...componentProps}
        className={`rounded-l-only ${componentProps.className ?? ''}`}
        type={
--- a/src/components/IssueDetails/index.tsx
+++ b/src/components/IssueDetails/index.tsx
@@ -33,7 +33,7 @@ import { useRouter } from 'next/router';
 import { useState } from 'react';
 import { FormattedRelativeTime, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
-import useSWR, { mutate } from 'swr';
+import useSWR from 'swr';
 import * as Yup from 'yup';

 const messages = defineMessages('components.IssueDetails', {
@@ -155,7 +155,6 @@ const IssueDetails = () => {
        autoDismiss: true,
      });
      revalidateIssue();
-      mutate('/api/v1/issue/count');
    } catch (e) {
      addToast(intl.formatMessage(messages.toaststatusupdatefailed), {
        appearance: 'error',
@@ -170,7 +169,6 @@ const IssueDetails = () => {
        method: 'DELETE',
      });
      if (!res.ok) throw new Error();
-      mutate('/api/v1/issue/count');

      addToast(intl.formatMessage(messages.toastissuedeleted), {
        appearance: 'success',
@@ -242,7 +240,7 @@ const IssueDetails = () => {
            src={
              data.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
-                : '/images/jellyseerr_poster_not_found.png'
+                : '/images/overseerr_poster_not_found.png'
            }
            alt=""
            sizes="100vw"
--- a/src/components/IssueList/IssueItem/index.tsx
+++ b/src/components/IssueList/IssueItem/index.tsx
@@ -142,7 +142,7 @@ const IssueItem = ({ issue }: IssueItemProps) => {
              src={
                title.posterPath
                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                  : '/images/jellyseerr_poster_not_found.png'
+                  : '/images/overseerr_poster_not_found.png'
              }
              alt=""
              sizes="100vw"
--- a/src/components/IssueModal/CreateIssueModal/index.tsx
+++ b/src/components/IssueModal/CreateIssueModal/index.tsx
@@ -15,7 +15,7 @@ import { Field, Formik } from 'formik';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
-import useSWR, { mutate } from 'swr';
+import useSWR from 'swr';
 import * as Yup from 'yup';

 const messages = defineMessages('components.IssueModal.CreateIssueModal', {
@@ -138,8 +138,6 @@ const CreateIssueModal = ({
                autoDismiss: true,
              }
            );
-
-            mutate('/api/v1/issue/count');
          }

          if (onCancel) {
--- a/src/components/LanguageSelector/index.tsx
+++ b/src/components/LanguageSelector/index.tsx
@@ -33,7 +33,6 @@ interface LanguageSelectorProps {
  setFieldValue: (property: string, value: string) => void;
  serverValue?: string;
  isUserSettings?: boolean;
-  isDisabled?: boolean;
 }

 const LanguageSelector = ({
@@ -41,7 +40,6 @@ const LanguageSelector = ({
  setFieldValue,
  serverValue,
  isUserSettings = false,
-  isDisabled,
 }: LanguageSelectorProps) => {
  const intl = useIntl();
  const { data: languages } = useSWR<Language[]>('/api/v1/languages');
@@ -98,7 +96,6 @@ const LanguageSelector = ({
    <Select<OptionType, true>
      options={options}
      isMulti
-      isDisabled={isDisabled}
      className="react-select-container"
      classNamePrefix="react-select"
      value={
--- a/src/components/Layout/MobileMenu/index.tsx
+++ b/src/components/Layout/MobileMenu/index.tsx
@@ -1,4 +1,3 @@
-import Badge from '@app/components/Common/Badge';
 import { menuMessages } from '@app/components/Layout/Sidebar';
 import useClickOutside from '@app/hooks/useClickOutside';
 import { Permission, useUser } from '@app/hooks/useUser';
@@ -27,16 +26,9 @@ import {
 } from '@heroicons/react/24/solid';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { cloneElement, useEffect, useRef, useState } from 'react';
+import { cloneElement, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';

-interface MobileMenuProps {
-  pendingRequestsCount: number;
-  openIssuesCount: number;
-  revalidateIssueCount: () => void;
-  revalidateRequestsCount: () => void;
-}
-
 interface MenuLink {
  href: string;
  svgIcon: JSX.Element;
@@ -49,12 +41,7 @@ interface MenuLink {
  dataTestId?: string;
 }

-const MobileMenu = ({
-  pendingRequestsCount,
-  openIssuesCount,
-  revalidateIssueCount,
-  revalidateRequestsCount,
-}: MobileMenuProps) => {
+const MobileMenu = () => {
  const ref = useRef<HTMLDivElement>(null);
  const intl = useIntl();
  const [isOpen, setIsOpen] = useState(false);
@@ -152,21 +139,6 @@ const MobileMenu = ({
      })
  );

-  useEffect(() => {
-    if (openIssuesCount) {
-      revalidateIssueCount();
-    }
-
-    if (pendingRequestsCount) {
-      revalidateRequestsCount();
-    }
-  }, [
-    revalidateIssueCount,
-    revalidateRequestsCount,
-    pendingRequestsCount,
-    openIssuesCount,
-  ]);
-
  return (
    <div className="fixed bottom-0 left-0 right-0 z-50">
      <Transition
@@ -187,7 +159,7 @@ const MobileMenu = ({
            <Link
              key={`mobile-menu-link-${link.href}`}
              href={link.href}
-              className={`flex items-center ${
+              className={`flex items-center space-x-2 ${
                isActive ? 'text-indigo-500' : ''
              }`}
              onKeyDown={(e) => {
@@ -202,25 +174,7 @@ const MobileMenu = ({
              {cloneElement(isActive ? link.svgIconSelected : link.svgIcon, {
                className: 'h-5 w-5',
              })}
-              <span className="ml-2">{link.content}</span>
-              {link.href === '/requests' &&
-                pendingRequestsCount > 0 &&
-                hasPermission(Permission.MANAGE_REQUESTS) && (
-                  <div className="ml-auto flex">
-                    <Badge className="rounded-md border-indigo-500 bg-gradient-to-br from-indigo-600 to-purple-600">
-                      {pendingRequestsCount}
-                    </Badge>
-                  </div>
-                )}
-              {link.href === '/issues' &&
-                openIssuesCount > 0 &&
-                hasPermission(Permission.MANAGE_ISSUES) && (
-                  <div className="ml-auto flex">
-                    <Badge className="rounded-md border-indigo-500 bg-gradient-to-br from-indigo-600 to-purple-600">
-                      {openIssuesCount}
-                    </Badge>
-                  </div>
-                )}
+              <span>{link.content}</span>
            </Link>
          );
        })}
@@ -236,7 +190,7 @@ const MobileMenu = ({
                <Link
                  key={`mobile-menu-link-${link.href}`}
                  href={link.href}
-                  className={`relative flex flex-col items-center space-y-1 ${
+                  className={`flex flex-col items-center space-y-1 ${
                    isActive ? 'text-indigo-500' : ''
                  }`}
                >
@@ -246,23 +200,6 @@ const MobileMenu = ({
                      className: 'h-6 w-6',
                    }
                  )}
-                  {link.href === '/requests' &&
-                    pendingRequestsCount > 0 &&
-                    hasPermission(Permission.MANAGE_REQUESTS) && (
-                      <div className="absolute left-3 bottom-3">
-                        <Badge
-                          className={`bg-gradient-to-br ${
-                            router.pathname.match(link.activeRegExp)
-                              ? 'border-indigo-600 from-indigo-700 to-purple-700'
-                              : 'border-indigo-500 from-indigo-600 to-purple-600'
-                          } flex h-4 w-4 items-center justify-center !px-[9px] !py-[9px] text-[9px]`}
-                        >
-                          {pendingRequestsCount > 99
-                            ? '99+'
-                            : pendingRequestsCount}
-                        </Badge>
-                      </div>
-                    )}
                </Link>
              );
            })}
--- a/src/components/Layout/Sidebar/index.tsx
+++ b/src/components/Layout/Sidebar/index.tsx
@@ -1,4 +1,3 @@
-import Badge from '@app/components/Common/Badge';
 import UserWarnings from '@app/components/Layout/UserWarnings';
 import VersionStatus from '@app/components/Layout/VersionStatus';
 import useClickOutside from '@app/hooks/useClickOutside';
@@ -19,7 +18,7 @@ import {
 import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { Fragment, useEffect, useRef } from 'react';
+import { Fragment, useRef } from 'react';
 import { useIntl } from 'react-intl';

 export const menuMessages = defineMessages('components.Layout.Sidebar', {
@@ -36,10 +35,6 @@ export const menuMessages = defineMessages('components.Layout.Sidebar', {
 interface SidebarProps {
  open?: boolean;
  setClosed: () => void;
-  pendingRequestsCount: number;
-  openIssuesCount: number;
-  revalidateIssueCount: () => void;
-  revalidateRequestsCount: () => void;
 }

 interface SidebarLinkProps {
@@ -119,35 +114,13 @@ const SidebarLinks: SidebarLinkProps[] = [
  },
 ];

-const Sidebar = ({
-  open,
-  setClosed,
-  pendingRequestsCount,
-  openIssuesCount,
-  revalidateIssueCount,
-  revalidateRequestsCount,
-}: SidebarProps) => {
+const Sidebar = ({ open, setClosed }: SidebarProps) => {
  const navRef = useRef<HTMLDivElement>(null);
  const router = useRouter();
  const intl = useIntl();
  const { hasPermission } = useUser();
  useClickOutside(navRef, () => setClosed());

-  useEffect(() => {
-    if (openIssuesCount) {
-      revalidateIssueCount();
-    }
-
-    if (pendingRequestsCount) {
-      revalidateRequestsCount();
-    }
-  }, [
-    revalidateIssueCount,
-    revalidateRequestsCount,
-    pendingRequestsCount,
-    openIssuesCount,
-  ]);
-
  return (
    <>
      <div className="lg:hidden">
@@ -280,48 +253,18 @@ const Sidebar = ({
                      href={sidebarLink.href}
                      as={sidebarLink.as}
                      className={`group flex items-center rounded-md px-2 py-2 text-lg font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none
-                              ${
-                                router.pathname.match(sidebarLink.activeRegExp)
-                                  ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
-                                  : 'hover:bg-gray-700 focus:bg-gray-700'
-                              }
-                            `}
+                            ${
+                              router.pathname.match(sidebarLink.activeRegExp)
+                                ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
+                                : 'hover:bg-gray-700 focus:bg-gray-700'
+                            }
+                          `}
                      data-testid={sidebarLink.dataTestId}
                    >
                      {sidebarLink.svgIcon}
                      {intl.formatMessage(
                        menuMessages[sidebarLink.messagesKey]
                      )}
-                      {sidebarLink.messagesKey === 'requests' &&
-                        pendingRequestsCount > 0 &&
-                        hasPermission(Permission.MANAGE_REQUESTS) && (
-                          <div className="ml-auto flex">
-                            <Badge
-                              className={`rounded-md bg-gradient-to-br ${
-                                router.pathname.match(sidebarLink.activeRegExp)
-                                  ? 'border-indigo-600 from-indigo-700 to-purple-700'
-                                  : 'border-indigo-500 from-indigo-600 to-purple-600'
-                              }`}
-                            >
-                              {pendingRequestsCount}
-                            </Badge>
-                          </div>
-                        )}
-                      {sidebarLink.messagesKey === 'issues' &&
-                        openIssuesCount > 0 &&
-                        hasPermission(Permission.MANAGE_ISSUES) && (
-                          <div className="ml-auto flex">
-                            <Badge
-                              className={`rounded-md bg-gradient-to-br ${
-                                router.pathname.match(sidebarLink.activeRegExp)
-                                  ? 'border-indigo-600 from-indigo-700 to-purple-700'
-                                  : 'border-indigo-500 from-indigo-600 to-purple-600'
-                              }`}
-                            >
-                              {openIssuesCount}
-                            </Badge>
-                          </div>
-                        )}
                    </Link>
                  );
                })}
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -10,7 +10,6 @@ import { useUser } from '@app/hooks/useUser';
 import { ArrowLeftIcon, Bars3BottomLeftIcon } from '@heroicons/react/24/solid';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
-import useSWR from 'swr';

 type LayoutProps = {
  children: React.ReactNode;
@@ -23,18 +22,6 @@ const Layout = ({ children }: LayoutProps) => {
  const router = useRouter();
  const { currentSettings } = useSettings();
  const { setLocale } = useLocale();
-  const { data: requestResponse, mutate: revalidateRequestsCount } = useSWR(
-    '/api/v1/request/count',
-    {
-      revalidateOnMount: true,
-    }
-  );
-  const { data: issueResponse, mutate: revalidateIssueCount } = useSWR(
-    '/api/v1/issue/count',
-    {
-      revalidateOnMount: true,
-    }
-  );

  useEffect(() => {
    if (setLocale && user) {
@@ -68,21 +55,10 @@ const Layout = ({ children }: LayoutProps) => {
      <div className="absolute top-0 h-64 w-full bg-gradient-to-bl from-gray-800 to-gray-900">
        <div className="relative inset-0 h-full w-full bg-gradient-to-t from-gray-900 to-transparent" />
      </div>
-      <Sidebar
-        open={isSidebarOpen}
-        setClosed={() => setSidebarOpen(false)}
-        pendingRequestsCount={requestResponse?.pending ?? 0}
-        openIssuesCount={issueResponse?.open ?? 0}
-        revalidateIssueCount={() => revalidateIssueCount()}
-        revalidateRequestsCount={() => revalidateRequestsCount()}
-      />
+
+      <Sidebar open={isSidebarOpen} setClosed={() => setSidebarOpen(false)} />
      <div className="sm:hidden">
-        <MobileMenu
-          pendingRequestsCount={requestResponse?.pending ?? 0}
-          openIssuesCount={issueResponse?.open ?? 0}
-          revalidateIssueCount={() => revalidateIssueCount()}
-          revalidateRequestsCount={() => revalidateRequestsCount()}
-        />
+        <MobileMenu />
      </div>

      <div className="relative mb-16 flex w-0 min-w-0 flex-1 flex-col lg:ml-64">
--- a/src/components/Login/JellyfinLogin.tsx
+++ b/src/components/Login/JellyfinLogin.tsx
@@ -1,39 +1,63 @@
 import Button from '@app/components/Common/Button';
-import SensitiveInput from '@app/components/Common/SensitiveInput';
+import Tooltip from '@app/components/Common/Tooltip';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
-import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
+import { InformationCircleIcon } from '@heroicons/react/24/solid';
 import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType, ServerType } from '@server/constants/server';
 import { Field, Form, Formik } from 'formik';
-import { useIntl } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import * as Yup from 'yup';

 const messages = defineMessages('components.Login', {
-  loginwithapp: 'Login with {appName}',
  username: 'Username',
  password: 'Password',
+  hostname: '{mediaServerName} URL',
+  port: 'Port',
+  enablessl: 'Use SSL',
+  urlBase: 'URL Base',
+  email: 'Email',
+  emailtooltip:
+    'Address does not need to be associated with your {mediaServerName} instance.',
+  validationhostrequired: '{mediaServerName} URL required',
+  validationhostformat: 'Valid URL required',
+  validationemailrequired: 'Email required',
+  validationemailformat: 'Valid email required',
  validationusernamerequired: 'Username required',
  validationpasswordrequired: 'Password required',
+  validationservertyperequired: 'Please select a server type',
+  validationHostnameRequired: 'You must provide a valid hostname or IP address',
+  validationPortRequired: 'You must provide a valid port number',
+  validationUrlTrailingSlash: 'URL must not end in a trailing slash',
+  validationUrlBaseLeadingSlash: 'URL base must have a leading slash',
+  validationUrlBaseTrailingSlash: 'URL base must not end in a trailing slash',
  loginerror: 'Something went wrong while trying to sign in.',
  adminerror: 'You must use an admin account to sign in.',
  noadminerror: 'No admin user found on the server.',
  credentialerror: 'The username or password is incorrect.',
  invalidurlerror: 'Unable to connect to {mediaServerName} server.',
-  signingin: 'Signing In…',
+  signingin: 'Signing in…',
  signin: 'Sign In',
+  initialsigningin: 'Connecting…',
+  initialsignin: 'Connect',
  forgotpassword: 'Forgot Password?',
+  servertype: 'Server Type',
+  back: 'Go back',
 });

 interface JellyfinLoginProps {
  revalidate: () => void;
+  initial?: boolean;
  serverType?: MediaServerType;
+  onCancel?: () => void;
 }

 const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
  revalidate,
+  initial,
  serverType,
+  onCancel,
 }) => {
  const toasts = useToasts();
  const intl = useIntl();
@@ -48,29 +72,56 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
        : 'Media Server',
  };

-  const LoginSchema = Yup.object().shape({
-    username: Yup.string().required(
-      intl.formatMessage(messages.validationusernamerequired)
-    ),
-    password: Yup.string(),
-  });
-  const baseUrl = settings.currentSettings.jellyfinExternalHost
-    ? settings.currentSettings.jellyfinExternalHost
-    : settings.currentSettings.jellyfinHost;
-  const jellyfinForgotPasswordUrl =
-    settings.currentSettings.jellyfinForgotPasswordUrl;
+  if (initial) {
+    const LoginSchema = Yup.object().shape({
+      hostname: Yup.string().required(
+        intl.formatMessage(
+          messages.validationhostrequired,
+          mediaServerFormatValues
+        )
+      ),
+      port: Yup.number().required(
+        intl.formatMessage(messages.validationPortRequired)
+      ),
+      urlBase: Yup.string()
+        .test(
+          'leading-slash',
+          intl.formatMessage(messages.validationUrlBaseLeadingSlash),
+          (value) => !value || value.startsWith('/')
+        )
+        .test(
+          'trailing-slash',
+          intl.formatMessage(messages.validationUrlBaseTrailingSlash),
+          (value) => !value || !value.endsWith('/')
+        ),
+      email: Yup.string()
+        .email(intl.formatMessage(messages.validationemailformat))
+        .required(intl.formatMessage(messages.validationemailrequired)),
+      username: Yup.string().required(
+        intl.formatMessage(messages.validationusernamerequired)
+      ),
+      password: Yup.string(),
+    });

-  return (
-    <div>
+    return (
      <Formik
        initialValues={{
          username: '',
          password: '',
+          hostname: '',
+          port: 8096,
+          useSsl: false,
+          urlBase: '',
+          email: '',
        }}
        validationSchema={LoginSchema}
-        validateOnBlur={false}
        onSubmit={async (values) => {
          try {
+            // Check if serverType is either 'Jellyfin' or 'Emby'
+            // if (serverType !== 'Jellyfin' && serverType !== 'Emby') {
+            //   throw new Error('Invalid serverType'); // You can customize the error message
+            // }
+
            const res = await fetch('/api/v1/auth/jellyfin', {
              method: 'POST',
              headers: {
@@ -79,7 +130,12 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
              body: JSON.stringify({
                username: values.username,
                password: values.password,
-                email: values.username,
+                hostname: values.hostname,
+                port: values.port,
+                useSsl: values.useSsl,
+                urlBase: values.urlBase,
+                email: values.email,
+                serverType: serverType,
              }),
            });
            if (!res.ok) throw new Error(res.statusText, { cause: res });
@@ -109,6 +165,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                errorMessage = messages.loginerror;
                break;
            }
+
            toasts.addToast(
              intl.formatMessage(errorMessage, mediaServerFormatValues),
              {
@@ -121,55 +178,303 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
          }
        }}
      >
-        {({ errors, touched, isSubmitting, isValid }) => {
-          return (
-            <>
-              <Form data-form-type="login">
-                <div>
-                  <h2 className="mb-6 -mt-1 text-center text-lg font-bold text-neutral-200">
-                    {intl.formatMessage(messages.loginwithapp, {
-                      appName: mediaServerFormatValues.mediaServerName,
-                    })}
-                  </h2>
-
-                  <div className="mt-1 mb-4">
-                    <div className="form-input-field">
+        {({
+          errors,
+          touched,
+          values,
+          setFieldValue,
+          isSubmitting,
+          isValid,
+        }) => (
+          <Form>
+            <div className="sm:border-t sm:border-gray-800">
+              <div className="flex flex-col sm:flex-row sm:gap-4">
+                <div className="w-full">
+                  <label htmlFor="hostname" className="text-label">
+                    {intl.formatMessage(
+                      messages.hostname,
+                      mediaServerFormatValues
+                    )}
+                  </label>
+                  <div className="mt-1 mb-2 sm:col-span-2 sm:mb-0 sm:mt-0">
+                    <div className="flex rounded-md shadow-sm">
+                      <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-gray-100 sm:text-sm">
+                        {values.useSsl ? 'https://' : 'http://'}
+                      </span>
                      <Field
-                        id="username"
-                        name="username"
+                        id="hostname"
+                        name="hostname"
                        type="text"
-                        placeholder={intl.formatMessage(messages.username)}
-                        className="!bg-gray-700/80 placeholder:text-gray-400"
-                        data-form-type="username"
+                        className="rounded-r-only flex-1"
+                        placeholder={intl.formatMessage(
+                          messages.hostname,
+                          mediaServerFormatValues
+                        )}
                      />
                    </div>
-                    {errors.username && touched.username && (
-                      <div className="error">{errors.username}</div>
+                    {errors.hostname && touched.hostname && (
+                      <div className="error">{errors.hostname}</div>
                    )}
                  </div>
-
-                  <div className="mt-1 mb-2">
-                    <div className="form-input-field">
-                      <SensitiveInput
-                        as="field"
-                        id="password"
-                        name="password"
-                        type="password"
-                        autoComplete="current-password"
-                        placeholder={intl.formatMessage(messages.password)}
-                        className="!bg-gray-700/80 placeholder:text-gray-400"
-                        data-form-type="password"
-                        data-1pignore="false"
-                        data-lpignore="false"
-                      />
+                </div>
+                <div className="flex-1">
+                  <label htmlFor="port" className="text-label">
+                    {intl.formatMessage(messages.port)}
+                  </label>
+                  <div className="mt-1 sm:mt-0">
+                    <Field
+                      id="port"
+                      name="port"
+                      inputMode="numeric"
+                      type="text"
+                      className="short flex-1"
+                      placeholder={intl.formatMessage(messages.port)}
+                    />
+                    {errors.port && touched.port && (
+                      <div className="error">{errors.port}</div>
+                    )}
+                  </div>
+                </div>
+              </div>
+              <label htmlFor="useSsl" className="text-label mt-2">
+                {intl.formatMessage(messages.enablessl)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    id="useSsl"
+                    name="useSsl"
+                    type="checkbox"
+                    onChange={() => {
+                      setFieldValue('useSsl', !values.useSsl);
+                      setFieldValue('port', values.useSsl ? 8096 : 443);
+                    }}
+                  />
+                </div>
+              </div>
+              <label htmlFor="urlBase" className="text-label mt-1">
+                {intl.formatMessage(messages.urlBase)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    type="text"
+                    inputMode="url"
+                    id="urlBase"
+                    name="urlBase"
+                    placeholder={intl.formatMessage(messages.urlBase)}
+                  />
+                </div>
+                {errors.urlBase && touched.urlBase && (
+                  <div className="error">{errors.urlBase}</div>
+                )}
+              </div>
+              <label
+                htmlFor="email"
+                className="text-label inline-flex gap-1 align-middle"
+              >
+                {intl.formatMessage(messages.email)}
+                <span className="label-tip">
+                  <Tooltip
+                    content={intl.formatMessage(
+                      messages.emailtooltip,
+                      mediaServerFormatValues
+                    )}
+                  >
+                    <span className="tooltip-trigger">
+                      <InformationCircleIcon className="h-4 w-4" />
+                    </span>
+                  </Tooltip>
+                </span>
+              </label>
+              <div className="mt-1 sm:col-span-2 sm:mb-2 sm:mt-0">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    id="email"
+                    name="email"
+                    type="text"
+                    placeholder={intl.formatMessage(messages.email)}
+                  />
+                </div>
+                {errors.email && touched.email && (
+                  <div className="error">{errors.email}</div>
+                )}
+              </div>
+              <label htmlFor="username" className="text-label">
+                {intl.formatMessage(messages.username)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                <div className="flex rounded-md shadow-sm">
+                  <Field
+                    id="username"
+                    name="username"
+                    type="text"
+                    placeholder={intl.formatMessage(messages.username)}
+                  />
+                </div>
+                {errors.username && touched.username && (
+                  <div className="error">{errors.username}</div>
+                )}
+              </div>
+              <label htmlFor="password" className="text-label">
+                {intl.formatMessage(messages.password)}
+              </label>
+              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                <div className="flexrounded-md shadow-sm">
+                  <Field
+                    id="password"
+                    name="password"
+                    type="password"
+                    placeholder={intl.formatMessage(messages.password)}
+                  />
+                </div>
+                {errors.password && touched.password && (
+                  <div className="error">{errors.password}</div>
+                )}
+              </div>
+            </div>
+            <div className="mt-8 border-t border-gray-700 pt-5">
+              <div className="flex flex-row-reverse justify-between">
+                <span className="inline-flex rounded-md shadow-sm">
+                  <Button
+                    buttonType="primary"
+                    type="submit"
+                    disabled={isSubmitting || !isValid}
+                  >
+                    {isSubmitting
+                      ? intl.formatMessage(messages.signingin)
+                      : intl.formatMessage(messages.signin)}
+                  </Button>
+                </span>
+                {onCancel && (
+                  <span className="inline-flex rounded-md shadow-sm">
+                    <Button buttonType="default" onClick={() => onCancel()}>
+                      <FormattedMessage {...messages.back} />
+                    </Button>
+                  </span>
+                )}
+              </div>
+            </div>
+          </Form>
+        )}
+      </Formik>
+    );
+  } else {
+    const LoginSchema = Yup.object().shape({
+      username: Yup.string().required(
+        intl.formatMessage(messages.validationusernamerequired)
+      ),
+      password: Yup.string(),
+    });
+    const baseUrl = settings.currentSettings.jellyfinExternalHost
+      ? settings.currentSettings.jellyfinExternalHost
+      : settings.currentSettings.jellyfinHost;
+    const jellyfinForgotPasswordUrl =
+      settings.currentSettings.jellyfinForgotPasswordUrl;
+    return (
+      <div>
+        <Formik
+          initialValues={{
+            username: '',
+            password: '',
+          }}
+          validationSchema={LoginSchema}
+          onSubmit={async (values) => {
+            try {
+              const res = await fetch('/api/v1/auth/jellyfin', {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                  username: values.username,
+                  password: values.password,
+                  email: values.username,
+                }),
+              });
+              if (!res.ok) throw new Error(res.statusText, { cause: res });
+            } catch (e) {
+              let errorData;
+              try {
+                errorData = await e.cause?.text();
+                errorData = JSON.parse(errorData);
+              } catch {
+                /* empty */
+              }
+              let errorMessage = null;
+              switch (errorData?.message) {
+                case ApiErrorCode.InvalidUrl:
+                  errorMessage = messages.invalidurlerror;
+                  break;
+                case ApiErrorCode.InvalidCredentials:
+                  errorMessage = messages.credentialerror;
+                  break;
+                case ApiErrorCode.NotAdmin:
+                  errorMessage = messages.adminerror;
+                  break;
+                case ApiErrorCode.NoAdminUser:
+                  errorMessage = messages.noadminerror;
+                  break;
+                default:
+                  errorMessage = messages.loginerror;
+                  break;
+              }
+              toasts.addToast(
+                intl.formatMessage(errorMessage, mediaServerFormatValues),
+                {
+                  autoDismiss: true,
+                  appearance: 'error',
+                }
+              );
+            } finally {
+              revalidate();
+            }
+          }}
+        >
+          {({ errors, touched, isSubmitting, isValid }) => {
+            return (
+              <>
+                <Form>
+                  <div className="sm:border-t sm:border-gray-800">
+                    <label htmlFor="username" className="text-label">
+                      {intl.formatMessage(messages.username)}
+                    </label>
+                    <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                      <div className="flex max-w-lg rounded-md shadow-sm">
+                        <Field
+                          id="username"
+                          name="username"
+                          type="text"
+                          placeholder={intl.formatMessage(messages.username)}
+                        />
+                      </div>
+                      {errors.username && touched.username && (
+                        <div className="error">{errors.username}</div>
+                      )}
                    </div>
-                    <div className="flex">
+                    <label htmlFor="password" className="text-label">
+                      {intl.formatMessage(messages.password)}
+                    </label>
+                    <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
+                      <div className="flex max-w-lg rounded-md shadow-sm">
+                        <Field
+                          id="password"
+                          name="password"
+                          type="password"
+                          placeholder={intl.formatMessage(messages.password)}
+                        />
+                      </div>
                      {errors.password && touched.password && (
                        <div className="error">{errors.password}</div>
                      )}
-                      <div className="flex-grow"></div>
-                      {baseUrl && (
-                        <a
+                    </div>
+                  </div>
+                  <div className="mt-8 border-t border-gray-700 pt-5">
+                    <div className="flex justify-between">
+                      <span className="inline-flex rounded-md shadow-sm">
+                        <Button
+                          as="a"
+                          buttonType="ghost"
                          href={
                            jellyfinForgotPasswordUrl
                              ? `${jellyfinForgotPasswordUrl}`
@@ -180,35 +485,31 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                                    : ''
                                }forgotpassword.html`
                          }
-                          className="pt-2 text-sm text-indigo-500 hover:text-indigo-400"
                        >
                          {intl.formatMessage(messages.forgotpassword)}
-                        </a>
-                      )}
+                        </Button>
+                      </span>
+                      <span className="inline-flex rounded-md shadow-sm">
+                        <Button
+                          buttonType="primary"
+                          type="submit"
+                          disabled={isSubmitting || !isValid}
+                        >
+                          {isSubmitting
+                            ? intl.formatMessage(messages.signingin)
+                            : intl.formatMessage(messages.signin)}
+                        </Button>
+                      </span>
                    </div>
                  </div>
-                </div>
-
-                <Button
-                  buttonType="primary"
-                  type="submit"
-                  disabled={isSubmitting || !isValid}
-                  className="mt-2 w-full shadow-sm"
-                >
-                  <ArrowLeftOnRectangleIcon />
-                  <span>
-                    {isSubmitting
-                      ? intl.formatMessage(messages.signingin)
-                      : intl.formatMessage(messages.signin)}
-                  </span>
-                </Button>
-              </Form>
-            </>
-          );
-        }}
-      </Formik>
-    </div>
-  );
+                </Form>
+              </>
+            );
+          }}
+        </Formik>
+      </div>
+    );
+  }
 };

 export default JellyfinLogin;
--- a/src/components/Login/LocalLogin.tsx
+++ b/src/components/Login/LocalLogin.tsx
@@ -2,7 +2,10 @@ import Button from '@app/components/Common/Button';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
-import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
+import {
+  ArrowLeftOnRectangleIcon,
+  LifebuoyIcon,
+} from '@heroicons/react/24/outline';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useState } from 'react';
@@ -10,7 +13,6 @@ import { useIntl } from 'react-intl';
 import * as Yup from 'yup';

 const messages = defineMessages('components.Login', {
-  loginwithapp: 'Login with {appName}',
  username: 'Username',
  email: 'Email Address',
  password: 'Password',
@@ -51,7 +53,6 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
        password: '',
      }}
      validationSchema={LoginSchema}
-      validateOnBlur={false}
      onSubmit={async (values) => {
        try {
          const res = await fetch('/api/v1/auth/local', {
@@ -75,27 +76,21 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
      {({ errors, touched, isSubmitting, isValid }) => {
        return (
          <>
-            <Form data-form-type="login">
+            <Form>
              <div>
-                <h2 className="mb-6 -mt-1 text-center text-lg font-bold text-neutral-200">
-                  {intl.formatMessage(messages.loginwithapp, {
-                    appName: settings.currentSettings.applicationTitle,
-                  })}
-                </h2>
-
-                <div className="mt-1 mb-4">
+                <label htmlFor="email" className="text-label">
+                  {intl.formatMessage(messages.email) +
+                    ' / ' +
+                    intl.formatMessage(messages.username)}
+                </label>
+                <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
                  <div className="form-input-field">
                    <Field
                      id="email"
                      name="email"
-                      placeholder={`${intl.formatMessage(
-                        messages.email
-                      )} / ${intl.formatMessage(messages.username)}`}
                      type="text"
                      inputMode="email"
                      data-testid="email"
-                      data-form-type="username,email"
-                      className="!bg-gray-700/80 placeholder:text-gray-400"
                    />
                  </div>
                  {errors.email &&
@@ -104,38 +99,25 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
                      <div className="error">{errors.email}</div>
                    )}
                </div>
-                <div className="mt-1 mb-2">
+                <label htmlFor="password" className="text-label">
+                  {intl.formatMessage(messages.password)}
+                </label>
+                <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
                  <div className="form-input-field">
                    <SensitiveInput
                      as="field"
                      id="password"
                      name="password"
                      type="password"
-                      placeholder={intl.formatMessage(messages.password)}
                      autoComplete="current-password"
                      data-testid="password"
-                      data-form-type="password"
-                      className="!bg-gray-700/80 placeholder:text-gray-400"
-                      data-1pignore="false"
-                      data-lpignore="false"
                    />
                  </div>
-                  <div className="flex">
-                    {errors.password &&
-                      touched.password &&
-                      typeof errors.password === 'string' && (
-                        <div className="error">{errors.password}</div>
-                      )}
-                    <div className="flex-grow"></div>
-                    {passwordResetEnabled && (
-                      <Link
-                        href="/resetpassword"
-                        className="pt-2 text-sm text-indigo-500 hover:text-indigo-400"
-                      >
-                        {intl.formatMessage(messages.forgotpassword)}
-                      </Link>
+                  {errors.password &&
+                    touched.password &&
+                    typeof errors.password === 'string' && (
+                      <div className="error">{errors.password}</div>
                    )}
-                  </div>
                </div>
                {loginError && (
                  <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
@@ -143,21 +125,37 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
                  </div>
                )}
              </div>
-
-              <Button
-                buttonType="primary"
-                type="submit"
-                disabled={isSubmitting || !isValid}
-                data-testid="local-signin-button"
-                className="mt-2 w-full shadow-sm"
-              >
-                <ArrowLeftOnRectangleIcon />
-                <span>
-                  {isSubmitting
-                    ? intl.formatMessage(messages.signingin)
-                    : intl.formatMessage(messages.signin)}
-                </span>
-              </Button>
+              <div className="mt-8 border-t border-gray-700 pt-5">
+                <div className="flex flex-row-reverse justify-between">
+                  <span className="inline-flex rounded-md shadow-sm">
+                    <Button
+                      buttonType="primary"
+                      type="submit"
+                      disabled={isSubmitting || !isValid}
+                      data-testid="local-signin-button"
+                    >
+                      <ArrowLeftOnRectangleIcon />
+                      <span>
+                        {isSubmitting
+                          ? intl.formatMessage(messages.signingin)
+                          : intl.formatMessage(messages.signin)}
+                      </span>
+                    </Button>
+                  </span>
+                  {passwordResetEnabled && (
+                    <span className="inline-flex rounded-md shadow-sm">
+                      <Link href="/resetpassword" passHref legacyBehavior>
+                        <Button as="a" buttonType="ghost">
+                          <LifebuoyIcon />
+                          <span>
+                            {intl.formatMessage(messages.forgotpassword)}
+                          </span>
+                        </Button>
+                      </Link>
+                    </span>
+                  )}
+                </div>
+              </div>
            </Form>
          </>
        );
--- a/src/components/Login/PlexLoginButton.tsx
+++ b/src/components/Login/PlexLoginButton.tsx
@@ -1,62 +0,0 @@
-import PlexIcon from '@app/assets/services/plex.svg';
-import Button from '@app/components/Common/Button';
-import { SmallLoadingSpinner } from '@app/components/Common/LoadingSpinner';
-import usePlexLogin from '@app/hooks/usePlexLogin';
-import defineMessages from '@app/utils/defineMessages';
-import { FormattedMessage } from 'react-intl';
-
-const messages = defineMessages('components.Login', {
-  loginwithapp: 'Login with {appName}',
-});
-
-interface PlexLoginButtonProps {
-  onAuthToken: (authToken: string) => void;
-  isProcessing?: boolean;
-  onError?: (message: string) => void;
-  large?: boolean;
-}
-
-const PlexLoginButton = ({
-  onAuthToken,
-  onError,
-  isProcessing,
-  large,
-}: PlexLoginButtonProps) => {
-  const { loading, login } = usePlexLogin({ onAuthToken, onError });
-
-  return (
-    <Button
-      className="relative flex-1 border-[#cc7b19] bg-[rgba(204,123,25,0.3)] hover:border-[#cc7b19] hover:bg-[rgba(204,123,25,0.7)] disabled:opacity-50"
-      onClick={login}
-      disabled={loading || isProcessing}
-      data-testid="plex-login-button"
-    >
-      {loading && (
-        <div className="absolute right-0 mr-4 h-4 w-4">
-          <SmallLoadingSpinner />
-        </div>
-      )}
-
-      {large ? (
-        <FormattedMessage
-          {...messages.loginwithapp}
-          values={{
-            appName: <PlexIcon className="mt-[2px] ml-[0.35em] w-8" />,
-          }}
-        >
-          {(chunks) => (
-            <>
-              {chunks.map((c) =>
-                typeof c === 'string' ? <span>{c}</span> : c
-              )}
-            </>
-          )}
-        </FormattedMessage>
-      ) : (
-        <PlexIcon className="w-8" />
-      )}
-    </Button>
-  );
-};
-
-export default PlexLoginButton;
--- a/src/components/Login/index.tsx
+++ b/src/components/Login/index.tsx
@@ -1,13 +1,9 @@
-import EmbyLogo from '@app/assets/services/emby-icon-only.svg';
-import JellyfinLogo from '@app/assets/services/jellyfin-icon.svg';
-import PlexLogo from '@app/assets/services/plex.svg';
-import Button from '@app/components/Common/Button';
+import Accordion from '@app/components/Common/Accordion';
 import ImageFader from '@app/components/Common/ImageFader';
 import PageTitle from '@app/components/Common/PageTitle';
 import LanguagePicker from '@app/components/Layout/LanguagePicker';
-import JellyfinLogin from '@app/components/Login/JellyfinLogin';
 import LocalLogin from '@app/components/Login/LocalLogin';
-import PlexLoginButton from '@app/components/Login/PlexLoginButton';
+import PlexLoginButton from '@app/components/PlexLoginButton';
 import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
@@ -16,10 +12,10 @@ import { XCircleIcon } from '@heroicons/react/24/solid';
 import { MediaServerType } from '@server/constants/server';
 import { useRouter } from 'next/dist/client/router';
 import Image from 'next/image';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { CSSTransition, SwitchTransition } from 'react-transition-group';
 import useSWR from 'swr';
+import JellyfinLogin from './JellyfinLogin';

 const messages = defineMessages('components.Login', {
  signin: 'Sign In',
@@ -27,21 +23,16 @@ const messages = defineMessages('components.Login', {
  signinwithplex: 'Use your Plex account',
  signinwithjellyfin: 'Use your {mediaServerName} account',
  signinwithoverseerr: 'Use your {applicationTitle} account',
-  orsigninwith: 'Or sign in with',
 });

 const Login = () => {
  const intl = useIntl();
-  const router = useRouter();
-  const settings = useSettings();
-  const { user, revalidate } = useUser();
-
  const [error, setError] = useState('');
  const [isProcessing, setProcessing] = useState(false);
  const [authToken, setAuthToken] = useState<string | undefined>(undefined);
-  const [mediaServerLogin, setMediaServerLogin] = useState(
-    settings.currentSettings.mediaServerLogin
-  );
+  const { user, revalidate } = useUser();
+  const router = useRouter();
+  const settings = useSettings();

  // Effect that is triggered when the `authToken` comes back from the Plex OAuth
  // We take the token and attempt to sign in. If we get a success message, we will
@@ -95,73 +86,14 @@ const Login = () => {
    revalidateOnFocus: false,
  });

-  const mediaServerName =
-    settings.currentSettings.mediaServerType === MediaServerType.PLEX
-      ? 'Plex'
-      : settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-      ? 'Jellyfin'
-      : settings.currentSettings.mediaServerType === MediaServerType.EMBY
-      ? 'Emby'
-      : undefined;
-
-  const MediaServerLogo =
-    settings.currentSettings.mediaServerType === MediaServerType.PLEX
-      ? PlexLogo
-      : settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-      ? JellyfinLogo
-      : settings.currentSettings.mediaServerType === MediaServerType.EMBY
-      ? EmbyLogo
-      : undefined;
-
-  const isJellyfin =
-    settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN ||
-    settings.currentSettings.mediaServerType === MediaServerType.EMBY;
-  const mediaServerLoginRef = useRef<HTMLDivElement>(null);
-  const localLoginRef = useRef<HTMLDivElement>(null);
-  const loginRef = mediaServerLogin ? mediaServerLoginRef : localLoginRef;
-
-  const loginFormVisible =
-    (isJellyfin && settings.currentSettings.mediaServerLogin) ||
-    settings.currentSettings.localLogin;
-  const additionalLoginOptions = [
-    settings.currentSettings.mediaServerLogin &&
-      (settings.currentSettings.mediaServerType === MediaServerType.PLEX ? (
-        <PlexLoginButton
-          key="plex"
-          isProcessing={isProcessing}
-          onAuthToken={(authToken) => setAuthToken(authToken)}
-          large={!isJellyfin && !settings.currentSettings.localLogin}
-        />
-      ) : (
-        settings.currentSettings.localLogin &&
-        (mediaServerLogin ? (
-          <Button
-            key="jellyseerr"
-            data-testid="jellyseerr-login-button"
-            className="flex-1 bg-transparent"
-            onClick={() => setMediaServerLogin(false)}
-          >
-            {/* eslint-disable-next-line @next/next/no-img-element */}
-            <img
-              src="/os_icon.svg"
-              alt={settings.currentSettings.applicationTitle}
-              className="mr-2 h-5"
-            />
-            <span>{settings.currentSettings.applicationTitle}</span>
-          </Button>
-        ) : (
-          <Button
-            key="mediaserver"
-            data-testid="mediaserver-login-button"
-            className="flex-1 bg-transparent"
-            onClick={() => setMediaServerLogin(true)}
-          >
-            <MediaServerLogo />
-            <span>{mediaServerName}</span>
-          </Button>
-        ))
-      )),
-  ].filter((o): o is JSX.Element => !!o);
+  const mediaServerFormatValues = {
+    mediaServerName:
+      settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
+        ? 'Jellyfin'
+        : settings.currentSettings.mediaServerType === MediaServerType.EMBY
+        ? 'Emby'
+        : undefined,
+  };

  return (
    <div className="relative flex min-h-screen flex-col bg-gray-900 py-14">
@@ -180,6 +112,9 @@ const Login = () => {
        <div className="relative h-48 w-full max-w-full">
          <Image src="/logo_stacked.svg" alt="Logo" fill />
        </div>
+        <h2 className="mt-12 text-center text-3xl font-extrabold leading-9 text-gray-100">
+          {intl.formatMessage(messages.signinheader)}
+        </h2>
      </div>
      <div className="relative z-50 mt-8 sm:mx-auto sm:w-full sm:max-w-md">
        <div
@@ -210,71 +145,65 @@ const Login = () => {
                </div>
              </div>
            </Transition>
-            <div className="px-10 py-8">
-              <SwitchTransition mode="out-in">
-                <CSSTransition
-                  key={mediaServerLogin ? 'ms' : 'local'}
-                  nodeRef={loginRef}
-                  addEndListener={(done) => {
-                    loginRef.current?.addEventListener(
-                      'transitionend',
-                      done,
-                      false
-                    );
-                  }}
-                  onEntered={() => {
-                    document
-                      .querySelector<HTMLInputElement>('#email, #username')
-                      ?.focus();
-                  }}
-                  classNames={{
-                    appear: 'opacity-0',
-                    appearActive: 'transition-opacity duration-500 opacity-100',
-                    enter: 'opacity-0',
-                    enterActive: 'transition-opacity duration-500 opacity-100',
-                    exitActive: 'transition-opacity duration-0 opacity-0',
-                  }}
-                >
-                  <div ref={loginRef} className="button-container">
-                    {isJellyfin &&
-                    (mediaServerLogin ||
-                      !settings.currentSettings.localLogin) ? (
-                      <JellyfinLogin
-                        serverType={settings.currentSettings.mediaServerType}
-                        revalidate={revalidate}
-                      />
-                    ) : (
-                      settings.currentSettings.localLogin && (
-                        <LocalLogin revalidate={revalidate} />
-                      )
-                    )}
-                  </div>
-                </CSSTransition>
-              </SwitchTransition>
-
-              {additionalLoginOptions.length > 0 &&
-                (loginFormVisible ? (
-                  <div className="flex items-center py-5">
-                    <div className="flex-grow border-t border-gray-600"></div>
-                    <span className="mx-2 flex-shrink text-sm text-gray-400">
-                      {intl.formatMessage(messages.orsigninwith)}
-                    </span>
-                    <div className="flex-grow border-t border-gray-600"></div>
-                  </div>
-                ) : (
-                  <h2 className="mb-6 text-center text-lg font-bold text-neutral-200">
-                    {intl.formatMessage(messages.signinheader)}
-                  </h2>
-                ))}
-
-              <div
-                className={`flex w-full flex-wrap gap-2 ${
-                  !loginFormVisible ? 'flex-col' : ''
-                }`}
-              >
-                {additionalLoginOptions}
-              </div>
-            </div>
+            <Accordion single atLeastOne>
+              {({ openIndexes, handleClick, AccordionContent }) => (
+                <>
+                  <button
+                    className={`w-full cursor-default bg-gray-800 bg-opacity-70 py-2 text-center text-sm font-bold text-gray-400 transition-colors duration-200 focus:outline-none sm:rounded-t-lg ${
+                      openIndexes.includes(0) && 'text-indigo-500'
+                    } ${
+                      settings.currentSettings.localLogin &&
+                      'hover:cursor-pointer hover:bg-gray-700'
+                    }`}
+                    onClick={() => handleClick(0)}
+                    disabled={!settings.currentSettings.localLogin}
+                  >
+                    {settings.currentSettings.mediaServerType ==
+                    MediaServerType.PLEX
+                      ? intl.formatMessage(messages.signinwithplex)
+                      : intl.formatMessage(
+                          messages.signinwithjellyfin,
+                          mediaServerFormatValues
+                        )}
+                  </button>
+                  <AccordionContent isOpen={openIndexes.includes(0)}>
+                    <div className="px-10 py-8">
+                      {settings.currentSettings.mediaServerType ==
+                      MediaServerType.PLEX ? (
+                        <PlexLoginButton
+                          isProcessing={isProcessing}
+                          onAuthToken={(authToken) => setAuthToken(authToken)}
+                        />
+                      ) : (
+                        <JellyfinLogin revalidate={revalidate} />
+                      )}
+                    </div>
+                  </AccordionContent>
+                  {settings.currentSettings.localLogin && (
+                    <div>
+                      <button
+                        className={`w-full cursor-default bg-gray-800 bg-opacity-70 py-2 text-center text-sm font-bold text-gray-400 transition-colors duration-200 hover:cursor-pointer hover:bg-gray-700 focus:outline-none ${
+                          openIndexes.includes(1)
+                            ? 'text-indigo-500'
+                            : 'sm:rounded-b-lg'
+                        }`}
+                        onClick={() => handleClick(1)}
+                      >
+                        {intl.formatMessage(messages.signinwithoverseerr, {
+                          applicationTitle:
+                            settings.currentSettings.applicationTitle,
+                        })}
+                      </button>
+                      <AccordionContent isOpen={openIndexes.includes(1)}>
+                        <div className="px-10 py-8">
+                          <LocalLogin revalidate={revalidate} />
+                        </div>
+                      </AccordionContent>
+                    </div>
+                  )}
+                </>
+              )}
+            </Accordion>
          </>
        </div>
      </div>
--- a/src/components/ManageSlideOver/index.tsx
+++ b/src/components/ManageSlideOver/index.tsx
@@ -122,13 +122,15 @@ const ManageSlideOver = ({

  const deleteMediaFile = async () => {
    if (data.mediaInfo) {
-      // we don't check if the response is ok here because there may be no file to delete
-      await fetch(`/api/v1/media/${data.mediaInfo.id}/file`, {
+      const res1 = await fetch(`/api/v1/media/${data.mediaInfo.id}/file`, {
        method: 'DELETE',
      });
-      await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
+      if (!res1.ok) throw new Error();
+
+      const res2 = await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
        method: 'DELETE',
      });
+      if (!res2.ok) throw new Error();

      revalidate();
      onClose();
--- a/src/components/MediaSlider/index.tsx
+++ b/src/components/MediaSlider/index.tsx
@@ -56,7 +56,6 @@ const MediaSlider = ({
    },
    {
      initialSize: 2,
-      revalidateFirstPage: false,
    }
  );

--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -25,7 +25,7 @@ import StatusBadge from '@app/components/StatusBadge';
 import useDeepLinks from '@app/hooks/useDeepLinks';
 import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
-import { Permission, UserType, useUser } from '@app/hooks/useUser';
+import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import ErrorPage from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
@@ -505,7 +505,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
            src={
              data.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
-                : '/images/jellyseerr_poster_not_found.png'
+                : '/images/overseerr_poster_not_found.png'
            }
            alt=""
            sizes="100vw"
@@ -590,48 +590,47 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                  buttonSize={'md'}
                  onClick={() => setShowBlacklistModal(true)}
                >
-                  <EyeSlashIcon />
+                  <EyeSlashIcon className={'h-3'} />
                </Button>
              </Tooltip>
            )}
-          {data?.mediaInfo?.status !== MediaStatus.BLACKLISTED &&
-            user?.userType !== UserType.PLEX && (
-              <>
-                {toggleWatchlist ? (
-                  <Tooltip
-                    content={intl.formatMessage(messages.addtowatchlist)}
+          {data?.mediaInfo?.status !== MediaStatus.BLACKLISTED && (
+            <>
+              {toggleWatchlist ? (
+                <Tooltip content={intl.formatMessage(messages.addtowatchlist)}>
+                  <Button
+                    buttonType={'ghost'}
+                    className="z-40 mr-2"
+                    buttonSize={'md'}
+                    onClick={onClickWatchlistBtn}
                  >
-                    <Button
-                      buttonType={'ghost'}
-                      className="z-40 mr-2"
-                      buttonSize={'md'}
-                      onClick={onClickWatchlistBtn}
-                    >
-                      {isUpdating ? (
-                        <Spinner />
-                      ) : (
-                        <StarIcon className={'text-amber-300'} />
-                      )}
-                    </Button>
-                  </Tooltip>
-                ) : (
-                  <Tooltip
-                    content={intl.formatMessage(messages.removefromwatchlist)}
+                    {isUpdating ? (
+                      <Spinner className="h-3" />
+                    ) : (
+                      <StarIcon className={'h-3 text-amber-300'} />
+                    )}
+                  </Button>
+                </Tooltip>
+              ) : (
+                <Tooltip
+                  content={intl.formatMessage(messages.removefromwatchlist)}
+                >
+                  <Button
+                    className="z-40 mr-2"
+                    buttonSize={'md'}
+                    onClick={onClickDeleteWatchlistBtn}
                  >
-                    <Button
-                      className="z-40 mr-2"
-                      buttonSize={'md'}
-                      onClick={onClickDeleteWatchlistBtn}
-                    >
-                      {isUpdating ? <Spinner /> : <MinusCircleIcon />}
-                    </Button>
-                  </Tooltip>
-                )}
-              </>
-            )}
-          <div className="z-20">
-            <PlayButton links={mediaLinks} />
-          </div>
+                    {isUpdating ? (
+                      <Spinner className="h-3" />
+                    ) : (
+                      <MinusCircleIcon className={'h-3'} />
+                    )}
+                  </Button>
+                </Tooltip>
+              )}
+            </>
+          )}
+          <PlayButton links={mediaLinks} />
          <RequestButton
            mediaType="movie"
            media={data.mediaInfo}
--- a/src/components/PWAHeader/index.tsx
+++ b/src/components/PWAHeader/index.tsx
@@ -2,7 +2,7 @@ interface PWAHeaderProps {
  applicationTitle?: string;
 }

-const PWAHeader = ({ applicationTitle = 'Jellyseerr' }: PWAHeaderProps) => {
+const PWAHeader = ({ applicationTitle = 'Overseerr' }: PWAHeaderProps) => {
  return (
    <>
      <link
--- a/src/components/PlexLoginButton/index.tsx
+++ b/src/components/PlexLoginButton/index.tsx
@@ -0,0 +1,66 @@
+import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
+import PlexOAuth from '@app/utils/plex';
+import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
+import { useState } from 'react';
+import { useIntl } from 'react-intl';
+
+const messages = defineMessages('components.PlexLoginButton', {
+  signinwithplex: 'Sign In',
+  signingin: 'Signing In…',
+});
+
+const plexOAuth = new PlexOAuth();
+
+interface PlexLoginButtonProps {
+  onAuthToken: (authToken: string) => void;
+  isProcessing?: boolean;
+  onError?: (message: string) => void;
+}
+
+const PlexLoginButton = ({
+  onAuthToken,
+  onError,
+  isProcessing,
+}: PlexLoginButtonProps) => {
+  const intl = useIntl();
+  const [loading, setLoading] = useState(false);
+
+  const getPlexLogin = async () => {
+    setLoading(true);
+    try {
+      const authToken = await plexOAuth.login();
+      setLoading(false);
+      onAuthToken(authToken);
+    } catch (e) {
+      if (onError) {
+        onError(e.message);
+      }
+      setLoading(false);
+    }
+  };
+  return (
+    <span className="block w-full rounded-md shadow-sm">
+      <button
+        type="button"
+        onClick={() => {
+          plexOAuth.preparePopup();
+          setTimeout(() => getPlexLogin(), 1500);
+        }}
+        disabled={loading || isProcessing}
+        className="plex-button"
+      >
+        <ArrowLeftOnRectangleIcon />
+        <span>
+          {loading
+            ? intl.formatMessage(globalMessages.loading)
+            : isProcessing
+            ? intl.formatMessage(messages.signingin)
+            : intl.formatMessage(messages.signinwithplex)}
+        </span>
+      </button>
+    </span>
+  );
+};
+
+export default PlexLoginButton;
--- a/src/components/RequestBlock/index.tsx
+++ b/src/components/RequestBlock/index.tsx
@@ -20,7 +20,6 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
-import { mutate } from 'swr';

 const messages = defineMessages('components.RequestBlock', {
  seasons: '{seasonCount, plural, one {Season} other {Seasons}}',
@@ -60,7 +59,6 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {

    if (onUpdate) {
      onUpdate();
-      mutate('/api/v1/request/count');
    }
    setIsUpdating(false);
  };
@@ -74,7 +72,6 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {

    if (onUpdate) {
      onUpdate();
-      mutate('/api/v1/request/count');
    }

    setIsUpdating(false);
--- a/src/components/RequestButton/index.tsx
+++ b/src/components/RequestButton/index.tsx
@@ -15,7 +15,6 @@ import type Media from '@server/entity/Media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import { useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { mutate } from 'swr';

 const messages = defineMessages('components.RequestButton', {
  viewrequest: 'View Request',
@@ -102,7 +101,6 @@ const RequestButton = ({

    if (data) {
      onUpdate();
-      mutate('/api/v1/request/count');
    }
  };

@@ -125,7 +123,6 @@ const RequestButton = ({
    );

    onUpdate();
-    mutate('/api/v1/request/count');
  };

  const buttons: ButtonOption[] = [];
--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -80,7 +80,6 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
    if (!res.ok) throw new Error();
    mutate('/api/v1/media?filter=allavailable&take=20&sort=mediaAdded');
    mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
-    mutate('/api/v1/request/count');
  };

  return (
@@ -272,7 +271,6 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {

    if (data) {
      revalidate();
-      mutate('/api/v1/request/count');
    }
  };

@@ -282,7 +280,6 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
    });
    if (!res.ok) throw new Error();
    mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
-    mutate('/api/v1/request/count');
  };

  const retryRequest = async () => {
@@ -621,7 +618,7 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
            src={
              title.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                : '/images/jellyseerr_poster_not_found.png'
+                : '/images/overseerr_poster_not_found.png'
            }
            alt=""
            sizes="100vw"
--- a/src/components/RequestList/RequestItem/index.tsx
+++ b/src/components/RequestList/RequestItem/index.tsx
@@ -17,10 +17,9 @@ import {
  TrashIcon,
  XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus, MediaType } from '@server/constants/media';
+import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties } from '@server/interfaces/api/common';
-import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import Link from 'next/link';
@@ -28,7 +27,7 @@ import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { FormattedRelativeTime, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
-import useSWR, { mutate } from 'swr';
+import useSWR from 'swr';

 const messages = defineMessages('components.RequestList.RequestItem', {
  seasons: '{seasonCount, plural, one {Season} other {Seasons}}',
@@ -70,7 +69,6 @@ const RequestItemError = ({
    });
    if (!res.ok) throw new Error();
    revalidateList();
-    mutate('/api/v1/request/count');
  };

  const { mediaUrl: plexUrl, mediaUrl4k: plexUrl4k } = useDeepLinks({
@@ -294,16 +292,9 @@ const RequestItemError = ({
 interface RequestItemProps {
  request: NonFunctionProperties<MediaRequest> & { profileName?: string };
  revalidateList: () => void;
-  radarrData?: RadarrSettings[];
-  sonarrData?: SonarrSettings[];
 }

-const RequestItem = ({
-  request,
-  revalidateList,
-  radarrData,
-  sonarrData,
-}: RequestItemProps) => {
+const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
  const settings = useSettings();
  const { ref, inView } = useInView({
    triggerOnce: true,
@@ -343,7 +334,6 @@ const RequestItem = ({

    if (data) {
      revalidate();
-      mutate('/api/v1/request/count');
    }
  };

@@ -354,12 +344,10 @@ const RequestItem = ({
    if (!res.ok) throw new Error();

    revalidateList();
-    mutate('/api/v1/request/count');
  };

  const deleteMediaFile = async () => {
    if (request.media) {
-      // we don't check if the response is ok here because there may be no file to delete
      await fetch(`/api/v1/media/${request.media.id}/file`, {
        method: 'DELETE',
      });
@@ -398,23 +386,6 @@ const RequestItem = ({
    iOSPlexUrl4k: requestData?.media?.iOSPlexUrl4k,
  });

-  const serviceExists = () => {
-    if (title?.mediaInfo) {
-      if (title?.mediaInfo.mediaType === MediaType.MOVIE) {
-        return (
-          radarrData?.find((radarr) => radarr.id === request.serverId) !==
-          undefined
-        );
-      } else {
-        return (
-          sonarrData?.find((sonarr) => sonarr.id === request.serverId) !==
-          undefined
-        );
-      }
-    }
-    return false;
-  };
-
  if (!title && !error) {
    return (
      <div
@@ -481,7 +452,7 @@ const RequestItem = ({
                src={
                  title.posterPath
                    ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                    : '/images/jellyseerr_poster_not_found.png'
+                    : '/images/overseerr_poster_not_found.png'
                }
                alt=""
                sizes="100vw"
@@ -722,30 +693,28 @@ const RequestItem = ({
            )}
          {requestData.status !== MediaRequestStatus.PENDING &&
            hasPermission(Permission.MANAGE_REQUESTS) && (
-              <ConfirmButton
-                onClick={() => deleteRequest()}
-                confirmText={intl.formatMessage(globalMessages.areyousure)}
-                className="w-full"
-              >
-                <TrashIcon />
-                <span>{intl.formatMessage(messages.deleterequest)}</span>
-              </ConfirmButton>
-            )}
-          {hasPermission(Permission.MANAGE_REQUESTS) &&
-            title?.mediaInfo?.serviceId &&
-            serviceExists() && (
-              <ConfirmButton
-                onClick={() => deleteMediaFile()}
-                confirmText={intl.formatMessage(globalMessages.areyousure)}
-                className="w-full"
-              >
-                <TrashIcon />
-                <span>
-                  {intl.formatMessage(messages.removearr, {
-                    arr: request.type === 'movie' ? 'Radarr' : 'Sonarr',
-                  })}
-                </span>
-              </ConfirmButton>
+              <>
+                <ConfirmButton
+                  onClick={() => deleteRequest()}
+                  confirmText={intl.formatMessage(globalMessages.areyousure)}
+                  className="w-full"
+                >
+                  <TrashIcon />
+                  <span>{intl.formatMessage(messages.deleterequest)}</span>
+                </ConfirmButton>
+                <ConfirmButton
+                  onClick={() => deleteMediaFile()}
+                  confirmText={intl.formatMessage(globalMessages.areyousure)}
+                  className="w-full"
+                >
+                  <TrashIcon />
+                  <span>
+                    {intl.formatMessage(messages.removearr, {
+                      arr: request.type === 'movie' ? 'Radarr' : 'Sonarr',
+                    })}
+                  </span>
+                </ConfirmButton>
+              </>
            )}
          {requestData.status === MediaRequestStatus.PENDING &&
            hasPermission(Permission.MANAGE_REQUESTS) && (
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -17,8 +17,6 @@ import {
  FunnelIcon,
 } from '@heroicons/react/24/solid';
 import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces';
-import { Permission } from '@server/lib/permissions';
-import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
@@ -53,7 +51,7 @@ const RequestList = () => {
  const { user } = useUser({
    id: Number(router.query.userId),
  });
-  const { user: currentUser, hasPermission } = useUser();
+  const { user: currentUser } = useUser();
  const [currentFilter, setCurrentFilter] = useState<Filter>(Filter.PENDING);
  const [currentSort, setCurrentSort] = useState<Sort>('added');
  const [currentSortDirection, setCurrentSortDirection] =
@@ -64,13 +62,6 @@ const RequestList = () => {
  const pageIndex = page - 1;
  const updateQueryParams = useUpdateQueryParams({ page: page.toString() });

-  const { data: radarrData } = useSWR<RadarrSettings[]>(
-    hasPermission(Permission.ADMIN) ? '/api/v1/settings/radarr' : null
-  );
-  const { data: sonarrData } = useSWR<SonarrSettings[]>(
-    hasPermission(Permission.ADMIN) ? '/api/v1/settings/sonarr' : null
-  );
-
  const {
    data,
    error,
@@ -254,8 +245,6 @@ const RequestList = () => {
            <RequestItem
              request={request}
              revalidateList={() => revalidate()}
-              radarrData={radarrData}
-              sonarrData={sonarrData}
            />
          </div>
        );
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -16,7 +16,7 @@ import type { Collection } from '@server/models/Collection';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
-import useSWR, { mutate } from 'swr';
+import useSWR from 'swr';

 const messages = defineMessages('components.RequestModal', {
  requestadmin: 'This request will be approved automatically.',
@@ -220,7 +220,6 @@ const CollectionRequestModal = ({
            ? MediaStatus.UNKNOWN
            : MediaStatus.PARTIALLY_AVAILABLE
        );
-        mutate('/api/v1/request/count');
      }

      addToast(
@@ -240,16 +239,7 @@ const CollectionRequestModal = ({
    } finally {
      setIsUpdating(false);
    }
-  }, [
-    requestOverrides,
-    data?.parts,
-    data?.name,
-    onComplete,
-    addToast,
-    intl,
-    selectedParts,
-    is4k,
-  ]);
+  }, [requestOverrides, data, onComplete, addToast, intl, selectedParts, is4k]);

  const hasAutoApprove = hasPermission(
    [
@@ -451,7 +441,7 @@ const CollectionRequestModal = ({
                                src={
                                  part.posterPath
                                    ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${part.posterPath}`
-                                    : '/images/jellyseerr_poster_not_found.png'
+                                    : '/images/overseerr_poster_not_found.png'
                                }
                                alt=""
                                sizes="100vw"
--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -104,7 +104,6 @@ const MovieRequestModal = ({
      if (!res.ok) throw new Error();
      const mediaRequest: MediaRequest = await res.json();
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
-      mutate('/api/v1/request/count');

      if (mediaRequest) {
        if (onComplete) {
@@ -139,16 +138,7 @@ const MovieRequestModal = ({
    } finally {
      setIsUpdating(false);
    }
-  }, [
-    requestOverrides,
-    data?.id,
-    data?.title,
-    is4k,
-    onComplete,
-    addToast,
-    intl,
-    hasPermission,
-  ]);
+  }, [data, onComplete, addToast, requestOverrides, hasPermission, intl, is4k]);

  const cancelRequest = async () => {
    setIsUpdating(true);
@@ -160,7 +150,6 @@ const MovieRequestModal = ({
      if (!res.ok) throw new Error();

      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
-      mutate('/api/v1/request/count');

      if (res.status === 204) {
        if (onComplete) {
@@ -208,7 +197,6 @@ const MovieRequestModal = ({
        if (!res.ok) throw new Error();
      }
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
-      mutate('/api/v1/request/count');

      addToast(
        <span>
--- a/src/components/RequestModal/SearchByNameModal/index.tsx
+++ b/src/components/RequestModal/SearchByNameModal/index.tsx
@@ -92,7 +92,7 @@ const SearchByNameModal = ({
                <Image
                  src={
                    item.remotePoster ??
-                    '/images/jellyseerr_poster_not_found.png'
+                    '/images/overseerr_poster_not_found.png'
                  }
                  alt={item.title}
                  className="w-100 h-auto rounded-md"
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -106,7 +106,6 @@ const TvRequestModal = ({

    if (onUpdating) {
      onUpdating(true);
-      mutate('/api/v1/request/count');
    }

    try {
@@ -142,7 +141,6 @@ const TvRequestModal = ({
        if (!res.ok) throw new Error();
      }
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
-      mutate('/api/v1/request/count');

      addToast(
        <span>
@@ -191,7 +189,6 @@ const TvRequestModal = ({

    if (onUpdating) {
      onUpdating(true);
-      mutate('/api/v1/request/count');
    }

    try {
@@ -217,7 +214,7 @@ const TvRequestModal = ({
          mediaType: 'tv',
          is4k,
          seasons: settings.currentSettings.partialRequestsEnabled
-            ? selectedSeasons.sort((a, b) => a - b)
+            ? selectedSeasons
            : getAllSeasons().filter(
                (season) => !getAllRequestedSeasons().includes(season)
              ),
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -52,21 +52,18 @@ type SingleVal = {
 type BaseSelectorMultiProps = {
  defaultValue?: string;
  isMulti: true;
-  isDisabled?: boolean;
  onChange: (value: MultiValue<SingleVal> | null) => void;
 };

 type BaseSelectorSingleProps = {
  defaultValue?: string;
  isMulti?: false;
-  isDisabled?: boolean;
  onChange: (value: SingleValue<SingleVal> | null) => void;
 };

 export const CompanySelector = ({
  defaultValue,
  isMulti,
-  isDisabled,
  onChange,
 }: BaseSelectorSingleProps | BaseSelectorMultiProps) => {
  const intl = useIntl();
@@ -120,7 +117,6 @@ export const CompanySelector = ({
      className="react-select-container"
      classNamePrefix="react-select"
      isMulti={isMulti}
-      isDisabled={isDisabled}
      defaultValue={defaultDataValue}
      defaultOptions
      cacheOptions
@@ -147,7 +143,6 @@ type GenreSelectorProps = (BaseSelectorMultiProps | BaseSelectorSingleProps) & {
 export const GenreSelector = ({
  isMulti,
  defaultValue,
-  isDisabled,
  onChange,
  type,
 }: GenreSelectorProps) => {
@@ -208,7 +203,6 @@ export const GenreSelector = ({
      defaultOptions
      cacheOptions
      isMulti={isMulti}
-      isDisabled={isDisabled}
      loadOptions={loadGenreOptions}
      placeholder={intl.formatMessage(messages.searchGenres)}
      onChange={(value) => {
@@ -221,7 +215,6 @@ export const GenreSelector = ({

 export const StatusSelector = ({
  isMulti,
-  isDisabled,
  defaultValue,
  onChange,
 }: BaseSelectorMultiProps | BaseSelectorSingleProps) => {
@@ -279,7 +272,6 @@ export const StatusSelector = ({
      defaultValue={isMulti ? defaultDataValue : defaultDataValue?.[0]}
      defaultOptions
      isMulti={isMulti}
-      isDisabled={isDisabled}
      loadOptions={loadStatusOptions}
      placeholder={intl.formatMessage(messages.searchStatus)}
      onChange={(value) => {
@@ -292,7 +284,6 @@ export const StatusSelector = ({

 export const KeywordSelector = ({
  isMulti,
-  isDisabled,
  defaultValue,
  onChange,
 }: BaseSelectorMultiProps | BaseSelectorSingleProps) => {
@@ -350,7 +341,6 @@ export const KeywordSelector = ({
      key={`keyword-select-${defaultDataValue}`}
      inputId="data"
      isMulti={isMulti}
-      isDisabled={isDisabled}
      className="react-select-container"
      classNamePrefix="react-select"
      noOptionsMessage={({ inputValue }) =>
@@ -561,7 +551,6 @@ export const WatchProviderSelector = ({

 export const UserSelector = ({
  isMulti,
-  isDisabled,
  defaultValue,
  onChange,
 }: BaseSelectorMultiProps | BaseSelectorSingleProps) => {
@@ -578,10 +567,7 @@ export const UserSelector = ({

      const users = defaultValue.split(',');

-      const res = await fetch(
-        `/api/v1/user?includeIds=${encodeURIComponent(defaultValue)}`
-      );
-
+      const res = await fetch(`/api/v1/user`);
      if (!res.ok) {
        throw new Error('Network response was not ok');
      }
@@ -627,7 +613,6 @@ export const UserSelector = ({
      defaultOptions
      cacheOptions
      isMulti={isMulti}
-      isDisabled={isDisabled}
      loadOptions={loadUserOptions}
      placeholder={intl.formatMessage(messages.searchUsers)}
      onChange={(value) => {
--- a/src/components/Settings/Notifications/NotificationsDiscord.tsx
+++ b/src/components/Settings/Notifications/NotificationsDiscord.tsx
@@ -238,11 +238,6 @@ const NotificationsDiscord = () => {
                    name="botUsername"
                    type="text"
                    placeholder={settings.currentSettings.applicationTitle}
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
                  />
                </div>
                {errors.botUsername &&
--- a/src/components/Settings/Notifications/NotificationsEmail.tsx
+++ b/src/components/Settings/Notifications/NotificationsEmail.tsx
@@ -104,7 +104,7 @@ const NotificationsEmail = () => {
          otherwise: Yup.string().nullable(),
        })
        .matches(
-          /-----BEGIN PGP PRIVATE KEY BLOCK-----.+-----END PGP PRIVATE KEY BLOCK-----/,
+          /-----BEGIN PGP PRIVATE KEY BLOCK-----.+-----END PGP PRIVATE KEY BLOCK-----/s,
          intl.formatMessage(messages.validationPgpPrivateKey)
        ),
      pgpPassword: Yup.string().when('pgpPrivateKey', {
@@ -221,7 +221,6 @@ const NotificationsEmail = () => {
                    requireTls: values.encryption === 'opportunistic',
                    authUser: values.authUser,
                    authPass: values.authPass,
-                    allowSelfSigned: values.allowSelfSigned,
                    senderName: values.senderName,
                    pgpPrivateKey: values.pgpPrivateKey,
                    pgpPassword: values.pgpPassword,
@@ -296,11 +295,6 @@ const NotificationsEmail = () => {
                    name="emailFrom"
                    type="text"
                    inputMode="email"
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
                  />
                </div>
                {errors.emailFrom &&
@@ -322,11 +316,6 @@ const NotificationsEmail = () => {
                    name="smtpHost"
                    type="text"
                    inputMode="url"
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
                  />
                </div>
                {errors.smtpHost &&
@@ -348,11 +337,6 @@ const NotificationsEmail = () => {
                  type="text"
                  inputMode="numeric"
                  className="short"
-                  autoComplete="off"
-                  data-form-type="other"
-                  data-1pignore="true"
-                  data-lpignore="true"
-                  data-bwignore="true"
                />
                {errors.smtpPort &&
                  touched.smtpPort &&
@@ -406,16 +390,7 @@ const NotificationsEmail = () => {
              </label>
              <div className="form-input-area">
                <div className="form-input-field">
-                  <Field
-                    id="authUser"
-                    name="authUser"
-                    type="text"
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
-                  />
+                  <Field id="authUser" name="authUser" type="text" />
                </div>
              </div>
            </div>
@@ -425,7 +400,12 @@ const NotificationsEmail = () => {
              </label>
              <div className="form-input-area">
                <div className="form-input-field">
-                  <SensitiveInput as="field" id="authPass" name="authPass" />
+                  <SensitiveInput
+                    as="field"
+                    id="authPass"
+                    name="authPass"
+                    autoComplete="one-time-code"
+                  />
                </div>
              </div>
            </div>
@@ -450,11 +430,6 @@ const NotificationsEmail = () => {
                    type="textarea"
                    rows="10"
                    className="font-mono text-xs"
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
                  />
                </div>
                {errors.pgpPrivateKey &&
@@ -482,11 +457,7 @@ const NotificationsEmail = () => {
                    as="field"
                    id="pgpPassword"
                    name="pgpPassword"
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
+                    autoComplete="one-time-code"
                  />
                </div>
                {errors.pgpPassword &&
--- a/src/components/Settings/Notifications/NotificationsTelegram.tsx
+++ b/src/components/Settings/Notifications/NotificationsTelegram.tsx
@@ -245,7 +245,7 @@ const NotificationsTelegram = () => {
                    as="field"
                    id="botAPI"
                    name="botAPI"
-                    type="text"
+                    autoComplete="one-time-code"
                  />
                </div>
                {errors.botAPI &&
@@ -264,16 +264,7 @@ const NotificationsTelegram = () => {
              </label>
              <div className="form-input-area">
                <div className="form-input-field">
-                  <Field
-                    id="botUsername"
-                    name="botUsername"
-                    type="text"
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
-                  />
+                  <Field id="botUsername" name="botUsername" type="text" />
                </div>
                {errors.botUsername &&
                  touched.botUsername &&
@@ -303,16 +294,7 @@ const NotificationsTelegram = () => {
              </label>
              <div className="form-input-area">
                <div className="form-input-field">
-                  <Field
-                    id="chatId"
-                    name="chatId"
-                    type="text"
-                    autoComplete="off"
-                    data-form-type="other"
-                    data-1pignore="true"
-                    data-lpignore="true"
-                    data-bwignore="true"
-                  />
+                  <Field id="chatId" name="chatId" type="text" />
                </div>
                {errors.chatId &&
                  touched.chatId &&
--- a/src/components/Settings/OverrideRule/OverrideRuleModal.tsx
+++ b/src/components/Settings/OverrideRule/OverrideRuleModal.tsx
@@ -11,13 +11,7 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import type OverrideRule from '@server/entity/OverrideRule';
-import type {
-  DVRSettings,
-  RadarrSettings,
-  SonarrSettings,
-} from '@server/lib/settings';
 import { Field, Formik } from 'formik';
-import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import Select from 'react-select';
 import { useToasts } from 'react-toast-notifications';
@@ -26,9 +20,6 @@ const messages = defineMessages('components.Settings.OverrideRuleModal', {
  createrule: 'New Override Rule',
  editrule: 'Edit Override Rule',
  create: 'Create rule',
-  service: 'Service',
-  serviceDescription: 'Apply this rule to the selected service.',
-  selectService: 'Select service',
  conditions: 'Conditions',
  conditionsDescription:
    'Specifies conditions before applying parameter changes. Each field must be validated for the rules to be applied (AND operation). A field is considered verified if any of its properties match (OR operation).',
@@ -58,88 +49,21 @@ type OptionType = {
 interface OverrideRuleModalProps {
  rule: OverrideRule | null;
  onClose: () => void;
-  radarrServices: RadarrSettings[];
-  sonarrServices: SonarrSettings[];
+  testResponse: DVRTestResponse;
+  radarrId?: number;
+  sonarrId?: number;
 }

 const OverrideRuleModal = ({
  onClose,
  rule,
-  radarrServices,
-  sonarrServices,
+  testResponse,
+  radarrId,
+  sonarrId,
 }: OverrideRuleModalProps) => {
  const intl = useIntl();
  const { addToast } = useToasts();
  const { currentSettings } = useSettings();
-  const [isValidated, setIsValidated] = useState(rule ? true : false);
-  const [isTesting, setIsTesting] = useState(false);
-  const [testResponse, setTestResponse] = useState<DVRTestResponse>({
-    profiles: [],
-    rootFolders: [],
-    tags: [],
-  });
-
-  const getServiceInfos = useCallback(
-    async ({
-      hostname,
-      port,
-      apiKey,
-      baseUrl,
-      useSsl = false,
-    }: {
-      hostname: string;
-      port: number;
-      apiKey: string;
-      baseUrl?: string;
-      useSsl?: boolean;
-    }) => {
-      setIsTesting(true);
-      try {
-        const res = await fetch('/api/v1/settings/sonarr/test', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            hostname,
-            apiKey,
-            port: Number(port),
-            baseUrl,
-            useSsl,
-          }),
-        });
-        if (!res.ok) throw new Error();
-        const data: DVRTestResponse = await res.json();
-
-        setIsValidated(true);
-        setTestResponse(data);
-      } catch (e) {
-        setIsValidated(false);
-      } finally {
-        setIsTesting(false);
-      }
-    },
-    []
-  );
-
-  useEffect(() => {
-    let service: DVRSettings | null = null;
-    if (rule?.radarrServiceId !== null && rule?.radarrServiceId !== undefined) {
-      service = radarrServices[rule?.radarrServiceId] || null;
-    }
-    if (rule?.sonarrServiceId !== null && rule?.sonarrServiceId !== undefined) {
-      service = sonarrServices[rule?.sonarrServiceId] || null;
-    }
-    if (service) {
-      getServiceInfos(service);
-    }
-  }, [
-    getServiceInfos,
-    radarrServices,
-    rule?.radarrServiceId,
-    rule?.sonarrServiceId,
-    sonarrServices,
-  ]);

  return (
    <Transition
@@ -155,8 +79,6 @@ const OverrideRuleModal = ({
    >
      <Formik
        initialValues={{
-          radarrServiceId: rule?.radarrServiceId,
-          sonarrServiceId: rule?.sonarrServiceId,
          users: rule?.users,
          genre: rule?.genre,
          language: rule?.language,
@@ -175,8 +97,8 @@ const OverrideRuleModal = ({
              profileId: Number(values.profileId) || null,
              rootFolder: values.rootFolder || null,
              tags: values.tags || null,
-              radarrServiceId: values.radarrServiceId,
-              sonarrServiceId: values.sonarrServiceId,
+              radarrServiceId: radarrId,
+              sonarrServiceId: sonarrId,
            };
            if (!rule) {
              const res = await fetch('/api/v1/overrideRule', {
@@ -248,75 +170,6 @@ const OverrideRuleModal = ({
              }
            >
              <div className="mb-6">
-                <h3 className="text-lg font-bold leading-8 text-gray-100">
-                  {intl.formatMessage(messages.service)}
-                </h3>
-                <p className="description">
-                  {intl.formatMessage(messages.serviceDescription)}
-                </p>
-                <div className="form-row">
-                  <label htmlFor="service" className="text-label">
-                    {intl.formatMessage(messages.service)}
-                  </label>
-                  <div className="form-input-area">
-                    <div className="form-input-field">
-                      <select
-                        id="service"
-                        name="service"
-                        defaultValue={
-                          values.radarrServiceId !== null
-                            ? `radarr-${values.radarrServiceId}`
-                            : `sonarr-${values.sonarrServiceId}`
-                        }
-                        onChange={(e) => {
-                          const id = Number(e.target.value.split('-')[1]);
-                          if (e.target.value.startsWith('radarr-')) {
-                            setFieldValue('radarrServiceId', id);
-                            setFieldValue('sonarrServiceId', null);
-                            if (radarrServices[id]) {
-                              getServiceInfos(radarrServices[id]);
-                            }
-                          } else if (e.target.value.startsWith('sonarr-')) {
-                            setFieldValue('radarrServiceId', null);
-                            setFieldValue('sonarrServiceId', id);
-                            if (sonarrServices[id]) {
-                              getServiceInfos(sonarrServices[id]);
-                            }
-                          } else {
-                            setFieldValue('radarrServiceId', null);
-                            setFieldValue('sonarrServiceId', null);
-                            setIsValidated(false);
-                          }
-                        }}
-                      >
-                        <option value="">
-                          {intl.formatMessage(messages.selectService)}
-                        </option>
-                        {radarrServices.map((radarr) => (
-                          <option
-                            key={`radarr-${radarr.id}`}
-                            value={`radarr-${radarr.id}`}
-                          >
-                            {radarr.name}
-                          </option>
-                        ))}
-                        {sonarrServices.map((sonarr) => (
-                          <option
-                            key={`sonarr-${sonarr.id}`}
-                            value={`sonarr-${sonarr.id}`}
-                          >
-                            {sonarr.name}
-                          </option>
-                        ))}
-                      </select>
-                    </div>
-                    {errors.rootFolder &&
-                      touched.rootFolder &&
-                      typeof errors.rootFolder === 'string' && (
-                        <div className="error">{errors.rootFolder}</div>
-                      )}
-                  </div>
-                </div>
                <h3 className="text-lg font-bold leading-8 text-gray-100">
                  {intl.formatMessage(messages.conditions)}
                </h3>
@@ -331,7 +184,6 @@ const OverrideRuleModal = ({
                    <div className="form-input-field">
                      <UserSelector
                        defaultValue={values.users}
-                        isDisabled={!isValidated || isTesting}
                        isMulti
                        onChange={(users) => {
                          setFieldValue(
@@ -355,10 +207,9 @@ const OverrideRuleModal = ({
                  <div className="form-input-area">
                    <div className="form-input-field">
                      <GenreSelector
-                        type={values.radarrServiceId ? 'movie' : 'tv'}
+                        type={radarrId ? 'movie' : 'tv'}
                        defaultValue={values.genre}
                        isMulti
-                        isDisabled={!isValidated || isTesting}
                        onChange={(genres) => {
                          setFieldValue(
                            'genre',
@@ -386,7 +237,6 @@ const OverrideRuleModal = ({
                        setFieldValue={(_key, value) => {
                          setFieldValue('language', value);
                        }}
-                        isDisabled={!isValidated || isTesting}
                      />
                    </div>
                    {errors.language &&
@@ -405,7 +255,6 @@ const OverrideRuleModal = ({
                      <KeywordSelector
                        defaultValue={values.keywords}
                        isMulti
-                        isDisabled={!isValidated || isTesting}
                        onChange={(value) => {
                          setFieldValue(
                            'keywords',
@@ -433,12 +282,7 @@ const OverrideRuleModal = ({
                  </label>
                  <div className="form-input-area">
                    <div className="form-input-field">
-                      <Field
-                        as="select"
-                        id="rootFolderRule"
-                        name="rootFolder"
-                        disabled={!isValidated || isTesting}
-                      >
+                      <Field as="select" id="rootFolderRule" name="rootFolder">
                        <option value="">
                          {intl.formatMessage(messages.selectRootFolder)}
                        </option>
@@ -466,12 +310,7 @@ const OverrideRuleModal = ({
                  </label>
                  <div className="form-input-area">
                    <div className="form-input-field">
-                      <Field
-                        as="select"
-                        id="profileIdRule"
-                        name="profileId"
-                        disabled={!isValidated || isTesting}
-                      >
+                      <Field as="select" id="profileIdRule" name="profileId">
                        <option value="">
                          {intl.formatMessage(messages.selectQualityProfile)}
                        </option>
@@ -504,7 +343,6 @@ const OverrideRuleModal = ({
                        value: tag.id,
                      }))}
                      isMulti
-                      isDisabled={!isValidated || isTesting}
                      placeholder={intl.formatMessage(messages.selecttags)}
                      className="react-select-container"
                      classNamePrefix="react-select"
--- a/src/components/Settings/OverrideRule/OverrideRuleTile.tsx
+++ b/src/components/Settings/OverrideRule/OverrideRuleTile.tsx
@@ -0,0 +1,267 @@
+import type { DVRTestResponse } from '@app/components/Settings/SettingsServices';
+import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
+import { PencilIcon, TrashIcon } from '@heroicons/react/24/solid';
+import type { TmdbGenre } from '@server/api/themoviedb/interfaces';
+import type OverrideRule from '@server/entity/OverrideRule';
+import type { User } from '@server/entity/User';
+import type {
+  Language,
+  RadarrSettings,
+  SonarrSettings,
+} from '@server/lib/settings';
+import type { Keyword } from '@server/models/common';
+import { useEffect, useState } from 'react';
+import { useIntl } from 'react-intl';
+import useSWR from 'swr';
+
+const messages = defineMessages('components.Settings.OverrideRuleTile', {
+  qualityprofile: 'Quality Profile',
+  rootfolder: 'Root Folder',
+  tags: 'Tags',
+  users: 'Users',
+  genre: 'Genre',
+  language: 'Language',
+  keywords: 'Keywords',
+  conditions: 'Conditions',
+  settings: 'Settings',
+});
+
+interface OverrideRuleTileProps {
+  rules: OverrideRule[];
+  setOverrideRuleModal: ({
+    open,
+    rule,
+    testResponse,
+  }: {
+    open: boolean;
+    rule: OverrideRule | null;
+    testResponse: DVRTestResponse;
+  }) => void;
+  testResponse: DVRTestResponse;
+  radarr?: RadarrSettings | null;
+  sonarr?: SonarrSettings | null;
+  revalidate: () => void;
+}
+
+const OverrideRuleTile = ({
+  rules,
+  setOverrideRuleModal,
+  testResponse,
+  radarr,
+  sonarr,
+  revalidate,
+}: OverrideRuleTileProps) => {
+  const intl = useIntl();
+  const [users, setUsers] = useState<User[] | null>(null);
+  const [keywords, setKeywords] = useState<Keyword[] | null>(null);
+  const { data: languages } = useSWR<Language[]>('/api/v1/languages');
+  const { data: genres } = useSWR<TmdbGenre[]>('/api/v1/genres/movie');
+
+  useEffect(() => {
+    (async () => {
+      const keywords = await Promise.all(
+        rules
+          .map((rule) => rule.keywords?.split(','))
+          .flat()
+          .filter((keywordId) => keywordId)
+          .map(async (keywordId) => {
+            const res = await fetch(`/api/v1/keyword/${keywordId}`);
+            if (!res.ok) throw new Error();
+            const keyword: Keyword = await res.json();
+            return keyword;
+          })
+      );
+      setKeywords(keywords);
+      const users = await Promise.all(
+        rules
+          .map((rule) => rule.users?.split(','))
+          .flat()
+          .filter((userId) => userId)
+          .map(async (userId) => {
+            const res = await fetch(`/api/v1/user/${userId}`);
+            if (!res.ok) throw new Error();
+            const user: User = await res.json();
+            return user;
+          })
+      );
+      setUsers(users);
+    })();
+  }, [rules]);
+
+  return (
+    <>
+      {rules
+        .filter(
+          (rule) =>
+            (rule.radarrServiceId !== null &&
+              rule.radarrServiceId === radarr?.id) ||
+            (rule.sonarrServiceId !== null &&
+              rule.sonarrServiceId === sonarr?.id)
+        )
+        .map((rule) => (
+          <li className="flex h-full flex-col rounded-lg bg-gray-800 text-left shadow ring-1 ring-gray-500">
+            <div className="flex w-full flex-1 items-center justify-between space-x-6 p-6">
+              <div className="flex-1 truncate">
+                <span className="text-lg">
+                  {intl.formatMessage(messages.conditions)}
+                </span>
+                {rule.users && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.users)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.users.split(',').map((userId) => {
+                        return (
+                          <span>
+                            {
+                              users?.find((user) => user.id === Number(userId))
+                                ?.displayName
+                            }
+                          </span>
+                        );
+                      })}
+                    </div>
+                  </p>
+                )}
+                {rule.genre && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.genre)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.genre.split(',').map((genreId) => (
+                        <span>
+                          {genres?.find((g) => g.id === Number(genreId))?.name}
+                        </span>
+                      ))}
+                    </div>
+                  </p>
+                )}
+                {rule.language && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.language)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.language
+                        .split('|')
+                        .filter((languageId) => languageId !== 'server')
+                        .map((languageId) => {
+                          const language = languages?.find(
+                            (language) => language.iso_639_1 === languageId
+                          );
+                          if (!language) return null;
+                          const languageName =
+                            intl.formatDisplayName(language.iso_639_1, {
+                              type: 'language',
+                              fallback: 'none',
+                            }) ?? language.english_name;
+                          return <span>{languageName}</span>;
+                        })}
+                    </div>
+                  </p>
+                )}
+                {rule.keywords && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.keywords)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.keywords.split(',').map((keywordId) => {
+                        return (
+                          <span>
+                            {
+                              keywords?.find(
+                                (keyword) => keyword.id === Number(keywordId)
+                              )?.name
+                            }
+                          </span>
+                        );
+                      })}
+                    </div>
+                  </p>
+                )}
+                <span className="text-lg">
+                  {intl.formatMessage(messages.settings)}
+                </span>
+                {rule.profileId && (
+                  <p className="runcate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.qualityprofile)}
+                    </span>
+                    {
+                      testResponse.profiles.find(
+                        (profile) => rule.profileId === profile.id
+                      )?.name
+                    }
+                  </p>
+                )}
+                {rule.rootFolder && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.rootfolder)}
+                    </span>
+                    {rule.rootFolder}
+                  </p>
+                )}
+                {rule.tags && rule.tags.length > 0 && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.tags)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.tags.split(',').map((tag) => (
+                        <span>
+                          {
+                            testResponse.tags?.find((t) => t.id === Number(tag))
+                              ?.label
+                          }
+                        </span>
+                      ))}
+                    </div>
+                  </p>
+                )}
+              </div>
+            </div>
+            <div className="border-t border-gray-500">
+              <div className="-mt-px flex">
+                <div className="flex w-0 flex-1 border-r border-gray-500">
+                  <button
+                    onClick={() =>
+                      setOverrideRuleModal({ open: true, rule, testResponse })
+                    }
+                    className="focus:ring-blue relative -mr-px inline-flex w-0 flex-1 items-center justify-center rounded-bl-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
+                  >
+                    <PencilIcon className="mr-2 h-5 w-5" />
+                    <span>{intl.formatMessage(globalMessages.edit)}</span>
+                  </button>
+                </div>
+                <div className="-ml-px flex w-0 flex-1">
+                  <button
+                    onClick={async () => {
+                      const res = await fetch(
+                        `/api/v1/overrideRule/${rule.id}`,
+                        {
+                          method: 'DELETE',
+                        }
+                      );
+                      if (!res.ok) throw new Error();
+                      revalidate();
+                    }}
+                    className="focus:ring-blue relative inline-flex w-0 flex-1 items-center justify-center rounded-br-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
+                  >
+                    <TrashIcon className="mr-2 h-5 w-5" />
+                    <span>{intl.formatMessage(globalMessages.delete)}</span>
+                  </button>
+                </div>
+              </div>
+            </div>
+          </li>
+        ))}
+    </>
+  );
+};
+
+export default OverrideRuleTile;
--- a/src/components/Settings/OverrideRule/OverrideRuleTiles.tsx
+++ b/src/components/Settings/OverrideRule/OverrideRuleTiles.tsx
@@ -1,318 +0,0 @@
-import type { DVRTestResponse } from '@app/components/Settings/SettingsServices';
-import globalMessages from '@app/i18n/globalMessages';
-import defineMessages from '@app/utils/defineMessages';
-import { PencilIcon, TrashIcon } from '@heroicons/react/24/solid';
-import type { TmdbGenre } from '@server/api/themoviedb/interfaces';
-import type OverrideRule from '@server/entity/OverrideRule';
-import type { User } from '@server/entity/User';
-import type {
-  DVRSettings,
-  Language,
-  RadarrSettings,
-  SonarrSettings,
-} from '@server/lib/settings';
-import type { Keyword } from '@server/models/common';
-import { useCallback, useEffect, useState } from 'react';
-import { useIntl } from 'react-intl';
-import useSWR from 'swr';
-
-const messages = defineMessages('components.Settings.OverrideRuleTile', {
-  qualityprofile: 'Quality Profile',
-  rootfolder: 'Root Folder',
-  tags: 'Tags',
-  users: 'Users',
-  genre: 'Genre',
-  language: 'Language',
-  keywords: 'Keywords',
-  conditions: 'Conditions',
-  settings: 'Settings',
-});
-
-interface OverrideRuleTilesProps {
-  rules: OverrideRule[];
-  setOverrideRuleModal: ({
-    open,
-    rule,
-  }: {
-    open: boolean;
-    rule: OverrideRule | null;
-  }) => void;
-  revalidate: () => void;
-  radarrServices: RadarrSettings[];
-  sonarrServices: SonarrSettings[];
-}
-
-const OverrideRuleTiles = ({
-  rules,
-  setOverrideRuleModal,
-  revalidate,
-  radarrServices,
-  sonarrServices,
-}: OverrideRuleTilesProps) => {
-  const intl = useIntl();
-  const [users, setUsers] = useState<User[] | null>(null);
-  const [keywords, setKeywords] = useState<Keyword[] | null>(null);
-  const { data: languages } = useSWR<Language[]>('/api/v1/languages');
-  const { data: genres } = useSWR<TmdbGenre[]>('/api/v1/genres/movie');
-  const [testResponses, setTestResponses] = useState<
-    (DVRTestResponse & { type: string; id: number })[]
-  >([]);
-
-  const getServiceInfos = useCallback(async () => {
-    const results: (DVRTestResponse & { type: string; id: number })[] = [];
-    const services: DVRSettings[] = [...radarrServices, ...sonarrServices];
-    for (const service of services) {
-      const { hostname, port, apiKey, baseUrl, useSsl = false } = service;
-      try {
-        const res = await fetch(
-          `/api/v1/settings/${
-            radarrServices.includes(service as RadarrSettings)
-              ? 'radarr'
-              : 'sonarr'
-          }/test`,
-          {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              hostname,
-              apiKey,
-              port: Number(port),
-              baseUrl,
-              useSsl,
-            }),
-          }
-        );
-        if (!res.ok) throw new Error();
-        const data: DVRTestResponse = await res.json();
-        results.push({
-          type: radarrServices.includes(service as RadarrSettings)
-            ? 'radarr'
-            : 'sonarr',
-          id: service.id,
-          ...data,
-        });
-      } catch {
-        results.push({
-          type: radarrServices.includes(service as RadarrSettings)
-            ? 'radarr'
-            : 'sonarr',
-          id: service.id,
-          profiles: [],
-          rootFolders: [],
-          tags: [],
-        });
-      }
-    }
-    setTestResponses(results);
-  }, [radarrServices, sonarrServices]);
-
-  useEffect(() => {
-    getServiceInfos();
-  }, [getServiceInfos]);
-
-  useEffect(() => {
-    (async () => {
-      const keywords = await Promise.all(
-        rules
-          .map((rule) => rule.keywords?.split(','))
-          .flat()
-          .filter((keywordId) => keywordId)
-          .map(async (keywordId) => {
-            const res = await fetch(`/api/v1/keyword/${keywordId}`);
-            if (!res.ok) throw new Error();
-            const keyword: Keyword = await res.json();
-            return keyword;
-          })
-      );
-      setKeywords(keywords);
-      const allUsersFromRules = rules
-        .map((rule) => rule.users)
-        .filter((users) => users)
-        .join(',');
-      if (allUsersFromRules) {
-        const res = await fetch(
-          `/api/v1/user?includeIds=${encodeURIComponent(allUsersFromRules)}`
-        );
-        if (!res.ok) throw new Error();
-        const users: User[] = (await res.json()).results;
-        setUsers(users);
-      }
-      setUsers(users);
-    })();
-  }, [rules]);
-
-  return (
-    <>
-      {rules.map((rule) => (
-        <li className="flex h-full flex-col rounded-lg bg-gray-800 text-left shadow ring-1 ring-gray-500">
-          <div className="flex w-full flex-1 items-center justify-between space-x-6 p-6">
-            <div className="flex-1 truncate">
-              <span className="text-lg">
-                {intl.formatMessage(messages.conditions)}
-              </span>
-              {rule.users && (
-                <p className="truncate text-sm leading-5 text-gray-300">
-                  <span className="mr-2 font-bold">
-                    {intl.formatMessage(messages.users)}
-                  </span>
-                  <div className="inline-flex gap-2">
-                    {rule.users.split(',').map((userId) => {
-                      return (
-                        <span>
-                          {
-                            users?.find((user) => user.id === Number(userId))
-                              ?.displayName
-                          }
-                        </span>
-                      );
-                    })}
-                  </div>
-                </p>
-              )}
-              {rule.genre && (
-                <p className="truncate text-sm leading-5 text-gray-300">
-                  <span className="mr-2 font-bold">
-                    {intl.formatMessage(messages.genre)}
-                  </span>
-                  <div className="inline-flex gap-2">
-                    {rule.genre.split(',').map((genreId) => (
-                      <span>
-                        {genres?.find((g) => g.id === Number(genreId))?.name}
-                      </span>
-                    ))}
-                  </div>
-                </p>
-              )}
-              {rule.language && (
-                <p className="truncate text-sm leading-5 text-gray-300">
-                  <span className="mr-2 font-bold">
-                    {intl.formatMessage(messages.language)}
-                  </span>
-                  <div className="inline-flex gap-2">
-                    {rule.language
-                      .split('|')
-                      .filter((languageId) => languageId !== 'server')
-                      .map((languageId) => {
-                        const language = languages?.find(
-                          (language) => language.iso_639_1 === languageId
-                        );
-                        if (!language) return null;
-                        const languageName =
-                          intl.formatDisplayName(language.iso_639_1, {
-                            type: 'language',
-                            fallback: 'none',
-                          }) ?? language.english_name;
-                        return <span>{languageName}</span>;
-                      })}
-                  </div>
-                </p>
-              )}
-              {rule.keywords && (
-                <p className="truncate text-sm leading-5 text-gray-300">
-                  <span className="mr-2 font-bold">
-                    {intl.formatMessage(messages.keywords)}
-                  </span>
-                  <div className="inline-flex gap-2">
-                    {rule.keywords.split(',').map((keywordId) => {
-                      return (
-                        <span>
-                          {
-                            keywords?.find(
-                              (keyword) => keyword.id === Number(keywordId)
-                            )?.name
-                          }
-                        </span>
-                      );
-                    })}
-                  </div>
-                </p>
-              )}
-              <span className="text-lg">
-                {intl.formatMessage(messages.settings)}
-              </span>
-              {rule.profileId && (
-                <p className="runcate text-sm leading-5 text-gray-300">
-                  <span className="mr-2 font-bold">
-                    {intl.formatMessage(messages.qualityprofile)}
-                  </span>
-                  {testResponses
-                    .find(
-                      (r) =>
-                        (r.id === rule.radarrServiceId &&
-                          r.type === 'radarr') ||
-                        (r.id === rule.sonarrServiceId && r.type === 'sonarr')
-                    )
-                    ?.profiles.find((profile) => rule.profileId === profile.id)
-                    ?.name || rule.profileId}
-                </p>
-              )}
-              {rule.rootFolder && (
-                <p className="truncate text-sm leading-5 text-gray-300">
-                  <span className="mr-2 font-bold">
-                    {intl.formatMessage(messages.rootfolder)}
-                  </span>
-                  {rule.rootFolder}
-                </p>
-              )}
-              {rule.tags && rule.tags.length > 0 && (
-                <p className="truncate text-sm leading-5 text-gray-300">
-                  <span className="mr-2 font-bold">
-                    {intl.formatMessage(messages.tags)}
-                  </span>
-                  <div className="inline-flex gap-2">
-                    {rule.tags.split(',').map((tag) => (
-                      <span>
-                        {testResponses
-                          .find(
-                            (r) =>
-                              (r.id === rule.radarrServiceId &&
-                                r.type === 'radarr') ||
-                              (r.id === rule.sonarrServiceId &&
-                                r.type === 'sonarr')
-                          )
-                          ?.tags?.find((t) => t.id === Number(tag))?.label ||
-                          tag}
-                      </span>
-                    ))}
-                  </div>
-                </p>
-              )}
-            </div>
-          </div>
-          <div className="border-t border-gray-500">
-            <div className="-mt-px flex">
-              <div className="flex w-0 flex-1 border-r border-gray-500">
-                <button
-                  onClick={() => setOverrideRuleModal({ open: true, rule })}
-                  className="focus:ring-blue relative -mr-px inline-flex w-0 flex-1 items-center justify-center rounded-bl-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
-                >
-                  <PencilIcon className="mr-2 h-5 w-5" />
-                  <span>{intl.formatMessage(globalMessages.edit)}</span>
-                </button>
-              </div>
-              <div className="-ml-px flex w-0 flex-1">
-                <button
-                  onClick={async () => {
-                    const res = await fetch(`/api/v1/overrideRule/${rule.id}`, {
-                      method: 'DELETE',
-                    });
-                    if (!res.ok) throw new Error();
-                    revalidate();
-                  }}
-                  className="focus:ring-blue relative inline-flex w-0 flex-1 items-center justify-center rounded-br-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
-                >
-                  <TrashIcon className="mr-2 h-5 w-5" />
-                  <span>{intl.formatMessage(globalMessages.delete)}</span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </li>
-      ))}
-    </>
-  );
-};
-
-export default OverrideRuleTiles;
--- a/src/components/Settings/RadarrModal/index.tsx
+++ b/src/components/Settings/RadarrModal/index.tsx
@@ -1,15 +1,24 @@
+import Button from '@app/components/Common/Button';
 import Modal from '@app/components/Common/Modal';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
-import type { RadarrTestResponse } from '@app/components/Settings/SettingsServices';
+import OverrideRuleTile from '@app/components/Settings/OverrideRule/OverrideRuleTile';
+import type {
+  DVRTestResponse,
+  RadarrTestResponse,
+} from '@app/components/Settings/SettingsServices';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
+import { PlusIcon } from '@heroicons/react/24/solid';
+import type OverrideRule from '@server/entity/OverrideRule';
+import type { OverrideRuleResultsResponse } from '@server/interfaces/api/overrideRuleInterfaces';
 import type { RadarrSettings } from '@server/lib/settings';
 import { Field, Formik } from 'formik';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import Select from 'react-select';
 import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
 import * as Yup from 'yup';

 type OptionType = {
@@ -70,16 +79,36 @@ const messages = defineMessages('components.Settings.RadarrModal', {
  announced: 'Announced',
  inCinemas: 'In Cinemas',
  released: 'Released',
+  overrideRules: 'Override Rules',
+  addrule: 'New Override Rule',
 });

 interface RadarrModalProps {
  radarr: RadarrSettings | null;
  onClose: () => void;
  onSave: () => void;
+  overrideRuleModal: { open: boolean; rule: OverrideRule | null };
+  setOverrideRuleModal: ({
+    open,
+    rule,
+    testResponse,
+  }: {
+    open: boolean;
+    rule: OverrideRule | null;
+    testResponse: DVRTestResponse;
+  }) => void;
 }

-const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
+const RadarrModal = ({
+  onClose,
+  radarr,
+  onSave,
+  overrideRuleModal,
+  setOverrideRuleModal,
+}: RadarrModalProps) => {
  const intl = useIntl();
+  const { data: rules, mutate: revalidate } =
+    useSWR<OverrideRuleResultsResponse>('/api/v1/overrideRule');
  const initialLoad = useRef(false);
  const { addToast } = useToasts();
  const [isValidated, setIsValidated] = useState(radarr ? true : false);
@@ -206,6 +235,10 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
    }
  }, [radarr, testConnection]);

+  useEffect(() => {
+    revalidate();
+  }, [overrideRuleModal, revalidate]);
+
  return (
    <Transition
      as="div"
@@ -349,6 +382,7 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
                      values.is4k ? messages.edit4kradarr : messages.editradarr
                    )
              }
+              backgroundClickable={!overrideRuleModal.open}
            >
              <div className="mb-6">
                <div className="form-row">
@@ -382,11 +416,6 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
                        id="name"
                        name="name"
                        type="text"
-                        autoComplete="off"
-                        data-form-type="other"
-                        data-1pignore="true"
-                        data-lpignore="true"
-                        data-bwignore="true"
                        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                          setIsValidated(false);
                          setFieldValue('name', e.target.value);
@@ -480,6 +509,7 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
                        as="field"
                        id="apiKey"
                        name="apiKey"
+                        autoComplete="one-time-code"
                        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                          setIsValidated(false);
                          setFieldValue('apiKey', e.target.value);
@@ -743,6 +773,42 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
                  </div>
                </div>
              </div>
+              {radarr && (
+                <>
+                  <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
+                    {intl.formatMessage(messages.overrideRules)}
+                  </h3>
+                  <ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
+                    {rules && (
+                      <OverrideRuleTile
+                        rules={rules}
+                        setOverrideRuleModal={setOverrideRuleModal}
+                        testResponse={testResponse}
+                        radarr={radarr}
+                        revalidate={revalidate}
+                      />
+                    )}
+                    <li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
+                      <div className="flex h-full w-full items-center justify-center">
+                        <Button
+                          buttonType="ghost"
+                          onClick={() =>
+                            setOverrideRuleModal({
+                              open: true,
+                              rule: null,
+                              testResponse,
+                            })
+                          }
+                          disabled={!isValidated}
+                        >
+                          <PlusIcon />
+                          <span>{intl.formatMessage(messages.addrule)}</span>
+                        </Button>
+                      </div>
+                    </li>
+                  </ul>
+                </>
+              )}
            </Modal>
          );
        }}
--- a/src/components/Settings/SettingsLogs/index.tsx
+++ b/src/components/Settings/SettingsLogs/index.tsx
@@ -35,7 +35,7 @@ import useSWR from 'swr';
 const messages = defineMessages('components.Settings.SettingsLogs', {
  logs: 'Logs',
  logsDescription:
-    'You can also view these logs directly via <code>stdout</code>, or in <code>{appDataPath}/logs/jellyseerr.log</code>.',
+    'You can also view these logs directly via <code>stdout</code>, or in <code>{appDataPath}/logs/overseerr.log</code>.',
  time: 'Timestamp',
  level: 'Severity',
  label: 'Label',
--- a/src/components/Settings/SettingsNetwork/index.tsx
+++ b/src/components/Settings/SettingsNetwork/index.tsx
@@ -27,6 +27,12 @@ const messages = defineMessages('components.Settings.SettingsNetwork', {
  trustProxy: 'Enable Proxy Support',
  trustProxyTip:
    'Allow Jellyseerr to correctly register client IP addresses behind a proxy',
+  forceIpv4First: 'IPv4 Resolution First',
+  forceIpv4FirstTip:
+    'Force Jellyseerr to resolve IPv4 addresses first instead of IPv6',
+  dnsServers: 'Custom DNS Servers',
+  dnsServersTip:
+    'Comma-separated list of custom DNS servers, e.g. "1.1.1.1,[2606:4700:4700::1111]"',
  proxyEnabled: 'HTTP(S) Proxy',
  proxyHostname: 'Proxy Hostname',
  proxyPort: 'Proxy Port',
@@ -38,16 +44,9 @@ const messages = defineMessages('components.Settings.SettingsNetwork', {
    "Use ',' as a separator, and '*.' as a wildcard for subdomains",
  proxyBypassLocalAddresses: 'Bypass Proxy for Local Addresses',
  validationProxyPort: 'You must provide a valid port',
-  advancedNetworkSettings: 'Advanced Network Settings',
-  networkDisclaimer:
-    'Network parameters from your container/system should be used instead of these settings. See the {docs} for more information.',
-  docs: 'documentation',
-  forceIpv4First: 'Force IPv4 Resolution First',
-  forceIpv4FirstTip:
-    'Force Jellyseerr to resolve IPv4 addresses first instead of IPv6',
 });

-const SettingsNetwork = () => {
+const SettingsMain = () => {
  const { addToast } = useToasts();
  const intl = useIntl();
  const {
@@ -90,6 +89,7 @@ const SettingsNetwork = () => {
          initialValues={{
            csrfProtection: data?.csrfProtection,
            forceIpv4First: data?.forceIpv4First,
+            dnsServers: data?.dnsServers,
            trustProxy: data?.trustProxy,
            proxyEnabled: data?.proxy?.enabled,
            proxyHostname: data?.proxy?.hostname,
@@ -112,6 +112,7 @@ const SettingsNetwork = () => {
                body: JSON.stringify({
                  csrfProtection: values.csrfProtection,
                  forceIpv4First: values.forceIpv4First,
+                  dnsServers: values.dnsServers,
                  trustProxy: values.trustProxy,
                  proxy: {
                    enabled: values.proxyEnabled,
@@ -205,6 +206,55 @@ const SettingsNetwork = () => {
                    </Tooltip>
                  </div>
                </div>
+                <div className="form-row">
+                  <label htmlFor="forceIpv4First" className="checkbox-label">
+                    <span className="mr-2">
+                      {intl.formatMessage(messages.forceIpv4First)}
+                    </span>
+                    <SettingsBadge badgeType="advanced" className="mr-2" />
+                    <SettingsBadge badgeType="restartRequired" />
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.forceIpv4FirstTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <Field
+                      type="checkbox"
+                      id="forceIpv4First"
+                      name="forceIpv4First"
+                      onChange={() => {
+                        setFieldValue('forceIpv4First', !values.forceIpv4First);
+                      }}
+                    />
+                  </div>
+                </div>
+                <div className="form-row">
+                  <label htmlFor="dnsServers" className="checkbox-label">
+                    <span className="mr-2">
+                      {intl.formatMessage(messages.dnsServers)}
+                    </span>
+                    <SettingsBadge badgeType="advanced" className="mr-2" />
+                    <SettingsBadge badgeType="restartRequired" />
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.dnsServersTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field">
+                      <Field
+                        id="dnsServers"
+                        name="dnsServers"
+                        type="text"
+                        inputMode="url"
+                      />
+                    </div>
+                    {errors.dnsServers &&
+                      touched.dnsServers &&
+                      typeof errors.dnsServers === 'string' && (
+                        <div className="error">{errors.dnsServers}</div>
+                      )}
+                  </div>
+                </div>
                <div className="form-row">
                  <label htmlFor="proxyEnabled" className="checkbox-label">
                    <span className="mr-2">
@@ -381,46 +431,6 @@ const SettingsNetwork = () => {
                    </div>
                  </>
                )}
-                <h3 className="heading mt-10">
-                  {intl.formatMessage(messages.advancedNetworkSettings)}
-                </h3>
-                <p className="description">
-                  {intl.formatMessage(messages.networkDisclaimer, {
-                    docs: (
-                      <a
-                        href="https://docs.jellyseerr.dev/troubleshooting"
-                        target="_blank"
-                        rel="noreferrer"
-                        className="text-white"
-                      >
-                        {intl.formatMessage(messages.docs)}
-                      </a>
-                    ),
-                  })}
-                </p>
-                <div className="form-row">
-                  <label htmlFor="forceIpv4First" className="checkbox-label">
-                    <span className="mr-2">
-                      {intl.formatMessage(messages.forceIpv4First)}
-                    </span>
-                    <SettingsBadge badgeType="advanced" className="mr-2" />
-                    <SettingsBadge badgeType="restartRequired" />
-                    <SettingsBadge badgeType="experimental" />
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.forceIpv4FirstTip)}
-                    </span>
-                  </label>
-                  <div className="form-input-area">
-                    <Field
-                      type="checkbox"
-                      id="forceIpv4First"
-                      name="forceIpv4First"
-                      onChange={() => {
-                        setFieldValue('forceIpv4First', !values.forceIpv4First);
-                      }}
-                    />
-                  </div>
-                </div>
                <div className="actions">
                  <div className="flex justify-end">
                    <span className="ml-3 inline-flex rounded-md shadow-sm">
@@ -448,4 +458,4 @@ const SettingsNetwork = () => {
  );
 };

-export default SettingsNetwork;
+export default SettingsMain;
--- a/src/components/Settings/SettingsPlex.tsx
+++ b/src/components/Settings/SettingsPlex.tsx
@@ -872,11 +872,6 @@ const SettingsPlex = ({ onComplete }: SettingsPlexProps) => {
                        id="tautulliPort"
                        name="tautulliPort"
                        className="short"
-                        autoComplete="off"
-                        data-form-type="other"
-                        data-1pignore="true"
-                        data-lpignore="true"
-                        data-bwignore="true"
                      />
                      {errors.tautulliPort &&
                        touched.tautulliPort &&
@@ -914,11 +909,6 @@ const SettingsPlex = ({ onComplete }: SettingsPlexProps) => {
                          inputMode="url"
                          id="tautulliUrlBase"
                          name="tautulliUrlBase"
-                          autoComplete="off"
-                          data-form-type="other"
-                          data-1pignore="true"
-                          data-lpignore="true"
-                          data-bwignore="true"
                        />
                      </div>
                      {errors.tautulliUrlBase &&
@@ -939,6 +929,7 @@ const SettingsPlex = ({ onComplete }: SettingsPlexProps) => {
                          as="field"
                          id="tautulliApiKey"
                          name="tautulliApiKey"
+                          autoComplete="one-time-code"
                        />
                      </div>
                      {errors.tautulliApiKey &&
@@ -959,11 +950,6 @@ const SettingsPlex = ({ onComplete }: SettingsPlexProps) => {
                          inputMode="url"
                          id="tautulliExternalUrl"
                          name="tautulliExternalUrl"
-                          autoComplete="off"
-                          data-form-type="other"
-                          data-1pignore="true"
-                          data-lpignore="true"
-                          data-bwignore="true"
                        />
                      </div>
                      {errors.tautulliExternalUrl &&
--- a/src/components/Settings/SettingsServices.tsx
+++ b/src/components/Settings/SettingsServices.tsx
@@ -7,7 +7,6 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import Modal from '@app/components/Common/Modal';
 import PageTitle from '@app/components/Common/PageTitle';
 import OverrideRuleModal from '@app/components/Settings/OverrideRule/OverrideRuleModal';
-import OverrideRuleTiles from '@app/components/Settings/OverrideRule/OverrideRuleTiles';
 import RadarrModal from '@app/components/Settings/RadarrModal';
 import SonarrModal from '@app/components/Settings/SonarrModal';
 import globalMessages from '@app/i18n/globalMessages';
@@ -15,7 +14,6 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import { PencilIcon, PlusIcon, TrashIcon } from '@heroicons/react/24/solid';
 import type OverrideRule from '@server/entity/OverrideRule';
-import type { OverrideRuleResultsResponse } from '@server/interfaces/api/overrideRuleInterfaces';
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import { Fragment, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -45,10 +43,6 @@ const messages = defineMessages('components.Settings', {
  mediaTypeMovie: 'movie',
  mediaTypeSeries: 'series',
  deleteServer: 'Delete {serverType} Server',
-  overrideRules: 'Override Rules',
-  overrideRulesDescription:
-    'Override rules allow you to specify properties that will be replaced if a request matches the rule.',
-  addrule: 'New Override Rule',
 });

 interface ServerInstanceProps {
@@ -119,8 +113,6 @@ const ServerInstance = ({
            <h3 className="truncate font-medium leading-5 text-white">
              <a
                href={serviceUrl}
-                target="_blank"
-                rel="noopener noreferrer"
                className="transition duration-300 hover:text-white hover:underline"
              >
                {name}
@@ -149,8 +141,6 @@ const ServerInstance = ({
            </span>
            <a
              href={internalUrl}
-              target="_blank"
-              rel="noopener noreferrer"
              className="transition duration-300 hover:text-white hover:underline"
            >
              {internalUrl}
@@ -163,12 +153,7 @@ const ServerInstance = ({
            {profileName}
          </p>
        </div>
-        <a
-          href={serviceUrl}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="opacity-50 hover:opacity-100"
-        >
+        <a href={serviceUrl} className="opacity-50 hover:opacity-100">
          {isSonarr ? (
            <SonarrLogo className="h-10 w-10 flex-shrink-0" />
          ) : (
@@ -214,8 +199,6 @@ const SettingsServices = () => {
    error: sonarrError,
    mutate: revalidateSonarr,
  } = useSWR<SonarrSettings[]>('/api/v1/settings/sonarr');
-  const { data: rules, mutate: revalidate } =
-    useSWR<OverrideRuleResultsResponse>('/api/v1/overrideRule');
  const [editRadarrModal, setEditRadarrModal] = useState<{
    open: boolean;
    radarr: RadarrSettings | null;
@@ -242,9 +225,11 @@ const SettingsServices = () => {
  const [overrideRuleModal, setOverrideRuleModal] = useState<{
    open: boolean;
    rule: OverrideRule | null;
+    testResponse: DVRTestResponse | null;
  }>({
    open: false,
    rule: null,
+    testResponse: null,
  });

  const deleteServer = async () => {
@@ -280,6 +265,21 @@ const SettingsServices = () => {
          })}
        </p>
      </div>
+      {overrideRuleModal.open && overrideRuleModal.testResponse && (
+        <OverrideRuleModal
+          rule={overrideRuleModal.rule}
+          onClose={() =>
+            setOverrideRuleModal({
+              open: false,
+              rule: null,
+              testResponse: null,
+            })
+          }
+          testResponse={overrideRuleModal.testResponse}
+          radarrId={editRadarrModal.radarr?.id}
+          sonarrId={editSonarrModal.sonarr?.id}
+        />
+      )}
      {editRadarrModal.open && (
        <RadarrModal
          radarr={editRadarrModal.radarr}
@@ -292,6 +292,8 @@ const SettingsServices = () => {
            mutate('/api/v1/settings/public');
            setEditRadarrModal({ open: false, radarr: null });
          }}
+          overrideRuleModal={overrideRuleModal}
+          setOverrideRuleModal={setOverrideRuleModal}
        />
      )}
      {editSonarrModal.open && (
@@ -306,6 +308,8 @@ const SettingsServices = () => {
            mutate('/api/v1/settings/public');
            setEditSonarrModal({ open: false, sonarr: null });
          }}
+          overrideRuleModal={overrideRuleModal}
+          setOverrideRuleModal={setOverrideRuleModal}
        />
      )}
      <Transition
@@ -503,60 +507,6 @@ const SettingsServices = () => {
          </>
        )}
      </div>
-      <div className="mt-10 mb-6">
-        <h3 className="heading">
-          {intl.formatMessage(messages.overrideRules)}
-        </h3>
-        <p className="description">
-          {intl.formatMessage(messages.overrideRulesDescription, {
-            serverType: 'Sonarr',
-          })}
-        </p>
-      </div>
-      <div className="section">
-        <ul className="grid max-w-6xl grid-cols-1 gap-6 lg:grid-cols-2 xl:grid-cols-3">
-          {rules && radarrData && sonarrData && (
-            <OverrideRuleTiles
-              rules={rules}
-              radarrServices={radarrData}
-              sonarrServices={sonarrData}
-              setOverrideRuleModal={setOverrideRuleModal}
-              revalidate={revalidate}
-            />
-          )}
-          <li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
-            <div className="flex h-full w-full items-center justify-center">
-              <Button
-                buttonType="ghost"
-                disabled={!radarrData?.length && !sonarrData?.length}
-                onClick={() =>
-                  setOverrideRuleModal({
-                    open: true,
-                    rule: null,
-                  })
-                }
-              >
-                <PlusIcon />
-                <span>{intl.formatMessage(messages.addrule)}</span>
-              </Button>
-            </div>
-          </li>
-        </ul>
-      </div>
-      {overrideRuleModal.open && radarrData && sonarrData && (
-        <OverrideRuleModal
-          rule={overrideRuleModal.rule}
-          onClose={() => {
-            setOverrideRuleModal({
-              open: false,
-              rule: null,
-            });
-            revalidate();
-          }}
-          radarrServices={radarrData}
-          sonarrServices={sonarrData}
-        />
-      )}
    </>
  );
 };
--- a/src/components/Settings/SettingsUsers/index.tsx
+++ b/src/components/Settings/SettingsUsers/index.tsx
@@ -1,5 +1,4 @@
 import Button from '@app/components/Common/Button';
-import LabeledCheckbox from '@app/components/Common/LabeledCheckbox';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import PageTitle from '@app/components/Common/PageTitle';
 import PermissionEdit from '@app/components/PermissionEdit';
@@ -14,7 +13,6 @@ import { Field, Form, Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR, { mutate } from 'swr';
-import * as yup from 'yup';

 const messages = defineMessages('components.Settings.SettingsUsers', {
  users: 'Users',
@@ -22,15 +20,9 @@ const messages = defineMessages('components.Settings.SettingsUsers', {
  userSettingsDescription: 'Configure global and default user settings.',
  toastSettingsSuccess: 'User settings saved successfully!',
  toastSettingsFailure: 'Something went wrong while saving settings.',
-  loginMethods: 'Login Methods',
-  loginMethodsTip: 'Configure login methods for users.',
  localLogin: 'Enable Local Sign-In',
  localLoginTip:
-    'Allow users to sign in using their email address and password',
-  mediaServerLogin: 'Enable {mediaServerName} Sign-In',
-  mediaServerLoginTip:
-    'Allow users to sign in using their {mediaServerName} account',
-  atLeastOneAuth: 'At least one authentication method must be selected.',
+    'Allow users to sign in using their email address and password, instead of {mediaServerName} OAuth',
  newPlexLogin: 'Enable New {mediaServerName} Sign-In',
  newPlexLoginTip:
    'Allow {mediaServerName} users to sign in without first being imported',
@@ -50,27 +42,6 @@ const SettingsUsers = () => {
  } = useSWR<MainSettings>('/api/v1/settings/main');
  const settings = useSettings();

-  const schema = yup
-    .object()
-    .shape({
-      localLogin: yup.boolean(),
-      mediaServerLogin: yup.boolean(),
-    })
-    .test({
-      name: 'atLeastOneAuth',
-      test: function (values) {
-        const isValid = ['localLogin', 'mediaServerLogin'].some(
-          (field) => !!values[field]
-        );
-
-        if (isValid) return true;
-        return this.createError({
-          path: 'localLogin | mediaServerLogin',
-          message: intl.formatMessage(messages.atLeastOneAuth),
-        });
-      },
-    });
-
  if (!data && !error) {
    return <LoadingSpinner />;
  }
@@ -81,8 +52,6 @@ const SettingsUsers = () => {
        ? 'Jellyfin'
        : settings.currentSettings.mediaServerType === MediaServerType.EMBY
        ? 'Emby'
-        : settings.currentSettings.mediaServerType === MediaServerType.PLEX
-        ? 'Plex'
        : undefined,
  };

@@ -104,7 +73,6 @@ const SettingsUsers = () => {
        <Formik
          initialValues={{
            localLogin: data?.localLogin,
-            mediaServerLogin: data?.mediaServerLogin,
            newPlexLogin: data?.newPlexLogin,
            movieQuotaLimit: data?.defaultQuotas.movie.quotaLimit ?? 0,
            movieQuotaDays: data?.defaultQuotas.movie.quotaDays ?? 7,
@@ -112,7 +80,6 @@ const SettingsUsers = () => {
            tvQuotaDays: data?.defaultQuotas.tv.quotaDays ?? 7,
            defaultPermissions: data?.defaultPermissions ?? 0,
          }}
-          validationSchema={schema}
          enableReinitialize
          onSubmit={async (values) => {
            try {
@@ -123,7 +90,6 @@ const SettingsUsers = () => {
                },
                body: JSON.stringify({
                  localLogin: values.localLogin,
-                  mediaServerLogin: values.mediaServerLogin,
                  newPlexLogin: values.newPlexLogin,
                  defaultQuotas: {
                    movie: {
@@ -155,61 +121,30 @@ const SettingsUsers = () => {
            }
          }}
        >
-          {({ isSubmitting, isValid, values, errors, setFieldValue }) => {
+          {({ isSubmitting, values, setFieldValue }) => {
            return (
              <Form className="section">
-                <div
-                  role="group"
-                  aria-labelledby="group-label"
-                  className="form-group"
-                >
-                  <div className="form-row">
-                    <span id="group-label" className="group-label">
-                      {intl.formatMessage(messages.loginMethods)}
-                      <span className="label-tip">
-                        {intl.formatMessage(messages.loginMethodsTip)}
-                      </span>
-                      {'localLogin | mediaServerLogin' in errors && (
-                        <span className="error">
-                          {errors['localLogin | mediaServerLogin'] as string}
-                        </span>
+                <div className="form-row">
+                  <label htmlFor="localLogin" className="checkbox-label">
+                    {intl.formatMessage(messages.localLogin)}
+                    <span className="label-tip">
+                      {intl.formatMessage(
+                        messages.localLoginTip,
+                        mediaServerFormatValues
                      )}
                    </span>
-
-                    <div className="form-input-area max-w-lg">
-                      <LabeledCheckbox
-                        id="localLogin"
-                        label={intl.formatMessage(messages.localLogin)}
-                        description={intl.formatMessage(
-                          messages.localLoginTip,
-                          mediaServerFormatValues
-                        )}
-                        onChange={() =>
-                          setFieldValue('localLogin', !values.localLogin)
-                        }
-                      />
-                      <LabeledCheckbox
-                        id="mediaServerLogin"
-                        className="mt-4"
-                        label={intl.formatMessage(
-                          messages.mediaServerLogin,
-                          mediaServerFormatValues
-                        )}
-                        description={intl.formatMessage(
-                          messages.mediaServerLoginTip,
-                          mediaServerFormatValues
-                        )}
-                        onChange={() =>
-                          setFieldValue(
-                            'mediaServerLogin',
-                            !values.mediaServerLogin
-                          )
-                        }
-                      />
-                    </div>
+                  </label>
+                  <div className="form-input-area">
+                    <Field
+                      type="checkbox"
+                      id="localLogin"
+                      name="localLogin"
+                      onChange={() => {
+                        setFieldValue('localLogin', !values.localLogin);
+                      }}
+                    />
                  </div>
                </div>
-
                <div className="form-row">
                  <label htmlFor="newPlexLogin" className="checkbox-label">
                    {intl.formatMessage(
@@ -294,7 +229,7 @@ const SettingsUsers = () => {
                      <Button
                        buttonType="primary"
                        type="submit"
-                        disabled={isSubmitting || !isValid}
+                        disabled={isSubmitting}
                      >
                        <ArrowDownOnSquareIcon />
                        <span>
--- a/src/components/Settings/SonarrModal/index.tsx
+++ b/src/components/Settings/SonarrModal/index.tsx
@@ -1,9 +1,17 @@
+import Button from '@app/components/Common/Button';
 import Modal from '@app/components/Common/Modal';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
-import type { SonarrTestResponse } from '@app/components/Settings/SettingsServices';
+import OverrideRuleTile from '@app/components/Settings/OverrideRule/OverrideRuleTile';
+import type {
+  DVRTestResponse,
+  SonarrTestResponse,
+} from '@app/components/Settings/SettingsServices';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
+import { PlusIcon } from '@heroicons/react/24/solid';
+import type OverrideRule from '@server/entity/OverrideRule';
+import type { OverrideRuleResultsResponse } from '@server/interfaces/api/overrideRuleInterfaces';
 import type { SonarrSettings } from '@server/lib/settings';
 import { Field, Formik } from 'formik';
 import { useCallback, useEffect, useRef, useState } from 'react';
@@ -11,6 +19,7 @@ import { useIntl } from 'react-intl';
 import type { OnChangeValue } from 'react-select';
 import Select from 'react-select';
 import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
 import * as Yup from 'yup';

 type OptionType = {
@@ -76,16 +85,36 @@ const messages = defineMessages('components.Settings.SonarrModal', {
  animeTags: 'Anime Tags',
  notagoptions: 'No tags.',
  selecttags: 'Select tags',
+  overrideRules: 'Override Rules',
+  addrule: 'New Override Rule',
 });

 interface SonarrModalProps {
  sonarr: SonarrSettings | null;
  onClose: () => void;
  onSave: () => void;
+  overrideRuleModal: { open: boolean; rule: OverrideRule | null };
+  setOverrideRuleModal: ({
+    open,
+    rule,
+    testResponse,
+  }: {
+    open: boolean;
+    rule: OverrideRule | null;
+    testResponse: DVRTestResponse;
+  }) => void;
 }

-const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
+const SonarrModal = ({
+  onClose,
+  sonarr,
+  onSave,
+  overrideRuleModal,
+  setOverrideRuleModal,
+}: SonarrModalProps) => {
  const intl = useIntl();
+  const { data: rules, mutate: revalidate } =
+    useSWR<OverrideRuleResultsResponse>('/api/v1/overrideRule');
  const initialLoad = useRef(false);
  const { addToast } = useToasts();
  const [isValidated, setIsValidated] = useState(sonarr ? true : false);
@@ -215,6 +244,10 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
    }
  }, [sonarr, testConnection]);

+  useEffect(() => {
+    revalidate();
+  }, [overrideRuleModal, revalidate]);
+
  return (
    <Transition
      as="div"
@@ -382,6 +415,7 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                      values.is4k ? messages.edit4ksonarr : messages.editsonarr
                    )
              }
+              backgroundClickable={!overrideRuleModal.open}
            >
              <div className="mb-6">
                <div className="form-row">
@@ -415,11 +449,6 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                        id="name"
                        name="name"
                        type="text"
-                        autoComplete="off"
-                        data-form-type="other"
-                        data-1pignore="true"
-                        data-lpignore="true"
-                        data-bwignore="true"
                        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                          setIsValidated(false);
                          setFieldValue('name', e.target.value);
@@ -513,6 +542,7 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                        as="field"
                        id="apiKey"
                        name="apiKey"
+                        autoComplete="one-time-code"
                        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                          setIsValidated(false);
                          setFieldValue('apiKey', e.target.value);
@@ -1040,6 +1070,42 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                  </div>
                </div>
              </div>
+              {sonarr && (
+                <>
+                  <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
+                    {intl.formatMessage(messages.overrideRules)}
+                  </h3>
+                  <ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
+                    {rules && (
+                      <OverrideRuleTile
+                        rules={rules}
+                        setOverrideRuleModal={setOverrideRuleModal}
+                        testResponse={testResponse}
+                        sonarr={sonarr}
+                        revalidate={revalidate}
+                      />
+                    )}
+                    <li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
+                      <div className="flex h-full w-full items-center justify-center">
+                        <Button
+                          buttonType="ghost"
+                          onClick={() =>
+                            setOverrideRuleModal({
+                              open: true,
+                              rule: null,
+                              testResponse,
+                            })
+                          }
+                          disabled={!isValidated}
+                        >
+                          <PlusIcon />
+                          <span>{intl.formatMessage(messages.addrule)}</span>
+                        </Button>
+                      </div>
+                    </li>
+                  </ul>
+                </>
+              )}
            </Modal>
          );
        }}
--- a/Show More
+++ b/Show More