refactor: update Next.js, React.js and Node.js (#815)

* refactor: update Next.js and React.js

* refactor: update Next.js images

* refactor: update ESLint rules and fix warnings/errors

* fix: remove old intl polyfill

* fix: add proper size to next/image components

* fix: adjust full-size for next/image components

* fix: temporary allow all domains for image optimization

* build: fixes an issue where dev env could lead to javascript heap out of memory

* fix: resolve webpack cache issue with country-flag-icons

* refactor: switch compiler from Babel to SWC

* fix: resize logo in sidebar

* fix: break word on long path to avoid text overflow

* chore: added sharp for production image optimisation

* fix: change extract script for i18n to a custom script

* fix: resolve GitHub CodeQL alert

* chore: temporarily remove builds for ARMv7

* fix: resize avatar images

* refactor: update Node.js to v20

* fix: resolve various UI issues

* build: migrate yarn to pnpm and restrict engine to node@^20.0.0

* ci: specify the pnpm version to use in workflow actions

* ci: fix typo in pnpm action-setup for cypress workflow

* test(cypress): use pnpm instead of yarn

* style: ran prettier on pnpm-lock

* ci(cypress): setup nodejs v20 in cypress workflow

* ci: pnpm cache to reduce install time

* ci: use sh shell to get pnpm store directory

* build(dockerfile): migrate to pnpm from yarn in docker builds

* build(dockerfile): copy the proper pnpm lockfile

* build: install pnpm for all platforms

* build(dockerfile): remove unnecessary `&&` on apk installation steps

* build: migrate pnpm 8 to 9

* build(dockerfile): add node-gyp back in

* build(dockerfile): install node-gyp through npm

* build(dockerfile): ignore scripts to not run husky install when devdependencies are pruned

* build: migrate to pnpm from yarn

* chore: remove a section that is no longer relevant

---------

Co-authored-by: fallenbagel <98979876+Fallenbagel@users.noreply.github.com>

.eslintrc.js

@@ -5,9 +5,7 @@ module.exports = {
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
     'plugin:jsx-a11y/recommended',
-    'plugin:react/recommended',
-    'plugin:react-hooks/recommended',
-    'plugin:react/jsx-runtime',
+    'plugin:@next/next/recommended',
     'prettier',
   ],
   parserOptions: {

.github/workflows/ci.yml

@@ -13,20 +13,35 @@ jobs:
     name: Lint & Test Build
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-22.04
-    container: node:18.18-alpine
+    container: node:20-alpine
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Pnpm Setup
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - name: Get pnpm store directory
+        shell: sh
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       - name: Install dependencies
         env:
           HUSKY: 0
-        run: yarn
+        run: pnpm install
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
       - name: Formatting
-        run: yarn format:check
+        run: pnpm format:check
       - name: Build
-        run: yarn build
+        run: pnpm build
 
   build_and_push:
     name: Build & Publish Docker Images
@@ -60,7 +75,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
             COMMIT_TAG=${{ github.sha }}

.github/workflows/cypress.yml

@@ -14,11 +14,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Pnpm Setup
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
-          build: yarn cypress:build
-          start: yarn start
+          build: pnpm cypress:build
+          start: pnpm start
           wait-on: 'http://localhost:5055'
           record: true
         env:

.github/workflows/preview.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
             COMMIT_TAG=${{ github.sha }}

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -26,8 +26,23 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Pnpm Setup
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - name: Get pnpm store directory
+        shell: sh
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       - name: Install dependencies
-        run: yarn
+        run: pnpm install
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -45,7 +60,6 @@ jobs:
   #       architecture:
   #         - amd64
   #         - arm64
-  #         - armhf
   #   steps:
   #     - name: Checkout Code
   #       uses: actions/checkout@v4

.github/workflows/snap.yaml

@@ -30,7 +30,6 @@ jobs:
         architecture:
           - amd64
           - arm64
-          - armhf
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

.npmrc

@@ -0,0 +1 @@
+engine-strict=true

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.18-alpine AS BUILD_IMAGE
+FROM node:20-alpine AS BUILD_IMAGE
 
 WORKDIR /app
 
@@ -10,22 +10,24 @@ RUN \
   'linux/arm64' | 'linux/arm/v7') \
   apk update && \
   apk add --no-cache python3 make g++ gcc libc6-compat bash && \
-  yarn global add node-gyp \
+  npm install --global node-gyp \
   ;; \
   esac
 
-COPY package.json yarn.lock ./
-RUN CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
+Run npm install --global pnpm
+
+COPY package.json pnpm-lock.yaml ./
+RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
 
 COPY . ./
 
 ARG COMMIT_TAG
 ENV COMMIT_TAG=${COMMIT_TAG}
 
-RUN yarn build
+RUN pnpm build
 
 # remove development dependencies
-RUN yarn install --production --ignore-scripts --prefer-offline
+RUN pnpm prune --prod --ignore-scripts
 
 RUN rm -rf src server .next/cache
 
@@ -34,7 +36,7 @@ RUN touch config/DOCKER
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:18.18-alpine
+FROM node:20-alpine
 
 # Metadata for Github Package Registry
 LABEL org.opencontainers.image.source="https://github.com/Fallenbagel/jellyseerr"
@@ -47,6 +49,6 @@ RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
 COPY --from=BUILD_IMAGE /app ./
 
 ENTRYPOINT [ "/sbin/tini", "--" ]
-CMD [ "yarn", "start" ]
+CMD [ "pnpm", "start" ]
 
 EXPOSE 5055

Dockerfile.local

@@ -1,8 +1,10 @@
-FROM node:18.18-alpine
+FROM node:20-alpine
 
 COPY . /app
 WORKDIR /app
 
-RUN yarn
+Run npm install --global pnpm
 
-CMD yarn dev
+RUN pnpm install
+
+CMD pnpm dev

README.md

@@ -21,6 +21,8 @@ _The original Overseerr team have been busy and Jellyfin/Emby support aren't on
 
 ## Current Features
 
+<!--  -->
+
 - Full Jellyfin/Emby/Plex integration including authentication with user import & management
 - Supports Movies, Shows and Mixed Libraries
 - Ability to change email addresses for smtp purposes
@@ -38,10 +40,6 @@ With more features on the way! Check out our [issue tracker](https://github.com/
 
 ## Getting Started
 
-#### Pre-requisite (Important)
-
-_*On Jellyfin/Emby, ensure the `Settings > Home > Automatically group content from the following folders into views such as 'Movies', 'Music' and 'TV'` is turned off*_
-
 ### Launching Jellyseerr using Docker (Recommended)
 
 Check out our docker hub for instructions on how to install and run Jellyseerr:
@@ -53,19 +51,21 @@ https://hub.docker.com/r/fallenbagel/jellyseerr
 
 Pre-requisites:
 
-- Nodejs [v18](https://nodejs.org/download/release/v18.18.2)
-- [Yarn](https://classic.yarnpkg.com/lang/en/docs/install)
+- Nodejs [v20](https://nodejs.org/en/download)
+- Pnpm [v9](https://pnpm.io/installation)
 - Download/git clone the source code from the github (Either develop branch or main for stable)
 
 ```cmd
 npm i -g win-node-env
 set CYPRESS_INSTALL_BINARY=0
-yarn install --frozen-lockfile --network-timeout 1000000
-yarn run build
-yarn start
+pnpm install --frozen-lockfile
+pnpm add typeorm@0.13.11
+pnpm run build
+pnpm start
 ```
 
-(You can use task scheduler to run a bat script with `@echo off` and `yarn start` to run jellyseerr in the background)
+(You can use task scheduler to run a bat script with `@echo off` and `pnpm start` to run jellyseerr in the background)
+(You can also use nssm to run jellyseerr as a service, see [nssm](https://nssm.cc/usage) for more information)
 
 _To set env variables such as `JELLYFIN_TYPE=emby` create a file called `.env` in the root directory of jellyseerr_
 
@@ -73,8 +73,8 @@ _To set env variables such as `JELLYFIN_TYPE=emby` create a file called `.env` i
 
 **Pre-requisites:**
 
-- Nodejs [v18](https://nodejs.org/en/download/package-manager)
-- [Yarn](https://classic.yarnpkg.com/lang/en/docs/install) (on Debian based distros, the package manager provided `yarn` is different and is a package called cmdlet. You can remove that using `apt-remove cmdlet` then install yarn using `npm install -g yarn`)
+- Nodejs [v20](https://nodejs.org/en/download)
+- Pnpm [v9](https://pnpm.io/installation)
 - Git
 
 **Steps:**
@@ -95,11 +95,11 @@ git checkout main
 3. Then install the dependencies and build the dist
 
 ```bash
-CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
-yarn run build
+CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
+pnpm build
 ```
 
-4. Now you can start jellyseerr using `yarn start` and opening http://localhost:5055 in your browser.
+4. Now you can start jellyseerr using `pnpm start` and opening http://localhost:5055 in your browser.
 
 5. If you want to run jellyseerr as a _Systemd-service:_
 
@@ -147,7 +147,7 @@ WantedBy=multi-user.target
 
 Archlinux: [AUR](https://aur.archlinux.org/packages/jellyseerr)
 Nixpkg: [Nixpkg](https://search.nixos.org/packages?channel=unstable&show=jellyseerr)
-Snap: [Snap](https://snapcraft.io/jellyseerr)
+~Snap: [Snap](https://snapcraft.io/jellyseerr)~(Deprecated)
 
 ## Preview
 

babel.config.js

@@ -1,25 +0,0 @@
-module.exports = function (api) {
-  api.cache(true);
-
-  return {
-    presets: [
-      [
-        'next/babel',
-        {
-          'preset-env': {
-            useBuiltIns: 'entry',
-            corejs: '3',
-          },
-        },
-      ],
-    ],
-    plugins: [
-      [
-        'react-intl-auto',
-        {
-          removePrefix: 'src/',
-        },
-      ],
-    ],
-  };
-};

cypress/support/e2e.ts

@@ -2,6 +2,6 @@ import './commands';
 
 before(() => {
   if (Cypress.env('SEED_DATABASE')) {
-    cy.exec('yarn cypress:prepare');
+    cy.exec('pnpm cypress:prepare');
   }
 });

next.config.js

@@ -10,7 +10,11 @@ module.exports = {
     JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
   },
   images: {
-    domains: ['image.tmdb.org'],
+    remotePatterns: [
+      { hostname: 'gravatar.com' },
+      { hostname: 'image.tmdb.org' },
+      { hostname: '*', protocol: 'https' },
+    ],
   },
   webpack(config) {
     config.module.rules.push({

package.json

@@ -3,26 +3,27 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "preinstall": "npx only-allow pnpm",
     "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
     "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
     "build:next": "next build",
-    "build": "yarn build:next && yarn build:server",
+    "build": "pnpm build:next && pnpm build:server",
     "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache",
     "lintfix": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --fix",
     "start": "NODE_ENV=production node dist/index.js",
-    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
+    "i18n:extract": "ts-node --project server/tsconfig.json src/i18n/extractMessages.ts",
     "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts",
     "migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts",
     "migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts",
     "format": "prettier --loglevel warn --write --cache .",
     "format:check": "prettier --check --cache .",
-    "typecheck": "yarn typecheck:server && yarn typecheck:client",
+    "typecheck": "pnpm typecheck:server && pnpm typecheck:client",
     "typecheck:server": "tsc --project server/tsconfig.json --noEmit",
     "typecheck:client": "tsc --noEmit",
     "prepare": "husky install",
     "cypress:open": "cypress open",
     "cypress:prepare": "ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/scripts/prepareTestDb.ts",
-    "cypress:build": "yarn build && yarn cypress:prepare"
+    "cypress:build": "pnpm build && pnpm cypress:prepare"
   },
   "repository": {
     "type": "git",
@@ -34,6 +35,7 @@
     "@formatjs/intl-locale": "3.1.1",
     "@formatjs/intl-pluralrules": "5.1.10",
     "@formatjs/intl-utils": "3.8.4",
+    "@formatjs/swc-plugin-experimental": "^0.4.0",
     "@headlessui/react": "1.7.12",
     "@heroicons/react": "2.0.16",
     "@supercharge/request-ip": "1.2.0",
@@ -59,11 +61,10 @@
     "express-openapi-validator": "4.13.8",
     "express-rate-limit": "6.7.0",
     "express-session": "1.17.3",
-    "formik": "2.2.9",
+    "formik": "^2.4.6",
     "gravatar-url": "3.1.0",
-    "intl": "1.2.5",
     "lodash": "4.17.21",
-    "next": "12.3.4",
+    "next": "^14.2.4",
     "node-cache": "5.1.2",
     "node-gyp": "9.3.1",
     "node-schedule": "2.1.1",
@@ -71,13 +72,13 @@
     "openpgp": "5.7.0",
     "plex-api": "5.3.2",
     "pug": "3.0.2",
-    "react": "18.2.0",
+    "react": "^18.3.1",
     "react-ace": "10.1.0",
     "react-animate-height": "2.1.2",
     "react-aria": "3.23.0",
-    "react-dom": "18.2.0",
+    "react-dom": "^18.3.1",
     "react-intersection-observer": "9.4.3",
-    "react-intl": "6.2.10",
+    "react-intl": "^6.6.8",
     "react-markdown": "8.0.5",
     "react-popper-tooltip": "4.4.2",
     "react-select": "5.7.0",
@@ -89,9 +90,10 @@
     "reflect-metadata": "0.1.13",
     "secure-random-password": "0.2.3",
     "semver": "7.3.8",
+    "sharp": "^0.33.4",
     "sqlite3": "5.1.4",
     "swagger-ui-express": "4.6.2",
-    "swr": "2.0.4",
+    "swr": "2.2.5",
     "typeorm": "0.3.12",
     "web-push": "3.5.0",
     "winston": "3.8.2",
@@ -102,7 +104,6 @@
     "zod": "3.20.6"
   },
   "devDependencies": {
-    "@babel/cli": "7.21.0",
     "@commitlint/cli": "17.4.4",
     "@commitlint/config-conventional": "17.4.4",
     "@semantic-release/changelog": "6.0.2",
@@ -123,8 +124,8 @@
     "@types/node": "17.0.36",
     "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.0.11",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "@types/react-transition-group": "4.4.5",
     "@types/secure-random-password": "0.2.1",
     "@types/semver": "7.3.13",
@@ -136,15 +137,13 @@
     "@typescript-eslint/eslint-plugin": "5.54.0",
     "@typescript-eslint/parser": "5.54.0",
     "autoprefixer": "10.4.13",
-    "babel-plugin-react-intl": "8.2.25",
-    "babel-plugin-react-intl-auto": "3.3.0",
     "commitizen": "4.3.0",
     "copyfiles": "2.4.1",
     "cy-mobile-commands": "0.3.0",
     "cypress": "12.7.0",
     "cz-conventional-changelog": "3.3.0",
     "eslint": "8.35.0",
-    "eslint-config-next": "12.3.4",
+    "eslint-config-next": "^14.2.4",
     "eslint-config-prettier": "8.6.0",
     "eslint-plugin-formatjs": "4.9.0",
     "eslint-plugin-jsx-a11y": "6.7.1",
@@ -152,7 +151,6 @@
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-react": "7.32.2",
     "eslint-plugin-react-hooks": "4.6.0",
-    "extract-react-intl-messages": "4.1.1",
     "husky": "8.0.3",
     "lint-staged": "13.1.2",
     "nodemon": "2.0.20",
@@ -168,10 +166,12 @@
     "tsconfig-paths": "4.1.2",
     "typescript": "4.9.5"
   },
-  "resolutions": {
+  "engines": {
+    "node": "^20.0.0",
+    "pnpm": "^9.0.0"
+  },
+  "overrides": {
     "sqlite3/node-gyp": "8.4.1",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.0.11",
     "@types/express-session": "1.17.6"
   },
   "config": {
@@ -237,8 +237,7 @@
         ],
         "platforms": [
           "linux/amd64",
-          "linux/arm64",
-          "linux/arm/v7"
+          "linux/arm64"
         ]
       },
       "@semantic-release/github"

server/index.ts

@@ -146,7 +146,7 @@ app
       try {
         const descriptor = Object.getOwnPropertyDescriptor(req, 'ip');
         if (descriptor?.writable === true) {
-          req.ip = getClientIp(req) ?? '';
+          (req as any).ip = getClientIp(req) ?? '';
         }
       } catch (e) {
         logger.error('Failed to attach the ip to the request', {

server/tsconfig.json

@@ -5,6 +5,7 @@
     "module": "commonjs",
     "outDir": "../dist",
     "noEmit": false,
+    "incremental": true,
     "baseUrl": ".",
     "paths": {
       "@server/*": ["*"]

snap/snapcraft.yaml

@@ -12,7 +12,7 @@ confinement: strict
 architectures:
   - build-on: amd64
   - build-on: arm64
-  - build-on: armhf
+  # - build-on: armhf
 
 parts:
   jellyseerr:
@@ -27,12 +27,12 @@ parts:
           - automake
           - python-gi
           - python-gi-dev
-      - on armhf:
-          - libatomic1
-          - build-essential
-          - automake
-          - python-gi
-          - python-gi-dev
+      # - on armhf:
+      #     - libatomic1
+      #     - build-essential
+      #     - automake
+      #     - python-gi
+      #     - python-gi-dev
     source: .
     override-pull: |
       snapcraftctl pull
@@ -75,7 +75,7 @@ parts:
       curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 
       # Set Node.js version
-      NODE_MAJOR=18
+      NODE_MAJOR=20
       # Add Node.js repository to sources list
       echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
@@ -97,9 +97,9 @@ parts:
       cp -R $SNAPCRAFT_PART_BUILD/node_modules $SNAPCRAFT_PART_INSTALL/
       # Remove .github and gitbook as it will fail snap lint
       rm -rf $SNAPCRAFT_PART_INSTALL/.github
-    stage-packages:
-      - on armhf:
-          - libatomic1
+    # stage-packages:
+    #   - on armhf:
+    #       - libatomic1
     stage: [.next, ./*]
     prime: [.next, ./*]
 

src/components/AirDateBadge/index.tsx

@@ -1,7 +1,8 @@
 import Badge from '@app/components/Common/Badge';
-import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl';
+import defineMessages from '@app/utils/defineMessages';
+import { FormattedRelativeTime, useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.AirDateBadge', {
   airedrelative: 'Aired {relativeTime}',
   airsrelative: 'Airing {relativeTime}',
 });

src/components/AppDataWarning/index.tsx

@@ -1,8 +1,9 @@
 import Alert from '@app/components/Common/Alert';
-import { defineMessages, useIntl } from 'react-intl';
+import defineMessages from '@app/utils/defineMessages';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.AppDataWarning', {
   dockerVolumeMissingDescription:
     'The <code>{appDataPath}</code> volume mount was not configured properly. All data will be cleared when the container is stopped or restarted.',
 });

src/components/CollectionDetails/index.tsx

@@ -10,6 +10,7 @@ import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import { ArrowDownTrayIcon } from '@heroicons/react/24/outline';
 import { MediaStatus } from '@server/constants/media';
@@ -18,10 +19,10 @@ import { uniq } from 'lodash';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useMemo, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.CollectionDetails', {
   overview: 'Overview',
   numberofmovies: '{count} Movies',
   requestcollection: 'Request Collection',
@@ -166,10 +167,9 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
           <Link
             href={`/discover/movies/genre/${genreId}`}
             key={`genre-${genreId}`}
+            className="hover:underline"
           >
-            <a className="hover:underline">
-              {genres.find((g) => g.id === genreId)?.name}
-            </a>
+            {genres.find((g) => g.id === genreId)?.name}
           </Link>
         ))
         .reduce((prev, curr) => (
@@ -195,8 +195,8 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
           <CachedImage
             alt=""
             src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
-            layout="fill"
-            objectFit="cover"
+            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+            fill
             priority
           />
           <div
@@ -229,7 +229,8 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
                 : '/images/overseerr_poster_not_found.png'
             }
             alt=""
-            layout="responsive"
+            sizes="100vw"
+            style={{ width: '100%', height: 'auto' }}
             width={600}
             height={900}
             priority

src/components/Common/Accordion/index.tsx

@@ -1,4 +1,3 @@
-import type * as React from 'react';
 import { useState } from 'react';
 import AnimateHeight from 'react-animate-height';
 

src/components/Common/Badge/index.tsx

@@ -93,13 +93,12 @@ const Badge = (
     );
   } else if (href) {
     return (
-      <Link href={href}>
-        <a
-          className={badgeStyle.join(' ')}
-          ref={ref as React.Ref<HTMLAnchorElement>}
-        >
-          {children}
-        </a>
+      <Link
+        href={href}
+        className={badgeStyle.join(' ')}
+        ref={ref as React.Ref<HTMLAnchorElement>}
+      >
+        {children}
       </Link>
     );
   } else {

src/components/Common/ImageFader/index.tsx

@@ -64,8 +64,8 @@ const ImageFader: ForwardRefRenderFunction<HTMLDivElement, ImageFaderProps> = (
             className="absolute inset-0 h-full w-full"
             alt=""
             src={imageUrl}
-            layout="fill"
-            objectFit="cover"
+            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+            fill
             {...overrides}
           />
           <div

src/components/Common/Modal/index.tsx

@@ -125,8 +125,8 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
               <CachedImage
                 alt=""
                 src={backdrop}
-                layout="fill"
-                objectFit="cover"
+                style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+                fill
                 priority
               />
               <div

src/components/Common/SettingsTabs/index.tsx

@@ -55,15 +55,14 @@ const SettingsLink = ({
   }
 
   return (
-    <Link href={route}>
-      <a
-        className={`${linkClasses} ${
-          currentPath.match(regex) ? activeLinkColor : inactiveLinkColor
-        }`}
-        aria-current="page"
-      >
-        {children}
-      </a>
+    <Link
+      href={route}
+      className={`${linkClasses} ${
+        currentPath.match(regex) ? activeLinkColor : inactiveLinkColor
+      }`}
+      aria-current="page"
+    >
+      {children}
     </Link>
   );
 };

src/components/CompanyCard/index.tsx

@@ -12,40 +12,39 @@ const CompanyCard = ({ image, url, name }: CompanyCardProps) => {
   const [isHovered, setHovered] = useState(false);
 
   return (
-    <Link href={url}>
-      <a
-        className={`relative flex h-32 w-56 transform-gpu cursor-pointer items-center justify-center p-8 shadow ring-1 transition duration-300 ease-in-out sm:h-36 sm:w-72 ${
-          isHovered
-            ? 'scale-105 bg-gray-700 ring-gray-500'
-            : 'scale-100 bg-gray-800 ring-gray-700'
-        } rounded-xl`}
-        onMouseEnter={() => {
+    <Link
+      href={url}
+      className={`relative flex h-32 w-56 transform-gpu cursor-pointer items-center justify-center p-8 shadow ring-1 transition duration-300 ease-in-out sm:h-36 sm:w-72 ${
+        isHovered
+          ? 'scale-105 bg-gray-700 ring-gray-500'
+          : 'scale-100 bg-gray-800 ring-gray-700'
+      } rounded-xl`}
+      onMouseEnter={() => {
+        setHovered(true);
+      }}
+      onMouseLeave={() => setHovered(false)}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter') {
           setHovered(true);
-        }}
-        onMouseLeave={() => setHovered(false)}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter') {
-            setHovered(true);
-          }
-        }}
-        role="link"
-        tabIndex={0}
-      >
-        <div className="relative h-full w-full">
-          <CachedImage
-            src={image}
-            alt={name}
-            className="relative z-40 h-full w-full"
-            layout="fill"
-            objectFit="contain"
-          />
-        </div>
-        <div
-          className={`absolute bottom-0 left-0 right-0 z-0 h-12 rounded-b-xl bg-gradient-to-t ${
-            isHovered ? 'from-gray-800' : 'from-gray-900'
-          }`}
+        }
+      }}
+      role="link"
+      tabIndex={0}
+    >
+      <div className="relative h-full w-full">
+        <CachedImage
+          src={image}
+          alt={name}
+          className="relative z-40 h-full w-full"
+          style={{ width: '100%', height: '100%', objectFit: 'contain' }}
+          fill
         />
-      </a>
+      </div>
+      <div
+        className={`absolute bottom-0 left-0 right-0 z-0 h-12 rounded-b-xl bg-gradient-to-t ${
+          isHovered ? 'from-gray-800' : 'from-gray-900'
+        }`}
+      />
     </Link>
   );
 };

src/components/Discover/CreateSlider/index.tsx

@@ -4,6 +4,7 @@ import { sliderTitles } from '@app/components/Discover/constants';
 import MediaSlider from '@app/components/MediaSlider';
 import { WatchProviderSelector } from '@app/components/Selector';
 import { encodeURIExtraParams } from '@app/hooks/useDiscover';
+import defineMessages from '@app/utils/defineMessages';
 import type {
   TmdbCompanySearchResponse,
   TmdbGenre,
@@ -16,12 +17,12 @@ import type { Keyword, ProductionCompany } from '@server/models/common';
 import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useCallback, useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import AsyncSelect from 'react-select/async';
 import { useToasts } from 'react-toast-notifications';
 import * as Yup from 'yup';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.CreateSlider', {
   addSlider: 'Add Slider',
   editSlider: 'Edit Slider',
   slidernameplaceholder: 'Slider Name',

src/components/Discover/DiscoverMovieGenre/index.tsx

@@ -4,11 +4,12 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { MovieResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverMovieGenre', {
   genreMovies: '{genre} Movies',
 });
 

src/components/Discover/DiscoverMovieKeyword/index.tsx

@@ -4,12 +4,13 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover, { encodeURIExtraParams } from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
 import type { MovieResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverMovieKeyword', {
   keywordMovies: '{keywordTitle} Movies',
 });
 

src/components/Discover/DiscoverMovieLanguage/index.tsx

@@ -4,11 +4,12 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { MovieResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverMovieLanguage', {
   languageMovies: '{language} Movies',
 });
 

src/components/Discover/DiscoverMovies/index.tsx

@@ -11,14 +11,15 @@ import FilterSlideover from '@app/components/Discover/FilterSlideover';
 import useDiscover from '@app/hooks/useDiscover';
 import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import { BarsArrowDownIcon, FunnelIcon } from '@heroicons/react/24/solid';
 import type { SortOptions as TMDBSortOptions } from '@server/api/themoviedb';
 import type { MovieResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverMovies', {
   discovermovies: 'Movies',
   activefilters:
     '{count, plural, one {# Active Filter} other {# Active Filters}}',

src/components/Discover/DiscoverNetwork/index.tsx

@@ -4,12 +4,14 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { TvNetwork } from '@server/models/common';
 import type { TvResult } from '@server/models/Search';
+import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverNetwork', {
   networkSeries: '{network} Series',
 });
 
@@ -47,10 +49,11 @@ const DiscoverTvNetwork = () => {
         <Header>
           {firstResultData?.network.logoPath ? (
             <div className="mb-6 flex justify-center">
-              <img
+              <Image
                 src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
                 alt={firstResultData.network.name}
                 className="max-h-24 sm:max-h-32"
+                fill
               />
             </div>
           ) : (

src/components/Discover/DiscoverSliderEdit/index.tsx

@@ -8,6 +8,7 @@ import CreateSlider from '@app/components/Discover/CreateSlider';
 import GenreTag from '@app/components/GenreTag';
 import KeywordTag from '@app/components/KeywordTag';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { MagnifyingGlassIcon } from '@heroicons/react/24/outline';
 import {
   ArrowUturnLeftIcon,
@@ -22,10 +23,10 @@ import type DiscoverSlider from '@server/entity/DiscoverSlider';
 import axios from 'axios';
 import { useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-aria';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverSliderEdit', {
   deletesuccess: 'Sucessfully deleted slider.',
   deletefail: 'Failed to delete slider.',
   remove: 'Remove',

src/components/Discover/DiscoverStudio/index.tsx

@@ -4,12 +4,14 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { ProductionCompany } from '@server/models/common';
 import type { MovieResult } from '@server/models/Search';
+import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverStudio', {
   studioMovies: '{studio} Movies',
 });
 
@@ -47,10 +49,11 @@ const DiscoverMovieStudio = () => {
         <Header>
           {firstResultData?.studio.logoPath ? (
             <div className="mb-6 flex justify-center">
-              <img
+              <Image
                 src={`//image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
                 alt={firstResultData.studio.name}
                 className="max-h-24 sm:max-h-32"
+                fill
               />
             </div>
           ) : (

src/components/Discover/DiscoverTv/index.tsx

@@ -11,14 +11,15 @@ import FilterSlideover from '@app/components/Discover/FilterSlideover';
 import useDiscover from '@app/hooks/useDiscover';
 import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import { BarsArrowDownIcon, FunnelIcon } from '@heroicons/react/24/solid';
 import type { SortOptions as TMDBSortOptions } from '@server/api/themoviedb';
 import type { TvResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverTv', {
   discovertv: 'Series',
   activefilters:
     '{count, plural, one {# Active Filter} other {# Active Filters}}',

src/components/Discover/DiscoverTvGenre/index.tsx

@@ -4,11 +4,12 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { TvResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverTvGenre', {
   genreSeries: '{genre} Series',
 });
 

src/components/Discover/DiscoverTvKeyword/index.tsx

@@ -4,12 +4,13 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover, { encodeURIExtraParams } from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
 import type { TvResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverTvKeyword', {
   keywordSeries: '{keywordTitle} Series',
 });
 

src/components/Discover/DiscoverTvLanguage/index.tsx

@@ -4,11 +4,12 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { TvResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverTvLanguage', {
   languageSeries: '{language} Series',
 });
 

src/components/Discover/DiscoverTvUpcoming.tsx

@@ -3,12 +3,11 @@ import ListView from '@app/components/Common/ListView';
 import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { TvResult } from '@server/models/Search';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
-  upcomingtv: 'Upcoming Series',
-});
+const messages = defineMessages('components.DiscoverTvUpcoming', {});
 
 const DiscoverTvUpcoming = () => {
   const intl = useIntl();

src/components/Discover/DiscoverWatchlist/index.tsx

@@ -4,12 +4,13 @@ import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import { useUser } from '@app/hooks/useUser';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.DiscoverWatchlist', {
   discoverwatchlist: 'Your Watchlist',
   watchlist: 'Plex Watchlist',
 });
@@ -58,8 +59,8 @@ const DiscoverWatchlist = () => {
         <Header
           subtext={
             router.query.userId ? (
-              <Link href={`/users/${user?.id}`}>
-                <a className="hover:underline">{user?.displayName}</a>
+              <Link href={`/users/${user?.id}`} className="hover:underline">
+                {user?.displayName}
               </Link>
             ) : (
               ''

src/components/Discover/FilterSlideover/index.tsx

@@ -15,11 +15,12 @@ import {
   useBatchUpdateQueryParams,
   useUpdateQueryParams,
 } from '@app/hooks/useUpdateQueryParams';
+import defineMessages from '@app/utils/defineMessages';
 import { XCircleIcon } from '@heroicons/react/24/outline';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import Datepicker from 'react-tailwindcss-datepicker-sct';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.FilterSlideover', {
   filters: 'Filters',
   activefilters:
     '{count, plural, one {# Active Filter} other {# Active Filters}}',

src/components/Discover/MovieGenreList/index.tsx

@@ -4,11 +4,12 @@ import PageTitle from '@app/components/Common/PageTitle';
 import { genreColorMap } from '@app/components/Discover/constants';
 import GenreCard from '@app/components/GenreCard';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.MovieGenreList', {
   moviegenres: 'Movie Genres',
 });
 

src/components/Discover/MovieGenreSlider/index.tsx

@@ -1,14 +1,15 @@
 import { genreColorMap } from '@app/components/Discover/constants';
 import GenreCard from '@app/components/GenreCard';
 import Slider from '@app/components/Slider';
+import defineMessages from '@app/utils/defineMessages';
 import { ArrowRightCircleIcon } from '@heroicons/react/24/outline';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
 import Link from 'next/link';
 import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.MovieGenreSlider', {
   moviegenres: 'Movie Genres',
 });
 
@@ -25,11 +26,9 @@ const MovieGenreSlider = () => {
   return (
     <>
       <div className="slider-header">
-        <Link href="/discover/movies/genres">
-          <a className="slider-title">
-            <span>{intl.formatMessage(messages.moviegenres)}</span>
-            <ArrowRightCircleIcon />
-          </a>
+        <Link href="/discover/movies/genres" className="slider-title">
+          <span>{intl.formatMessage(messages.moviegenres)}</span>
+          <ArrowRightCircleIcon />
         </Link>
       </div>
       <Slider

src/components/Discover/NetworkSlider/index.tsx

@@ -1,8 +1,9 @@
 import CompanyCard from '@app/components/CompanyCard';
 import Slider from '@app/components/Slider';
-import { defineMessages, useIntl } from 'react-intl';
+import defineMessages from '@app/utils/defineMessages';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.NetworkSlider', {
   networks: 'Networks',
 });
 

src/components/Discover/PlexWatchlistSlider/index.tsx

@@ -1,13 +1,14 @@
 import Slider from '@app/components/Slider';
 import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
 import { useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import { ArrowRightCircleIcon } from '@heroicons/react/24/outline';
 import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
 import Link from 'next/link';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.PlexWatchlistSlider', {
   plexwatchlist: 'Your Watchlist',
   emptywatchlist:
     'Media added to your <PlexWatchlistSupportLink>Plex Watchlist</PlexWatchlistSupportLink> will appear here.',
@@ -39,11 +40,9 @@ const PlexWatchlistSlider = () => {
   return (
     <>
       <div className="slider-header">
-        <Link href="/discover/watchlist">
-          <a className="slider-title">
-            <span>{intl.formatMessage(messages.plexwatchlist)}</span>
-            <ArrowRightCircleIcon />
-          </a>
+        <Link href="/discover/watchlist" className="slider-title">
+          <span>{intl.formatMessage(messages.plexwatchlist)}</span>
+          <ArrowRightCircleIcon />
         </Link>
       </div>
       <Slider

src/components/Discover/RecentRequestsSlider/index.tsx

@@ -24,11 +24,9 @@ const RecentRequestsSlider = () => {
   return (
     <>
       <div className="slider-header">
-        <Link href="/requests?filter=all">
-          <a className="slider-title">
-            <span>{intl.formatMessage(sliderTitles.recentrequests)}</span>
-            <ArrowRightCircleIcon />
-          </a>
+        <Link href="/requests?filter=all" className="slider-title">
+          <span>{intl.formatMessage(sliderTitles.recentrequests)}</span>
+          <ArrowRightCircleIcon />
         </Link>
       </div>
       <Slider

src/components/Discover/RecentlyAddedSlider/index.tsx

@@ -1,11 +1,12 @@
 import Slider from '@app/components/Slider';
 import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
 import { Permission, useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import type { MediaResultsResponse } from '@server/interfaces/api/mediaInterfaces';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.RecentlyAddedSlider', {
   recentlyAdded: 'Recently Added',
 });
 

src/components/Discover/StudioSlider/index.tsx

@@ -1,8 +1,9 @@
 import CompanyCard from '@app/components/CompanyCard';
 import Slider from '@app/components/Slider';
-import { defineMessages, useIntl } from 'react-intl';
+import defineMessages from '@app/utils/defineMessages';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.StudioSlider', {
   studios: 'Studios',
 });
 

src/components/Discover/Trending.tsx

@@ -3,14 +3,15 @@ import ListView from '@app/components/Common/ListView';
 import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type {
   MovieResult,
   PersonResult,
   TvResult,
 } from '@server/models/Search';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover', {
   trending: 'Trending',
 });
 

src/components/Discover/TvGenreList/index.tsx

@@ -4,11 +4,12 @@ import PageTitle from '@app/components/Common/PageTitle';
 import { genreColorMap } from '@app/components/Discover/constants';
 import GenreCard from '@app/components/GenreCard';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.TvGenreList', {
   seriesgenres: 'Series Genres',
 });
 

src/components/Discover/TvGenreSlider/index.tsx

@@ -1,14 +1,15 @@
 import { genreColorMap } from '@app/components/Discover/constants';
 import GenreCard from '@app/components/GenreCard';
 import Slider from '@app/components/Slider';
+import defineMessages from '@app/utils/defineMessages';
 import { ArrowRightCircleIcon } from '@heroicons/react/24/outline';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
 import Link from 'next/link';
 import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover.TvGenreSlider', {
   tvgenres: 'Series Genres',
 });
 
@@ -25,11 +26,9 @@ const TvGenreSlider = () => {
   return (
     <>
       <div className="slider-header">
-        <Link href="/discover/tv/genres">
-          <a className="slider-title">
-            <span>{intl.formatMessage(messages.tvgenres)}</span>
-            <ArrowRightCircleIcon />
-          </a>
+        <Link href="/discover/tv/genres" className="slider-title">
+          <span>{intl.formatMessage(messages.tvgenres)}</span>
+          <ArrowRightCircleIcon />
         </Link>
       </div>
       <Slider

src/components/Discover/Upcoming.tsx

@@ -3,10 +3,11 @@ import ListView from '@app/components/Common/ListView';
 import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { MovieResult } from '@server/models/Search';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover', {
   upcomingmovies: 'Upcoming Movies',
 });
 

src/components/Discover/constants.ts

@@ -1,5 +1,5 @@
+import defineMessages from '@app/utils/defineMessages';
 import type { ParsedUrlQuery } from 'querystring';
-import { defineMessages } from 'react-intl';
 import { z } from 'zod';
 
 type AvailableColors =
@@ -66,7 +66,7 @@ export const genreColorMap: Record<number, [string, string]> = {
   10768: colorTones.darkred, // War & Politics
 };
 
-export const sliderTitles = defineMessages({
+export const sliderTitles = defineMessages('components.Discover', {
   recentrequests: 'Recent Requests',
   popularmovies: 'Popular Movies',
   populartv: 'Popular Series',

src/components/Discover/index.tsx

@@ -17,6 +17,7 @@ import MediaSlider from '@app/components/MediaSlider';
 import { encodeURIExtraParams } from '@app/hooks/useDiscover';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import {
   ArrowDownOnSquareIcon,
@@ -29,11 +30,11 @@ import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
 import axios from 'axios';
 import { useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Discover', {
   discover: 'Discover',
   emptywatchlist:
     'Media added to your <PlexWatchlistSupportLink>Plex Watchlist</PlexWatchlistSupportLink> will appear here.',

src/components/DownloadBlock/index.tsx

@@ -1,9 +1,10 @@
 import Badge from '@app/components/Common/Badge';
 import { Permission, useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import type { DownloadingItem } from '@server/lib/downloadtracker';
-import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl';
+import { FormattedRelativeTime, useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.DownloadBlock', {
   estimatedtime: 'Estimated {time}',
   formattedTitle: '{title}: Season {seasonNumber} Episode {episodeNumber}',
 });

src/components/GenreCard/index.tsx

@@ -14,37 +14,41 @@ const GenreCard = ({ image, url, name, canExpand = false }: GenreCardProps) => {
   const [isHovered, setHovered] = useState(false);
 
   return (
-    <Link href={url}>
-      <a
-        className={`relative flex h-32 items-center justify-center sm:h-36 ${
-          canExpand ? 'w-full' : 'w-56 sm:w-72'
-        } transform-gpu cursor-pointer p-8 shadow ring-1 transition duration-300 ease-in-out ${
-          isHovered
-            ? 'scale-105 bg-gray-700 bg-opacity-100 ring-gray-500'
-            : 'scale-100 bg-gray-800 bg-opacity-80 ring-gray-700'
-        } overflow-hidden rounded-xl bg-cover bg-center`}
-        onMouseEnter={() => {
+    <Link
+      href={url}
+      className={`relative flex h-32 items-center justify-center sm:h-36 ${
+        canExpand ? 'w-full' : 'w-56 sm:w-72'
+      } transform-gpu cursor-pointer p-8 shadow ring-1 transition duration-300 ease-in-out ${
+        isHovered
+          ? 'scale-105 bg-gray-700 bg-opacity-100 ring-gray-500'
+          : 'scale-100 bg-gray-800 bg-opacity-80 ring-gray-700'
+      } overflow-hidden rounded-xl bg-cover bg-center`}
+      onMouseEnter={() => {
+        setHovered(true);
+      }}
+      onMouseLeave={() => setHovered(false)}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter') {
           setHovered(true);
-        }}
-        onMouseLeave={() => setHovered(false)}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter') {
-            setHovered(true);
-          }
-        }}
-        role="link"
-        tabIndex={0}
-      >
-        <CachedImage src={image} alt="" layout="fill" objectFit="cover" />
-        <div
-          className={`absolute inset-0 z-10 h-full w-full bg-gray-800 transition duration-300 ${
-            isHovered ? 'bg-opacity-10' : 'bg-opacity-30'
-          }`}
-        />
-        <div className="relative z-20 w-full truncate whitespace-normal text-center text-2xl font-bold text-white sm:text-3xl">
-          {name}
-        </div>
-      </a>
+        }
+      }}
+      role="link"
+      tabIndex={0}
+    >
+      <CachedImage
+        src={image}
+        alt=""
+        style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+        fill
+      />
+      <div
+        className={`absolute inset-0 z-10 h-full w-full bg-gray-800 transition duration-300 ${
+          isHovered ? 'bg-opacity-10' : 'bg-opacity-30'
+        }`}
+      />
+      <div className="relative z-20 w-full truncate whitespace-normal text-center text-2xl font-bold text-white sm:text-3xl">
+        {name}
+      </div>
     </Link>
   );
 };

src/components/IssueBlock/index.tsx

@@ -45,10 +45,9 @@ const IssueBlock = ({ issue }: IssueBlockProps) => {
                     ? '/profile'
                     : `/users/${issue.createdBy.id}`
                 }
+                className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
               >
-                <a className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
-                  {issue.createdBy.displayName}
-                </a>
+                {issue.createdBy.displayName}
               </Link>
             </span>
           </div>
@@ -64,7 +63,7 @@ const IssueBlock = ({ issue }: IssueBlockProps) => {
           </div>
         </div>
         <div className="ml-2 flex flex-shrink-0 flex-wrap">
-          <Link href={`/issues/${issue.id}`} passHref>
+          <Link href={`/issues/${issue.id}`} passHref legacyBehavior>
             <Button buttonType="primary" as="a">
               <EyeIcon />
             </Button>

src/components/IssueDetails/IssueComment/index.tsx

@@ -1,18 +1,20 @@
 import Button from '@app/components/Common/Button';
 import Modal from '@app/components/Common/Modal';
 import { Permission, useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
 import type { default as IssueCommentType } from '@server/entity/IssueComment';
 import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
+import Image from 'next/image';
 import Link from 'next/link';
 import { Fragment, useState } from 'react';
-import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl';
+import { FormattedRelativeTime, useIntl } from 'react-intl';
 import ReactMarkdown from 'react-markdown';
 import * as Yup from 'yup';
 
-const messages = defineMessages({
+const messages = defineMessages('components.IssueDetails.IssueComment', {
   postedby: 'Posted {relativeTime} by {username}',
   postedbyedited: 'Posted {relativeTime} by {username} (Edited)',
   delete: 'Delete Comment',
@@ -84,13 +86,13 @@ const IssueComment = ({
         </Modal>
       </Transition>
       <Link href={isActiveUser ? '/profile' : `/users/${comment.user.id}`}>
-        <a>
-          <img
-            src={comment.user.avatar}
-            alt=""
-            className="h-10 w-10 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
-          />
-        </a>
+        <Image
+          src={comment.user.avatar}
+          alt=""
+          className="h-10 w-10 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
+          width={40}
+          height={40}
+        />
       </Link>
       <div className="relative flex-1">
         <div className="w-full rounded-md shadow ring-1 ring-gray-500">
@@ -242,10 +244,9 @@ const IssueComment = ({
                     href={
                       isActiveUser ? '/profile' : `/users/${comment.user.id}`
                     }
+                    className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
                   >
-                    <a className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
-                      {comment.user.displayName}
-                    </a>
+                    {comment.user.displayName}
                   </Link>
                 ),
                 relativeTime: (

src/components/IssueDetails/IssueDescription/index.tsx

@@ -1,14 +1,15 @@
 import Button from '@app/components/Common/Button';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import ReactMarkdown from 'react-markdown';
 
-const messages = defineMessages({
+const messages = defineMessages('components.IssueDetails.IssueDescription', {
   description: 'Description',
   edit: 'Edit Description',
   deleteissue: 'Delete Issue',

src/components/IssueDetails/index.tsx

@@ -12,6 +12,7 @@ import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import {
   ChatBubbleOvalLeftEllipsisIcon,
@@ -29,15 +30,16 @@ import type { TvDetails } from '@server/models/Tv';
 import axios from 'axios';
 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';
 import { useState } from 'react';
-import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl';
+import { FormattedRelativeTime, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 import * as Yup from 'yup';
 
-const messages = defineMessages({
+const messages = defineMessages('components.IssueDetails', {
   openedby: '#{issueId} opened {relativeTime} by {username}',
   closeissue: 'Close Issue',
   closeissueandcomment: 'Close with Comment',
@@ -210,8 +212,8 @@ const IssueDetails = () => {
           <CachedImage
             alt=""
             src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
-            layout="fill"
-            objectFit="cover"
+            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+            fill
             priority
           />
           <div
@@ -232,7 +234,8 @@ const IssueDetails = () => {
                 : '/images/overseerr_poster_not_found.png'
             }
             alt=""
-            layout="responsive"
+            sizes="100vw"
+            style={{ width: '100%', height: 'auto' }}
             width={600}
             height={900}
             priority
@@ -256,8 +259,9 @@ const IssueDetails = () => {
               href={`/${
                 issueData.media.mediaType === MediaType.MOVIE ? 'movie' : 'tv'
               }/${data.id}`}
+              className="hover:underline"
             >
-              <a className="hover:underline">{title}</a>
+              {title}
             </Link>{' '}
             {releaseYear && (
               <span className="media-year">({releaseYear.slice(0, 4)})</span>
@@ -273,17 +277,18 @@ const IssueDetails = () => {
                       ? '/profile'
                       : `/users/${issueData.createdBy.id}`
                   }
+                  className="group ml-1 inline-flex h-full items-center xl:ml-1.5"
                 >
-                  <a className="group ml-1 inline-flex h-full items-center xl:ml-1.5">
-                    <img
-                      className="mr-0.5 h-5 w-5 scale-100 transform-gpu rounded-full object-cover transition duration-300 group-hover:scale-105 xl:mr-1 xl:h-6 xl:w-6"
-                      src={issueData.createdBy.avatar}
-                      alt=""
-                    />
-                    <span className="font-semibold text-gray-100 transition duration-300 group-hover:text-white group-hover:underline">
-                      {issueData.createdBy.displayName}
-                    </span>
-                  </a>
+                  <Image
+                    className="mr-0.5 h-5 w-5 scale-100 transform-gpu rounded-full object-cover transition duration-300 group-hover:scale-105 xl:mr-1 xl:h-6 xl:w-6"
+                    src={issueData.createdBy.avatar}
+                    alt=""
+                    width={20}
+                    height={20}
+                  />
+                  <span className="font-semibold text-gray-100 transition duration-300 group-hover:text-white group-hover:underline">
+                    {issueData.createdBy.displayName}
+                  </span>
                 </Link>
               ),
               relativeTime: (

src/components/IssueList/IssueItem/index.tsx

@@ -4,18 +4,20 @@ import CachedImage from '@app/components/Common/CachedImage';
 import { issueOptions } from '@app/components/IssueModal/constants';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { EyeIcon } from '@heroicons/react/24/solid';
 import { IssueStatus } from '@server/constants/issue';
 import { MediaType } from '@server/constants/media';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useInView } from 'react-intersection-observer';
-import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl';
+import { FormattedRelativeTime, useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.IssueList.IssueItem', {
   openeduserdate: '{date} by {user}',
   seasons: '{seasonCount, plural, one {Season} other {Seasons}}',
   episodes: '{episodeCount, plural, one {Episode} other {Episodes}}',
@@ -113,8 +115,8 @@ const IssueItem = ({ issue }: IssueItemProps) => {
           <CachedImage
             src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
             alt=""
-            layout="fill"
-            objectFit="cover"
+            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+            fill
           />
           <div
             className="absolute inset-0"
@@ -133,21 +135,20 @@ const IssueItem = ({ issue }: IssueItemProps) => {
                 ? `/movie/${issue.media.tmdbId}`
                 : `/tv/${issue.media.tmdbId}`
             }
+            className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105"
           >
-            <a className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105">
-              <CachedImage
-                src={
-                  title.posterPath
-                    ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                    : '/images/overseerr_poster_not_found.png'
-                }
-                alt=""
-                layout="responsive"
-                width={600}
-                height={900}
-                objectFit="cover"
-              />
-            </a>
+            <CachedImage
+              src={
+                title.posterPath
+                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
+                  : '/images/overseerr_poster_not_found.png'
+              }
+              alt=""
+              sizes="100vw"
+              style={{ width: '100%', height: 'auto', objectFit: 'cover' }}
+              width={600}
+              height={900}
+            />
           </Link>
           <div className="flex flex-col justify-center overflow-hidden pl-2 xl:pl-4">
             <div className="pt-0.5 text-xs text-white sm:pt-1">
@@ -162,10 +163,9 @@ const IssueItem = ({ issue }: IssueItemProps) => {
                   ? `/movie/${issue.media.tmdbId}`
                   : `/tv/${issue.media.tmdbId}`
               }
+              className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl"
             >
-              <a className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl">
-                {isMovie(title) ? title.title : title.name}
-              </a>
+              {isMovie(title) ? title.title : title.name}
             </Link>
             {problemSeasonEpisodeLine.length > 0 && (
               <div className="card-field">
@@ -222,17 +222,20 @@ const IssueItem = ({ issue }: IssueItemProps) => {
                       />
                     ),
                     user: (
-                      <Link href={`/users/${issue.createdBy.id}`}>
-                        <a className="group flex items-center truncate">
-                          <img
-                            src={issue.createdBy.avatar}
-                            alt=""
-                            className="avatar-sm ml-1.5 object-cover"
-                          />
-                          <span className="truncate text-sm font-semibold group-hover:text-white group-hover:underline">
-                            {issue.createdBy.displayName}
-                          </span>
-                        </a>
+                      <Link
+                        href={`/users/${issue.createdBy.id}`}
+                        className="group flex items-center truncate"
+                      >
+                        <Image
+                          src={issue.createdBy.avatar}
+                          alt=""
+                          className="avatar-sm ml-1.5 object-cover"
+                          width={20}
+                          height={20}
+                        />
+                        <span className="truncate text-sm font-semibold group-hover:text-white group-hover:underline">
+                          {issue.createdBy.displayName}
+                        </span>
                       </Link>
                     ),
                   })}
@@ -259,7 +262,7 @@ const IssueItem = ({ issue }: IssueItemProps) => {
       </div>
       <div className="z-10 mt-4 flex w-full flex-col justify-center pl-4 pr-4 xl:mt-0 xl:w-96 xl:items-end xl:pl-0">
         <span className="w-full">
-          <Link href={`/issues/${issue.id}`} passHref>
+          <Link href={`/issues/${issue.id}`} passHref legacyBehavior>
             <Button as="a" className="w-full" buttonType="primary">
               <EyeIcon />
               <span>{intl.formatMessage(messages.viewissue)}</span>

src/components/IssueList/index.tsx

@@ -5,6 +5,7 @@ import PageTitle from '@app/components/Common/PageTitle';
 import IssueItem from '@app/components/IssueList/IssueItem';
 import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import {
   BarsArrowDownIcon,
   ChevronLeftIcon,
@@ -14,10 +15,10 @@ import {
 import type { IssueResultsResponse } from '@server/interfaces/api/issueInterfaces';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.IssueList', {
   issues: 'Issues',
   sortAdded: 'Most Recent',
   sortModified: 'Last Modified',

src/components/IssueModal/CreateIssueModal/index.tsx

@@ -4,6 +4,7 @@ import { issueOptions } from '@app/components/IssueModal/constants';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { RadioGroup } from '@headlessui/react';
 import { ArrowRightCircleIcon } from '@heroicons/react/24/solid';
 import { MediaStatus } from '@server/constants/media';
@@ -13,12 +14,12 @@ import type { TvDetails } from '@server/models/Tv';
 import axios from 'axios';
 import { Field, Formik } from 'formik';
 import Link from 'next/link';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 import * as Yup from 'yup';
 
-const messages = defineMessages({
+const messages = defineMessages('components.IssueModal.CreateIssueModal', {
   validationMessageRequired: 'You must provide a description',
   whatswrong: "What's wrong?",
   providedetail:
@@ -118,7 +119,7 @@ const CreateIssueModal = ({
                     strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
                   })}
                 </div>
-                <Link href={`/issues/${newIssue.data.id}`}>
+                <Link href={`/issues/${newIssue.data.id}`} legacyBehavior>
                   <Button as="a" className="mt-4">
                     <span>{intl.formatMessage(messages.toastviewissue)}</span>
                     <ArrowRightCircleIcon />

src/components/IssueModal/constants.ts

@@ -1,8 +1,8 @@
+import defineMessages from '@app/utils/defineMessages';
 import { IssueType } from '@server/constants/issue';
 import type { MessageDescriptor } from 'react-intl';
-import { defineMessages } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.IssueModal', {
   issueAudio: 'Audio',
   issueVideo: 'Video',
   issueSubtitles: 'Subtitle',

src/components/LanguageSelector/index.tsx

@@ -1,13 +1,14 @@
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import type { Language } from '@server/lib/settings';
 import { sortBy } from 'lodash';
 import { useMemo } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import type { CSSObjectWithLabel } from 'react-select';
 import Select from 'react-select';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.LanguageSelector', {
   originalLanguageDefault: 'All Languages',
   languageServerDefault: 'Default ({language})',
 });

src/components/Layout/LanguagePicker/index.tsx

@@ -2,12 +2,13 @@ import type { AvailableLocale } from '@app/context/LanguageContext';
 import { availableLanguages } from '@app/context/LanguageContext';
 import useClickOutside from '@app/hooks/useClickOutside';
 import useLocale from '@app/hooks/useLocale';
+import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import { LanguageIcon } from '@heroicons/react/24/solid';
 import { useRef, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Layout.LanguagePicker', {
   displaylanguage: 'Display Language',
 });
 

src/components/Layout/MobileMenu/index.tsx

@@ -142,25 +142,25 @@ const MobileMenu = () => {
         {filteredLinks.map((link) => {
           const isActive = router.pathname.match(link.activeRegExp);
           return (
-            <Link key={`mobile-menu-link-${link.href}`} href={link.href}>
-              <a
-                className={`flex items-center space-x-2 ${
-                  isActive ? 'text-indigo-500' : ''
-                }`}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter') {
-                    setIsOpen(false);
-                  }
-                }}
-                onClick={() => setIsOpen(false)}
-                role="button"
-                tabIndex={0}
-              >
-                {cloneElement(isActive ? link.svgIconSelected : link.svgIcon, {
-                  className: 'h-5 w-5',
-                })}
-                <span>{link.content}</span>
-              </a>
+            <Link
+              key={`mobile-menu-link-${link.href}`}
+              href={link.href}
+              className={`flex items-center space-x-2 ${
+                isActive ? 'text-indigo-500' : ''
+              }`}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  setIsOpen(false);
+                }
+              }}
+              onClick={() => setIsOpen(false)}
+              role="button"
+              tabIndex={0}
+            >
+              {cloneElement(isActive ? link.svgIconSelected : link.svgIcon, {
+                className: 'h-5 w-5',
+              })}
+              <span>{link.content}</span>
             </Link>
           );
         })}
@@ -173,19 +173,19 @@ const MobileMenu = () => {
               const isActive =
                 router.pathname.match(link.activeRegExp) && !isOpen;
               return (
-                <Link key={`mobile-menu-link-${link.href}`} href={link.href}>
-                  <a
-                    className={`flex flex-col items-center space-y-1 ${
-                      isActive ? 'text-indigo-500' : ''
-                    }`}
-                  >
-                    {cloneElement(
-                      isActive ? link.svgIconSelected : link.svgIcon,
-                      {
-                        className: 'h-6 w-6',
-                      }
-                    )}
-                  </a>
+                <Link
+                  key={`mobile-menu-link-${link.href}`}
+                  href={link.href}
+                  className={`flex flex-col items-center space-y-1 ${
+                    isActive ? 'text-indigo-500' : ''
+                  }`}
+                >
+                  {cloneElement(
+                    isActive ? link.svgIconSelected : link.svgIcon,
+                    {
+                      className: 'h-6 w-6',
+                    }
+                  )}
                 </Link>
               );
             })}

src/components/Layout/SearchInput/index.tsx

@@ -1,9 +1,10 @@
 import useSearchInput from '@app/hooks/useSearchInput';
+import defineMessages from '@app/utils/defineMessages';
 import { XCircleIcon } from '@heroicons/react/24/outline';
 import { MagnifyingGlassIcon } from '@heroicons/react/24/solid';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Layout.SearchInput', {
   searchPlaceholder: 'Search Movies & TV',
 });
 

src/components/Layout/Sidebar/index.tsx

@@ -2,6 +2,7 @@ import UserWarnings from '@app/components/Layout/UserWarnings';
 import VersionStatus from '@app/components/Layout/VersionStatus';
 import useClickOutside from '@app/hooks/useClickOutside';
 import { Permission, useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import {
   ClockIcon,
@@ -13,12 +14,13 @@ import {
   UsersIcon,
   XMarkIcon,
 } from '@heroicons/react/24/outline';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { Fragment, useRef } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-export const menuMessages = defineMessages({
+export const menuMessages = defineMessages('components.Layout.Sidebar', {
   dashboard: 'Discover',
   browsemovies: 'Movies',
   browsetv: 'Series',
@@ -146,16 +148,16 @@ const Sidebar = ({ open, setClosed }: SidebarProps) => {
                   </div>
                   <div
                     ref={navRef}
-                    className="flex flex-1 flex-col overflow-y-auto pt-8 pb-8 sm:pb-4"
+                    className="flex flex-1 flex-col overflow-y-auto pt-4 pb-8 sm:pb-4"
                   >
                     <div className="flex flex-shrink-0 items-center px-2">
-                      <span className="px-4 text-xl text-gray-50">
-                        <a href="/">
-                          <img src="/logo_full.svg" alt="Logo" />
-                        </a>
+                      <span className="w-full px-4 text-xl text-gray-50">
+                        <Link href="/" className="relative block h-24 w-64">
+                          <Image src="/logo_full.svg" alt="Logo" fill />
+                        </Link>
                       </span>
                     </div>
-                    <nav className="mt-16 flex-1 space-y-4 px-4">
+                    <nav className="mt-10 flex-1 space-y-4 px-4">
                       {SidebarLinks.filter((link) =>
                         link.requiredPermission
                           ? hasPermission(link.requiredPermission, {
@@ -168,32 +170,27 @@ const Sidebar = ({ open, setClosed }: SidebarProps) => {
                             key={`mobile-${sidebarLink.messagesKey}`}
                             href={sidebarLink.href}
                             as={sidebarLink.as}
+                            onClick={() => setClosed()}
+                            onKeyDown={(e) => {
+                              if (e.key === 'Enter') {
+                                setClosed();
+                              }
+                            }}
+                            role="button"
+                            tabIndex={0}
+                            className={`flex items-center rounded-md px-2 py-2 text-base font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none
+                            ${
+                              router.pathname.match(sidebarLink.activeRegExp)
+                                ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
+                                : 'hover:bg-gray-700 focus:bg-gray-700'
+                            }
+                          `}
+                            data-testid={`${sidebarLink.dataTestId}-mobile`}
                           >
-                            <a
-                              onClick={() => setClosed()}
-                              onKeyDown={(e) => {
-                                if (e.key === 'Enter') {
-                                  setClosed();
-                                }
-                              }}
-                              role="button"
-                              tabIndex={0}
-                              className={`flex items-center rounded-md px-2 py-2 text-base font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none
-                                ${
-                                  router.pathname.match(
-                                    sidebarLink.activeRegExp
-                                  )
-                                    ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
-                                    : 'hover:bg-gray-700 focus:bg-gray-700'
-                                }
-                              `}
-                              data-testid={`${sidebarLink.dataTestId}-mobile`}
-                            >
-                              {sidebarLink.svgIcon}
-                              {intl.formatMessage(
-                                menuMessages[sidebarLink.messagesKey]
-                              )}
-                            </a>
+                            {sidebarLink.svgIcon}
+                            {intl.formatMessage(
+                              menuMessages[sidebarLink.messagesKey]
+                            )}
                           </Link>
                         );
                       })}
@@ -221,15 +218,15 @@ const Sidebar = ({ open, setClosed }: SidebarProps) => {
       <div className="fixed top-0 bottom-0 left-0 z-30 hidden lg:flex lg:flex-shrink-0">
         <div className="sidebar flex w-64 flex-col">
           <div className="flex h-0 flex-1 flex-col">
-            <div className="flex flex-1 flex-col overflow-y-auto pt-8 pb-4">
+            <div className="flex flex-1 flex-col overflow-y-auto pb-4">
               <div className="flex flex-shrink-0 items-center">
-                <span className="px-4 text-2xl text-gray-50">
-                  <a href="/">
-                    <img src="/logo_full.svg" alt="Logo" />
-                  </a>
+                <span className="w-full px-4 py-2 text-2xl text-gray-50">
+                  <Link href="/" className="relative block h-24">
+                    <Image src="/logo_full.svg" alt="Logo" fill />
+                  </Link>
                 </span>
               </div>
-              <nav className="mt-16 flex-1 space-y-4 px-4">
+              <nav className="mt-8 flex-1 space-y-4 px-4">
                 {SidebarLinks.filter((link) =>
                   link.requiredPermission
                     ? hasPermission(link.requiredPermission, {
@@ -242,24 +239,19 @@ const Sidebar = ({ open, setClosed }: SidebarProps) => {
                       key={`desktop-${sidebarLink.messagesKey}`}
                       href={sidebarLink.href}
                       as={sidebarLink.as}
+                      className={`group flex items-center rounded-md px-2 py-2 text-lg font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none
+                            ${
+                              router.pathname.match(sidebarLink.activeRegExp)
+                                ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
+                                : 'hover:bg-gray-700 focus:bg-gray-700'
+                            }
+                          `}
+                      data-testid={sidebarLink.dataTestId}
                     >
-                      <a
-                        className={`group flex items-center rounded-md px-2 py-2 text-lg font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none
-                                ${
-                                  router.pathname.match(
-                                    sidebarLink.activeRegExp
-                                  )
-                                    ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
-                                    : 'hover:bg-gray-700 focus:bg-gray-700'
-                                }
-                              `}
-                        data-testid={sidebarLink.dataTestId}
-                      >
-                        {sidebarLink.svgIcon}
-                        {intl.formatMessage(
-                          menuMessages[sidebarLink.messagesKey]
-                        )}
-                      </a>
+                      {sidebarLink.svgIcon}
+                      {intl.formatMessage(
+                        menuMessages[sidebarLink.messagesKey]
+                      )}
                     </Link>
                   );
                 })}

src/components/Layout/UserDropdown/MiniQuotaDisplay/index.tsx

@@ -1,14 +1,18 @@
 import Infinity from '@app/assets/infinity.svg';
 import { SmallLoadingSpinner } from '@app/components/Common/LoadingSpinner';
 import ProgressCircle from '@app/components/Common/ProgressCircle';
+import defineMessages from '@app/utils/defineMessages';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
-  movierequests: 'Movie Requests',
-  seriesrequests: 'Series Requests',
-});
+const messages = defineMessages(
+  'components.Layout.UserDropdown.MiniQuotaDisplay',
+  {
+    movierequests: 'Movie Requests',
+    seriesrequests: 'Series Requests',
+  }
+);
 
 type MiniQuotaDisplayProps = {
   userId: number;

src/components/Layout/UserDropdown/index.tsx

@@ -1,5 +1,6 @@
 import MiniQuotaDisplay from '@app/components/Layout/UserDropdown/MiniQuotaDisplay';
 import { useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import {
   ArrowRightOnRectangleIcon,
@@ -7,12 +8,13 @@ import {
 } from '@heroicons/react/24/outline';
 import { CogIcon, UserIcon } from '@heroicons/react/24/solid';
 import axios from 'axios';
+import Image from 'next/image';
 import type { LinkProps } from 'next/link';
 import Link from 'next/link';
 import { forwardRef, Fragment } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Layout.UserDropdown', {
   myprofile: 'Profile',
   settings: 'Settings',
   requests: 'Requests',
@@ -24,10 +26,8 @@ const ForwardedLink = forwardRef<
   LinkProps & React.ComponentPropsWithoutRef<'a'>
 >(({ href, children, ...rest }, ref) => {
   return (
-    <Link href={href}>
-      <a ref={ref} {...rest}>
-        {children}
-      </a>
+    <Link href={href} ref={ref} {...rest}>
+      {children}
     </Link>
   );
 });
@@ -53,10 +53,12 @@ const UserDropdown = () => {
           className="flex max-w-xs items-center rounded-full text-sm ring-1 ring-gray-700 hover:ring-gray-500 focus:outline-none focus:ring-gray-500"
           data-testid="user-menu"
         >
-          <img
+          <Image
             className="h-8 w-8 rounded-full object-cover sm:h-10 sm:w-10"
-            src={user?.avatar}
+            src={user?.avatar || ''}
             alt=""
+            width={40}
+            height={40}
           />
         </Menu.Button>
       </div>
@@ -74,10 +76,12 @@ const UserDropdown = () => {
           <div className="divide-y divide-gray-700 rounded-md bg-gray-800 bg-opacity-80 ring-1 ring-gray-700 backdrop-blur">
             <div className="flex flex-col space-y-4 px-4 py-4">
               <div className="flex items-center space-x-2">
-                <img
+                <Image
                   className="h-8 w-8 rounded-full object-cover sm:h-10 sm:w-10"
-                  src={user?.avatar}
+                  src={user?.avatar || ''}
                   alt=""
+                  width={40}
+                  height={40}
                 />
                 <div className="flex min-w-0 flex-col">
                   <span className="truncate text-xl font-semibold text-gray-200">

src/components/Layout/UserWarnings/index.tsx

@@ -1,10 +1,10 @@
 import { useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import { ExclamationTriangleIcon } from '@heroicons/react/24/outline';
 import Link from 'next/link';
-import type React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Layout.UserWarnings', {
   emailRequired: 'An email address is required.',
   emailInvalid: 'Email address is invalid.',
   passwordRequired: 'A password is required.',
@@ -37,24 +37,23 @@ const UserWarnings: React.FC<UserWarningsProps> = ({ onClick }) => {
       }
 
       res = (
-        <Link href={link}>
-          <a
-            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>
-          </a>
+        <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>
       );
     });

src/components/Layout/VersionStatus/index.tsx

@@ -1,3 +1,4 @@
+import defineMessages from '@app/utils/defineMessages';
 import {
   ArrowUpCircleIcon,
   BeakerIcon,
@@ -6,10 +7,10 @@ import {
 } from '@heroicons/react/24/outline';
 import type { StatusResponse } from '@server/interfaces/api/settingsInterfaces';
 import Link from 'next/link';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Layout.VersionStatus', {
   streamdevelop: 'Jellyseerr Develop',
   streamstable: 'Jellyseerr Stable',
   outofdate: 'Out of Date',
@@ -39,49 +40,48 @@ const VersionStatus = ({ onClick }: VersionStatusProps) => {
       : intl.formatMessage(messages.streamstable);
 
   return (
-    <Link href="/settings/about">
-      <a
-        onClick={onClick}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' && onClick) {
-            onClick();
-          }
-        }}
-        role="button"
-        tabIndex={0}
-        className={`mx-2 flex items-center rounded-lg p-2 text-xs ring-1 ring-gray-700 transition duration-300 ${
-          data.updateAvailable
-            ? 'bg-yellow-500 text-white hover:bg-yellow-400'
-            : 'bg-gray-900 text-gray-300 hover:bg-gray-800'
-        }`}
-      >
-        {data.commitTag === 'local' ? (
-          <CodeBracketIcon className="h-6 w-6" />
-        ) : data.version.startsWith('develop-') ? (
-          <BeakerIcon className="h-6 w-6" />
-        ) : (
-          <ServerIcon 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">{versionStream}</span>
-          <span className="truncate">
-            {data.commitTag === 'local' ? (
-              '(⌐■_■)'
-            ) : data.commitsBehind > 0 ? (
-              intl.formatMessage(messages.commitsbehind, {
-                commitsBehind: data.commitsBehind,
-              })
-            ) : data.commitsBehind === -1 ? (
-              intl.formatMessage(messages.outofdate)
-            ) : (
-              <code className="bg-transparent p-0">
-                {data.version.replace('develop-', '')}
-              </code>
-            )}
-          </span>
-        </div>
-        {data.updateAvailable && <ArrowUpCircleIcon className="h-6 w-6" />}
-      </a>
+    <Link
+      href="/settings/about"
+      onClick={onClick}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter' && onClick) {
+          onClick();
+        }
+      }}
+      role="button"
+      tabIndex={0}
+      className={`mx-2 flex items-center rounded-lg p-2 text-xs ring-1 ring-gray-700 transition duration-300 ${
+        data.updateAvailable
+          ? 'bg-yellow-500 text-white hover:bg-yellow-400'
+          : 'bg-gray-900 text-gray-300 hover:bg-gray-800'
+      }`}
+    >
+      {data.commitTag === 'local' ? (
+        <CodeBracketIcon className="h-6 w-6" />
+      ) : data.version.startsWith('develop-') ? (
+        <BeakerIcon className="h-6 w-6" />
+      ) : (
+        <ServerIcon 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">{versionStream}</span>
+        <span className="truncate">
+          {data.commitTag === 'local' ? (
+            '(⌐■_■)'
+          ) : data.commitsBehind > 0 ? (
+            intl.formatMessage(messages.commitsbehind, {
+              commitsBehind: data.commitsBehind,
+            })
+          ) : data.commitsBehind === -1 ? (
+            intl.formatMessage(messages.outofdate)
+          ) : (
+            <code className="bg-transparent p-0">
+              {data.version.replace('develop-', '')}
+            </code>
+          )}
+        </span>
+      </div>
+      {data.updateAvailable && <ArrowUpCircleIcon className="h-6 w-6" />}
     </Link>
   );
 };

src/components/Login/AddEmailModal.tsx

@@ -1,13 +1,13 @@
 import Modal from '@app/components/Common/Modal';
 import useSettings from '@app/hooks/useSettings';
+import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import axios from 'axios';
 import { Field, Formik } from 'formik';
-import type React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import * as Yup from 'yup';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Login', {
   title: 'Add Email',
   description:
     'Since this is your first time logging into {applicationName}, you are required to add a valid email address.',

src/components/Login/JellyfinLogin.tsx

@@ -1,17 +1,17 @@
 import Button from '@app/components/Common/Button';
 import Tooltip from '@app/components/Common/Tooltip';
 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 axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import getConfig from 'next/config';
-import type React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import * as Yup from 'yup';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Login', {
   username: 'Username',
   password: 'Password',
   hostname: '{mediaServerName} URL',

src/components/Login/LocalLogin.tsx

@@ -1,6 +1,7 @@
 import Button from '@app/components/Common/Button';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
 import useSettings from '@app/hooks/useSettings';
+import defineMessages from '@app/utils/defineMessages';
 import {
   ArrowLeftOnRectangleIcon,
   LifebuoyIcon,
@@ -9,10 +10,10 @@ import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import * as Yup from 'yup';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Login', {
   username: 'Username',
   email: 'Email Address',
   password: 'Password',
@@ -137,7 +138,7 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
                   </span>
                   {passwordResetEnabled && (
                     <span className="inline-flex rounded-md shadow-sm">
-                      <Link href="/resetpassword" passHref>
+                      <Link href="/resetpassword" passHref legacyBehavior>
                         <Button as="a" buttonType="ghost">
                           <LifebuoyIcon />
                           <span>

src/components/Login/index.tsx

@@ -6,18 +6,20 @@ import LocalLogin from '@app/components/Login/LocalLogin';
 import PlexLoginButton from '@app/components/PlexLoginButton';
 import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
+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 axios from 'axios';
 import getConfig from 'next/config';
 import { useRouter } from 'next/dist/client/router';
+import Image from 'next/image';
 import { useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 import JellyfinLogin from './JellyfinLogin';
 
-const messages = defineMessages({
+const messages = defineMessages('components.Login', {
   signin: 'Sign In',
   signinheader: 'Sign in to continue',
   signinwithplex: 'Use your Plex account',
@@ -86,8 +88,10 @@ const Login = () => {
         <LanguagePicker />
       </div>
       <div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md">
-        <img src="/logo_stacked.svg" className="mb-10 max-w-full" alt="Logo" />
-        <h2 className="mt-2 text-center text-3xl font-extrabold leading-9 text-gray-100">
+        <div className="relative h-48 w-full max-w-full">
+          <Image src="/logo_stacked.svg" alt="Logo" fill />
+        </div>
+        <h2 className="mt-12 text-center text-3xl font-extrabold leading-9 text-gray-100">
           {intl.formatMessage(messages.signinheader)}
         </h2>
       </div>

src/components/ManageSlideOver/index.tsx

@@ -8,6 +8,7 @@ import RequestBlock from '@app/components/RequestBlock';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { Bars4Icon, ServerIcon } from '@heroicons/react/24/outline';
 import {
   CheckCircleIcon,
@@ -27,11 +28,12 @@ import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import axios from 'axios';
 import getConfig from 'next/config';
+import Image from 'next/image';
 import Link from 'next/link';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.ManageSlideOver', {
   manageModalTitle: 'Manage {mediaType}',
   manageModalIssues: 'Open Issues',
   manageModalRequests: 'Requests',
@@ -328,19 +330,20 @@ const ManageSlideOver = ({
                                       : `/users/${user.id}`
                                   }
                                   key={`watch-user-${user.id}`}
+                                  className="z-0 mb-1 -mr-2 shrink-0 hover:z-50"
                                 >
-                                  <a className="z-0 mb-1 -mr-2 shrink-0 hover:z-50">
-                                    <Tooltip
-                                      key={`watch-user-${user.id}`}
-                                      content={user.displayName}
-                                    >
-                                      <img
-                                        src={user.avatar}
-                                        alt={user.displayName}
-                                        className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
-                                      />
-                                    </Tooltip>
-                                  </a>
+                                  <Tooltip
+                                    key={`watch-user-${user.id}`}
+                                    content={user.displayName}
+                                  >
+                                    <Image
+                                      src={user.avatar}
+                                      alt={user.displayName}
+                                      className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
+                                      width={32}
+                                      height={32}
+                                    />
+                                  </Tooltip>
                                 </Link>
                               ))}
                             </span>
@@ -488,19 +491,20 @@ const ManageSlideOver = ({
                                       : `/users/${user.id}`
                                   }
                                   key={`watch-user-${user.id}`}
+                                  className="z-0 mb-1 -mr-2 shrink-0 hover:z-50"
                                 >
-                                  <a className="z-0 mb-1 -mr-2 shrink-0 hover:z-50">
-                                    <Tooltip
-                                      key={`watch-user-${user.id}`}
-                                      content={user.displayName}
-                                    >
-                                      <img
-                                        src={user.avatar}
-                                        alt={user.displayName}
-                                        className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
-                                      />
-                                    </Tooltip>
-                                  </a>
+                                  <Tooltip
+                                    key={`watch-user-${user.id}`}
+                                    content={user.displayName}
+                                  >
+                                    <Image
+                                      src={user.avatar}
+                                      alt={user.displayName}
+                                      className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
+                                      width={32}
+                                      height={32}
+                                    />
+                                  </Tooltip>
                                 </Link>
                               ))}
                             </span>

src/components/MediaSlider/ShowMoreCard/index.tsx

@@ -1,11 +1,13 @@
 import TitleCard from '@app/components/TitleCard';
+import defineMessages from '@app/utils/defineMessages';
 import { ArrowRightCircleIcon } from '@heroicons/react/24/solid';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.MediaSlider.ShowMoreCard', {
   seemore: 'See More',
 });
 
@@ -30,79 +32,82 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
   }
 
   return (
-    <Link href={url}>
-      <a
-        className={'w-36 sm:w-36 md:w-44'}
-        onMouseEnter={() => {
+    <Link
+      href={url}
+      className={'w-36 sm:w-36 md:w-44'}
+      onMouseEnter={() => {
+        setHovered(true);
+      }}
+      onMouseLeave={() => setHovered(false)}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter') {
           setHovered(true);
-        }}
-        onMouseLeave={() => setHovered(false)}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter') {
-            setHovered(true);
-          }
-        }}
-        role="link"
-        tabIndex={0}
+        }
+      }}
+      role="link"
+      tabIndex={0}
+    >
+      <div
+        className={`relative w-36 transform-gpu cursor-pointer
+       overflow-hidden rounded-xl text-white shadow-lg ring-1 transition duration-150 ease-in-out sm:w-36 md:w-44 ${
+         isHovered
+           ? 'scale-105 bg-gray-600 ring-gray-500'
+           : 'scale-100 bg-gray-800 ring-gray-700'
+       }`}
       >
-        <div
-          className={`relative w-36 transform-gpu cursor-pointer
-         overflow-hidden rounded-xl text-white shadow-lg ring-1 transition duration-150 ease-in-out sm:w-36 md:w-44 ${
-           isHovered
-             ? 'scale-105 bg-gray-600 ring-gray-500'
-             : 'scale-100 bg-gray-800 ring-gray-700'
-         }`}
-        >
-          <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 flex h-full flex-wrap items-center justify-center opacity-30">
-                {posters[0] && (
-                  <div className="w-1/2 p-1">
-                    <img
-                      src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[0]}`}
-                      alt=""
-                      className="w-full rounded-md"
-                    />
-                  </div>
-                )}
-                {posters[1] && (
-                  <div className="w-1/2 p-1">
-                    <img
-                      src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[1]}`}
-                      alt=""
-                      className="w-full rounded-md"
-                    />
-                  </div>
-                )}
-                {posters[2] && (
-                  <div className="w-1/2 p-1">
-                    <img
-                      src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[2]}`}
-                      alt=""
-                      className="w-full rounded-md"
-                    />
-                  </div>
-                )}
-                {posters[3] && (
-                  <div className="w-1/2 p-1">
-                    <img
-                      src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[3]}`}
-                      alt=""
-                      className="w-full rounded-md"
-                    />
-                  </div>
-                )}
-              </div>
-              <div className="absolute inset-0 z-20 flex flex-col items-center justify-center text-white">
-                <ArrowRightCircleIcon className="w-14" />
-                <div className="mt-2 font-extrabold">
-                  {intl.formatMessage(messages.seemore)}
+        <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 flex h-full flex-wrap items-center justify-center opacity-30">
+              {posters[0] && (
+                <div className="w-1/2 p-1">
+                  <Image
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[0]}`}
+                    alt=""
+                    className="w-full rounded-md"
+                    fill
+                  />
                 </div>
+              )}
+              {posters[1] && (
+                <div className="w-1/2 p-1">
+                  <Image
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[1]}`}
+                    alt=""
+                    className="w-full rounded-md"
+                    fill
+                  />
+                </div>
+              )}
+              {posters[2] && (
+                <div className="w-1/2 p-1">
+                  <Image
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[2]}`}
+                    alt=""
+                    className="w-full rounded-md"
+                    fill
+                  />
+                </div>
+              )}
+              {posters[3] && (
+                <div className="w-1/2 p-1">
+                  <Image
+                    src={`//image.tmdb.org/t/p/w300_and_h450_face${posters[3]}`}
+                    alt=""
+                    className="w-full rounded-md"
+                    fill
+                  />
+                </div>
+              )}
+            </div>
+            <div className="absolute inset-0 z-20 flex flex-col items-center justify-center text-white">
+              <ArrowRightCircleIcon className="w-14" />
+              <div className="mt-2 font-extrabold">
+                {intl.formatMessage(messages.seemore)}
               </div>
             </div>
           </div>
         </div>
-      </a>
+      </div>
     </Link>
   );
 };

src/components/MediaSlider/index.tsx

@@ -152,11 +152,9 @@ const MediaSlider = ({
     <>
       <div className="slider-header">
         {linkUrl ? (
-          <Link href={linkUrl}>
-            <a className="slider-title min-w-0 pr-16">
-              <span className="truncate">{title}</span>
-              <ArrowRightCircleIcon />
-            </a>
+          <Link href={linkUrl} className="slider-title min-w-0 pr-16">
+            <span className="truncate">{title}</span>
+            <ArrowRightCircleIcon />
           </Link>
         ) : (
           <div className="slider-title">

src/components/MovieDetails/MovieCast/index.tsx

@@ -3,13 +3,14 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import PageTitle from '@app/components/Common/PageTitle';
 import PersonCard from '@app/components/PersonCard';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { MovieDetails } from '@server/models/Movie';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.MovieDetails.MovieCast', {
   fullcast: 'Full Cast',
 });
 
@@ -34,8 +35,8 @@ const MovieCast = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            <Link href={`/movie/${data.id}`}>
-              <a className="hover:underline">{data.title}</a>
+            <Link href={`/movie/${data.id}`} className="hover:underline">
+              {data.title}
             </Link>
           }
         >

src/components/MovieDetails/MovieCrew/index.tsx

@@ -3,13 +3,14 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import PageTitle from '@app/components/Common/PageTitle';
 import PersonCard from '@app/components/PersonCard';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { MovieDetails } from '@server/models/Movie';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.MovieDetails.MovieCrew', {
   fullcrew: 'Full Crew',
 });
 
@@ -34,8 +35,8 @@ const MovieCrew = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            <Link href={`/movie/${data.id}`}>
-              <a className="hover:underline">{data.title}</a>
+            <Link href={`/movie/${data.id}`} className="hover:underline">
+              {data.title}
             </Link>
           }
         >

src/components/MovieDetails/MovieRecommendations.tsx

@@ -3,14 +3,15 @@ import ListView from '@app/components/Common/ListView';
 import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { MovieDetails } from '@server/models/Movie';
 import type { MovieResult } from '@server/models/Search';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.MovieDetails', {
   recommendations: 'Recommendations',
 });
 
@@ -44,8 +45,8 @@ const MovieRecommendations = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            <Link href={`/movie/${movieData?.id}`}>
-              <a className="hover:underline">{movieData?.title}</a>
+            <Link href={`/movie/${movieData?.id}`} className="hover:underline">
+              {movieData?.title}
             </Link>
           }
         >

src/components/MovieDetails/MovieSimilar.tsx

@@ -3,14 +3,15 @@ import ListView from '@app/components/Common/ListView';
 import PageTitle from '@app/components/Common/PageTitle';
 import useDiscover from '@app/hooks/useDiscover';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { MovieDetails } from '@server/models/Movie';
 import type { MovieResult } from '@server/models/Search';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.MovieDetails', {
   similar: 'Similar Titles',
 });
 
@@ -42,8 +43,8 @@ const MovieSimilar = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            <Link href={`/movie/${movieData?.id}`}>
-              <a className="hover:underline">{movieData?.title}</a>
+            <Link href={`/movie/${movieData?.id}`} className="hover:underline">
+              {movieData?.title}
             </Link>
           }
         >

src/components/MovieDetails/index.tsx

@@ -27,6 +27,7 @@ import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
+import defineMessages from '@app/utils/defineMessages';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import {
   ArrowRightCircleIcon,
@@ -46,17 +47,17 @@ import { IssueStatus } from '@server/constants/issue';
 import { MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
-import { hasFlag } from 'country-flag-icons';
+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 { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.MovieDetails', {
   originaltitle: 'Original Title',
   releasedate:
     '{releaseCount, plural, one {Release Date} other {Release Dates}}',
@@ -239,8 +240,12 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
     movieAttributes.push(
       data.genres
         .map((g) => (
-          <Link href={`/discover/movies?genre=${g.id}`} key={`genre-${g.id}`}>
-            <a className="hover:underline">{g.name}</a>
+          <Link
+            href={`/discover/movies?genre=${g.id}`}
+            key={`genre-${g.id}`}
+            className="hover:underline"
+          >
+            {g.name}
           </Link>
         ))
         .reduce((prev, curr) => (
@@ -294,8 +299,8 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
           <CachedImage
             alt=""
             src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
-            layout="fill"
-            objectFit="cover"
+            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+            fill
             priority
           />
           <div
@@ -336,7 +341,8 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                 : '/images/overseerr_poster_not_found.png'
             }
             alt=""
-            layout="responsive"
+            sizes="100vw"
+            style={{ width: '100%', height: 'auto' }}
             width={600}
             height={900}
             priority
@@ -483,18 +489,19 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                 {sortedCrew.slice(0, 6).map((person) => (
                   <li key={`crew-${person.job}-${person.id}`}>
                     <span>{person.job}</span>
-                    <Link href={`/person/${person.id}`}>
-                      <a className="crew-name">{person.name}</a>
+                    <Link href={`/person/${person.id}`} className="crew-name">
+                      {person.name}
                     </Link>
                   </li>
                 ))}
               </ul>
               <div className="mt-4 flex justify-end">
-                <Link href={`/movie/${data.id}/crew`}>
-                  <a className="flex items-center text-gray-400 transition duration-300 hover:text-gray-100">
-                    <span>{intl.formatMessage(messages.viewfullcrew)}</span>
-                    <ArrowRightCircleIcon className="ml-1.5 inline-block h-5 w-5" />
-                  </a>
+                <Link
+                  href={`/movie/${data.id}/crew`}
+                  className="flex items-center text-gray-400 transition duration-300 hover:text-gray-100"
+                >
+                  <span>{intl.formatMessage(messages.viewfullcrew)}</span>
+                  <ArrowRightCircleIcon className="ml-1.5 inline-block h-5 w-5" />
                 </Link>
               </div>
             </>
@@ -505,10 +512,9 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                 <Link
                   href={`/discover/movies?keywords=${keyword.id}`}
                   key={`keyword-id-${keyword.id}`}
+                  className="mb-2 mr-2 inline-flex last:mr-0"
                 >
-                  <a className="mb-2 mr-2 inline-flex last:mr-0">
-                    <Tag>{keyword.name}</Tag>
-                  </a>
+                  <Tag>{keyword.name}</Tag>
                 </Link>
               ))}
             </div>
@@ -518,31 +524,33 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
           {data.collection && (
             <div className="mb-6">
               <Link href={`/collection/${data.collection.id}`}>
-                <a>
-                  <div className="group relative z-0 scale-100 transform-gpu cursor-pointer overflow-hidden rounded-lg bg-gray-800 bg-cover bg-center shadow-md ring-1 ring-gray-700 transition duration-300 hover:scale-105 hover:ring-gray-500">
-                    <div className="absolute inset-0 z-0">
-                      <CachedImage
-                        src={`https://image.tmdb.org/t/p/w1440_and_h320_multi_faces/${data.collection.backdropPath}`}
-                        alt=""
-                        layout="fill"
-                        objectFit="cover"
-                      />
-                      <div
-                        className="absolute inset-0"
-                        style={{
-                          backgroundImage:
-                            'linear-gradient(180deg, rgba(31, 41, 55, 0.47) 0%, rgba(31, 41, 55, 0.80) 100%)',
-                        }}
-                      />
-                    </div>
-                    <div className="relative z-10 flex h-full items-center justify-between p-4 text-gray-200 transition duration-300 group-hover:text-white">
-                      <div>{data.collection.name}</div>
-                      <Button buttonSize="sm">
-                        {intl.formatMessage(globalMessages.view)}
-                      </Button>
-                    </div>
+                <div className="group relative z-0 scale-100 transform-gpu cursor-pointer overflow-hidden rounded-lg bg-gray-800 bg-cover bg-center shadow-md ring-1 ring-gray-700 transition duration-300 hover:scale-105 hover:ring-gray-500">
+                  <div className="absolute inset-0 z-0">
+                    <CachedImage
+                      src={`https://image.tmdb.org/t/p/w1440_and_h320_multi_faces/${data.collection.backdropPath}`}
+                      alt=""
+                      style={{
+                        width: '100%',
+                        height: '100%',
+                        objectFit: 'cover',
+                      }}
+                      fill
+                    />
+                    <div
+                      className="absolute inset-0"
+                      style={{
+                        backgroundImage:
+                          'linear-gradient(180deg, rgba(31, 41, 55, 0.47) 0%, rgba(31, 41, 55, 0.80) 100%)',
+                      }}
+                    />
                   </div>
-                </a>
+                  <div className="relative z-10 flex h-full items-center justify-between p-4 text-gray-200 transition duration-300 group-hover:text-white">
+                    <div>{data.collection.name}</div>
+                    <Button buttonSize="sm">
+                      {intl.formatMessage(globalMessages.view)}
+                    </Button>
+                  </div>
+                </div>
               </Link>
             </div>
           )}
@@ -739,15 +747,13 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                   <Link
                     href={`/discover/movies/language/${data.originalLanguage}`}
                   >
-                    <a>
-                      {intl.formatDisplayName(data.originalLanguage, {
-                        type: 'language',
-                        fallback: 'none',
-                      }) ??
-                        data.spokenLanguages.find(
-                          (lng) => lng.iso_639_1 === data.originalLanguage
-                        )?.name}
-                    </a>
+                    {intl.formatDisplayName(data.originalLanguage, {
+                      type: 'language',
+                      fallback: 'none',
+                    }) ??
+                      data.spokenLanguages.find(
+                        (lng) => lng.iso_639_1 === data.originalLanguage
+                      )?.name}
                   </Link>
                 </span>
               </div>
@@ -766,7 +772,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                         className="flex items-center justify-end"
                         key={`prodcountry-${c.iso_3166_1}`}
                       >
-                        {hasFlag(c.iso_3166_1) && (
+                        {countries.includes(c.iso_3166_1) && (
                           <span
                             className={`mr-1.5 text-xs leading-5 flag:${c.iso_3166_1}`}
                           />
@@ -803,8 +809,9 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                         <Link
                           href={`/discover/movies/studio/${s.id}`}
                           key={`studio-${s.id}`}
+                          className="block"
                         >
-                          <a className="block">{s.name}</a>
+                          {s.name}
                         </Link>
                       );
                     })}
@@ -864,11 +871,13 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
       {data.credits.cast.length > 0 && (
         <>
           <div className="slider-header">
-            <Link href="/movie/[movieId]/cast" as={`/movie/${data.id}/cast`}>
-              <a className="slider-title">
-                <span>{intl.formatMessage(messages.cast)}</span>
-                <ArrowRightCircleIcon />
-              </a>
+            <Link
+              href="/movie/[movieId]/cast"
+              as={`/movie/${data.id}/cast`}
+              className="slider-title"
+            >
+              <span>{intl.formatMessage(messages.cast)}</span>
+              <ArrowRightCircleIcon />
             </Link>
           </div>
           <Slider

src/components/NotificationTypeSelector/index.tsx

@@ -2,11 +2,12 @@ import NotificationType from '@app/components/NotificationTypeSelector/Notificat
 import useSettings from '@app/hooks/useSettings';
 import type { User } from '@app/hooks/useUser';
 import { Permission, useUser } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import { sortBy } from 'lodash';
 import { useMemo, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.NotificationTypeSelector', {
   notificationTypes: 'Notification Types',
   mediarequested: 'Request Pending Approval',
   mediarequestedDescription:

src/components/PermissionEdit/index.tsx

@@ -3,10 +3,11 @@ import PermissionOption from '@app/components/PermissionOption';
 import useSettings from '@app/hooks/useSettings';
 import type { User } from '@app/hooks/useUser';
 import { Permission } from '@app/hooks/useUser';
+import defineMessages from '@app/utils/defineMessages';
 import { MediaServerType } from '@server/constants/server';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-export const messages = defineMessages({
+export const messages = defineMessages('components.PermissionEdit', {
   admin: 'Admin',
   adminDescription:
     'Full administrator access. Bypasses all other permission checks.',

src/components/PersonCard/index.tsx

@@ -21,71 +21,72 @@ const PersonCard = ({
   const [isHovered, setHovered] = useState(false);
 
   return (
-    <Link href={`/person/${personId}`}>
-      <a
-        className={canExpand ? 'w-full' : 'w-36 sm:w-36 md:w-44'}
-        onMouseEnter={() => {
+    <Link
+      href={`/person/${personId}`}
+      className={canExpand ? 'w-full' : 'w-36 sm:w-36 md:w-44'}
+      onMouseEnter={() => {
+        setHovered(true);
+      }}
+      onMouseLeave={() => setHovered(false)}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter') {
           setHovered(true);
-        }}
-        onMouseLeave={() => setHovered(false)}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter') {
-            setHovered(true);
-          }
-        }}
-        role="link"
-        tabIndex={0}
+        }
+      }}
+      role="link"
+      tabIndex={0}
+    >
+      <div
+        className={`relative ${
+          canExpand ? 'w-full' : 'w-36 sm:w-36 md:w-44'
+        } transform-gpu cursor-pointer rounded-xl text-white shadow ring-1 transition duration-150 ease-in-out ${
+          isHovered
+            ? 'scale-105 bg-gray-700 ring-gray-500'
+            : 'scale-100 bg-gray-800 ring-gray-700'
+        }`}
       >
-        <div
-          className={`relative ${
-            canExpand ? 'w-full' : 'w-36 sm:w-36 md:w-44'
-          } transform-gpu cursor-pointer rounded-xl text-white shadow ring-1 transition duration-150 ease-in-out ${
-            isHovered
-              ? 'scale-105 bg-gray-700 ring-gray-500'
-              : 'scale-100 bg-gray-800 ring-gray-700'
-          }`}
-        >
-          <div style={{ paddingBottom: '150%' }}>
-            <div className="absolute inset-0 flex h-full w-full flex-col items-center p-2">
-              <div className="relative mt-2 mb-4 flex h-1/2 w-full justify-center">
-                {profilePath ? (
-                  <div className="relative h-full w-3/4 overflow-hidden rounded-full ring-1 ring-gray-700">
-                    <CachedImage
-                      src={`https://image.tmdb.org/t/p/w600_and_h900_bestv2${profilePath}`}
-                      alt=""
-                      layout="fill"
-                      objectFit="cover"
-                    />
-                  </div>
-                ) : (
-                  <UserCircleIcon className="h-full" />
-                )}
-              </div>
-              <div className="w-full truncate text-center font-bold">
-                {name}
-              </div>
-              {subName && (
-                <div
-                  className="overflow-hidden whitespace-normal text-center text-sm text-gray-300"
-                  style={{
-                    WebkitLineClamp: 2,
-                    display: '-webkit-box',
-                    overflow: 'hidden',
-                    WebkitBoxOrient: 'vertical',
-                  }}
-                >
-                  {subName}
+        <div style={{ paddingBottom: '150%' }}>
+          <div className="absolute inset-0 flex h-full w-full flex-col items-center p-2">
+            <div className="relative mt-2 mb-4 flex h-1/2 w-full justify-center">
+              {profilePath ? (
+                <div className="relative h-full w-3/4 overflow-hidden rounded-full ring-1 ring-gray-700">
+                  <CachedImage
+                    src={`https://image.tmdb.org/t/p/w600_and_h900_bestv2${profilePath}`}
+                    alt=""
+                    style={{
+                      width: '100%',
+                      height: '100%',
+                      objectFit: 'cover',
+                    }}
+                    fill
+                  />
                 </div>
+              ) : (
+                <UserCircleIcon className="h-full" />
               )}
-              <div
-                className={`absolute bottom-0 left-0 right-0 h-12 rounded-b-xl bg-gradient-to-t ${
-                  isHovered ? 'from-gray-800' : 'from-gray-900'
-                }`}
-              />
             </div>
+            <div className="w-full truncate text-center font-bold">{name}</div>
+            {subName && (
+              <div
+                className="overflow-hidden whitespace-normal text-center text-sm text-gray-300"
+                style={{
+                  WebkitLineClamp: 2,
+                  display: '-webkit-box',
+                  overflow: 'hidden',
+                  WebkitBoxOrient: 'vertical',
+                }}
+              >
+                {subName}
+              </div>
+            )}
+            <div
+              className={`absolute bottom-0 left-0 right-0 h-12 rounded-b-xl bg-gradient-to-t ${
+                isHovered ? 'from-gray-800' : 'from-gray-900'
+              }`}
+            />
           </div>
         </div>
-      </a>
+      </div>
     </Link>
   );
 };

src/components/PersonDetails/index.tsx

@@ -6,16 +6,17 @@ import PageTitle from '@app/components/Common/PageTitle';
 import TitleCard from '@app/components/TitleCard';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
+import defineMessages from '@app/utils/defineMessages';
 import type { PersonCombinedCreditsResponse } from '@server/interfaces/api/personInterfaces';
 import type { PersonDetails as PersonDetailsType } from '@server/models/Person';
 import { groupBy } from 'lodash';
 import { useRouter } from 'next/router';
 import { useMemo, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import TruncateMarkup from 'react-truncate-markup';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.PersonDetails', {
   birthdate: 'Born {birthdate}',
   lifespan: '{birthdate} – {deathdate}',
   alsoknownas: 'Also Known As: {names}',
@@ -228,8 +229,8 @@ const PersonDetails = () => {
             <CachedImage
               src={`https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.profilePath}`}
               alt=""
-              layout="fill"
-              objectFit="cover"
+              style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+              fill
             />
           </div>
         )}

src/components/PlexLoginButton/index.tsx

@@ -1,10 +1,11 @@
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import PlexOAuth from '@app/utils/plex';
 import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
 import { useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.PlexLoginButton', {
   signinwithplex: 'Sign In',
   signingin: 'Signing In…',
 });

src/components/QuotaSelector/index.tsx

@@ -1,7 +1,8 @@
+import defineMessages from '@app/utils/defineMessages';
 import React, { useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.QuotaSelector', {
   movieRequests:
     '{quotaLimit} <quotaUnits>{movies} per {quotaDays} {days}</quotaUnits>',
   tvRequests:

src/components/RegionSelector/index.tsx

@@ -1,15 +1,16 @@
 import useSettings from '@app/hooks/useSettings';
+import defineMessages from '@app/utils/defineMessages';
 import { Listbox, Transition } from '@headlessui/react';
 import { CheckIcon, ChevronDownIcon } from '@heroicons/react/24/solid';
 import type { Region } from '@server/lib/settings';
-import { hasFlag } from 'country-flag-icons';
+import { countries } from 'country-flag-icons';
 import 'country-flag-icons/3x2/flags.css';
 import { sortBy } from 'lodash';
 import { useEffect, useMemo, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.RegionSelector', {
   regionDefault: 'All Regions',
   regionServerDefault: 'Default ({region})',
 });
@@ -92,11 +93,12 @@ const RegionSelector = ({
           <div className="relative">
             <span className="inline-block w-full rounded-md shadow-sm">
               <Listbox.Button className="focus:shadow-outline-blue relative flex w-full cursor-default items-center rounded-md border border-gray-500 bg-gray-700 py-2 pl-3 pr-10 text-left text-white transition duration-150 ease-in-out focus:border-blue-300 focus:outline-none sm:text-sm sm:leading-5">
-                {((selectedRegion && hasFlag(selectedRegion?.iso_3166_1)) ||
+                {((selectedRegion &&
+                  countries.includes(selectedRegion?.iso_3166_1)) ||
                   (isUserSetting &&
                     !selectedRegion &&
                     currentSettings.region &&
-                    hasFlag(currentSettings.region))) && (
+                    countries.includes(currentSettings.region))) && (
                   <span className="mr-2 h-4 overflow-hidden text-base leading-4">
                     <span
                       className={`flag:${
@@ -146,7 +148,7 @@ const RegionSelector = ({
                         <span className="mr-2 text-base">
                           <span
                             className={
-                              hasFlag(currentSettings.region)
+                              countries.includes(currentSettings.region)
                                 ? `flag:${currentSettings.region}`
                                 : 'pr-6'
                             }
@@ -215,7 +217,7 @@ const RegionSelector = ({
                         <span className="mr-2 text-base">
                           <span
                             className={
-                              hasFlag(region.iso_3166_1)
+                              countries.includes(region.iso_3166_1)
                                 ? `flag:${region.iso_3166_1}`
                                 : 'pr-6'
                             }

src/components/RequestBlock/index.tsx

@@ -5,6 +5,7 @@ import RequestModal from '@app/components/RequestModal';
 import useRequestOverride from '@app/hooks/useRequestOverride';
 import { useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import {
   CalendarIcon,
   CheckIcon,
@@ -19,9 +20,9 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.RequestBlock', {
   seasons: '{seasonCount, plural, one {Season} other {Seasons}}',
   requestoverrides: 'Request Overrides',
   server: 'Destination Server',
@@ -101,10 +102,9 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
                       ? '/profile'
                       : `/users/${request.requestedBy.id}`
                   }
+                  className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
                 >
-                  <a className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
-                    {request.requestedBy.displayName}
-                  </a>
+                  {request.requestedBy.displayName}
                 </Link>
               </span>
             </div>
@@ -120,10 +120,9 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
                         ? '/profile'
                         : `/users/${request.modifiedBy.id}`
                     }
+                    className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline"
                   >
-                    <a className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
-                      {request.modifiedBy.displayName}
-                    </a>
+                    {request.modifiedBy.displayName}
                   </Link>
                 </span>
               </div>

src/components/RequestButton/index.tsx

@@ -3,6 +3,7 @@ import RequestModal from '@app/components/RequestModal';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownTrayIcon } from '@heroicons/react/24/outline';
 import {
   CheckIcon,
@@ -14,9 +15,9 @@ import type Media from '@server/entity/Media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import axios from 'axios';
 import { useMemo, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
-const messages = defineMessages({
+const messages = defineMessages('components.RequestButton', {
   viewrequest: 'View Request',
   viewrequest4k: 'View 4K Request',
   requestmore: 'Request More',

src/components/RequestCard/index.tsx

@@ -7,6 +7,7 @@ import StatusBadge from '@app/components/StatusBadge';
 import useDeepLinks from '@app/hooks/useDeepLinks';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import { withProperties } from '@app/utils/typeHelpers';
 import {
@@ -21,14 +22,15 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import axios from 'axios';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import { useInView } from 'react-intersection-observer';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR, { mutate } from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.RequestCard', {
   seasons: '{seasonCount, plural, one {Season} other {Seasons}}',
   failedretry: 'Something went wrong while retrying the request.',
   mediaerror: '{mediaType} Not Found',
@@ -106,17 +108,22 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
                   { type: 'or' }
                 ) && (
                   <div className="card-field !hidden sm:!block">
-                    <Link href={`/users/${requestData.requestedBy.id}`}>
-                      <a className="group flex items-center">
-                        <img
+                    <Link
+                      href={`/users/${requestData.requestedBy.id}`}
+                      className="group flex items-center"
+                    >
+                      <span className="avatar-sm">
+                        <Image
                           src={requestData.requestedBy.avatar}
                           alt=""
-                          className="avatar-sm"
+                          className="avatar-sm object-cover"
+                          width={20}
+                          height={20}
                         />
-                        <span className="truncate group-hover:underline">
-                          {requestData.requestedBy.displayName}
-                        </span>
-                      </a>
+                      </span>
+                      <span className="truncate group-hover:underline">
+                        {requestData.requestedBy.displayName}
+                      </span>
                     </Link>
                   </div>
                 )}
@@ -324,8 +331,8 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
             <CachedImage
               alt=""
               src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
-              layout="fill"
-              objectFit="cover"
+              style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+              fill
             />
             <div
               className="absolute inset-0"
@@ -352,27 +359,31 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
                 ? `/movie/${requestData.media.tmdbId}`
                 : `/tv/${requestData.media.tmdbId}`
             }
+            className="overflow-hidden overflow-ellipsis whitespace-nowrap text-base font-bold text-white hover:underline sm:text-lg"
           >
-            <a className="overflow-hidden overflow-ellipsis whitespace-nowrap text-base font-bold text-white hover:underline sm:text-lg">
-              {isMovie(title) ? title.title : title.name}
-            </a>
+            {isMovie(title) ? title.title : title.name}
           </Link>
           {hasPermission(
             [Permission.MANAGE_REQUESTS, Permission.REQUEST_VIEW],
             { type: 'or' }
           ) && (
             <div className="card-field">
-              <Link href={`/users/${requestData.requestedBy.id}`}>
-                <a className="group flex items-center">
-                  <img
+              <Link
+                href={`/users/${requestData.requestedBy.id}`}
+                className="group flex items-center"
+              >
+                <span className="avatar-sm">
+                  <Image
                     src={requestData.requestedBy.avatar}
                     alt=""
                     className="avatar-sm object-cover"
+                    width={20}
+                    height={20}
                   />
-                  <span className="truncate font-semibold group-hover:text-white group-hover:underline">
-                    {requestData.requestedBy.displayName}
-                  </span>
-                </a>
+                </span>
+                <span className="truncate font-semibold group-hover:text-white group-hover:underline">
+                  {requestData.requestedBy.displayName}
+                </span>
               </Link>
             </div>
           )}
@@ -572,20 +583,20 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
               ? `/movie/${requestData.media.tmdbId}`
               : `/tv/${requestData.media.tmdbId}`
           }
+          className="w-20 flex-shrink-0 scale-100 transform-gpu cursor-pointer overflow-hidden rounded-md shadow-sm transition duration-300 hover:scale-105 hover:shadow-md sm:w-28"
         >
-          <a className="w-20 flex-shrink-0 scale-100 transform-gpu cursor-pointer overflow-hidden rounded-md shadow-sm transition duration-300 hover:scale-105 hover:shadow-md sm:w-28">
-            <CachedImage
-              src={
-                title.posterPath
-                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                  : '/images/overseerr_poster_not_found.png'
-              }
-              alt=""
-              layout="responsive"
-              width={600}
-              height={900}
-            />
-          </a>
+          <CachedImage
+            src={
+              title.posterPath
+                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
+                : '/images/overseerr_poster_not_found.png'
+            }
+            alt=""
+            sizes="100vw"
+            style={{ width: '100%', height: 'auto' }}
+            width={600}
+            height={900}
+          />
         </Link>
       </div>
     </>

src/components/RequestList/RequestItem/index.tsx

@@ -7,6 +7,7 @@ import StatusBadge from '@app/components/StatusBadge';
 import useDeepLinks from '@app/hooks/useDeepLinks';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import {
   ArrowPathIcon,
@@ -20,14 +21,15 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import axios from 'axios';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
-import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl';
+import { FormattedRelativeTime, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.RequestList.RequestItem', {
   seasons: '{seasonCount, plural, one {Season} other {Seasons}}',
   failedretry: 'Something went wrong while retrying the request.',
   requested: 'Requested',
@@ -179,17 +181,22 @@ const RequestItemError = ({
                           />
                         ),
                         user: (
-                          <Link href={`/users/${requestData.requestedBy.id}`}>
-                            <a className="group flex items-center truncate">
-                              <img
+                          <Link
+                            href={`/users/${requestData.requestedBy.id}`}
+                            className="group flex items-center truncate"
+                          >
+                            <span className="avatar-sm ml-1.5">
+                              <Image
                                 src={requestData.requestedBy.avatar}
                                 alt=""
-                                className="avatar-sm ml-1.5"
+                                className="avatar-sm object-cover"
+                                width={20}
+                                height={20}
                               />
-                              <span className="truncate text-sm group-hover:underline">
-                                {requestData.requestedBy.displayName}
-                              </span>
-                            </a>
+                            </span>
+                            <span className="truncate text-sm group-hover:underline">
+                              {requestData.requestedBy.displayName}
+                            </span>
                           </Link>
                         ),
                       })}
@@ -233,17 +240,22 @@ const RequestItemError = ({
                         />
                       ),
                       user: (
-                        <Link href={`/users/${requestData.modifiedBy.id}`}>
-                          <a className="group flex items-center truncate">
-                            <img
+                        <Link
+                          href={`/users/${requestData.modifiedBy.id}`}
+                          className="group flex items-center truncate"
+                        >
+                          <span className="avatar-sm ml-1.5">
+                            <Image
                               src={requestData.modifiedBy.avatar}
                               alt=""
-                              className="avatar-sm ml-1.5"
+                              className="avatar-sm object-cover"
+                              width={20}
+                              height={20}
                             />
-                            <span className="truncate text-sm group-hover:underline">
-                              {requestData.modifiedBy.displayName}
-                            </span>
-                          </a>
+                          </span>
+                          <span className="truncate text-sm group-hover:underline">
+                            {requestData.modifiedBy.displayName}
+                          </span>
                         </Link>
                       ),
                     })}
@@ -381,8 +393,8 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
             <CachedImage
               src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
               alt=""
-              layout="fill"
-              objectFit="cover"
+              style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+              fill
             />
             <div
               className="absolute inset-0"
@@ -401,21 +413,20 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                   ? `/movie/${requestData.media.tmdbId}`
                   : `/tv/${requestData.media.tmdbId}`
               }
+              className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105"
             >
-              <a className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105">
-                <CachedImage
-                  src={
-                    title.posterPath
-                      ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                      : '/images/overseerr_poster_not_found.png'
-                  }
-                  alt=""
-                  layout="responsive"
-                  width={600}
-                  height={900}
-                  objectFit="cover"
-                />
-              </a>
+              <CachedImage
+                src={
+                  title.posterPath
+                    ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
+                    : '/images/overseerr_poster_not_found.png'
+                }
+                alt=""
+                sizes="100vw"
+                style={{ width: '100%', height: 'auto', objectFit: 'cover' }}
+                width={600}
+                height={900}
+              />
             </Link>
             <div className="flex flex-col justify-center overflow-hidden pl-2 xl:pl-4">
               <div className="pt-0.5 text-xs font-medium text-white sm:pt-1">
@@ -430,10 +441,9 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                     ? `/movie/${requestData.media.tmdbId}`
                     : `/tv/${requestData.media.tmdbId}`
                 }
+                className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl"
               >
-                <a className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl">
-                  {isMovie(title) ? title.title : title.name}
-                </a>
+                {isMovie(title) ? title.title : title.name}
               </Link>
               {!isMovie(title) && request.seasons.length > 0 && (
                 <div className="card-field">
@@ -527,17 +537,22 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                         />
                       ),
                       user: (
-                        <Link href={`/users/${requestData.requestedBy.id}`}>
-                          <a className="group flex items-center truncate">
-                            <img
+                        <Link
+                          href={`/users/${requestData.requestedBy.id}`}
+                          className="group flex items-center truncate"
+                        >
+                          <span className="avatar-sm ml-1.5">
+                            <Image
                               src={requestData.requestedBy.avatar}
                               alt=""
-                              className="avatar-sm ml-1.5 object-cover"
+                              className="avatar-sm object-cover"
+                              width={20}
+                              height={20}
                             />
-                            <span className="truncate text-sm font-semibold group-hover:text-white group-hover:underline">
-                              {requestData.requestedBy.displayName}
-                            </span>
-                          </a>
+                          </span>
+                          <span className="truncate text-sm font-semibold group-hover:text-white group-hover:underline">
+                            {requestData.requestedBy.displayName}
+                          </span>
                         </Link>
                       ),
                     })}
@@ -581,17 +596,22 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                       />
                     ),
                     user: (
-                      <Link href={`/users/${requestData.modifiedBy.id}`}>
-                        <a className="group flex items-center truncate">
-                          <img
-                            src={requestData.modifiedBy.avatar}
+                      <Link
+                        href={`/users/${requestData.modifiedBy.id}`}
+                        className="group flex items-center truncate"
+                      >
+                        <span className="avatar-sm ml-1.5">
+                          <Image
+                            src={requestData.requestedBy.avatar}
                             alt=""
-                            className="avatar-sm ml-1.5 object-cover"
+                            className="avatar-sm object-cover"
+                            width={20}
+                            height={20}
                           />
-                          <span className="truncate text-sm font-semibold group-hover:text-white group-hover:underline">
-                            {requestData.modifiedBy.displayName}
-                          </span>
-                        </a>
+                        </span>
+                        <span className="truncate text-sm font-semibold group-hover:text-white group-hover:underline">
+                          {requestData.modifiedBy.displayName}
+                        </span>
                       </Link>
                     ),
                   })}

src/components/RequestList/index.tsx

@@ -6,6 +6,7 @@ import RequestItem from '@app/components/RequestList/RequestItem';
 import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import { useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import {
   BarsArrowDownIcon,
   ChevronLeftIcon,
@@ -16,10 +17,10 @@ import type { RequestResultsResponse } from '@server/interfaces/api/requestInter
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.RequestList', {
   requests: 'Requests',
   showallrequests: 'Show All Requests',
   sortAdded: 'Most Recent',
@@ -122,12 +123,12 @@ const RequestList = () => {
         <Header
           subtext={
             router.pathname.startsWith('/profile') ? (
-              <Link href={`/profile`}>
-                <a className="hover:underline">{currentUser?.displayName}</a>
+              <Link href={`/profile`} className="hover:underline">
+                {currentUser?.displayName}
               </Link>
             ) : router.query.userId ? (
-              <Link href={`/users/${user?.id}`}>
-                <a className="hover:underline">{user?.displayName}</a>
+              <Link href={`/users/${user?.id}`} className="hover:underline">
+                {user?.displayName}
               </Link>
             ) : (
               ''

src/components/RequestModal/AdvancedRequester/index.tsx

@@ -3,6 +3,7 @@ import { SmallLoadingSpinner } from '@app/components/Common/LoadingSpinner';
 import type { User } from '@app/hooks/useUser';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { formatBytes } from '@app/utils/numberHelpers';
 import { Listbox, Transition } from '@headlessui/react';
 import { CheckIcon, ChevronDownIcon } from '@heroicons/react/24/solid';
@@ -13,8 +14,9 @@ import type {
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
 import { hasPermission } from '@server/lib/permissions';
 import { isEqual } from 'lodash';
+import Image from 'next/image';
 import { useEffect, useMemo, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import Select from 'react-select';
 import useSWR from 'swr';
 
@@ -23,7 +25,7 @@ type OptionType = {
   label: string;
 };
 
-const messages = defineMessages({
+const messages = defineMessages('components.RequestModal.AdvancedRequester', {
   advancedoptions: 'Advanced',
   destinationserver: 'Destination Server',
   qualityprofile: 'Quality Profile',
@@ -559,10 +561,12 @@ const AdvancedRequester = ({
                     <span className="inline-block w-full rounded-md shadow-sm">
                       <Listbox.Button className="focus:shadow-outline-blue relative w-full cursor-default rounded-md border border-gray-700 bg-gray-800 py-2 pl-3 pr-10 text-left text-white transition duration-150 ease-in-out focus:border-blue-300 focus:outline-none sm:text-sm sm:leading-5">
                         <span className="flex items-center">
-                          <img
+                          <Image
                             src={selectedUser.avatar}
                             alt=""
                             className="h-6 w-6 flex-shrink-0 rounded-full object-cover"
+                            width={24}
+                            height={24}
                           />
                           <span className="ml-3 block">
                             {selectedUser.displayName}
@@ -609,10 +613,12 @@ const AdvancedRequester = ({
                                     selected ? 'font-semibold' : 'font-normal'
                                   } flex items-center`}
                                 >
-                                  <img
+                                  <Image
                                     src={user.avatar}
                                     alt=""
                                     className="h-6 w-6 flex-shrink-0 rounded-full object-cover"
+                                    width={24}
+                                    height={24}
                                   />
                                   <span className="ml-3 block flex-shrink-0">
                                     {user.displayName}

src/components/RequestModal/CollectionRequestModal.tsx

@@ -7,6 +7,7 @@ import AdvancedRequester from '@app/components/RequestModal/AdvancedRequester';
 import QuotaDisplay from '@app/components/RequestModal/QuotaDisplay';
 import { useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
@@ -14,11 +15,11 @@ import { Permission } from '@server/lib/permissions';
 import type { Collection } from '@server/models/Collection';
 import axios from 'axios';
 import { useCallback, useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
-const messages = defineMessages({
+const messages = defineMessages('components.RequestModal', {
   requestadmin: 'This request will be approved automatically.',
   requestSuccess: '<strong>{title}</strong> requested successfully!',
   requestcollectiontitle: 'Request Collection',
@@ -402,10 +403,14 @@ const CollectionRequestModal = ({
                                   : '/images/overseerr_poster_not_found.png'
                               }
                               alt=""
-                              layout="responsive"
+                              sizes="100vw"
+                              style={{
+                                width: '100%',
+                                height: 'auto',
+                                objectFit: 'cover',
+                              }}
                               width={600}
                               height={900}
-                              objectFit="cover"
                             />
                           </div>
                           <div className="flex flex-col justify-center pl-2">