refactor: clean the rate limit utility

fix(jellyfinapi): add missing argument in JellyfinAPI constructor
feat: set IPv4 first as an option
2024-07-13 20:31:31 +02:00 · 2024-07-13 02:03:46 +02:00 · 2024-07-11 16:33:33 +02:00 · 2024-07-11 15:48:45 +02:00 · 2024-07-11 15:48:43 +02:00 · 2024-07-11 15:48:43 +02:00
104 changed files with 2333 additions and 5891 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -403,42 +403,6 @@
      "contributions": [
        "doc"
      ]
-    },
-    {
-      "login": "mobihen",
-      "name": "Nir Israel Hen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/35529491?v=4",
-      "profile": "https://mobihen.com",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "XDark187",
-      "name": "Baraa",
-      "avatar_url": "https://avatars.githubusercontent.com/u/39034192?v=4",
-      "profile": "https://github.com/XDark187",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "franciscofsales",
-      "name": "Francisco Sales",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7977645?v=4",
-      "profile": "https://github.com/franciscofsales",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "myselfolli",
-      "name": "Oliver Laing",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37535998?v=4",
-      "profile": "https://github.com/myselfolli",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Global code ownership
-*                               @Fallenbagel @gauthier-th
+*                               @Fallenbagel
--- a/README.md
+++ b/README.md
@@ -8,10 +8,10 @@
 <p align="center">
 <a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/discord/952656177924300932" alt="Discord"></a>
 <a href="https://hub.docker.com/r/fallenbagel/jellyseerr"><img src="https://img.shields.io/docker/pulls/fallenbagel/jellyseerr" alt="Docker pulls"></a>
-<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="http://jellyseerr.borgcube.de/engage/jellyseerr/"><img src="http://jellyseerr.borgcube.de/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-47-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -137,15 +137,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <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>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=ThowZzy" 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>
-    </tr>
-    <tr>
-      <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>
-      <td align="center" valign="top" width="14.28%"><a href="https://mobihen.com"><img src="https://avatars.githubusercontent.com/u/35529491?v=4?s=100" width="100px;" alt="Nir Israel Hen"/><br /><sub><b>Nir Israel Hen</b></sub></a><br /><a href="#translation-mobihen" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/XDark187"><img src="https://avatars.githubusercontent.com/u/39034192?v=4?s=100" width="100px;" alt="Baraa"/><br /><sub><b>Baraa</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=XDark187" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/franciscofsales"><img src="https://avatars.githubusercontent.com/u/7977645?v=4?s=100" width="100px;" alt="Francisco Sales"/><br /><sub><b>Francisco Sales</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=franciscofsales" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/myselfolli"><img src="https://avatars.githubusercontent.com/u/37535998?v=4?s=100" width="100px;" alt="Oliver Laing"/><br /><sub><b>Oliver Laing</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=myselfolli" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
--- a/cypress/e2e/user/user-list.cy.ts
+++ b/cypress/e2e/user/user-list.cy.ts
@@ -1,5 +1,5 @@
 const testUser = {
-  username: 'Test User',
+  displayName: 'Test User',
  emailAddress: 'test@seeerr.dev',
  password: 'test1234',
 };
@@ -32,7 +32,7 @@ describe('User List', () => {

    cy.get('[data-testid=modal-title]').should('contain', 'Create Local User');

-    cy.get('#username').type(testUser.username);
+    cy.get('#displayName').type(testUser.displayName);
    cy.get('#email').type(testUser.emailAddress);
    cy.get('#password').type(testUser.password);

--- a/docs/getting-started/buildfromsource.mdx
+++ b/docs/getting-started/buildfromsource.mdx
@@ -248,7 +248,6 @@ git checkout main
 ```
 3. Install the dependencies:
 ```powershell
-npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && yarn install --frozen-lockfile --network-timeout 1000000
 ```
 4. Build the project:
@@ -273,7 +272,6 @@ git checkout develop # by default, you are on the develop branch so this step is
 ```
 3. Install the dependencies:
 ```powershell
-npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
 ```
 4. Build the project:
--- a/docs/getting-started/nixpkg.mdx
+++ b/docs/getting-started/nixpkg.mdx
@@ -22,7 +22,7 @@ export const VersionMismatchWarning = () => {
    <>
      {!isUpToDate ? (
        <Admonition type="warning">
-          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package-derivation">override the package derivation</a>.
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package">override the package derivation</a>.
        </Admonition>
      ) : (
        <Admonition type="success">
@@ -95,12 +95,12 @@ export const VersionMatch = () => {
      };

      offlineCache = pkgs.fetchYarnDeps {
-        sha256 = pkgs.lib.fakeSha256;
+        sha256 = pkgs.lib.fakeSha256; 
      };
-    });
+    }); 
  };
 }`;
-
+ 
  const module = `{ config, pkgs, lib, ... }:

 with lib;
--- a/docs/using-jellyseerr/settings/general.md
+++ b/docs/using-jellyseerr/settings/general.md
@@ -12,8 +12,6 @@ This is your Jellyseerr API key, which can be used to integrate Jellyseerr with

 If you need to generate a new API key for any reason, simply click the button to the right of the text box.

-If you want to set the API key, rather than letting it be randomly generated, you can use the API_KEY environment variable. Whatever that variable is set to will be your API key.
-
 ## Application Title

 If you aren't a huge fan of the name "Jellyseerr" and would like to display something different to your users, you can customize the application title!
--- a/docs/using-jellyseerr/users/editing-users.md
+++ b/docs/using-jellyseerr/users/editing-users.md
@@ -35,7 +35,7 @@ Users can override the [global display language](/using-jellyseerr/settings/gene

 ### Discover Region & Discover Language

-Users can override the [global filter settings](/using-jellyseerr/settings/general#discover-region--discover-language) to suit their own preferences.
+Users can override the [global filter settings](/using-jellyseerr/settings/general#discover-region-and-discover-language) to suit their own preferences.

 ### Movie Request Limit & Series Request Limit

--- a/next.config.js
+++ b/next.config.js
@@ -6,6 +6,10 @@ module.exports = {
    commitTag: process.env.COMMIT_TAG || 'local',
    forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
  },
+  publicRuntimeConfig: {
+    // Will be available on both server and client
+    JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
+  },
  images: {
    remotePatterns: [
      { hostname: 'gravatar.com' },
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -3586,8 +3586,6 @@ paths:
                  type: string
                email:
                  type: string
-                serverType:
-                  type: number
              required:
                - username
                - password
@@ -4864,11 +4862,6 @@ paths:
          schema:
            type: string
            example: 8|9
-        - in: query
-          name: status
-          schema:
-            type: string
-            example: 3|4
      responses:
        '200':
          description: Results
--- a/server/api/externalapi.ts
+++ b/server/api/externalapi.ts
@@ -68,10 +68,7 @@ class ExternalAPI {
    if (!response.ok) {
      const text = await response.text();
      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`
      );
    }
    const data = await this.getDataFromResponse(response);
@@ -85,7 +82,7 @@ class ExternalAPI {

  protected async post<T>(
    endpoint: string,
-    data?: Record<string, unknown>,
+    data: Record<string, unknown>,
    params?: Record<string, string>,
    ttl?: number,
    config?: RequestInit
@@ -107,17 +104,8 @@ class ExternalAPI {
        ...this.defaultHeaders,
        ...config?.headers,
      },
-      body: data ? JSON.stringify(data) : undefined,
+      body: JSON.stringify(data),
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const resData = await this.getDataFromResponse(response);

    if (this.cache) {
@@ -153,15 +141,6 @@ class ExternalAPI {
      },
      body: JSON.stringify(data),
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const resData = await this.getDataFromResponse(response);

    if (this.cache) {
@@ -178,22 +157,12 @@ class ExternalAPI {
  ): Promise<T> {
    const url = this.formatUrl(endpoint, params);
    const response = await this.fetch(url, {
-      method: 'DELETE',
      ...config,
      headers: {
        ...this.defaultHeaders,
        ...config?.headers,
      },
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const data = await this.getDataFromResponse(response);

    return data;
@@ -228,17 +197,6 @@ class ExternalAPI {
            ...config?.headers,
          },
        }).then(async (response) => {
-          if (!response.ok) {
-            const text = await response.text();
-            throw new Error(
-              `${response.status} ${response.statusText}${
-                text ? ': ' + text : ''
-              }`,
-              {
-                cause: response,
-              }
-            );
-          }
          const data = await this.getDataFromResponse(response);
          this.cache?.set(cacheKey, data, ttl ?? DEFAULT_TTL);
        });
@@ -254,15 +212,6 @@ class ExternalAPI {
        ...config?.headers,
      },
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const data = await this.getDataFromResponse(response);

    if (this.cache) {
@@ -286,12 +235,7 @@ class ExternalAPI {
      ...this.params,
      ...params,
    });
-    return (
-      href +
-      (searchParams.toString().length
-        ? '?' + searchParams.toString()
-        : searchParams.toString())
-    );
+    return `${href}?${searchParams.toString()}`;
  }

  private serializeCacheKey(
@@ -306,24 +250,20 @@ class ExternalAPI {
  }

  private async getDataFromResponse(response: Response) {
-    const contentType = response.headers.get('Content-Type');
-    if (contentType?.includes('application/json')) {
+    const contentType = response.headers.get('Content-Type')?.split(';')[0];
+    if (contentType === 'application/json') {
      return await response.json();
    } else if (
-      contentType?.includes('application/xml') ||
-      contentType?.includes('text/html') ||
-      contentType?.includes('text/plain')
+      contentType === 'application/xml' ||
+      contentType === 'text/html' ||
+      contentType === 'text/plain'
    ) {
      return await response.text();
    } else {
      try {
        return await response.json();
      } catch {
-        try {
-          return await response.blob();
-        } catch {
-          return null;
-        }
+        return await response.blob();
      }
    }
  }
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -93,7 +93,9 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
 }

 class JellyfinAPI extends ExternalAPI {
+  private authToken?: string;
  private userId?: string;
+  private jellyfinHost: string;

  constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
    let authHeaderVal: string;
@@ -112,6 +114,9 @@ class JellyfinAPI extends ExternalAPI {
        },
      }
    );
+
+    this.jellyfinHost = jellyfinHost;
+    this.authToken = authToken;
  }

  public async login(
@@ -147,7 +152,7 @@ class JellyfinAPI extends ExternalAPI {
    try {
      return await authenticate(false);
    } catch (e) {
-      const status = e.cause?.status;
+      const status = e.response?.status;

      const networkErrorCodes = new Set([
        'ECONNREFUSED',
@@ -185,7 +190,7 @@ class JellyfinAPI extends ExternalAPI {

      return systemInfoResponse;
    } catch (e) {
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -202,7 +207,7 @@ class JellyfinAPI extends ExternalAPI {
        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.Unknown);
+      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
    }
  }

@@ -217,7 +222,7 @@ class JellyfinAPI extends ExternalAPI {
        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -233,7 +238,7 @@ class JellyfinAPI extends ExternalAPI {
        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -312,7 +317,7 @@ class JellyfinAPI extends ExternalAPI {
        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -333,7 +338,7 @@ class JellyfinAPI extends ExternalAPI {
        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -348,7 +353,7 @@ class JellyfinAPI extends ExternalAPI {
      return itemResponse;
    } catch (e) {
      if (availabilitySync.running) {
-        if (e.cause?.status === 500) {
+        if (e.response && e.response.status === 500) {
          return undefined;
        }
      }
@@ -357,7 +362,7 @@ class JellyfinAPI extends ExternalAPI {
        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -372,7 +377,7 @@ class JellyfinAPI extends ExternalAPI {
        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -397,23 +402,6 @@ class JellyfinAPI extends ExternalAPI {
        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
-    }
-  }
-
-  public async createApiToken(appName: string): Promise<string> {
-    try {
-      await this.post(`/Auth/Keys?App=${appName}`);
-      const apiKeys = await this.get<any>(`/Auth/Keys`);
-      return apiKeys.Items.reverse().find(
-        (item: any) => item.AppName === appName
-      ).AccessToken;
-    } catch (e) {
-      logger.error(
-        `Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
-      );
-
      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
--- a/server/api/rating/imdbRadarrProxy.ts
+++ b/server/api/rating/imdbRadarrProxy.ts
@@ -175,11 +175,7 @@ class IMDBRadarrProxy extends ExternalAPI {
        `/movie/imdb/${IMDBid}`
      );

-      if (
-        !data?.length ||
-        data[0].ImdbId !== IMDBid ||
-        !data[0].MovieRatings.Imdb
-      ) {
+      if (!data?.length || data[0].ImdbId !== IMDBid) {
        return null;
      }

--- a/server/api/servarr/radarr.ts
+++ b/server/api/servarr/radarr.ts
@@ -179,20 +179,13 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
      }
      return data;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error(
        'Failed to add movie to Radarr. This might happen if the movie already exists, in which case you can safely ignore this error.',
        {
          label: 'Radarr',
          errorMessage: e.message,
          options,
-          response: errorData,
+          response: e?.response?.data,
        }
      );
      throw new Error('Failed to add movie to Radarr');
--- a/server/api/servarr/sonarr.ts
+++ b/server/api/servarr/sonarr.ts
@@ -257,18 +257,11 @@ class SonarrAPI extends ServarrBase<{

      return createdSeriesData;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Something went wrong while adding a series to Sonarr.', {
        label: 'Sonarr API',
        errorMessage: e.message,
        options,
-        response: errorData,
+        response: e?.response?.data,
      });
      throw new Error('Failed to add series');
    }
@@ -303,10 +296,10 @@ class SonarrAPI extends ServarrBase<{
    });

    try {
-      await this.runCommand('MissingEpisodeSearch', { seriesId });
+      await this.runCommand('SeriesSearch', { seriesId });
    } catch (e) {
      logger.error(
-        'Something went wrong while executing Sonarr missing episode search.',
+        'Something went wrong while executing Sonarr series search.',
        {
          label: 'Sonarr API',
          errorMessage: e.message,
--- a/server/api/themoviedb/index.ts
+++ b/server/api/themoviedb/index.ts
@@ -95,7 +95,6 @@ interface DiscoverTvOptions {
  sortBy?: SortOptions;
  watchRegion?: string;
  watchProviders?: string;
-  withStatus?: string; // Returning Series: 0 Planned: 1 In Production: 2 Ended: 3 Cancelled: 4 Pilot: 5
 }

 class TheMovieDb extends ExternalAPI {
@@ -524,7 +523,6 @@ class TheMovieDb extends ExternalAPI {
    voteCountLte,
    watchProviders,
    watchRegion,
-    withStatus,
  }: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
    try {
      const defaultFutureDate = new Date(
@@ -572,7 +570,6 @@ class TheMovieDb extends ExternalAPI {
        'vote_count.lte': voteCountLte || '',
        with_watch_providers: watchProviders || '',
        watch_region: watchRegion || '',
-        with_status: withStatus || '',
      });

      return data;
--- a/server/constants/error.ts
+++ b/server/constants/error.ts
@@ -2,7 +2,6 @@ export enum ApiErrorCode {
  InvalidUrl = 'INVALID_URL',
  InvalidCredentials = 'INVALID_CREDENTIALS',
  InvalidAuthToken = 'INVALID_AUTH_TOKEN',
-  InvalidEmail = 'INVALID_EMAIL',
  NotAdmin = 'NOT_ADMIN',
  SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
  SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
--- a/server/constants/server.ts
+++ b/server/constants/server.ts
@@ -4,8 +4,3 @@ export enum MediaServerType {
  EMBY,
  NOT_CONFIGURED,
 }
-
-export enum ServerType {
-  JELLYFIN = 'Jellyfin',
-  EMBY = 'Emby',
-}
--- a/server/constants/user.ts
+++ b/server/constants/user.ts
@@ -2,5 +2,4 @@ export enum UserType {
  PLEX = 1,
  LOCAL = 2,
  JELLYFIN = 3,
-  EMBY = 4,
 }
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -211,10 +211,9 @@ class Media {
      }
    } else {
      const pageName =
-        getSettings().main.mediaServerType == MediaServerType.EMBY
-          ? 'item'
-          : 'details';
+        process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
      const { serverId, externalHostname } = getSettings().jellyfin;
+
      const jellyfinHost =
        externalHostname && externalHostname.length > 0
          ? externalHostname
--- a/server/index.ts
+++ b/server/index.ts
@@ -63,7 +63,7 @@ app
    }

    // Load Settings
-    const settings = await getSettings().load();
+    const settings = getSettings();
    restartFlag.initializeSettings(settings.main);

    // Migrate library types
--- a/server/interfaces/api/common.ts
+++ b/server/interfaces/api/common.ts
@@ -8,16 +8,3 @@ interface PageInfo {
 export interface PaginatedResponse {
  pageInfo: PageInfo;
 }
-
-/**
- * Get the keys of an object that are not functions
- */
-type NonFunctionPropertyNames<T> = {
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  [K in keyof T]: T[K] extends Function ? never : K;
-}[keyof T];
-
-/**
- * Get the properties of an object that are not functions
- */
-export type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;
--- a/server/interfaces/api/requestInterfaces.ts
+++ b/server/interfaces/api/requestInterfaces.ts
@@ -1,9 +1,9 @@
 import type { MediaType } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties, PaginatedResponse } from './common';
+import type { PaginatedResponse } from './common';

 export interface RequestResultsResponse extends PaginatedResponse {
-  results: NonFunctionProperties<MediaRequest>[];
+  results: MediaRequest[];
 }

 export type MediaRequestBody = {
@@ -14,7 +14,6 @@ export type MediaRequestBody = {
  is4k?: boolean;
  serverId?: number;
  profileId?: number;
-  profileName?: string;
  rootFolder?: string;
  languageProfileId?: number;
  userId?: number;
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -63,7 +63,12 @@ class AvailabilitySync {
      ) {
        admin = await userRepository.findOne({
          where: { id: 1 },
-          select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+          select: [
+            'id',
+            'jellyfinAuthToken',
+            'jellyfinUserId',
+            'jellyfinDeviceId',
+          ],
          order: { id: 'ASC' },
        });
      }
@@ -81,7 +86,7 @@ class AvailabilitySync {
          if (admin) {
            this.jellyfinClient = new JellyfinAPI(
              getHostname(),
-              settings.jellyfin.apiKey,
+              admin.jellyfinAuthToken,
              admin.jellyfinDeviceId
            );

--- a/server/lib/downloadtracker.ts
+++ b/server/lib/downloadtracker.ts
@@ -20,7 +20,6 @@ export interface DownloadingItem {
  timeLeft: string;
  estimatedCompletionTime: Date;
  title: string;
-  downloadId: string;
  episode?: EpisodeNumberResult;
 }

@@ -96,7 +95,6 @@ class DownloadTracker {
              status: item.status,
              timeLeft: item.timeleft,
              title: item.title,
-              downloadId: item.downloadId,
            }));

            if (queueItems.length > 0) {
@@ -174,7 +172,6 @@ class DownloadTracker {
              timeLeft: item.timeleft,
              title: item.title,
              episode: item.episode,
-              downloadId: item.downloadId,
            }));

            if (queueItems.length > 0) {
--- a/server/lib/notifications/agents/discord.ts
+++ b/server/lib/notifications/agents/discord.ts
@@ -291,7 +291,7 @@ class DiscordAgent
        }
      }

-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
@@ -305,25 +305,15 @@ class DiscordAgent
          content: userMentions.join(' '),
        } as DiscordWebhookPayload),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending Discord notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/gotify.ts
+++ b/server/lib/notifications/agents/gotify.ts
@@ -132,32 +132,22 @@ class GotifyAgent
      const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
      const notificationPayload = this.getNotificationPayload(type, payload);

-      const response = await fetch(endpoint, {
+      await fetch(endpoint, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
        },
        body: JSON.stringify(notificationPayload),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending Gotify notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/lunasea.ts
+++ b/server/lib/notifications/agents/lunasea.ts
@@ -100,7 +100,7 @@ class LunaSeaAgent
    });

    try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: settings.options.profileName
          ? {
@@ -114,25 +114,15 @@ class LunaSeaAgent
            },
        body: JSON.stringify(this.buildPayload(type, payload)),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending LunaSea notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/pushbullet.ts
+++ b/server/lib/notifications/agents/pushbullet.ts
@@ -122,7 +122,7 @@ class PushbulletAgent
      });

      try {
-        const response = await fetch(endpoint, {
+        await fetch(endpoint, {
          method: 'POST',
          headers: {
            'Content-Type': 'application/json',
@@ -133,23 +133,13 @@ class PushbulletAgent
            channel_tag: settings.options.channelTag,
          }),
        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
      } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
        logger.error('Error sending Pushbullet notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
        });

        return false;
@@ -174,7 +164,7 @@ class PushbulletAgent
        });

        try {
-          const response = await fetch(endpoint, {
+          await fetch(endpoint, {
            method: 'POST',
            headers: {
              'Content-Type': 'application/json',
@@ -182,24 +172,14 @@ class PushbulletAgent
            },
            body: JSON.stringify(notificationPayload),
          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
        } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
          logger.error('Error sending Pushbullet notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
          });

          return false;
@@ -235,7 +215,7 @@ class PushbulletAgent
              });

              try {
-                const response = await fetch(endpoint, {
+                await fetch(endpoint, {
                  method: 'POST',
                  headers: {
                    'Content-Type': 'application/json',
@@ -243,24 +223,14 @@ class PushbulletAgent
                  },
                  body: JSON.stringify(notificationPayload),
                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
              } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                logger.error('Error sending Pushbullet notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                });

                return false;
--- a/server/lib/notifications/agents/pushover.ts
+++ b/server/lib/notifications/agents/pushover.ts
@@ -52,9 +52,6 @@ class PushoverAgent
  ): Promise<Partial<PushoverImagePayload>> {
    try {
      const response = await fetch(imageUrl);
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
      const arrayBuffer = await response.arrayBuffer();
      const base64 = Buffer.from(arrayBuffer).toString('base64');
      const contentType = (
@@ -67,17 +64,10 @@ class PushoverAgent
        attachment_type: contentType,
      };
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error getting image payload', {
        label: 'Notifications',
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });
      return {};
    }
@@ -210,7 +200,7 @@ class PushoverAgent
      });

      try {
-        const response = await fetch(endpoint, {
+        await fetch(endpoint, {
          method: 'POST',
          headers: {
            'Content-Type': 'application/json',
@@ -222,23 +212,13 @@ class PushoverAgent
            sound: settings.options.sound,
          } as PushoverPayload),
        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
      } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
        logger.error('Error sending Pushover notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
        });

        return false;
@@ -266,7 +246,7 @@ class PushoverAgent
        });

        try {
-          const response = await fetch(endpoint, {
+          await fetch(endpoint, {
            method: 'POST',
            headers: {
              'Content-Type': 'application/json',
@@ -278,24 +258,14 @@ class PushoverAgent
              sound: payload.notifyUser.settings.pushoverSound,
            } as PushoverPayload),
          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
        } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
          logger.error('Error sending Pushover notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
          });

          return false;
@@ -332,7 +302,7 @@ class PushoverAgent
              });

              try {
-                const response = await fetch(endpoint, {
+                await fetch(endpoint, {
                  method: 'POST',
                  headers: {
                    'Content-Type': 'application/json',
@@ -343,24 +313,14 @@ class PushoverAgent
                    user: user.settings.pushoverUserKey,
                  } as PushoverPayload),
                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
              } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                logger.error('Error sending Pushover notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                });

                return false;
--- a/server/lib/notifications/agents/slack.ts
+++ b/server/lib/notifications/agents/slack.ts
@@ -237,32 +237,22 @@ class SlackAgent
      subject: payload.subject,
    });
    try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
        },
        body: JSON.stringify(this.buildEmbed(type, payload)),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending Slack notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/telegram.ts
+++ b/server/lib/notifications/agents/telegram.ts
@@ -174,7 +174,7 @@ class TelegramAgent
      });

      try {
-        const response = await fetch(endpoint, {
+        await fetch(endpoint, {
          method: 'POST',
          headers: {
            'Content-Type': 'application/json',
@@ -185,23 +185,13 @@ class TelegramAgent
            disable_notification: !!settings.options.sendSilently,
          } as TelegramMessagePayload | TelegramPhotoPayload),
        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
      } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
        logger.error('Error sending Telegram notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
        });

        return false;
@@ -225,7 +215,7 @@ class TelegramAgent
        });

        try {
-          const response = await fetch(endpoint, {
+          await fetch(endpoint, {
            method: 'POST',
            headers: {
              'Content-Type': 'application/json',
@@ -237,24 +227,14 @@ class TelegramAgent
                !!payload.notifyUser.settings.telegramSendSilently,
            } as TelegramMessagePayload | TelegramPhotoPayload),
          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
        } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
          logger.error('Error sending Telegram notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
          });

          return false;
@@ -288,7 +268,7 @@ class TelegramAgent
              });

              try {
-                const response = await fetch(endpoint, {
+                await fetch(endpoint, {
                  method: 'POST',
                  headers: {
                    'Content-Type': 'application/json',
@@ -299,24 +279,14 @@ class TelegramAgent
                    disable_notification: !!user.settings?.telegramSendSilently,
                  } as TelegramMessagePayload | TelegramPhotoPayload),
                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
              } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                logger.error('Error sending Telegram notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                });

                return false;
--- a/server/lib/notifications/agents/webhook.ts
+++ b/server/lib/notifications/agents/webhook.ts
@@ -177,7 +177,7 @@ class WebhookAgent
    });

    try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
@@ -187,25 +187,15 @@ class WebhookAgent
        },
        body: JSON.stringify(this.buildPayload(type, payload)),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending webhook notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -567,10 +567,7 @@ class JellyfinScanner {
  public async run(): Promise<void> {
    const settings = getSettings();

-    if (
-      settings.main.mediaServerType != MediaServerType.JELLYFIN &&
-      settings.main.mediaServerType != MediaServerType.EMBY
-    ) {
+    if (settings.main.mediaServerType != MediaServerType.JELLYFIN) {
      return;
    }

@@ -585,7 +582,12 @@ class JellyfinScanner {
      const userRepository = getRepository(User);
      const admin = await userRepository.findOne({
        where: { id: 1 },
-        select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+        select: [
+          'id',
+          'jellyfinAuthToken',
+          'jellyfinUserId',
+          'jellyfinDeviceId',
+        ],
        order: { id: 'ASC' },
      });

@@ -595,7 +597,7 @@ class JellyfinScanner {

      this.jfClient = new JellyfinAPI(
        getHostname(),
-        settings.jellyfin.apiKey,
+        admin.jellyfinAuthToken,
        admin.jellyfinDeviceId
      );

--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -47,7 +47,6 @@ export interface JellyfinSettings {
  jellyfinForgotPasswordUrl?: string;
  libraries: Library[];
  serverId: string;
-  apiKey: string;
 }
 export interface TautulliSettings {
  hostname?: string;
@@ -343,7 +342,6 @@ class Settings {
        jellyfinForgotPasswordUrl: '',
        libraries: [],
        serverId: '',
-        apiKey: '',
      },
      tautulli: {},
      radarr: [],
@@ -611,11 +609,7 @@ class Settings {
  }

  private generateApiKey(): string {
-    if (process.env.API_KEY) {
-      return process.env.API_KEY;
-    } else {
-      return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
-    }
+    return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
  }

  private generateVapidKeys(force = false): void {
@@ -635,7 +629,7 @@ class Settings {
   * @param overrideSettings If passed in, will override all existing settings with these
   * values
   */
-  public async load(overrideSettings?: AllSettings): Promise<Settings> {
+  public load(overrideSettings?: AllSettings): Settings {
    if (overrideSettings) {
      this.data = overrideSettings;
      return this;
@@ -648,16 +642,10 @@ class Settings {

    if (data) {
      const parsedJson = JSON.parse(data);
-      this.data = await runMigrations(parsedJson);
+      this.data = runMigrations(parsedJson);

      this.data = merge(this.data, parsedJson);

-      if (process.env.API_KEY) {
-        if (this.main.apiKey != process.env.API_KEY) {
-          this.main.apiKey = process.env.API_KEY;
-        }
-      }
-
      this.save();
    }
    return this;
@@ -668,6 +656,7 @@ class Settings {
  }
 }

+let loaded = false;
 let settings: Settings | undefined;

 export const getSettings = (initialSettings?: AllSettings): Settings => {
@@ -675,6 +664,11 @@ export const getSettings = (initialSettings?: AllSettings): Settings => {
    settings = new Settings(initialSettings);
  }

+  if (!loaded) {
+    settings.load();
+    loaded = true;
+  }
+
  return settings;
 };

--- a/server/lib/settings/migrations/0002_migrate_apitokens.ts
+++ b/server/lib/settings/migrations/0002_migrate_apitokens.ts
@@ -1,36 +0,0 @@
-import JellyfinAPI from '@server/api/jellyfin';
-import { MediaServerType } from '@server/constants/server';
-import { getRepository } from '@server/datasource';
-import { User } from '@server/entity/User';
-import type { AllSettings } from '@server/lib/settings';
-import { getHostname } from '@server/utils/getHostname';
-
-const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
-  const mediaServerType = settings.main.mediaServerType;
-  if (
-    !settings.jellyfin.apiKey &&
-    (mediaServerType === MediaServerType.JELLYFIN ||
-      mediaServerType === MediaServerType.EMBY)
-  ) {
-    const userRepository = getRepository(User);
-    const admin = await userRepository.findOne({
-      where: { id: 1 },
-      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
-      order: { id: 'ASC' },
-    });
-    if (!admin) {
-      return settings;
-    }
-    const jellyfinClient = new JellyfinAPI(
-      getHostname(settings.jellyfin),
-      admin.jellyfinAuthToken,
-      admin.jellyfinDeviceId
-    );
-    jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
-    const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-    settings.jellyfin.apiKey = apiKey;
-  }
-  return settings;
-};
-
-export default migrateApiTokens;
--- a/server/lib/settings/migrations/0003_emby_media_server_type.ts
+++ b/server/lib/settings/migrations/0003_emby_media_server_type.ts
@@ -1,16 +0,0 @@
-import { MediaServerType } from '@server/constants/server';
-import type { AllSettings } from '@server/lib/settings';
-
-const migrateHostname = (settings: any): AllSettings => {
-  const oldMediaServerType = settings.main.mediaServerType;
-  if (
-    oldMediaServerType === MediaServerType.JELLYFIN &&
-    process.env.JELLYFIN_TYPE === 'emby'
-  ) {
-    settings.main.mediaServerType = MediaServerType.EMBY;
-  }
-
-  return settings;
-};
-
-export default migrateHostname;
--- a/server/lib/settings/migrator.ts
+++ b/server/lib/settings/migrator.ts
@@ -1,13 +1,10 @@
 import type { AllSettings } from '@server/lib/settings';
-import logger from '@server/logger';
 import fs from 'fs';
 import path from 'path';

 const migrationsDir = path.join(__dirname, 'migrations');

-export const runMigrations = async (
-  settings: AllSettings
-): Promise<AllSettings> => {
+export const runMigrations = (settings: AllSettings): AllSettings => {
  const migrations = fs
    .readdirSync(migrationsDir)
    .filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
@@ -16,15 +13,8 @@ export const runMigrations = async (

  let migrated = settings;

-  try {
-    for (const migration of migrations) {
-      migrated = await migration(migrated);
-    }
-  } catch (e) {
-    logger.error(
-      `Something went wrong while running settings migrations: ${e.message}`,
-      { label: 'Settings Migrator' }
-    );
+  for (const migration of migrations) {
+    migrated = migration(migrated);
  }

  return migrated;
--- a/server/models/Movie.ts
+++ b/server/models/Movie.ts
@@ -85,7 +85,6 @@ export interface MovieDetails {
  mediaUrl?: string;
  watchProviders?: WatchProviders[];
  keywords: Keyword[];
-  onUserWatchlist?: boolean;
 }

 export const mapProductionCompany = (
@@ -102,8 +101,7 @@ export const mapProductionCompany = (

 export const mapMovieDetails = (
  movie: TmdbMovieDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): MovieDetails => ({
  id: movie.id,
  adult: movie.adult,
@@ -150,5 +148,4 @@ export const mapMovieDetails = (
    id: keyword.id,
    name: keyword.name,
  })),
-  onUserWatchlist: userWatchlist,
 });
--- a/server/models/Tv.ts
+++ b/server/models/Tv.ts
@@ -111,7 +111,6 @@ export interface TvDetails {
  keywords: Keyword[];
  mediaInfo?: Media;
  watchProviders?: WatchProviders[];
-  onUserWatchlist?: boolean;
 }

 const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
@@ -162,8 +161,7 @@ export const mapNetwork = (network: TmdbNetwork): TvNetwork => ({

 export const mapTvDetails = (
  show: TmdbTvDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): TvDetails => ({
  createdBy: show.created_by,
  episodeRunTime: show.episode_run_time,
@@ -225,5 +223,4 @@ export const mapTvDetails = (
  })),
  mediaInfo: media,
  watchProviders: mapWatchProviders(show['watch/providers']?.results ?? {}),
-  onUserWatchlist: userWatchlist,
 });
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -1,7 +1,7 @@
 import JellyfinAPI from '@server/api/jellyfin';
 import PlexTvAPI from '@server/api/plextv';
 import { ApiErrorCode } from '@server/constants/error';
-import { MediaServerType, ServerType } from '@server/constants/server';
+import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
@@ -227,20 +227,15 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    urlBase?: string;
    useSsl?: boolean;
    email?: string;
-    serverType?: number;
  };

-  //Make sure jellyfin login is enabled, but only if jellyfin && Emby is not already configured
+  //Make sure jellyfin login is enabled, but only if jellyfin is not already configured
  if (
    settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-    settings.main.mediaServerType !== MediaServerType.EMBY &&
-    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
-    settings.jellyfin.ip !== ''
+    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
  ) {
    return res.status(500).json({ error: 'Jellyfin login is disabled' });
-  }
-
-  if (!body.username) {
+  } else if (!body.username) {
    return res.status(500).json({ error: 'You must provide an username' });
  } else if (settings.jellyfin.ip !== '' && body.hostname) {
    return res
@@ -278,8 +273,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    }

    // First we need to attempt to log the user in to jellyfin
-    const jellyfinserver = new JellyfinAPI(hostname ?? '', undefined, deviceId);
-
+    const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
    const jellyfinHost =
      externalHostname && externalHostname.length > 0
        ? externalHostname
@@ -323,55 +317,20 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      );

      // User doesn't exist, and there are no users in the database, we'll create the user
-      // with admin permissions
-      switch (body.serverType) {
-        case MediaServerType.EMBY:
-          settings.main.mediaServerType = MediaServerType.EMBY;
-          user = new User({
-            email: body.email || account.User.Name,
-            jellyfinUsername: account.User.Name,
-            jellyfinUserId: account.User.Id,
-            jellyfinDeviceId: deviceId,
-            jellyfinAuthToken: account.AccessToken,
-            permissions: Permission.ADMIN,
-            avatar: account.User.PrimaryImageTag
-              ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-              : gravatarUrl(body.email || account.User.Name, {
-                  default: 'mm',
-                  size: 200,
-                }),
-            userType: UserType.EMBY,
-          });
-          break;
-        case MediaServerType.JELLYFIN:
-          settings.main.mediaServerType = MediaServerType.JELLYFIN;
-          user = new User({
-            email: body.email || account.User.Name,
-            jellyfinUsername: account.User.Name,
-            jellyfinUserId: account.User.Id,
-            jellyfinDeviceId: deviceId,
-            jellyfinAuthToken: account.AccessToken,
-            permissions: Permission.ADMIN,
-            avatar: account.User.PrimaryImageTag
-              ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-              : gravatarUrl(body.email || account.User.Name, {
-                  default: 'mm',
-                  size: 200,
-                }),
-            userType: UserType.JELLYFIN,
-          });
-          break;
-        default:
-          throw new Error('select_server_type');
-      }
-
-      // Create an API key on Jellyfin from this admin user
-      const jellyfinClient = new JellyfinAPI(
-        hostname,
-        account.AccessToken,
-        deviceId
-      );
-      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
+      // with admin permission
+      settings.main.mediaServerType = MediaServerType.JELLYFIN;
+      user = new User({
+        email: body.email,
+        jellyfinUsername: account.User.Name,
+        jellyfinUserId: account.User.Id,
+        jellyfinDeviceId: deviceId,
+        jellyfinAuthToken: account.AccessToken,
+        permissions: Permission.ADMIN,
+        avatar: account.User.PrimaryImageTag
+          ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+          : gravatarUrl(body.email ?? '', { default: 'mm', size: 200 }),
+        userType: UserType.JELLYFIN,
+      });

      const serverName = await jellyfinserver.getServerName();

@@ -381,7 +340,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      settings.jellyfin.port = body.port ?? 8096;
      settings.jellyfin.urlBase = body.urlBase ?? '';
      settings.jellyfin.useSsl = body.useSsl ?? false;
-      settings.jellyfin.apiKey = apiKey;
      settings.save();
      startJobs();

@@ -392,12 +350,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      logger.info(
        `Found matching ${
          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? ServerType.JELLYFIN
-            : ServerType.EMBY
+            ? 'Jellyfin'
+            : 'Emby'
        } user; updating user with ${
          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? ServerType.JELLYFIN
-            : ServerType.EMBY
+            ? 'Jellyfin'
+            : 'Emby'
        }`,
        {
          label: 'API',
@@ -405,11 +363,15 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
          jellyfinUsername: account.User.Name,
        }
      );
+      // Let's check if their authtoken is up to date
+      if (user.jellyfinAuthToken !== account.AccessToken) {
+        user.jellyfinAuthToken = account.AccessToken;
+      }
      // Update the users avatar with their jellyfin profile pic (incase it changed)
      if (account.User.PrimaryImageTag) {
        user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
      } else {
-        user.avatar = gravatarUrl(user.email || account.User.Name, {
+        user.avatar = gravatarUrl(user.email, {
          default: 'mm',
          size: 200,
        });
@@ -420,6 +382,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        user.username = '';
      }

+      // TODO: If JELLYFIN_TYPE is set to 'emby' then set mediaServerType to EMBY
+      // if (process.env.JELLYFIN_TYPE === 'emby') {
+      //   settings.main.mediaServerType = MediaServerType.EMBY;
+      //   settings.save();
+      // }
+
      await userRepository.save(user);
    } else if (!settings.main.newPlexLogin) {
      logger.warn(
@@ -445,22 +413,21 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        }
      );

+      if (!body.email) {
+        throw new Error('add_email');
+      }
+
      user = new User({
        email: body.email,
        jellyfinUsername: account.User.Name,
        jellyfinUserId: account.User.Id,
        jellyfinDeviceId: deviceId,
+        jellyfinAuthToken: account.AccessToken,
        permissions: settings.main.defaultPermissions,
        avatar: account.User.PrimaryImageTag
          ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-          : gravatarUrl(body.email || account.User.Name, {
-              default: 'mm',
-              size: 200,
-            }),
-        userType:
-          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? UserType.JELLYFIN
-            : UserType.EMBY,
+          : gravatarUrl(body.email, { default: 'mm', size: 200 }),
+        userType: UserType.JELLYFIN,
      });
      //initialize Jellyfin/Emby users with local login
      const passedExplicitPassword = body.password && body.password.length > 0;
@@ -763,7 +730,6 @@ authRoutes.post('/reset-password/:guid', async (req, res, next) => {
    });
  }
  user.recoveryLinkExpirationDate = null;
-  await user.setPassword(req.body.password);
  userRepository.save(user);
  logger.info('Successfully reset password', {
    label: 'API',
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -71,7 +71,6 @@ const QueryFilterOptions = z.object({
  network: z.coerce.string().optional(),
  watchProviders: z.coerce.string().optional(),
  watchRegion: z.coerce.string().optional(),
-  status: z.coerce.string().optional(),
 });

 export type FilterOptions = z.infer<typeof QueryFilterOptions>;
@@ -386,7 +385,6 @@ discoverRoutes.get('/tv', async (req, res, next) => {
      voteCountLte: query.voteCountLte,
      watchProviders: query.watchProviders,
      watchRegion: query.watchRegion,
-      withStatus: query.status,
    });

    const media = await Media.getRelatedMedia(
--- a/server/routes/movie.ts
+++ b/server/routes/movie.ts
@@ -3,9 +3,7 @@ import RottenTomatoes from '@server/api/rating/rottentomatoes';
 import { type RatingResponse } from '@server/api/ratings';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import { Watchlist } from '@server/entity/Watchlist';
 import logger from '@server/logger';
 import { mapMovieDetails } from '@server/models/Movie';
 import { mapMovieResult } from '@server/models/Search';
@@ -24,24 +22,7 @@ movieRoutes.get('/:id', async (req, res, next) => {

    const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);

-    const onUserWatchlist = await getRepository(Watchlist).exist({
-      where: {
-        tmdbId: Number(req.params.id),
-        requestedBy: {
-          id: req.user?.id,
-        },
-      },
-    });
-
-    const data = mapMovieDetails(tmdbMovie, media, onUserWatchlist);
-
-    // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
-    if (!data.overview) {
-      const tvEnglish = await tmdb.getMovie({ movieId: Number(req.params.id) });
-      data.overview = tvEnglish.overview;
-    }
-
-    return res.status(200).json(data);
+    return res.status(200).json(mapMovieDetails(tmdbMovie, media));
  } catch (e) {
    logger.debug('Something went wrong retrieving movie', {
      label: 'API',
--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -1,5 +1,3 @@
-import RadarrAPI from '@server/api/servarr/radarr';
-import SonarrAPI from '@server/api/servarr/sonarr';
 import {
  MediaRequestStatus,
  MediaStatus,
@@ -21,7 +19,6 @@ import type {
  RequestResultsResponse,
 } from '@server/interfaces/api/requestInterfaces';
 import { Permission } from '@server/lib/permissions';
-import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { Router } from 'express';
@@ -146,62 +143,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
        .skip(skip)
        .getManyAndCount();

-      const settings = getSettings();
-
-      // get all quality profiles for every configured sonarr server
-      const sonarrServers = await Promise.all(
-        settings.sonarr.map(async (sonarrSetting) => {
-          const sonarr = new SonarrAPI({
-            apiKey: sonarrSetting.apiKey,
-            url: SonarrAPI.buildUrl(sonarrSetting, '/api/v3'),
-          });
-
-          return {
-            id: sonarrSetting.id,
-            profiles: await sonarr.getProfiles(),
-          };
-        })
-      );
-
-      // get all quality profiles for every configured radarr server
-      const radarrServers = await Promise.all(
-        settings.radarr.map(async (radarrSetting) => {
-          const radarr = new RadarrAPI({
-            apiKey: radarrSetting.apiKey,
-            url: RadarrAPI.buildUrl(radarrSetting, '/api/v3'),
-          });
-
-          return {
-            id: radarrSetting.id,
-            profiles: await radarr.getProfiles(),
-          };
-        })
-      );
-
-      // add profile names to the media requests, with undefined if not found
-      const requestsWithProfileNames = requests.map((r) => {
-        switch (r.type) {
-          case MediaType.MOVIE: {
-            const profileName = radarrServers
-              .find((serverr) => serverr.id === r.serverId)
-              ?.profiles.find((profile) => profile.id === r.profileId)?.name;
-
-            return {
-              ...r,
-              profileName,
-            };
-          }
-          case MediaType.TV: {
-            return {
-              ...r,
-              profileName: sonarrServers
-                .find((serverr) => serverr.id === r.serverId)
-                ?.profiles.find((profile) => profile.id === r.profileId)?.name,
-            };
-          }
-        }
-      });
-
      return res.status(200).json({
        pageInfo: {
          pages: Math.ceil(requestCount / pageSize),
@@ -209,7 +150,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
          results: requestCount,
          page: Math.ceil(skip / pageSize) + 1,
        },
-        results: requestsWithProfileNames,
+        results: requests,
      });
    } catch (e) {
      next({ status: 500, message: e.message });
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -262,7 +262,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
  try {
    const admin = await userRepository.findOneOrFail({
      where: { id: 1 },
-      select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
      order: { id: 'ASC' },
    });

@@ -270,7 +270,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {

    const jellyfinClient = new JellyfinAPI(
      getHostname(tempJellyfinSettings),
-      tempJellyfinSettings.apiKey,
+      admin.jellyfinAuthToken ?? '',
      admin.jellyfinDeviceId ?? ''
    );

@@ -318,13 +318,13 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
  if (req.query.sync) {
    const userRepository = getRepository(User);
    const admin = await userRepository.findOneOrFail({
-      select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+      select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
      where: { id: 1 },
      order: { id: 'ASC' },
    });
    const jellyfinClient = new JellyfinAPI(
      getHostname(),
-      settings.jellyfin.apiKey,
+      admin.jellyfinAuthToken ?? '',
      admin.jellyfinDeviceId ?? ''
    );

@@ -376,8 +376,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
 });

 settingsRoutes.get('/jellyfin/users', async (req, res) => {
-  const settings = getSettings();
-  const { externalHostname } = settings.jellyfin;
+  const { externalHostname } = getSettings().jellyfin;
  const jellyfinHost =
    externalHostname && externalHostname.length > 0
      ? externalHostname
@@ -385,13 +384,13 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {

  const userRepository = getRepository(User);
  const admin = await userRepository.findOneOrFail({
-    select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+    select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
    where: { id: 1 },
    order: { id: 'ASC' },
  });
  const jellyfinClient = new JellyfinAPI(
    getHostname(),
-    settings.jellyfin.apiKey,
+    admin.jellyfinAuthToken ?? '',
    admin.jellyfinDeviceId ?? ''
  );

--- a/server/routes/tv.ts
+++ b/server/routes/tv.ts
@@ -1,9 +1,7 @@
 import RottenTomatoes from '@server/api/rating/rottentomatoes';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import { Watchlist } from '@server/entity/Watchlist';
 import logger from '@server/logger';
 import { mapTvResult } from '@server/models/Search';
 import { mapSeasonWithEpisodes, mapTvDetails } from '@server/models/Tv';
@@ -21,24 +19,7 @@ tvRoutes.get('/:id', async (req, res, next) => {

    const media = await Media.getMedia(tv.id, MediaType.TV);

-    const onUserWatchlist = await getRepository(Watchlist).exist({
-      where: {
-        tmdbId: Number(req.params.id),
-        requestedBy: {
-          id: req.user?.id,
-        },
-      },
-    });
-
-    const data = mapTvDetails(tv, media, onUserWatchlist);
-
-    // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
-    if (!data.overview) {
-      const tvEnglish = await tmdb.getTvShow({ tvId: Number(req.params.id) });
-      data.overview = tvEnglish.overview;
-    }
-
-    return res.status(200).json(data);
+    return res.status(200).json(mapTvDetails(tv, media));
  } catch (e) {
    logger.debug('Something went wrong retrieving series', {
      label: 'API',
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -2,7 +2,6 @@ import JellyfinAPI from '@server/api/jellyfin';
 import PlexTvAPI from '@server/api/plextv';
 import TautulliAPI from '@server/api/tautulli';
 import { MediaType } from '@server/constants/media';
-import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
@@ -42,19 +41,7 @@ router.get('/', async (req, res, next) => {
        break;
      case 'displayname':
        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`,
+          "(CASE WHEN (user.username IS NULL OR user.username = '') THEN (CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN user.email ELSE LOWER(user.plexUsername) END) ELSE LOWER(user.username) END)",
          'ASC'
        );
        break;
@@ -103,13 +90,12 @@ router.post(
      const settings = getSettings();

      const body = req.body;
-      const email = body.email || body.username;
      const userRepository = getRepository(User);

      const existingUser = await userRepository
        .createQueryBuilder('user')
        .where('user.email = :email', {
-          email: email.toLowerCase(),
+          email: body.email.toLowerCase(),
        })
        .getOne();

@@ -122,7 +108,7 @@ router.post(
      }

      const passedExplicitPassword = body.password && body.password.length > 0;
-      const avatar = gravatarUrl(email, { default: 'mm', size: 200 });
+      const avatar = gravatarUrl(body.email, { default: 'mm', size: 200 });

      if (
        !passedExplicitPassword &&
@@ -132,9 +118,9 @@ router.post(
      }

      const user = new User({
-        email,
        avatar: body.avatar ?? avatar,
        username: body.username,
+        email: body.email,
        password: body.password,
        permissions: settings.main.defaultPermissions,
        plexToken: '',
@@ -502,14 +488,17 @@ router.post(
      // taken from auth.ts
      const admin = await userRepository.findOneOrFail({
        where: { id: 1 },
-        select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+        select: [
+          'id',
+          'jellyfinAuthToken',
+          'jellyfinDeviceId',
+          'jellyfinUserId',
+        ],
        order: { id: 'ASC' },
      });
-
-      const hostname = getHostname();
      const jellyfinClient = new JellyfinAPI(
-        hostname,
-        settings.jellyfin.apiKey,
+        getHostname(),
+        admin.jellyfinAuthToken ?? '',
        admin.jellyfinDeviceId ?? ''
      );
      jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
@@ -517,6 +506,7 @@ router.post(
      //const jellyfinUsersResponse = await jellyfinClient.getUsers();
      const createdUsers: User[] = [];
      const { externalHostname } = getSettings().jellyfin;
+      const hostname = getHostname();

      const jellyfinHost =
        externalHostname && externalHostname.length > 0
@@ -551,10 +541,7 @@ router.post(
                  default: 'mm',
                  size: 200,
                }),
-            userType:
-              settings.main.mediaServerType === MediaServerType.JELLYFIN
-                ? UserType.JELLYFIN
-                : UserType.EMBY,
+            userType: UserType.JELLYFIN,
          });

          await userRepository.save(newUser);
--- a/server/routes/user/usersettings.ts
+++ b/server/routes/user/usersettings.ts
@@ -1,4 +1,3 @@
-import { ApiErrorCode } from '@server/constants/error';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
 import { UserSettings } from '@server/entity/UserSettings';
@@ -10,7 +9,6 @@ import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
-import { ApiError } from '@server/types/error';
 import { Router } from 'express';
 import { canMakePermissionsChange } from '.';

@@ -100,17 +98,7 @@ userSettingsRoutes.post<
    }

    user.username = req.body.username;
-    const oldEmail = user.email;
-    if (user.jellyfinUsername) {
-      user.email = req.body.email || user.jellyfinUsername || user.email;
-    }
-
-    const existingUser = await userRepository.findOne({
-      where: { email: user.email },
-    });
-    if (oldEmail !== user.email && existingUser) {
-      throw new ApiError(400, ApiErrorCode.InvalidEmail);
-    }
+    user.email = req.body.email ?? user.email;

    // Update quota values only if the user has the correct permissions
    if (
@@ -155,14 +143,7 @@ userSettingsRoutes.post<
      email: savedUser.email,
    });
  } catch (e) {
-    if (e.errorCode) {
-      return next({
-        status: e.statusCode,
-        message: e.errorCode,
-      });
-    } else {
-      return next({ status: 500, message: e.message });
-    }
+    next({ status: 500, message: e.message });
  }
 });

--- a/server/utils/rateLimit.ts
+++ b/server/utils/rateLimit.ts
@@ -7,10 +7,9 @@ type RateLimiteState<T extends (...args: Parameters<T>) => Promise<U>, U> = {
  queue: {
    args: Parameters<T>;
    resolve: (value: U) => void;
-    reject: (reason?: unknown) => void;
  }[];
-  lastTimestamps: number[];
-  timeout: ReturnType<typeof setTimeout>;
+  activeRequests: number;
+  timer: NodeJS.Timeout | null;
 };

 const rateLimitById: Record<string, unknown> = {};
@@ -28,40 +27,46 @@ export default function rateLimit<
 >(fn: T, options: RateLimitOptions): (...args: Parameters<T>) => Promise<U> {
  const state: RateLimiteState<T, U> = (rateLimitById[
    options.id || ''
-  ] as RateLimiteState<T, U>) || { queue: [], lastTimestamps: [] };
+  ] as RateLimiteState<T, U>) || { queue: [], activeRequests: 0, timer: null };
  if (options.id) {
    rateLimitById[options.id] = state;
  }

  const processQueue = () => {
-    // remove old timestamps
-    state.lastTimestamps = state.lastTimestamps.filter(
-      (timestamp) => Date.now() - timestamp < 1000
-    );
+    if (state.queue.length === 0) {
+      if (state.timer) {
+        clearInterval(state.timer);
+        state.timer = null;
+      }
+      return;
+    }

-    if (state.lastTimestamps.length < options.maxRPS) {
-      // process requests if RPS not exceeded
+    while (state.activeRequests < options.maxRPS) {
+      state.activeRequests++;
      const item = state.queue.shift();
-      if (!item) return;
-      state.lastTimestamps.push(Date.now());
-      const { args, resolve, reject } = item;
+      if (!item) break;
+      const { args, resolve } = item;
      fn(...args)
        .then(resolve)
-        .catch(reject);
-      processQueue();
-    } else {
-      // rerun once the oldest item in queue is older than 1s
-      if (state.timeout) clearTimeout(state.timeout);
-      state.timeout = setTimeout(
-        processQueue,
-        1000 - (Date.now() - state.lastTimestamps[0])
-      );
+        .finally(() => {
+          state.activeRequests--;
+          if (state.queue.length > 0) {
+            if (!state.timer) {
+              state.timer = setInterval(processQueue, 1000);
+            }
+          } else {
+            if (state.timer) {
+              clearInterval(state.timer);
+              state.timer = null;
+            }
+          }
+        });
    }
  };

  return (...args: Parameters<T>): Promise<U> => {
-    return new Promise<U>((resolve, reject) => {
-      state.queue.push({ args, resolve, reject });
+    return new Promise<U>((resolve) => {
+      state.queue.push({ args, resolve });
      processQueue();
    });
  };
--- a/src/assets/services/emby-icon-only.svg
+++ b/src/assets/services/emby-icon-only.svg
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 712.60077 712.5481"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="opacity:0;fill:#ffffff;stroke-width:4.12543"
-     id="rect249"
-     width="712.60077"
-     height="712.5481"
-     x="-0.00071160076"
-     y="2.0223413e-11" />
-  <rect
-     style="fill:#ffffff"
-     id="rect289"
-     width="230.18982"
-     height="229.82355"
-     x="241.20476"
-     y="241.36227" />
-  <g
-     id="layer1"
-     transform="matrix(0.70249853,0,0,0.70249853,88.770447,96.84571)">
-    <path
-       id="path3427"
-       d="m 327.06546,642.18589 c -45.39663,-45.86009 -82.73776,-83.3683 -82.98029,-83.3516 -0.24253,0.0167 -7.23324,6.65975 -15.53493,14.7623 l -15.09396,14.73193 -40.13624,-40.38805 C 151.24511,525.72706 108.73555,482.86504 78.854363,452.69158 l -54.329437,-54.86086 83.720394,-82.90796 83.72039,-82.90797 -15.19316,-15.20441 -15.19315,-15.20443 95.18008,-94.29313 c 52.34904,-51.86121 95.35849,-94.293118 95.57653,-94.293118 0.21805,0 37.39519,37.357576 82.61589,83.016832 45.22068,45.659256 82.53772,83.131956 82.92673,83.272666 0.38901,0.14071 7.46336,-6.49498 15.72077,-14.746 l 15.01348,-15.00184 7.14591,7.19902 c 73.95232,74.50189 181.50599,183.56427 181.36678,183.9109 -0.10065,0.25064 -37.54056,37.44106 -83.19981,82.64536 -45.65926,45.2043 -83.10802,82.41429 -83.21946,82.68884 -0.11145,0.27456 6.50478,7.34753 14.70272,15.71771 l 14.90534,15.21851 -15.3888,15.28883 c -21.09609,20.95904 -162.95155,161.27018 -169.79551,167.947 l -5.52526,5.39033 z m 89.8523,-204.1566 c 64.84836,-37.53366 117.81919,-68.54793 117.71294,-68.92058 -0.15927,-0.55862 -233.55022,-136.2489 -236.27084,-137.3646 -0.68441,-0.28068 -0.85761,27.45642 -0.85761,137.33982 0,99.83563 0.20749,137.62237 0.75471,137.43996 0.41509,-0.13837 53.81245,-30.96093 118.6608,-68.4946 z"
-       style="fill:#52b54b;fill-opacity:1;stroke:none" />
-  </g>
-</svg>
-
--- a/src/assets/services/emby.svg
+++ b/src/assets/services/emby.svg
@@ -1,131 +1,46 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	y="0px" width="100%" viewBox="0 0 617 188" enable-background="new 0 0 617 188" xml:space="preserve">
-	<path fill="#52B54B" opacity="1.000000" stroke="none" d="
-M89.583336,1.000000 
-	C90.189529,1.685005 90.166168,2.574803 90.599510,3.025271 
-	C103.718315,16.662701 116.882103,30.256845 129.948212,43.764053 
-	C130.577850,43.523941 130.916519,43.491173 131.111343,43.306595 
-	C138.657471,36.157455 138.655273,36.156090 146.005478,43.505203 
-	C159.538589,57.036308 173.016449,70.623535 186.654617,84.047913 
-	C189.264145,86.616562 189.414017,88.253456 186.716782,90.895164 
-	C174.709808,102.655037 162.893280,114.609337 151.008514,126.493958 
-	C146.073502,131.428925 146.076691,131.427155 151.017944,136.523712 
-	C151.698944,137.226120 152.340485,137.966812 153.259171,138.973434 
-	C151.947098,140.380035 150.766312,141.712204 149.516266,142.975861 
-	C134.544815,158.110641 119.563087,173.235260 104.792023,188.681274 
-	C103.611107,189.000000 102.222221,189.000000 100.624634,188.681274 
-	C86.361732,174.796494 72.307518,161.230438 57.702755,147.132965 
-	C56.157101,149.136856 54.135899,151.757263 51.994804,154.533112 
-	C35.932781,138.457108 20.569420,123.048477 5.141897,107.704361 
-	C3.997114,106.565773 2.391420,105.890610 1.000000,105.000000 
-	C1.000000,103.611107 1.000000,102.222221 1.318741,100.624641 
-	C15.203506,86.361694 28.769531,72.307434 42.867004,57.702602 
-	C40.863205,56.156994 38.242813,54.135792 35.425343,51.962570 
-	C51.518696,35.908516 66.939468,20.557360 82.295547,5.141749 
-	C83.434830,3.998048 84.109390,2.391417 85.000000,0.999999 
-	C86.388893,1.000000 87.777779,1.000000 89.583336,1.000000 
-M73.196465,79.500702 
-	C73.196465,96.254150 73.196465,113.007599 73.196465,130.872055 
-	C94.273178,118.764557 114.417175,107.192863 135.221664,95.241745 
-	C114.247169,83.251732 94.091187,71.729622 73.196594,59.785294 
-	C73.196594,66.631348 73.196594,72.566254 73.196465,79.500702 
-z" />
-	<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
-M618.000000,60.571537 
-	C617.004395,62.042580 615.613281,62.912964 615.073181,64.153824 
-	C608.143372,80.073746 601.328613,96.043816 594.498169,112.006920 
-	C586.973572,129.592300 579.343018,147.133865 571.999390,164.794601 
-	C568.632385,172.892075 568.893372,173.002594 560.133972,172.999832 
-	C555.470825,172.998367 550.807617,172.994385 546.144592,172.969360 
-	C545.841980,172.967712 545.540466,172.775543 544.836609,172.534256 
-	C548.592896,163.531219 551.714905,154.222061 556.286133,145.689255 
-	C559.733765,139.253830 559.138794,134.062668 556.454224,127.695969 
-	C546.360352,103.757523 536.803345,79.592712 526.837830,55.000847 
-	C534.817078,55.000847 542.437622,54.725182 550.003540,55.244331 
-	C551.436218,55.342628 553.169678,58.412052 553.885010,60.423309 
-	C558.720520,74.018005 563.307556,87.700912 568.003784,101.345413 
-	C569.107483,104.551987 570.321045,107.720764 571.976196,112.255157 
-	C573.889587,107.365631 575.415283,103.375916 577.007935,99.413109 
-	C582.693298,85.266724 588.344238,71.105591 594.218018,57.037624 
-	C594.650513,56.001743 596.734497,55.132927 598.079773,55.089733 
-	C604.401855,54.886726 610.734131,54.999401 617.531372,54.999699 
-	C618.000000,56.714359 618.000000,58.428715 618.000000,60.571537 
-z" />
-	<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
-M430.000122,99.002235 
-	C430.000122,112.477097 430.000122,125.452438 430.000122,138.713440 
-	C423.048126,138.713440 416.308685,138.713440 408.999878,138.713440 
-	C408.999878,129.350739 409.120758,119.916939 408.962219,110.487823 
-	C408.832153,102.753624 409.088898,94.909142 407.866791,87.324188 
-	C406.440887,78.474220 401.302399,74.201607 394.304291,74.000290 
-	C387.617249,73.807938 380.317963,79.297188 378.047363,86.438652 
-	C377.420715,88.409592 377.055725,90.550858 377.044647,92.616508 
-	C376.962494,107.913475 377.000122,123.211082 377.000122,138.753479 
-	C369.630646,138.753479 362.559692,138.753479 354.999878,138.753479 
-	C354.999878,123.256836 355.044769,107.816956 354.977661,92.377571 
-	C354.951050,86.251518 352.748199,80.799278 347.911346,77.066116 
-	C339.239685,70.373154 327.811401,74.635170 324.084412,84.471092 
-	C322.793915,87.876816 322.147491,91.713402 322.090881,95.366882 
-	C321.868958,109.685005 322.000122,124.008591 322.000122,138.665009 
-	C314.823853,138.665009 307.760773,138.665009 300.346558,138.665009 
-	C300.346558,111.006645 300.346558,83.281189 300.346558,55.001301 
-	C306.163818,55.001301 312.104645,54.855133 318.024780,55.139343 
-	C319.060455,55.189068 320.450378,56.891682 320.882477,58.112110 
-	C321.380768,59.519447 320.998291,61.238617 320.998291,64.136040 
-	C328.715179,54.407440 338.407898,52.804527 348.408875,54.206123 
-	C356.403381,55.326527 361.770447,57.638248 366.682190,66.544373 
-	C372.325470,62.972542 377.601440,58.269657 383.771973,56.014080 
-	C396.273407,51.444298 408.602570,53.673611 419.067657,61.818150 
-	C426.629364,67.703125 429.037811,76.770744 429.932556,86.011482 
-	C430.332214,90.138710 430.000122,94.336792 430.000122,99.002235 
-z" />
-	<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
-M462.000427,35.006332 
-	C462.000427,44.815434 462.000427,54.126144 462.000427,64.132019 
-	C468.844696,58.319965 476.100769,54.654530 484.669739,53.656227 
-	C496.686127,52.256294 507.565582,54.979622 516.927185,62.503853 
-	C534.236755,76.416115 535.360107,106.231667 523.651062,123.341644 
-	C516.745056,133.433182 506.539673,139.485458 493.555267,140.111023 
-	C483.836304,140.579254 474.670624,139.889420 466.610413,133.799713 
-	C465.039795,132.613068 463.390686,131.530289 461.957214,130.525391 
-	C461.633789,132.375305 461.105469,135.397171 460.522095,138.733841 
-	C454.446686,138.733841 448.017822,138.733841 441.292542,138.733841 
-	C441.292542,99.722672 441.292542,60.652122 441.292542,21.290209 
-	C447.943787,21.290209 454.684204,21.290209 462.000427,21.290209 
-	C462.000427,25.636984 462.000427,30.072460 462.000427,35.006332 
-M480.890228,119.974937 
-	C485.426086,119.681152 490.365997,120.444260 494.421356,118.893707 
-	C506.182587,114.396866 510.858643,104.919495 509.036591,92.234833 
-	C507.422546,80.997993 496.539307,71.772278 483.551605,73.864754 
-	C469.724976,76.092384 464.376770,85.538391 463.152863,96.752327 
-	C462.120667,106.209480 469.961761,116.189537 480.890228,119.974937 
-z" />
-	<path fill="#FDFDFD" opacity="1.000000" stroke="none" d="
-M234.797928,54.654831 
-	C244.856339,52.605957 254.504562,52.040043 264.239868,54.923946 
-	C279.600891,59.474377 286.402191,68.163963 289.768585,81.937614 
-	C291.530579,89.146889 290.954620,96.927589 291.469940,105.005005 
-	C269.550385,105.005005 248.375092,105.005005 227.094437,105.005005 
-	C229.577957,116.288628 239.741562,120.764336 248.594757,121.034813 
-	C256.790771,121.285217 264.390472,119.882645 271.081848,114.731178 
-	C271.774902,114.197632 273.962708,114.659111 274.786041,115.402222 
-	C278.726318,118.958458 282.435333,122.770882 286.509888,126.770363 
-	C281.309174,132.968170 274.787445,135.946014 267.542938,138.175064 
-	C253.746231,142.420120 240.209259,142.317459 227.237503,135.935410 
-	C212.712891,128.789368 205.730453,116.523628 204.973831,100.473404 
-	C204.537735,91.222557 205.503754,82.283119 210.008469,74.017265 
-	C215.396210,64.131088 223.372589,57.511646 234.797928,54.654831 
-M266.971497,78.708908 
-	C259.384399,70.789909 249.920425,70.480316 240.489548,73.410858 
-	C234.405487,75.301414 229.437546,79.631561 227.800247,86.722244 
-	C242.152313,86.722244 256.002747,86.722244 270.947815,86.722244 
-	C269.410950,83.870155 268.228943,81.676651 266.971497,78.708908 
-z" />
-	<path fill="#FCFEFC" opacity="1.000000" stroke="none" d="
-M73.196533,79.000931 
-	C73.196594,72.566254 73.196594,66.631348 73.196594,59.785294 
-	C94.091187,71.729622 114.247169,83.251732 135.221664,95.241745 
-	C114.417175,107.192863 94.273178,118.764557 73.196465,130.872055 
-	C73.196465,113.007599 73.196465,96.254150 73.196533,79.000931 
-z" />
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 712.60077 712.5481"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="opacity:0;fill:#ffffff;stroke-width:4.12543"
+     id="rect249"
+     width="712.60077"
+     height="712.5481"
+     x="-0.00071160076"
+     y="2.0223413e-11" />
+  <rect
+     style="fill:#ffffff"
+     id="rect289"
+     width="230.18982"
+     height="229.82355"
+     x="241.20476"
+     y="241.36227" />
+  <g
+     id="layer1"
+     transform="matrix(0.70249853,0,0,0.70249853,88.770447,96.84571)">
+    <path
+       id="path3427"
+       d="m 327.06546,642.18589 c -45.39663,-45.86009 -82.73776,-83.3683 -82.98029,-83.3516 -0.24253,0.0167 -7.23324,6.65975 -15.53493,14.7623 l -15.09396,14.73193 -40.13624,-40.38805 C 151.24511,525.72706 108.73555,482.86504 78.854363,452.69158 l -54.329437,-54.86086 83.720394,-82.90796 83.72039,-82.90797 -15.19316,-15.20441 -15.19315,-15.20443 95.18008,-94.29313 c 52.34904,-51.86121 95.35849,-94.293118 95.57653,-94.293118 0.21805,0 37.39519,37.357576 82.61589,83.016832 45.22068,45.659256 82.53772,83.131956 82.92673,83.272666 0.38901,0.14071 7.46336,-6.49498 15.72077,-14.746 l 15.01348,-15.00184 7.14591,7.19902 c 73.95232,74.50189 181.50599,183.56427 181.36678,183.9109 -0.10065,0.25064 -37.54056,37.44106 -83.19981,82.64536 -45.65926,45.2043 -83.10802,82.41429 -83.21946,82.68884 -0.11145,0.27456 6.50478,7.34753 14.70272,15.71771 l 14.90534,15.21851 -15.3888,15.28883 c -21.09609,20.95904 -162.95155,161.27018 -169.79551,167.947 l -5.52526,5.39033 z m 89.8523,-204.1566 c 64.84836,-37.53366 117.81919,-68.54793 117.71294,-68.92058 -0.15927,-0.55862 -233.55022,-136.2489 -236.27084,-137.3646 -0.68441,-0.28068 -0.85761,27.45642 -0.85761,137.33982 0,99.83563 0.20749,137.62237 0.75471,137.43996 0.41509,-0.13837 53.81245,-30.96093 118.6608,-68.4946 z"
+       style="fill:#52b54b;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
--- a/src/assets/services/plex.svg
+++ b/src/assets/services/plex.svg
@@ -1,85 +1 @@
-<?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)  -->
-
-<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>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320.03 103.61"><defs><style>.cls-1{fill:#fff}.cls-2{fill:url(#a)}.cls-3{fill:#e5a00d}</style><radialGradient id="a" cx="258.33" cy="51.76" r="42.95" gradientUnits="userSpaceOnUse"><stop offset=".17" stop-color="#f9be03"/><stop offset=".51" stop-color="#e8a50b"/><stop offset="1" stop-color="#cc7c19"/></radialGradient></defs><polygon points="320.03 -.09 289.96 -.09 259.88 51.76 289.96 103.61 320.01 103.61 289.96 51.79" class="cls-1"/><polygon points="226.7 -.09 256.78 -.09 289.96 51.76 256.78 103.61 226.7 103.61 259.88 51.76" class="cls-2"/><polygon points="226.7 -.09 256.78 -.09 289.96 51.76 256.78 103.61 226.7 103.61 259.88 51.76" class="cls-3"/><path d="M216.32,103.61H156.49V-.09h59.83v18h-37.8V40.69H213.7v18H178.52V85.45h37.8Z" class="cls-1"/><path d="M82.07,103.61V-.09h22V85.45h42.07v18.16Z" class="cls-1"/><path d="M71.66,32.25Q71.66,49,61.2,57.87T31.44,66.73H22v36.88H0V-.09H33.14Q52-.09,61.83,8T71.66,32.25ZM22,48.71h7.24q10.15,0,15.18-4c3.37-2.66,5-6.56,5-11.67s-1.41-9-4.22-11.42S38,17.93,32,17.93H22Z" class="cls-1"/></svg>
--- a/src/components/Discover/DiscoverNetwork/index.tsx
+++ b/src/components/Discover/DiscoverNetwork/index.tsx
@@ -48,11 +48,11 @@ const DiscoverTvNetwork = () => {
      <div className="mt-1 mb-5">
        <Header>
          {firstResultData?.network.logoPath ? (
-            <div className="relative mb-6 flex h-24 justify-center sm:h-32">
+            <div className="mb-6 flex justify-center">
              <Image
-                src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
+                src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
                alt={firstResultData.network.name}
-                className="object-contain"
+                className="max-h-24 sm:max-h-32"
                fill
              />
            </div>
--- a/src/components/Discover/DiscoverStudio/index.tsx
+++ b/src/components/Discover/DiscoverStudio/index.tsx
@@ -48,11 +48,11 @@ const DiscoverMovieStudio = () => {
      <div className="mt-1 mb-5">
        <Header>
          {firstResultData?.studio.logoPath ? (
-            <div className="relative mb-6 flex h-24 justify-center sm:h-32">
+            <div className="mb-6 flex justify-center">
              <Image
-                src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
+                src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
                alt={firstResultData.studio.name}
-                className="object-contain"
+                className="max-h-24 sm:max-h-32"
                fill
              />
            </div>
--- a/src/components/Discover/FilterSlideover/index.tsx
+++ b/src/components/Discover/FilterSlideover/index.tsx
@@ -8,7 +8,6 @@ import {
  CompanySelector,
  GenreSelector,
  KeywordSelector,
-  StatusSelector,
  WatchProviderSelector,
 } from '@app/components/Selector';
 import useSettings from '@app/hooks/useSettings';
@@ -41,7 +40,6 @@ const messages = defineMessages('components.Discover.FilterSlideover', {
  runtime: 'Runtime',
  streamingservices: 'Streaming Services',
  voteCount: 'Number of votes between {minValue} and {maxValue}',
-  status: 'Status',
 });

 type FilterSlideoverProps = {
@@ -152,23 +150,6 @@ const FilterSlideover = ({
            updateQueryParams('genre', value?.map((v) => v.value).join(','));
          }}
        />
-        {type === 'tv' && (
-          <>
-            <span className="text-lg font-semibold">
-              {intl.formatMessage(messages.status)}
-            </span>
-            <StatusSelector
-              defaultValue={currentFilters.status}
-              isMulti
-              onChange={(value) => {
-                updateQueryParams(
-                  'status',
-                  value?.map((v) => v.value).join('|')
-                );
-              }}
-            />
-          </>
-        )}
        <span className="text-lg font-semibold">
          {intl.formatMessage(messages.keywords)}
        </span>
--- a/src/components/Discover/constants.ts
+++ b/src/components/Discover/constants.ts
@@ -108,7 +108,6 @@ export const QueryFilterOptions = z.object({
  voteCountGte: z.string().optional(),
  watchRegion: z.string().optional(),
  watchProviders: z.string().optional(),
-  status: z.string().optional(),
 });

 export type FilterOptions = z.infer<typeof QueryFilterOptions>;
@@ -148,10 +147,6 @@ export const prepareFilterValues = (
    filterValues.genre = values.genre;
  }

-  if (values.status) {
-    filterValues.status = values.status;
-  }
-
  if (values.keywords) {
    filterValues.keywords = values.keywords;
  }
--- a/src/components/ExternalLinkBlock/index.tsx
+++ b/src/components/ExternalLinkBlock/index.tsx
@@ -11,6 +11,7 @@ import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
 import { MediaType } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
+import getConfig from 'next/config';

 interface ExternalLinkBlockProps {
  mediaType: 'movie' | 'tv';
@@ -30,6 +31,7 @@ const ExternalLinkBlock = ({
  mediaUrl,
 }: ExternalLinkBlockProps) => {
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();
  const { locale } = useLocale();

  return (
@@ -43,8 +45,7 @@ const ExternalLinkBlock = ({
        >
          {settings.currentSettings.mediaServerType === MediaServerType.PLEX ? (
            <PlexLogo />
-          ) : settings.currentSettings.mediaServerType ===
-            MediaServerType.EMBY ? (
+          ) : publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? (
            <EmbyLogo />
          ) : (
            <JellyfinLogo />
--- a/src/components/IssueDetails/IssueComment/index.tsx
+++ b/src/components/IssueDetails/IssueComment/index.tsx
@@ -181,9 +181,6 @@ const IssueComment = ({
                    `/api/v1/issueComment/${comment.id}`,
                    {
                      method: 'PUT',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
                      body: JSON.stringify({ message: values.newMessage }),
                    }
                  );
--- a/src/components/IssueDetails/index.tsx
+++ b/src/components/IssueDetails/index.tsx
@@ -28,6 +28,7 @@ import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import { Field, Form, Formik } from 'formik';
+import getConfig from 'next/config';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
@@ -107,6 +108,7 @@ const IssueDetails = () => {
    (opt) => opt.issueType === issueData?.issueType
  );
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();

  if (!data && !error) {
    return <LoadingSpinner />;
@@ -124,9 +126,6 @@ const IssueDetails = () => {
    try {
      const res = await fetch(`/api/v1/issueComment/${firstComment.id}`, {
        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json',
-        },
        body: JSON.stringify({ message: newMessage }),
      });
      if (!res.ok) throw new Error();
@@ -388,8 +387,7 @@ const IssueDetails = () => {
                >
                  <PlayIcon />
                  <span>
-                    {settings.currentSettings.mediaServerType ===
-                    MediaServerType.EMBY
+                    {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
                      ? intl.formatMessage(messages.playonplex, {
                          mediaServerName: 'Emby',
                        })
@@ -436,8 +434,7 @@ const IssueDetails = () => {
                >
                  <PlayIcon />
                  <span>
-                    {settings.currentSettings.mediaServerType ===
-                    MediaServerType.EMBY
+                    {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
                      ? intl.formatMessage(messages.play4konplex, {
                          mediaServerName: 'Emby',
                        })
@@ -504,9 +501,6 @@ const IssueDetails = () => {
                    `/api/v1/issue/${issueData?.id}/comment`,
                    {
                      method: 'POST',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
                      body: JSON.stringify({ message: values.message }),
                    }
                  );
@@ -662,8 +656,7 @@ const IssueDetails = () => {
              >
                <PlayIcon />
                <span>
-                  {settings.currentSettings.mediaServerType ===
-                  MediaServerType.EMBY
+                  {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
                    ? intl.formatMessage(messages.playonplex, {
                        mediaServerName: 'Emby',
                      })
@@ -709,8 +702,7 @@ const IssueDetails = () => {
              >
                <PlayIcon />
                <span>
-                  {settings.currentSettings.mediaServerType ===
-                  MediaServerType.EMBY
+                  {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
                    ? intl.formatMessage(messages.play4konplex, {
                        mediaServerName: 'Emby',
                      })
--- a/src/components/IssueModal/CreateIssueModal/index.tsx
+++ b/src/components/IssueModal/CreateIssueModal/index.tsx
@@ -102,9 +102,6 @@ const CreateIssueModal = ({
        try {
          const res = await fetch('/api/v1/issue', {
            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
            body: JSON.stringify({
              issueType: values.selectedIssue.issueType,
              message: values.message,
--- a/src/components/Layout/UserDropdown/index.tsx
+++ b/src/components/Layout/UserDropdown/index.tsx
@@ -90,11 +90,9 @@ const UserDropdown = () => {
                  <span className="truncate text-xl font-semibold text-gray-200">
                    {user?.displayName}
                  </span>
-                  {user?.displayName?.toLowerCase() !== user?.email && (
-                    <span className="truncate text-sm text-gray-400">
-                      {user?.email}
-                    </span>
-                  )}
+                  <span className="truncate text-sm text-gray-400">
+                    {user?.email}
+                  </span>
                </div>
              </div>
              {user && <MiniQuotaDisplay userId={user?.id} />}
--- a/src/components/Layout/UserWarnings/index.tsx
+++ b/src/components/Layout/UserWarnings/index.tsx
@@ -17,45 +17,47 @@ interface UserWarningsProps {
 const UserWarnings: React.FC<UserWarningsProps> = ({ onClick }) => {
  const intl = useIntl();
  const { user } = useUser();
-  //check if a user has warnings
-  if (!user || !user.warnings || user.warnings.length === 0) {
+  if (!user) {
    return null;
  }

  let res = null;

-  user.warnings.forEach((warning) => {
-    let link = '';
-    let warningText = '';
-    let warningTitle = '';
-    switch (warning) {
-      case 'userEmailRequired':
-        link = '/profile/settings/';
-        warningTitle = 'Profile is incomplete';
-        warningText = intl.formatMessage(messages.emailRequired);
-    }
+  //check if a user has warnings
+  if (user.warnings.length > 0) {
+    user.warnings.forEach((warning) => {
+      let link = '';
+      let warningText = '';
+      let warningTitle = '';
+      switch (warning) {
+        case 'userEmailRequired':
+          link = '/profile/settings/';
+          warningTitle = 'Profile is incomplete';
+          warningText = intl.formatMessage(messages.emailRequired);
+      }

-    res = (
-      <Link
-        href={link}
-        onClick={onClick}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' && onClick) {
-            onClick();
-          }
-        }}
-        role="button"
-        tabIndex={0}
-        className="mx-2 mb-2 flex items-center rounded-lg bg-yellow-500 p-2 text-xs text-white ring-1 ring-gray-700 transition duration-300 hover:bg-yellow-400"
-      >
-        <ExclamationTriangleIcon className="h-6 w-6" />
-        <div className="flex min-w-0 flex-1 flex-col truncate px-2 last:pr-0">
-          <span className="font-bold">{warningTitle}</span>
-          <span className="truncate">{warningText}</span>
-        </div>
-      </Link>
-    );
-  });
+      res = (
+        <Link
+          href={link}
+          onClick={onClick}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' && onClick) {
+              onClick();
+            }
+          }}
+          role="button"
+          tabIndex={0}
+          className="mx-2 mb-2 flex items-center rounded-lg bg-yellow-500 p-2 text-xs text-white ring-1 ring-gray-700 transition duration-300 hover:bg-yellow-400"
+        >
+          <ExclamationTriangleIcon className="h-6 w-6" />
+          <div className="flex min-w-0 flex-1 flex-col truncate px-2 last:pr-0">
+            <span className="font-bold">{warningTitle}</span>
+            <span className="truncate">{warningText}</span>
+          </div>
+        </Link>
+      );
+    });
+  }

  return res;
 };
--- a/src/components/Login/AddEmailModal.tsx
+++ b/src/components/Login/AddEmailModal.tsx
@@ -59,9 +59,6 @@ const AddEmailModal: React.FC<AddEmailModalProps> = ({
          try {
            const res = await fetch('/api/v1/auth/jellyfin', {
              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
              body: JSON.stringify({
                username: username,
                password: password,
--- a/src/components/Login/JellyfinLogin.tsx
+++ b/src/components/Login/JellyfinLogin.tsx
@@ -4,9 +4,9 @@ import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 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 { FormattedMessage, useIntl } from 'react-intl';
+import getConfig from 'next/config';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import * as Yup from 'yup';

@@ -26,7 +26,6 @@ const messages = defineMessages('components.Login', {
  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',
@@ -41,51 +40,42 @@ const messages = defineMessages('components.Login', {
  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();
  const settings = useSettings();
-
-  const mediaServerFormatValues = {
-    mediaServerName:
-      serverType === MediaServerType.JELLYFIN
-        ? ServerType.JELLYFIN
-        : serverType === MediaServerType.EMBY
-        ? ServerType.EMBY
-        : 'Media Server',
-  };
+  const { publicRuntimeConfig } = getConfig();

  if (initial) {
    const LoginSchema = Yup.object().shape({
      hostname: Yup.string().required(
-        intl.formatMessage(
-          messages.validationhostrequired,
-          mediaServerFormatValues
-        )
+        intl.formatMessage(messages.validationhostrequired, {
+          mediaServerName:
+            publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+        })
      ),
      port: Yup.number().required(
        intl.formatMessage(messages.validationPortRequired)
      ),
-      urlBase: Yup.string().matches(
-        /^(.*[^/])$/,
-        intl.formatMessage(messages.validationUrlBaseTrailingSlash)
-      ),
+      urlBase: Yup.string()
+        .matches(
+          /^(\/[^/].*[^/]$)/,
+          intl.formatMessage(messages.validationUrlBaseLeadingSlash)
+        )
+        .matches(
+          /^(.*[^/])$/,
+          intl.formatMessage(messages.validationUrlBaseTrailingSlash)
+        ),
      email: Yup.string()
        .email(intl.formatMessage(messages.validationemailformat))
        .required(intl.formatMessage(messages.validationemailrequired)),
@@ -95,6 +85,11 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
      password: Yup.string(),
    });

+    const mediaServerFormatValues = {
+      mediaServerName:
+        publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+    };
+
    return (
      <Formik
        initialValues={{
@@ -109,11 +104,6 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
        validationSchema={LoginSchema}
        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: {
@@ -127,20 +117,12 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                useSsl: values.useSsl,
                urlBase: values.urlBase,
                email: values.email,
-                serverType: serverType,
              }),
            });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
+            if (!res.ok) throw new Error();
          } catch (e) {
-            let errorData;
-            try {
-              errorData = await e.cause?.text();
-              errorData = JSON.parse(errorData);
-            } catch {
-              /* empty */
-            }
            let errorMessage = null;
-            switch (errorData?.message) {
+            switch (e.response?.data?.message) {
              case ApiErrorCode.InvalidUrl:
                errorMessage = messages.invalidurlerror;
                break;
@@ -323,7 +305,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
              </div>
            </div>
            <div className="mt-8 border-t border-gray-700 pt-5">
-              <div className="flex flex-row-reverse justify-between">
+              <div className="flex justify-end">
                <span className="inline-flex rounded-md shadow-sm">
                  <Button
                    buttonType="primary"
@@ -335,13 +317,6 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                      : 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>
@@ -447,8 +422,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                            jellyfinForgotPasswordUrl
                              ? `${jellyfinForgotPasswordUrl}`
                              : `${baseUrl}/web/index.html#!/${
-                                  settings.currentSettings.mediaServerType ===
-                                  MediaServerType.EMBY
+                                  process.env.JELLYFIN_TYPE === 'emby'
                                    ? 'startup/'
                                    : ''
                                }forgotpassword.html`
--- a/src/components/Login/index.tsx
+++ b/src/components/Login/index.tsx
@@ -10,6 +10,7 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import { XCircleIcon } from '@heroicons/react/24/solid';
 import { MediaServerType } from '@server/constants/server';
+import getConfig from 'next/config';
 import { useRouter } from 'next/dist/client/router';
 import Image from 'next/image';
 import { useEffect, useState } from 'react';
@@ -33,6 +34,7 @@ const Login = () => {
  const { user, revalidate } = useUser();
  const router = useRouter();
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();

  // 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
@@ -43,26 +45,16 @@ const Login = () => {
      try {
        const res = await fetch('/api/v1/auth/plex', {
          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
          body: JSON.stringify({ authToken }),
        });
-        if (!res.ok) throw new Error(res.statusText, { cause: res });
+        if (!res.ok) throw new Error();
        const data = await res.json();

        if (data?.id) {
          revalidate();
        }
      } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
-        setError(errorData?.message);
+        setError(e.response.data.message);
        setAuthToken(undefined);
        setProcessing(false);
      }
@@ -86,15 +78,6 @@ const Login = () => {
    revalidateOnFocus: false,
  });

-  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">
      <PageTitle title={intl.formatMessage(messages.signin)} />
@@ -161,10 +144,12 @@ const Login = () => {
                    {settings.currentSettings.mediaServerType ==
                    MediaServerType.PLEX
                      ? intl.formatMessage(messages.signinwithplex)
-                      : intl.formatMessage(
-                          messages.signinwithjellyfin,
-                          mediaServerFormatValues
-                        )}
+                      : intl.formatMessage(messages.signinwithjellyfin, {
+                          mediaServerName:
+                            publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                              ? 'Emby'
+                              : 'Jellyfin',
+                        })}
                  </button>
                  <AccordionContent isOpen={openIndexes.includes(0)}>
                    <div className="px-10 py-8">
--- a/src/components/ManageSlideOver/index.tsx
+++ b/src/components/ManageSlideOver/index.tsx
@@ -26,6 +26,7 @@ import type { MediaWatchDataResponse } from '@server/interfaces/api/mediaInterfa
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import getConfig from 'next/config';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
@@ -94,6 +95,7 @@ const ManageSlideOver = ({
  const { user: currentUser, hasPermission } = useUser();
  const intl = useIntl();
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();
  const { data: watchData } = useSWR<MediaWatchDataResponse>(
    settings.currentSettings.mediaServerType === MediaServerType.PLEX &&
      data.mediaInfo &&
@@ -115,7 +117,6 @@ const ManageSlideOver = ({
      });
      if (!res.ok) throw new Error();
      revalidate();
-      onClose();
    }
  };

@@ -132,7 +133,6 @@ const ManageSlideOver = ({
      if (!res2.ok) throw new Error();

      revalidate();
-      onClose();
    }
  };

@@ -659,8 +659,7 @@ const ManageSlideOver = ({
                      mediaType === 'movie' ? messages.movie : messages.tvshow
                    ),
                    mediaServerName:
-                      settings.currentSettings.mediaServerType ===
-                      MediaServerType.EMBY
+                      publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
                        ? 'Emby'
                        : settings.currentSettings.mediaServerType ===
                          MediaServerType.PLEX
--- a/src/components/MediaSlider/ShowMoreCard/index.tsx
+++ b/src/components/MediaSlider/ShowMoreCard/index.tsx
@@ -57,48 +57,44 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
      >
        <div style={{ paddingBottom: '150%' }}>
          <div className="absolute inset-0 flex h-full w-full flex-col items-center p-2">
-            <div className="relative z-10 grid h-full w-full grid-cols-2 items-center justify-center gap-2 opacity-30">
+            <div className="relative z-10 flex h-full flex-wrap items-center justify-center opacity-30">
              {posters[0] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                  <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[0]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[0]}`}
                    alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                  />
                </div>
              )}
              {posters[1] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                  <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[1]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[1]}`}
                    alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                  />
                </div>
              )}
              {posters[2] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                  <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[2]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[2]}`}
                    alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                  />
                </div>
              )}
              {posters[3] && (
-                <div className="">
+                <div className="w-1/2 p-1">
                  <Image
-                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[3]}`}
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[3]}`}
                    alt=""
-                    className="rounded-md"
-                    width={300}
-                    height={450}
+                    className="w-full rounded-md"
+                    fill
                  />
                </div>
              )}
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -3,7 +3,6 @@ import RTAudRotten from '@app/assets/rt_aud_rotten.svg';
 import RTFresh from '@app/assets/rt_fresh.svg';
 import RTRotten from '@app/assets/rt_rotten.svg';
 import ImdbLogo from '@app/assets/services/imdb.svg';
-import Spinner from '@app/assets/spinner.svg';
 import TmdbLogo from '@app/assets/tmdb_logo.svg';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -26,7 +25,7 @@ import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
-import ErrorPage from '@app/pages/_error';
+import Error from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
 import defineMessages from '@app/utils/defineMessages';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
@@ -42,22 +41,20 @@ import {
 import {
  ChevronDoubleDownIcon,
  ChevronDoubleUpIcon,
-  MinusCircleIcon,
-  StarIcon,
 } from '@heroicons/react/24/solid';
 import { type RatingResponse } from '@server/api/ratings';
 import { IssueStatus } from '@server/constants/issue';
-import { MediaStatus, MediaType } from '@server/constants/media';
+import { MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
 import { countries } from 'country-flag-icons';
 import 'country-flag-icons/3x2/flags.css';
 import { uniqBy } from 'lodash';
+import getConfig from 'next/config';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';

 const messages = defineMessages('components.MovieDetails', {
@@ -97,12 +94,6 @@ const messages = defineMessages('components.MovieDetails', {
  rtaudiencescore: 'Rotten Tomatoes Audience Score',
  tmdbuserscore: 'TMDB User Score',
  imdbuserscore: 'IMDB User Score',
-  watchlistSuccess: '<strong>{title}</strong> added to watchlist successfully!',
-  watchlistDeleted:
-    '<strong>{title}</strong> Removed from watchlist successfully!',
-  watchlistError: 'Something went wrong try again.',
-  removefromwatchlist: 'Remove From Watchlist',
-  addtowatchlist: 'Add To Watchlist',
 });

 interface MovieDetailsProps {
@@ -121,11 +112,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
  const minStudios = 3;
  const [showMoreStudios, setShowMoreStudios] = useState(false);
  const [showIssueModal, setShowIssueModal] = useState(false);
-  const [isUpdating, setIsUpdating] = useState<boolean>(false);
-  const [toggleWatchlist, setToggleWatchlist] = useState<boolean>(
-    !movie?.onUserWatchlist
-  );
-  const { addToast } = useToasts();
+  const { publicRuntimeConfig } = getConfig();

  const {
    data,
@@ -167,7 +154,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
  }

  if (!data) {
-    return <ErrorPage statusCode={404} />;
+    return <Error statusCode={404} />;
  }

  const showAllStudios = data.productionCompanies.length <= minStudios + 1;
@@ -277,7 +264,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
      ?.flatrate ?? [];

  function getAvalaibleMediaServerName() {
-    if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) {
+    if (publicRuntimeConfig.JELLYFIN_TYPE === 'emby') {
      return intl.formatMessage(messages.play, { mediaServerName: 'Emby' });
    }

@@ -289,8 +276,8 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
  }

  function getAvalaible4kMediaServerName() {
-    if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) {
-      return intl.formatMessage(messages.play, { mediaServerName: 'Emby' });
+    if (publicRuntimeConfig.JELLYFIN_TYPE === 'emby') {
+      return intl.formatMessage(messages.play4k, { mediaServerName: 'Emby' });
    }

    if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) {
@@ -300,80 +287,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
    return intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' });
  }

-  const onClickWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/watchlist', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        tmdbId: movie?.id,
-        mediaType: MediaType.MOVIE,
-        title: movie?.title,
-      }),
-    });
-
-    if (!res.ok) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    const data = await res.json();
-
-    if (data) {
-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistSuccess, {
-            title: movie?.title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    }
-
-    setIsUpdating(false);
-    setToggleWatchlist((prevState) => !prevState);
-  };
-
-  const onClickDeleteWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-    try {
-      const res = await fetch(`/api/v1/watchlist/${movie?.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
-
-      if (res.status === 204) {
-        addToast(
-          <span>
-            {intl.formatMessage(messages.watchlistDeleted, {
-              title: movie?.title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'info', autoDismiss: true }
-        );
-      }
-    } catch (e) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    } finally {
-      setIsUpdating(false);
-      setToggleWatchlist((prevState) => !prevState);
-    }
-  };
-
  return (
    <div
      className="media-page"
@@ -495,40 +408,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
          </span>
        </div>
        <div className="media-actions">
-          <>
-            {toggleWatchlist ? (
-              <Tooltip content={intl.formatMessage(messages.addtowatchlist)}>
-                <Button
-                  buttonType={'ghost'}
-                  className="z-40 mr-2"
-                  buttonSize={'md'}
-                  onClick={onClickWatchlistBtn}
-                >
-                  {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}
-                >
-                  {isUpdating ? (
-                    <Spinner className="h-3" />
-                  ) : (
-                    <MinusCircleIcon className={'h-3'} />
-                  )}
-                </Button>
-              </Tooltip>
-            )}
-          </>
          <PlayButton links={mediaLinks} />
          <RequestButton
            mediaType="movie"
--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -19,7 +19,6 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import Image from 'next/image';
@@ -59,7 +58,7 @@ const RequestCardPlaceholder = () => {
 };

 interface RequestCardErrorProps {
-  requestData?: NonFunctionProperties<MediaRequest>;
+  requestData?: MediaRequest;
 }

 const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
@@ -214,7 +213,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
 };

 interface RequestCardProps {
-  request: NonFunctionProperties<MediaRequest>;
+  request: MediaRequest;
  onTitleData?: (requestId: number, title: MovieDetails | TvDetails) => void;
 }

@@ -239,19 +238,16 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
    data: requestData,
    error: requestError,
    mutate: revalidate,
-  } = useSWR<NonFunctionProperties<MediaRequest>>(
-    `/api/v1/request/${request.id}`,
-    {
-      fallbackData: request,
-      refreshInterval: refreshIntervalHelper(
-        {
-          downloadStatus: request.media.downloadStatus,
-          downloadStatus4k: request.media.downloadStatus4k,
-        },
-        15000
-      ),
-    }
-  );
+  } = useSWR<MediaRequest>(`/api/v1/request/${request.id}`, {
+    fallbackData: request,
+    refreshInterval: refreshIntervalHelper(
+      {
+        downloadStatus: request.media.downloadStatus,
+        downloadStatus4k: request.media.downloadStatus4k,
+      },
+      15000
+    ),
+  });

  const { mediaUrl: plexUrl, mediaUrl4k: plexUrl4k } = useDeepLinks({
    mediaUrl: requestData?.media?.mediaUrl,
--- a/src/components/RequestList/RequestItem/index.tsx
+++ b/src/components/RequestList/RequestItem/index.tsx
@@ -18,7 +18,6 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import Image from 'next/image';
@@ -43,7 +42,6 @@ const messages = defineMessages('components.RequestList.RequestItem', {
  tmdbid: 'TMDB ID',
  tvdbid: 'TheTVDB ID',
  unknowntitle: 'Unknown Title',
-  profileName: 'Profile',
 });

 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
@@ -51,7 +49,7 @@ const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
 };

 interface RequestItemErrorProps {
-  requestData?: NonFunctionProperties<MediaRequest>;
+  requestData?: MediaRequest;
  revalidateList: () => void;
 }

@@ -287,7 +285,7 @@ const RequestItemError = ({
 };

 interface RequestItemProps {
-  request: NonFunctionProperties<MediaRequest> & { profileName?: string };
+  request: MediaRequest;
  revalidateList: () => void;
 }

@@ -306,18 +304,19 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
  const { data: title, error } = useSWR<MovieDetails | TvDetails>(
    inView ? url : null
  );
-  const { data: requestData, mutate: revalidate } = useSWR<
-    NonFunctionProperties<MediaRequest>
-  >(`/api/v1/request/${request.id}`, {
-    fallbackData: request,
-    refreshInterval: refreshIntervalHelper(
-      {
-        downloadStatus: request.media.downloadStatus,
-        downloadStatus4k: request.media.downloadStatus4k,
-      },
-      15000
-    ),
-  });
+  const { data: requestData, mutate: revalidate } = useSWR<MediaRequest>(
+    `/api/v1/request/${request.id}`,
+    {
+      fallbackData: request,
+      refreshInterval: refreshIntervalHelper(
+        {
+          downloadStatus: request.media.downloadStatus,
+          downloadStatus4k: request.media.downloadStatus4k,
+        },
+        15000
+      ),
+    }
+  );

  const [isRetrying, setRetrying] = useState(false);

@@ -402,7 +401,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
          setShowEditModal(false);
        }}
      />
-      <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-2 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
+      <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
        {title.backdropPath && (
          <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
            <CachedImage
@@ -483,7 +482,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
              )}
            </div>
          </div>
-          <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center gap-1 overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
+          <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
            <div className="card-field">
              <span className="card-field-name">
                {intl.formatMessage(globalMessages.status)}
@@ -633,16 +632,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                </span>
              </div>
            )}
-            {request.profileName && (
-              <div className="card-field">
-                <span className="card-field-name">
-                  {intl.formatMessage(messages.profileName)}
-                </span>
-                <span className="flex truncate text-sm text-gray-300">
-                  {request.profileName}
-                </span>
-              </div>
-            )}
          </div>
        </div>
        <div className="z-10 mt-4 flex w-full flex-col justify-center space-y-2 pl-4 pr-4 xl:mt-0 xl:w-96 xl:items-end xl:pl-0">
--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -8,7 +8,6 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { MovieDetails } from '@server/models/Movie';
@@ -39,7 +38,7 @@ const messages = defineMessages('components.RequestModal', {
 interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
  tmdbId: number;
  is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
  onCancel?: () => void;
  onComplete?: (newStatus: MediaStatus) => void;
  onUpdating?: (isUpdating: boolean) => void;
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -13,7 +13,6 @@ import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type SeasonRequest from '@server/entity/SeasonRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { TvDetails } from '@server/models/Tv';
@@ -58,7 +57,7 @@ interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
  onComplete?: (newStatus: MediaStatus) => void;
  onUpdating?: (isUpdating: boolean) => void;
  is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
 }

 const TvRequestModal = ({
--- a/src/components/RequestModal/index.tsx
+++ b/src/components/RequestModal/index.tsx
@@ -4,14 +4,13 @@ import TvRequestModal from '@app/components/RequestModal/TvRequestModal';
 import { Transition } from '@headlessui/react';
 import type { MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';

 interface RequestModalProps {
  show: boolean;
  type: 'movie' | 'tv' | 'collection';
  tmdbId: number;
  is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
  onComplete?: (newStatus: MediaStatus) => void;
  onCancel?: () => void;
  onUpdating?: (isUpdating: boolean) => void;
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -33,13 +33,6 @@ const messages = defineMessages('components.Selector', {
  nooptions: 'No results.',
  showmore: 'Show More',
  showless: 'Show Less',
-  searchStatus: 'Select status...',
-  returningSeries: 'Returning Series',
-  planned: 'Planned',
-  inProduction: 'In Production',
-  ended: 'Ended',
-  canceled: 'Canceled',
-  pilot: 'Pilot',
 });

 type SingleVal = {
@@ -211,75 +204,6 @@ export const GenreSelector = ({
  );
 };

-export const StatusSelector = ({
-  isMulti,
-  defaultValue,
-  onChange,
-}: BaseSelectorMultiProps | BaseSelectorSingleProps) => {
-  const intl = useIntl();
-  const [defaultDataValue, setDefaultDataValue] = useState<
-    { label: string; value: number }[] | null
-  >(null);
-
-  const options = useMemo(
-    () => [
-      { name: intl.formatMessage(messages.returningSeries), id: 0 },
-      { name: intl.formatMessage(messages.planned), id: 1 },
-      { name: intl.formatMessage(messages.inProduction), id: 2 },
-      { name: intl.formatMessage(messages.ended), id: 3 },
-      { name: intl.formatMessage(messages.canceled), id: 4 },
-      { name: intl.formatMessage(messages.pilot), id: 5 },
-    ],
-    [intl]
-  );
-
-  useEffect(() => {
-    const loadDefaultStatus = async (): Promise<void> => {
-      if (!defaultValue) {
-        return;
-      }
-      const statuses = defaultValue.split('|');
-
-      const statusData = options
-        .filter((opt) => statuses.find((s) => Number(s) === opt.id))
-        .map((o) => ({
-          label: o.name,
-          value: o.id,
-        }));
-
-      setDefaultDataValue(statusData);
-    };
-
-    loadDefaultStatus();
-  }, [defaultValue, options]);
-
-  const loadStatusOptions = async () => {
-    return options
-      .map((result) => ({
-        label: result.name,
-        value: result.id,
-      }))
-      .filter(({ label }) => label.toLowerCase());
-  };
-
-  return (
-    <AsyncSelect
-      key={`status-select-${defaultDataValue}`}
-      className="react-select-container"
-      classNamePrefix="react-select"
-      defaultValue={isMulti ? defaultDataValue : defaultDataValue?.[0]}
-      defaultOptions
-      isMulti={isMulti}
-      loadOptions={loadStatusOptions}
-      placeholder={intl.formatMessage(messages.searchStatus)}
-      onChange={(value) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        onChange(value as any);
-      }}
-    />
-  );
-};
-
 export const KeywordSelector = ({
  isMulti,
  defaultValue,
--- a/src/components/Settings/SettingsJellyfin.tsx
+++ b/src/components/Settings/SettingsJellyfin.tsx
@@ -1,16 +1,14 @@
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
-import SensitiveInput from '@app/components/Common/SensitiveInput';
 import LibraryItem from '@app/components/Settings/LibraryItem';
-import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import { ApiErrorCode } from '@server/constants/error';
-import { MediaServerType } from '@server/constants/server';
 import type { JellyfinSettings } from '@server/lib/settings';
 import { Field, Formik } from 'formik';
+import getConfig from 'next/config';
 import { useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -32,14 +30,13 @@ const messages = defineMessages('components.Settings', {
  jellyfinSettingsSuccess: '{mediaServerName} settings saved successfully!',
  jellyfinSettings: '{mediaServerName} Settings',
  jellyfinSettingsDescription:
-    'Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page. You can also change the Jellyfin API key, which was automatically generated previously.',
+    'Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.',
  externalUrl: 'External URL',
  hostname: 'Hostname or IP Address',
  port: 'Port',
  enablessl: 'Use SSL',
  urlBase: 'URL Base',
  jellyfinForgotPasswordUrl: 'Forgot Password URL',
-  apiKey: 'API key',
  jellyfinSyncFailedNoLibrariesFound: 'No libraries were found',
  jellyfinSyncFailedAutomaticGroupedFolders:
    'Custom authentication with Automatic Library Grouping not supported',
@@ -62,9 +59,6 @@ const messages = defineMessages('components.Settings', {
  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',
-  tip: 'Tip',
-  scanbackground:
-    'Scanning will run in the background. You can continue the setup process in the meantime.',
 });

 interface Library {
@@ -82,13 +76,13 @@ interface SyncStatus {
 }

 interface SettingsJellyfinProps {
-  isSetupSettings?: boolean;
+  showAdvancedSettings?: boolean;
  onComplete?: () => void;
 }

 const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
  onComplete,
-  isSetupSettings,
+  showAdvancedSettings,
 }) => {
  const [isSyncing, setIsSyncing] = useState(false);
  const toasts = useToasts();
@@ -106,7 +100,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
  );
  const intl = useIntl();
  const { addToast } = useToasts();
-  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();

  const JellyfinSettingsSchema = Yup.object().shape({
    hostname: Yup.string()
@@ -179,18 +173,11 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
      const res = await fetch(
        `/api/v1/settings/jellyfin/library?${searchParams.toString()}`
      );
-      if (!res.ok) throw new Error(res.statusText, { cause: res });
+      if (!res.ok) throw new Error();
      setIsSyncing(false);
      revalidate();
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
-      if (errorData?.message === 'SYNC_ERROR_GROUPED_FOLDERS') {
+      if (e.response.data.message === 'SYNC_ERROR_GROUPED_FOLDERS') {
        toasts.addToast(
          intl.formatMessage(
            messages.jellyfinSyncFailedAutomaticGroupedFolders
@@ -200,7 +187,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
            appearance: 'warning',
          }
        );
-      } else if (errorData?.message === 'SYNC_ERROR_NO_LIBRARIES') {
+      } else if (e.response.data.message === 'SYNC_ERROR_NO_LIBRARIES') {
        toasts.addToast(
          intl.formatMessage(messages.jellyfinSyncFailedNoLibrariesFound),
          {
@@ -265,7 +252,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({

      const searchParams = new URLSearchParams(params.enable ? params : {});
      const res = await fetch(
-        `/api/v1/settings/jellyfin/library?${searchParams.toString()}`
+        `/api/v1/settings/jellyfin/library?${searchParams.toString}`
      );
      if (!res.ok) throw new Error();
    } else {
@@ -288,29 +275,26 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
    return <LoadingSpinner />;
  }

-  const mediaServerFormatValues = {
-    mediaServerName:
-      settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-        ? 'Jellyfin'
-        : settings.currentSettings.mediaServerType === MediaServerType.EMBY
-        ? 'Emby'
-        : undefined,
-  };
-
  return (
    <>
      <div className="mb-6">
        <h3 className="heading">
-          {intl.formatMessage(
-            messages.jellyfinlibraries,
-            mediaServerFormatValues
-          )}
+          {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+            ? intl.formatMessage(messages.jellyfinlibraries, {
+                mediaServerName: 'Emby',
+              })
+            : intl.formatMessage(messages.jellyfinlibraries, {
+                mediaServerName: 'Jellyfin',
+              })}
        </h3>
        <p className="description">
-          {intl.formatMessage(
-            messages.jellyfinlibrariesDescription,
-            mediaServerFormatValues
-          )}
+          {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+            ? intl.formatMessage(messages.jellyfinlibrariesDescription, {
+                mediaServerName: 'Emby',
+              })
+            : intl.formatMessage(messages.jellyfinlibrariesDescription, {
+                mediaServerName: 'Jellyfin',
+              })}
        </p>
      </div>
      <div className="section">
@@ -347,10 +331,13 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
          <FormattedMessage {...messages.manualscanJellyfin} />
        </h3>
        <p className="description">
-          {intl.formatMessage(
-            messages.manualscanDescriptionJellyfin,
-            mediaServerFormatValues
-          )}
+          {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+            ? intl.formatMessage(messages.manualscanDescriptionJellyfin, {
+                mediaServerName: 'Emby',
+              })
+            : intl.formatMessage(messages.manualscanDescriptionJellyfin, {
+                mediaServerName: 'Jellyfin',
+              })}
        </p>
      </div>
      <div className="section">
@@ -450,117 +437,112 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
          </div>
        </div>
      </div>
-      {isSetupSettings && (
-        <div className="text-sm text-gray-500">
-          <span className="mr-2">
-            <Badge>{intl.formatMessage(messages.tip)}</Badge>
-          </span>
-          {intl.formatMessage(messages.scanbackground)}
-        </div>
-      )}
-      <div className="mt-10 mb-6">
-        <h3 className="heading">
-          {intl.formatMessage(
-            messages.jellyfinSettings,
-            mediaServerFormatValues
-          )}
-        </h3>
-        <p className="description">
-          {intl.formatMessage(
-            messages.jellyfinSettingsDescription,
-            mediaServerFormatValues
-          )}
-        </p>
-      </div>
-      <Formik
-        initialValues={{
-          hostname: data?.ip,
-          port: data?.port ?? 8096,
-          useSsl: data?.useSsl,
-          urlBase: data?.urlBase || '',
-          jellyfinExternalUrl: data?.externalHostname || '',
-          jellyfinForgotPasswordUrl: data?.jellyfinForgotPasswordUrl || '',
-          apiKey: data?.apiKey,
-        }}
-        validationSchema={JellyfinSettingsSchema}
-        onSubmit={async (values) => {
-          try {
-            const res = await fetch('/api/v1/settings/jellyfin', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                ip: values.hostname,
-                port: Number(values.port),
-                useSsl: values.useSsl,
-                urlBase: values.urlBase,
-                externalHostname: values.jellyfinExternalUrl,
-                jellyfinForgotPasswordUrl: values.jellyfinForgotPasswordUrl,
-                apiKey: values.apiKey,
-              } as JellyfinSettings),
-            });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
+      {showAdvancedSettings && (
+        <>
+          <div className="mt-10 mb-6">
+            <h3 className="heading">
+              {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                ? intl.formatMessage(messages.jellyfinSettings, {
+                    mediaServerName: 'Emby',
+                  })
+                : intl.formatMessage(messages.jellyfinSettings, {
+                    mediaServerName: 'Jellyfin',
+                  })}
+            </h3>
+            <p className="description">
+              {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                ? intl.formatMessage(messages.jellyfinSettingsDescription, {
+                    mediaServerName: 'Emby',
+                  })
+                : intl.formatMessage(messages.jellyfinSettingsDescription, {
+                    mediaServerName: 'Jellyfin',
+                  })}
+            </p>
+          </div>
+          <Formik
+            initialValues={{
+              hostname: data?.ip,
+              port: data?.port ?? 8096,
+              useSsl: data?.useSsl,
+              urlBase: data?.urlBase || '',
+              jellyfinExternalUrl: data?.externalHostname || '',
+              jellyfinForgotPasswordUrl: data?.jellyfinForgotPasswordUrl || '',
+            }}
+            validationSchema={JellyfinSettingsSchema}
+            onSubmit={async (values) => {
+              try {
+                const res = await fetch('/api/v1/settings/jellyfin', {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                  body: JSON.stringify({
+                    ip: values.hostname,
+                    port: Number(values.port),
+                    useSsl: values.useSsl,
+                    urlBase: values.urlBase,
+                    externalHostname: values.jellyfinExternalUrl,
+                    jellyfinForgotPasswordUrl: values.jellyfinForgotPasswordUrl,
+                  } as JellyfinSettings),
+                });
+                if (!res.ok) throw new Error();

-            addToast(
-              intl.formatMessage(
-                messages.jellyfinSettingsSuccess,
-                mediaServerFormatValues
-              ),
-              {
-                autoDismiss: true,
-                appearance: 'success',
+                addToast(
+                  intl.formatMessage(messages.jellyfinSettingsSuccess, {
+                    mediaServerName:
+                      publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                        ? 'Emby'
+                        : 'Jellyfin',
+                  }),
+                  {
+                    autoDismiss: true,
+                    appearance: 'success',
+                  }
+                );
+              } catch (e) {
+                if (e.response?.data?.message === ApiErrorCode.InvalidUrl) {
+                  addToast(
+                    intl.formatMessage(messages.invalidurlerror, {
+                      mediaServerName:
+                        publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                          ? 'Emby'
+                          : 'Jellyfin',
+                    }),
+                    {
+                      autoDismiss: true,
+                      appearance: 'error',
+                    }
+                  );
+                } else {
+                  addToast(
+                    intl.formatMessage(messages.jellyfinSettingsFailure, {
+                      mediaServerName:
+                        publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                          ? 'Emby'
+                          : 'Jellyfin',
+                    }),
+                    {
+                      autoDismiss: true,
+                      appearance: 'error',
+                    }
+                  );
+                }
+              } finally {
+                revalidate();
              }
-            );
-          } catch (e) {
-            let errorData;
-            try {
-              errorData = await e.cause?.text();
-              errorData = JSON.parse(errorData);
-            } catch {
-              /* empty */
-            }
-            if (errorData?.message === ApiErrorCode.InvalidUrl) {
-              addToast(
-                intl.formatMessage(
-                  messages.invalidurlerror,
-                  mediaServerFormatValues
-                ),
-                {
-                  autoDismiss: true,
-                  appearance: 'error',
-                }
-              );
-            } else {
-              addToast(
-                intl.formatMessage(
-                  messages.jellyfinSettingsFailure,
-                  mediaServerFormatValues
-                ),
-                {
-                  autoDismiss: true,
-                  appearance: 'error',
-                }
-              );
-            }
-          } finally {
-            revalidate();
-          }
-        }}
-      >
-        {({
-          errors,
-          touched,
-          values,
-          setFieldValue,
-          handleSubmit,
-          isSubmitting,
-          isValid,
-        }) => {
-          return (
-            <form className="section" onSubmit={handleSubmit}>
-              {!isSetupSettings && (
-                <>
+            }}
+          >
+            {({
+              errors,
+              touched,
+              values,
+              setFieldValue,
+              handleSubmit,
+              isSubmitting,
+              isValid,
+            }) => {
+              return (
+                <form className="section" onSubmit={handleSubmit}>
                  <div className="form-row">
                    <label htmlFor="hostname" className="text-label">
                      {intl.formatMessage(messages.hostname)}
@@ -622,29 +604,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                      />
                    </div>
                  </div>
-                </>
-              )}
-              <div className="form-row">
-                <label htmlFor="apiKey" className="text-label">
-                  {intl.formatMessage(messages.apiKey)}
-                </label>
-                <div className="form-input-area">
-                  <div className="form-input-field">
-                    <SensitiveInput
-                      as="field"
-                      type="text"
-                      inputMode="url"
-                      id="apiKey"
-                      name="apiKey"
-                    />
-                  </div>
-                  {errors.apiKey && touched.apiKey && (
-                    <div className="error">{errors.apiKey}</div>
-                  )}
-                </div>
-              </div>
-              {!isSetupSettings && (
-                <>
                  <div className="form-row">
                    <label htmlFor="urlBase" className="text-label">
                      {intl.formatMessage(messages.urlBase)}
@@ -665,75 +624,75 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                        )}
                    </div>
                  </div>
-                </>
-              )}
-              <div className="form-row">
-                <label htmlFor="jellyfinExternalUrl" className="text-label">
-                  {intl.formatMessage(messages.externalUrl)}
-                </label>
-                <div className="form-input-area">
-                  <div className="form-input-field">
-                    <Field
-                      type="text"
-                      inputMode="url"
-                      id="jellyfinExternalUrl"
-                      name="jellyfinExternalUrl"
-                    />
-                  </div>
-                  {errors.jellyfinExternalUrl &&
-                    touched.jellyfinExternalUrl && (
-                      <div className="error">{errors.jellyfinExternalUrl}</div>
-                    )}
-                </div>
-              </div>
-              <div className="form-row">
-                <label
-                  htmlFor="jellyfinForgotPasswordUrl"
-                  className="text-label"
-                >
-                  {intl.formatMessage(messages.jellyfinForgotPasswordUrl)}
-                </label>
-                <div className="form-input-area">
-                  <div className="form-input-field">
-                    <Field
-                      type="text"
-                      inputMode="url"
-                      id="jellyfinForgotPasswordUrl"
-                      name="jellyfinForgotPasswordUrl"
-                    />
-                  </div>
-                  {errors.jellyfinForgotPasswordUrl &&
-                    touched.jellyfinForgotPasswordUrl && (
-                      <div className="error">
-                        {errors.jellyfinForgotPasswordUrl}
+                  <div className="form-row">
+                    <label htmlFor="jellyfinExternalUrl" className="text-label">
+                      {intl.formatMessage(messages.externalUrl)}
+                    </label>
+                    <div className="form-input-area">
+                      <div className="form-input-field">
+                        <Field
+                          type="text"
+                          inputMode="url"
+                          id="jellyfinExternalUrl"
+                          name="jellyfinExternalUrl"
+                        />
                      </div>
-                    )}
-                </div>
-              </div>
-              <div
-                className={`actions ${isSetupSettings ? 'mt-0 border-0' : ''}`}
-              >
-                <div className="flex justify-end">
-                  <span className="ml-3 inline-flex rounded-md shadow-sm">
-                    <Button
-                      buttonType="primary"
-                      type="submit"
-                      disabled={isSubmitting || !isValid}
+                      {errors.jellyfinExternalUrl &&
+                        touched.jellyfinExternalUrl && (
+                          <div className="error">
+                            {errors.jellyfinExternalUrl}
+                          </div>
+                        )}
+                    </div>
+                  </div>
+                  <div className="form-row">
+                    <label
+                      htmlFor="jellyfinForgotPasswordUrl"
+                      className="text-label"
                    >
-                      <ArrowDownOnSquareIcon />
-                      <span>
-                        {isSubmitting
-                          ? intl.formatMessage(globalMessages.saving)
-                          : intl.formatMessage(globalMessages.save)}
+                      {intl.formatMessage(messages.jellyfinForgotPasswordUrl)}
+                    </label>
+                    <div className="form-input-area">
+                      <div className="form-input-field">
+                        <Field
+                          type="text"
+                          inputMode="url"
+                          id="jellyfinForgotPasswordUrl"
+                          name="jellyfinForgotPasswordUrl"
+                        />
+                      </div>
+                      {errors.jellyfinForgotPasswordUrl &&
+                        touched.jellyfinForgotPasswordUrl && (
+                          <div className="error">
+                            {errors.jellyfinForgotPasswordUrl}
+                          </div>
+                        )}
+                    </div>
+                  </div>
+                  <div className="actions">
+                    <div className="flex justify-end">
+                      <span className="ml-3 inline-flex rounded-md shadow-sm">
+                        <Button
+                          buttonType="primary"
+                          type="submit"
+                          disabled={isSubmitting || !isValid}
+                        >
+                          <ArrowDownOnSquareIcon />
+                          <span>
+                            {isSubmitting
+                              ? intl.formatMessage(globalMessages.saving)
+                              : intl.formatMessage(globalMessages.save)}
+                          </span>
+                        </Button>
                      </span>
-                    </Button>
-                  </span>
-                </div>
-              </div>
-            </form>
-          );
-        }}
-      </Formik>
+                    </div>
+                  </div>
+                </form>
+              );
+            }}
+          </Formik>
+        </>
+      )}
    </>
  );
 };
--- a/src/components/Settings/SettingsJobsCache/index.tsx
+++ b/src/components/Settings/SettingsJobsCache/index.tsx
@@ -7,7 +7,6 @@ import PageTitle from '@app/components/Common/PageTitle';
 import Table from '@app/components/Common/Table';
 import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
-
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { formatBytes } from '@app/utils/numberHelpers';
@@ -58,8 +57,8 @@ const messages: { [messageName: string]: MessageDescriptor } = defineMessages(
    'plex-recently-added-scan': 'Plex Recently Added Scan',
    'plex-full-scan': 'Plex Full Library Scan',
    'plex-watchlist-sync': 'Plex Watchlist Sync',
-    'jellyfin-full-scan': 'Jellyfin Full Library Scan',
    'jellyfin-recently-added-scan': 'Jellyfin Recently Added Scan',
+    'jellyfin-full-scan': 'Jellyfin Full Library Scan',
    'availability-sync': 'Media Availability Sync',
    'radarr-scan': 'Radarr Scan',
    'sonarr-scan': 'Sonarr Scan',
@@ -168,20 +167,6 @@ const SettingsJobs = () => {
  const [isSaving, setIsSaving] = useState(false);
  const settings = useSettings();

-  if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) {
-    messages['jellyfin-recently-added-scan'] = {
-      id: 'jellyfin-recently-added-scan',
-      defaultMessage: 'Emby Recently Added Scan',
-    };
-  }
-
-  if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) {
-    messages['jellyfin-full-scan'] = {
-      id: 'jellyfin-full-scan',
-      defaultMessage: 'Emby Full Library Scan',
-    };
-  }
-
  if (!data && !error) {
    return <LoadingSpinner />;
  }
--- a/src/components/Settings/SettingsLayout.tsx
+++ b/src/components/Settings/SettingsLayout.tsx
@@ -5,6 +5,7 @@ import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaServerType } from '@server/constants/server';
+import getConfig from 'next/config';
 import { useIntl } from 'react-intl';

 const messages = defineMessages('components.Settings', {
@@ -25,6 +26,7 @@ type SettingsLayoutProps = {

 const SettingsLayout = ({ children }: SettingsLayoutProps) => {
  const intl = useIntl();
+  const { publicRuntimeConfig } = getConfig();
  const settings = useSettings();
  const settingsRoutes: SettingsRoute[] = [
    {
@@ -87,11 +89,7 @@ const SettingsLayout = ({ children }: SettingsLayoutProps) => {
  function getAvailableMediaServerName() {
    return intl.formatMessage(messages.menuJellyfinSettings, {
      mediaServerName:
-        settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-          ? 'Jellyfin'
-          : settings.currentSettings.mediaServerType === MediaServerType.EMBY
-          ? 'Emby'
-          : undefined,
+        publicRuntimeConfig.JELLYFIN_TYPE === 'emby' ? 'Emby' : 'Jellyfin',
    });
  }
 };
--- a/src/components/Settings/SettingsUsers/index.tsx
+++ b/src/components/Settings/SettingsUsers/index.tsx
@@ -10,6 +10,7 @@ import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import { MediaServerType } from '@server/constants/server';
 import type { MainSettings } from '@server/lib/settings';
 import { Field, Form, Formik } from 'formik';
+import getConfig from 'next/config';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR, { mutate } from 'swr';
@@ -41,20 +42,12 @@ const SettingsUsers = () => {
    mutate: revalidate,
  } = useSWR<MainSettings>('/api/v1/settings/main');
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();

  if (!data && !error) {
    return <LoadingSpinner />;
  }

-  const mediaServerFormatValues = {
-    mediaServerName:
-      settings.currentSettings.mediaServerType === MediaServerType.JELLYFIN
-        ? 'Jellyfin'
-        : settings.currentSettings.mediaServerType === MediaServerType.EMBY
-        ? 'Emby'
-        : undefined,
-  };
-
  return (
    <>
      <PageTitle
@@ -128,10 +121,16 @@ const SettingsUsers = () => {
                  <label htmlFor="localLogin" className="checkbox-label">
                    {intl.formatMessage(messages.localLogin)}
                    <span className="label-tip">
-                      {intl.formatMessage(
-                        messages.localLoginTip,
-                        mediaServerFormatValues
-                      )}
+                      {intl.formatMessage(messages.localLoginTip, {
+                        mediaServerName:
+                          settings.currentSettings.mediaServerType ===
+                          MediaServerType.PLEX
+                            ? 'Plex'
+                            : settings.currentSettings.mediaServerType ===
+                              MediaServerType.JELLYFIN
+                            ? 'Jellyfin'
+                            : 'Emby',
+                      })}
                    </span>
                  </label>
                  <div className="form-input-area">
@@ -147,15 +146,25 @@ const SettingsUsers = () => {
                </div>
                <div className="form-row">
                  <label htmlFor="newPlexLogin" className="checkbox-label">
-                    {intl.formatMessage(
-                      messages.newPlexLogin,
-                      mediaServerFormatValues
-                    )}
+                    {intl.formatMessage(messages.newPlexLogin, {
+                      mediaServerName:
+                        publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                          ? 'Emby'
+                          : settings.currentSettings.mediaServerType ===
+                            MediaServerType.PLEX
+                          ? 'Plex'
+                          : 'Jellyfin',
+                    })}
                    <span className="label-tip">
-                      {intl.formatMessage(
-                        messages.newPlexLoginTip,
-                        mediaServerFormatValues
-                      )}
+                      {intl.formatMessage(messages.newPlexLoginTip, {
+                        mediaServerName:
+                          publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                            ? 'Emby'
+                            : settings.currentSettings.mediaServerType ===
+                              MediaServerType.PLEX
+                            ? 'Plex'
+                            : 'Jellyfin',
+                      })}
                    </span>
                  </label>
                  <div className="form-input-area">
--- a/src/components/Setup/SetupLogin.tsx
+++ b/src/components/Setup/SetupLogin.tsx
@@ -1,39 +1,32 @@
-import Button from '@app/components/Common/Button';
+import Accordion from '@app/components/Common/Accordion';
 import JellyfinLogin from '@app/components/Login/JellyfinLogin';
 import PlexLoginButton from '@app/components/PlexLoginButton';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaServerType } from '@server/constants/server';
+import getConfig from 'next/config';
 import { useEffect, useState } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';

 const messages = defineMessages('components.Setup', {
  welcome: 'Welcome to Jellyseerr',
  signinMessage: 'Get started by signing in',
-  signin: 'Sign in to your account',
-  signinWithJellyfin: 'Enter your Jellyfin details',
-  signinWithEmby: 'Enter your Emby details',
-  signinWithPlex: 'Enter your Plex details',
-  back: 'Go back',
+  signinWithJellyfin: 'Use your {mediaServerName} account',
+  signinWithPlex: 'Use your Plex account',
 });

 interface LoginWithMediaServerProps {
-  serverType: MediaServerType;
-  onCancel: () => void;
-  onComplete: () => void;
+  onComplete: (onComplete: MediaServerType) => void;
 }

-const SetupLogin: React.FC<LoginWithMediaServerProps> = ({
-  serverType,
-  onCancel,
-  onComplete,
-}) => {
+const SetupLogin: React.FC<LoginWithMediaServerProps> = ({ onComplete }) => {
  const [authToken, setAuthToken] = useState<string | undefined>(undefined);
  const [mediaServerType, setMediaServerType] = useState<MediaServerType>(
    MediaServerType.NOT_CONFIGURED
  );
  const { user, revalidate } = useUser();
-
+  const intl = useIntl();
+  const { publicRuntimeConfig } = getConfig();
  // Effect that is triggered when the `authToken` comes back from the Plex OAuth
  // We take the token and attempt to login. If we get a success message, we will
  // ask swr to revalidate the user which _shouid_ come back with a valid user.
@@ -63,60 +56,71 @@ const SetupLogin: React.FC<LoginWithMediaServerProps> = ({

  useEffect(() => {
    if (user) {
-      onComplete();
+      onComplete(mediaServerType);
    }
  }, [user, mediaServerType, onComplete]);

  return (
-    <div className="p-4">
+    <div>
      <div className="mb-2 flex justify-center text-xl font-bold">
-        <FormattedMessage {...messages.signin} />
+        <FormattedMessage {...messages.welcome} />
      </div>
      <div className="mb-2 flex justify-center pb-6 text-sm">
-        {serverType === MediaServerType.JELLYFIN ? (
-          <FormattedMessage {...messages.signinWithJellyfin} />
-        ) : serverType === MediaServerType.EMBY ? (
-          <FormattedMessage {...messages.signinWithEmby} />
-        ) : (
-          <FormattedMessage {...messages.signinWithPlex} />
-        )}
+        <FormattedMessage {...messages.signinMessage} />
      </div>
-      {serverType === MediaServerType.PLEX && (
-        <>
-          <div
-            className="px-10 py-8"
-            style={{ backgroundColor: 'rgba(0,0,0,0.3)' }}
-          >
-            <PlexLoginButton
-              onAuthToken={(authToken) => {
-                setMediaServerType(MediaServerType.PLEX);
-                setAuthToken(authToken);
-              }}
-            />
-          </div>
-          <div className="mt-4">
-            <Button buttonType="default" onClick={() => onCancel()}>
-              <FormattedMessage {...messages.back} />
-            </Button>
-          </div>
-        </>
-      )}
-      {serverType === MediaServerType.JELLYFIN && (
-        <JellyfinLogin
-          initial={true}
-          revalidate={revalidate}
-          serverType={serverType}
-          onCancel={onCancel}
-        />
-      )}
-      {serverType === MediaServerType.EMBY && (
-        <JellyfinLogin
-          initial={true}
-          revalidate={revalidate}
-          serverType={serverType}
-          onCancel={onCancel}
-        />
-      )}
+      <Accordion single atLeastOne>
+        {({ openIndexes, handleClick, AccordionContent }) => (
+          <>
+            <button
+              className={`w-full cursor-default bg-gray-900 py-2 text-center text-sm text-gray-400 transition-colors duration-200 hover:cursor-pointer hover:bg-gray-700 focus:outline-none sm:rounded-t-lg ${
+                openIndexes.includes(0) && 'text-indigo-500'
+              } ${openIndexes.includes(1) && 'border-b border-gray-500'}`}
+              onClick={() => handleClick(0)}
+            >
+              <FormattedMessage {...messages.signinWithPlex} />
+            </button>
+            <AccordionContent isOpen={openIndexes.includes(0)}>
+              <div
+                className="px-10 py-8"
+                style={{ backgroundColor: 'rgba(0,0,0,0.3)' }}
+              >
+                <PlexLoginButton
+                  onAuthToken={(authToken) => {
+                    setMediaServerType(MediaServerType.PLEX);
+                    setAuthToken(authToken);
+                  }}
+                />
+              </div>
+            </AccordionContent>
+            <div>
+              <button
+                className={`w-full cursor-default bg-gray-900 py-2 text-center text-sm 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)}
+              >
+                {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                  ? intl.formatMessage(messages.signinWithJellyfin, {
+                      mediaServerName: 'Emby',
+                    })
+                  : intl.formatMessage(messages.signinWithJellyfin, {
+                      mediaServerName: 'Jellyfin',
+                    })}
+              </button>
+              <AccordionContent isOpen={openIndexes.includes(1)}>
+                <div
+                  className="rounded-b-lg px-10 py-8"
+                  style={{ backgroundColor: 'rgba(0,0,0,0.3)' }}
+                >
+                  <JellyfinLogin initial={true} revalidate={revalidate} />
+                </div>
+              </AccordionContent>
+            </div>
+          </>
+        )}
+      </Accordion>
    </div>
  );
 };
--- a/src/components/Setup/index.tsx
+++ b/src/components/Setup/index.tsx
@@ -1,7 +1,5 @@
-import EmbyLogo from '@app/assets/services/emby.svg';
-import JellyfinLogo from '@app/assets/services/jellyfin.svg';
-import PlexLogo from '@app/assets/services/plex.svg';
 import AppDataWarning from '@app/components/AppDataWarning';
+import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import ImageFader from '@app/components/Common/ImageFader';
 import PageTitle from '@app/components/Common/PageTitle';
@@ -11,30 +9,26 @@ import SettingsPlex from '@app/components/Settings/SettingsPlex';
 import SettingsServices from '@app/components/Settings/SettingsServices';
 import SetupSteps from '@app/components/Setup/SetupSteps';
 import useLocale from '@app/hooks/useLocale';
-import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaServerType } from '@server/constants/server';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import useSWR, { mutate } from 'swr';
 import SetupLogin from './SetupLogin';

 const messages = defineMessages('components.Setup', {
-  welcome: 'Welcome to Jellyseerr',
-  subtitle: 'Get started by choosing your media server',
-  configjellyfin: 'Configure Jellyfin',
-  configplex: 'Configure Plex',
-  configemby: 'Configure Emby',
  setup: 'Setup',
  finish: 'Finish Setup',
  finishing: 'Finishing…',
  continue: 'Continue',
-  servertype: 'Choose Server Type',
  signin: 'Sign In',
  configuremediaserver: 'Configure Media Server',
  configureservices: 'Configure Services',
+  tip: 'Tip',
+  scanbackground:
+    'Scanning will run in the background. You can continue the setup process in the meantime.',
 });

 const Setup = () => {
@@ -48,7 +42,6 @@ const Setup = () => {
  );
  const router = useRouter();
  const { locale } = useLocale();
-  const settings = useSettings();

  const finishSetup = async () => {
    setIsUpdating(true);
@@ -83,25 +76,6 @@ const Setup = () => {
    revalidateOnFocus: false,
  });

-  useEffect(() => {
-    if (settings.currentSettings.initialized) {
-      router.push('/');
-    }
-    if (
-      settings.currentSettings.mediaServerType !==
-      MediaServerType.NOT_CONFIGURED
-    ) {
-      setCurrentStep(3);
-      setMediaServerType(settings.currentSettings.mediaServerType);
-    }
-  }, [
-    settings.currentSettings.mediaServerType,
-    settings.currentSettings.initialized,
-    router,
-  ]);
-
-  if (settings.currentSettings.initialized) return <></>;
-
  return (
    <div className="relative flex min-h-screen flex-col justify-center bg-gray-900 py-12">
      <PageTitle title={intl.formatMessage(messages.setup)} />
@@ -127,120 +101,58 @@ const Setup = () => {
          >
            <SetupSteps
              stepNumber={1}
-              description={intl.formatMessage(messages.servertype)}
+              description={intl.formatMessage(messages.signin)}
              active={currentStep === 1}
              completed={currentStep > 1}
            />
            <SetupSteps
              stepNumber={2}
-              description={intl.formatMessage(messages.signin)}
+              description={intl.formatMessage(messages.configuremediaserver)}
              active={currentStep === 2}
              completed={currentStep > 2}
            />
            <SetupSteps
              stepNumber={3}
-              description={intl.formatMessage(messages.configuremediaserver)}
-              active={currentStep === 3}
-              completed={currentStep > 3}
-            />
-            <SetupSteps
-              stepNumber={4}
              description={intl.formatMessage(messages.configureservices)}
-              active={currentStep === 4}
+              active={currentStep === 3}
              isLastStep
            />
          </ul>
        </nav>
        <div className="mt-10 w-full rounded-md border border-gray-600 bg-gray-800 bg-opacity-50 p-4 text-white">
          {currentStep === 1 && (
-            <div className="flex flex-col items-center pb-6">
-              <div className="mb-2 flex justify-center text-xl font-bold">
-                {intl.formatMessage(messages.welcome)}
-              </div>
-              <div className="mb-2 flex justify-center pb-6 text-sm">
-                {intl.formatMessage(messages.subtitle)}
-              </div>
-              <div className="grid grid-cols-3">
-                <div className="flex flex-col divide-y divide-gray-600 rounded-l border border-gray-600 py-2">
-                  <div className="mb-2 flex flex-1 items-center justify-center py-2 px-2">
-                    <JellyfinLogo className="h-10" />
-                  </div>
-                  <div className="px-2 pt-2">
-                    <button
-                      onClick={() => {
-                        setMediaServerType(MediaServerType.JELLYFIN);
-                        setCurrentStep(2);
-                      }}
-                      className="button-md relative z-10 inline-flex h-full w-full items-center justify-center rounded-md border border-gray-600 bg-transparent px-4 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out hover:z-20 hover:border-gray-200 focus:z-20 focus:border-gray-100 focus:outline-none active:border-gray-100"
-                    >
-                      {intl.formatMessage(messages.configjellyfin)}
-                    </button>
-                  </div>
-                </div>
-                <div className="flex flex-col divide-y divide-gray-600 border-y border-gray-600 py-2">
-                  <div className="mb-2 flex flex-1 items-center justify-center py-2 px-2">
-                    <PlexLogo className="h-8" />
-                  </div>
-                  <div className="px-2 pt-2">
-                    <button
-                      onClick={() => {
-                        setMediaServerType(MediaServerType.PLEX);
-                        setCurrentStep(2);
-                      }}
-                      className="button-md relative z-10 inline-flex h-full w-full items-center justify-center rounded-md border border-gray-600 bg-transparent px-4 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out hover:z-20 hover:border-gray-200 focus:z-20 focus:border-gray-100 focus:outline-none active:border-gray-100"
-                    >
-                      {intl.formatMessage(messages.configplex)}
-                    </button>
-                  </div>
-                </div>
-                <div className="flex flex-col divide-y divide-gray-600 rounded-r border border-gray-600 py-2">
-                  <div className="mb-2 flex flex-1 items-center justify-center py-2 px-2">
-                    <EmbyLogo className="h-9" />
-                  </div>
-                  <div className="px-2 pt-2">
-                    <button
-                      onClick={() => {
-                        setMediaServerType(MediaServerType.EMBY);
-                        setCurrentStep(2);
-                      }}
-                      className="button-md relative z-10 inline-flex h-full w-full items-center justify-center rounded-md border border-gray-600 bg-transparent px-4 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out hover:z-20 hover:border-gray-200 focus:z-20 focus:border-gray-100 focus:outline-none active:border-gray-100"
-                    >
-                      {intl.formatMessage(messages.configemby)}
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          )}
-          {currentStep === 2 && (
            <SetupLogin
-              serverType={mediaServerType}
-              onCancel={() => {
-                setMediaServerType(MediaServerType.NOT_CONFIGURED);
-                setCurrentStep(1);
+              onComplete={(mServerType) => {
+                setMediaServerType(mServerType);
+                setCurrentStep(2);
              }}
-              onComplete={() => setCurrentStep(3)}
            />
          )}
-          {currentStep === 3 && (
-            <div className="p-2">
+          {currentStep === 2 && (
+            <div>
              {mediaServerType === MediaServerType.PLEX ? (
                <SettingsPlex
                  onComplete={() => setMediaServerSettingsComplete(true)}
                />
              ) : (
                <SettingsJellyfin
-                  isSetupSettings
+                  showAdvancedSettings={false}
                  onComplete={() => setMediaServerSettingsComplete(true)}
                />
              )}
+              <div className="mt-4 text-sm text-gray-500">
+                <span className="mr-2">
+                  <Badge>{intl.formatMessage(messages.tip)}</Badge>
+                </span>
+                {intl.formatMessage(messages.scanbackground)}
+              </div>
              <div className="actions">
                <div className="flex justify-end">
                  <span className="ml-3 inline-flex rounded-md shadow-sm">
                    <Button
                      buttonType="primary"
                      disabled={!mediaServerSettingsComplete}
-                      onClick={() => setCurrentStep(4)}
+                      onClick={() => setCurrentStep(3)}
                    >
                      {intl.formatMessage(messages.continue)}
                    </Button>
@@ -249,7 +161,7 @@ const Setup = () => {
              </div>
            </div>
          )}
-          {currentStep === 4 && (
+          {currentStep === 3 && (
            <div>
              <SettingsServices />
              <div className="actions">
--- a/src/components/StatusBadge/index.tsx
+++ b/src/components/StatusBadge/index.tsx
@@ -9,6 +9,7 @@ import defineMessages from '@app/utils/defineMessages';
 import { MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { DownloadingItem } from '@server/lib/downloadtracker';
+import getConfig from 'next/config';
 import { useIntl } from 'react-intl';

 const messages = defineMessages('components.StatusBadge', {
@@ -17,7 +18,6 @@ const messages = defineMessages('components.StatusBadge', {
  playonplex: 'Play on {mediaServerName}',
  openinarr: 'Open in {arr}',
  managemedia: 'Manage {mediaType}',
-  seasonnumber: 'S{seasonNumber}',
  seasonepisodenumber: 'S{seasonNumber}E{episodeNumber}',
 });

@@ -47,6 +47,7 @@ const StatusBadge = ({
  const intl = useIntl();
  const { hasPermission } = useUser();
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();

  let mediaLink: string | undefined;
  let mediaLinkDescription: string | undefined;
@@ -84,7 +85,7 @@ const StatusBadge = ({
    mediaLink = plexUrl;
    mediaLinkDescription = intl.formatMessage(messages.playonplex, {
      mediaServerName:
-        settings.currentSettings.mediaServerType === MediaServerType.EMBY
+        publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
          ? 'Emby'
          : settings.currentSettings.mediaServerType === MediaServerType.PLEX
          ? 'Plex'
@@ -106,34 +107,22 @@ const StatusBadge = ({
    }
  }

-  const tooltipContent =
-    mediaType === 'tv' &&
-    downloadItem.length > 1 &&
-    downloadItem.every(
-      (item) =>
-        item.downloadId && item.downloadId === downloadItem[0].downloadId
-    ) ? (
-      <DownloadBlock
-        downloadItem={downloadItem[0]}
-        title={Array.isArray(title) ? title[0] : title}
-        is4k={is4k}
-      />
-    ) : (
-      <ul>
-        {downloadItem.map((status, index) => (
-          <li
-            key={`dl-status-${status.externalId}-${index}`}
-            className="border-b border-gray-700 last:border-b-0"
-          >
-            <DownloadBlock
-              downloadItem={status}
-              title={Array.isArray(title) ? title[index] : title}
-              is4k={is4k}
-            />
-          </li>
-        ))}
-      </ul>
-    );
+  const tooltipContent = (
+    <ul>
+      {downloadItem.map((status, index) => (
+        <li
+          key={`dl-status-${status.externalId}-${index}`}
+          className="border-b border-gray-700 last:border-b-0"
+        >
+          <DownloadBlock
+            downloadItem={status}
+            title={Array.isArray(title) ? title[index] : title}
+            is4k={is4k}
+          />
+        </li>
+      ))}
+    </ul>
+  );

  const badgeDownloadProgress = (
    <div
@@ -188,27 +177,14 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' &&
-                    downloadItem[0].episode &&
-                    (downloadItem.length > 1 &&
-                    downloadItem.every(
-                      (item) =>
-                        item.downloadId &&
-                        item.downloadId === downloadItem[0].downloadId
-                    ) ? (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonnumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                        })}
-                      </span>
-                    ) : (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonepisodenumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                          episodeNumber: downloadItem[0].episode.episodeNumber,
-                        })}
-                      </span>
-                    ))}
+                  {mediaType === 'tv' && downloadItem[0].episode && (
+                    <span className="ml-1">
+                      {intl.formatMessage(messages.seasonepisodenumber, {
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                      })}
+                    </span>
+                  )}
                  <Spinner className="ml-1 h-3 w-3" />
                </>
              )}
@@ -254,27 +230,14 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' &&
-                    downloadItem[0].episode &&
-                    (downloadItem.length > 1 &&
-                    downloadItem.every(
-                      (item) =>
-                        item.downloadId &&
-                        item.downloadId === downloadItem[0].downloadId
-                    ) ? (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonnumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                        })}
-                      </span>
-                    ) : (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonepisodenumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                          episodeNumber: downloadItem[0].episode.episodeNumber,
-                        })}
-                      </span>
-                    ))}
+                  {mediaType === 'tv' && downloadItem[0].episode && (
+                    <span className="ml-1">
+                      {intl.formatMessage(messages.seasonepisodenumber, {
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                      })}
+                    </span>
+                  )}
                  <Spinner className="ml-1 h-3 w-3" />
                </>
              )}
@@ -320,27 +283,14 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' &&
-                    downloadItem[0].episode &&
-                    (downloadItem.length > 1 &&
-                    downloadItem.every(
-                      (item) =>
-                        item.downloadId &&
-                        item.downloadId === downloadItem[0].downloadId
-                    ) ? (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonnumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                        })}
-                      </span>
-                    ) : (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonepisodenumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                          episodeNumber: downloadItem[0].episode.episodeNumber,
-                        })}
-                      </span>
-                    ))}
+                  {mediaType === 'tv' && downloadItem[0].episode && (
+                    <span className="ml-1">
+                      {intl.formatMessage(messages.seasonepisodenumber, {
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                      })}
+                    </span>
+                  )}
                  <Spinner className="ml-1 h-3 w-3" />
                </>
              )}
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -2,7 +2,6 @@ import RTAudFresh from '@app/assets/rt_aud_fresh.svg';
 import RTAudRotten from '@app/assets/rt_aud_rotten.svg';
 import RTFresh from '@app/assets/rt_fresh.svg';
 import RTRotten from '@app/assets/rt_rotten.svg';
-import Spinner from '@app/assets/spinner.svg';
 import TmdbLogo from '@app/assets/tmdb_logo.svg';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
@@ -41,29 +40,21 @@ import {
  FilmIcon,
  PlayIcon,
 } from '@heroicons/react/24/outline';
-import {
-  ChevronDownIcon,
-  MinusCircleIcon,
-  StarIcon,
-} from '@heroicons/react/24/solid';
+import { ChevronDownIcon } from '@heroicons/react/24/solid';
 import type { RTRating } from '@server/api/rating/rottentomatoes';
 import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { IssueStatus } from '@server/constants/issue';
-import {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { Crew } from '@server/models/common';
 import type { TvDetails as TvDetailsType } from '@server/models/Tv';
 import { countries } from 'country-flag-icons';
 import 'country-flag-icons/3x2/flags.css';
+import getConfig from 'next/config';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';

 const messages = defineMessages('components.TvDetails', {
@@ -98,12 +89,6 @@ const messages = defineMessages('components.TvDetails', {
  rtcriticsscore: 'Rotten Tomatoes Tomatometer',
  rtaudiencescore: 'Rotten Tomatoes Audience Score',
  tmdbuserscore: 'TMDB User Score',
-  watchlistSuccess: '<strong>{title}</strong> added to watchlist successfully!',
-  watchlistDeleted:
-    '<strong>{title}</strong> Removed from watchlist successfully!',
-  watchlistError: 'Something went wrong try again.',
-  removefromwatchlist: 'Remove From Watchlist',
-  addtowatchlist: 'Add To Watchlist',
 });

 interface TvDetailsProps {
@@ -121,11 +106,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
    router.query.manage == '1' ? true : false
  );
  const [showIssueModal, setShowIssueModal] = useState(false);
-  const [isUpdating, setIsUpdating] = useState<boolean>(false);
-  const [toggleWatchlist, setToggleWatchlist] = useState<boolean>(
-    !tv?.onUserWatchlist
-  );
-  const { addToast } = useToasts();
+  const { publicRuntimeConfig } = getConfig();

  const {
    data,
@@ -298,7 +279,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
      ?.flatrate ?? [];

  function getAvalaibleMediaServerName() {
-    if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) {
+    if (publicRuntimeConfig.JELLYFIN_TYPE === 'emby') {
      return intl.formatMessage(messages.play, { mediaServerName: 'Emby' });
    }

@@ -310,93 +291,17 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
  }

  function getAvalaible4kMediaServerName() {
-    if (settings.currentSettings.mediaServerType === MediaServerType.EMBY) {
-      return intl.formatMessage(messages.play, { mediaServerName: 'Emby' });
+    if (publicRuntimeConfig.JELLYFIN_TYPE === 'emby') {
+      return intl.formatMessage(messages.play4k, { mediaServerName: 'Emby' });
    }

    if (settings.currentSettings.mediaServerType === MediaServerType.PLEX) {
      return intl.formatMessage(messages.play4k, { mediaServerName: 'Plex' });
    }

-    return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' });
+    return intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' });
  }

-  const onClickWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/watchlist', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        tmdbId: tv?.id,
-        mediaType: MediaType.TV,
-        title: tv?.name,
-      }),
-    });
-
-    if (!res.ok) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    const data = await res.json();
-
-    if (data) {
-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistSuccess, {
-            title: tv?.name,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    }
-
-    setIsUpdating(false);
-    setToggleWatchlist((prevState) => !prevState);
-  };
-
-  const onClickDeleteWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/watchlist/' + tv?.id, {
-      method: 'DELETE',
-    });
-
-    if (!res.ok) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    if (res.status === 204) {
-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistDeleted, {
-            title: tv?.name,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'info', autoDismiss: true }
-      );
-      setIsUpdating(false);
-      setToggleWatchlist((prevState) => !prevState);
-    }
-  };
-
  return (
    <div
      className="media-page"
@@ -528,40 +433,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
          </span>
        </div>
        <div className="media-actions">
-          <>
-            {toggleWatchlist ? (
-              <Tooltip content={intl.formatMessage(messages.addtowatchlist)}>
-                <Button
-                  buttonType={'ghost'}
-                  className="z-40 mr-2"
-                  buttonSize={'md'}
-                  onClick={onClickWatchlistBtn}
-                >
-                  {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}
-                >
-                  {isUpdating ? (
-                    <Spinner className="h-3" />
-                  ) : (
-                    <MinusCircleIcon className={'h-3'} />
-                  )}
-                </Button>
-              </Tooltip>
-            )}
-          </>
          <PlayButton links={mediaLinks} />
          <RequestButton
            mediaType="tv"
--- a/src/components/UserList/JellyfinImportModal.tsx
+++ b/src/components/UserList/JellyfinImportModal.tsx
@@ -3,8 +3,8 @@ import Modal from '@app/components/Common/Modal';
 import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
-import { MediaServerType } from '@server/constants/server';
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
+import getConfig from 'next/config';
 import Image from 'next/image';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -36,6 +36,7 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
 }) => {
  const intl = useIntl();
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();
  const { addToast } = useToasts();
  const [isImporting, setImporting] = useState(false);
  const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
@@ -55,6 +56,14 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
    `/api/v1/user?take=${children}`
  );

+  data?.forEach((user, pos) => {
+    if (
+      existingUsers?.results.some((data) => data.jellyfinUserId === user.id)
+    ) {
+      data?.splice(pos, 1);
+    }
+  });
+
  const importUsers = async () => {
    setImporting(true);

@@ -69,7 +78,7 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
        }),
      });
      if (!res.ok) throw new Error();
-      const createdUsers = await res.json();
+      const { data: createdUsers } = await res.json();

      if (!createdUsers.length) {
        throw new Error('No users were imported from Jellyfin.');
@@ -80,9 +89,7 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
          userCount: createdUsers.length,
          strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
          mediaServerName:
-            settings.currentSettings.mediaServerType === MediaServerType.EMBY
-              ? 'Emby'
-              : 'Jellyfin',
+            publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
        }),
        {
          autoDismiss: true,
@@ -97,9 +104,7 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
      addToast(
        intl.formatMessage(messages.importfromJellyfinerror, {
          mediaServerName:
-            settings.currentSettings.mediaServerType === MediaServerType.EMBY
-              ? 'Emby'
-              : 'Jellyfin',
+            publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
        }),
        {
          autoDismiss: true,
@@ -137,9 +142,7 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
      loading={!data && !error}
      title={intl.formatMessage(messages.importfromJellyfin, {
        mediaServerName:
-          settings.currentSettings.mediaServerType === MediaServerType.EMBY
-            ? 'Emby'
-            : 'Jellyfin',
+          publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
      })}
      onOk={() => {
        importUsers();
@@ -156,8 +159,7 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
            <Alert
              title={intl.formatMessage(messages.newJellyfinsigninenabled, {
                mediaServerName:
-                  settings.currentSettings.mediaServerType ===
-                  MediaServerType.EMBY
+                  publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
                    ? 'Emby'
                    : 'Jellyfin',
                strong: (msg: React.ReactNode) => (
@@ -207,71 +209,64 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
                      </tr>
                    </thead>
                    <tbody className="divide-y divide-gray-700 bg-gray-600">
-                      {data
-                        ?.filter(
-                          (user) =>
-                            !existingUsers?.results.some(
-                              (u) => u.jellyfinUserId === user.id
-                            )
-                        )
-                        .map((user) => (
-                          <tr key={`user-${user.id}`}>
-                            <td className="whitespace-nowrap px-4 py-4 text-sm font-medium leading-5 text-gray-100">
+                      {data?.map((user) => (
+                        <tr key={`user-${user.id}`}>
+                          <td className="whitespace-nowrap px-4 py-4 text-sm font-medium leading-5 text-gray-100">
+                            <span
+                              role="checkbox"
+                              tabIndex={0}
+                              aria-checked={isSelectedUser(user.id)}
+                              onClick={() => toggleUser(user.id)}
+                              onKeyDown={(e) => {
+                                if (e.key === 'Enter' || e.key === 'Space') {
+                                  toggleUser(user.id);
+                                }
+                              }}
+                              className="relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none"
+                            >
                              <span
-                                role="checkbox"
-                                tabIndex={0}
-                                aria-checked={isSelectedUser(user.id)}
-                                onClick={() => toggleUser(user.id)}
-                                onKeyDown={(e) => {
-                                  if (e.key === 'Enter' || e.key === 'Space') {
-                                    toggleUser(user.id);
-                                  }
-                                }}
-                                className="relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                  className={`${
-                                    isSelectedUser(user.id)
-                                      ? 'bg-indigo-500'
-                                      : 'bg-gray-800'
-                                  } absolute mx-auto h-4 w-9 rounded-full transition-colors duration-200 ease-in-out`}
-                                ></span>
-                                <span
-                                  aria-hidden="true"
-                                  className={`${
-                                    isSelectedUser(user.id)
-                                      ? 'translate-x-5'
-                                      : 'translate-x-0'
-                                  } absolute left-0 inline-block h-5 w-5 transform rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
-                                ></span>
-                              </span>
-                            </td>
-                            <td className="whitespace-nowrap px-1 py-4 text-sm font-medium leading-5 text-gray-100 md:px-6">
-                              <div className="flex items-center">
-                                <Image
-                                  className="h-10 w-10 flex-shrink-0 rounded-full"
-                                  src={user.thumb}
-                                  alt=""
-                                  width={40}
-                                  height={40}
-                                />
-                                <div className="ml-4">
-                                  <div className="text-base font-bold leading-5">
-                                    {user.username}
-                                  </div>
-                                  {/* {user.username &&
+                                aria-hidden="true"
+                                className={`${
+                                  isSelectedUser(user.id)
+                                    ? 'bg-indigo-500'
+                                    : 'bg-gray-800'
+                                } absolute mx-auto h-4 w-9 rounded-full transition-colors duration-200 ease-in-out`}
+                              ></span>
+                              <span
+                                aria-hidden="true"
+                                className={`${
+                                  isSelectedUser(user.id)
+                                    ? 'translate-x-5'
+                                    : 'translate-x-0'
+                                } absolute left-0 inline-block h-5 w-5 transform rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
+                              ></span>
+                            </span>
+                          </td>
+                          <td className="whitespace-nowrap px-1 py-4 text-sm font-medium leading-5 text-gray-100 md:px-6">
+                            <div className="flex items-center">
+                              <Image
+                                className="h-10 w-10 flex-shrink-0 rounded-full"
+                                src={user.thumb}
+                                alt=""
+                                width={40}
+                                height={40}
+                              />
+                              <div className="ml-4">
+                                <div className="text-base font-bold leading-5">
+                                  {user.username}
+                                </div>
+                                {/* {user.username &&
                                  user.username.toLowerCase() !==
                                  user.email && (
                                    <div className="text-sm leading-5 text-gray-300">
                                      {user.email}
                                    </div>
                                  )} */}
-                                </div>
                              </div>
-                            </td>
-                          </tr>
-                        ))}
+                            </div>
+                          </td>
+                        </tr>
+                      ))}
                    </tbody>
                  </table>
                </div>
@@ -283,9 +278,7 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
        <Alert
          title={intl.formatMessage(messages.noJellyfinuserstoimport, {
            mediaServerName:
-              settings.currentSettings.mediaServerType === MediaServerType.EMBY
-                ? 'Emby'
-                : 'Jellyfin',
+              publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
          })}
          type="info"
        />
--- a/src/components/UserList/index.tsx
+++ b/src/components/UserList/index.tsx
@@ -28,6 +28,7 @@ import { MediaServerType } from '@server/constants/server';
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
 import { hasPermission } from '@server/lib/permissions';
 import { Field, Form, Formik } from 'formik';
+import getConfig from 'next/config';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
@@ -67,15 +68,14 @@ const messages = defineMessages('components.UserList', {
  usercreatedfailedexisting:
    'The provided email address is already in use by another user.',
  usercreatedsuccess: 'User created successfully!',
-  username: 'Username',
+  displayName: 'Display Name',
  email: 'Email Address',
  password: 'Password',
  passwordinfodescription:
    'Configure an application URL and enable email notifications to allow automatic password generation.',
  autogeneratepassword: 'Automatically Generate Password',
  autogeneratepasswordTip: 'Email a server-generated password to the user',
-  validationUsername: 'You must provide an username',
-  validationEmail: 'Email required',
+  validationEmail: 'You must provide a valid email address',
  sortCreated: 'Join Date',
  sortDisplayName: 'Display Name',
  sortRequests: 'Request Count',
@@ -89,6 +89,7 @@ const UserList = () => {
  const intl = useIntl();
  const router = useRouter();
  const settings = useSettings();
+  const { publicRuntimeConfig } = getConfig();
  const { addToast } = useToasts();
  const { user: currentUser, hasPermission: currentHasPermission } = useUser();
  const [currentSort, setCurrentSort] = useState<Sort>('displayname');
@@ -207,10 +208,9 @@ const UserList = () => {
  }

  const CreateUserSchema = Yup.object().shape({
-    username: Yup.string().required(
-      intl.formatMessage(messages.validationUsername)
-    ),
-    email: Yup.string().email(intl.formatMessage(messages.validationEmail)),
+    email: Yup.string()
+      .required(intl.formatMessage(messages.validationEmail))
+      .email(intl.formatMessage(messages.validationEmail)),
    password: Yup.lazy((value) =>
      !value
        ? Yup.string()
@@ -258,7 +258,7 @@ const UserList = () => {
            setDeleteModal({ isOpen: false, user: deleteModal.user })
          }
          title={intl.formatMessage(messages.deleteuser)}
-          subTitle={deleteModal.user?.username}
+          subTitle={deleteModal.user?.displayName}
        >
          {intl.formatMessage(messages.deleteconfirm)}
        </Modal>
@@ -276,7 +276,7 @@ const UserList = () => {
      >
        <Formik
          initialValues={{
-            username: '',
+            displayName: '',
            email: '',
            password: '',
            genpassword: false,
@@ -290,28 +290,21 @@ const UserList = () => {
                  'Content-Type': 'application/json',
                },
                body: JSON.stringify({
-                  username: values.username,
+                  username: values.displayName,
                  email: values.email,
                  password: values.genpassword ? null : values.password,
                }),
              });
-              if (!res.ok) throw new Error(res.statusText, { cause: res });
+              if (!res.ok) throw new Error();
              addToast(intl.formatMessage(messages.usercreatedsuccess), {
                appearance: 'success',
                autoDismiss: true,
              });
              setCreateModal({ isOpen: false });
            } catch (e) {
-              let errorData;
-              try {
-                errorData = await e.cause?.text();
-                errorData = JSON.parse(errorData);
-              } catch {
-                /* empty */
-              }
              addToast(
                intl.formatMessage(
-                  errorData.errors?.includes('USER_EXISTS')
+                  e.response.data.errors?.includes('USER_EXISTS')
                    ? messages.usercreatedfailedexisting
                    : messages.usercreatedfailed
                ),
@@ -370,24 +363,23 @@ const UserList = () => {
                  )}
                <Form className="section">
                  <div className="form-row">
-                    <label htmlFor="username" className="text-label">
-                      {intl.formatMessage(messages.username)}
-                      <span className="label-required">*</span>
+                    <label htmlFor="displayName" className="text-label">
+                      {intl.formatMessage(messages.displayName)}
                    </label>
                    <div className="form-input-area">
                      <div className="form-input-field">
-                        <Field id="username" name="username" type="text" />
+                        <Field
+                          id="displayName"
+                          name="displayName"
+                          type="text"
+                        />
                      </div>
-                      {errors.username &&
-                        touched.username &&
-                        typeof errors.username === 'string' && (
-                          <div className="error">{errors.username}</div>
-                        )}
                    </div>
                  </div>
                  <div className="form-row">
                    <label htmlFor="email" className="text-label">
                      {intl.formatMessage(messages.email)}
+                      <span className="label-required">*</span>
                    </label>
                    <div className="form-input-area">
                      <div className="form-input-field">
@@ -533,8 +525,7 @@ const UserList = () => {
            >
              <InboxArrowDownIcon />
              <span>
-                {settings.currentSettings.mediaServerType ===
-                MediaServerType.EMBY
+                {publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
                  ? intl.formatMessage(messages.importfrommediaserver, {
                      mediaServerName: 'Emby',
                    })
@@ -647,16 +638,9 @@ const UserList = () => {
                      className="text-base font-bold leading-5 transition duration-300 hover:underline"
                      data-testid="user-list-username-link"
                    >
-                      {user.username ||
-                        user.jellyfinUsername ||
-                        user.plexUsername ||
-                        user.email}
+                      {user.displayName}
                    </Link>
-                    {(
-                      user.username ||
-                      user.jellyfinUsername ||
-                      user.plexUsername
-                    )?.toLowerCase() !== user.email && (
+                    {user.displayName.toLowerCase() !== user.email && (
                      <div className="text-sm leading-5 text-gray-300">
                        {user.email}
                      </div>
@@ -689,7 +673,7 @@ const UserList = () => {
                  <Badge badgeType="default">
                    {intl.formatMessage(messages.localuser)}
                  </Badge>
-                ) : user.userType === UserType.EMBY ? (
+                ) : publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? (
                  <Badge badgeType="success">
                    {intl.formatMessage(messages.mediaServerUser, {
                      mediaServerName: 'Emby',
--- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
@@ -14,9 +14,9 @@ import globalMessages from '@app/i18n/globalMessages';
 import ErrorPage from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
-import { ApiErrorCode } from '@server/constants/error';
 import type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces';
 import { Field, Form, Formik } from 'formik';
+import getConfig from 'next/config';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -43,7 +43,6 @@ const messages = defineMessages(
    user: 'User',
    toastSettingsSuccess: 'Settings saved successfully!',
    toastSettingsFailure: 'Something went wrong while saving settings.',
-    toastSettingsFailureEmail: 'This email is already taken!',
    region: 'Discover Region',
    regionTip: 'Filter content by regional availability',
    originallanguage: 'Discover Language',
@@ -70,6 +69,7 @@ const messages = defineMessages(

 const UserGeneralSettings = () => {
  const intl = useIntl();
+  const { publicRuntimeConfig } = getConfig();
  const { addToast } = useToasts();
  const { locale, setLocale } = useLocale();
  const [movieQuotaEnabled, setMovieQuotaEnabled] = useState(false);
@@ -93,14 +93,9 @@ const UserGeneralSettings = () => {
  );

  const UserGeneralSettingsSchema = Yup.object().shape({
-    email:
-      user?.id === 1
-        ? Yup.string()
-            .email(intl.formatMessage(messages.validationemailformat))
-            .required(intl.formatMessage(messages.validationemailrequired))
-        : Yup.string().email(
-            intl.formatMessage(messages.validationemailformat)
-          ),
+    email: Yup.string()
+      .email(intl.formatMessage(messages.validationemailformat))
+      .required(intl.formatMessage(messages.validationemailrequired)),
    discordId: Yup.string()
      .nullable()
      .matches(/^\d{17,19}$/, intl.formatMessage(messages.validationDiscordId)),
@@ -139,7 +134,7 @@ const UserGeneralSettings = () => {
      <Formik
        initialValues={{
          displayName: data?.username ?? '',
-          email: data?.email?.includes('@') ? data.email : '',
+          email: data?.email ?? '',
          discordId: data?.discordId ?? '',
          locale: data?.locale,
          region: data?.region,
@@ -162,8 +157,7 @@ const UserGeneralSettings = () => {
              },
              body: JSON.stringify({
                username: values.displayName,
-                email:
-                  values.email || user?.jellyfinUsername || user?.plexUsername,
+                email: values.email,
                discordId: values.discordId,
                locale: values.locale,
                region: values.region,
@@ -180,7 +174,7 @@ const UserGeneralSettings = () => {
                watchlistSyncTv: values.watchlistSyncTv,
              }),
            });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
+            if (!res.ok) throw new Error();

            if (currentUser?.id === user?.id && setLocale) {
              setLocale(
@@ -195,24 +189,10 @@ const UserGeneralSettings = () => {
              appearance: 'success',
            });
          } catch (e) {
-            let errorData;
-            try {
-              errorData = await e.cause?.text();
-              errorData = JSON.parse(errorData);
-            } catch {
-              /* empty */
-            }
-            if (errorData?.message === ApiErrorCode.InvalidEmail) {
-              addToast(intl.formatMessage(messages.toastSettingsFailureEmail), {
-                autoDismiss: true,
-                appearance: 'error',
-              });
-            } else {
-              addToast(intl.formatMessage(messages.toastSettingsFailure), {
-                autoDismiss: true,
-                appearance: 'error',
-              });
-            }
+            addToast(intl.formatMessage(messages.toastSettingsFailure), {
+              autoDismiss: true,
+              appearance: 'error',
+            });
          } finally {
            revalidate();
            revalidateUser();
@@ -243,7 +223,7 @@ const UserGeneralSettings = () => {
                      <Badge badgeType="default">
                        {intl.formatMessage(messages.localuser)}
                      </Badge>
-                    ) : user?.userType === UserType.EMBY ? (
+                    ) : publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? (
                      <Badge badgeType="success">
                        {intl.formatMessage(messages.mediaServerUser, {
                          mediaServerName: 'Emby',
@@ -284,9 +264,7 @@ const UserGeneralSettings = () => {
                      name="displayName"
                      type="text"
                      placeholder={
-                        user?.username ||
-                        user?.jellyfinUsername ||
-                        user?.plexUsername
+                        user?.plexUsername ? user.plexUsername : user?.email
                      }
                    />
                  </div>
@@ -311,7 +289,6 @@ const UserGeneralSettings = () => {
                      name="email"
                      type="text"
                      placeholder="example@domain.com"
-                      disabled={user?.plexUsername}
                      className={
                        user?.warnings.find((w) => w === 'userEmailRequired')
                          ? 'border-2 border-red-400 focus:border-blue-600'
--- a/src/hooks/useUser.ts
+++ b/src/hooks/useUser.ts
@@ -12,7 +12,6 @@ export interface User {
  id: number;
  warnings: string[];
  plexUsername?: string;
-  jellyfinUsername?: string;
  username?: string;
  displayName: string;
  email: string;
--- a/src/i18n/locale/ca.json
+++ b/src/i18n/locale/ca.json
@@ -191,7 +191,7 @@
  "components.Discover.TvGenreSlider.tvgenres": "Gèneres de Sèries",
  "components.Discover.TvGenreList.seriesgenres": "Gèneres de Sèries",
  "components.Discover.StudioSlider.studios": "Estudis",
-  "components.Discover.NetworkSlider.networks": "Emissors",
+  "components.Discover.NetworkSlider.networks": "Plataformes",
  "components.Discover.MovieGenreSlider.moviegenres": "Gèneres de Pel·lícules",
  "components.Discover.MovieGenreList.moviegenres": "Gèneres de Pel·lícules",
  "components.Discover.DiscoverTvLanguage.languageSeries": "Sèries en {language}",
@@ -397,7 +397,7 @@
  "components.TvDetails.originaltitle": "Títol original",
  "components.TvDetails.originallanguage": "Idioma original",
  "components.TvDetails.nextAirDate": "Pròxima data d'emissió",
-  "components.TvDetails.network": "{networkCount, plural, one {Emissor} other {Emissors}}",
+  "components.TvDetails.network": "{networkCount, plural, one {Plataforma} other {Plataformes}}",
  "components.TvDetails.firstAirDate": "Primera data d'emissió",
  "components.TvDetails.episodeRuntimeMinutes": "{runtime} minuts",
  "components.TvDetails.episodeRuntime": "Duració de l'episodi",
@@ -494,7 +494,7 @@
  "components.Settings.SonarrModal.validationNameRequired": "Heu de proporcionar un nom de servidor",
  "components.Settings.SonarrModal.validationLanguageProfileRequired": "Heu de seleccionar un perfil d'idioma",
  "components.Settings.SonarrModal.validationHostnameRequired": "Heu de proporcionar un nom d’amfitrió o una adreça IP vàlides",
-  "components.Settings.SonarrModal.validationBaseUrlTrailingSlash": "L'URL base no pot acabar amb una barra inclinada final",
+  "components.Settings.SonarrModal.validationBaseUrlTrailingSlash": "L'URL base no ha d'acabar amb una barra inclinada final",
  "components.Settings.SonarrModal.validationBaseUrlLeadingSlash": "L'URL base ha de tenir una barra inclinada",
  "components.Settings.SonarrModal.validationApplicationUrlTrailingSlash": "L'URL no pot acabar amb una barra inclinada final",
  "components.Settings.SonarrModal.validationApplicationUrl": "Heu de proporcionar un URL vàlid",
@@ -1135,7 +1135,7 @@
  "components.Discover.CreateSlider.needresults": "Cal tenir almenys 1 resultat.",
  "components.Discover.CreateSlider.nooptions": "Sense resultats.",
  "components.Discover.CreateSlider.providetmdbgenreid": "Proporciona un ID de categoria TMDB",
-  "components.Discover.CreateSlider.providetmdbnetwork": "Proporciona l'ID d'emissor TMDB",
+  "components.Discover.CreateSlider.providetmdbnetwork": "Proporciona l'ID de la plataforma TMDB",
  "components.Discover.CreateSlider.providetmdbstudio": "Proporciona l'ID d'estudi TMDB",
  "components.Discover.CreateSlider.searchGenres": "Cercar per gènere…",
  "components.Discover.CreateSlider.searchKeywords": "Cercar per paraules clau…",
@@ -1167,7 +1167,7 @@
  "components.Discover.networks": "Emissors",
  "components.Discover.resetwarning": "Restablir tots els controls lliscants al valor predeterminat. Això també suprimirà els controls lliscants personalitzats!",
  "components.Discover.tmdbmoviekeyword": "Paraula clau de pel·lícula TMDB",
-  "components.Discover.tmdbnetwork": "Emissors TMDB",
+  "components.Discover.tmdbnetwork": "Plataformes TMDB",
  "components.Discover.FilterSlideover.tmdbuserscore": "Puntuació d'usuaris TMDB",
  "components.Discover.tvgenres": "Gèneres de sèries",
  "components.Discover.DiscoverTvKeyword.keywordSeries": "Sèries {keywordTitle}",
@@ -1241,11 +1241,18 @@
  "components.Settings.SettingsJobsCache.availability-sync": "Sincronització de disponibilitat de contingut",
  "components.Discover.tmdbmoviestreamingservices": "Serveis de transmissió de pel·lícules TMDB",
  "components.Discover.tmdbtvstreamingservices": "Serveis de transmissió de TV TMDB",
-  "components.Layout.UserWarnings.emailRequired": "És requereix un n correu electrònic.",
-  "components.Layout.UserWarnings.passwordRequired": "Es requereix una contrasenya.",
-  "components.Login.description": "Com que és la primera vegada que inicieu sessió a {applicationName}, es necessita afegir un correu electrònic vàlid.",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "Recompte de vots d'usuaris de TMDB",
-  "components.Discover.FilterSlideover.voteCount": "Nombre de vots entre {minValue} i {maxValue}",
-  "components.Layout.UserWarnings.emailInvalid": "El correu electrònic no és vàlid.",
-  "components.Login.credentialerror": "El nom d'usuari o la contrasenya són incorrectes."
+  "components.Discover.FilterSlideover.tmdbuservotecount": "Recompte de vots dels usuaris de TMDB",
+  "components.Discover.FilterSlideover.voteCount": "Número de vots entre {minValue} i {maxValue}",
+  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "So per a les notificacions",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Dispositiu per defecte",
+  "components.Settings.Notifications.NotificationsPushover.sound": "So per a les notificacions",
+  "components.Settings.SonarrModal.animeSeriesType": "Tipus d'Anime",
+  "components.Settings.SonarrModal.seriesType": "Tipus de sèrie",
+  "components.Settings.SonarrModal.tagRequests": "Sol·licituds d'etiquetes",
+  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Dispositiu per defecte",
+  "i18n.collection": "Col·lecció",
+  "components.MovieDetails.imdbuserscore": "Puntuació dels usuaris de IMDB",
+  "components.Settings.RadarrModal.tagRequests": "Sol·licituds d'etiqueta",
+  "components.Settings.RadarrModal.tagRequestsInfo": "Automàticament afegeix una etiqueta addicional amb el nom d'usuari i nom complet del sol·licitant",
+  "components.Settings.SonarrModal.tagRequestsInfo": "Automàticament afegeix una etiqueta addicional amb el nom d'usuari i nom complet del sol·licitant"
 }
--- a/src/i18n/locale/de.json
+++ b/src/i18n/locale/de.json
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -73,7 +73,6 @@
  "components.Discover.FilterSlideover.releaseDate": "Release Date",
  "components.Discover.FilterSlideover.runtime": "Runtime",
  "components.Discover.FilterSlideover.runtimeText": "{minValue}-{maxValue} minute runtime",
-  "components.Discover.FilterSlideover.status": "Status",
  "components.Discover.FilterSlideover.streamingservices": "Streaming Services",
  "components.Discover.FilterSlideover.studio": "Studio",
  "components.Discover.FilterSlideover.tmdbuserscore": "TMDB User Score",
@@ -221,7 +220,6 @@
  "components.Layout.VersionStatus.streamdevelop": "Jellyseerr Develop",
  "components.Layout.VersionStatus.streamstable": "Jellyseerr Stable",
  "components.Login.adminerror": "You must use an admin account to sign in.",
-  "components.Login.back": "Go back",
  "components.Login.credentialerror": "The username or password is incorrect.",
  "components.Login.description": "Since this is your first time logging into {applicationName}, you are required to add a valid email address.",
  "components.Login.email": "Email Address",
@@ -237,7 +235,6 @@
  "components.Login.port": "Port",
  "components.Login.save": "Add",
  "components.Login.saving": "Adding…",
-  "components.Login.servertype": "Server Type",
  "components.Login.signin": "Sign In",
  "components.Login.signingin": "Signing In…",
  "components.Login.signinheader": "Sign in to continue",
@@ -259,7 +256,6 @@
  "components.Login.validationhostformat": "Valid URL required",
  "components.Login.validationhostrequired": "{mediaServerName} URL required",
  "components.Login.validationpasswordrequired": "You must provide a password",
-  "components.Login.validationservertyperequired": "Please select a server type",
  "components.Login.validationusernamerequired": "Username required",
  "components.ManageSlideOver.alltime": "All Time",
  "components.ManageSlideOver.downloadstatus": "Downloads",
@@ -290,7 +286,6 @@
  "components.MediaSlider.ShowMoreCard.seemore": "See More",
  "components.MovieDetails.MovieCast.fullcast": "Full Cast",
  "components.MovieDetails.MovieCrew.fullcrew": "Full Crew",
-  "components.MovieDetails.addtowatchlist": "Add To Watchlist",
  "components.MovieDetails.budget": "Budget",
  "components.MovieDetails.cast": "Cast",
  "components.MovieDetails.digitalrelease": "Digital Release",
@@ -311,7 +306,6 @@
  "components.MovieDetails.productioncountries": "Production {countryCount, plural, one {Country} other {Countries}}",
  "components.MovieDetails.recommendations": "Recommendations",
  "components.MovieDetails.releasedate": "{releaseCount, plural, one {Release Date} other {Release Dates}}",
-  "components.MovieDetails.removefromwatchlist": "Remove From Watchlist",
  "components.MovieDetails.reportissue": "Report an Issue",
  "components.MovieDetails.revenue": "Revenue",
  "components.MovieDetails.rtaudiencescore": "Rotten Tomatoes Audience Score",
@@ -325,9 +319,6 @@
  "components.MovieDetails.theatricalrelease": "Theatrical Release",
  "components.MovieDetails.tmdbuserscore": "TMDB User Score",
  "components.MovieDetails.viewfullcrew": "View Full Crew",
-  "components.MovieDetails.watchlistDeleted": "<strong>{title}</strong> Removed from watchlist successfully!",
-  "components.MovieDetails.watchlistError": "Something went wrong try again.",
-  "components.MovieDetails.watchlistSuccess": "<strong>{title}</strong> added to watchlist successfully!",
  "components.MovieDetails.watchtrailer": "Watch Trailer",
  "components.NotificationTypeSelector.adminissuecommentDescription": "Get notified when other users comment on issues.",
  "components.NotificationTypeSelector.adminissuereopenedDescription": "Get notified when issues are reopened by other users.",
@@ -474,7 +465,6 @@
  "components.RequestList.RequestItem.mediaerror": "{mediaType} Not Found",
  "components.RequestList.RequestItem.modified": "Modified",
  "components.RequestList.RequestItem.modifieduserdate": "{date} by {user}",
-  "components.RequestList.RequestItem.profileName": "Profile",
  "components.RequestList.RequestItem.requested": "Requested",
  "components.RequestList.RequestItem.requesteddate": "Requested",
  "components.RequestList.RequestItem.seasons": "{seasonCount, plural, one {Season} other {Seasons}}",
@@ -559,16 +549,9 @@
  "components.ResetPassword.validationpasswordrequired": "You must provide a password",
  "components.Search.search": "Search",
  "components.Search.searchresults": "Search Results",
-  "components.Selector.canceled": "Canceled",
-  "components.Selector.ended": "Ended",
-  "components.Selector.inProduction": "In Production",
  "components.Selector.nooptions": "No results.",
-  "components.Selector.pilot": "Pilot",
-  "components.Selector.planned": "Planned",
-  "components.Selector.returningSeries": "Returning Series",
  "components.Selector.searchGenres": "Select genres…",
  "components.Selector.searchKeywords": "Search keywords…",
-  "components.Selector.searchStatus": "Select status...",
  "components.Selector.searchStudios": "Search studios…",
  "components.Selector.showless": "Show Less",
  "components.Selector.showmore": "Show More",
@@ -966,7 +949,7 @@
  "components.Settings.is4k": "4K",
  "components.Settings.jellyfinForgotPasswordUrl": "Forgot Password URL",
  "components.Settings.jellyfinSettings": "{mediaServerName} Settings",
-  "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page. You can also change the Jellyfin API key, which was automatically generated previously.",
+  "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.",
  "components.Settings.jellyfinSettingsFailure": "Something went wrong while saving {mediaServerName} settings.",
  "components.Settings.jellyfinSettingsSuccess": "{mediaServerName} settings saved successfully!",
  "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "Custom authentication with Automatic Library Grouping not supported",
@@ -1050,31 +1033,23 @@
  "components.Settings.webAppUrlTip": "Optionally direct users to the web app on your server instead of the \"hosted\" web app",
  "components.Settings.webhook": "Webhook",
  "components.Settings.webpush": "Web Push",
-  "components.Setup.back": "Go back",
-  "components.Setup.configemby": "Configure Emby",
-  "components.Setup.configjellyfin": "Configure Jellyfin",
-  "components.Setup.configplex": "Configure Plex",
  "components.Setup.configuremediaserver": "Configure Media Server",
  "components.Setup.configureservices": "Configure Services",
  "components.Setup.continue": "Continue",
  "components.Setup.finish": "Finish Setup",
  "components.Setup.finishing": "Finishing…",
  "components.Setup.scanbackground": "Scanning will run in the background. You can continue the setup process in the meantime.",
-  "components.Setup.servertype": "Choose Server Type",
  "components.Setup.setup": "Setup",
  "components.Setup.signin": "Sign In",
  "components.Setup.signinMessage": "Get started by signing in",
-  "components.Setup.signinWithEmby": "Enter your Emby details",
-  "components.Setup.signinWithJellyfin": "Enter your Jellyfin details",
-  "components.Setup.signinWithPlex": "Enter your Plex details",
-  "components.Setup.subtitle": "Get started by choosing your media server",
+  "components.Setup.signinWithJellyfin": "Use your {mediaServerName} account",
+  "components.Setup.signinWithPlex": "Use your Plex account",
  "components.Setup.tip": "Tip",
  "components.Setup.welcome": "Welcome to Jellyseerr",
  "components.StatusBadge.managemedia": "Manage {mediaType}",
  "components.StatusBadge.openinarr": "Open in {arr}",
  "components.StatusBadge.playonplex": "Play on {mediaServerName}",
  "components.StatusBadge.seasonepisodenumber": "S{seasonNumber}E{episodeNumber}",
-  "components.StatusBadge.seasonnumber": "S{seasonNumber}",
  "components.StatusBadge.status": "{status}",
  "components.StatusBadge.status4k": "4K {status}",
  "components.StatusChecker.appUpdated": "{applicationTitle} Updated",
@@ -1095,7 +1070,6 @@
  "components.TvDetails.Season.somethingwentwrong": "Something went wrong while retrieving season data.",
  "components.TvDetails.TvCast.fullseriescast": "Full Series Cast",
  "components.TvDetails.TvCrew.fullseriescrew": "Full Series Crew",
-  "components.TvDetails.addtowatchlist": "Add To Watchlist",
  "components.TvDetails.anime": "Anime",
  "components.TvDetails.cast": "Cast",
  "components.TvDetails.episodeCount": "{episodeCount, plural, one {# Episode} other {# Episodes}}",
@@ -1113,7 +1087,6 @@
  "components.TvDetails.play4k": "Play 4K on {mediaServerName}",
  "components.TvDetails.productioncountries": "Production {countryCount, plural, one {Country} other {Countries}}",
  "components.TvDetails.recommendations": "Recommendations",
-  "components.TvDetails.removefromwatchlist": "Remove From Watchlist",
  "components.TvDetails.reportissue": "Report an Issue",
  "components.TvDetails.rtaudiencescore": "Rotten Tomatoes Audience Score",
  "components.TvDetails.rtcriticsscore": "Rotten Tomatoes Tomatometer",
@@ -1126,9 +1099,6 @@
  "components.TvDetails.streamingproviders": "Currently Streaming On",
  "components.TvDetails.tmdbuserscore": "TMDB User Score",
  "components.TvDetails.viewfullcrew": "View Full Crew",
-  "components.TvDetails.watchlistDeleted": "<strong>{title}</strong> Removed from watchlist successfully!",
-  "components.TvDetails.watchlistError": "Something went wrong try again.",
-  "components.TvDetails.watchlistSuccess": "<strong>{title}</strong> added to watchlist successfully!",
  "components.TvDetails.watchtrailer": "Watch Trailer",
  "components.UserList.accounttype": "Type",
  "components.UserList.admin": "Admin",
@@ -1141,6 +1111,7 @@
  "components.UserList.creating": "Creating…",
  "components.UserList.deleteconfirm": "Are you sure you want to delete this user? All of their request data will be permanently removed.",
  "components.UserList.deleteuser": "Delete User",
+  "components.UserList.displayName": "Display Name",
  "components.UserList.edituser": "Edit User Permissions",
  "components.UserList.email": "Email Address",
  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} imported successfully!",
@@ -1174,11 +1145,9 @@
  "components.UserList.userdeleteerror": "Something went wrong while deleting the user.",
  "components.UserList.userfail": "Something went wrong while saving user permissions.",
  "components.UserList.userlist": "User List",
-  "components.UserList.username": "Username",
  "components.UserList.users": "Users",
  "components.UserList.userssaved": "User permissions saved successfully!",
-  "components.UserList.validationEmail": "Email required",
-  "components.UserList.validationUsername": "You must provide an username",
+  "components.UserList.validationEmail": "You must provide a valid email address",
  "components.UserList.validationpasswordminchars": "Password is too short; should be a minimum of 8 characters",
  "components.UserProfile.ProfileHeader.joindate": "Joined {joindate}",
  "components.UserProfile.ProfileHeader.profile": "View Profile",
--- a/src/i18n/locale/es.json
+++ b/src/i18n/locale/es.json
@@ -201,7 +201,7 @@
  "components.Settings.SonarrModal.animerootfolder": "Carpeta raíz de anime",
  "components.Settings.SonarrModal.animequalityprofile": "Perfil de calidad de anime",
  "components.Settings.SettingsAbout.timezone": "Zona horaria",
-  "components.Settings.SettingsAbout.supportoverseerr": "Apoya a Overseerr",
+  "components.Settings.SettingsAbout.supportoverseerr": "Apoya a Jellyseerr",
  "components.Settings.SettingsAbout.helppaycoffee": "Ayúdame invitándome a un café",
  "components.Settings.SettingsAbout.Releases.viewongithub": "Ver en GitHub",
  "components.Settings.SettingsAbout.Releases.viewchangelog": "Ver registro de cambios",
@@ -299,14 +299,14 @@
  "components.RequestButton.viewrequest": "Ver Solicitud",
  "components.RequestButton.requestmore4k": "Solicitar más en 4K",
  "components.RequestButton.requestmore": "Solicitar más",
-  "components.RequestButton.declinerequests": "Rechazar {requestCount, plural, one {Request} other {{requestCount} Requests}}",
+  "components.RequestButton.declinerequests": "Rechazar {requestCount, plural, one {solicitud} other {{requestCount} solicitudes}}",
  "components.RequestButton.declinerequest4k": "Rechazar Solicitud 4K",
  "components.RequestButton.declinerequest": "Rechazar Solicitud",
-  "components.RequestButton.decline4krequests": "Rechazar {requestCount, plural, one {4K Request} other {{requestCount} 4K Requests}}",
-  "components.RequestButton.approverequests": "Aprobar {requestCount, plural, one {Request} other {{requestCount} Requests}}",
+  "components.RequestButton.decline4krequests": "Rechazar {requestCount, plural, one {solicitud en 4K} other {{requestCount} solicitudes en 4K}}",
+  "components.RequestButton.approverequests": "Aprobar {requestCount, plural, one {solicitud} other {{requestCount} solicitudes}}",
  "components.RequestButton.approverequest4k": "Aprobar Solicitud 4K",
  "components.RequestButton.approverequest": "Aprobar Solicitud",
-  "components.RequestButton.approve4krequests": "Aprobar {requestCount, plural, one {4K Request} other {{requestCount} 4K Requests}}",
+  "components.RequestButton.approve4krequests": "Aprobar {requestCount, plural, one {petición en 4K} other {requestCount} peticiones en 4K}}",
  "components.RequestBlock.server": "Servidor de Destino",
  "components.RequestBlock.rootfolder": "Carpeta Raíz",
  "components.RequestBlock.profilechanged": "Perfil de Calidad",
@@ -656,7 +656,7 @@
  "components.QuotaSelector.unlimited": "Ilimitadas",
  "components.MovieDetails.originaltitle": "Título Original",
  "components.LanguageSelector.originalLanguageDefault": "Todos los Idiomas",
-  "components.LanguageSelector.languageServerDefault": "({language}) por defecto",
+  "components.LanguageSelector.languageServerDefault": "({Language}) por defecto",
  "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {cambio} other {cambios}} por detrás",
  "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSetOwnAccount": "Tu cuenta no tiene configurada una contraseña actualmente. Configure una contraseña a continuación para habilitar el acceso como \"usuario local\" utilizando tu dirección de email.",
  "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSet": "Esta cuenta de usuario no tiene configurada una contraseña actualmente. Configure una contraseña a continuación para habilitar el acceso como \"usuario local\"",
@@ -784,7 +784,7 @@
  "components.DownloadBlock.estimatedtime": "Estimación de {time}",
  "components.Settings.Notifications.encryptionOpportunisticTls": "Usa siempre STARTTLS",
  "components.TvDetails.streamingproviders": "Emisión Actual en",
-  "components.UserProfile.UserSettings.UserGeneralSettings.languageDefault": "({language}) por defecto",
+  "components.UserProfile.UserSettings.UserGeneralSettings.languageDefault": "{{Language}} por defecto",
  "components.Settings.Notifications.NotificationsWebPush.httpsRequirement": "Para recibir notificaciones web push, Jellyseerr debe servirse mediante HTTPS.",
  "components.Settings.Notifications.NotificationsWebhook.validationTypes": "Debes seleccionar, al menos, un tipo de notificación",
  "components.Settings.Notifications.validationTypes": "Debes seleccionar, al menos, un tipo de notificación",
@@ -816,10 +816,10 @@
  "components.Settings.Notifications.encryptionTip": "Normalmente, TLS Implícito usa el puerto 465 y STARTTLS usa el puerto 587",
  "components.UserList.localLoginDisabled": "El ajuste para <strong>Habilitar el Inicio de Sesión Local</strong> está actualmente deshabilitado.",
  "components.Settings.SettingsUsers.defaultPermissionsTip": "Permisos iniciales asignados a nuevos usuarios",
-  "components.Settings.SettingsAbout.runningDevelop": "Estás utilizando la rama de <code>desarrollo</code> de Jellyseerr, la cual solo se recomienda para aquellos que contribuyen al desarrollo o al soporte de las pruebas de nuevos desarrollos.",
+  "components.Settings.SettingsAbout.runningDevelop": "Estás utilizando la rama de <code>develop</code> de Jellyseerr, la cual solo se recomienda para aquellos que contribuyen al desarrollo o al soporte de las pruebas de nuevos desarrollos.",
  "components.StatusBadge.status": "{status}",
-  "components.Settings.SettingsJobsCache.editJobScheduleSelectorMinutes": "Cada {jobScheduleMinutes, plural, one {minute} other {{jobScheduleMinutes} minutes}}",
-  "components.Settings.SettingsJobsCache.editJobScheduleSelectorHours": "Cada {jobScheduleHours, plural, one {hour} other {{jobScheduleHours} hours}}",
+  "components.Settings.SettingsJobsCache.editJobScheduleSelectorMinutes": "Cada {jobScheduleMinutes, plural, one {minuto} other {{jobScheduleMinutes} minutos}}",
+  "components.Settings.SettingsJobsCache.editJobScheduleSelectorHours": "Cada {jobScheduleHours, plural, one {hora} other {{jobScheduleHours} horas}}",
  "components.Settings.SettingsJobsCache.jobScheduleEditFailed": "Algo fue mal al guardar la tarea programada.",
  "components.Settings.SettingsJobsCache.editJobSchedule": "Modificar tarea programada",
  "components.Settings.SettingsJobsCache.editJobSchedulePrompt": "Nueva frecuencia",
@@ -848,7 +848,7 @@
  "components.IssueDetails.nocomments": "Sin comentarios.",
  "components.IssueDetails.openedby": "#{issueId} abierta {relativeTime} por {username}",
  "components.IssueDetails.openin4karr": "Abrir en {arr} 4K",
-  "components.IssueDetails.openinarr": "Abrir en {arr}",
+  "components.IssueDetails.openinarr": "Abierta en {arr}",
  "components.IssueDetails.play4konplex": "Ver en 4K en {mediaServerName}",
  "components.IssueDetails.playonplex": "Ver en {mediaServerName}",
  "components.IssueDetails.problemepisode": "Episodio Afectado",
@@ -1193,7 +1193,7 @@
  "components.RequestList.RequestItem.tvdbid": "Identificador de TheTVDB",
  "components.Settings.SettingsJobsCache.image-cache-cleanup": "Limpieza de la caché de imágenes",
  "components.Settings.SettingsJobsCache.imagecache": "Caché de imágenes",
-  "components.Settings.SettingsJobsCache.editJobScheduleSelectorSeconds": "Cada {jobScheduleSeconds, plural, one {second} other {{jobScheduleSeconds} seconds}}",
+  "components.Settings.SettingsJobsCache.editJobScheduleSelectorSeconds": "Cada {jobScheduleSeconds, plural, one {segundo} other {{jobScheduleSeconds} segundos}}",
  "components.Settings.SettingsJobsCache.availability-sync": "Sincronización de la disponibilidad de medios",
  "components.Discover.tmdbmoviestreamingservices": "Servicios de streaming de películas TMDB",
  "components.Discover.tmdbtvstreamingservices": "Servicios de TV en streaming TMDB",
@@ -1205,110 +1205,10 @@
  "components.Settings.RadarrModal.tagRequestsInfo": "Añadir automáticamente una etiqueta adicional con el nombre de usuario y el nombre para mostrar del solicitante",
  "components.Settings.SonarrModal.tagRequestsInfo": "Añadir automáticamente una etiqueta adicional con el nombre de usuario y el nombre para mostrar del solicitante",
  "components.MovieDetails.imdbuserscore": "Puntuación de los usuarios de IMDB",
-  "components.Layout.UserWarnings.passwordRequired": "Se requiere una contraseña.",
-  "components.Login.credentialerror": "El usuario o contraseña es incorrecto.",
-  "components.Login.host": "{mediaServerName} URL",
-  "components.Login.initialsignin": "Conectar",
-  "components.Login.initialsigningin": "Conectando…",
-  "components.Login.emailtooltip": "No es necesario asociar la dirección con su instancia de {mediaServerName}.",
-  "components.Login.saving": "Añadiendo…",
-  "components.Login.title": "Añadir Email",
-  "components.Login.username": "Nombre de usuario",
-  "components.Login.validationEmailFormat": "El email es inválido",
-  "components.Login.validationEmailRequired": "Debes proporcional un email",
-  "components.Login.validationemailformat": "Se requiere de un email válido",
-  "components.Login.validationhostformat": "Se requiere de una URL válida",
-  "components.Login.validationusernamerequired": "Se requiere un nombre de usuario",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Esto eliminará de manera irreversible esta {mediaType} de {arr}, incluyendo todos los archivos.",
-  "i18n.open": "Abierto",
-  "components.MovieDetails.downloadstatus": "Estado de la descarga",
-  "components.MovieDetails.openradarr": "Abrir Película en Radarr",
-  "components.MovieDetails.openradarr4k": "Abrir Película 4K en Radarr",
-  "components.MovieDetails.play": "Reproducir en {mediaServerName}",
-  "components.MovieDetails.play4k": "Reproducir 4K en {mediaServerName}",
-  "components.NotificationTypeSelector.issueresolved": "Incidencia Resuelta",
-  "components.NotificationTypeSelector.userissuecommentDescription": "Notificame cuando haya nuevos comentarios en incidencias que haya abierto.",
-  "components.NotificationTypeSelector.userissuecreatedDescription": "Notificame cuando otros usuarios reporten incidencias.",
-  "components.PermissionEdit.viewissues": "Ver incidencias",
-  "components.PermissionEdit.manageissuesDescription": "Dar permiso para administrar incidencias.",
-  "components.PermissionEdit.viewissuesDescription": "Dar permiso para ver incidencias reportadas por otros usuarios.",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Sonido de Notificacion",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Escanear Añadidos Recientemente de Jellyfin",
-  "components.Settings.SettingsJobsCache.jellyfin-full-scan": "Escaneo Completo de la libreria de Jellyfin",
-  "components.Settings.jellyfinSettings": "Ajustes de {mediaServerName}",
-  "components.Settings.jellyfinsettings": "Ajustes de {mediaServerName}",
-  "components.Settings.jellyfinSettingsFailure": "Algo salió mal al guardar la configuración de {mediaServerName}.",
-  "components.Settings.jellyfinSettingsSuccess": "¡La configuración de {mediaServerName} se guardó correctamente!",
-  "components.Settings.jellyfinlibraries": "Bibliotecas {mediaServerName}",
-  "components.Settings.jellyfinlibrariesDescription": "La biblioteca {mediaServerName} busca títulos. Haga clic en el botón a continuación si no aparece ninguna biblioteca.",
-  "components.Settings.manualscanDescriptionJellyfin": "Normalmente, esto sólo se ejecutará una vez cada 24 horas. Jellyseerr comprobará de forma más agresiva los añadidos recientemente de su servidor {mediaServerName}. ¡Si es la primera vez que configura Jellyseerr, se recomienda un escaneo manual completo de la biblioteca!",
-  "components.Settings.save": "Guardar Cambios",
-  "components.Settings.saving": "Guardando…",
-  "components.Settings.syncing": "Sincronizando",
-  "components.Settings.timeout": "Tiempo agotado",
-  "components.Setup.signinWithPlex": "Usa tu cuenta de Plex",
-  "components.Setup.configuremediaserver": "Configurar servidor multimedia",
-  "components.TitleCard.addToWatchList": "Añadir a lista de seguimiento",
-  "components.TitleCard.watchlistCancel": "Lista de seguimiento para <strong>{title}</strong> cancelada.",
-  "components.TitleCard.watchlistError": "Algo salió mal, intenta de nuevo.",
-  "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> añadido correctamente a la lista de seguimiento!",
-  "components.TvDetails.play": "Reproducir en {mediaServerName}",
-  "components.UserList.importfromJellyfin": "Importar Usuarios de {mediaServerName}",
-  "components.UserList.mediaServerUser": "Usuario de {mediaServerName}",
-  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} importado correctamente!",
-  "components.UserList.importfromJellyfinerror": "Se produjo un error al importar usuarios de {mediaServerName}.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Guardar Cambios",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "Email",
-  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Dispositivo Predeterminado",
-  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Sonido de Notificacion",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletsettingsfailed": "Fallo al guardar los ajustes de la notificación Pushbullet.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletsettingssaved": "¡Los ajustes de notificación Pushbullet se han guardado con éxito!",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverApplicationToken": "Token de aplicación API",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverUserKey": "Clave de usuario o grupo",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverUserKeyTip": "Tu <UsersGroupsLink>identificador de usuario o grupo</UsersGroupsLink> de 30 caracteres",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoversettingssaved": "¡Se han guardado los ajustes de notificación de Pushover!",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverApplicationTokenTip": "<ApplicationRegistrationLink>Registrar una aplicación</ApplicationRegistrationLink> para usar con {applicationTitle}",
-  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverUserKey": "Debes proporcionar una clave de usuario o grupo válida",
-  "components.Login.validationhostrequired": "{mediaServerName} URL requerida",
-  "i18n.resolved": "Resuelto",
-  "components.UserList.importfrommediaserver": "Importar Usuarios de {mediaServerName}",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Dispositivo Predeterminado",
-  "components.ManageSlideOver.removearr": "Eliminar de {arr}",
-  "components.NotificationTypeSelector.issuereopenedDescription": "Enviar notificación cuando se reabran incidencias.",
-  "components.Layout.UserWarnings.emailRequired": "Se requiere una dirección de email.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessToken": "Token de Acceso",
-  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverApplicationToken": "Debes proporcionar un token de aplicación válido",
-  "components.Settings.syncJellyfin": "Sincronizar Bibliotecas",
-  "components.Layout.UserWarnings.emailInvalid": "La dirección de correo es inválida.",
-  "components.Login.description": "Como es la primera vez que inicias sesión en {applicationName}, es necesario añadir una dirección de email válida.",
-  "components.Login.save": "Añadir",
-  "components.NotificationTypeSelector.issueresolvedDescription": "Enviar notificación cuando se resuelvan incidencias.",
-  "components.PermissionEdit.manageissues": "Administrar incidencias",
-  "components.PermissionEdit.createissues": "Notificar incidencia",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Guardando…",
-  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushbulletAccessToken": "Debes indicar un token de acceso",
-  "components.Login.signinwithjellyfin": "Utiliza tu cuenta de {mediaServerName}",
-  "components.ManageSlideOver.removearr4k": "Eliminar de {arr} 4K",
-  "components.Settings.internalUrl": "URL Interna",
-  "components.TvDetails.play4k": "Reproducir 4K en {mediaServerName}",
-  "components.Setup.signin": "Iniciar Sesión",
-  "components.Setup.signinWithJellyfin": "Utiliza tu cuenta de {mediaServerName}",
-  "components.UserList.noJellyfinuserstoimport": "No hay usuarios de {mediaServerName} que importar.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "Usuario de {mediaServerName}",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessTokenTip": "Crea un token desde tu <PushbulletSettingsLink>Opciones de Cuenta</PushbulletSettingsLink>",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoversettingsfailed": "No se pudo guardar la configuración de notificaciones de Pushover.",
-  "components.NotificationTypeSelector.userissuereopenedDescription": "Recibir notificaciones cuando se vuelvan a abrir incidencias que haya reportado.",
-  "components.NotificationTypeSelector.userissueresolvedDescription": "Reciba notificaciones cuando se resuelvan las incidencias que haya reportado.",
-  "components.PermissionEdit.createissuesDescription": "Dar permiso para informar incidencias.",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Apoya a Jellyseerr",
-  "components.Settings.Notifications.userEmailRequired": "Requerir email de usuario",
-  "components.Settings.SonarrModal.animeSeriesType": "Tipo de Serie Anime",
-  "components.Settings.SonarrModal.seriesType": "Tipo Serie",
-  "components.Settings.jellyfinSettingsDescription": "Opcionalmente, configure los puntos finales internos y externos para su servidor {mediaServerName}. En la mayoría de los casos, la URL externa es diferente a la URL interna. También se puede configurar una URL de restablecimiento de contraseña personalizada para el inicio de sesión de {mediaServerName}, en caso de que desee redirigir a una página de restablecimiento de contraseña diferente.",
-  "components.Settings.jellyfinsettingsDescription": "Configure los ajustes para su servidor {mediaServerName}. {mediaServerName} escanea sus bibliotecas de {mediaServerName} para ver qué contenido está disponible.",
-  "components.Settings.manualscanJellyfin": "Escanear Libreria Manualmente",
-  "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> Eliminado correctamente de la lista de seguimiento!",
-  "components.UserList.newJellyfinsigninenabled": "La configuración <strong>Habilitar nuevo inicio de sesión de {mediaServerName}</strong> está actualmente habilitada. Los usuarios de {mediaServerName} con acceso a la biblioteca no necesitan ser importados para poder iniciar sesión.",
-  "components.UserProfile.localWatchlist": "Lista de seguimiento de {username}"
+  "components.Settings.SonarrModal.animeSeriesType": "Tipo de anime",
+  "components.Settings.SonarrModal.seriesType": "Tipo de series",
+  "components.Settings.Notifications.NotificationsPushover.sound": "Sonido para las notificaciones",
+  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Dispositivo predeterminado",
+  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Sonido para las notificaciones",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Dispositivo predeterminado"
 }
--- a/src/i18n/locale/fr.json
+++ b/src/i18n/locale/fr.json
@@ -59,7 +59,7 @@
  "components.Discover.DiscoverTvGenre.genreSeries": "Séries {genre}",
  "components.Discover.DiscoverTvKeyword.keywordSeries": "{keywordTitle} Séries",
  "components.Discover.DiscoverTvLanguage.languageSeries": "Séries en {language}",
-  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Votre watchlist",
+  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Votre watchlist Plex",
  "components.Discover.DiscoverWatchlist.watchlist": "Watchlist Plex",
  "components.Discover.FilterSlideover.activefilters": "{count, plural, one {# Filtre actif} other {# Filtres actifs}}",
  "components.Discover.FilterSlideover.clearfilters": "Effacer les filtres actifs",
@@ -176,7 +176,7 @@
  "components.Settings.RadarrModal.port": "Port",
  "components.Settings.RadarrModal.qualityprofile": "Profil de qualité",
  "components.Settings.RadarrModal.rootfolder": "Dossier racine",
-  "components.Settings.RadarrModal.selectMinimumAvailability": "Sélectionner une disponibilté minimale",
+  "components.Settings.RadarrModal.selectMinimumAvailability": "Sélectionner une disponibilité minimale",
  "components.Settings.RadarrModal.selectQualityProfile": "Sélectionner un profil qualité",
  "components.Settings.RadarrModal.selectRootFolder": "Sélectionner un dossier racine",
  "components.Settings.RadarrModal.server4k": "Serveur 4K",
@@ -277,7 +277,7 @@
  "i18n.tvshows": "Séries",
  "i18n.unavailable": "Indisponible",
  "pages.oops": "Oups",
-  "pages.returnHome": "Retourner à l'acceuil",
+  "pages.returnHome": "Retourner à l'accueil",
  "components.TvDetails.TvCast.fullseriescast": "Casting complet de la série",
  "components.MovieDetails.MovieCast.fullcast": "Casting complet",
  "components.Settings.Notifications.emailsettingssaved": "Paramètres de notification par e-mail enregistrés avec succès !",
@@ -323,7 +323,7 @@
  "components.Settings.SettingsAbout.Releases.viewchangelog": "Voir le journal des modifications",
  "components.Settings.SettingsAbout.Releases.versionChangelog": "Journal des modifications de la version {version}",
  "components.Settings.SettingsAbout.Releases.releases": "Versions",
-  "components.Settings.SettingsAbout.Releases.releasedataMissing": "Les données de version sont actuellement indisponible.",
+  "components.Settings.SettingsAbout.Releases.releasedataMissing": "Les données de version sont actuellement indisponibles.",
  "components.Settings.SettingsAbout.Releases.latestversion": "Dernière version",
  "components.Settings.SettingsAbout.Releases.currentversion": "Actuelle",
  "components.UserList.importfromplexerror": "Une erreur s'est produite durant l'importation des utilisateurs de Plex.",
@@ -1071,7 +1071,7 @@
  "components.ManageSlideOver.manageModalMedia4k": "Média(s) 4K",
  "components.ManageSlideOver.markallseasons4kavailable": "Marquer toutes les saisons comme disponibles en 4K",
  "components.ManageSlideOver.playedby": "Joué par",
-  "components.Settings.validationUrlTrailingSlash": "L'URL ne doit pas ce terminer par un slash",
+  "components.Settings.validationUrlTrailingSlash": "L'URL ne doit pas se terminer par un slash",
  "components.Settings.externalUrl": "URL externe",
  "components.Settings.tautulliApiKey": "Clé API",
  "components.Settings.tautulliSettings": "Paramètres Tautulli",
@@ -1252,70 +1252,10 @@
  "components.Settings.SonarrModal.tagRequestsInfo": "Ajouter automatiquement un tag supplémentaire avec l'ID utilisateur et le nom d'affichage du demandeur",
  "i18n.collection": "Collection",
  "components.Settings.RadarrModal.tagRequestsInfo": "Ajouter automatiquement un tag supplémentaire avec l'ID utilisateur et le nom d'affichage du demandeur",
-  "components.IssueModal.issueVideo": "Vidéo",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Son de notification",
-  "components.Settings.jellyfinSettings": "Paramètres pour {mediaServerName}",
-  "components.Settings.jellyfinSettingsFailure": "Une erreur est survenue lors de l'enregistrement des paramètres pour {mediaServerName}.",
-  "components.Settings.jellyfinSettingsSuccess": "Les paramètres pour {mediaServerName} ont été enregistrés avec succès !",
-  "components.Settings.jellyfinlibraries": "Bibliothèques {mediaServerName}",
-  "components.Settings.jellyfinlibrariesDescription": "Les bibliothèques de {mediaServerName} sont en cours d'analyze. Cliquez sur le bouton ci-dessous si aucune bibliothèque n'est répertoriée.",
-  "components.Settings.jellyfinsettings": "Paramètres pour {mediaServerName}",
-  "components.Settings.manualscanJellyfin": "Analyse manuelle de la bibliothèque",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.Settings.save": "Enregistrer les modifications",
-  "components.Settings.saving": "Sauvegarde en cours…",
-  "components.Settings.syncing": "Synchronisation en cours",
-  "components.Setup.signin": "Se connecter",
-  "components.Setup.signinWithPlex": "Utilisez votre compte Plex",
-  "components.StatusBadge.managemedia": "Gérer {mediaType}",
-  "components.StatusBadge.openinarr": "Ouvrir dans {arr}",
-  "components.StatusBadge.playonplex": "Lire sur {mediaServerName}",
-  "components.TitleCard.addToWatchList": "Ajouter à votre watchlist",
-  "components.TitleCard.watchlistCancel": "Watchlist pour <strong>{title}</strong> annulée.",
-  "components.TitleCard.watchlistError": "Une erreur est survenue. Veuillez réessayer.",
-  "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> a été ajouté à votre watchlist avec succès !",
-  "components.TvDetails.Season.somethingwentwrong": "Une erreur est survenue lors de la récupération des données de la saison.",
-  "components.TvDetails.manageseries": "Gérer les séries",
-  "components.TvDetails.play": "Jouer sur {mediaServerName}",
-  "components.TvDetails.play4k": "Jouer en 4K sur {mediaServerName}",
-  "components.TvDetails.rtcriticsscore": "Tomatometer sur Rotten Tomatoes",
-  "components.TvDetails.seasonnumber": "Saison {seasonNumber}",
-  "components.TvDetails.seasonstitle": "Saisons",
-  "components.TvDetails.status4k": "{status} 4K",
-  "components.TvDetails.tmdbuserscore": "Score utilisateur sur TMDB",
-  "components.UserList.importfromJellyfin": "Importer les utilisateurs de {mediaServerName}",
-  "components.UserList.importfromJellyfinerror": "Une erreur est survenue lors de l'importation des utilisateurs de {mediaServerName}.",
-  "components.UserList.importfrommediaserver": "Importer les utilisateurs de {mediaServerName}",
-  "components.UserList.noJellyfinuserstoimport": "Il n'y a aucun utilisateur à importer pour {mediaServerName}.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Sauvegarde en cours…",
-  "components.UserProfile.plexwatchlist": "Watchlist Plex",
-  "components.Settings.syncJellyfin": "Synchroniser les bibliothèques",
-  "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> a été retiré de votre watchlist avec succès !",
-  "components.IssueModal.issueSubtitles": "Sous-titre",
-  "components.Login.emailtooltip": "L'adresse ne nécessite pas d'être associée avec votre instance {mediaServerName}.",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Appareil par défaut",
-  "components.Settings.Notifications.userEmailRequired": "E-mail utilisateur requis",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Soutenez Jellyseerr",
-  "components.Settings.SettingsJobsCache.jellyfin-full-scan": "Scan complet des bibliothèques Jellyfin",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Scan des ajouts récents aux bibliothèques Jellyfin",
-  "components.Settings.SonarrModal.animeSeriesType": "Type de série anime",
  "components.Settings.SonarrModal.seriesType": "Type de série",
-  "components.Settings.internalUrl": "URL interne",
-  "components.Settings.jellyfinsettingsDescription": "Configurez les paramètres de votre serveur {mediaServerName}. {mediaServerName} analyse vos bibliothèques {mediaServerName} pour voir quel contenu est disponible.",
-  "components.Settings.jellyfinSettingsDescription": "Configurez facultativement les URL internes et externes pour votre serveur {mediaServerName}. Dans la plupart des cas, l'URL externe est différente de l'URL interne. Vous pouvez également définir une URL de réinitialisation de mot de passe personnalisée pour la connexion à {mediaServerName}, au cas où vous souhaiteriez rediriger vers une page de réinitialisation de mot de passe différente.",
-  "components.Settings.manualscanDescriptionJellyfin": "Normalement, cette tâche est executée qu'une fois toutes les 24 heures. Jellyseerr vérifiera plus agressivement les éléments récemment ajoutés à votre serveur {mediaServerName}. Si c'est la première fois que vous configurez Jellyseerr, une analyse complète manuelle de la bibliothèque est recommandée !",
-  "components.Settings.timeout": "Temps écoulé",
-  "components.Setup.configuremediaserver": "Configurer le serveur multimédia",
-  "components.TvDetails.rtaudiencescore": "Score de l'audience sur Rotten Tomatoes",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "Utilisateur pour {mediaServerName}",
-  "components.Setup.signinWithJellyfin": "Utilisez votre compte {mediaServerName}",
-  "components.UserList.mediaServerUser": "Utilisateur de {mediaServerName}",
-  "components.TvDetails.episodeCount": "{episodeCount, plural, one {# Épisode} other {# Épisodes}}",
-  "components.UserList.newJellyfinsigninenabled": "Le paramètre <strong>Activer la nouvelle connexion à {mediaServerName}</strong> est actuellement activé. Les utilisateurs de {mediaServerName} avec accès à la bibliothèque n'ont pas besoin d'être importés pour se connecter.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "E-mail",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Enregistrer les modifications",
+  "components.Settings.SonarrModal.animeSeriesType": "Types d'anime",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Appareil par défaut",
  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Appareil par défaut",
-  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} importé(s) avec succès !",
  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Son de notification",
-  "components.UserProfile.localWatchlist": "Watchlist de {username}"
+  "components.Settings.Notifications.NotificationsPushover.sound": "Son de notification"
 }
--- a/src/i18n/locale/he.json
+++ b/src/i18n/locale/he.json
@@ -1,8 +1,8 @@
 {
  "components.ManageSlideOver.alltime": "כל הזמנים",
-  "components.Login.validationemailrequired": "יש לספק מייל חוקי",
+  "components.Login.validationemailrequired": "חובה לספק כתובת מייל חוקית",
  "components.NotificationTypeSelector.userissuereopenedDescription": "קבל התראה כשבעיות שפתחת נפתחות מחדש.",
-  "components.AppDataWarning.dockerVolumeMissingDescription": "ה <code>{appDataPath}</code> אחסון לא הוגדר כראוי. כל המידע יוסר כאשר הקונטיינר יעצור או יותחל מחדש.",
+  "components.AppDataWarning.dockerVolumeMissingDescription": "רכיב האחסון <code>{appDataPath}</code> לא הוגדר כראוי. כל המידע יוסר כאשר הקונטיינר יעצור או יותחל מחדש.",
  "components.CollectionDetails.overview": "תצוגה כללית",
  "components.CollectionDetails.numberofmovies": "{כמות} סרטים",
  "components.CollectionDetails.requestcollection": "אוסף בקשות",
@@ -31,8 +31,8 @@
  "components.Discover.upcomingtv": "סדרות שיצאו בקרוב",
  "components.DownloadBlock.estimatedtime": "{time} משוער",
  "components.IssueDetails.IssueComment.delete": "מחיקת תגובה",
-  "components.IssueDetails.IssueComment.areyousuredelete": "למחוק את התגובה?",
-  "components.IssueDetails.IssueComment.edit": "עריכת תגובה",
+  "components.IssueDetails.IssueComment.areyousuredelete": "האם תרצה למחוק את התגובה?",
+  "components.IssueDetails.IssueComment.edit": "לערוך תגובה",
  "components.IssueDetails.IssueDescription.edit": "ערוך תיאור",
  "components.IssueDetails.allepisodes": "כל הפרקים",
  "components.IssueDetails.allseasons": "כל העונות",
@@ -40,8 +40,8 @@
  "components.IssueDetails.closeissueandcomment": "סגור עם תגובה",
  "components.IssueDetails.episode": "פרק {episodeNumber}",
  "components.IssueDetails.issuepagetitle": "מקרה",
-  "components.IssueDetails.playonplex": "הפעל ב-Plex",
-  "components.IssueDetails.play4konplex": "הפעל 4K ב-Plex",
+  "components.IssueDetails.playonplex": "הפעל בפלקס",
+  "components.IssueDetails.play4konplex": "הפעל 4K בפלקס",
  "components.IssueDetails.problemepisode": "פרק מושפע",
  "components.IssueDetails.toastissuedeleted": "מקרה נמחק בהצלחה!",
  "components.IssueList.IssueItem.issuetype": "סוג",
@@ -49,11 +49,11 @@
  "components.IssueList.IssueItem.openeduserdate": "{date} ע\"י {user}",
  "components.IssueModal.issueSubtitles": "כתוביות",
  "components.IssueModal.issueVideo": "וידאו",
-  "components.Layout.Sidebar.dashboard": "גילוי חדשים",
-  "components.Login.signingin": "מבצע לוגאין…",
-  "components.Login.signinheader": "יש להתחבר בכדי להמשיך",
-  "components.Login.signinwithoverseerr": "שימוש בחשבון {applicationTitle}",
-  "components.Login.signinwithplex": "שימוש בחשבון Plex",
+  "components.Layout.Sidebar.dashboard": "לגלות",
+  "components.Login.signingin": "התחברות…",
+  "components.Login.signinheader": "התחבר בשביל להמשיך",
+  "components.Login.signinwithoverseerr": "השתמש בחשבון {applicationTitle} שלך",
+  "components.Login.signinwithplex": "השתמש בחשבון הפלקס שלך",
  "components.ManageSlideOver.downloadstatus": "הורדות",
  "components.Discover.DiscoverWatchlist.watchlist": "רשימת צפייה",
  "components.Discover.MovieGenreSlider.moviegenres": "סוגי סרטים",
@@ -68,7 +68,7 @@
  "components.IssueList.sortAdded": "הכי עדכני",
  "components.IssueList.sortModified": "עודכן לאחרונה",
  "components.IssueModal.CreateIssueModal.allepisodes": "כל הפרקים",
-  "components.IssueModal.CreateIssueModal.providedetail": "יש לספק מידע מפורט אודות המקרה שחווית.",
+  "components.IssueModal.CreateIssueModal.providedetail": "אנא תפרט אודות המקרה שחווית.",
  "components.IssueModal.CreateIssueModal.submitissue": "הגש מקרה",
  "components.LanguageSelector.originalLanguageDefault": "כל השפות",
  "components.Layout.Sidebar.requests": "בקשות",
@@ -76,7 +76,7 @@
  "components.Layout.Sidebar.users": "משתמשים",
  "components.Layout.UserDropdown.myprofile": "פרופיל",
  "components.Layout.UserDropdown.settings": "הגדרות",
-  "components.Layout.VersionStatus.streamdevelop": "פיתוח Jellyseerr",
+  "components.Layout.VersionStatus.streamdevelop": "Jellyseerr פיתוח",
  "components.AirDateBadge.airedrelative": "שודר ב-{relativeTime}",
  "components.Discover.NetworkSlider.networks": "רשתות שידור",
  "components.Discover.discover": "לגלות",
@@ -89,7 +89,7 @@
  "components.IssueDetails.leavecomment": "תגובה",
  "components.IssueDetails.nocomments": "אין תגובות.",
  "components.IssueDetails.problemseason": "עונה מושפעת",
-  "components.IssueDetails.reopenissue": "פתח בעיה מחדש",
+  "components.IssueDetails.reopenissue": "פתח מקרה מחדש",
  "components.IssueDetails.reopenissueandcomment": "פתח מחדש עם תגובה",
  "components.IssueDetails.season": "עונה {seasonNumber}",
  "components.IssueDetails.toasteditdescriptionfailed": "משהו השתבש בזמן עריכת תיאור המקרה.",
@@ -112,7 +112,7 @@
  "components.IssueModal.CreateIssueModal.toastFailedCreate": "משהו השתבש בזמן הגשת מקרה.",
  "components.IssueModal.CreateIssueModal.reportissue": "דווח על מקרה",
  "components.IssueModal.CreateIssueModal.whatswrong": "מה השתבש?",
-  "components.IssueModal.issueAudio": "אודיו",
+  "components.IssueModal.issueAudio": "שמע/אודיו",
  "components.IssueModal.issueOther": "אחר",
  "components.IssueModal.CreateIssueModal.toastviewissue": "צפה במקרה",
  "components.IssueModal.CreateIssueModal.validationMessageRequired": "אנא כתוב תיאור",
@@ -123,237 +123,53 @@
  "components.Layout.UserDropdown.MiniQuotaDisplay.seriesrequests": "בקשות סדרות",
  "components.Login.forgotpassword": "שכחת סיסמה?",
  "components.Layout.VersionStatus.streamstable": "Jellyseerr יציבה",
-  "components.Login.email": "כתובת מייל",
+  "components.Login.email": "כתובת אימייל",
  "components.ManageSlideOver.manageModalAdvanced": "מתקדם",
-  "components.ManageSlideOver.manageModalClearMedia": "ניקוי מידע",
+  "components.ManageSlideOver.manageModalClearMedia": "מחק מידע",
  "components.Discover.emptywatchlist": "מדיה נוספה לתוך <PlexWatchlistSupportLink>רשימת צפייה</PlexWatchlistSupportLink> תוצג פה.",
  "components.IssueModal.CreateIssueModal.toastSuccessCreate": "דווח מקרה של <strong>{title}</strong> הוגש בהצלחה!",
  "components.Layout.Sidebar.issues": "מקרים",
  "components.Layout.UserDropdown.requests": "בקשות",
  "components.Layout.UserDropdown.signout": "התנתק",
  "components.Layout.VersionStatus.outofdate": "לא מעודכן",
-  "components.Login.loginerror": "משהו השתבש בלוגאין.",
+  "components.Login.loginerror": "משהו השתבש בזמן ההתחברות.",
  "components.Login.password": "סיסמה",
  "components.Login.signin": "התחברות",
-  "components.Login.validationpasswordrequired": "יש לספק סיסמה",
-  "components.Discover.CreateSlider.editSlider": "ערוך סליידר",
-  "components.Discover.CreateSlider.editfail": "נכשלה עריכת סליידר.",
-  "components.Discover.CreateSlider.needresults": "אתה צריך לפחות תוצאה אחת.",
-  "components.Discover.CreateSlider.nooptions": "אין תוצאות.",
-  "components.Discover.CreateSlider.providetmdbgenreid": "ספק מזהה ז'אנר TMDB",
-  "components.Discover.CreateSlider.providetmdbkeywordid": "ספק מזהה מילת מפתח TMDB",
-  "components.Discover.CreateSlider.providetmdbsearch": "ספק שאילתת חיפוש",
-  "components.Discover.CreateSlider.providetmdbstudio": "ספק מזהה סטודיו TMDB",
-  "components.Discover.CreateSlider.searchGenres": "חפש ז'אנרים…",
-  "components.Discover.CreateSlider.searchKeywords": "חפש מילות מפתח…",
-  "components.Discover.CreateSlider.searchStudios": "חפש אולפנים…",
+  "components.Login.validationpasswordrequired": "חובה לכתוב סיסמה",
+  "components.Discover.CreateSlider.editsuccess": "ערוך סליידרהגדרות התאמה אישית שמורות.",
  "components.Discover.CreateSlider.slidernameplaceholder": "שם הסליידר",
+  "components.Discover.DiscoverMovies.sortPopularityDesc": "פופולאריות יורדץ",
+  "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "דירוג TMDB עולה",
+  "components.Discover.CreateSlider.searchStudios": "חפש אולפנים…",
+  "components.Discover.DiscoverMovies.sortReleaseDateDesc": "תאריך שחרור יורד",
+  "components.Discover.CreateSlider.providetmdbnetwork": "הזמן מזהה רשת TMDB",
+  "components.Discover.CreateSlider.addfail": "שגיאה ביצירת סליידר.",
+  "components.Discover.DiscoverMovies.sortPopularityAsc": "פופולאריות עולה",
+  "components.Discover.CreateSlider.needresults": "חייב שתהיה לפחות תוצאה אחת.",
+  "components.Discover.CreateSlider.addcustomslider": "צור סליידר מותאם אישית",
+  "components.Discover.CreateSlider.editSlider": "ערוך סליידר",
  "components.Discover.CreateSlider.validationDatarequired": "עליך לספק ערך.",
-  "components.Discover.CreateSlider.validationTitlerequired": "עליך לספק כותר.",
-  "components.Discover.DiscoverMovieKeyword.keywordMovies": "סרטים {keywordTitle}",
-  "components.Discover.DiscoverMovies.discovermovies": "סרטים",
-  "components.Discover.DiscoverMovies.sortPopularityAsc": "פופולריות בסדר עולה",
-  "components.Discover.DiscoverMovies.sortPopularityDesc": "פופולריות בסדר יורד",
-  "components.Discover.DiscoverMovies.sortReleaseDateAsc": "תאריך שחרור בסדר עולה",
-  "components.Discover.DiscoverMovies.sortReleaseDateDesc": "תאריך שחרור בסדר יורד",
-  "components.Discover.DiscoverMovies.sortTitleAsc": "כותר (א-ת, A-Z) עולה",
-  "components.Discover.DiscoverMovies.sortTitleDesc": "כותר (ת-א, A-Z) יורד",
-  "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "דירוג TMDB בסדר עולה",
-  "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "דירוג TMDB בסדר יורד",
-  "components.Discover.DiscoverSliderEdit.deletesuccess": "סליידר נמחק בהצלחה.",
-  "components.Discover.DiscoverSliderEdit.enable": "שנה נראות",
-  "components.Discover.DiscoverSliderEdit.remove": "הסר",
-  "components.Discover.DiscoverTv.activefilters": "{count, plural, one {פילטר אחד פעיל} other {# פילטרים פעילים}}",
  "components.Discover.DiscoverTv.discovertv": "סדרה",
-  "components.Discover.CreateSlider.addfail": "נכשלה יצירת סליידר חדש.",
-  "components.Discover.DiscoverTv.sortPopularityAsc": "פופולריות בסדר עולה",
-  "components.Discover.DiscoverTv.sortPopularityDesc": "פופולריות בסדר יורד",
-  "components.Discover.DiscoverTv.sortTitleAsc": "כותר (א-ת, A-Z) עולה",
-  "components.Discover.DiscoverTv.sortTitleDesc": "כותר (א-ת, A-Z) יורד",
-  "components.Discover.DiscoverTv.sortTmdbRatingAsc": "דירוג TMDB בסדר עולה",
-  "components.Discover.DiscoverTvKeyword.keywordSeries": "סדרה {keywordTitle}",
-  "components.Discover.FilterSlideover.activefilters": "{count, plural, one {פילטר אחד פעיל} other {# פילטרים פעילים}}",
-  "components.Discover.FilterSlideover.clearfilters": "נקה פילטרים פעילים",
-  "components.Discover.FilterSlideover.filters": "פילטרים",
-  "components.Discover.FilterSlideover.firstAirDate": "תאריך שידור ראשון",
-  "components.Discover.FilterSlideover.from": "מאת",
-  "components.Discover.FilterSlideover.keywords": "מילות מפתח",
-  "components.Discover.FilterSlideover.originalLanguage": "שפה מקורית",
-  "components.Discover.FilterSlideover.ratingText": "דירוג בין {minValue} ל {maxValue}",
-  "components.Discover.FilterSlideover.releaseDate": "תאריך שחרור",
-  "components.Discover.FilterSlideover.runtime": "זמן ריצה",
-  "components.Discover.FilterSlideover.streamingservices": "שירותי הזרמה",
-  "components.Discover.FilterSlideover.studio": "אולפן",
-  "components.Discover.FilterSlideover.tmdbuserscore": "דירוג משתמש TMDB",
+  "components.Discover.DiscoverSliderEdit.deletefail": "שגיאה במחיקת סליידר.",
+  "components.Discover.CreateSlider.providetmdbstudio": "הזן מזהה אולפן TMDB",
+  "components.Discover.DiscoverMovies.sortTitleDesc": "כותר (ת-א) יורד",
+  "components.Discover.CreateSlider.searchGenres": "חפש ז'אנרים…",
+  "components.Discover.CreateSlider.editfail": "שגיאה בעריכת סליידר.",
+  "components.Discover.CreateSlider.starttyping": "התחל לכתוב כדי לחפש.",
+  "components.Discover.DiscoverSliderEdit.enable": "שנה נראות",
  "components.Discover.CreateSlider.addSlider": "הוסף סליידר",
-  "components.Discover.CreateSlider.addcustomslider": "צור סליידר מותאם",
-  "components.Discover.CreateSlider.addsuccess": "סליידר חדש נוצר בהצלחה ונשמרו הגדרות התאמה.",
-  "components.Discover.CreateSlider.providetmdbnetwork": "ספק מזהה רשת TMDB",
-  "components.Discover.DiscoverTv.sortFirstAirDateDesc": "תאריך שידור ראשון בסדר יורד",
-  "components.Discover.CreateSlider.starttyping": "התחל להזין כדי לחפש.",
-  "components.Discover.FilterSlideover.runtimeText": "זמן ריצה בין {minValue} ל {maxValue}",
-  "components.Discover.DiscoverMovies.activefilters": "{count, plural, one {פילטר פעיל} other {# פילטרים פעילים}}",
-  "components.Discover.DiscoverSliderEdit.deletefail": "כשל במחיקת סליידר.",
-  "components.Discover.DiscoverTv.sortFirstAirDateAsc": "תאריך שידור ראשון בסדר עולה",
-  "components.Discover.CreateSlider.editsuccess": "סליידר נערך ונשמר בהצלחה.",
-  "components.Discover.DiscoverTv.sortTmdbRatingDesc": "דירוג TMDB בסדר יורד",
-  "components.Discover.FilterSlideover.genres": "ז'אנרים",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "מספר הצבעות משתמשים בTMDB",
-  "components.Discover.FilterSlideover.to": "בשביל",
-  "components.Discover.FilterSlideover.voteCount": "מספר הצבעות בין {minValue} ל-{maxValue}",
-  "components.Discover.PlexWatchlistSlider.emptywatchlist": "מדיה נוספה ל<PlexWatchlistSupportLink>רשימת צפייה ב-Plex</PlexWatchlistSupportLink>ותופיע שם.",
-  "components.Discover.PlexWatchlistSlider.plexwatchlist": "רשימת הצפייה שלך",
-  "components.Discover.RecentlyAddedSlider.recentlyAdded": "נוספו לאחרונה",
-  "components.Discover.createnewslider": "יצירת מחוון חדש",
-  "components.Discover.customizediscover": "התאם אישית את הגילוי",
-  "components.Discover.networks": "רשתות",
-  "components.Discover.resetsuccess": "הגדרות הגילוי אופסו בהצלחה.",
-  "components.Discover.resettodefault": "אופס לברירת מחדל",
-  "components.Discover.stopediting": "סיים עריכה",
-  "components.Discover.studios": "אולפנים",
-  "components.Discover.tmdbmoviegenre": "ז'אנר סרט בTMDB",
-  "components.Discover.tmdbmoviekeyword": "מילת מפתח של סרט בTMDB",
-  "components.Discover.tmdbmoviestreamingservices": "רשת צפייה של סרט בTMDB",
-  "components.Discover.tmdbnetwork": "רשת בTMDB",
-  "components.Discover.tmdbsearch": "חיפוש בTMDB",
-  "components.Discover.tmdbstudio": "אולפן בTMDB",
-  "components.Discover.tmdbtvgenre": "ז'אנר סדרה בTMDB",
-  "components.Discover.tmdbtvkeyword": "מילת מפתח של סדרה בTMDB",
-  "components.Discover.tvgenres": "ז'אנרים של סדרות",
-  "components.Discover.updatefailed": "משהו השתבש במהלך עדכון הגדרות של גילוי.",
-  "components.Discover.updatesuccess": "הגדרות הגילוי התעדכנו.",
-  "components.IssueList.IssueItem.seasons": "{seasonCount, plural, one {Season} other {Seasons}}",
-  "components.Layout.Sidebar.browsetv": "סדרות",
-  "components.Layout.UserWarnings.emailRequired": "דרושה כתובת מייל.",
-  "components.Layout.UserWarnings.passwordRequired": "דרושה סיסמה.",
-  "components.Login.credentialerror": "שם המשתמש או הסיסמה שגויים.",
-  "components.Login.description": "בהתחברות ראשונית ל-{applicationName}, יש להוסיף כתובת מייל.",
-  "components.Login.host": "קישור {mediaServerName}",
-  "components.Login.initialsignin": "חיבור",
-  "components.Login.initialsigningin": "מתחבר…",
-  "components.Login.save": "הוספה",
-  "components.Login.saving": "מוסיף…",
-  "components.Login.title": "הוספת מייל",
-  "components.Login.username": "שם משתמש",
-  "components.Login.validationEmailFormat": "כתובת מייל שגוייה",
-  "components.Login.validationEmailRequired": "יש להוסיף מייל",
-  "components.Login.validationemailformat": "נדרש מייל תקין",
-  "components.Login.validationhostrequired": "נדרש קישור של {mediaServerName}",
-  "components.Login.validationusernamerequired": "נדרש שם משתמש",
-  "components.ManageSlideOver.manageModalIssues": "תקלות פתוחות",
-  "components.ManageSlideOver.manageModalMedia": "מדיה",
-  "components.ManageSlideOver.manageModalMedia4k": "מדיה ב-4K",
-  "components.ManageSlideOver.manageModalNoRequests": "אין בקשות.",
-  "components.ManageSlideOver.manageModalRequests": "בקשות",
-  "components.ManageSlideOver.manageModalTitle": "נהל {mediaType}",
-  "components.ManageSlideOver.mark4kavailable": "סמן כזמין באיכות 4K",
-  "components.ManageSlideOver.markallseasonsavailable": "סמן את כל העונות כזמינות",
-  "components.ManageSlideOver.markavailable": "סמן כזמין",
-  "components.ManageSlideOver.movie": "סרט",
-  "components.ManageSlideOver.openarr": "הפעל ב-{arr}",
-  "components.ManageSlideOver.openarr4k": "הפעל גרסת 4K ב-{arr}",
-  "components.ManageSlideOver.opentautulli": "הפעל ב-Tautulli",
-  "components.ManageSlideOver.pastdays": "{days, number} ימים עברו",
-  "components.ManageSlideOver.playedby": "משוחק על ידי",
-  "components.ManageSlideOver.removearr": "הסר מ-{arr}",
-  "components.ManageSlideOver.removearr4k": "הסר את איכות 4K מ-{arr}",
-  "components.ManageSlideOver.tvshow": "סדרה",
-  "components.MediaSlider.ShowMoreCard.seemore": "ראה עוד",
-  "components.MovieDetails.MovieCast.fullcast": "כל השחקנים",
-  "components.MovieDetails.MovieCrew.fullcrew": "כל הצוות",
-  "components.MovieDetails.budget": "תקציב",
-  "components.MovieDetails.cast": "ליהוק",
-  "components.MovieDetails.digitalrelease": "מהדורה דיגיטלית",
-  "components.MovieDetails.downloadstatus": "מצב הורדה",
-  "components.MovieDetails.imdbuserscore": "דירוג משתמש ב-IMDB",
-  "components.MovieDetails.mark4kavailable": "סמן כזמין באיכות 4K",
-  "components.MovieDetails.markavailable": "סמן כזמין",
-  "components.MovieDetails.openradarr": "הפעל סרט ב-Radarr",
-  "components.MovieDetails.openradarr4k": "הפעל סרט באיכות 4K ב-Radarr",
-  "components.MovieDetails.originallanguage": "שפת מקור",
-  "components.MovieDetails.originaltitle": "השם במקור",
-  "components.MovieDetails.overview": "סקירה",
-  "components.MovieDetails.physicalrelease": "מהדורה פיזית",
-  "components.MovieDetails.play": "הפעל ב-{mediaServerName}",
-  "components.MovieDetails.play4k": "הפעל באיכות 4K ב-{mediaServerName}",
-  "components.MovieDetails.recommendations": "המלצות",
-  "components.MovieDetails.revenue": "רווח",
-  "components.MovieDetails.rtaudiencescore": "דירוג צופים ב-Rotten Tomatoes",
-  "components.MovieDetails.rtcriticsscore": "דירוג ב-Rotten Tomatoes",
-  "components.MovieDetails.runtime": "{minutes} דקות",
-  "components.MovieDetails.showless": "הראה פחות",
-  "components.MovieDetails.showmore": "הראה יותר",
-  "components.MovieDetails.streamingproviders": "זמין כעת ב",
-  "components.MovieDetails.studio": "{studioCount, plural, one {Studio} other {Studios}}",
-  "components.Discover.moviegenres": "ז'אנרים של סרטים",
-  "components.Discover.resetfailed": "משהו השתבש, מאפס את ההתאמה האישית בגילוי.",
-  "components.Discover.resetwarning": "מאפס את כל המחוונים, זה ימחק כל מחוון מותאם אישית!",
-  "components.Discover.tmdbtvstreamingservices": "רשתות צפייה של סדרות בTMDB",
-  "components.DownloadBlock.formattedTitle": "{title}: עונה {seasonNumber} פרק {episodeNumber}",
-  "components.IssueList.IssueItem.episodes": "{episodeCount, plural, one {Episode} other {Episodes}}",
-  "components.Layout.Sidebar.browsemovies": "סרטים",
-  "components.Layout.UserWarnings.emailInvalid": "כתובת מייל אינה תקינה.",
-  "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {commit} other {commits}} מאחור",
-  "components.Login.signinwithjellyfin": "שימוש בחשבון {mediaServerName}",
-  "components.Login.validationhostformat": "נדרש קישור תקין",
-  "components.ManageSlideOver.manageModalClearMediaWarning": "* כל הנתונים שלך ל-{mediaType}, כולל בקשות, ימחקו. אם זה קיים בספרייה של {mediaServerName}, זה יצור אותה מחדש בסריקה הבאה.",
-  "components.ManageSlideOver.markallseasons4kavailable": "סמן את כל העונות כזמינות ב-4K",
-  "components.ManageSlideOver.plays": "<strong>{playCount, number}</strong> {playCount, plural, one {play} other {plays}}",
-  "components.MovieDetails.managemovie": "נהל סרט",
-  "components.MovieDetails.overviewunavailable": "סקירה לא זמינה.",
-  "components.MovieDetails.productioncountries": "נוצר ב-{countryCount, plural, one {Country} other {Countries}}",
-  "components.MovieDetails.releasedate": "{releaseCount, plural, one {Release Date} other {Release Dates}}",
-  "components.MovieDetails.reportissue": "דווח על תקלה",
-  "components.MovieDetails.similar": "כותרים דומים",
-  "components.Login.emailtooltip": "הכתובת אינה צריכה להיות משוייכת ל-{mediaServerName}.",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* הפעולה תסיר את {mediaType} מ-{arr} כולל כל הקבצים.",
-  "components.MovieDetails.theatricalrelease": "שיחרור מוגבל",
-  "components.MovieDetails.tmdbuserscore": "דיגור TMDB",
-  "components.MovieDetails.viewfullcrew": "צפייה בכל הצוות",
-  "components.MovieDetails.watchtrailer": "נגן טריילר",
-  "components.NotificationTypeSelector.adminissuecommentDescription": "קבלת התראות כאשר משתמשים אחרים מגיבים למקרה.",
-  "components.NotificationTypeSelector.adminissuereopenedDescription": "קבלת התראות כאשר משתמשים אחרים פותחים את המקרה מחדש.",
-  "components.NotificationTypeSelector.adminissueresolvedDescription": "קבלת התראות כאשר המקרה נפתר ע״י משתמשים אחרים.",
-  "components.NotificationTypeSelector.issuecomment": "תגובה למקרה",
-  "components.NotificationTypeSelector.issuecommentDescription": "קבלת התראות כאשר מתקבלות תגובות חדשות למקרים.",
-  "components.NotificationTypeSelector.issuecreated": "מקרה חדש נפתח",
-  "components.NotificationTypeSelector.issuecreatedDescription": "קבלת התראות כאשר מקרה חדש נפתח.",
-  "components.NotificationTypeSelector.issuereopened": "מקרה נפתח מחדש",
-  "components.NotificationTypeSelector.issuereopenedDescription": "קבלת התראות כאשר מקרים נפתחים מחדש.",
-  "components.NotificationTypeSelector.issueresolved": "פנייה נפתרה",
-  "components.NotificationTypeSelector.issueresolvedDescription": "קבלת התראות כאשר פניות נפתרות.",
-  "components.NotificationTypeSelector.mediaAutoApproved": "בקשה אושרה אוטומטית",
-  "components.NotificationTypeSelector.mediaAutoApprovedDescription": "קבלת התראות כאשר משתמשים פותחים בקשה חדשה שמאושרת אוטומטית.",
-  "components.NotificationTypeSelector.mediaapproved": "בקשה אושרה",
-  "components.NotificationTypeSelector.mediaapprovedDescription": "שליחת התראות כאשר בקשות מדיה מאושרות אוטומטית.",
-  "components.NotificationTypeSelector.mediaautorequested": "בקשה נפתחה אוטומטית",
-  "components.NotificationTypeSelector.mediaautorequestedDescription": "שליחת התראות כאשר הבקשה נוצרת אוטומטית עבור מדיה ברשימת הצפייה.",
-  "components.NotificationTypeSelector.mediaavailable": "בקשה זמינה",
-  "components.NotificationTypeSelector.mediaavailableDescription": "שליחת התראות כאשר ניתן ליצור בקשות מדיה.",
-  "components.NotificationTypeSelector.mediadeclined": "בקשה נדחתה",
-  "components.NotificationTypeSelector.mediadeclinedDescription": "קבלת התראות כאשר בקשות מדיה נדחות.",
-  "components.NotificationTypeSelector.mediafailed": "עיבוד הבקשה נכשל",
-  "components.NotificationTypeSelector.mediarequested": "בקשה ממתינה לאישור",
-  "components.NotificationTypeSelector.mediarequestedDescription": "קבלת התראות כאשר משתמשים פותחים בקשות מדיה שדורשות אישור.",
-  "components.NotificationTypeSelector.userissuecreatedDescription": "קבלת התראות כאשר משתמשים אחרים מדווחים על תקלות",
-  "components.PermissionEdit.admin": "מנהל",
-  "components.PermissionEdit.adminDescription": "גישת מנהל מלאה. עוקף את כל ההרשאות שסומנו.",
-  "components.PermissionEdit.advancedrequest": "בקשות מתקדמות",
-  "components.PermissionEdit.advancedrequestDescription": "הרשאות לשינוי אפשרויות בקשות מדיה.",
-  "components.PermissionEdit.autoapprove": "אישור אוטומטי",
-  "components.PermissionEdit.autoapprove4k": "אישור אוטומטי של 4K",
-  "components.PermissionEdit.autoapprove4kMovies": "אישור אוטומטי סרטי 4K",
-  "components.PermissionEdit.autoapprove4kMoviesDescription": "אישור אוטומטי של בקשות לסרטים 4K",
-  "components.PermissionEdit.autoapprove4kSeries": "אישור אוטומטי של סדרות 4K",
-  "components.PermissionEdit.autoapproveDescription": "אישור אוטומטי של בקשות לסדרות ברזולוציית נמוכה מ-4K",
-  "components.PermissionEdit.autoapproveMovies": "אישור סרטים אוטומטי",
-  "components.PermissionEdit.autoapproveMoviesDescription": "אישור בקשות סרטים אוטומטי (ללא 4K).",
-  "components.PermissionEdit.autoapproveSeries": "אישור סדרות אוטומטי",
-  "components.PermissionEdit.autorequest": "בקשה אוטומטית",
-  "components.NotificationTypeSelector.mediafailedDescription": "קבלת התראות כאשר יש כשל בהוספת בקשות מדיה אל Radarr או Sonarr",
-  "components.NotificationTypeSelector.notificationTypes": "סוגי התראות",
-  "components.NotificationTypeSelector.userissuecommentDescription": "קבלת התראות כאשר תקלות שדיווחת מקבלות תגובות חדשות.",
-  "components.PermissionEdit.autoapprove4kDescription": "אישור אוטומטי של בקשות מדיה 4K",
-  "components.PermissionEdit.autoapprove4kSeriesDescription": "אישור אוטומטי של בקשות לסדרות ברזולוציית 4K",
-  "components.PermissionEdit.autoapproveSeriesDescription": "אישור בקשות סדרות אוטומטי (ללא 4K)."
+  "components.Discover.CreateSlider.providetmdbsearch": "הזן מילת חיפוש",
+  "components.Discover.CreateSlider.providetmdbkeywordid": "הזן מילת חיפוש TMDB",
+  "components.Discover.DiscoverMovieKeyword.keywordMovies": "סרטי {keywordTitle}",
+  "components.Discover.CreateSlider.validationTitlerequired": "עליך לספק כותרת.",
+  "components.Discover.DiscoverMovies.sortReleaseDateAsc": "תאריך שחרור עולה",
+  "components.Discover.CreateSlider.nooptions": "אין תוצאות.",
+  "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "דירוג TMDB יורד",
+  "components.Discover.CreateSlider.searchKeywords": "חפש מילות מפתח…",
+  "components.Discover.CreateSlider.addsuccess": "צור סליידר חדש והגדרות התאמה אישית שמורות.",
+  "components.Discover.DiscoverSliderEdit.deletesuccess": "סליידר נמחק בהצלחה.",
+  "components.Discover.DiscoverMovies.discovermovies": "סרטים",
+  "components.Discover.DiscoverMovies.sortTitleAsc": "כותר (א-ת) עולה",
+  "components.Discover.CreateSlider.providetmdbgenreid": "הזן מזהה ז'אנר TMDB",
+  "components.Discover.DiscoverSliderEdit.remove": "הסר"
 }
--- a/src/i18n/locale/nl.json
+++ b/src/i18n/locale/nl.json
@@ -3,12 +3,12 @@
  "components.Discover.discovertv": "Populaire series",
  "components.Discover.popularmovies": "Populaire films",
  "components.Discover.populartv": "Populaire series",
-  "components.Discover.recentlyAdded": "Onlangs toegevoegd",
+  "components.Discover.recentlyAdded": "Recent toegevoegd",
  "components.Discover.recentrequests": "Recente verzoeken",
  "components.Discover.trending": "Trending",
  "components.Discover.upcoming": "Verwachte films",
  "components.Discover.upcomingmovies": "Verwachte films",
-  "components.Layout.SearchInput.searchPlaceholder": "Films en series zoeken",
+  "components.Layout.SearchInput.searchPlaceholder": "Zoek films en series",
  "components.Layout.Sidebar.dashboard": "Ontdekken",
  "components.Layout.Sidebar.requests": "Verzoeken",
  "components.Layout.Sidebar.settings": "Instellingen",
@@ -16,7 +16,7 @@
  "components.Layout.UserDropdown.signout": "Uitloggen",
  "components.MovieDetails.budget": "Budget",
  "components.MovieDetails.cast": "Cast",
-  "components.MovieDetails.originallanguage": "Oorspronkelijke taal",
+  "components.MovieDetails.originallanguage": "Originele taal",
  "components.MovieDetails.overview": "Overzicht",
  "components.MovieDetails.overviewunavailable": "Overzicht niet beschikbaar.",
  "components.MovieDetails.recommendations": "Aanbevelingen",
@@ -114,7 +114,7 @@
  "components.Settings.hostname": "Hostnaam of IP-adres",
  "components.Settings.librariesRemaining": "Resterende bibliotheken: {count}",
  "components.Settings.manualscan": "Handmatige bibliotheekscan",
-  "components.Settings.manualscanDescription": "Normaliter wordt dit eenmaal per 24 uur uitgevoerd. Jellyseerr zal de lijst met onlangs toegevoegde media op je Plex-server vaker controleren. Als dit de eerste keer is dat je Jellyseerr instelt, wordt aanbevolen eenmalig een handmatige, volledige bibliotheekscan uit te voeren!",
+  "components.Settings.manualscanDescription": "Normaal wordt dit eens elke 24 uur uitgevoerd. Jellyseerr controleert de recent toegevoegde items van je Plex-server agressiever. Als je Plex voor de eerste keer configureert, is een eenmalige handmatige volledige bibliotheekscan aanbevolen!",
  "components.Settings.menuAbout": "Over",
  "components.Settings.menuGeneralSettings": "Algemeen",
  "components.Settings.menuJobs": "Taken en cache",
@@ -127,7 +127,7 @@
  "components.Settings.plexlibraries": "Plex-bibliotheken",
  "components.Settings.plexlibrariesDescription": "De bibliotheken die Jellyseerr scant voor titels. Stel je Plex-verbinding in en sla ze op. Klik daarna op de onderstaande knop als er geen bibliotheken staan.",
  "components.Settings.plexsettings": "Plex-instellingen",
-  "components.Settings.plexsettingsDescription": "Configureer de instellingen voor je Plex-server. Jellyseerr scant je Plex-bibliotheken om te zien welke inhoud beschikbaar is.",
+  "components.Settings.plexsettingsDescription": "Configureer de instellingen voor je Plex-server. Jellyseerr scant je Plex-bibliotheken om te zien welke content beschikbaar is.",
  "components.Settings.port": "Poort",
  "components.Settings.radarrsettings": "Radarr-instellingen",
  "components.Settings.sonarrsettings": "Sonarr-instellingen",
@@ -137,12 +137,12 @@
  "components.Setup.configureservices": "Diensten configureren",
  "components.Setup.continue": "Doorgaan",
  "components.Setup.finish": "Installatie voltooien",
-  "components.Setup.finishing": "Voltooien…",
+  "components.Setup.finishing": "Bezig met voltooien…",
  "components.Setup.loginwithplex": "Inloggen met Plex",
-  "components.Setup.signinMessage": "Ga aan de slag door je aan te melden",
+  "components.Setup.signinMessage": "Ga aan de slag door in te loggen met je Plex-account",
  "components.Setup.welcome": "Welkom bij Jellyseerr",
  "components.TvDetails.cast": "Cast",
-  "components.TvDetails.originallanguage": "Oorspronkelijke taal",
+  "components.TvDetails.originallanguage": "Originele taal",
  "components.TvDetails.overview": "Overzicht",
  "components.TvDetails.overviewunavailable": "Overzicht niet beschikbaar.",
  "components.TvDetails.recommendations": "Aanbevelingen",
@@ -164,7 +164,7 @@
  "i18n.movies": "Films",
  "i18n.partiallyavailable": "Deels beschikbaar",
  "i18n.pending": "In behandeling",
-  "i18n.processing": "Verwerken",
+  "i18n.processing": "Bezig met verwerken",
  "i18n.tvshows": "Series",
  "i18n.unavailable": "Niet beschikbaar",
  "pages.oops": "Oeps",
@@ -187,14 +187,14 @@
  "components.Setup.tip": "Tip",
  "components.Settings.SonarrModal.testFirstRootFolders": "Test verbinding om hoofdmappen te laden",
  "components.Settings.SonarrModal.testFirstQualityProfiles": "Test verbinding om kwaliteitsprofielen te laden",
-  "components.Settings.SonarrModal.loadingrootfolders": "Hoofdmappen laden…",
-  "components.Settings.SonarrModal.loadingprofiles": "Kwaliteitsprofielen laden…",
+  "components.Settings.SonarrModal.loadingrootfolders": "Bezig met laden van hoofdmappen…",
+  "components.Settings.SonarrModal.loadingprofiles": "Bezig met laden van kwaliteitsprofielen…",
  "components.Settings.SettingsAbout.gettingsupport": "Ondersteuning krijgen",
  "components.Settings.RadarrModal.validationMinimumAvailabilityRequired": "Je moet een minimale beschikbaarheid selecteren",
  "components.Settings.RadarrModal.testFirstRootFolders": "Test verbinding om hoofdmappen te laden",
  "components.Settings.RadarrModal.testFirstQualityProfiles": "Test verbinding om kwaliteitsprofielen te laden",
-  "components.Settings.RadarrModal.loadingrootfolders": "Hoofdmappen laden…",
-  "components.Settings.RadarrModal.loadingprofiles": "Kwaliteitsprofielen laden…",
+  "components.Settings.RadarrModal.loadingrootfolders": "Bezig met laden van hoofdmappen…",
+  "components.Settings.RadarrModal.loadingprofiles": "Bezig met laden van kwaliteitsprofielen…",
  "components.Settings.SettingsAbout.Releases.releasedataMissing": "Versiegegevens zijn momenteel niet beschikbaar.",
  "components.Settings.SettingsAbout.Releases.latestversion": "Nieuwste",
  "components.Settings.SettingsAbout.Releases.currentversion": "Huidig",
@@ -208,7 +208,7 @@
  "i18n.retry": "Opnieuw proberen",
  "i18n.requested": "Aangevraagd",
  "i18n.failed": "Mislukt",
-  "i18n.deleting": "Verwijderen…",
+  "i18n.deleting": "Bezig met verwijderen…",
  "i18n.close": "Sluiten",
  "components.UserList.userdeleteerror": "Er ging iets mis bij het verwijderen van de gebruiker.",
  "components.UserList.userdeleted": "Gebruiker succesvol verwijderd!",
@@ -223,7 +223,7 @@
  "components.TvDetails.network": "{networkCount, plural, one {Netwerk} other {Netwerken}}",
  "components.TvDetails.firstAirDate": "Datum eerste uitzending",
  "components.TvDetails.anime": "Anime",
-  "components.StatusChacker.reloadJellyseerr": "Herladen",
+  "components.StatusChacker.reloadOverseerr": "Herladen",
  "components.StatusChacker.newversionavailable": "Toepassingsupdate",
  "components.StatusChacker.newversionDescription": "Jellyseerr is geüpdatet! Klik op de onderstaande knop om de pagina opnieuw te laden.",
  "components.Settings.toastSettingsSuccess": "Instellingen succesvol opgeslagen!",
@@ -303,10 +303,10 @@
  "components.UserList.create": "Aanmaken",
  "components.UserList.createlocaluser": "Lokale gebruiker aanmaken",
  "components.UserList.usercreatedfailed": "Er ging iets mis bij het aanmaken van de gebruiker.",
-  "components.UserList.creating": "Aanmaken…",
+  "components.UserList.creating": "Bezig met aanmaken…",
  "components.UserList.validationpasswordminchars": "Wachtwoord is te kort; moet minimaal 8 tekens bevatten",
  "components.UserList.usercreatedsuccess": "Gebruiker succesvol aangemaakt!",
-  "components.UserList.passwordinfodescription": "Stel een applicatie-URL in en schakel e-mailmeldingen in om automatische wachtwoordgeneratie mogelijk te maken.",
+  "components.UserList.passwordinfodescription": "Configureer een applicatie-URL en schakel e-mailmeldingen in om automatische wachtwoordgeneratie mogelijk te maken.",
  "components.UserList.password": "Wachtwoord",
  "components.UserList.localuser": "Lokale gebruiker",
  "components.UserList.email": "E-mailadres",
@@ -340,23 +340,23 @@
  "components.RequestModal.SearchByNameModal.notvdbiddescription": "We kunnen deze serie niet automatisch matchen. Selecteer hieronder de juiste match.",
  "components.Login.signinwithplex": "Plex-account gebruiken",
  "components.Login.signinheader": "Log in om verder te gaan",
-  "components.Login.signingin": "Aanmelden…",
+  "components.Login.signingin": "Bezig met inloggen…",
  "components.Login.signin": "Inloggen",
  "components.Settings.notificationAgentSettingsDescription": "Meldingsagenten configureren en inschakelen.",
  "components.PlexLoginButton.signinwithplex": "Inloggen",
-  "components.PlexLoginButton.signingin": "Aanmelden…",
+  "components.PlexLoginButton.signingin": "Bezig met inloggen…",
  "components.PermissionEdit.advancedrequest": "Geavanceerde aanvragen",
  "components.PermissionEdit.admin": "Beheerder",
  "components.UserList.userssaved": "Gebruikersrechten succesvol opgeslagen!",
  "components.Settings.toastPlexRefreshSuccess": "Serverlijst van Plex succesvol opgehaald!",
  "components.Settings.toastPlexRefresh": "Bezig met serverlijst ophalen van Plex…",
-  "components.Settings.toastPlexConnecting": "Verbinden met Plex…",
+  "components.Settings.toastPlexConnecting": "Bezig met verbinden met Plex-server…",
  "components.UserList.bulkedit": "Meerdere bewerken",
  "components.Settings.toastPlexRefreshFailure": "Kan serverlijst van Plex niet ophalen.",
  "components.Settings.toastPlexConnectingSuccess": "Succesvol verbonden met Plex-server!",
  "components.Settings.toastPlexConnectingFailure": "Kan geen verbinding maken met Plex.",
  "components.Settings.settingUpPlexDescription": "Om Plex in te stellen, kan je de gegevens handmatig invoeren of een server selecteren die is opgehaald van <RegisterPlexTVLink>plex.tv</RegisterPlexTVLink>. Druk op de knop rechts van de vervolgkeuzelijst om de lijst van beschikbare servers op te halen.",
-  "components.Settings.serverpresetRefreshing": "Servers ophalen…",
+  "components.Settings.serverpresetRefreshing": "Bezig met servers ophalen…",
  "components.Settings.serverpresetManualMessage": "Handmatige configuratie",
  "components.Settings.serverpresetLoad": "Klik op de knop om de beschikbare servers te laden",
  "components.Settings.serverpreset": "Server",
@@ -431,7 +431,7 @@
  "components.RequestModal.AdvancedRequester.requestas": "Aanvragen als",
  "components.Discover.discover": "Ontdekken",
  "components.Settings.validationApplicationTitle": "Je moet een toepassingstitel opgeven",
-  "components.AppDataWarning.dockerVolumeMissingDescription": "De volumekoppeling <code>{appDataPath}</code> is niet correct geconfigureerd. Alle gegevens zullen worden gewist wanneer de container wordt gestopt of opnieuw wordt gestart.",
+  "components.AppDataWarning.dockerVolumeMissingDescription": "De volumekoppeling <code>{appDataPath}</code> was niet correct geconfigureerd. Alle gegevens zullen worden gewist wanneer de container wordt gestopt of opnieuw wordt gestart.",
  "components.Settings.validationApplicationUrlTrailingSlash": "URL mag niet eindigen op een schuine streep",
  "components.Settings.validationApplicationUrl": "Je moet een geldige URL opgeven",
  "components.Settings.SonarrModal.validationApplicationUrlTrailingSlash": "URL mag niet eindigen op een schuine streep",
@@ -520,7 +520,7 @@
  "components.Layout.UserDropdown.myprofile": "Profiel",
  "components.UserProfile.UserSettings.UserNotificationSettings.validationDiscordId": "Je moet een geldige gebruikers-ID opgeven",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordIdTip": "Het <FindDiscordIdLink>meercijferige ID-nummer</FindDiscordIdLink> van je gebruikersaccount",
-  "components.CollectionDetails.requestcollection4k": "Collectie aanvragen in 4K",
+  "components.CollectionDetails.requestcollection4k": "Collectie in 4K aanvragen",
  "components.UserProfile.UserSettings.UserGeneralSettings.regionTip": "Inhoud filteren op regionale beschikbaarheid",
  "components.UserProfile.UserSettings.UserGeneralSettings.region": "Regio van Ontdekken",
  "components.UserProfile.UserSettings.UserGeneralSettings.originallanguageTip": "Inhoud filteren op oorspronkelijke taal",
@@ -546,7 +546,7 @@
  "components.Settings.SettingsJobsCache.download-sync-reset": "Reset download sync",
  "components.Settings.SettingsJobsCache.download-sync": "Synchronisatie downloads",
  "components.TvDetails.seasons": "{seasonCount, plural, one {# seizoen} other {# seizoenen}}",
-  "i18n.loading": "Laden…",
+  "i18n.loading": "Bezig met laden…",
  "components.UserProfile.UserSettings.UserNotificationSettings.validationTelegramChatId": "Je moet een geldige chat-ID opgeven",
  "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTipLong": "<TelegramBotLink>Een chat starten</TelegramBotLink>, <GetIdBotLink>@get_id_bot</GetIdBotLink> toevoegen en de opdracht <code>/my_id</code> geven",
  "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatId": "Chat-ID",
@@ -558,14 +558,14 @@
  "components.Discover.DiscoverNetwork.networkSeries": "Series van {network}",
  "components.Discover.DiscoverMovieGenre.genreMovies": "{genre} films",
  "components.Setup.scanbackground": "Het scannen wordt op de achtergrond uitgevoerd. Je kunt in de tussentijd doorgaan met het installatieproces.",
-  "components.Settings.scanning": "Synchroniseren…",
+  "components.Settings.scanning": "Bezig met synchroniseren…",
  "components.Settings.scan": "Bibliotheken synchroniseren",
  "components.Settings.SettingsJobsCache.sonarr-scan": "Sonarr-scan",
  "components.Settings.SettingsJobsCache.radarr-scan": "Radarr-scan",
  "components.Settings.SettingsJobsCache.plex-recently-added-scan": "Plex recent toegevoegde scan",
  "components.Settings.SettingsJobsCache.plex-full-scan": "Plex volledige bibliotheekscan",
  "components.Settings.SettingsJobsCache.jellyfin-full-scan": "volledige bibliotheekscan Jellyfin",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Scan van 'onlangs toegevoegd' in Jellyfin",
+  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Jellyfin recent toegevoegde scan",
  "components.Settings.Notifications.validationUrl": "Je moet een geldige URL opgeven",
  "components.Settings.Notifications.botAvatarUrl": "URL bot-avatar",
  "components.RequestList.RequestItem.requested": "Aangevraagd",
@@ -670,27 +670,27 @@
  "components.QuotaSelector.unlimited": "Onbeperkt",
  "i18n.view": "Bekijken",
  "i18n.tvshow": "Serie",
-  "i18n.testing": "Testen…",
+  "i18n.testing": "Bezig met testen…",
  "i18n.test": "Test",
  "i18n.status": "Status",
  "i18n.showingresults": "<strong>{from}</strong> tot <strong>{to}</strong> van de <strong>{total}</strong> resultaten worden weergegeven",
-  "i18n.saving": "Opslaan…",
+  "i18n.saving": "Bezig met opslaan…",
  "i18n.save": "Wijzigingen opslaan",
  "i18n.resultsperpage": "{pageSize} resultaten per pagina weergeven",
-  "i18n.requesting": "Aanvragen…",
+  "i18n.requesting": "Bezig met aanvragen…",
  "i18n.request4k": "Aanvragen in 4K",
  "i18n.previous": "Vorige",
  "i18n.notrequested": "Niet aangevraagd",
  "i18n.noresults": "Geen resultaten.",
  "i18n.next": "Volgende",
  "i18n.movie": "Film",
-  "i18n.canceling": "Annuleren…",
+  "i18n.canceling": "Bezig met annuleren…",
  "i18n.back": "Terug",
  "i18n.areyousure": "Weet je het zeker?",
  "i18n.all": "Alle",
  "components.RequestModal.QuotaDisplay.requiredquotaUser": "Deze gebruiker heeft nog minstens <strong>{seasons}</strong> {seasons, plural, one {seizoensverzoek} other {seizoensverzoeken}} nodig om deze serie aan te vragen.",
-  "components.TvDetails.originaltitle": "Oorspronkelijke titel",
-  "components.MovieDetails.originaltitle": "Oorspronkelijke titel",
+  "components.TvDetails.originaltitle": "Originele titel",
+  "components.MovieDetails.originaltitle": "Originele titel",
  "components.LanguageSelector.originalLanguageDefault": "Alle talen",
  "components.LanguageSelector.languageServerDefault": "Standaard ({language})",
  "components.Settings.SonarrModal.testFirstTags": "Test de verbinding om labels te laden",
@@ -733,9 +733,9 @@
  "components.RequestModal.pendingapproval": "Je verzoek is in afwachting van goedkeuring.",
  "components.RequestList.RequestItem.cancelRequest": "Verzoek annuleren",
  "components.NotificationTypeSelector.notificationTypes": "Meldingtypes",
-  "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSetOwnAccount": "Er is voor jouw account momenteel geen wachtwoord ingesteld. Configureer hieronder een wachtwoord om in te kunnen loggen als een \"lokale gebruiker\" met je e-mailadres.",
+  "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSetOwnAccount": "Er is voor jouw account momenteel geen wachtwoord ingesteld. Configureer hieronder een wachtwoord om in te kunnen loggen als een \"lokale gebruiker\" met uw e-mailadres.",
  "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSet": "Deze gebruikersaccount heeft momenteel geen wachtwoord ingesteld. Configureer hieronder een wachtwoord zodat deze account in staat is om zich aan te melden als een \"lokale gebruiker\".",
-  "components.Settings.serviceSettingsDescription": "Stel je {serverType}-server(s) hieronder in. Je kunt meerdere {serverType}-servers verbinden, maar slechts twee ervan kunnen als standaard worden gemarkeerd (één niet-4K en één 4K). Beheerders kunnen vóór goedkeuring de server aanpassen die voor nieuwe aanvragen gebruikt wordt.",
+  "components.Settings.serviceSettingsDescription": "Configureer je {serverType} server(s) hieronder. Je kunt meerdere {serverType} servers verbinden, maar slechts twee ervan kunnen als standaard worden gemarkeerd (één niet-4K en één 4K). Beheerders kunnen vóór de goedkeuring de server die gebruikt wordt om nieuwe aanvragen te verwerken aanpassen.",
  "components.Settings.noDefaultServer": "Ten minste één {serverType} server moet als standaard worden gemarkeerd om {mediaType}verzoeken te kunnen verwerken.",
  "components.Settings.noDefaultNon4kServer": "Als je slechts één enkele {serverType} server hebt voor zowel niet-4K als 4K-inhoud (of als je alleen 4K-inhoud downloadt), dan moet je {serverType} server <strong>NIET</strong> aangeduid worden als een 4K-server.",
  "components.Settings.mediaTypeSeries": "serie",
@@ -747,7 +747,7 @@
  "components.Layout.VersionStatus.outofdate": "Verouderd",
  "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {commit} other {commits}} achter",
  "components.UserList.autogeneratepasswordTip": "Een door de server gegenereerd wachtwoord naar de gebruiker e-mailen",
-  "i18n.retrying": "Opnieuw proberen…",
+  "i18n.retrying": "Bezig met opnieuw proberen…",
  "components.Settings.serverSecure": "veilig",
  "components.UserList.usercreatedfailedexisting": "Het opgegeven e-mailadres wordt al gebruikt door een andere gebruiker.",
  "components.RequestModal.edit": "Verzoek bewerken",
@@ -847,7 +847,7 @@
  "components.NotificationTypeSelector.usermediadeclinedDescription": "Een melding ontvangen wanneer je mediaverzoeken worden geweigerd.",
  "components.NotificationTypeSelector.usermediaavailableDescription": "Een melding ontvangen wanneer je mediaverzoeken beschikbaar zijn.",
  "components.NotificationTypeSelector.usermediaAutoApprovedDescription": "Een melding ontvangen wanneer andere gebruikers nieuwe mediaverzoeken indienen die automatisch worden goedgekeurd.",
-  "components.Settings.SettingsAbout.betawarning": "Dit is BETA-software. Functies kunnen kapot en/of instabiel zijn. Meld eventuele problemen op GitHub!",
+  "components.Settings.SettingsAbout.betawarning": "Dit is BETA software. Functies kunnen kapot en/of instabiel zijn. Meld eventuele problemen op GitHub!",
  "components.Layout.LanguagePicker.displaylanguage": "Weergavetaal",
  "components.MovieDetails.showmore": "Meer tonen",
  "components.MovieDetails.showless": "Minder tonen",
@@ -971,7 +971,7 @@
  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverUserKey": "Je moet een geldige gebruikers- of groepssleutel opgeven",
  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletsettingssaved": "Instellingen voor Pushbullet-meldingen succesvol opgeslagen!",
  "components.IssueDetails.playonplex": "Afspelen op {mediaServerName}",
-  "components.IssueDetails.play4konplex": "Afspelen op {mediaServerName} in 4K",
+  "components.IssueDetails.play4konplex": "Afspelen in 4K op {mediaServerName}",
  "components.IssueDetails.openin4karr": "Openen in 4K {arr}",
  "components.IssueList.IssueItem.episodes": "{episodeCount, plural, one {aflevering} other {afleveringen}}",
  "components.IssueList.IssueItem.seasons": "{seasonCount, plural, one {seizoen} other {seizoenen}}",
@@ -982,7 +982,7 @@
  "components.NotificationTypeSelector.adminissuereopenedDescription": "Ontvang een melding wanneer problemen door andere gebruikers opnieuw worden ingediend.",
  "components.NotificationTypeSelector.issuereopenedDescription": "Stuur meldingen wanneer problemen opnieuw worden ingediend.",
  "components.NotificationTypeSelector.userissuereopenedDescription": "Ontvang een bericht wanneer problemen die jij hebt gemeld, opnieuw worden ingediend.",
-  "components.RequestModal.requestseasons4k": "{seasonCount} {seasonCount, plural, one {seizoen} other {seizoenen}} aanvragen in 4K",
+  "components.RequestModal.requestseasons4k": "{seasonCount} {seasonCount, plural, one {seizoen} other {seizoenen}} in 4K aanvragen",
  "components.RequestModal.requestmovies": "{count} {count, plural, one {film} other {films}} aanvragen",
  "components.RequestModal.selectmovies": "Film(s) selecteren",
  "components.MovieDetails.productioncountries": "Productie{countryCount, plural, one {land} other {landen}}",
@@ -998,7 +998,7 @@
  "components.Settings.Notifications.NotificationsGotify.agentenabled": "Agent inschakelen",
  "components.Settings.Notifications.NotificationsGotify.gotifysettingssaved": "Instellingen voor meldingen Gotify succesvol opgeslagen!",
  "components.Settings.Notifications.NotificationsGotify.token": "Toepassingstoken",
-  "i18n.importing": "Importeren…",
+  "i18n.importing": "Bezig met importeren…",
  "components.Settings.Notifications.NotificationsGotify.gotifysettingsfailed": "Instellingen voor meldingen Gotify niet opgeslagen.",
  "components.Settings.Notifications.NotificationsGotify.toastGotifyTestFailed": "Testmelding Gotify niet verzonden.",
  "components.Settings.Notifications.NotificationsGotify.toastGotifyTestSuccess": "Testmelding Gotify verzonden!",
@@ -1012,7 +1012,7 @@
  "components.UserList.newplexsigninenabled": "De instelling <strong>Nieuwe Plex-aanmelding inschakelen</strong> is momenteel ingeschakeld. Plex-gebruikers met bibliotheektoegang hoeven niet te worden geïmporteerd om in te loggen.",
  "components.ManageSlideOver.manageModalAdvanced": "Geavanceerd",
  "components.ManageSlideOver.alltime": "Altijd",
-  "components.ManageSlideOver.markallseasons4kavailable": "Alle seizoenen markeren als beschikbaar in 4K",
+  "components.ManageSlideOver.markallseasons4kavailable": "Alle seizoenen als beschikbaar in 4K markeren",
  "components.ManageSlideOver.opentautulli": "In Tautulli openen",
  "components.ManageSlideOver.pastdays": "Afgelopen {days, number} dagen",
  "components.ManageSlideOver.playedby": "Afgespeeld door",
@@ -1046,8 +1046,8 @@
  "components.UserProfile.emptywatchlist": "Media die zijn toegevoegd aan je <PlexWatchlistSupportLink>Plex Kijklijst</PlexWatchlistSupportLink> verschijnen hier.",
  "components.MovieDetails.digitalrelease": "Digitale release",
  "i18n.restartRequired": "Opnieuw opstarten vereist",
-  "components.PermissionEdit.viewrecentDescription": "Toestemming geven om de lijst met onlangs toegevoegde media weer te geven.",
-  "components.PermissionEdit.viewrecent": "Onlangs toegevoegd weergeven",
+  "components.PermissionEdit.viewrecentDescription": "Toestemming geven om de lijst met recent toegevoegde media te bekijken.",
+  "components.PermissionEdit.viewrecent": "Recent toegevoegd bekijken",
  "components.Settings.deleteServer": "{serverType}-server verwijderen",
  "components.StatusChecker.appUpdated": "{applicationTitle} bijgewerkt",
  "components.RequestList.RequestItem.tmdbid": "TMDB ID",
@@ -1072,8 +1072,8 @@
  "components.TvDetails.seasonnumber": "Seizoen {seasonNumber}",
  "components.TvDetails.Season.somethingwentwrong": "Er ging iets mis bij het ophalen van de seizoensgegevens.",
  "components.TvDetails.seasonstitle": "Seizoenen",
-  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Jouw kijklijst",
-  "components.Discover.plexwatchlist": "Jouw kijklijst",
+  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Je Plex-kijklijst",
+  "components.Discover.plexwatchlist": "Je Plex Kijklijst",
  "components.MovieDetails.physicalrelease": "Fysieke release",
  "components.PermissionEdit.autorequest": "Automatisch aanvragen",
  "components.Settings.SettingsJobsCache.plex-watchlist-sync": "Plex Kijklijst synchroniseren",
@@ -1099,7 +1099,7 @@
  "components.TvDetails.manageseries": "Serie beheren",
  "components.MovieDetails.managemovie": "Film beheren",
  "components.MovieDetails.reportissue": "Probleem melden",
-  "components.PermissionEdit.autorequestMoviesDescription": "Toestemming geven om niet-4K films in je Plex-kijklijst automatisch aan te vragen.",
+  "components.PermissionEdit.autorequestMoviesDescription": "Toestemming geven om niet-4K films in je Plex Kijklijst automatisch aan te vragen.",
  "components.PermissionEdit.autorequestSeries": "Series automatisch aanvragen",
  "components.PermissionEdit.autorequestMovies": "Films automatisch aanvragen",
  "components.Settings.experimentalTooltip": "Deze instelling inschakelen, kan leiden tot onverwacht gedrag van de toepassing",
@@ -1152,8 +1152,8 @@
  "components.Discover.DiscoverSliderEdit.remove": "Verwijderen",
  "components.Discover.resetfailed": "Er is iets fout gegaan bij het resetten van de instellingen van Ontdekken.",
  "components.Discover.PlexWatchlistSlider.emptywatchlist": "Media die zijn toegevoegd aan je <PlexWatchlistSupportLink>Plex Kijklijst</PlexWatchlistSupportLink> verschijnen hier.",
-  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Jouw kijklijst",
-  "components.Discover.RecentlyAddedSlider.recentlyAdded": "Onlangs toegevoegd",
+  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Je Plex Kijklijst",
+  "components.Discover.RecentlyAddedSlider.recentlyAdded": "Recent toegevoegd",
  "components.Discover.networks": "Netwerken",
  "components.Discover.CreateSlider.searchStudios": "Studio's zoeken…",
  "components.Discover.CreateSlider.starttyping": "Begin met typen om te zoeken.",
@@ -1184,8 +1184,8 @@
  "components.Discover.DiscoverMovies.sortPopularityAsc": "Populariteit oplopend",
  "components.Discover.DiscoverMovies.sortPopularityDesc": "Populariteit aflopend",
  "components.Discover.DiscoverMovies.sortReleaseDateAsc": "Releasedatum oplopend",
-  "components.Discover.DiscoverMovies.sortTitleAsc": "Titel oplopend (A-Z)",
-  "components.Discover.DiscoverMovies.sortTitleDesc": "Titel aflopend (Z-A)",
+  "components.Discover.DiscoverMovies.sortTitleAsc": "Titel (A-Z) oplopend",
+  "components.Discover.DiscoverMovies.sortTitleDesc": "Titel (Z-A) aflopend",
  "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "TMDB-beoordeling oplopend",
  "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "TMDB-beoordeling aflopend",
  "components.Discover.DiscoverSliderEdit.deletefail": "Slider verwijderen mislukt.",
@@ -1202,7 +1202,7 @@
  "components.Discover.FilterSlideover.from": "Van",
  "components.Discover.FilterSlideover.genres": "Genres",
  "components.Discover.FilterSlideover.keywords": "Trefwoorden",
-  "components.Discover.FilterSlideover.originalLanguage": "Oorspronkelijke taal",
+  "components.Discover.FilterSlideover.originalLanguage": "Originele taal",
  "components.Discover.FilterSlideover.ratingText": "Beoordelingen tussen {minValue} en {maxValue}",
  "components.Discover.FilterSlideover.releaseDate": "Releasedatum",
  "components.Discover.FilterSlideover.runtime": "Duur",
@@ -1262,87 +1262,18 @@
  "components.Settings.SettingsJobsCache.availability-sync": "Synchronisatie van mediabeschikbaarheid",
  "components.Discover.tmdbmoviestreamingservices": "Streamingdiensten voor films TMDB",
  "components.Discover.tmdbtvstreamingservices": "Streamingdiensten voor series TMDB",
-  "components.Login.validationhostrequired": "{mediaServerName}-URL vereist",
-  "components.Layout.UserWarnings.emailInvalid": "E-mailadres is ongeldig.",
-  "components.Login.description": "Aangezien dit de eerste keer is dat je je aanmeldt bij {applicationName}, dien je een geldig e-mailadres op te geven.",
-  "components.Login.saving": "Toevoegen…",
-  "components.ManageSlideOver.removearr": "Verwijderen van {arr}",
-  "components.Settings.RadarrModal.tagRequests": "Aanvragen taggen",
-  "components.MovieDetails.openradarr4k": "Film openen in 4K-Radarr",
-  "components.Settings.RadarrModal.tagRequestsInfo": "Automatisch een extra label toevoegen met de gebruikers-id en weergavenaam van de aanvrager",
-  "components.Settings.SonarrModal.animeSeriesType": "Serietype anime",
-  "components.Settings.SonarrModal.tagRequestsInfo": "Automatisch een extra label toevoegen met de gebruikers-id en weergavenaam van de aanvrager",
-  "components.Settings.internalUrl": "Interne URL",
-  "components.Settings.jellyfinsettings": "{mediaServerName}-instellingen",
-  "components.Settings.jellyfinlibrariesDescription": "De {mediaServerName}-bibliotheken die op titels worden gescand. Klik op onderstaande knop als er geen bibliotheken in de lijst staan.",
-  "components.Settings.manualscanDescriptionJellyfin": "Normaliter wordt dit eenmaal per 24 uur uitgevoerd. Jellyseerr zal de lijst met onlangs toegevoegde media op je {mediaServerName}-server vaker controleren. Als dit de eerste keer is dat je Jellyseerr instelt, wordt aanbevolen eenmalig een handmatige, volledige bibliotheekscan uit te voeren!",
-  "components.Settings.save": "Wijzigingen opslaan",
-  "components.Settings.syncJellyfin": "Bibliotheken synchoniseren",
-  "components.TvDetails.play": "Afspelen op {mediaServerName}",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "Aantal gebruikersstemmen TMDB",
-  "components.Login.save": "Toevoegen",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Hiermee wordt deze {mediaType} onomkeerbaar verwijderd van {arr}, inclusief alle bestanden.",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Apparaatstandaard",
-  "components.Settings.Notifications.userEmailRequired": "Gebruikerse-mail vereisen",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Jellyseerr ondersteunen",
-  "components.Settings.SonarrModal.seriesType": "Serietype",
-  "components.Settings.jellyfinSettings": "{mediaServerName}-instellingen",
-  "components.Setup.configuremediaserver": "Mediaserver instellen",
-  "components.TvDetails.play4k": "Afspelen op {mediaServerName} in 4K",
-  "components.UserList.mediaServerUser": "{mediaServerName}-gebruiker",
-  "components.UserList.noJellyfinuserstoimport": "Er zijn geen {mediaServerName}-gebruikers om te importeren.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "E-mail",
-  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Apparaatstandaard",
-  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Meldingsgeluid",
-  "components.Login.signinwithjellyfin": "{mediaServerName}-account gebruiken",
+  "components.Discover.FilterSlideover.tmdbuservotecount": "Aantal stemmen TMDB-gebruikers",
  "components.Discover.FilterSlideover.voteCount": "Aantal stemmen tussen {minValue} en {maxValue}",
-  "components.Layout.UserWarnings.emailRequired": "Een e-mailadres is vereist.",
-  "components.Layout.UserWarnings.passwordRequired": "Een wachtwoord is vereist.",
-  "components.Login.credentialerror": "Gebruikersnaam of wachtwoord is onjuist.",
-  "components.Login.emailtooltip": "Het adres hoeft niet gelieerd te zijn aan je {mediaServerName}-instantie.",
-  "components.Login.host": "{mediaServerName}-URL",
-  "components.Login.initialsignin": "Verbinden",
-  "components.Login.initialsigningin": "Verbinden…",
-  "components.Login.title": "E-mail toevoegen",
-  "components.Login.username": "Gebruikersnaam",
-  "components.Login.validationEmailRequired": "Je moet een e-mailadres opgeven",
-  "components.Login.validationEmailFormat": "Ongeldig e-mailadres",
-  "components.Login.validationemailformat": "Geldig e-mailadres vereist",
-  "components.Login.validationhostformat": "Geldige URL vereist",
-  "components.Login.validationusernamerequired": "Gebruikersnaam vereist",
-  "components.ManageSlideOver.removearr4k": "Verwijderen van 4K-{arr}",
-  "components.MovieDetails.downloadstatus": "Downloadstatus",
-  "components.MovieDetails.imdbuserscore": "Gebruikersbeoordeling IMDB",
-  "components.MovieDetails.openradarr": "Film openen in Radarr",
-  "components.MovieDetails.play": "Afspelen op {mediaServerName}",
-  "components.MovieDetails.play4k": "Afspelen op {mediaServerName} in 4K",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Meldingsgeluid",
-  "components.Settings.SonarrModal.tagRequests": "Aanvragen taggen",
-  "components.Settings.jellyfinSettingsFailure": "Er is iets misgegaan bij het opslaan van de {mediaServerName}-instellingen.",
-  "components.Settings.jellyfinSettingsSuccess": "{mediaServerName}-instellingen opgeslagen!",
-  "components.Settings.jellyfinlibraries": "{mediaServerName}-bibliotheken",
-  "components.Settings.manualscanJellyfin": "Handmatige bibliotheekscan",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.Settings.saving": "Opslaan…",
-  "components.Settings.syncing": "Synchroniseren",
-  "components.Settings.timeout": "Time-out",
-  "components.Setup.signin": "Aanmelden",
-  "components.Setup.signinWithJellyfin": "{mediaServerName}-account gebruiken",
-  "components.TitleCard.addToWatchList": "Toevoegen aan kijklijst",
-  "components.TitleCard.watchlistError": "Er is iets misgegaan. Probeer het opnieuw.",
-  "components.UserList.importfromJellyfin": "{mediaServerName}-gebruikers importeren",
-  "components.UserList.importfromJellyfinerror": "Er is iets misgegaan bij het importeren van {mediaServerName}-gebruikers.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "{mediaServerName}-gebruiker",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Wijzigingen opslaan",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Opslaan…",
+  "components.Settings.RadarrModal.tagRequests": "Tagverzoeken",
+  "components.Settings.RadarrModal.tagRequestsInfo": "Voeg automatisch een extra tag toe met de gebruikers-ID en weergavenaam van de aanvrager",
+  "components.MovieDetails.imdbuserscore": "Gebruikersscore IMDB",
+  "components.Settings.SonarrModal.tagRequests": "Tagverzoeken",
+  "components.Settings.SonarrModal.tagRequestsInfo": "Voeg automatisch een extra tag toe met de gebruikers-ID en weergavenaam van de aanvrager",
  "i18n.collection": "Collectie",
-  "components.UserProfile.localWatchlist": "Kijklijst van {username}",
-  "components.Setup.signinWithPlex": "Plex-account gebruiken",
-  "components.Settings.jellyfinSettingsDescription": "Optioneel, configureer de interne en externe eindpunten voor uw {mediaServerName} server. In de meeste gevallen verschilt de externe URL met de interne URL. Een aangepaste wachtwoord reset URL kan ook gebruikt worden voor de {mediaServerName} login, voor het geval dat u doorverwezen wilt worden naar een andere wachtwoord reset pagina.",
-  "components.Settings.jellyfinsettingsDescription": "Configureer de instellingen voor uw {mediaServerName} server. {mediaServerName} scanned uw {mediaServerName} bibliotheken om te zien welke content beschikbaar is.",
-  "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> Is succesvol verwijderd van de kijklijst!",
-  "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> succesvol toegevoegd aan de kijklijst!",
-  "components.TitleCard.watchlistCancel": "kijklijst voor <strong>{title}</strong> is geannuleerd.",
-  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} succesvol geimporteerd!",
-  "components.UserList.newJellyfinsigninenabled": "De <strong>Gebruik Nieuwe {mediaServerName} Login</strong> instelling staat momenteel aan. {mediaServerName} gebruikers met toegang tot de bibliotheek, hoeven niet geïmporteerd te worden om in te kunnen loggen."
+  "components.Settings.Notifications.NotificationsPushover.sound": "Meldingsgeluid",
+  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Apparaatstandaard",
+  "components.Settings.SonarrModal.animeSeriesType": "Serietype anime",
+  "components.Settings.SonarrModal.seriesType": "Serietype",
+  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Meldingsgeluid",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Apparaatstandaard"
 }
--- a/src/i18n/locale/pl.json
+++ b/src/i18n/locale/pl.json
@@ -1061,212 +1061,196 @@
  "components.MovieDetails.rtaudiencescore": "Ocena Rotten Tomatoes",
  "components.MovieDetails.rtcriticsscore": "Tomatometer Rotten Tomatoes",
  "components.MovieDetails.tmdbuserscore": "Ocena użytkowników TMDB",
-  "components.Discover.CreateSlider.addSlider": "Dodaj suwak",
-  "components.Discover.CreateSlider.addcustomslider": "Utwórz niestandardowy suwak",
-  "components.Discover.CreateSlider.addfail": "Nie udało się utworzyć nowego suwaka.",
-  "components.Discover.CreateSlider.addsuccess": "Stworzony nowy suwak i zapisano dostosowywania odkrywania.",
-  "components.Discover.CreateSlider.editSlider": "Edytuj suwak",
-  "components.Discover.CreateSlider.editfail": "Nie udało się edytować suwaka.",
-  "components.Discover.CreateSlider.needresults": "Musisz mieć przynajmniej 1 wynik.",
-  "components.Discover.CreateSlider.nooptions": "Brak wyników.",
-  "components.Discover.CreateSlider.providetmdbgenreid": "Podaj ID gatunku TMDB",
-  "components.Discover.CreateSlider.providetmdbnetwork": "Podaj ID stacji TMDB",
-  "components.Discover.CreateSlider.providetmdbsearch": "Podaj zapytanie wyszukiwania",
-  "components.Discover.CreateSlider.providetmdbstudio": "Podaj ID studia TMDB",
-  "components.Discover.CreateSlider.searchGenres": "Szukaj gatunków…",
-  "components.Discover.CreateSlider.searchStudios": "Wyszukaj studia…",
-  "components.Discover.CreateSlider.slidernameplaceholder": "Nazwa suwaka",
-  "components.Discover.CreateSlider.starttyping": "Zacznij pisać aby wyszukać.",
-  "components.Discover.CreateSlider.validationDatarequired": "Należy wprowadzić wartość danych.",
-  "components.Discover.CreateSlider.validationTitlerequired": "Należy podać tytuł.",
-  "components.Discover.DiscoverMovieKeyword.keywordMovies": "Filmy: {keywordTitle}",
-  "components.Discover.DiscoverMovies.discovermovies": "Filmy",
-  "components.Discover.DiscoverMovies.sortPopularityAsc": "Popularność rosnąco",
-  "components.Discover.DiscoverMovies.sortPopularityDesc": "Popularność malejąco",
-  "components.Discover.DiscoverMovies.sortReleaseDateDesc": "Data wydania malejąco",
-  "components.Discover.DiscoverMovies.sortTitleAsc": "Tytuł (A-Z) rosnąco",
-  "components.Discover.DiscoverMovies.sortTitleDesc": "Tytuł (Z-A) malejąco",
-  "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "Ocena TMDB rosnąco",
-  "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "Ocena TMDB malejąco",
-  "components.Discover.DiscoverSliderEdit.deletefail": "Nie udało się usunąć suwaka.",
-  "components.Discover.DiscoverSliderEdit.deletesuccess": "Pomyślnie usunięto suwak.",
-  "components.Discover.DiscoverSliderEdit.enable": "Przełącz widoczność",
-  "components.Discover.DiscoverSliderEdit.remove": "Usuń",
-  "components.Discover.DiscoverTv.sortFirstAirDateAsc": "Data premiery rosnąco",
-  "components.Discover.DiscoverTv.sortFirstAirDateDesc": "Data premiery malejąco",
-  "components.Discover.DiscoverTv.sortPopularityAsc": "Popularność rosnąco",
-  "components.Discover.DiscoverTv.sortPopularityDesc": "Popularność malejąco",
-  "components.Discover.DiscoverTv.sortTitleAsc": "Tytuł (A-Z) rosnąco",
-  "components.Discover.DiscoverTv.sortTitleDesc": "Tytuł (Z-A) malejąco",
-  "components.Discover.DiscoverTv.sortTmdbRatingDesc": "Ocena TMDB malejąco",
-  "components.Discover.FilterSlideover.clearfilters": "Wyczyść aktywne filtry",
-  "components.Discover.FilterSlideover.filters": "Filtry",
-  "components.Discover.FilterSlideover.firstAirDate": "Data pierwszego wyemitowania",
-  "components.Discover.FilterSlideover.from": "Od",
-  "components.Discover.FilterSlideover.genres": "Gatunki",
-  "components.Discover.FilterSlideover.keywords": "Słowa kluczowe",
-  "components.Discover.FilterSlideover.ratingText": "Oceny między {minValue} a {maxValue}",
-  "components.Discover.CreateSlider.providetmdbkeywordid": "Podaj ID słowa kluczowego TMDB",
-  "components.Discover.CreateSlider.searchKeywords": "Wyszukaj słowa kluczowe…",
-  "components.Discover.DiscoverMovies.sortReleaseDateAsc": "Data wydania rosnąco",
-  "components.Discover.DiscoverTv.discovertv": "Seriale",
-  "components.Discover.DiscoverTv.sortTmdbRatingAsc": "Ocena TMDB rosnąco",
-  "components.Discover.DiscoverTvKeyword.keywordSeries": "Seriale: {keywordTitle}",
-  "components.Discover.FilterSlideover.originalLanguage": "Oryginalny język",
-  "components.Discover.FilterSlideover.releaseDate": "Data wydania",
-  "components.Discover.FilterSlideover.runtime": "Długość",
-  "components.Discover.FilterSlideover.runtimeText": "{minValue}-{maxValue} minut trwania",
-  "components.Discover.FilterSlideover.streamingservices": "Serwisy streamingowe",
-  "components.Discover.FilterSlideover.studio": "Studio",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "Liczba głosów użytkowników TMDB",
-  "components.Discover.FilterSlideover.to": "Do",
-  "components.Discover.FilterSlideover.voteCount": "Liczba głosów między {minValue} a {maxValue}",
-  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Twoja lista obserwowanych Plex",
-  "components.Discover.RecentlyAddedSlider.recentlyAdded": "Niedawno dodane",
-  "components.Discover.createnewslider": "Dodaj nowy suwak",
-  "components.Discover.customizediscover": "Dostosuj Odkryj",
-  "components.Discover.PlexWatchlistSlider.emptywatchlist": "Media dodane do twojej <PlexWatchlistSupportLink>listy obserwowanych Plex</PlexWatchlistSupportLink> zostaną wyświetlone tutaj.",
-  "components.Discover.emptywatchlist": "Media dodane do twojej <PlexWatchlistSupportLink>listy obserwowanych Plex</PlexWatchlistSupportLink> zostaną wyświetlone tutaj.",
-  "components.Discover.tmdbstudio": "Studio TMDB",
-  "components.Discover.tmdbtvkeyword": "Słowo kluczowe serialu TMDB",
-  "components.Discover.tmdbtvgenre": "Gatunek serialu TMDB",
-  "components.Discover.tmdbsearch": "Wyszukiwanie TMDB",
-  "components.Discover.FilterSlideover.tmdbuserscore": "Ocena użytkownika TMDB",
-  "components.Discover.moviegenres": "Gatunki filmu",
-  "components.Discover.networks": "Kanały",
-  "components.Discover.CreateSlider.editsuccess": "Edytowano suwak i zapisano ustawienia personalizacji.",
-  "components.Discover.stopediting": "Zakończ edytowanie",
-  "components.Discover.studios": "Studia",
-  "components.DownloadBlock.formattedTitle": "{title}: Sezon {seasonNumber} Odcinek {episodeNumber}",
-  "components.Discover.tvgenres": "Gatunki seriali",
-  "components.Discover.updatefailed": "Coś poszło nie tak podczas aktualizacji ustawień personalizacji wykrywania.",
-  "components.Discover.updatesuccess": "Zaktualizowano ustawienia personalizacji wykrywania.",
-  "components.Discover.resettodefault": "Przywróć domyślne",
-  "components.Discover.resetfailed": "Coś poszło nie tak podczas resetowania ustawień personalizacji wykrywania.",
-  "components.Discover.resetsuccess": "Pomyślnie zresetowano ustawienia wykrywania.",
-  "components.Discover.tmdbmoviegenre": "Gatunek filmu TMDB",
-  "components.Layout.Sidebar.browsetv": "Seriale",
-  "components.Layout.UserWarnings.emailInvalid": "Adres e-mail jest nieprawidłowy.",
-  "components.Layout.UserWarnings.passwordRequired": "Wymagane jest podanie hasła.",
-  "components.Login.credentialerror": "Nazwa użytkownika lub hasło są nieprawidłowe.",
-  "components.Login.emailtooltip": "Adres nie musi być powiązany z instancją {mediaServerName}.",
-  "components.Login.host": "{mediaServerName} URL",
-  "components.Login.initialsignin": "Połącz",
-  "components.Login.initialsigningin": "Łączenie…",
-  "components.Login.save": "Reklama",
-  "components.Login.saving": "Dodaję…",
-  "components.Login.signinwithjellyfin": "Użyj swojego konta {mediaServerName}",
-  "components.Login.title": "Dodaj e-mail",
-  "components.Login.username": "Nazwa użytkownika",
-  "components.Login.validationEmailRequired": "Musisz podać adres e-mail",
-  "components.Login.validationemailformat": "Wymagany poprawny adres e-mail",
-  "components.Login.validationhostformat": "Wymagany poprawny adres URL",
-  "components.Login.validationhostrequired": "{mediaServerName} URL wymagany",
-  "components.Login.validationusernamerequired": "Wymagana nazwa użytkownika",
-  "components.ManageSlideOver.removearr4k": "Usuń z 4k {arr}",
-  "components.MovieDetails.downloadstatus": "Status pobierania",
-  "components.MovieDetails.openradarr4k": "Otwórz film 4k w Radarr",
-  "components.MovieDetails.play": "Odtwórz na {mediaServerName}",
-  "components.MovieDetails.play4k": "Odtwórz w 4K na {mediaServerName}",
+  "components.Settings.SettingsJobsCache.editJobScheduleCurrent": "Bieżąca częstotliwość",
+  "components.TvDetails.seasonnumber": "Sezon {seasonNumber}",
+  "components.TvDetails.seasonstitle": "Sezony",
+  "components.Settings.SettingsJobsCache.imagecache": "Pamięć podręczna obrazów",
  "components.PermissionEdit.viewrecent": "Wyświetl ostatnio dodane",
-  "components.PermissionEdit.viewrecentDescription": "Zezwolenie na wyświetlanie listy ostatnio dodanych multimediów.",
-  "components.RequestBlock.approve": "Zatwierdź żądanie",
-  "components.RequestBlock.decline": "Odrzuć żądanie",
-  "components.RequestBlock.delete": "Usuń żądanie",
-  "components.RequestBlock.lastmodifiedby": "Ostatnio modyfikowany przez",
-  "components.RequestBlock.requestdate": "Data żądania",
-  "components.RequestBlock.requestedby": "Żądany przez",
+  "components.PermissionEdit.viewrecentDescription": "Przyznaj uprawnienia do przeglądania listy ostatnio dodanych multimediów.",
+  "components.TitleCard.cleardata": "Wyczyść dane",
+  "components.RequestList.RequestItem.tmdbid": "Identyfikator TMDB",
+  "components.RequestList.RequestItem.tvdbid": "Identyfikator TVDB",
+  "components.TitleCard.tmdbid": "Identyfikator TMDB",
+  "components.Settings.SettingsJobsCache.plex-watchlist-sync": "Synchronizacja listy obserwowanych Plex",
+  "components.TitleCard.mediaerror": "Nie znaleziono {mediaType}",
+  "components.TitleCard.tvdbid": "Identyfikator TVDB",
+  "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncseriestip": "Automatyczne zamawianie filmów z <PlexWatchlistSupportLink>listy obserwowanych Plex</PlexWatchlistSupportLink>",
+  "components.PermissionEdit.autorequestSeriesDescription": "Udziel zgody na automatyczne przesyłanie próśb dotyczących multimediów innych niż 4K za pośrednictwem listy obserwowanych Plex.",
+  "components.PermissionEdit.viewwatchlists": "Wyświetlanie list obserwacyjnych Plex",
+  "components.PermissionEdit.viewwatchlistsDescription": "Przyznaj uprawnienia do przeglądania list obserwowanych Plex innych użytkowników.",
+  "components.RequestCard.tmdbid": "Identyfikator TMDB",
+  "components.RequestCard.tvdbid": "Identyfikator TVDB",
+  "components.Settings.SettingsLogs.viewdetails": "Zobacz szczegóły",
+  "components.Settings.restartrequiredTooltip": "Overseerr musi zostać ponownie uruchomiony, aby zmiany tego ustawienia zaczęły obowiązywać",
+  "components.TvDetails.reportissue": "Zgłoś problem",
+  "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncseries": "Automatyczna prośba o serial",
+  "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncmoviestip": "Automatyczne zamawianie filmów z <PlexWatchlistSupportLink>listy obserwowanych Plex</PlexWatchlistSupportLink>",
+  "components.UserProfile.plexwatchlist": "Lista obserwowanych Plex",
  "components.RequestCard.cancelrequest": "Anuluj prośbę",
  "components.RequestCard.declinerequest": "Odrzuć prośbę",
+  "components.RequestCard.approverequest": "Zatwierdź prośbę",
+  "components.DownloadBlock.formattedTitle": "{title}: Sezon {seasonNumber} Odcinek {episodeNumber}",
+  "components.RequestBlock.approve": "Zatwierdź prośbę",
+  "components.RequestBlock.decline": "Odrzuć prośbę",
+  "components.RequestBlock.delete": "Usuń prośbę",
+  "components.RequestBlock.edit": "Edytuj prośbę",
+  "components.RequestBlock.lastmodifiedby": "Ostatnio zmodyfikowane przez",
+  "components.RequestBlock.requestdate": "Data złożenia prośby",
+  "components.RequestBlock.requestedby": "Prośba zgłoszona przez",
  "components.RequestCard.editrequest": "Edytuj prośbę",
-  "components.RequestCard.unknowntitle": "Nieznany tytuł",
+  "components.RequestModal.requestcollection4ktitle": "Poproś o kolekcję w 4K",
  "components.RequestModal.requestcollectiontitle": "Poproś o kolekcję",
  "components.RequestModal.requestmovie4ktitle": "Poproś o film w 4K",
  "components.RequestModal.requestmovietitle": "Poproś o film",
  "components.RequestModal.requestseries4ktitle": "Poproś o serial w 4K",
  "components.RequestModal.requestseriestitle": "Poproś o serial",
-  "components.Selector.searchGenres": "Wybierz gatunki…",
-  "components.Selector.searchKeywords": "Wyszukaj słowa kluczowe…",
-  "components.Selector.searchStudios": "Szukaj studiów…",
-  "components.Selector.showless": "Pokaż mniej",
-  "components.Selector.starttyping": "Rozpocznij wpisywanie, aby wyszukać.",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Ostatnio dodane skanowanie Jellyfin",
-  "components.Settings.SettingsMain.apikey": "Klucz API",
-  "components.Settings.SettingsMain.applicationTitle": "Nazwa aplikacji",
-  "components.Settings.SettingsMain.applicationurl": "URL aplikacji",
-  "components.Settings.SettingsMain.csrfProtection": "Włącz ochronę CSRF",
-  "components.Settings.SettingsMain.csrfProtectionHoverTip": "NIE włączaj tego ustawienia, jeśli nie rozumiesz, co robisz!",
-  "components.Settings.SettingsMain.csrfProtectionTip": "Ustawienie dostępu do zewnętrznego API tylko do odczytu (wymaga HTTPS)",
+  "components.Settings.SettingsJobsCache.image-cache-cleanup": "Czyszczenie pamięci podręcznej obrazów",
+  "components.Settings.SettingsJobsCache.imagecacheDescription": "Po włączeniu w ustawieniach Overseerr będzie pośredniczyć i buforować obrazy ze wstępnie skonfigurowanych źródeł zewnętrznych. Obrazy z pamięci podręcznej są zapisywane w folderze konfiguracji. Możesz znaleźć pliki w <code>{appDataPath}/cache/images</code>.",
+  "components.Settings.SettingsJobsCache.imagecachecount": "Obrazy zapisane w pamięci podręcznej",
+  "components.Settings.SettingsJobsCache.imagecachesize": "Całkowity rozmiar pamięci podręcznej",
+  "components.Settings.advancedTooltip": "Nieprawidłowe skonfigurowanie tego ustawienia może spowodować nieprawidłowe działanie",
+  "components.Settings.experimentalTooltip": "Włączenie tego ustawienia może spowodować nieoczekiwane zachowanie aplikacji",
+  "components.TvDetails.rtaudiencescore": "Ocena publiczności Rotten Tomatoes",
+  "components.TvDetails.rtcriticsscore": "Rotten Tomatoes Tomatometr",
+  "components.TvDetails.status4k": "4K {status}",
+  "components.TvDetails.tmdbuserscore": "Ocena użytkowników TMDB",
+  "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncmovies": "Filmy z próśb automatycznych",
+  "components.UserProfile.emptywatchlist": "W tym miejscu pojawią się multimedia dodane do <PlexWatchlistSupportLink>listy obserwowanych Plex</PlexWatchlistSupportLink>.",
+  "components.RequestCard.unknowntitle": "Nieznany tytuł",
+  "components.RequestList.RequestItem.unknowntitle": "Nieznany tytuł",
+  "components.StatusBadge.playonplex": "Odtwórz na Plex",
+  "components.StatusBadge.seasonepisodenumber": "S{seasonNumber}E{episodeNumber}",
+  "components.TvDetails.Season.noepisodes": "Lista odcinków jest niedostępna.",
+  "components.TvDetails.Season.somethingwentwrong": "Coś poszło nie tak podczas pobierania danych o sezonie.",
+  "components.TvDetails.manageseries": "Zarządzaj serialem",
+  "components.Discover.emptywatchlist": "W tym miejscu pojawią się multimedia dodane do <PlexWatchlistSupportLink>listy obserwowanych Plex</PlexWatchlistSupportLink>.",
+  "components.RequestModal.SearchByNameModal.nomatches": "Nie udało nam się znaleźć dopasowania do tej serii.",
+  "components.StatusBadge.managemedia": "Zarządzaj {mediaType}",
+  "components.StatusBadge.openinarr": "Otwórz w {arr}",
+  "components.TvDetails.episodeCount": "{episodeCount, plural, one {# Odcinek} other {# Odcinki}}",
+  "components.Discover.CreateSlider.addSlider": "Dodaj Suwak",
+  "components.Discover.CreateSlider.addcustomslider": "Utwórz niestandardowy Suwak",
+  "components.Discover.CreateSlider.addfail": "Nie udało się utworzyć nowego Suwaka.",
+  "components.Discover.CreateSlider.addsuccess": "Utworzono nowy Suwaki zapisano ustawienia dostosowywania odnajdywania.",
+  "components.Discover.CreateSlider.editSlider": "Edytuj Suwak",
+  "components.Discover.CreateSlider.editfail": "Nie udało się edytować Suwaka.",
+  "components.Discover.CreateSlider.editsuccess": "Edytowano Suwak i zapisano ustawienia odkrywania.",
+  "components.Discover.CreateSlider.needresults": "Musisz mieć co najmniej 1 wynik.",
+  "components.Discover.CreateSlider.nooptions": "Brak wyników.",
+  "components.Discover.CreateSlider.providetmdbgenreid": "Podaj identyfikator gatunku TMDB",
+  "components.Discover.CreateSlider.providetmdbkeywordid": "Podaj identyfikator słowa kluczowego TMDB",
+  "components.Discover.CreateSlider.providetmdbnetwork": "Podaj identyfikator platformy TMDB",
+  "components.Discover.CreateSlider.providetmdbsearch": "Podaj zapytanie wyszukiwania",
+  "components.Discover.CreateSlider.providetmdbstudio": "Podaj identyfikator studia TMDB",
+  "components.Discover.CreateSlider.searchGenres": "Szukaj gatunków…",
+  "components.Discover.CreateSlider.searchKeywords": "Szukaj słów kluczowych…",
+  "components.Discover.CreateSlider.slidernameplaceholder": "Nazwa slidera",
+  "components.Discover.CreateSlider.starttyping": "Zacznij pisać, aby wyszukać.",
+  "components.Discover.CreateSlider.validationDatarequired": "Musisz uzyskać wartość danych.",
+  "components.Discover.CreateSlider.validationTitlerequired": "Musisz podać tytuł.",
+  "components.Discover.DiscoverMovieKeyword.keywordMovies": "{keywordTitle} Filmy",
+  "components.Discover.DiscoverSliderEdit.deletefail": "Nie udało się usunąć slidera.",
+  "components.Discover.DiscoverSliderEdit.remove": "Usuń",
+  "components.Discover.DiscoverTvKeyword.keywordSeries": "Serial {keywordTitle}",
+  "components.Discover.DiscoverMovies.activefilters": "{count, plural, one {# aktywny filtr} other {# aktywnych filtrów}}",
+  "components.Discover.DiscoverMovies.discovermovies": "Filmy",
+  "components.Discover.DiscoverMovies.sortPopularityAsc": "Popularność rosnąco",
+  "components.Discover.DiscoverMovies.sortPopularityDesc": "Popularność malejąco",
+  "components.Discover.DiscoverMovies.sortReleaseDateAsc": "Data wydania rosnąco",
+  "components.Discover.DiscoverMovies.sortReleaseDateDesc": "Data wydania malejąco",
+  "components.Discover.DiscoverMovies.sortTitleAsc": "Tytuł (A-Z) rosnąco",
+  "components.Discover.DiscoverMovies.sortTitleDesc": "Tytuł (Z-A) malejąco",
+  "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "Ocena TMDB rosnąco",
+  "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "Ocena TMDB malejąco",
+  "components.Discover.DiscoverSliderEdit.deletesuccess": "Pomyślnie usunięto slider.",
+  "components.Discover.DiscoverSliderEdit.enable": "Przełącz widoczność",
+  "components.Discover.DiscoverTv.activefilters": "{count, plural, one {# aktywny filtr} other {# aktywnych filtrów}}",
+  "components.Discover.DiscoverTv.discovertv": "Seriale",
+  "components.Discover.DiscoverTv.sortFirstAirDateAsc": "Data pierwszej emisji rosnąco",
+  "components.Discover.DiscoverTv.sortFirstAirDateDesc": "Pierwsza data emisji malejąco",
+  "components.Discover.DiscoverTv.sortPopularityAsc": "Popularność rosnąco",
+  "components.Discover.DiscoverTv.sortPopularityDesc": "Popularność malejąco",
+  "components.Discover.DiscoverTv.sortTitleAsc": "Tytuł (A-Z) rosnąco",
+  "components.Discover.DiscoverTv.sortTitleDesc": "Tytuł (Z-A) malejąco",
+  "components.Discover.DiscoverTv.sortTmdbRatingAsc": "Ocena TMDB rosnąco",
+  "components.Discover.DiscoverTv.sortTmdbRatingDesc": "Ocena TMDB malejąco",
+  "components.Discover.CreateSlider.searchStudios": "Szukaj studiów…",
  "components.Settings.SettingsMain.general": "Ogólne",
  "components.Settings.SettingsMain.generalsettings": "Ustawienia ogólne",
-  "components.Settings.SettingsMain.generalsettingsDescription": "Konfiguracja globalnych i domyślnych ustawień Overseerr.",
-  "components.Settings.SettingsMain.hideAvailable": "Ukryj dostępne media",
-  "components.Settings.SettingsMain.locale": "Wyświetlany język",
-  "components.Settings.SettingsMain.partialRequestsEnabled": "Zezwalaj na częściowe żądania seriali",
-  "components.Settings.SettingsMain.region": "Region odkrywania",
-  "components.Settings.SettingsMain.regionTip": "Filtrowanie zawartości według dostępności regionalnej",
-  "components.Settings.SettingsMain.toastSettingsFailure": "Coś poszło nie tak podczas zapisywania ustawień.",
-  "components.Settings.SettingsMain.trustProxyTip": "Umożliwienie Overseerr poprawnego rejestrowania adresów IP klientów za serwerem proxy",
-  "components.Settings.jellyfinSettings": "{mediaServerName} Ustawienia",
-  "components.Settings.jellyfinSettingsFailure": "Coś poszło nie tak podczas zapisywania ustawień {mediaServerName}.",
-  "components.Settings.jellyfinSettingsSuccess": "Ustawienia {mediaServerName} zostały pomyślnie zapisane!",
-  "components.Settings.jellyfinlibrariesDescription": "Biblioteki {mediaServerName} skanują w poszukiwaniu tytułów. Kliknij poniższy przycisk, jeśli na liście nie ma żadnych bibliotek.",
-  "components.Settings.jellyfinsettings": "{mediaServerName} ustawienia",
-  "components.Settings.jellyfinsettingsDescription": "Konfiguracja ustawień serwera {mediaServerName}. {mediaServerName} skanuje biblioteki {mediaServerName}, aby sprawdzić, jaka zawartość jest dostępna.",
-  "components.Settings.manualscanJellyfin": "Ręczne skanowanie biblioteki",
-  "components.Settings.saving": "Zapisywanie…",
-  "components.Settings.syncing": "Synchronizowanie",
-  "components.Setup.signinWithPlex": "Użyj konta Plex",
-  "components.StatusBadge.openinarr": "Otwórz w {arr}",
-  "components.StatusBadge.playonplex": "Odtwórz na {mediaServerName}",
-  "components.TitleCard.watchlistError": "Coś poszło nie tak, spróbuj ponownie.",
-  "components.TvDetails.Season.somethingwentwrong": "Coś poszło nie tak podczas pobierania danych sezonu.",
-  "components.TvDetails.seasonnumber": "Sezon {seasonNumber}",
-  "components.TvDetails.seasonstitle": "Sezony",
-  "components.TvDetails.status4k": "4K {status}",
-  "components.UserProfile.UserSettings.UserGeneralSettings.plexwatchlistsyncmovies": "Automatyczne żądania filmów",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Zapisz zmiany",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Zapisywanie…",
+  "components.Settings.SettingsMain.originallanguageTip": "Filtruj zawartość według języka oryginału",
+  "components.Discover.PlexWatchlistSlider.emptywatchlist": "W tym miejscu pojawią się multimedia dodane do <PlexWatchlistSupportLink>listy obserwowanych Plex</PlexWatchlistSupportLink>.",
+  "components.Discover.networks": "Platformy",
+  "components.Discover.moviegenres": "Gatunki filmowe",
+  "components.Discover.tmdbnetwork": "Platforma TMDB",
+  "components.Discover.tmdbstudio": "Studio TMDB",
+  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Twoja lista obserwowanych Plex",
+  "components.Discover.createnewslider": "Utwórz nowy suwak",
+  "components.Discover.customizediscover": "Dostosowywanie funkcji Odkryj",
+  "components.Discover.resetfailed": "Wystąpił problem podczas resetowania ustawień odnajdywania.",
+  "components.Discover.resetsuccess": "Pomyślnie zresetowano ustawienia odnajdywania.",
+  "components.Discover.resetwarning": "Przywróć wszystkie Suwaki do ustawień domyślnych. Spowoduje to również usunięcie wszystkich niestandardowych Suwaków!",
+  "components.Discover.resettodefault": "Przywróć ustawienia domyślne",
+  "components.Discover.studios": "Studia",
+  "components.Discover.tmdbmoviegenre": "Gatunek filmu TMDB",
+  "components.Discover.tvgenres": "Gatunki serialu",
+  "components.Settings.SettingsMain.csrfProtectionTip": "Ustaw zewnętrzny dostęp api na tylko do odczytu (wymaga HTTPS)",
+  "components.Settings.SettingsMain.csrfProtectionHoverTip": "NIE włączaj tego ustawienia, chyba że rozumiesz, co robisz!",
+  "components.Settings.SettingsMain.generalsettingsDescription": "Skonfiguruj globalne i domyślne ustawienia dla Overseerr.",
+  "components.Settings.SettingsMain.hideAvailable": "Ukryj dostępne multimedia",
+  "components.Settings.SettingsMain.trustProxyTip": "Pozwól Overseerr poprawnie rejestrować adresy IP klientów za serwerem proxy",
+  "components.Settings.SettingsMain.toastSettingsSuccess": "Ustawienia zostały zapisane pomyślnie!",
+  "components.Settings.SettingsMain.trustProxy": "Włącz obsługę proxy",
+  "components.Settings.SettingsMain.validationApplicationUrlTrailingSlash": "Adres URL nie może kończyć się ukośnikiem",
+  "components.Discover.FilterSlideover.activefilters": "{count, plural, one {# aktywny filtr} other {# aktywnych filtrów}}",
+  "components.Discover.FilterSlideover.clearfilters": "Wyczyść aktywne filtry",
+  "components.Discover.FilterSlideover.filters": "Filtry",
+  "components.Discover.FilterSlideover.firstAirDate": "Pierwsza data emisji",
+  "components.Discover.FilterSlideover.from": "Od",
+  "components.Discover.FilterSlideover.genres": "Gatunki",
+  "components.Discover.FilterSlideover.keywords": "Słowa kluczowe",
+  "components.Discover.FilterSlideover.originalLanguage": "Język oryginalny",
+  "components.Discover.FilterSlideover.ratingText": "Oceny pomiędzy {minValue} a {maxValue}",
+  "components.Discover.FilterSlideover.releaseDate": "Data wydania",
+  "components.Discover.FilterSlideover.runtimeText": "{minValue}-{maxValue} czas odtwarzania w minutach",
+  "components.Discover.FilterSlideover.runtime": "Czas odtwarzania",
+  "components.Discover.FilterSlideover.tmdbuserscore": "Ocena użytkowników TMDB",
+  "components.Discover.FilterSlideover.to": "Do",
+  "components.Discover.RecentlyAddedSlider.recentlyAdded": "Ostatnio dodane",
+  "components.Discover.stopediting": "Zatrzymaj edycję",
+  "components.Discover.tmdbmoviekeyword": "Słowo kluczowe filmu TMDB",
+  "components.Discover.tmdbsearch": "Wyszukiwanie TMDB",
  "components.Layout.Sidebar.browsemovies": "Filmy",
-  "components.Login.validationEmailFormat": "Nieprawidłowy adres e-mail",
-  "components.RequestModal.SearchByNameModal.nomatches": "Nie udało nam się znaleźć odpowiednika dla tego serialu.",
+  "components.Layout.Sidebar.browsetv": "Seriale",
+  "components.Selector.searchGenres": "Wybierz gatunki…",
+  "components.Selector.searchKeywords": "Szukaj słów kluczowych…",
  "components.Selector.showmore": "Pokaż więcej",
-  "components.Settings.SettingsMain.cacheImagesTip": "Pamięć podręczna obrazów pochodzących z zewnątrz (wymaga znacznej ilości miejsca na dysku)",
-  "components.Settings.SettingsMain.originallanguageTip": "Filtrowanie zawartości według oryginalnego języka",
-  "components.Settings.SettingsMain.toastSettingsSuccess": "Ustawienia zapisane pomyślnie!",
-  "components.Settings.experimentalTooltip": "Włączenie tego ustawienia może spowodować nieoczekiwane zachowanie aplikacji",
-  "components.UserList.mediaServerUser": "{mediaServerName} Użytkownik",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "Email",
-  "components.Discover.resetwarning": "Przywróć domyślne ustawienia wszystkich suwaków. Spowoduje to również usunięcie wszystkich niestandardowych suwaków!",
-  "components.Layout.UserWarnings.emailRequired": "Wymagany jest adres e-mail.",
-  "components.MovieDetails.openradarr": "Otwórz film w Radarr",
-  "components.RequestModal.requestcollection4ktitle": "Poproś o kolekcję w 4K",
-  "components.Setup.signinWithJellyfin": "Użyj konta {mediaServerName}",
-  "components.Login.description": "Ponieważ logujesz się do {applicationName} po raz pierwszy, musisz dodać prawidłowy adres e-mail.",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Spowoduje to nieodwracalne usunięcie tego {mediaType} z {arr}, w tym wszystkich plików.",
-  "components.ManageSlideOver.removearr": "Usuń z {arr}",
-  "components.PermissionEdit.autorequestSeriesDescription": "Zezwolenie na automatyczne przesyłanie żądań dotyczących seriali innych niż 4K za pośrednictwem listy obserwowanych Plex.",
-  "components.PermissionEdit.viewwatchlists": "Wyświetl {mediaServerName} watchlistę",
-  "components.RequestCard.approverequest": "Zaakceptuj prośbę",
-  "components.Settings.RadarrModal.tagRequestsInfo": "Automatycznie dodawaj dodatkowy znacznik z identyfikatorem użytkownika i wyświetlaną nazwą użytkownika",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Wspomóż Jellyseerr",
-  "components.Settings.SettingsJobsCache.jellyfin-full-scan": "Pełne skanowanie bibliotek Jellyfin",
-  "components.Settings.SettingsLogs.viewdetails": "Zobacz szczegóły",
-  "components.Settings.jellyfinSettingsDescription": "Opcjonalnie skonfiguruj wewnętrzne i zewnętrzne punkty końcowe dla serwera {mediaServerName}. W większości przypadków zewnętrzny adres URL różni się od wewnętrznego adresu URL. Niestandardowy adres URL resetowania hasła można również ustawić dla logowania {mediaServerName}, na wypadek gdybyś chciał przekierować na inną stronę resetowania hasła.",
-  "components.Settings.save": "Zapisz zmiany",
-  "components.Settings.syncJellyfin": "Synchronizuj biblioteki",
-  "components.TvDetails.Season.noepisodes": "Lista odcinków jest niedostępna.",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Dźwięk powiadomień",
-  "components.Settings.RadarrModal.tagRequests": "Żądania tagów",
-  "components.Settings.SettingsJobsCache.editJobScheduleCurrent": "Aktualna częstotliwość",
-  "components.Settings.SettingsMain.validationApplicationTitle": "Musisz podać tytuł aplikacji",
-  "components.Settings.SonarrModal.seriesType": "Typ seriali",
-  "components.Settings.advancedTooltip": "Nieprawidłowe skonfigurowanie tego ustawienia może spowodować nieprawidłowe działanie",
-  "components.TvDetails.reportissue": "Zgłoś problem",
-  "components.RequestBlock.edit": "Edytuj żądanie",
-  "components.RequestList.RequestItem.unknowntitle": "Nieznany tytuł",
+  "components.Selector.starttyping": "Zacznij pisać, aby wyszukać.",
+  "components.Settings.SettingsMain.applicationTitle": "Tytuł aplikacji",
+  "components.Settings.SettingsMain.applicationurl": "Adres URL aplikacji",
+  "components.Settings.SettingsMain.cacheImages": "Włącz buforowanie obrazów",
+  "components.Settings.SettingsMain.csrfProtection": "Włącz ochronę CSRF",
+  "components.Settings.SettingsMain.locale": "Język wyświetlania",
+  "components.Settings.SettingsMain.originallanguage": "Odkryj język",
+  "components.Settings.SettingsMain.partialRequestsEnabled": "Zezwalaj na prośby o część serialu",
+  "components.Settings.SettingsMain.region": "Odkryj region",
+  "components.Settings.SettingsMain.regionTip": "Filtruj zawartość według dostępności regionalnej",
+  "components.Settings.SettingsMain.toastApiKeyFailure": "Coś poszło nie tak podczas generowania nowego klucza API.",
+  "components.Settings.SettingsMain.toastApiKeySuccess": "Nowy klucz API został pomyślnie wygenerowany!",
+  "components.Settings.SettingsMain.validationApplicationTitle": "Należy podać tytuł aplikacji",
+  "components.Settings.SettingsMain.validationApplicationUrl": "Musisz podać prawidłowy adres URL",
+  "components.Discover.FilterSlideover.streamingservices": "Usługi streamingowe",
+  "components.Discover.FilterSlideover.studio": "Studia",
+  "components.Discover.tmdbtvgenre": "Gatunek serialu TMDB",
+  "components.Discover.tmdbtvkeyword": "Słowo kluczowe serialu TMDB",
+  "components.Discover.updatesuccess": "Zaktualizowano ustawienia odnajdywania.",
  "components.Selector.nooptions": "Brak wyników.",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Domyślne urządzenie",
-  "components.Settings.Notifications.userEmailRequired": "Wymagaj adresu e-mail użytkownika",
-  "components.Settings.manualscanDescriptionJellyfin": "Zwykle będzie to uruchamiane tylko raz na 24 godziny. Jellyseerr będzie bardziej agresywnie sprawdzać ostatnio dodane biblioteki serwera {mediaServerName}. Jeśli po raz pierwszy konfigurujesz Jellyseerr, zalecane jest jednorazowe pełne ręczne skanowanie biblioteki!"
+  "components.Selector.searchStudios": "Szukaj studiów…",
+  "components.Selector.showless": "Pokaż mniej",
+  "components.Discover.updatefailed": "Wystąpił problem podczas aktualizowania ustawień odnajdywania.",
+  "components.Settings.SettingsMain.apikey": "Klucz API",
+  "components.Settings.SettingsMain.cacheImagesTip": "Pamięć podręczna dla obrazów pochodzących z zewnętrznych źródeł (wymaga znacznej ilości miejsca na dysku)",
+  "components.Settings.SettingsMain.toastSettingsFailure": "Coś poszło nie tak podczas zapisywania ustawień.",
+  "i18n.collection": "Kolekcja",
+  "components.MovieDetails.imdbuserscore": "Ocena użytkowników IMDB",
+  "components.Settings.SonarrModal.seriesType": "Typ serialu"
 }
--- a/src/i18n/locale/pt_BR.json
+++ b/src/i18n/locale/pt_BR.json
@@ -1257,35 +1257,9 @@
  "components.Discover.FilterSlideover.tmdbuservotecount": "Qtd de Votos de Usuários TMDB",
  "components.Discover.FilterSlideover.voteCount": "Qtd the votos entre {minValue} e {maxValue}",
  "components.Settings.RadarrModal.tagRequestsInfo": "Adicione automaticamente uma tag extra com o ID de usuário e o nome de exibição do solicitante",
-  "components.Layout.UserWarnings.emailRequired": "Um endereço de e-mail é necessário.",
-  "components.Login.credentialerror": "O nome de usuário ou senha está incorreto.",
-  "components.Login.description": "Já que é sua primeira vez entrando em {applicationName}, você precisa adicionar um e-mail válido.",
-  "components.Login.host": "URL de {mediaServerName}",
-  "components.Login.initialsignin": "Conectar",
-  "components.Login.initialsigningin": "Conectando…",
-  "components.Login.save": "Adicionar",
-  "components.Login.saving": "Adicionando…",
-  "components.Login.signinwithjellyfin": "Use sua conta de {mediaServerName}",
-  "components.Login.title": "Adicionar E-Mail",
-  "components.Login.username": "Nome de usuário",
-  "components.Login.validationEmailFormat": "E-mail inválido",
-  "components.Login.validationEmailRequired": "Você precisa providenciar um e-mail",
-  "components.Login.validationemailformat": "E-mail válido necessário",
-  "components.Login.validationhostformat": "URL válido necessário",
-  "components.Login.validationusernamerequired": "Nome de usuário necessário",
-  "components.ManageSlideOver.removearr": "Remover de {arr}",
-  "components.ManageSlideOver.removearr4k": "Remover de {arr} 4K",
-  "components.MovieDetails.downloadstatus": "Status de download",
-  "components.MovieDetails.imdbuserscore": "Avaliação de usuário no IMDB",
-  "components.MovieDetails.openradarr": "Abrir filme no Radarr",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Som de notificação",
-  "components.Login.emailtooltip": "Endereço não precisa ser associado à sua instância de {mediaServerName}.",
-  "components.Layout.UserWarnings.emailInvalid": "Endereço de e-mail inválido.",
-  "components.Layout.UserWarnings.passwordRequired": "Uma senha é necessária.",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Padrão do dispositivo",
-  "components.Login.validationhostrequired": "URL de {mediaServerName} necessário",
-  "components.MovieDetails.openradarr4k": "Abrir filme em Radarr 4K",
-  "components.MovieDetails.play": "Reproduzir em {mediaServerName}",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Isto irá remover este {mediaType} de {arr}, incluindo todos os arquivos.",
-  "components.MovieDetails.play4k": "Reproduzir em 4K em {mediaServerName}"
+  "i18n.collection": "Coleção",
+  "components.MovieDetails.imdbuserscore": "Pontuação de usuário IMDB",
+  "components.Settings.SonarrModal.tagRequestsInfo": "Adiciona automaticamente uma tag adicional com o ID de usuário e nome de exibição de quem pediu",
+  "components.Settings.SonarrModal.tagRequests": "Marcar Pedidos",
+  "components.Settings.RadarrModal.tagRequests": "Marcar Pedidos"
 }
--- a/src/i18n/locale/ro.json
+++ b/src/i18n/locale/ro.json
@@ -370,7 +370,7 @@
  "components.PlexLoginButton.signinwithplex": "Conectat",
  "components.QuotaSelector.movieRequests": "{quotaLimit} <quotaUnits>{movies} per {quotaDays} {days}</quotaUnits>",
  "components.PersonDetails.lifespan": "{birthdate} – {deathdate}",
-  "components.RequestBlock.seasons": "{seasonCount, plural, un {Season} alte {Seasons}}",
+  "components.RequestBlock.seasons": "{seasonCount, plural, one {Sezon} other {Sezoane}}",
  "components.PermissionEdit.requestMoviesDescription": "Acordați permisiunea de a trimite solicitări pentru filme non-4K.",
  "components.PermissionEdit.viewissuesDescription": "Acordați permisiunea de a vizualiza problemele media raportate de alți utilizatori.",
  "components.PermissionEdit.viewwatchlistsDescription": "Acordați permisiunea de a vizualiza listele de urmărire Plex ale altor utilizatori.",
@@ -403,40 +403,62 @@
  "components.RequestBlock.approve": "Aprobă Solicitarea",
  "components.RequestBlock.decline": "Respinge Solicitarea",
  "components.RequestBlock.requestedby": "Solicitat de",
-  "components.RequestButton.approve4krequests": "Aprobă {requestCount, plural, o {4K Request} alte {{requestCount} 4K Requests}}",
+  "components.RequestButton.approve4krequests": "Aprobă {requestCount, plural, one {Cerere 4K} other {{requestCount} Cereri 4K}}",
  "components.RequestBlock.lastmodifiedby": "Ultima Dată Modificat de",
  "components.RequestBlock.profilechanged": "Profil Calitate",
  "components.RequestBlock.requestdate": "Dată Solicitare",
-  "components.Layout.UserWarnings.emailRequired": "Este necesara o adresa de email.",
-  "components.Layout.UserWarnings.passwordRequired": "Este necesara o parola.",
-  "components.Login.credentialerror": "Numele de utilizator sau parola sunt incorecte.",
-  "components.Login.emailtooltip": "Nu este necesar ca adresa ta sa fie asociata cu instanta ta {mediaServerName} .",
-  "components.Login.save": "Adauga",
-  "components.Login.signinwithjellyfin": "Foloseste-ti contul de {mediaServerName}",
-  "components.Login.title": "Adauga email",
-  "components.Login.username": "Nume utilizator",
-  "components.Login.validationEmailFormat": "Adresa email invalida",
-  "components.Login.validationemailformat": "Necesar email valid",
-  "components.Login.validationhostformat": "Necesar URL valid",
-  "components.Login.validationhostrequired": "{mediaServerName} URL necesar",
-  "components.Login.validationusernamerequired": "Nume utilizator necesar",
-  "components.MovieDetails.downloadstatus": "Status descarcare",
-  "components.MovieDetails.openradarr": "Deschide film in Radarr",
-  "components.MovieDetails.openradarr4k": "Deschide film in 4K Radarr",
-  "components.MovieDetails.play": "Ruleaza pe {mediaServerName}",
-  "components.MovieDetails.play4k": "Ruleaza 4k pe {mediaServerName}",
-  "components.RequestButton.declinerequest": "Refuza cerere",
-  "components.RequestButton.declinerequest4k": "Refuza cerere 4k",
-  "components.Layout.UserWarnings.emailInvalid": "Adresa de email este invalida.",
-  "components.Login.description": "Deoarece este prima ta authentificare in {applicationName}, este necesara sa introduci o adresa de email valida.",
-  "components.Login.initialsigningin": "Se conecteaza…",
-  "components.Login.saving": "Se adauga…",
-  "components.RequestButton.approverequest": "Aproba cerere",
-  "components.RequestButton.approverequest4k": "Aproba cerere 4k",
-  "components.Login.host": "{mediaServerName} URL",
-  "components.Login.initialsignin": "Conecteaza-te",
-  "components.ManageSlideOver.removearr4k": "Elimina din 4K {arr}",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Acesta va elimina ireversibil {mediaType} din {arr}, incluzand toate fisierele asociate.",
-  "components.Login.validationEmailRequired": "Trebuie sa introduci o adresa email",
-  "components.ManageSlideOver.removearr": "Elimina din {arr}"
+  "components.RequestButton.approverequests": "Aprobă {requestCount, plural, one {Cerere} other {{requestCount} Cereri}}",
+  "components.RequestButton.requestmore4k": "Cere mai mult în 4K",
+  "components.RequestButton.approverequest4k": "Aproba Cereri 4K",
+  "components.RequestCard.tmdbid": "ID TMDB",
+  "components.RequestCard.failedretry": "A apărut o eroare la reîncercarea solicitării.",
+  "components.RequestButton.declinerequest": "Respinge Cerere",
+  "components.RequestCard.seasons": "{seasonCount, plural, one {Sezon} other {Sezoane}}",
+  "components.RequestCard.declinerequest": "Respinge Cererea",
+  "components.RequestButton.viewrequest": "Vezi Cerere",
+  "components.RequestButton.declinerequests": "Respinge {requestCount, plural, one {Cererea} other {{requestCount} Cererile}}",
+  "components.RequestCard.mediaerror": "{mediaType} Nu a fost găsit",
+  "components.RequestCard.editrequest": "Editează Cererea",
+  "components.RequestButton.viewrequest4k": "Vezi Cerere 4K",
+  "components.RequestButton.decline4krequests": "Respinge {requestCount, plural, one {Cererea 4K} other {{requestCount} Cererile 4K}}",
+  "components.RequestButton.declinerequest4k": "Respinge Cerere 4K",
+  "components.RequestCard.approverequest": "Aprobă Cererea",
+  "components.RequestButton.approverequest": "Cereri Aprobate",
+  "components.RequestCard.deleterequest": "Șterge Cererea",
+  "components.RequestCard.unknowntitle": "Titlu necunoscut",
+  "components.RequestList.RequestItem.cancelRequest": "Anulează Cerere",
+  "components.RequestCard.tvdbid": "ID TheTVDB",
+  "components.RequestButton.requestmore": "Cere mai mult",
+  "components.RequestList.RequestItem.deleterequest": "Șterge Cerere",
+  "components.RequestCard.cancelrequest": "Anulează Cererea",
+  "components.RequestModal.AdvancedRequester.folder": "{path} ({space})",
+  "components.RequestList.RequestItem.modified": "Modificat",
+  "components.RequestList.RequestItem.editrequest": "Editează Cererea",
+  "components.RequestModal.AdvancedRequester.qualityprofile": "Profil de Calitate",
+  "components.RequestList.requests": "Cereri",
+  "components.RequestModal.AdvancedRequester.advancedoptions": "Avansat",
+  "components.RequestModal.AdvancedRequester.notagoptions": "Fără etichete.",
+  "components.RequestList.RequestItem.modifieduserdate": "{date} de {user}",
+  "components.RequestModal.AdvancedRequester.requestas": "Cere ca",
+  "components.RequestList.showallrequests": "Afișează toate cererile",
+  "components.RequestList.RequestItem.tmdbid": "ID-ul TMDB",
+  "components.RequestList.RequestItem.requesteddate": "Solicitat",
+  "components.RequestModal.QuotaDisplay.movie": "film",
+  "components.RequestList.RequestItem.failedretry": "Ceva a mers greșit în timpul reîncercării cererii.",
+  "components.RequestList.RequestItem.unknowntitle": "Titlu Necunoscut",
+  "components.RequestModal.AdvancedRequester.destinationserver": "Server Destinație",
+  "components.RequestModal.AdvancedRequester.rootfolder": "Folder Rădăcină",
+  "components.RequestList.sortAdded": "Cele Mai Recente",
+  "components.RequestModal.AdvancedRequester.tags": "Etichete",
+  "components.RequestList.RequestItem.mediaerror": "{mediaType} nu a fost găsit",
+  "components.RequestList.sortModified": "Ultima Modificată",
+  "components.RequestList.RequestItem.tvdbid": "ID-ul TheTVDB",
+  "components.RequestModal.AdvancedRequester.selecttags": "Selectați Etichetele",
+  "components.RequestList.RequestItem.requested": "Solicitat",
+  "components.RequestModal.QuotaDisplay.notenoughseasonrequests": "Nu sunt suficiente cereri de sezon rămase",
+  "components.RequestModal.AdvancedRequester.default": "{name} (Implicit)",
+  "components.RequestModal.AdvancedRequester.languageprofile": "Profil de Limbă",
+  "components.RequestModal.QuotaDisplay.allowedRequestsUser": "Acest utilizator are voie sa ceara <strong>{limit}</strong> {type} la fiecare <strong>{days}</strong> zile.",
+  "components.RequestList.RequestItem.seasons": "",
+  "components.RequestModal.QuotaDisplay.allowedRequests": "Aveți voie să cereți <strong>{limit}</strong> de {type} la fiecare <strong>{days}</strong> zile."
 }
--- a/src/i18n/locale/ru.json
+++ b/src/i18n/locale/ru.json
@@ -33,7 +33,7 @@
  "components.RequestModal.cancel": "Отменить запрос",
  "components.RequestModal.extras": "Дополнительно",
  "components.RequestModal.numberofepisodes": "# эпизодов",
-  "components.RequestModal.pendingrequest": "Ожидающий запрос",
+  "components.RequestModal.pendingrequest": "",
  "components.RequestModal.requestCancel": "Запрос на <strong>{title}</strong> отменён.",
  "components.RequestModal.requestSuccess": "<strong>{title}</strong> успешно запрошен!",
  "components.RequestModal.requestadmin": "Этот запрос будет одобрен автоматически.",
@@ -170,7 +170,7 @@
  "pages.oops": "Упс",
  "pages.returnHome": "Вернуться домой",
  "components.CollectionDetails.overview": "Обзор",
-  "components.CollectionDetails.numberofmovies": "{count} фильмов",
+  "components.CollectionDetails.numberofmovies": "{count} {count, plural, one {фильм} few {фильма} other {фильмов}}",
  "components.CollectionDetails.requestcollection": "Запросить Коллекцию",
  "components.Login.email": "Адрес электронной почты",
  "components.UserList.users": "Пользователи",
@@ -427,9 +427,9 @@
  "components.Settings.RadarrModal.testFirstRootFolders": "Протестировать подключение для загрузки корневых каталогов",
  "components.Settings.RadarrModal.loadingrootfolders": "Загрузка корневых каталогов…",
  "components.RequestModal.AdvancedRequester.destinationserver": "Сервер-получатель",
-  "components.RequestList.RequestItem.mediaerror": "{mediaType} не найдено",
+  "components.RequestList.RequestItem.mediaerror": "Название, связанное с этим запросом, больше недоступно.",
  "components.RequestList.RequestItem.failedretry": "Что-то пошло не так при попытке повторить запрос.",
-  "components.RequestCard.mediaerror": "{mediaType} не найдено",
+  "components.RequestCard.mediaerror": "Название, связанное с этим запросом, больше недоступно.",
  "components.RequestCard.failedretry": "Что-то пошло не так при попытке повторить запрос.",
  "components.RequestButton.viewrequest4k": "Посмотреть 4К запрос",
  "components.RequestButton.requestmore4k": "Запросить больше в 4К",
@@ -570,7 +570,7 @@
  "components.TvDetails.seasons": "{seasonCount, plural, one {# сезон} other {# сезонов}}",
  "components.RequestModal.QuotaDisplay.requiredquotaUser": "Этому пользователю необходимо иметь по крайней мере <strong>{seasons}</strong> {seasons, plural, one {запрос на сезоны} other {запроса(ов) на сезоны}} для того, чтобы отправить запрос на этот сериал.",
  "components.RequestModal.QuotaDisplay.requiredquota": "Вам необходимо иметь по крайней мере <strong>{seasons}</strong> {seasons, plural, one {запрос на сезоны} other {запроса(ов) на сезоны}} для того, чтобы отправить запрос на этот сериал.",
-  "components.RequestModal.pending4krequest": "Ожидающий 4K запрос",
+  "components.RequestModal.pending4krequest": "",
  "components.RequestModal.autoapproval": "Автоматическое одобрение",
  "i18n.usersettings": "Настройки пользователя",
  "i18n.showingresults": "Показываются результаты с <strong>{from}</strong> по <strong>{to}</strong> из <strong>{total}</strong>",
@@ -790,7 +790,7 @@
  "components.UserList.importfromplexerror": "Что-то пошло не так при импорте пользователей из Plex.",
  "components.UserList.importfrommediaserver": "Импортировать пользователей из {mediaServerName}",
  "components.UserList.importfromplex": "Импортировать пользователей из Plex",
-  "components.UserList.importedfromplex": "<strong>{userCount}</strong> {userCount, plural, one {# новый пользователь} other {# новых пользователя(ей)}} успешно импортированы из Plex!",
+  "components.UserList.importedfromplex": "{userCount, plural, one {# новый пользователь} other {# новых пользователя(ей)}} успешно импортированы из Plex!",
  "components.UserList.edituser": "Изменить разрешения пользователя",
  "components.UserList.displayName": "Отображаемое имя",
  "components.UserList.deleteconfirm": "Вы уверены, что хотите удалить этого пользователя? Все данные о его запросах будут удалены без возможности восстановления.",
@@ -1018,7 +1018,7 @@
  "components.Discover.CreateSlider.addcustomslider": "Создать слайдер",
  "components.Discover.CreateSlider.nooptions": "Нет результатов.",
  "components.Discover.CreateSlider.providetmdbgenreid": "Введите TMDB ID жанра",
-  "components.Discover.CreateSlider.needresults": "Должен быть хотя-бы 1 результат.",
+  "components.Discover.CreateSlider.needresults": "Должен быть хотя бы 1 результат.",
  "components.Discover.CreateSlider.providetmdbkeywordid": "Введите TMDB ID ключевого слова",
  "components.Discover.CreateSlider.providetmdbnetwork": "Введите TMDB ID сети",
  "components.Discover.CreateSlider.providetmdbsearch": "Введите поисковой запрос",
@@ -1027,7 +1027,7 @@
  "components.Discover.CreateSlider.searchKeywords": "Поиск ключевых слов…",
  "components.Discover.CreateSlider.searchStudios": "Поиск студий…",
  "components.Discover.CreateSlider.slidernameplaceholder": "Название слайдера",
-  "components.Discover.CreateSlider.starttyping": "Начините писать для поиска.",
+  "components.Discover.CreateSlider.starttyping": "Начните писать для поиска.",
  "components.Discover.CreateSlider.validationDatarequired": "Вы должны ввести дату.",
  "components.Discover.CreateSlider.validationTitlerequired": "Вы должны ввести заголовок.",
  "components.Discover.DiscoverMovieKeyword.keywordMovies": "Фильмы по ключевому слову \"{keywordTitle}\"",
@@ -1059,7 +1059,7 @@
  "components.Discover.DiscoverSliderEdit.deletesuccess": "Слайдер успешно удален.",
  "components.Discover.DiscoverSliderEdit.enable": "Изменить видимость",
  "components.Discover.DiscoverSliderEdit.remove": "Удалить",
-  "components.Discover.DiscoverTv.activefilters": "{count, plural, one {# Активный фильтр} other {# Активные фильтры}}",
+  "components.Discover.DiscoverTv.activefilters": "{count, plural, one {# Активен фильтр} other {# Активные фильтры }}",
  "components.Discover.DiscoverTv.discovertv": "Сериалы",
  "components.Discover.DiscoverTv.sortPopularityAsc": "Популярность по возрастанию",
  "components.Discover.DiscoverTv.sortPopularityDesc": "Популярность по убыванию",
@@ -1117,7 +1117,7 @@
  "components.MovieDetails.digitalrelease": "Цифровой релиз",
  "components.MovieDetails.physicalrelease": "Физический релиз",
  "components.Settings.SettingsMain.toastSettingsFailure": "Что-то пошло не так при сохранении настроек.",
-  "components.Settings.SettingsMain.trustProxyTip": "Разрешить Jellyseerr правильно регистрировать IP-адреса клиентов за прокси-сервером",
+  "components.Settings.SettingsMain.trustProxyTip": "Разрешить Overserr правильно регистрировать IP-адреса клиентов за прокси-сервером",
  "components.Settings.experimentalTooltip": "Включение этого параметра может привести к неожиданному поведению приложения",
  "components.Settings.advancedTooltip": "Неправильная настройка этого параметра может привести к нарушению функциональности",
  "components.Settings.externalUrl": "Внешний URL-адрес",
@@ -1131,7 +1131,7 @@
  "components.Settings.validationApiKey": "Вы должны предоставить ключ API",
  "components.TitleCard.mediaerror": "{mediaType} не найдено",
  "components.TitleCard.tmdbid": "TMDB ID",
-  "components.Settings.restartrequiredTooltip": "Чтобы изменения этого параметра вступили в силу, необходимо перезапустить Jellyseerr",
+  "components.Settings.restartrequiredTooltip": "Чтобы изменения этого параметра вступили в силу, необходимо перезапустить Overserr",
  "components.ManageSlideOver.alltime": "Все время",
  "components.ManageSlideOver.plays": "<strong>{playCount, number}</strong> {playCount, plural, one {просмотр} other {просмотров}}",
  "components.Settings.Notifications.NotificationsGotify.agentenabled": "Включить агент",
@@ -1214,13 +1214,13 @@
  "components.Settings.Notifications.NotificationsGotify.toastGotifyTestSending": "Отправка тестового уведомления Gotify…",
  "components.Settings.SettingsMain.cacheImages": "Включить кэширование изображений",
  "components.Settings.SettingsMain.generalsettings": "Общие настройки",
-  "components.Settings.SettingsMain.generalsettingsDescription": "Настройте глобальные параметры и параметры по умолчанию для Jellyseerr.",
+  "components.Settings.SettingsMain.generalsettingsDescription": "Настройте глобальные параметры и параметры по умолчанию для Overserr.",
  "components.Settings.SettingsMain.hideAvailable": "Скрыть доступные медиа",
  "components.Settings.SettingsMain.regionTip": "Фильтровать контент по региональной доступности",
  "components.Settings.SettingsMain.toastApiKeyFailure": "Что-то пошло не так при создании нового ключа API.",
  "components.Settings.SettingsMain.locale": "Язык приложения",
  "components.Settings.SettingsMain.originallanguage": "Регион поиска",
-  "components.Settings.tautulliSettingsDescription": "При желании настройте параметры для вашего сервера Tautulli. Jellyseerr извлекает данные истории просмотров Plex из Tautulli.",
+  "components.Settings.tautulliSettingsDescription": "При желании настройте параметры для вашего сервера Tautulli. Overserr извлекает данные истории просмотров Plex из Tautulli.",
  "components.Settings.toastTautulliSettingsFailure": "Что-то пошло не так при сохранении настроек Tautulli.",
  "components.Settings.toastTautulliSettingsSuccess": "Настройки Tautulli успешно сохранены!",
  "components.Settings.validationUrlBaseTrailingSlash": "База URL не должна заканчиваться косой чертой",
@@ -1241,7 +1241,7 @@
  "components.Settings.Notifications.NotificationsGotify.validationTypes": "Вы должны выбрать как минимум один тип уведомления",
  "components.Settings.Notifications.NotificationsGotify.validationUrlRequired": "Вы должны указать действующий URL",
  "components.Settings.Notifications.NotificationsGotify.validationUrlTrailingSlash": "URL не должен заканчиваться слешем",
-  "components.Settings.SettingsJobsCache.imagecacheDescription": "Если включено, Jellyseerr будет проксировать и кэшировать изображения из предварительно настроенных внешних источников. Кэшированные изображения сохраняются в папку конфигурации. Вы можете найти файлы в <code>{appDataPath}/cache/images</code>.",
+  "components.Settings.SettingsJobsCache.imagecacheDescription": "Если включено, Overserr будет проксировать и кэшировать изображения из предварительно настроенных внешних источников. Кэшированные изображения сохраняются в папку конфигурации. Вы можете найти файлы в <code>{appDataPath}/cache/images</code>.",
  "components.Settings.tautulliSettings": "Настройки Tautulli",
  "components.StatusBadge.seasonepisodenumber": "S{seasonNumber}E{episodeNumber}",
  "components.Discover.customizediscover": "Настроить Обнаружение",
@@ -1257,92 +1257,21 @@
  "components.Selector.showmore": "Показать больше",
  "components.Settings.SettingsJobsCache.imagecachesize": "Размер кэша",
  "components.Settings.validationUrlBaseLeadingSlash": "Базовый URL должен начинаться с косой черты",
-  "components.Layout.UserWarnings.emailRequired": "Требуется указать email адрес.",
-  "components.Layout.UserWarnings.passwordRequired": "Требуется указать пароль.",
-  "components.Login.emailtooltip": "Адрес не обязательно должен быть связан с вашим {mediaServerName} сервером.",
-  "components.Login.initialsignin": "Подключиться",
-  "components.Login.initialsigningin": "Подключение…",
-  "components.Login.save": "Добавить",
-  "components.Login.saving": "Добавление…",
-  "components.Login.signinwithjellyfin": "Используйте свой {mediaServerName} аккаунт",
-  "components.Login.host": "{mediaServerName} URL",
-  "components.Login.username": "Имя пользователя",
-  "components.Login.validationEmailFormat": "Неверный email",
-  "components.Login.validationemailformat": "Необходим корректный email",
-  "components.Login.validationhostformat": "Необходим корректный URL",
-  "components.Login.validationhostrequired": "Необходим {mediaServerName} URL",
-  "components.Login.validationusernamerequired": "Необходимо имя пользователя",
-  "components.ManageSlideOver.removearr": "Удалить из {arr}",
-  "components.ManageSlideOver.removearr4k": "Удалить из 4К {arr}",
+  "components.Discover.FilterSlideover.tmdbuservotecount": "Количество голосов пользователей TMDB",
+  "components.Discover.FilterSlideover.voteCount": "Количество голосов между {minValue} и {maxValue}",
+  "components.Discover.tmdbmoviestreamingservices": "Стриминговые сервисы фильмов TMDB",
+  "components.Discover.tmdbtvstreamingservices": "Стриминговые сервисы сериалов TMDB",
+  "components.Settings.RadarrModal.tagRequestsInfo": "Автоматически добавлять дополнительный тег с ID и именем запросившего пользователя",
+  "components.Settings.RadarrModal.tagRequests": "Теги запросов",
  "components.MovieDetails.imdbuserscore": "Оценка пользователей IMDB",
-  "components.MovieDetails.openradarr": "Открыть фильм в Radarr",
-  "components.MovieDetails.play": "Запустить на {mediaServerName}",
-  "components.MovieDetails.play4k": "Запустить 4К на {mediaServerName}",
-  "components.Settings.RadarrModal.tagRequests": "Тег запросов",
-  "components.Layout.UserWarnings.emailInvalid": "Неверный email адрес.",
-  "components.Settings.SonarrModal.seriesType": "Тип сериала",
-  "components.Discover.FilterSlideover.voteCount": "Количество голосов от {minValue} до {maxValue}",
-  "components.Login.validationEmailRequired": "Вы должны указать адрес электронной почты",
-  "components.Settings.Notifications.userEmailRequired": "Требуется email пользователя",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Сканировать недавно добавленное в Jellyfin",
-  "components.Discover.tmdbmoviestreamingservices": "Сервисы потоковой передачи фильмов TMDB",
-  "components.Discover.tmdbtvstreamingservices": "Сервисы потоковой передачи сериалов TMDB",
-  "components.Login.description": "Поскольку вы впервые входите в систему {ApplicationName}, вам необходимо добавить адрес электронной почты.",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Звук уведомлений",
-  "components.Settings.RadarrModal.tagRequestsInfo": "Автодобавление тега с именем и ID пользователя, отправившего запрос",
-  "components.Settings.SonarrModal.animeSeriesType": "Тип аниме",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "Количество голосов от пользователей TMDB",
-  "components.Login.credentialerror": "Введено неверное имя пользователя или пароль.",
-  "components.Login.title": "Добавить email",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Это приведет к необратимому удалению {MediaType} из {arr}, включая все файлы.",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Поддержать Jellyseerr",
-  "components.Settings.SonarrModal.tagRequests": "Тег запросов",
-  "components.MovieDetails.downloadstatus": "Статус загрузки",
-  "components.MovieDetails.openradarr4k": "Открыть фильм в 4К Radarr",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Устройство по умолчанию",
-  "components.Settings.SettingsJobsCache.jellyfin-full-scan": "Сканировать всю библиотеку Jellyfin",
-  "components.Settings.SettingsJobsCache.availability-sync": "Синхронизировать доступность медиа",
-  "components.Settings.jellyfinSettingsFailure": "Что-то пошло не так во время сохранения настроек {mediaServerName}.",
-  "components.Settings.jellyfinSettingsSuccess": "Настройки {mediaServerName} успешно сохранены!",
-  "components.Settings.jellyfinlibraries": "Библиотеки {mediaServerName}",
-  "components.Settings.jellyfinlibrariesDescription": "Библиотеки {mediaServerName} проверяются на наличие заголовков. Нажмите кнопку ниже, если в списке не хватает библиотек.",
-  "components.Settings.jellyfinsettings": "Настройки {mediaServerName}",
-  "components.Settings.internalUrl": "Внутренний URL-адрес",
-  "components.Settings.SonarrModal.tagRequestsInfo": "Автодобавление тега с именем и ID пользователя, отправившего запрос",
-  "components.Settings.jellyfinSettings": "Настройки {mediaServerName}",
-  "components.Settings.jellyfinSettingsDescription": "Необязательно настраивать внутреннюю и внешнюю конечные точки для вашего сервера {mediaServerName}. В большинстве случаев внешний URL-адрес отличается от внутреннего. Пользовательский URL-адрес для сброса пароля также может быть задан для входа в систему {mediaServerName}, на случай, если вы хотите перенаправить на другую страницу для сброса пароля.",
-  "components.Settings.jellyfinsettingsDescription": "Настройте свой {mediaServerName} сервер. {mediaServerName} отсканирует ваши библиотеки, чтобы увидеть, какие библиотеки доступны.",
-  "components.Settings.manualscanJellyfin": "Сканировать библиотеки вручную",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.Settings.syncJellyfin": "Синхронизировать библиотеки",
-  "components.Settings.syncing": "Синхронизация",
-  "components.Settings.timeout": "Время ожидания",
-  "components.Setup.signin": "Войти",
-  "components.Setup.signinWithPlex": "Используйте свой Plex аккаунт",
-  "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> успешно удален из списка наблюдения!",
-  "components.TitleCard.watchlistError": "Что-то пошло не так, попробуйте еще раз.",
-  "components.TvDetails.play": "Запустить в {mediaServerName}",
-  "components.TvDetails.play4k": "Запустить 4К в {mediaServerName}",
-  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {userCount, plural, one {# новый пользователь} other {# новых пользователя(ей)}} успешно импортированы из {mediaServerName}!",
-  "components.UserList.importfromJellyfin": "Добавить пользователей из {mediaServerName}",
-  "components.UserList.noJellyfinuserstoimport": "Нет пользователей {mediaServerName} для импорта.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "Пользователь {mediaServerName}",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Сохранение…",
-  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Звук уведомлений",
+  "components.Settings.SettingsJobsCache.availability-sync": "Синхронизация доступности медиа",
+  "components.Settings.SonarrModal.tagRequests": "Теги запросов",
+  "components.Settings.SonarrModal.tagRequestsInfo": "Автоматически добавлять тег с ID и именем запросившего пользователя",
  "i18n.collection": "Коллекция",
-  "components.Setup.configuremediaserver": "Настройте медиасервер",
-  "components.UserList.importfromJellyfinerror": "Что-то пошло не так при импорте пользователей из {mediaServerName}.",
-  "components.UserList.newJellyfinsigninenabled": "Параметр <strong>Включить новый вход в {mediaServerName}</strong> в настоящее время включен. Пользователей {mediaServerName} с доступом к библиотеке не нужно импортировать для входа.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "Электронная почта",
-  "components.UserProfile.localWatchlist": "Список наблюдения {username}",
-  "components.Settings.manualscanDescriptionJellyfin": "Обычно это выполняется только раз в 24 часа. Jellyseerr будет более настойчиво проверять недавно добавленный сервер {mediaServerName}. Если вы впервые настраиваете Jellyseerr, то рекомендуем однократное полное сканирование библиотеки!",
-  "components.TitleCard.watchlistCancel": "наблюдение за <strong>{title}</strong> отменено.",
-  "components.Settings.saving": "Сохранение…",
-  "components.TitleCard.addToWatchList": "Добавить в список наблюдения",
-  "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> успешно добавлен в список наблюдения!",
-  "components.Settings.save": "Сохранить изменения",
-  "components.Setup.signinWithJellyfin": "Используйте свой {mediaServerName} аккаунт",
-  "components.UserList.mediaServerUser": "Пользователь {mediaServerName}",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Сохранить изменения",
-  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Устройство по умолчанию"
+  "components.Settings.Notifications.NotificationsPushover.sound": "Звук уведомления",
+  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Устройство по умолчанию",
+  "components.Settings.SonarrModal.animeSeriesType": "Тип аниме-сериала",
+  "components.Settings.SonarrModal.seriesType": "Тип сериала",
+  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Звук уведомления",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Устройство по умолчанию"
 }
--- a/src/i18n/locale/sl.json
+++ b/src/i18n/locale/sl.json
@@ -1,59 +0,0 @@
-{
-  "components.Discover.CreateSlider.editsuccess": "Urejen drsnik in shranjene nastavitve prilagajanja odkrivanja.",
-  "components.CollectionDetails.numberofmovies": "{count} film/ov",
-  "components.Discover.CreateSlider.slidernameplaceholder": "Ime drsnika",
-  "components.Discover.DiscoverTv.sortFirstAirDateAsc": "Premiera ↓",
-  "components.AppDataWarning.dockerVolumeMissingDescription": "Pripenjanje nosilca <code>{appDataPath}</code> ni bilo pravilno konfigurirano. Vsi podatki bodo izbrisani, ko se vsebnik zaustavi ali znova zažene.",
-  "components.Discover.DiscoverMovies.sortPopularityDesc": "Priljubljenost ↑",
-  "components.AirDateBadge.airsrelative": "Predvajanje {relativeTime}",
-  "components.CollectionDetails.overview": "Pregled",
-  "components.Discover.DiscoverMovies.activefilters": "{count, plural, one {# Active Filter} drugo {# Active Filters}}",
-  "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "Ocena TMDB ↓",
-  "components.AirDateBadge.airedrelative": "Predvajano {relativeTime}",
-  "components.Discover.CreateSlider.searchStudios": "Iskanje studiev …",
-  "components.Discover.DiscoverMovies.sortReleaseDateDesc": "Datum izdaje ↑",
-  "components.Discover.CreateSlider.providetmdbnetwork": "Navedite ID omrežja TMDB",
-  "components.Discover.CreateSlider.addfail": "Novega drsnika ni bilo mogoče ustvariti.",
-  "components.CollectionDetails.requestcollection": "Zahtevaj zbirko",
-  "components.Discover.DiscoverMovieGenre.genreMovies": "Filmi: {genre}",
-  "components.Discover.DiscoverMovieLanguage.languageMovies": "Filmi: {language}",
-  "components.Discover.DiscoverTv.activefilters": "{count, plural, one {# Active Filter} other {# Active Filters}}",
-  "components.Discover.DiscoverMovies.sortPopularityAsc": "Priljubljenost ↓",
-  "components.Discover.CreateSlider.needresults": "Imeti morate vsaj 1 rezultat.",
-  "components.Discover.CreateSlider.addcustomslider": "Ustvari drsnik po meri",
-  "components.Discover.DiscoverTv.sortPopularityAsc": "Priljubljenost ↓",
-  "components.Discover.CreateSlider.editSlider": "Uredi drsnik",
-  "components.Discover.DiscoverTv.sortTitleAsc": "Naslov (a-ž) ↓",
-  "components.Discover.CreateSlider.validationDatarequired": "Navesti morate vrednost podatkov.",
-  "components.Discover.DiscoverTv.sortFirstAirDateDesc": "Premiera ↑",
-  "components.Discover.DiscoverTv.discovertv": "Serije",
-  "components.Discover.DiscoverSliderEdit.deletefail": "Drsnika ni bilo mogoče izbrisati.",
-  "components.Discover.CreateSlider.providetmdbstudio": "Navedite ID studia v TMDB",
-  "components.Discover.DiscoverMovies.sortTitleDesc": "Naslov (a-ž) ↑",
-  "components.Discover.DiscoverStudio.studioMovies": "{studio} filmi",
-  "components.Discover.DiscoverTv.sortPopularityDesc": "Priljubljenost ↑",
-  "components.Discover.CreateSlider.searchGenres": "Išči žanre …",
-  "components.Discover.CreateSlider.editfail": "Drsnika ni bilo mogoče urediti.",
-  "components.Discover.CreateSlider.starttyping": "Tipkajte za iskanje.",
-  "components.Discover.DiscoverSliderEdit.enable": "Preklopi vidnost",
-  "components.Discover.CreateSlider.addSlider": "Dodaj drsnik",
-  "components.CollectionDetails.requestcollection4k": "Zahtevaj zbirko 4K",
-  "components.Discover.CreateSlider.providetmdbsearch": "Vnesite iskalno poizvedbo",
-  "components.Discover.DiscoverNetwork.networkSeries": "{network} serije",
-  "components.Discover.CreateSlider.providetmdbkeywordid": "Navedite ID ključne besede TMDB",
-  "components.Discover.DiscoverMovieKeyword.keywordMovies": "Filmi: {keywordTitle}",
-  "components.Discover.CreateSlider.validationTitlerequired": "Navesti morate naslov.",
-  "components.Discover.DiscoverMovies.sortReleaseDateAsc": "Datum izdaje ↓",
-  "components.Discover.CreateSlider.nooptions": "Ni zadetkov.",
-  "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "Ocena TMDB ↑",
-  "components.Discover.CreateSlider.searchKeywords": "Iskanje po ključnih besedah …",
-  "components.Discover.CreateSlider.addsuccess": "Ustvarjen nov drsnik in shranjene nastavitve prilagajanja odkrivanja.",
-  "components.Discover.DiscoverSliderEdit.deletesuccess": "Drsnik je bil uspešno izbrisan.",
-  "components.Discover.DiscoverMovies.discovermovies": "Filmi",
-  "components.Discover.DiscoverMovies.sortTitleAsc": "Naslov (a-ž) ↓",
-  "components.Discover.CreateSlider.providetmdbgenreid": "Navedite ID žanra TMDB",
-  "components.Discover.DiscoverTv.sortTitleDesc": "Naslov (a-ž) ↑",
-  "components.Discover.DiscoverSliderEdit.remove": "Odstrani",
-  "components.Discover.DiscoverTv.sortTmdbRatingAsc": "Ocena TMDB ↓",
-  "components.Discover.DiscoverTvGenre.genreSeries": "{genre} Series"
-}
--- a/src/i18n/locale/sv.json
+++ b/src/i18n/locale/sv.json
--- a/src/i18n/locale/tr.json
+++ b/src/i18n/locale/tr.json
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
gauthier-th	7528a7c266	refactor: clean the rate limit utility	2024-07-13 20:31:31 +02:00
gauthier-th	8be79fcad8	fix(jellyfinapi): add missing argument in JellyfinAPI constructor	2024-07-13 02:03:46 +02:00
Gauthier	e9d6046997	feat: set IPv4 first as an option	2024-07-11 16:33:33 +02:00
Gauthier	eddbf2d0ec	revert: remove retry to external API requests	2024-07-11 15:48:45 +02:00
gauthier-th	6d9a1c596e	fix: imageProxy rate limit	2024-07-11 15:48:43 +02:00
Gauthier	c4054531cc	fix: try to fix network errors with IPv6	2024-07-11 15:48:43 +02:00
gauthier-th	98c5500967	feat: add retry to external API requests	2024-07-11 15:48:42 +02:00
gauthier-th	943d84e4d5	fix: better log for ExternalAPI errors	2024-07-11 15:48:42 +02:00
gauthier-th	faec3260f6	fix: use the right search params for ExternalAPI	2024-07-11 15:48:41 +02:00
gauthier-th	6bcaa672ad	fix: switch from URL objects to strings	2024-07-11 15:48:41 +02:00
gauthier-th	15568b1f6b	refactor: switch frontend from axios to fetch api	2024-07-11 15:48:40 +02:00
gauthier-th	0f6ba544f8	refactor: switch server from axios to fetch api	2024-07-11 15:48:39 +02:00
gauthier-th	27cd125532	refactor: add rate limit to fetch api	2024-07-11 15:48:39 +02:00
gauthier-th	8f6cbefbb3	refactor: add rate limit to fetch api	2024-07-11 15:48:38 +02:00
gauthier-th	1b2b137760	refactor: make tautulli use the ExternalAPI class	2024-07-11 15:48:38 +02:00
gauthier-th	543341d9f9	ci: try to fix format checker	2024-07-11 15:48:37 +02:00
gauthier-th	5865bfac96	ci: ci: try to fix format checker	2024-07-11 15:48:37 +02:00
gauthier-th	c5e35aad05	ci: try to fix format checker	2024-07-11 15:48:36 +02:00
gauthier-th	a46cdb3a4f	fix: send proper URL params	2024-07-11 15:48:36 +02:00
gauthier-th	bebbd690b4	fix: add missing auth token in Plex request	2024-07-11 15:48:35 +02:00
gauthier-th	99443d2796	refactor: switch ExternalAPI to Fetch API	2024-07-11 15:48:34 +02:00