fixup! Modernize startup and ConfigFileProvider

Support legacy postgres options
Rename configFileProvider
2026-03-17 16:14:46 -04:00 · 2022-06-21 21:05:53 +01:00 · 2022-06-20 21:53:25 +01:00 · 2022-06-20 21:35:11 +01:00 · 2022-06-20 21:35:11 +01:00
317 changed files with 3164 additions and 7971 deletions
--- a/.esprintrc
+++ b/.esprintrc
@@ -1,6 +1,7 @@
 {
  "paths": [
-    "frontend/src/**/*.js"
+    "frontend/src/**/*.js",
+    "src/NzbDrone.Core/Localization/Core/*.json"
  ],
  "ignored": [
    "**/node_modules/**/*"
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms

-github: radarr
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: radarr
 ko_fi: # Replace with a single Ko-fi username
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -5,9 +5,9 @@ body:
 - type: checkboxes
  attributes:
    label: Is there an existing issue for this?
-    description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch. 
+    description: Please search to see if an issue already exists for the bug you encountered.
    options:
-    - label: I have searched the existing open and closed issues
+    - label: I have searched the existing issues
      required: true
 - type: textarea
  attributes:
@@ -42,14 +42,12 @@ body:
        - **Docker Install**: Yes
        - **Using Reverse Proxy**: No
        - **Browser**: Firefox 90 (If UI related)
-        - **Database**: Sqlite 3.36.0
    value: |
        - OS: 
-        - Radarr: 
-        - Docker Install: 
-        - Using Reverse Proxy: 
-        - Browser: 
-        - Database: 
+        - Radarr:
+        - Docker Install:
+        - Using Reverse Proxy:
+        - Browser:
    render: markdown
  validations:
    required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -5,9 +5,9 @@ body:
 - type: checkboxes
  attributes:
    label: Is there an existing issue for this?
-    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
+    description: Please search to see if an issue already exists for the feature you are requesting.
    options:
-    - label: I have searched the existing open and closed issues
+    - label: I have searched the existing issues
      required: true
 - type: textarea
  attributes:
--- a/.github/workflows/azuresync.yml
+++ b/.github/workflows/azuresync.yml
@@ -7,12 +7,8 @@ on:

 concurrency: azuresync-${{ github.event.issue.number }}

-permissions: {}
 jobs:
  alert:
-    permissions:
-      issues: write # to update issue body
-
    runs-on: ubuntu-latest
    steps:
      - uses: danhellem/github-actions-issue-to-work-item@master
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -5,13 +5,8 @@ on:
  schedule:
    - cron: '0 0 * * *'

-permissions: {}
 jobs:
  lock:
-    permissions:
-      issues: write # to lock issues (dessant/lock-threads)
-      pull-requests: write # to lock PRs (dessant/lock-threads)
-
    runs-on: ubuntu-latest
    steps:
      - uses: dessant/lock-threads@v2
--- a/.github/workflows/support.yml
+++ b/.github/workflows/support.yml
@@ -4,12 +4,8 @@ on:
  issues:
    types: [labeled, unlabeled, reopened]

-permissions: {}
 jobs:
  support:
-    permissions:
-      issues: write # to modify issues
-
    runs-on: ubuntu-latest
    steps:
      - uses: dessant/support-requests@v2
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,132 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-<development@radarr.video>.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,13 +9,13 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '4.3.1'
+  majorVersion: '4.2.0'
  minorVersion: $[counter('minorVersion', 2000)]
  radarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(radarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.400'
+  dotnetVersion: '6.0.300'
  nodeVersion: '16.X'
  innoVersion: '6.2.0'
  windowsImage: 'windows-2022'
@@ -173,6 +173,7 @@ stages:
          key: 'yarn | "$(osName)" | yarn.lock'
          restoreKeys: |
             yarn | "$(osName)"
+             yarn
          path: $(yarnCacheFolder)
        displayName: Cache Yarn packages
      - bash: ./build.sh --frontend
@@ -543,13 +544,13 @@ stages:
      variables:
        pattern: 'Radarr.*.linux-core-x64.tar.gz'
        artifactName: linux-x64-tests
-        Radarr__Postgres__Host: 'localhost'
-        Radarr__Postgres__Port: '5432'
-        Radarr__Postgres__User: 'radarr'
-        Radarr__Postgres__Password: 'radarr'
+        Radarr__PostgresHost: 'localhost'
+        Radarr__PostgresPort: '5432'
+        Radarr__PostgresUser: 'radarr'
+        Radarr__PostgresPassword: 'radarr'

      pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'

      timeoutInMinutes: 10
        
@@ -576,7 +577,6 @@ stages:
          -e POSTGRES_PASSWORD=radarr \
          -e POSTGRES_USER=radarr \
          -p 5432:5432/tcp \
-          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
          postgres:14
        displayName: Start postgres
      - bash: |
@@ -681,13 +681,13 @@ stages:
      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
      variables:
        pattern: 'Radarr.*.linux-core-x64.tar.gz'
-        Radarr__Postgres__Host: 'localhost'
-        Radarr__Postgres__Port: '5432'
-        Radarr__Postgres__User: 'radarr'
-        Radarr__Postgres__Password: 'radarr'
+        Radarr__PostgresHost: 'localhost'
+        Radarr__PostgresPort: '5432'
+        Radarr__PostgresUser: 'radarr'
+        Radarr__PostgresPassword: 'radarr'

      pool:
-        vmImage: ${{ variables.linuxImage }}
+        vmImage: 'ubuntu-18.04'

      steps:
        - task: UseDotNet@2
@@ -722,7 +722,6 @@ stages:
            -e POSTGRES_PASSWORD=radarr \
            -e POSTGRES_USER=radarr \
            -p 5432:5432/tcp \
-            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
            postgres:14
          displayName: Start postgres
        - bash: |
@@ -761,7 +760,7 @@ stages:
        inputs:
          buildType: 'current'
          artifactName: Packages
-          itemPattern: '**/$(pattern)'
+          itemPattern: '/$(pattern)'
          targetPath: $(Build.ArtifactStagingDirectory)
      - bash: |
          mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
@@ -977,6 +976,7 @@ stages:
          key: 'yarn | "$(osName)" | yarn.lock'
          restoreKeys: |
             yarn | "$(osName)"
+             yarn
          path: $(yarnCacheFolder)
        displayName: Cache Yarn packages
      - bash: ./build.sh --lint
@@ -1143,5 +1143,4 @@ stages:
            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
            DISCORDCHANNELID: $(discordChannelId)
            DISCORDWEBHOOKKEY: $(discordWebhookKey)
-            DISCORDTHREADID: $(discordThreadId)

--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@@ -223,6 +223,7 @@ module.exports = (env) => {
            {
              loader: 'url-loader',
              options: {
+                limit: 24096,
                mimetype: 'application/font-woff',
                emitFile: false,
                name: 'Content/Fonts/[name].[ext]'
@@ -232,11 +233,12 @@ module.exports = (env) => {
        },

        {
-          test: /\.(ttf|eot|eot?#iefix|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+          test: /\.(ttf|eot|eot?#iefix|gif|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
          use: [
            {
              loader: 'file-loader',
              options: {
+                limit: 24096,
                emitFile: false,
                name: 'Content/Fonts/[name].[ext]'
              }
--- a/frontend/src/Activity/History/HistoryRow.css
+++ b/frontend/src/Activity/History/HistoryRow.css
@@ -10,12 +10,6 @@
  width: 80px;
 }

-.customFormatScore {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  width: 55px;
-}
-
 .releaseGroup {
  composes: cell from '~Components/Table/Cells/TableRowCell.css';

--- a/frontend/src/Activity/History/HistoryRow.js
+++ b/frontend/src/Activity/History/HistoryRow.js
@@ -9,7 +9,6 @@ import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import MovieTitleLink from 'Movie/MovieTitleLink';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
@@ -169,17 +168,6 @@ class HistoryRow extends Component {
              );
            }

-            if (name === 'customFormatScore') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.customFormatScore}
-                >
-                  {formatCustomFormatScore(data.customFormatScore)}
-                </TableRowCell>
-              );
-            }
-
            if (name === 'releaseGroup') {
              return (
                <TableRowCell
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import HeartRating from 'Components/HeartRating';
 import Icon from 'Components/Icon';
 import Label from 'Components/Label';
 import Link from 'Components/Link/Link';
-import TmdbRating from 'Components/TmdbRating';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
 import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
@@ -190,7 +190,7 @@ class AddNewMovieSearchResult extends Component {

            <div>
              <Label size={sizes.LARGE}>
-                <TmdbRating
+                <HeartRating
                  ratings={ratings}
                  iconSize={13}
                />
--- a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSearchResult.css
+++ b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSearchResult.css
@@ -1,5 +1,4 @@
-.container {
-  display: flex;
+.movie {
  padding: 10px 20px;
  width: 100%;

@@ -7,19 +6,3 @@
    background-color: $menuItemHoverBackgroundColor;
  }
 }
-
-.movie {
-  flex: 1 0 0;
-  overflow: hidden;
-}
-
-.tmdbLink {
-  composes: link from '~Components/Link/Link.css';
-
-  margin-left: auto;
-  color: $textColor;
-}
-
-.tmdbLinkIcon {
-  margin-left: 10px;
-}
--- a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSearchResult.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSearchResult.js
@@ -1,8 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
-import { icons } from 'Helpers/Props';
 import ImportMovieTitle from './ImportMovieTitle';
 import styles from './ImportMovieSearchResult.css';

@@ -20,7 +18,6 @@ class ImportMovieSearchResult extends Component {

  render() {
    const {
-      tmdbId,
      title,
      year,
      studio,
@@ -28,30 +25,17 @@ class ImportMovieSearchResult extends Component {
    } = this.props;

    return (
-      <div className={styles.container}>
-        <Link
-          className={styles.movie}
-          onPress={this.onPress}
-        >
-          <ImportMovieTitle
-            title={title}
-            year={year}
-            network={studio}
-            isExistingMovie={isExistingMovie}
-          />
-        </Link>
-
-        <Link
-          className={styles.tmdbLink}
-          to={`https://www.themoviedb.org/movie/${tmdbId}`}
-        >
-          <Icon
-            className={styles.tmdbLinkIcon}
-            name={icons.EXTERNAL_LINK}
-            size={16}
-          />
-        </Link>
-      </div>
+      <Link
+        className={styles.movie}
+        onPress={this.onPress}
+      >
+        <ImportMovieTitle
+          title={title}
+          year={year}
+          network={studio}
+          isExistingMovie={isExistingMovie}
+        />
+      </Link>
    );
  }
 }
--- a/frontend/src/Collection/CollectionFooter.js
+++ b/frontend/src/Collection/CollectionFooter.js
@@ -1,9 +1,6 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import AvailabilitySelectInput from 'Components/Form/AvailabilitySelectInput';
-import QualityProfileSelectInputConnector from 'Components/Form/QualityProfileSelectInputConnector';
-import RootFolderSelectInputConnector from 'Components/Form/RootFolderSelectInputConnector';
 import SelectInput from 'Components/Form/SelectInput';
 import SpinnerButton from 'Components/Link/SpinnerButton';
 import PageContentFooter from 'Components/Page/PageContentFooter';
@@ -25,9 +22,6 @@ class CollectionFooter extends Component {
    this.state = {
      monitor: NO_CHANGE,
      monitored: NO_CHANGE,
-      qualityProfileId: NO_CHANGE,
-      minimumAvailability: NO_CHANGE,
-      rootFolderPath: NO_CHANGE,
      destinationRootFolder: null
    };
  }
@@ -42,10 +36,7 @@ class CollectionFooter extends Component {
    if (prevProps.isSaving && !isSaving && !saveError) {
      this.setState({
        monitored: NO_CHANGE,
-        monitor: NO_CHANGE,
-        qualityProfileId: NO_CHANGE,
-        rootFolderPath: NO_CHANGE,
-        minimumAvailability: NO_CHANGE
+        monitor: NO_CHANGE
      });
    }

@@ -64,10 +55,7 @@ class CollectionFooter extends Component {
  onUpdateSelectedPress = () => {
    const {
      monitor,
-      monitored,
-      qualityProfileId,
-      minimumAvailability,
-      rootFolderPath
+      monitored
    } = this.state;

    const changes = {};
@@ -80,18 +68,6 @@ class CollectionFooter extends Component {
      changes.monitor = monitor;
    }

-    if (qualityProfileId !== NO_CHANGE) {
-      changes.qualityProfileId = qualityProfileId;
-    }
-
-    if (minimumAvailability !== NO_CHANGE) {
-      changes.minimumAvailability = minimumAvailability;
-    }
-
-    if (rootFolderPath !== NO_CHANGE) {
-      changes.rootFolderPath = rootFolderPath;
-    }
-
    this.props.onUpdateSelectedPress(changes);
  };

@@ -106,10 +82,7 @@ class CollectionFooter extends Component {

    const {
      monitored,
-      monitor,
-      qualityProfileId,
-      minimumAvailability,
-      rootFolderPath
+      monitor
    } = this.state;

    const monitoredOptions = [
@@ -152,52 +125,6 @@ class CollectionFooter extends Component {
          />
        </div>

-        <div className={styles.inputContainer}>
-          <CollectionFooterLabel
-            label={translate('QualityProfile')}
-            isSaving={isSaving && qualityProfileId !== NO_CHANGE}
-          />
-
-          <QualityProfileSelectInputConnector
-            name="qualityProfileId"
-            value={qualityProfileId}
-            includeNoChange={true}
-            isDisabled={!selectedCount}
-            onChange={this.onInputChange}
-          />
-        </div>
-
-        <div className={styles.inputContainer}>
-          <CollectionFooterLabel
-            label={translate('MinimumAvailability')}
-            isSaving={isSaving && minimumAvailability !== NO_CHANGE}
-          />
-
-          <AvailabilitySelectInput
-            name="minimumAvailability"
-            value={minimumAvailability}
-            includeNoChange={true}
-            isDisabled={!selectedCount}
-            onChange={this.onInputChange}
-          />
-        </div>
-
-        <div className={styles.inputContainer}>
-          <CollectionFooterLabel
-            label={translate('RootFolder')}
-            isSaving={isSaving && rootFolderPath !== NO_CHANGE}
-          />
-
-          <RootFolderSelectInputConnector
-            name="rootFolderPath"
-            value={rootFolderPath}
-            includeNoChange={true}
-            isDisabled={!selectedCount}
-            selectedValueOptions={{ includeFreeSpace: false }}
-            onChange={this.onInputChange}
-          />
-        </div>
-
        <div className={styles.buttonContainer}>
          <div className={styles.buttonContainerContent}>
            <CollectionFooterLabel
--- a/frontend/src/Collection/Edit/EditCollectionModalContent.js
+++ b/frontend/src/Collection/Edit/EditCollectionModalContent.js
@@ -115,7 +115,7 @@ class EditCollectionModalContent extends Component {
                </FormGroup>

                <FormGroup>
-                  <FormLabel>{translate('RootFolder')}</FormLabel>
+                  <FormLabel>{translate('Folder')}</FormLabel>

                  <FormInputGroup
                    type={inputTypes.ROOT_FOLDER_SELECT}
--- a/frontend/src/Collection/Overview/CollectionOverview.js
+++ b/frontend/src/Collection/Overview/CollectionOverview.js
@@ -1,8 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Slider from 'react-slick';
 import TextTruncate from 'react-text-truncate';
-import { Navigation } from 'swiper';
-import { Swiper, SwiperSlide } from 'swiper/react';
 import EditCollectionModalConnector from 'Collection/Edit/EditCollectionModalConnector';
 import CheckInput from 'Components/Form/CheckInput';
 import Icon from 'Components/Icon';
@@ -18,9 +17,8 @@ import CollectionMovieConnector from './CollectionMovieConnector';
 import CollectionMovieLabelConnector from './CollectionMovieLabelConnector';
 import styles from './CollectionOverview.css';

-// Import Swiper styles
-import 'swiper/css';
-import 'swiper/css/navigation';
+import 'slick-carousel/slick/slick.css';
+import 'slick-carousel/slick/slick-theme.css';

 const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
 const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
@@ -54,12 +52,8 @@ class CollectionOverview extends Component {
  //
  // Control

-  setSliderPrevRef = (ref) => {
-    this._swiperPrevRef = ref;
-  };
-
-  setSliderNextRef = (ref) => {
-    this._swiperNextRef = ref;
+  setSliderRef = (ref) => {
+    this.setState({ slider: ref });
  };

  //
@@ -126,6 +120,15 @@ class CollectionOverview extends Component {
    const contentHeight = getContentHeight(rowHeight, isSmallScreen);
    const overviewHeight = contentHeight - titleRowHeight - posterHeight;

+    const sliderSettings = {
+      arrows: false,
+      dots: false,
+      infinite: false,
+      slidesToShow: 1,
+      slidesToScroll: 1,
+      variableWidth: true
+    };
+
    return (
      <div className={styles.container}>
        <div className={styles.content}>
@@ -163,21 +166,19 @@ class CollectionOverview extends Component {
              {
                showPosters &&
                  <div className={styles.navigationButtons}>
-                    <span ref={this.setSliderPrevRef}>
-                      <IconButton
-                        name={icons.ARROW_LEFT}
-                        title={translate('ScrollMovies')}
-                        size={20}
-                      />
-                    </span>
+                    <IconButton
+                      name={icons.ARROW_LEFT}
+                      title={translate('ScrollMovies')}
+                      onPress={this.state.slider?.slickPrev}
+                      size={20}
+                    />

-                    <span ref={this.setSliderNextRef}>
-                      <IconButton
-                        name={icons.ARROW_RIGHT}
-                        title={translate('ScrollMovies')}
-                        size={20}
-                      />
-                    </span>
+                    <IconButton
+                      name={icons.ARROW_RIGHT}
+                      title={translate('ScrollMovies')}
+                      onPress={this.state.slider?.slickNext}
+                      size={20}
+                    />
                  </div>
              }

@@ -269,23 +270,9 @@ class CollectionOverview extends Component {
            {
              showPosters ?
                <div className={styles.sliderContainer}>
-                  <Swiper
-                    slidesPerView='auto'
-                    spaceBetween={10}
-                    slidesPerGroup={3}
-                    loop={false}
-                    loopFillGroupWithBlank={true}
-                    className="mySwiper"
-                    modules={[Navigation]}
-                    onInit={(swiper) => {
-                      swiper.params.navigation.prevEl = this._swiperPrevRef;
-                      swiper.params.navigation.nextEl = this._swiperNextRef;
-                      swiper.navigation.init();
-                      swiper.navigation.update();
-                    }}
-                  >
+                  <Slider ref={this.setSliderRef} {...sliderSettings}>
                    {movies.map((movie) => (
-                      <SwiperSlide key={movie.tmdbId} style={{ width: posterWidth }}>
+                      <div className={styles.movie} key={movie.tmdbId}>
                        <CollectionMovieConnector
                          key={movie.tmdbId}
                          posterWidth={posterWidth}
@@ -294,9 +281,9 @@ class CollectionOverview extends Component {
                          collectionId={id}
                          {...movie}
                        />
-                      </SwiperSlide>
+                      </div>
                    ))}
-                  </Swiper>
+                  </Slider>
                </div> :
                <div className={styles.labelsContainer}>
                  {movies.map((movie) => (
--- a/frontend/src/Components/HeartRating.css
+++ b/frontend/src/Components/HeartRating.css
@@ -0,0 +1,5 @@
+.image {
+  align-content: center;
+  margin-right: 5px;
+  vertical-align: -0.125em;
+}
--- a/frontend/src/Components/HeartRating.js
+++ b/frontend/src/Components/HeartRating.js
--- a/frontend/src/Components/ImdbRating.js
+++ b/frontend/src/Components/ImdbRating.js
@@ -22,11 +22,11 @@ class ImdbRating extends PureComponent {
    let ratingString = '0.0';

    if (rating) {
-      ratingString = `${rating.value.toFixed(1)}`;
+      ratingString = `${rating.value}`;
    }

    return (
-      <span title={`${rating ? rating.votes : 0} votes`}>
+      <span title={`${rating.votes} votes`}>
        {
          !hideIcon &&
            <img
--- a/frontend/src/Components/Page/PageJumpBar.css
+++ b/frontend/src/Components/Page/PageJumpBar.css
@@ -1,5 +1,4 @@
 .jumpBar {
-  z-index: $pageJumpBarZIndex;
  display: flex;
  align-content: stretch;
  align-items: stretch;
--- a/frontend/src/Components/Page/Toolbar/PageToolbarButton.css
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarButton.css
@@ -2,8 +2,7 @@
  composes: link from '~Components/Link/Link.css';

  padding-top: 4px;
-  min-width: $toolbarButtonWidth;
-  width: min-content;
+  width: $toolbarButtonWidth;
  text-align: center;

  &:hover {
--- a/frontend/src/Components/RottenTomatoRating.js
+++ b/frontend/src/Components/RottenTomatoRating.js
@@ -21,11 +21,9 @@ class RottenTomatoRating extends PureComponent {
    const rating = ratings.rottenTomatoes;

    let ratingString = '0%';
-    let ratingImage = rtFresh;

    if (rating) {
      ratingString = `${rating.value}%`;
-      ratingImage = rating.value > 50 ? rtFresh : rtRotten;
    }

    return (
@@ -34,7 +32,7 @@ class RottenTomatoRating extends PureComponent {
          !hideIcon &&
            <img
              className={styles.image}
-              src={ratingImage}
+              src={rating.value > 50 ? rtFresh : rtRotten}
              style={{
                height: `${iconSize}px`
              }}
--- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
@@ -192,7 +192,7 @@ class TableOptionsModal extends Component {
                                      <TableOptionsColumnDragSource
                                        key={name}
                                        name={name}
-                                        label={columnLabel || label}
+                                        label={label || columnLabel}
                                        isVisible={isVisible}
                                        isModifiable={true}
                                        index={index}
@@ -210,7 +210,7 @@ class TableOptionsModal extends Component {
                                    <TableOptionsColumn
                                      key={name}
                                      name={name}
-                                      label={columnLabel || label}
+                                      label={label || columnLabel}
                                      isVisible={isVisible}
                                      index={index}
                                      isModifiable={false}
--- a/frontend/src/Components/TmdbRating.js
+++ b/frontend/src/Components/TmdbRating.js
@@ -22,7 +22,7 @@ class TmdbRating extends PureComponent {
    let ratingString = '0%';

    if (rating) {
-      ratingString = `${(rating.value * 10).toFixed()}%`;
+      ratingString = `${rating.value * 10}%`;
    }

    return (
--- a/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js
+++ b/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import TmdbRating from 'Components/TmdbRating';
+import HeartRating from 'Components/HeartRating';
 import { getMovieStatusDetails } from 'Movie/MovieStatus';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
@@ -111,7 +111,7 @@ function DiscoverMoviePosterInfo(props) {
  if (sortKey === 'ratings' && ratings) {
    return (
      <div className={styles.info}>
-        <TmdbRating
+        <HeartRating
          ratings={ratings}
        />
      </div>
--- a/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
+++ b/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import HeartRating from 'Components/HeartRating';
 import Icon from 'Components/Icon';
 import ImportListListConnector from 'Components/ImportListListConnector';
 import IconButton from 'Components/Link/IconButton';
@@ -7,7 +8,6 @@ import Link from 'Components/Link/Link';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
 import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell';
-import TmdbRating from 'Components/TmdbRating';
 import Popover from 'Components/Tooltip/Popover';
 import AddNewDiscoverMovieModal from 'DiscoverMovie/AddNewDiscoverMovieModal';
 import ExcludeMovieModal from 'DiscoverMovie/Exclusion/ExcludeMovieModal';
@@ -245,7 +245,7 @@ class DiscoverMovieRow extends Component {
                  key={name}
                  className={styles[name]}
                >
-                  <TmdbRating
+                  <HeartRating
                    ratings={ratings}
                  />
                </VirtualTableRowCell>
--- a/frontend/src/Helpers/Props/icons.js
+++ b/frontend/src/Helpers/Props/icons.js
@@ -22,7 +22,6 @@ import {
 import {
  faArrowCircleLeft as fasArrowCircleLeft,
  faArrowCircleRight as fasArrowCircleRight,
-  faAsterisk as fasAsterisk,
  faBackward as fasBackward,
  faBan as fasBan,
  faBars as fasBars,
@@ -155,7 +154,6 @@ export const FILE = farFile;
 export const FILM = fasFilm;
 export const FILTER = fasFilter;
 export const FLAG = fasFlag;
-export const FOOTNOTE = fasAsterisk;
 export const FOLDER = farFolder;
 export const FOLDER_OPEN = fasFolderOpen;
 export const GENRE = fasTheaterMasks;
--- a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.css
+++ b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.css
@@ -1,7 +0,0 @@
-.modalBody {
-  composes: modalBody from '~Components/Modal/ModalBody.css';
-
-  display: flex;
-  flex: 1 1 auto;
-  flex-direction: column;
-}
--- a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js
+++ b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js
@@ -9,9 +9,8 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds, scrollDirections } from 'Helpers/Props';
+import { inputTypes, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import styles from './SelectReleaseGroupModalContent.css';

 class SelectReleaseGroupModalContent extends Component {

@@ -59,10 +58,7 @@ class SelectReleaseGroupModalContent extends Component {
          {translate('ManualImportSetReleaseGroup')}
        </ModalHeader>

-        <ModalBody
-          className={styles.modalBody}
-          scrollDirection={scrollDirections.NONE}
-        >
+        <ModalBody>
          <Form>
            <FormGroup>
              <FormLabel>{translate('ReleaseGroup')}</FormLabel>
@@ -71,7 +67,6 @@ class SelectReleaseGroupModalContent extends Component {
                type={inputTypes.TEXT}
                name="releaseGroup"
                value={releaseGroup}
-                autoFocus={true}
                onChange={this.onReleaseGroupChange}
              />
            </FormGroup>
--- a/frontend/src/Movie/History/MovieHistoryRow.js
+++ b/frontend/src/Movie/History/MovieHistoryRow.js
@@ -11,7 +11,6 @@ import { icons, kinds } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import styles from './MovieHistoryRow.css';

@@ -105,10 +104,6 @@ class MovieHistoryRow extends Component {
          />
        </TableRowCell>

-        <TableRowCell key={name}>
-          {formatCustomFormatScore(data.customFormatScore)}
-        </TableRowCell>
-
        <RelativeDateCellConnector
          date={date}
        />
--- a/frontend/src/Movie/History/MovieHistoryTableContent.js
+++ b/frontend/src/Movie/History/MovieHistoryTableContent.js
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Table from 'Components/Table/Table';
@@ -36,15 +35,6 @@ const columns = [
    isSortable: false,
    isVisible: true
  },
-  {
-    name: 'customFormatScore',
-    label: React.createElement(Icon, {
-      name: icons.SCORE,
-      title: 'Custom format score'
-    }),
-    isSortable: true,
-    isVisible: true
-  },
  {
    name: 'date',
    label: translate('Date'),
--- a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js
+++ b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js
@@ -102,21 +102,12 @@ function MovieIndexSortMenu(props) {
        </SortMenuItem>

        <SortMenuItem
-          name="imdbRating"
+          name="ratings"
          sortKey={sortKey}
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {translate('ImdbRating')}
-        </SortMenuItem>
-
-        <SortMenuItem
-          name="tmdbRating"
-          sortKey={sortKey}
-          sortDirection={sortDirection}
-          onPress={onSortSelect}
-        >
-          {translate('TmdbRating')}
+          {translate('Ratings')}
        </SortMenuItem>

        <SortMenuItem
--- a/frontend/src/Movie/Index/Table/MovieIndexHeader.css
+++ b/frontend/src/Movie/Index/Table/MovieIndexHeader.css
@@ -77,9 +77,7 @@
  flex: 0 0 120px;
 }

-.imdbRating,
-.tmdbRating,
-.rottenTomatoesRating {
+.ratings {
  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

  flex: 0 0 80px;
--- a/frontend/src/Movie/Index/Table/MovieIndexRow.css
+++ b/frontend/src/Movie/Index/Table/MovieIndexRow.css
@@ -84,9 +84,7 @@
  flex: 0 0 120px;
 }

-.imdbRating,
-.tmdbRating,
-.rottenTomatoesRating {
+.ratings {
  composes: cell;

  flex: 0 0 80px;
--- a/frontend/src/Movie/Index/Table/MovieIndexRow.js
+++ b/frontend/src/Movie/Index/Table/MovieIndexRow.js
@@ -1,15 +1,13 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import HeartRating from 'Components/HeartRating';
 import Icon from 'Components/Icon';
-import ImdbRating from 'Components/ImdbRating';
 import IconButton from 'Components/Link/IconButton';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
-import RottenTomatoRating from 'Components/RottenTomatoRating';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
 import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell';
 import TagListConnector from 'Components/TagListConnector';
-import TmdbRating from 'Components/TmdbRating';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds } from 'Helpers/Props';
 import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
@@ -351,39 +349,13 @@ class MovieIndexRow extends Component {
              );
            }

-            if (name === 'tmdbRating') {
+            if (name === 'ratings') {
              return (
                <VirtualTableRowCell
                  key={name}
                  className={styles[name]}
                >
-                  <TmdbRating
-                    ratings={ratings}
-                  />
-                </VirtualTableRowCell>
-              );
-            }
-
-            if (name === 'rottenTomatoesRating') {
-              return (
-                <VirtualTableRowCell
-                  key={name}
-                  className={styles[name]}
-                >
-                  <RottenTomatoRating
-                    ratings={ratings}
-                  />
-                </VirtualTableRowCell>
-              );
-            }
-
-            if (name === 'imdbRating') {
-              return (
-                <VirtualTableRowCell
-                  key={name}
-                  className={styles[name]}
-                >
-                  <ImdbRating
+                  <HeartRating
                    ratings={ratings}
                  />
                </VirtualTableRowCell>
--- a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.css
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.css
@@ -36,9 +36,3 @@
  margin: 0;
  border: none;
 }
-
-.label {
-  composes: label from '~Components/Label.css';
-
-  max-width: 100%;
-}
--- a/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import MiddleTruncate from 'react-middle-truncate';
 import Card from 'Components/Card';
 import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
@@ -125,15 +124,10 @@ class CustomFormat extends Component {

              return (
                <Label
-                  className={styles.label}
                  key={index}
                  kind={kind}
                >
-                  <MiddleTruncate
-                    text={item.name}
-                    start={10}
-                    end={14}
-                  />
+                  {item.name}
                </Label>
              );
            })
--- a/frontend/src/Settings/General/HostSettings.js
+++ b/frontend/src/Settings/General/HostSettings.js
@@ -21,7 +21,6 @@ function HostSettings(props) {
    port,
    urlBase,
    instanceName,
-    applicationUrl,
    enableSsl,
    sslPort,
    sslCertPath,
@@ -91,21 +90,6 @@ function HostSettings(props) {
        />
      </FormGroup>

-      <FormGroup
-        advancedSettings={advancedSettings}
-        isAdvanced={true}
-      >
-        <FormLabel>{translate('ApplicationURL')}</FormLabel>
-
-        <FormInputGroup
-          type={inputTypes.TEXT}
-          name="applicationUrl"
-          helpText={translate('ApplicationUrlHelpText')}
-          onChange={onInputChange}
-          {...applicationUrl}
-        />
-      </FormGroup>
-
      <FormGroup
        advancedSettings={advancedSettings}
        isAdvanced={true}
--- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
+++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
@@ -166,7 +166,7 @@ function EditImportListModalContent(props) {
              </FormGroup>

              <FormGroup>
-                <FormLabel>{translate('RootFolder')}</FormLabel>
+                <FormLabel>{translate('Folder')}</FormLabel>

                <FormInputGroup
                  type={inputTypes.ROOT_FOLDER_SELECT}
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.css
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.css
@@ -16,20 +16,3 @@
  margin-left: 10px;
  width: 200px;
 }
-
-.footNote {
-  display: flex;
-  color: $helpTextColor;
-
-  .icon {
-    margin-top: 3px;
-    margin-right: 5px;
-    padding: 2px;
-  }
-
-  code {
-    padding: 0 1px;
-    border: 1px solid $borderColor;
-    background-color: #f7f7f7;
-  }
-}
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -3,94 +3,17 @@ import React, { Component } from 'react';
 import FieldSet from 'Components/FieldSet';
 import SelectInput from 'Components/Form/SelectInput';
 import TextInput from 'Components/Form/TextInput';
-import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import Modal from 'Components/Modal/Modal';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { icons, sizes } from 'Helpers/Props';
+import { sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import NamingOption from './NamingOption';
 import styles from './NamingModal.css';

-const separatorOptions = [
-  { key: ' ', value: 'Space ( )' },
-  { key: '.', value: 'Period (.)' },
-  { key: '_', value: 'Underscore (_)' },
-  { key: '-', value: 'Dash (-)' }
-];
-
-const caseOptions = [
-  { key: 'title', value: translate('DefaultCase') },
-  { key: 'lower', value: translate('LowerCase') },
-  { key: 'upper', value: translate('UpperCase') }
-];
-
-const fileNameTokens = [
-  {
-    token: '{Movie Title} - {Quality Full}',
-    example: 'Movie Title (2010) - HDTV-720p Proper'
-  }
-];
-
-const movieTokens = [
-  { token: '{Movie Title}', example: 'Movie\'s Title' },
-  { token: '{Movie Title:DE}', example: 'Titel des Films' },
-  { token: '{Movie CleanTitle}', example: 'Movies Title' },
-  { token: '{Movie TitleThe}', example: 'Movie\'s Title, The' },
-  { token: '{Movie OriginalTitle}', example: 'Τίτλος ταινίας' },
-  { token: '{Movie CleanOriginalTitle}', example: 'Τίτλος ταινίας' },
-  { token: '{Movie TitleFirstCharacter}', example: 'M' },
-  { token: '{Movie Collection}', example: 'The Movie Collection' },
-  { token: '{Movie Certification}', example: 'R' },
-  { token: '{Release Year}', example: '2009' }
-];
-
-const movieIdTokens = [
-  { token: '{ImdbId}', example: 'tt12345' },
-  { token: '{TmdbId}', example: '123456' }
-];
-
-const qualityTokens = [
-  { token: '{Quality Full}', example: 'HDTV-720p Proper' },
-  { token: '{Quality Title}', example: 'HDTV-720p' }
-];
-
-const mediaInfoTokens = [
-  { token: '{MediaInfo Simple}', example: 'x264 DTS' },
-  { token: '{MediaInfo Full}', example: 'x264 DTS [EN+DE]', footNote: 1 },
-
-  { token: '{MediaInfo AudioCodec}', example: 'DTS' },
-  { token: '{MediaInfo AudioChannels}', example: '5.1' },
-  { token: '{MediaInfo AudioLanguages}', example: '[EN+DE]', footNote: 1 },
-  { token: '{MediaInfo SubtitleLanguages}', example: '[DE]', footNote: 1 },
-
-  { token: '{MediaInfo VideoCodec}', example: 'x264' },
-  { token: '{MediaInfo VideoBitDepth}', example: '10' },
-  { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' },
-  { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' },
-  { token: '{MediaInfo 3D}', example: '3D' }
-];
-
-const releaseGroupTokens = [
-  { token: '{Release Group}', example: 'Rls Grp' }
-];
-
-const editionTokens = [
-  { token: '{Edition Tags}', example: 'IMAX' }
-];
-
-const customFormatTokens = [
-  { token: '{Custom Formats}', example: 'Surround Sound x264' }
-];
-
-const originalTokens = [
-  { token: '{Original Title}', example: 'Movie.Title.HDTV.x264-EVOLVE' },
-  { token: '{Original Filename}', example: 'movie title hdtv.x264-Evolve' }
-];
-
 class NamingModal extends Component {

  //
@@ -171,6 +94,81 @@ class NamingModal extends Component {
      case: tokenCase
    } = this.state;

+    const separatorOptions = [
+      { key: ' ', value: 'Space ( )' },
+      { key: '.', value: 'Period (.)' },
+      { key: '_', value: 'Underscore (_)' },
+      { key: '-', value: 'Dash (-)' }
+    ];
+
+    const caseOptions = [
+      { key: 'title', value: translate('DefaultCase') },
+      { key: 'lower', value: translate('LowerCase') },
+      { key: 'upper', value: translate('UpperCase') }
+    ];
+
+    const fileNameTokens = [
+      {
+        token: '{Movie Title} - {Quality Full}',
+        example: 'Movie Title (2010) - HDTV-720p Proper'
+      }
+    ];
+
+    const movieTokens = [
+      { token: '{Movie Title}', example: 'Movie\'s Title' },
+      { token: '{Movie Title:DE}', example: 'Titel des Films' },
+      { token: '{Movie CleanTitle}', example: 'Movies Title' },
+      { token: '{Movie TitleThe}', example: 'Movie\'s Title, The' },
+      { token: '{Movie OriginalTitle}', example: 'Τίτλος ταινίας' },
+      { token: '{Movie CleanOriginalTitle}', example: 'Τίτλος ταινίας' },
+      { token: '{Movie TitleFirstCharacter}', example: 'M' },
+      { token: '{Movie Collection}', example: 'The Movie Collection' },
+      { token: '{Movie Certification}', example: 'R' },
+      { token: '{Release Year}', example: '2009' }
+    ];
+
+    const movieIdTokens = [
+      { token: '{ImdbId}', example: 'tt12345' },
+      { token: '{TmdbId}', example: '123456' }
+    ];
+
+    const qualityTokens = [
+      { token: '{Quality Full}', example: 'HDTV-720p Proper' },
+      { token: '{Quality Title}', example: 'HDTV-720p' }
+    ];
+
+    const mediaInfoTokens = [
+      { token: '{MediaInfo Simple}', example: 'x264 DTS' },
+      { token: '{MediaInfo Full}', example: 'x264 DTS [EN+DE]' },
+
+      { token: '{MediaInfo AudioCodec}', example: 'DTS' },
+      { token: '{MediaInfo AudioChannels}', example: '5.1' },
+      { token: '{MediaInfo AudioLanguages}', example: '[EN+DE]' },
+      { token: '{MediaInfo SubtitleLanguages}', example: '[DE]' },
+
+      { token: '{MediaInfo VideoCodec}', example: 'x264' },
+      { token: '{MediaInfo VideoBitDepth}', example: '10' },
+      { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' },
+      { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' }
+    ];
+
+    const releaseGroupTokens = [
+      { token: '{Release Group}', example: 'Rls Grp' }
+    ];
+
+    const editionTokens = [
+      { token: '{Edition Tags}', example: 'IMAX' }
+    ];
+
+    const customFormatTokens = [
+      { token: '{Custom Formats}', example: 'Surround Sound x264' }
+    ];
+
+    const originalTokens = [
+      { token: '{Original Title}', example: 'Movie.Title.HDTV.x264-EVOLVE' },
+      { token: '{Original Filename}', example: 'movie title hdtv.x264-Evolve' }
+    ];
+
    return (
      <Modal
        isOpen={isOpen}
@@ -299,7 +297,7 @@ class NamingModal extends Component {
                  <FieldSet legend={translate('MediaInfo')}>
                    <div className={styles.groups}>
                      {
-                        mediaInfoTokens.map(({ token, example, footNote }) => {
+                        mediaInfoTokens.map(({ token, example }) => {
                          return (
                            <NamingOption
                              key={token}
@@ -307,7 +305,6 @@ class NamingModal extends Component {
                              value={value}
                              token={token}
                              example={example}
-                              footNote={footNote}
                              tokenSeparator={tokenSeparator}
                              tokenCase={tokenCase}
                              onPress={this.onOptionPress}
@@ -317,14 +314,6 @@ class NamingModal extends Component {
                        )
                      }
                    </div>
-
-                    <div className={styles.footNote}>
-                      <Icon className={styles.icon} name={icons.FOOTNOTE} />
-                      <div>
-                        MediaInfo Full/AudioLanguages/SubtitleLanguages support a <code>:EN+DE</code> suffix allowing you to filter the languages included in the filename. Use <code>-DE</code> to exclude specific languages.
-                        Appending <code>+</code> (eg <code>:EN+</code>) will output <code>[EN]</code>/<code>[EN+--]</code>/<code>[--]</code> depending on excluded languages. For example <code>{'{'}MediaInfo Full:EN+DE{'}'}</code>.
-                      </div>
-                    </div>
                  </FieldSet>

                  <FieldSet legend={translate('ReleaseGroup')}>
--- a/frontend/src/Settings/MediaManagement/Naming/NamingOption.css
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingOption.css
@@ -35,15 +35,9 @@
  display: flex;
  align-items: center;
  align-self: stretch;
-  justify-content: space-between;
  flex: 0 0 50%;
  padding: 6px 16px;
  background-color: #ddd;
-
-  .footNote {
-    padding: 2px;
-    color: #aaa;
-  }
 }

 .lower {
--- a/frontend/src/Settings/MediaManagement/Naming/NamingOption.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingOption.js
@@ -1,9 +1,8 @@
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
-import { icons, sizes } from 'Helpers/Props';
+import { sizes } from 'Helpers/Props';
 import styles from './NamingOption.css';

 class NamingOption extends Component {
@@ -40,7 +39,6 @@ class NamingOption extends Component {
      token,
      tokenSeparator,
      example,
-      footNote,
      tokenCase,
      isFullFilename,
      size
@@ -62,11 +60,6 @@ class NamingOption extends Component {

        <div className={styles.example}>
          {example.replace(/ /g, tokenSeparator)}
-
-          {
-            footNote !== 0 &&
-              <Icon className={styles.footNote} name={icons.FOOTNOTE} />
-          }
        </div>
      </Link>
    );
@@ -76,7 +69,6 @@ class NamingOption extends Component {
 NamingOption.propTypes = {
  token: PropTypes.string.isRequired,
  example: PropTypes.string.isRequired,
-  footNote: PropTypes.number.isRequired,
  tokenSeparator: PropTypes.string.isRequired,
  tokenCase: PropTypes.string.isRequired,
  isFullFilename: PropTypes.bool.isRequired,
@@ -85,7 +77,6 @@ NamingOption.propTypes = {
 };

 NamingOption.defaultProps = {
-  footNote: 0,
  size: sizes.SMALL,
  isFullFilename: false
 };
--- a/frontend/src/Settings/Profiles/Delay/DelayProfile.js
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfile.js
@@ -85,7 +85,7 @@ class DelayProfile extends Component {
      connectDragSource
    } = this.props;

-    let preferred = `Prefer ${titleCase(preferredProtocol)}`;
+    let preferred = titleCase(preferredProtocol);

    if (!enableUsenet) {
      preferred = translate('OnlyTorrent');
--- a/frontend/src/Settings/Profiles/Delay/DelayProfiles.js
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfiles.js
@@ -83,7 +83,7 @@ class DelayProfiles extends Component {
              <div>
                <div className={styles.delayProfilesHeader}>
                  <div className={styles.column}>
-                    {translate('PreferredProtocol')}
+                    {translate('Protocol')}
                  </div>
                  <div className={styles.column}>
                    {translate('UsenetDelay')}
--- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
@@ -17,13 +17,6 @@ import { boolSettingShape, numberSettingShape, tagSettingShape } from 'Helpers/P
 import translate from 'Utilities/String/translate';
 import styles from './EditDelayProfileModalContent.css';

-const protocolOptions = [
-  { key: 'preferUsenet', value: translate('PreferUsenet') },
-  { key: 'preferTorrent', value: translate('PreferTorrent') },
-  { key: 'onlyUsenet', value: translate('OnlyUsenet') },
-  { key: 'onlyTorrent', value: translate('OnlyTorrent') }
-];
-
 function EditDelayProfileModalContent(props) {
  const {
    id,
@@ -33,6 +26,7 @@ function EditDelayProfileModalContent(props) {
    saveError,
    item,
    protocol,
+    protocolOptions,
    onInputChange,
    onProtocolChange,
    onSavePress,
@@ -58,24 +52,22 @@ function EditDelayProfileModalContent(props) {

      <ModalBody>
        {
-          isFetching ?
-            <LoadingIndicator /> :
-            null
+          isFetching &&
+            <LoadingIndicator />
        }

        {
-          !isFetching && !!error ?
+          !isFetching && !!error &&
            <div>
              {translate('UnableToAddANewQualityProfilePleaseTryAgain')}
-            </div> :
-            null
+            </div>
        }

        {
-          !isFetching && !error ?
+          !isFetching && !error &&
            <Form {...otherProps}>
              <FormGroup>
-                <FormLabel>{translate('PreferredProtocol')}</FormLabel>
+                <FormLabel>{translate('Protocol')}</FormLabel>

                <FormInputGroup
                  type={inputTypes.SELECT}
@@ -151,21 +143,19 @@ function EditDelayProfileModalContent(props) {
                    />
                  </FormGroup>
              }
-            </Form> :
-            null
+            </Form>
        }
      </ModalBody>
      <ModalFooter>
        {
-          id && id > 1 ?
+          id && id > 1 &&
            <Button
              className={styles.deleteButton}
              kind={kinds.DANGER}
              onPress={onDeleteDelayProfilePress}
            >
              {translate('Delete')}
-            </Button> :
-            null
+            </Button>
        }

        <Button
@@ -203,6 +193,7 @@ EditDelayProfileModalContent.propTypes = {
  saveError: PropTypes.object,
  item: PropTypes.shape(delayProfileShape).isRequired,
  protocol: PropTypes.string.isRequired,
+  protocolOptions: PropTypes.arrayOf(PropTypes.object).isRequired,
  onInputChange: PropTypes.func.isRequired,
  onProtocolChange: PropTypes.func.isRequired,
  onSavePress: PropTypes.func.isRequired,
--- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js
@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { saveDelayProfile, setDelayProfileValue } from 'Store/Actions/settingsActions';
 import selectSettings from 'Store/Selectors/selectSettings';
+import translate from 'Utilities/String/translate';
 import EditDelayProfileModalContent from './EditDelayProfileModalContent';

 const newDelayProfile = {
@@ -16,6 +17,13 @@ const newDelayProfile = {
  tags: []
 };

+const protocolOptions = [
+  { key: 'preferUsenet', value: translate('PreferUsenet') },
+  { key: 'preferTorrent', value: translate('PreferTorrent') },
+  { key: 'onlyUsenet', value: translate('OnlyUsenet') },
+  { key: 'onlyTorrent', value: translate('OnlyTorrent') }
+];
+
 function createDelayProfileSelector() {
  return createSelector(
    (state, { id }) => id,
@@ -71,6 +79,7 @@ function createMapStateToProps() {

      return {
        protocol,
+        protocolOptions,
        ...delayProfile
      };
    }
--- a/frontend/src/Store/Actions/discoverMovieActions.js
+++ b/frontend/src/Store/Actions/discoverMovieActions.js
@@ -262,10 +262,10 @@ export const defaultState = {
      type: filterBuilderTypes.ARRAY,
      optionsSelector: function(items) {
        const collectionList = items.reduce((acc, movie) => {
-          if (movie.collection && movie.collection.title) {
+          if (movie.collection) {
            acc.push({
-              id: movie.collection.title,
-              name: movie.collection.title
+              id: movie.collection.name,
+              name: movie.collection.name
            });
          }

@@ -561,7 +561,7 @@ export const actionHandlers = handleThunks({
    }, []);

    const promise = createAjaxRequest({
-      url: '/importlist/movie',
+      url: '/movie/import',
      method: 'POST',
      contentType: 'application/json',
      data: JSON.stringify(allNewMovies)
--- a/frontend/src/Store/Actions/historyActions.js
+++ b/frontend/src/Store/Actions/historyActions.js
@@ -1,7 +1,5 @@
-import React from 'react';
 import { createAction } from 'redux-actions';
-import Icon from 'Components/Icon';
-import { filterTypes, icons, sortDirections } from 'Helpers/Props';
+import { filterTypes, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
@@ -86,15 +84,6 @@ export const defaultState = {
      label: translate('SourceTitle'),
      isVisible: false
    },
-    {
-      name: 'customFormatScore',
-      columnLabel: translate('CustomFormatScore'),
-      label: React.createElement(Icon, {
-        name: icons.SCORE,
-        title: 'Custom format score'
-      }),
-      isVisible: false
-    },
    {
      name: 'details',
      columnLabel: translate('Details'),
--- a/frontend/src/Store/Actions/interactiveImportActions.js
+++ b/frontend/src/Store/Actions/interactiveImportActions.js
@@ -4,7 +4,6 @@ import { batchActions } from 'redux-batched-actions';
 import { sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
-import naturalExpansion from 'Utilities/String/naturalExpansion';
 import { set, update, updateItem } from './baseActions';
 import createHandleActions from './Creators/createHandleActions';
 import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer';
@@ -36,7 +35,7 @@ export const defaultState = {
    relativePath: function(item, direction) {
      const relativePath = item.relativePath;

-      return naturalExpansion(relativePath.toLowerCase());
+      return relativePath.toLowerCase();
    },

    movie: function(item, direction) {
--- a/frontend/src/Store/Actions/movieActions.js
+++ b/frontend/src/Store/Actions/movieActions.js
@@ -116,7 +116,7 @@ export const filterPredicates = {
    const predicate = filterTypePredicates[type];
    const { collection } = item;

-    return predicate(collection && collection.title ? collection.title : '', filterValue);
+    return predicate(collection ? collection.name : '', filterValue);
  },

  originalLanguage: function(item, filterValue, type) {
@@ -162,14 +162,6 @@ export const filterPredicates = {
    return predicate(rating, filterValue);
  },

-  rottenTomatoesRating: function(item, filterValue, type) {
-    const predicate = filterTypePredicates[type];
-
-    const rating = item.ratings.rottenTomatoes ? item.ratings.rottenTomatoes.value : 0;
-
-    return predicate(rating, filterValue);
-  },
-
  imdbVotes: function(item, filterValue, type) {
    const predicate = filterTypePredicates[type];

--- a/frontend/src/Store/Actions/movieCollectionActions.js
+++ b/frontend/src/Store/Actions/movieCollectionActions.js
@@ -1,12 +1,10 @@
 import _ from 'lodash';
 import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
-import { filterBuilderTypes, filterBuilderValueTypes, filterTypePredicates, sortDirections } from 'Helpers/Props';
+import { filterBuilderTypes, filterBuilderValueTypes, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
-import sortByName from 'Utilities/Array/sortByName';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import getNewMovie from 'Utilities/Movie/getNewMovie';
-import translate from 'Utilities/String/translate';
 import { set, update, updateItem } from './baseActions';
 import createHandleActions from './Creators/createHandleActions';
 import createSaveProviderHandler from './Creators/createSaveProviderHandler';
@@ -65,81 +63,19 @@ export const defaultState = {
    }
  ],

-  filterPredicates: {
-    genres: function(item, filterValue, type) {
-      const predicate = filterTypePredicates[type];
-
-      let allGenres = [];
-      item.movies.forEach((movie) => {
-        allGenres = allGenres.concat(movie.genres);
-      });
-
-      const genres = Array.from(new Set(allGenres)).slice(0, 3);
-
-      return predicate(genres, filterValue);
-    },
-    totalMovies: function(item, filterValue, type) {
-      const predicate = filterTypePredicates[type];
-      const { movies } = item;
-
-      const totalMovies = movies.length;
-      return predicate(totalMovies, filterValue);
-    }
-  },
+  filterPredicates: {},

  filterBuilderProps: [
    {
      name: 'title',
-      label: translate('Title'),
+      label: 'Title',
      type: filterBuilderTypes.STRING
    },
    {
      name: 'monitored',
-      label: translate('Monitored'),
+      label: 'Monitored',
      type: filterBuilderTypes.EXACT,
      valueType: filterBuilderValueTypes.BOOL
-    },
-    {
-      name: 'qualityProfileId',
-      label: translate('QualityProfile'),
-      type: filterBuilderTypes.EXACT,
-      valueType: filterBuilderValueTypes.QUALITY_PROFILE
-    },
-    {
-      name: 'rootFolderPath',
-      label: translate('RootFolder'),
-      type: filterBuilderTypes.STRING
-    },
-    {
-      name: 'genres',
-      label: translate('Genres'),
-      type: filterBuilderTypes.ARRAY,
-      optionsSelector: function(items) {
-        const genreList = items.reduce((acc, collection) => {
-          let collectionGenres = [];
-          collection.movies.forEach((movie) => {
-            collectionGenres = collectionGenres.concat(movie.genres);
-          });
-
-          const genres = Array.from(new Set(collectionGenres)).slice(0, 3);
-
-          genres.forEach((genre) => {
-            acc.push({
-              id: genre,
-              name: genre
-            });
-          });
-
-          return acc;
-        }, []);
-
-        return genreList.sort(sortByName);
-      }
-    },
-    {
-      name: 'totalMovies',
-      label: translate('TotalMovies'),
-      type: filterBuilderTypes.NUMBER
    }
  ]
 };
@@ -318,32 +254,27 @@ export const actionHandlers = handleThunks({
    const {
      collectionIds,
      monitored,
-      monitor,
-      qualityProfileId,
-      rootFolderPath,
-      minimumAvailability
+      monitor
    } = payload;

    const response = {};
+    const collections = [];

-    if (payload.hasOwnProperty('monitored')) {
-      response.monitored = monitored;
-    }
+    collectionIds.forEach((id) => {
+      const collectionToUpdate = { id };
+
+      if (payload.hasOwnProperty('monitored')) {
+        collectionToUpdate.monitored = monitored;
+      }
+
+      collections.push(collectionToUpdate);
+    });

    if (payload.hasOwnProperty('monitor')) {
      response.monitorMovies = monitor === 'monitored';
    }

-    if (payload.hasOwnProperty('qualityProfileId')) {
-      response.qualityProfileId = qualityProfileId;
-    }
-
-    if (payload.hasOwnProperty('minimumAvailability')) {
-      response.minimumAvailability = minimumAvailability;
-    }
-
-    response.rootFolderPath = rootFolderPath;
-    response.collectionIds = collectionIds;
+    response.collections = collections;

    dispatch(set({
      section,
--- a/frontend/src/Store/Actions/movieFileActions.js
+++ b/frontend/src/Store/Actions/movieFileActions.js
@@ -165,11 +165,11 @@ export const actionHandlers = handleThunks({
      requestData.quality = quality;
    }

-    if (releaseGroup !== undefined) {
+    if (releaseGroup) {
      requestData.releaseGroup = releaseGroup;
    }

-    if (edition !== undefined) {
+    if (edition) {
      requestData.edition = edition;
    }

@@ -201,11 +201,11 @@ export const actionHandlers = handleThunks({
            props.quality = quality;
          }

-          if (edition !== undefined) {
+          if (edition) {
            props.edition = edition;
          }

-          if (releaseGroup !== undefined) {
+          if (releaseGroup) {
            props.releaseGroup = releaseGroup;
          }

--- a/frontend/src/Store/Actions/movieIndexActions.js
+++ b/frontend/src/Store/Actions/movieIndexActions.js
@@ -178,20 +178,8 @@ export const defaultState = {
      isVisible: true
    },
    {
-      name: 'tmdbRating',
-      label: translate('TmdbRating'),
-      isSortable: true,
-      isVisible: false
-    },
-    {
-      name: 'rottenTomatoesRating',
-      label: translate('RottenTomatoesRating'),
-      isSortable: true,
-      isVisible: false
-    },
-    {
-      name: 'imdbRating',
-      label: translate('ImdbRating'),
+      name: 'ratings',
+      label: translate('Ratings'),
      isSortable: true,
      isVisible: false
    },
@@ -227,7 +215,7 @@ export const defaultState = {
    collection: function(item) {
      const { collection ={} } = item;

-      return collection.title;
+      return collection.name;
    },

    originalLanguage: function(item) {
@@ -236,22 +224,10 @@ export const defaultState = {
      return originalLanguage.name;
    },

-    imdbRating: function(item) {
+    ratings: function(item) {
      const { ratings = {} } = item;

-      return ratings.imdb ? ratings.imdb.value : 0;
-    },
-
-    tmdbRating: function(item) {
-      const { ratings = {} } = item;
-
-      return ratings.tmdb ? ratings.tmdb.value : 0;
-    },
-
-    rottenTomatoesRating: function(item) {
-      const { ratings = {} } = item;
-
-      return ratings.rottenTomatoes ? ratings.rottenTomatoes.value : 0;
+      return ratings.tmdb? ratings.tmdb.value : 0;
    }
  },

@@ -339,10 +315,10 @@ export const defaultState = {
      type: filterBuilderTypes.ARRAY,
      optionsSelector: function(items) {
        const collectionList = items.reduce((acc, movie) => {
-          if (movie.collection && movie.collection.title) {
+          if (movie.collection) {
            acc.push({
-              id: movie.collection.title,
-              name: movie.collection.title
+              id: movie.collection.name,
+              name: movie.collection.name
            });
          }

@@ -437,11 +413,6 @@ export const defaultState = {
      label: translate('ImdbRating'),
      type: filterBuilderTypes.NUMBER
    },
-    {
-      name: 'rottenTomatoesRating',
-      label: translate('RottenTomatoesRating'),
-      type: filterBuilderTypes.NUMBER
-    },
    {
      name: 'imdbVotes',
      label: translate('ImdbVotes'),
--- a/frontend/src/Styles/Variables/zIndexes.js
+++ b/frontend/src/Styles/Variables/zIndexes.js
@@ -1,5 +1,4 @@
 module.exports = {
-  pageJumpBarZIndex: 10,
  modalZIndex: 1000,
  popperZIndex: 2000
 };
--- a/frontend/src/Utilities/Number/formatCustomFormatScore.js
+++ b/frontend/src/Utilities/Number/formatCustomFormatScore.js
@@ -1,16 +0,0 @@
-
-function formatCustomFormatScore(input) {
-  const score = Number(input);
-
-  if (score > 0) {
-    return `+${score}`;
-  }
-
-  if (score < 0) {
-    return score;
-  }
-
-  return '';
-}
-
-export default formatCustomFormatScore;
--- a/frontend/src/Utilities/String/naturalExpansion.js
+++ b/frontend/src/Utilities/String/naturalExpansion.js
@@ -1,11 +0,0 @@
-const regex = /\d+/g;
-
-function naturalExpansion(input) {
-  if (!input) {
-    return '';
-  }
-
-  return input.replace(regex, (n) => n.padStart(8, '0'));
-}
-
-export default naturalExpansion;
--- a/frontend/src/Utilities/String/titleCase.js
+++ b/frontend/src/Utilities/String/titleCase.js
@@ -1,11 +1,9 @@
-const regex = /\b\w+/g;
-
 function titleCase(input) {
  if (!input) {
    return '';
  }

-  return input.replace(regex, (match) => {
+  return input.replace(/\b\w+/g, (match) => {
    return match.charAt(0).toUpperCase() + match.substr(1).toLowerCase();
  });
 }
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
    "@fortawesome/free-regular-svg-icons": "6.1.0",
    "@fortawesome/free-solid-svg-icons": "6.1.0",
    "@fortawesome/react-fontawesome": "0.1.18",
-    "@microsoft/signalr": "6.0.8",
+    "@microsoft/signalr": "6.0.5",
    "@sentry/browser": "6.18.2",
    "@sentry/integrations": "6.18.2",
    "classnames": "2.3.1",
@@ -45,7 +45,7 @@
    "jquery": "3.6.0",
    "lodash": "4.17.21",
    "mobile-detect": "1.4.5",
-    "moment": "2.29.4",
+    "moment": "2.29.2",
    "mousetrap": "1.6.5",
    "normalize.css": "8.0.1",
    "prop-types": "15.7.2",
@@ -62,7 +62,8 @@
    "react-document-title": "2.0.3",
    "react-dom": "17.0.2",
    "react-focus-lock": "2.5.0",
-    "swiper": "8.3.2",
+    "react-slick": "0.28.1",
+    "slick-carousel": "1.8.1",
    "react-google-recaptcha": "2.1.0",
    "react-lazyload": "3.2.0",
    "react-measure": "1.4.7",
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -90,7 +90,7 @@

  <!-- Standard testing packages -->
  <ItemGroup Condition="'$(TestProject)'=='true'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
    <PackageReference Include="NUnit" Version="3.13.2" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
--- a/src/NuGet.config
+++ b/src/NuGet.config
@@ -8,6 +8,5 @@
    <add key="SQLite" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/SQLite/nuget/v3/index.json" />
    <add key="coverlet-nightly" value="https://pkgs.dev.azure.com/Servarr/coverlet/_packaging/coverlet-nightly/nuget/v3/index.json" />
    <add key="FFMpegCore" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/FFMpegCore/nuget/v3/index.json" />
-    <add key="FluentMigrator" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/FluentMigrator/nuget/v3/index.json" />
  </packageSources>
 </configuration>
--- a/src/NzbDrone.Common.Test/ConfigFileProviderTest.cs
+++ b/src/NzbDrone.Common.Test/ConfigFileProviderTest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
@@ -13,7 +13,7 @@ namespace NzbDrone.Common.Test
 {
    [TestFixture]

-    public class ConfigFileProviderTest : TestBase<ConfigFileProvider>
+    public class ConfigFileWriterTest : TestBase<ConfigFileWriter>
    {
        private string _configFileContents;
        private string _configFilePath;
@@ -45,56 +45,7 @@ namespace NzbDrone.Common.Test
                .Callback<string, string>((p, t) => _configFileContents = t);
        }

-        [Test]
-        public void GetValue_Success()
-        {
-            const string key = "Port";
-            const string value = "7878";
-
-            var result = Subject.GetValue(key, value);
-
-            result.Should().Be(value);
-        }
-
-        [Test]
-        public void GetInt_Success()
-        {
-            const string key = "Port";
-            const int value = 7878;
-
-            var result = Subject.GetValueInt(key, value);
-
-            result.Should().Be(value);
-        }
-
-        [Test]
-        public void GetBool_Success()
-        {
-            const string key = "LaunchBrowser";
-            const bool value = true;
-
-            var result = Subject.GetValueBoolean(key, value);
-
-            result.Should().BeTrue();
-        }
-
-        [Test]
-        public void GetLaunchBrowser_Success()
-        {
-            var result = Subject.LaunchBrowser;
-
-            result.Should().Be(true);
-        }
-
-        [Test]
-        public void GetPort_Success()
-        {
-            const int value = 7878;
-
-            var result = Subject.Port;
-
-            result.Should().Be(value);
-        }
+        /*

        [Test]
        public void SetValue_bool()
@@ -120,17 +71,6 @@ namespace NzbDrone.Common.Test
            result.Should().Be(value);
        }

-        [Test]
-        public void GetValue_New_Key()
-        {
-            const string key = "Hello";
-            const string value = "World";
-
-            var result = Subject.GetValue(key, value);
-
-            result.Should().Be(value);
-        }
-
        [Test]
        public void GetAuthenticationType_No_Existing_Value()
        {
@@ -139,6 +79,7 @@ namespace NzbDrone.Common.Test
            result.Should().Be(AuthenticationType.None);
        }

+        /*
        [Test]
        public void SaveDictionary_should_save_proper_value()
        {
@@ -170,32 +111,6 @@ namespace NzbDrone.Common.Test

            Subject.Port.Should().Be(port);
            Subject.SslPort.Should().Be(sslPort);
-        }
-
-        [Test]
-        public void should_throw_if_config_file_is_empty()
-        {
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(v => v.FileExists(_configFilePath))
-                  .Returns(true);
-
-            Assert.Throws<InvalidConfigFileException>(() => Subject.GetValue("key", "value"));
-        }
-
-        [Test]
-        public void should_throw_if_config_file_contains_only_null_character()
-        {
-            _configFileContents = "\0";
-
-            Assert.Throws<InvalidConfigFileException>(() => Subject.GetValue("key", "value"));
-        }
-
-        [Test]
-        public void should_throw_if_config_file_contains_invalid_xml()
-        {
-            _configFileContents = "{ \"key\": \"value\" }";
-
-            Assert.Throws<InvalidConfigFileException>(() => Subject.GetValue("key", "value"));
-        }
+        }*/
    }
 }
--- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
@@ -212,7 +212,6 @@ namespace NzbDrone.Common.Test.Http
        }

        [Test]
-        [Platform(Exclude = "MacOsX", Reason = "Azure agent update prevents brotli on OSX")]
        public void should_execute_get_using_brotli()
        {
            var request = new HttpRequest($"https://{_httpBinHost}/brotli");
--- a/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
@@ -64,7 +64,6 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        [TestCase("https://notifiarr.com/notifier.php: api=1234530f-422f-4aac-b6b3-01233210aaaa&radarr_health_issue_message=Download")]
        [TestCase("/readarr/signalr/messages/negotiate?access_token=1234530f422f4aacb6b301233210aaaa&negotiateVersion=1")]
        [TestCase(@"[Info] MigrationController: *** Migrating Database=radarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;Enlist=False ***")]
-        [TestCase(@"[Info] MigrationController: *** Migrating Database=radarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;token=mySecret;Enlist=False&username=mySecret;mypassword=mySecret;mypass=shouldkeep1;test_token=mySecret;password=123%@%_@!#^#@;use_password=mySecret;get_token=shouldkeep2;usetoken=shouldkeep3;passwrd=mySecret;")]

        // Announce URLs (passkeys) Magnet & Tracker
        [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2f9pr04sg601233210imaveql2tyu8xyui%2fannounce""}")]
@@ -80,33 +79,14 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        // Notifiarr
        [TestCase(@"https://xxx.yyy/api/v1/notification/radarr/9pr04sg6-0123-3210-imav-eql2tyu8xyui")]

-        // Discord
-        [TestCase(@"https://discord.com/api/webhooks/mySecret")]
-        [TestCase(@"https://discord.com/api/webhooks/mySecret/01233210")]
-
        public void should_clean_message(string message)
        {
            var cleansedMessage = CleanseLogMessage.Cleanse(message);

            cleansedMessage.Should().NotContain("mySecret");
-            cleansedMessage.Should().NotContain("123%@%_@!#^#@");
            cleansedMessage.Should().NotContain("01233210");
        }

-        [TestCase(@"[Info] MigrationController: *** Migrating Database=radarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;token=mySecret;Enlist=False&username=mySecret;mypassword=mySecret;mypass=shouldkeep1;test_token=mySecret;password=123%@%_@!#^#@;use_password=mySecret;get_token=shouldkeep2;usetoken=shouldkeep3;passwrd=mySecret;")]
-        public void should_keep_message(string message)
-        {
-            var cleansedMessage = CleanseLogMessage.Cleanse(message);
-
-            cleansedMessage.Should().NotContain("mySecret");
-            cleansedMessage.Should().NotContain("123%@%_@!#^#@");
-            cleansedMessage.Should().NotContain("01233210");
-
-            cleansedMessage.Should().Contain("shouldkeep1");
-            cleansedMessage.Should().Contain("shouldkeep2");
-            cleansedMessage.Should().Contain("shouldkeep3");
-        }
-
        [TestCase(@"Some message (from 32.2.3.5 user agent)")]
        [TestCase(@"Auth-Invalidated ip 32.2.3.5")]
        [TestCase(@"Auth-Success ip 32.2.3.5")]
--- a/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs
@@ -18,26 +18,9 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        private static LogLevel[] SentryLevels = LogLevel.AllLevels.Where(x => x >= LogLevel.Error).ToArray();
        private static LogLevel[] OtherLevels = AllLevels.Except(SentryLevels).ToArray();

-        // TODO: SQLiteException filtering tests don't work on linux-86 and alpine customer Azure agents due to sqlite library not being loaded up, pass local
        private static Exception[] FilteredExceptions = new Exception[]
        {
-            // new SQLiteException(SQLiteErrorCode.Locked, "database is locked"),
-            new UnauthorizedAccessException(),
-            new AggregateException(new Exception[]
-            {
-                new UnauthorizedAccessException(),
-                new UnauthorizedAccessException()
-            })
-        };
-
-        private static Exception[] NonFilteredExceptions = new Exception[]
-        {
-            // new SQLiteException(SQLiteErrorCode.Error, "it's borked"),
-            new AggregateException(new Exception[]
-            {
-                new UnauthorizedAccessException(),
-                new NotImplementedException()
-            })
+            new UnauthorizedAccessException()
        };

        [SetUp]
@@ -80,14 +63,6 @@ namespace NzbDrone.Common.Test.InstrumentationTests
            _subject.IsSentryMessage(log).Should().BeFalse();
        }

-        [Test]
-        [TestCaseSource("NonFilteredExceptions")]
-        public void should_not_filter_event_for_filtered_exception_types(Exception ex)
-        {
-            var log = GivenLogEvent(LogLevel.Error, ex, "test");
-            _subject.IsSentryMessage(log).Should().BeTrue();
-        }
-
        [Test]
        [TestCaseSource("FilteredExceptions")]
        public void should_not_filter_event_for_filtered_exception_types_if_filtering_disabled(Exception ex)
--- a/src/NzbDrone.Common.Test/PathExtensionFixture.cs
+++ b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
@@ -278,7 +278,7 @@ namespace NzbDrone.Common.Test
        [Test]
        public void GetUpdateClientExePath()
        {
-            GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr.Update".AsOsAgnostic().ProcessNameToExe());
+            GetIAppDirectoryInfo().GetUpdateClientExePath(PlatformType.DotNet).Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr.Update.exe".AsOsAgnostic());
        }

        [Test]
--- a/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
+++ b/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using DryIoc;
 using DryIoc.Microsoft.DependencyInjection;
 using FluentAssertions;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
@@ -10,7 +11,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Composition.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation.Extensions;
-using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Messaging.Events;
@@ -32,7 +33,8 @@ namespace NzbDrone.Common.Test
                .AddStartupContext(new StartupContext("first", "second"));

            container.RegisterInstance(new Mock<IHostLifetime>().Object);
-            container.RegisterInstance(new Mock<IOptions<PostgresOptions>>().Object);
+            container.RegisterInstance(new Mock<IConfiguration>().Object);
+            container.RegisterInstance(new Mock<IOptionsMonitor<ConfigFileOptions>>().Object);

            var serviceProvider = container.GetServiceProvider();

--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@@ -264,11 +264,6 @@ namespace NzbDrone.Common.Disk

        protected virtual void MoveFileInternal(string source, string destination)
        {
-            if (File.Exists(destination))
-            {
-                throw new FileAlreadyExistsException("File already exists", destination);
-            }
-
            File.Move(source, destination);
        }

--- a/src/NzbDrone.Common/Disk/FileAlreadyExistsException.cs
+++ b/src/NzbDrone.Common/Disk/FileAlreadyExistsException.cs
@@ -1,15 +0,0 @@
-using System;
-
-namespace NzbDrone.Common.Disk
-{
-    public class FileAlreadyExistsException : Exception
-    {
-        public string Filename { get; set; }
-
-        public FileAlreadyExistsException(string message, string filename)
-            : base(message)
-        {
-            Filename = filename;
-        }
-    }
-}
--- a/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs
@@ -2,6 +2,13 @@ using System;

 namespace NzbDrone.Common.EnvironmentInfo
 {
+    public enum PlatformType
+    {
+        DotNet = 0,
+        Mono = 1,
+        NetCore = 2
+    }
+
    public interface IPlatformInfo
    {
        Version Version { get; }
@@ -9,18 +16,31 @@ namespace NzbDrone.Common.EnvironmentInfo

    public class PlatformInfo : IPlatformInfo
    {
+        private static PlatformType _platform;
        private static Version _version;

        static PlatformInfo()
        {
+            _platform = PlatformType.NetCore;
            _version = Environment.Version;
        }

+        public static PlatformType Platform => _platform;
+        public static bool IsDotNet => Platform == PlatformType.DotNet;
+        public static bool IsNetCore => Platform == PlatformType.NetCore;
+
        public static string PlatformName
        {
            get
            {
-                return ".NET";
+                if (IsDotNet)
+                {
+                    return ".NET";
+                }
+                else
+                {
+                    return ".NET Core";
+                }
            }
        }

--- a/src/NzbDrone.Common/Extensions/PathExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs
@@ -267,9 +267,9 @@ namespace NzbDrone.Common.Extensions
            return substring.Substring(0, lastSeparatorIndex);
        }

-        public static string ProcessNameToExe(this string processName)
+        public static string ProcessNameToExe(this string processName, PlatformType runtime)
        {
-            if (OsInfo.IsWindows)
+            if (OsInfo.IsWindows || runtime != PlatformType.NetCore)
            {
                processName += ".exe";
            }
@@ -277,6 +277,11 @@ namespace NzbDrone.Common.Extensions
            return processName;
        }

+        public static string ProcessNameToExe(this string processName)
+        {
+            return processName.ProcessNameToExe(PlatformInfo.Platform);
+        }
+
        public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)
        {
            return appFolderInfo.AppDataFolder;
@@ -347,9 +352,9 @@ namespace NzbDrone.Common.Extensions
            return Path.Combine(GetUpdatePackageFolder(appFolderInfo), UPDATE_CLIENT_FOLDER_NAME);
        }

-        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo)
+        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo, PlatformType runtime)
        {
-            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE_NAME).ProcessNameToExe();
+            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE_NAME).ProcessNameToExe(runtime);
        }

        public static string GetDatabase(this IAppFolderInfo appFolderInfo)
--- a/src/NzbDrone.Common/Http/HttpResponse.cs
+++ b/src/NzbDrone.Common/Http/HttpResponse.cs
@@ -55,8 +55,7 @@ namespace NzbDrone.Common.Http
                                       StatusCode == HttpStatusCode.Found ||
                                       StatusCode == HttpStatusCode.TemporaryRedirect ||
                                       StatusCode == HttpStatusCode.RedirectMethod ||
-                                       StatusCode == HttpStatusCode.SeeOther ||
-                                       StatusCode == HttpStatusCode.PermanentRedirect;
+                                       StatusCode == HttpStatusCode.SeeOther;

        public string[] GetCookieHeaders()
        {
--- a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Common.Instrumentation
                new Regex(@"iptorrents\.com/[/a-z0-9?&;]*?(?:[?&;](u|tp)=(?<secret>[^&=;]+?))+(?= |;|&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled),
                new Regex(@"getnzb.*?(?<=\?|&)(r)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"\b(\w*)?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=[?& ;])[^=]*?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

                // Trackers Announce Keys; Designed for Qbit Json; should work for all in theory
                new Regex(@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?<secret>[a-z0-9]{16,})|(?<secret>[a-z0-9]{16,})(/|%2f)announce"),
@@ -50,10 +50,7 @@ namespace NzbDrone.Common.Instrumentation
                new Regex(@"(?<=\?|&)(X-Plex-Client-Identifier|X-Plex-Token)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

                // Notifiarr
-                new Regex(@"api/v[0-9]/notification/radarr/(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-
-                // Discord
-                new Regex(@"discord.com/api/webhooks/((?<secret>[\w-]+)/)?(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase)
+                new Regex(@"api/v[0-9]/notification/radarr/(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase)
            };

        private static readonly Regex CleanseRemoteIPRegex = new Regex(@"(?:Auth-\w+(?<!Failure|Unauthorized) ip|from) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})", RegexOptions.Compiled);
--- a/src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs
+++ b/src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using NLog;
 using NLog.Fluent;

@@ -10,46 +8,47 @@ namespace NzbDrone.Common.Instrumentation.Extensions
    {
        public static readonly Logger SentryLogger = LogManager.GetLogger("Sentry");

-        public static LogEventBuilder SentryFingerprint(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder SentryFingerprint(this LogBuilder logBuilder, params string[] fingerprint)
        {
            return logBuilder.Property("Sentry", fingerprint);
        }

-        public static LogEventBuilder WriteSentryDebug(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryDebug(this LogBuilder logBuilder, params string[] fingerprint)
        {
            return LogSentryMessage(logBuilder, LogLevel.Debug, fingerprint);
        }

-        public static LogEventBuilder WriteSentryInfo(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryInfo(this LogBuilder logBuilder, params string[] fingerprint)
        {
            return LogSentryMessage(logBuilder, LogLevel.Info, fingerprint);
        }

-        public static LogEventBuilder WriteSentryWarn(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryWarn(this LogBuilder logBuilder, params string[] fingerprint)
        {
            return LogSentryMessage(logBuilder, LogLevel.Warn, fingerprint);
        }

-        public static LogEventBuilder WriteSentryError(this LogEventBuilder logBuilder, params string[] fingerprint)
+        public static LogBuilder WriteSentryError(this LogBuilder logBuilder, params string[] fingerprint)
        {
            return LogSentryMessage(logBuilder, LogLevel.Error, fingerprint);
        }

-        private static LogEventBuilder LogSentryMessage(LogEventBuilder logBuilder, LogLevel level, string[] fingerprint)
+        private static LogBuilder LogSentryMessage(LogBuilder logBuilder, LogLevel level, string[] fingerprint)
        {
-            SentryLogger.ForLogEvent(level)
-                        .CopyLogEvent(logBuilder.LogEvent)
+            SentryLogger.Log(level)
+                        .CopyLogEvent(logBuilder.LogEventInfo)
                        .SentryFingerprint(fingerprint)
-                        .Log();
+                        .Write();

-            return logBuilder.Property<string>("Sentry", null);
+            return logBuilder.Property("Sentry", null);
        }

-        private static LogEventBuilder CopyLogEvent(this LogEventBuilder logBuilder, LogEventInfo logEvent)
+        private static LogBuilder CopyLogEvent(this LogBuilder logBuilder, LogEventInfo logEvent)
        {
-            return logBuilder.TimeStamp(logEvent.TimeStamp)
+            return logBuilder.LoggerName(logEvent.LoggerName)
+                             .TimeStamp(logEvent.TimeStamp)
                             .Message(logEvent.Message, logEvent.Parameters)
-                             .Properties(logEvent.Properties.Select(p => new KeyValuePair<string, object>(p.Key.ToString(), p.Value)))
+                             .Properties(logEvent.Properties.ToDictionary(v => v.Key, v => v.Value))
                             .Exception(logEvent.Exception);
        }
    }
--- a/src/NzbDrone.Common/Instrumentation/NzbDroneFileTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/NzbDroneFileTarget.cs
@@ -1,16 +1,13 @@
-using System;
-using System.Text;
-using NLog;
+using NLog;
 using NLog.Targets;

 namespace NzbDrone.Common.Instrumentation
 {
    public class NzbDroneFileTarget : FileTarget
    {
-        protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuilder target)
+        protected override string GetFormattedMessage(LogEventInfo logEvent)
        {
-            var result = CleanseLogMessage.Cleanse(Layout.Render(logEvent));
-            target.Append(result);
+            return CleanseLogMessage.Cleanse(Layout.Render(logEvent));
        }
    }
 }
--- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
+++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
@@ -34,8 +34,6 @@ namespace NzbDrone.Common.Instrumentation

            var appFolderInfo = new AppFolderInfo(startupContext);

-            RegisterGlobalFilters();
-
            if (Debugger.IsAttached)
            {
                RegisterDebugger();
@@ -99,21 +97,10 @@ namespace NzbDrone.Common.Instrumentation
            target.Layout = "[${level}] [${threadid}] ${logger}: ${message} ${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}${exception:format=Data}${newline}}";

            var loggingRule = new LoggingRule("*", LogLevel.Trace, target);
-
            LogManager.Configuration.AddTarget("debugger", target);
            LogManager.Configuration.LoggingRules.Add(loggingRule);
        }

-        private static void RegisterGlobalFilters()
-        {
-            LogManager.Setup().LoadConfiguration(c =>
-            {
-                c.ForLogger("Microsoft.Hosting.Lifetime*").WriteToNil(LogLevel.Info);
-                c.ForLogger("System*").WriteToNil(LogLevel.Warn);
-                c.ForLogger("Microsoft*").WriteToNil(LogLevel.Warn);
-            });
-        }
-
        private static void RegisterConsole()
        {
            var level = LogLevel.Trace;
--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
@@ -229,48 +229,21 @@ namespace NzbDrone.Common.Instrumentation.Sentry
            {
                if (FilterEvents)
                {
-                    var exceptions = new List<Exception>();
-
-                    var aggEx = logEvent.Exception as AggregateException;
-
-                    if (aggEx != null && aggEx.InnerExceptions.Count > 0)
+                    var sqlEx = logEvent.Exception as SQLiteException;
+                    if (sqlEx != null && FilteredSQLiteErrors.Contains(sqlEx.ResultCode))
                    {
-                        exceptions.AddRange(aggEx.InnerExceptions);
-                    }
-                    else
-                    {
-                        exceptions.Add(logEvent.Exception);
+                        return false;
                    }

-                    // If any are sentry then send to sentry
-                    foreach (var ex in exceptions)
+                    if (FilteredExceptionTypeNames.Contains(logEvent.Exception.GetType().Name))
                    {
-                        var isSentry = true;
-
-                        var sqlEx = ex as SQLiteException;
-                        if (sqlEx != null && FilteredSQLiteErrors.Contains(sqlEx.ResultCode))
-                        {
-                            isSentry = false;
-                        }
-
-                        if (FilteredExceptionTypeNames.Contains(ex.GetType().Name))
-                        {
-                            isSentry = false;
-                        }
-
-                        if (FilteredExceptionMessages.Any(x => ex.Message.Contains(x)))
-                        {
-                            isSentry = false;
-                        }
-
-                        if (isSentry)
-                        {
-                            return true;
-                        }
+                        return false;
                    }

-                    // The exception or aggregate exception children were not sentry exceptions
-                    return false;
+                    if (FilteredExceptionMessages.Any(x => logEvent.Exception.Message.Contains(x)))
+                    {
+                        return false;
+                    }
                }

                return true;
--- a/src/NzbDrone.Common/Radarr.Common.csproj
+++ b/src/NzbDrone.Common/Radarr.Common.csproj
@@ -8,12 +8,12 @@
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="5.0.1" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Sentry" Version="3.20.1" />
-    <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
+    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
+    <PackageReference Include="Sentry" Version="3.15.0" />
+    <PackageReference Include="NLog.Targets.Syslog" Version="6.0.3" />
    <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="System.Text.Json" Version="6.0.5" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
--- a/src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
--- a/src/NzbDrone.Core.Test/Datastore/DatabaseFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/DatabaseFixture.cs
@@ -27,20 +27,6 @@ namespace NzbDrone.Core.Test.Datastore
            Mocker.Resolve<IDatabase>().Vacuum();
        }

-        [Test]
-        public void postgres_should_not_contain_timestamp_without_timezone_columns()
-        {
-            if (Db.DatabaseType != DatabaseType.PostgreSQL)
-            {
-                return;
-            }
-
-            Mocker.Resolve<IDatabase>()
-                .OpenConnection().Query("SELECT table_name, column_name, data_type FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = 'public' AND data_type = 'timestamp without time zone'")
-                .Should()
-                .BeNullOrEmpty();
-        }
-
        [Test]
        public void get_version()
        {
--- a/src/NzbDrone.Core.Test/Datastore/Migration/208_collectionsFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/208_collectionsFixture.cs
@@ -56,51 +56,6 @@ namespace NzbDrone.Core.Test.Datastore.Migration
            movies.First().CollectionTmdbId.Should().Be(collections.First().TmdbId);
        }

-        [Test]
-        public void should_skip_collection_from_movie_without_name()
-        {
-            var db = WithMigrationTestDb(c =>
-            {
-                c.Insert.IntoTable("Movies").Row(new
-                {
-                    Monitored = true,
-                    MinimumAvailability = 4,
-                    ProfileId = 1,
-                    MovieFileId = 0,
-                    MovieMetadataId = 1,
-                    Path = string.Format("/Movies/{0}", "Title"),
-                });
-
-                c.Insert.IntoTable("MovieMetadata").Row(new
-                {
-                    Title = "Title",
-                    CleanTitle = "CleanTitle",
-                    Status = 3,
-                    Images = new[] { new { CoverType = "Poster" } }.ToJson(),
-                    Recommendations = new[] { 1 }.ToJson(),
-                    Runtime = 90,
-                    OriginalTitle = "Title",
-                    CleanOriginalTitle = "CleanTitle",
-                    OriginalLanguage = 1,
-                    TmdbId = 132456,
-                    Collection = new { TmdbId = 11 }.ToJson(),
-                    LastInfoSync = DateTime.UtcNow,
-                });
-            });
-
-            var collections = db.Query<Collection208>("SELECT \"Id\", \"Title\", \"TmdbId\", \"Monitored\" FROM \"Collections\"");
-
-            collections.Should().HaveCount(1);
-            collections.First().TmdbId.Should().Be(11);
-            collections.First().Title.Should().Be("Collection 11");
-            collections.First().Monitored.Should().BeFalse();
-
-            var movies = db.Query<Movie208>("SELECT \"Id\", \"CollectionTmdbId\" FROM \"MovieMetadata\"");
-
-            movies.Should().HaveCount(1);
-            movies.First().CollectionTmdbId.Should().Be(collections.First().TmdbId);
-        }
-
        [Test]
        public void should_not_duplicate_collection()
        {
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
@@ -1,8 +1,6 @@
-using System;
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies;
@@ -170,80 +168,5 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                   .Should()
                   .BeFalse();
        }
-
-        [Test]
-        public void should_return_false_when_repack_but_auto_download_repack_is_false()
-        {
-            Mocker.GetMock<IConfigService>()
-                  .Setup(s => s.DownloadPropersAndRepacks)
-                  .Returns(ProperDownloadTypes.DoNotUpgrade);
-
-            _parsedMovieInfo.Quality.Revision.IsRepack = true;
-            _movie.MovieFileId = 1;
-            _movie.MovieFile = Builder<MovieFile>.CreateNew()
-                                                 .With(e => e.Quality = new QualityModel(Quality.SDTV))
-                                                 .With(e => e.ReleaseGroup = "Radarr")
-                                                 .Build();
-
-            var remoteMovie = Builder<RemoteMovie>.CreateNew()
-                                                      .With(e => e.ParsedMovieInfo = _parsedMovieInfo)
-                                                      .With(e => e.Movie = _movie)
-                                                      .Build();
-
-            Subject.IsSatisfiedBy(remoteMovie, null)
-                   .Accepted
-                   .Should()
-                   .BeFalse();
-        }
-
-        [Test]
-        public void should_return_true_when_repack_but_auto_download_repack_is_true()
-        {
-            Mocker.GetMock<IConfigService>()
-                  .Setup(s => s.DownloadPropersAndRepacks)
-                  .Returns(ProperDownloadTypes.PreferAndUpgrade);
-
-            _parsedMovieInfo.Quality.Revision.IsRepack = true;
-            _movie.MovieFileId = 1;
-            _movie.MovieFile = Builder<MovieFile>.CreateNew()
-                                                 .With(e => e.Quality = new QualityModel(Quality.SDTV))
-                                                 .With(e => e.ReleaseGroup = "Radarr")
-                                                 .Build();
-
-            var remoteMovie = Builder<RemoteMovie>.CreateNew()
-                                                      .With(e => e.ParsedMovieInfo = _parsedMovieInfo)
-                                                      .With(e => e.Movie = _movie)
-                                                      .Build();
-
-            Subject.IsSatisfiedBy(remoteMovie, null)
-                   .Accepted
-                   .Should()
-                   .BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_when_repacks_are_not_preferred()
-        {
-            Mocker.GetMock<IConfigService>()
-                  .Setup(s => s.DownloadPropersAndRepacks)
-                  .Returns(ProperDownloadTypes.DoNotPrefer);
-
-            _parsedMovieInfo.Quality.Revision.IsRepack = true;
-            _movie.MovieFileId = 1;
-            _movie.MovieFile = Builder<MovieFile>.CreateNew()
-                                                 .With(e => e.Quality = new QualityModel(Quality.SDTV))
-                                                 .With(e => e.ReleaseGroup = "Radarr")
-                                                 .Build();
-
-            var remoteMovie = Builder<RemoteMovie>.CreateNew()
-                                                      .With(e => e.ParsedMovieInfo = _parsedMovieInfo)
-                                                      .With(e => e.Movie = _movie)
-                                                      .Build();
-
-            Subject.IsSatisfiedBy(remoteMovie, null)
-                   .Accepted
-                   .Should()
-                   .BeTrue();
-        }
    }
 }
--- a/src/NzbDrone.Core.Test/Extras/ExtraServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Extras/ExtraServiceFixture.cs
@@ -1,245 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Extras;
-using NzbDrone.Core.Extras.Files;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.Extras
-{
-    [TestFixture]
-    public class ExtraServiceFixture : CoreTest<ExtraService>
-    {
-        private Movie _movie;
-        private MovieFile _movieFile;
-        private LocalMovie _localMovie;
-
-        private string _movieFolder;
-        private string _releaseFolder;
-
-        private Mock<IManageExtraFiles> _subtitleService;
-        private Mock<IManageExtraFiles> _otherExtraService;
-
-        [SetUp]
-        public void Setup()
-        {
-            _movieFolder = @"C:\Test\Movies\Movie Title".AsOsAgnostic();
-            _releaseFolder = @"C:\Test\Unsorted TV\Movie.Title.2022".AsOsAgnostic();
-
-            _movie = Builder<Movie>.CreateNew()
-                                     .With(s => s.Path = _movieFolder)
-                                     .Build();
-
-            _movieFile = Builder<MovieFile>.CreateNew()
-                                               .With(f => f.Path = Path.Combine(_movie.Path, "Movie Title - 2022.mkv").AsOsAgnostic())
-                                               .With(f => f.RelativePath = @"Movie Title - 2022.mkv".AsOsAgnostic())
-                                               .Build();
-
-            _localMovie = Builder<LocalMovie>.CreateNew()
-                                                 .With(l => l.Movie = _movie)
-                                                 .With(l => l.Path = Path.Combine(_releaseFolder, "Movie.Title.2022.mkv").AsOsAgnostic())
-                                                 .Build();
-
-            _subtitleService = new Mock<IManageExtraFiles>();
-            _subtitleService.SetupGet(s => s.Order).Returns(0);
-            _subtitleService.Setup(s => s.CanImportFile(It.IsAny<LocalMovie>(), It.IsAny<MovieFile>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
-                .Returns(false);
-            _subtitleService.Setup(s => s.CanImportFile(It.IsAny<LocalMovie>(), It.IsAny<MovieFile>(), It.IsAny<string>(), ".srt", It.IsAny<bool>()))
-                .Returns(true);
-
-            _otherExtraService = new Mock<IManageExtraFiles>();
-            _otherExtraService.SetupGet(s => s.Order).Returns(1);
-            _otherExtraService.Setup(s => s.CanImportFile(It.IsAny<LocalMovie>(), It.IsAny<MovieFile>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
-                .Returns(true);
-
-            Mocker.SetConstant<IEnumerable<IManageExtraFiles>>(new[]
-            {
-                _subtitleService.Object,
-                _otherExtraService.Object
-            });
-
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.FolderExists(It.IsAny<string>()))
-                  .Returns(false);
-
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetParentFolder(It.IsAny<string>()))
-                  .Returns((string path) => Directory.GetParent(path).FullName);
-
-            WithExistingFolder(_movie.Path);
-            WithExistingFile(_movieFile.Path);
-            WithExistingFile(_localMovie.Path);
-
-            Mocker.GetMock<IConfigService>().Setup(v => v.ImportExtraFiles).Returns(true);
-            Mocker.GetMock<IConfigService>().Setup(v => v.ExtraFileExtensions).Returns("nfo,srt");
-        }
-
-        private void WithExistingFolder(string path, bool exists = true)
-        {
-            var dir = Path.GetDirectoryName(path);
-
-            if (exists && dir.IsNotNullOrWhiteSpace())
-            {
-                WithExistingFolder(dir);
-            }
-
-            Mocker.GetMock<IDiskProvider>().Setup(v => v.FolderExists(path)).Returns(exists);
-        }
-
-        private void WithExistingFile(string path, bool exists = true, int size = 1000)
-        {
-            var dir = Path.GetDirectoryName(path);
-
-            if (exists && dir.IsNotNullOrWhiteSpace())
-            {
-                WithExistingFolder(dir);
-            }
-
-            Mocker.GetMock<IDiskProvider>().Setup(v => v.FileExists(path)).Returns(exists);
-            Mocker.GetMock<IDiskProvider>().Setup(v => v.GetFileSize(path)).Returns(size);
-        }
-
-        private void WithExistingFiles(List<string> files)
-        {
-            foreach (string file in files)
-            {
-                WithExistingFile(file);
-            }
-
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetFiles(_releaseFolder, It.IsAny<SearchOption>()))
-                  .Returns(files.ToArray());
-        }
-
-        [Test]
-        public void should_not_pass_file_if_import_disabled()
-        {
-            Mocker.GetMock<IConfigService>().Setup(v => v.ImportExtraFiles).Returns(false);
-
-            var nfofile = Path.Combine(_releaseFolder, "Movie.Title.2022.nfo").AsOsAgnostic();
-
-            var files = new List<string>
-            {
-                _localMovie.Path,
-                nfofile
-            };
-
-            WithExistingFiles(files);
-
-            Subject.ImportMovie(_localMovie, _movieFile, true);
-
-            _subtitleService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
-            _otherExtraService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
-        }
-
-        [Test]
-        [TestCase("Movie Title - 2022.sub")]
-        [TestCase("Movie Title - 2022.ass")]
-        public void should_not_pass_unwanted_file(string filePath)
-        {
-            Mocker.GetMock<IConfigService>().Setup(v => v.ImportExtraFiles).Returns(false);
-
-            var nfofile = Path.Combine(_releaseFolder, filePath).AsOsAgnostic();
-
-            var files = new List<string>
-            {
-                _localMovie.Path,
-                nfofile
-            };
-
-            WithExistingFiles(files);
-
-            Subject.ImportMovie(_localMovie, _movieFile, true);
-
-            _subtitleService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
-            _otherExtraService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
-        }
-
-        [Test]
-        public void should_pass_subtitle_file_to_subtitle_service()
-        {
-            var subtitleFile = Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic();
-
-            var files = new List<string>
-            {
-                _localMovie.Path,
-                subtitleFile
-            };
-
-            WithExistingFiles(files);
-
-            Subject.ImportMovie(_localMovie, _movieFile, true);
-
-            _subtitleService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { subtitleFile }, true), Times.Once());
-            _otherExtraService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { subtitleFile }, true), Times.Never());
-        }
-
-        [Test]
-        public void should_pass_nfo_file_to_other_service()
-        {
-            var nfofile = Path.Combine(_releaseFolder, "Movie.Title.2022.nfo").AsOsAgnostic();
-
-            var files = new List<string>
-            {
-                _localMovie.Path,
-                nfofile
-            };
-
-            WithExistingFiles(files);
-
-            Subject.ImportMovie(_localMovie, _movieFile, true);
-
-            _subtitleService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { nfofile }, true), Times.Never());
-            _otherExtraService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { nfofile }, true), Times.Once());
-        }
-
-        [Test]
-        public void should_search_subtitles_when_importing_from_job_folder()
-        {
-            _localMovie.FolderMovieInfo = new ParsedMovieInfo();
-
-            var subtitleFile = Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic();
-
-            var files = new List<string>
-            {
-                _localMovie.Path,
-                subtitleFile
-            };
-
-            WithExistingFiles(files);
-
-            Subject.ImportMovie(_localMovie, _movieFile, true);
-
-            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.AllDirectories), Times.Once);
-            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.TopDirectoryOnly), Times.Never);
-        }
-
-        [Test]
-        public void should_not_search_subtitles_when_not_importing_from_job_folder()
-        {
-            _localMovie.FolderMovieInfo = null;
-
-            var subtitleFile = Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic();
-
-            var files = new List<string>
-            {
-                _localMovie.Path,
-                subtitleFile
-            };
-
-            WithExistingFiles(files);
-
-            Subject.ImportMovie(_localMovie, _movieFile, true);
-
-            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.AllDirectories), Times.Never);
-            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.TopDirectoryOnly), Times.Once);
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/Extras/Others/OtherExtraServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Extras/Others/OtherExtraServiceFixture.cs
@@ -1,84 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Extras.Others;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.Extras.Others
-{
-    [TestFixture]
-    public class OtherExtraServiceFixture : CoreTest<OtherExtraService>
-    {
-        private Movie _movie;
-        private MovieFile _movieFile;
-        private LocalMovie _localMovie;
-
-        private string _movieFolder;
-        private string _releaseFolder;
-
-        [SetUp]
-        public void Setup()
-        {
-            _movieFolder = @"C:\Test\Movies\Movie Title".AsOsAgnostic();
-            _releaseFolder = @"C:\Test\Unsorted Movies\Movie.Title.2022".AsOsAgnostic();
-
-            _movie = Builder<Movie>.CreateNew()
-                                     .With(s => s.Path = _movieFolder)
-                                     .Build();
-
-            _movieFile = Builder<MovieFile>.CreateNew()
-                                               .With(f => f.Path = Path.Combine(_movie.Path, "Movie Title - 2022.mkv").AsOsAgnostic())
-                                               .With(f => f.RelativePath = @"Movie Title - 2022.mkv")
-                                               .Build();
-
-            _localMovie = Builder<LocalMovie>.CreateNew()
-                                                 .With(l => l.Movie = _movie)
-                                                 .With(l => l.Path = Path.Combine(_releaseFolder, "Movie.Title.2022.mkv").AsOsAgnostic())
-                                                 .With(l => l.FileMovieInfo = new ParsedMovieInfo
-                                                 {
-                                                     MovieTitles = new List<string> { "Movie Title" },
-                                                     Year = 2022
-                                                 })
-                                                 .Build();
-        }
-
-        [Test]
-        [TestCase("Movie Title - 2022.nfo", "Movie Title - 2022.nfo")]
-        [TestCase("Movie.Title.2022.nfo", "Movie Title - 2022.nfo")]
-        [TestCase("Movie Title 2022.nfo", "Movie Title - 2022.nfo")]
-        [TestCase("Movie_Title_2022.nfo", "Movie Title - 2022.nfo")]
-        [TestCase(@"Movie.Title.2022\thumb.jpg", "Movie Title - 2022.jpg")]
-        public void should_import_matching_file(string filePath, string expectedOutputPath)
-        {
-            var files = new List<string> { Path.Combine(_releaseFolder, filePath).AsOsAgnostic() };
-
-            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
-
-            results.Count().Should().Be(1);
-
-            results[0].RelativePath.AsOsAgnostic().PathEquals(expectedOutputPath.AsOsAgnostic()).Should().Be(true);
-        }
-
-        [Test]
-        public void should_not_import_multiple_nfo_files()
-        {
-            var files = new List<string>
-            {
-                Path.Combine(_releaseFolder, "Movie.Title.2022.nfo").AsOsAgnostic(),
-                Path.Combine(_releaseFolder, "Movie_Title_2022.nfo").AsOsAgnostic(),
-            };
-
-            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
-
-            results.Count().Should().Be(1);
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/Extras/Subtitles/SubtitleServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Extras/Subtitles/SubtitleServiceFixture.cs
@@ -1,179 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Extras.Subtitles;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.MovieImport;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.Extras.Subtitles
-{
-    [TestFixture]
-    public class SubtitleServiceFixture : CoreTest<SubtitleService>
-    {
-        private Movie _movie;
-        private MovieFile _movieFile;
-        private LocalMovie _localMovie;
-
-        private string _MovieFolder;
-        private string _releaseFolder;
-
-        [SetUp]
-        public void Setup()
-        {
-            _MovieFolder = @"C:\Test\Movies\Movie Title".AsOsAgnostic();
-            _releaseFolder = @"C:\Test\Unsorted Movies\Movie.Title.2022".AsOsAgnostic();
-
-            _movie = Builder<Movie>.CreateNew()
-                                     .With(s => s.Path = _MovieFolder)
-                                     .Build();
-
-            _movieFile = Builder<MovieFile>.CreateNew()
-                                               .With(f => f.Path = Path.Combine(_movie.Path, "Movie Title - 2022.mkv").AsOsAgnostic())
-                                               .With(f => f.RelativePath = @"Movie Title - 2022.mkv".AsOsAgnostic())
-                                               .Build();
-
-            _localMovie = Builder<LocalMovie>.CreateNew()
-                                                 .With(l => l.Movie = _movie)
-                                                 .With(l => l.Path = Path.Combine(_releaseFolder, "Movie.Title.2022.mkv").AsOsAgnostic())
-                                                 .With(l => l.FileMovieInfo = new ParsedMovieInfo
-                                                 {
-                                                     MovieTitles = new List<string> { "Movie Title" },
-                                                     Year = 2022
-                                                 })
-                                                 .Build();
-
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetParentFolder(It.IsAny<string>()))
-                  .Returns((string path) => Directory.GetParent(path).FullName);
-
-            Mocker.GetMock<IDetectSample>().Setup(s => s.IsSample(It.IsAny<MovieMetadata>(), It.IsAny<string>()))
-                  .Returns(DetectSampleResult.NotSample);
-        }
-
-        [Test]
-        [TestCase("Movie.Title.2022.en.nfo")]
-        public void should_not_import_non_subtitle_file(string filePath)
-        {
-            var files = new List<string> { Path.Combine(_releaseFolder, filePath).AsOsAgnostic() };
-
-            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
-
-            results.Count().Should().Be(0);
-        }
-
-        [Test]
-        [TestCase("Movie Title - 2022.srt", "Movie Title - 2022.srt")]
-        [TestCase("Movie.Title.2022.en.srt", "Movie Title - 2022.en.srt")]
-        [TestCase("Movie.Title.2022.english.srt", "Movie Title - 2022.en.srt")]
-        [TestCase("Movie Title 2022_en_sdh_forced.srt", "Movie Title - 2022.en.sdh.forced.srt")]
-        [TestCase("Movie_Title_2022 en.srt", "Movie Title - 2022.en.srt")]
-        [TestCase(@"Subs\Movie.Title.2022\2_en.srt", "Movie Title - 2022.en.srt")]
-        [TestCase("sub.srt", "Movie Title - 2022.srt")]
-        public void should_import_matching_subtitle_file(string filePath, string expectedOutputPath)
-        {
-            var files = new List<string> { Path.Combine(_releaseFolder, filePath).AsOsAgnostic() };
-
-            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
-
-            results.Count().Should().Be(1);
-
-            results[0].RelativePath.AsOsAgnostic().PathEquals(expectedOutputPath.AsOsAgnostic()).Should().Be(true);
-        }
-
-        [Test]
-        public void should_import_multiple_subtitle_files_per_language()
-        {
-            var files = new List<string>
-            {
-                Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic(),
-                Path.Combine(_releaseFolder, "Movie.Title.2022.eng.srt").AsOsAgnostic(),
-                Path.Combine(_releaseFolder, "Subs", "Movie_Title_2022_en_forced.srt").AsOsAgnostic(),
-                Path.Combine(_releaseFolder, "Subs", "Movie.Title.2022", "2_fr.srt").AsOsAgnostic()
-            };
-
-            var expectedOutputs = new string[]
-            {
-                "Movie Title - 2022.1.en.srt",
-                "Movie Title - 2022.2.en.srt",
-                "Movie Title - 2022.en.forced.srt",
-                "Movie Title - 2022.fr.srt",
-            };
-
-            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
-
-            results.Count().Should().Be(expectedOutputs.Length);
-
-            for (int i = 0; i < expectedOutputs.Length; i++)
-            {
-                results[i].RelativePath.AsOsAgnostic().PathEquals(expectedOutputs[i].AsOsAgnostic()).Should().Be(true);
-            }
-        }
-
-        [Test]
-        public void should_import_multiple_subtitle_files_per_language_with_tags()
-        {
-            var files = new List<string>
-            {
-                Path.Combine(_releaseFolder, "Movie.Title.2022.en.forced.cc.srt").AsOsAgnostic(),
-                Path.Combine(_releaseFolder, "Movie.Title.2022.other.en.forced.cc.srt").AsOsAgnostic(),
-                Path.Combine(_releaseFolder, "Movie.Title.2022.en.forced.sdh.srt").AsOsAgnostic(),
-                Path.Combine(_releaseFolder, "Movie.Title.2022.en.forced.default.srt").AsOsAgnostic(),
-            };
-
-            var expectedOutputs = new[]
-            {
-                "Movie Title - 2022.1.en.forced.cc.srt",
-                "Movie Title - 2022.2.en.forced.cc.srt",
-                "Movie Title - 2022.en.forced.sdh.srt",
-                "Movie Title - 2022.en.forced.default.srt"
-            };
-
-            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
-
-            results.Count().Should().Be(expectedOutputs.Length);
-
-            for (int i = 0; i < expectedOutputs.Length; i++)
-            {
-                results[i].RelativePath.AsOsAgnostic().PathEquals(expectedOutputs[i].AsOsAgnostic()).Should().Be(true);
-            }
-        }
-
-        [Test]
-        [TestCase(@"Subs\2_en.srt", "Movie Title - 2022.en.srt")]
-        public void should_import_unmatching_subtitle_file_if_only_episode(string filePath, string expectedOutputPath)
-        {
-            var subtitleFile = Path.Combine(_releaseFolder, filePath).AsOsAgnostic();
-
-            var sampleFile = Path.Combine(_movie.Path, "Movie Title - 2022.sample.mkv").AsOsAgnostic();
-
-            var videoFiles = new string[]
-            {
-                _localMovie.Path,
-                sampleFile
-            };
-
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
-                  .Returns(videoFiles);
-
-            Mocker.GetMock<IDetectSample>().Setup(s => s.IsSample(It.IsAny<MovieMetadata>(), sampleFile))
-                  .Returns(DetectSampleResult.Sample);
-
-            var results = Subject.ImportFiles(_localMovie, _movieFile, new List<string> { subtitleFile }, true).ToList();
-
-            results.Count().Should().Be(1);
-
-            results[0].RelativePath.AsOsAgnostic().PathEquals(expectedOutputPath.AsOsAgnostic()).Should().Be(true);
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/Framework/DbTest.cs
+++ b/src/NzbDrone.Core.Test/Framework/DbTest.cs
@@ -3,9 +3,11 @@ using System.Collections.Generic;
 using System.Data.SQLite;
 using System.IO;
 using System.Linq;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
+using Moq;
 using Npgsql;
 using NUnit.Framework;
 using NzbDrone.Common.Extensions;
@@ -124,13 +126,13 @@ namespace NzbDrone.Core.Test.Framework

        private void CreatePostgresDb()
        {
-            var options = Mocker.Resolve<IOptions<PostgresOptions>>().Value;
+            var options = Mocker.Resolve<IOptionsMonitor<ConfigFileOptions>>().CurrentValue;
            PostgresDatabase.Create(options, MigrationType);
        }

        private void DropPostgresDb()
        {
-            var options = Mocker.Resolve<IOptions<PostgresOptions>>().Value;
+            var options = Mocker.Resolve<IOptionsMonitor<ConfigFileOptions>>().CurrentValue;
            PostgresDatabase.Drop(options, MigrationType);
        }

@@ -174,12 +176,11 @@ namespace NzbDrone.Core.Test.Framework
            SetupLogging();

            // populate the possible postgres options
-            var postgresOptions = PostgresDatabase.GetTestOptions();
-            _databaseType = postgresOptions.Host.IsNotNullOrWhiteSpace() ? DatabaseType.PostgreSQL : DatabaseType.SQLite;
+            var options = PostgresDatabase.GetTestOptions();
+            _databaseType = options.PostgresHost.IsNotNullOrWhiteSpace() ? DatabaseType.PostgreSQL : DatabaseType.SQLite;

            // Set up remaining container services
-            Mocker.SetConstant(Options.Create(postgresOptions));
-            Mocker.SetConstant<IConfigFileProvider>(Mocker.Resolve<ConfigFileProvider>());
+            Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>().Setup(x => x.CurrentValue).Returns(options);
            Mocker.SetConstant<IConnectionStringFactory>(Mocker.Resolve<ConnectionStringFactory>());
            Mocker.SetConstant<IMigrationController>(Mocker.Resolve<MigrationController>());

--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/LegacyPostgresCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/LegacyPostgresCheckFixture.cs
@@ -0,0 +1,51 @@
+using System;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.HealthCheck.Checks;
+using NzbDrone.Core.Localization;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.HealthCheck.Checks
+{
+    [TestFixture]
+    public class LegacyPostgresCheckFixture : CoreTest<LegacyPostgresCheck>
+    {
+        [SetUp]
+        public void Setup()
+        {
+            Mocker.GetMock<ILocalizationService>()
+                  .Setup(s => s.GetLocalizedString(It.IsAny<string>()))
+                  .Returns("Warning {0} -> {1}");
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            foreach (var name in new[] { "__Postgres__Host", "__Postgres__Port", ":Postgres:Host", ":Postgres:Port" })
+            {
+                Environment.SetEnvironmentVariable(BuildInfo.AppName + name, null);
+            }
+        }
+
+        [Test]
+        public void should_return_ok_normally()
+        {
+            Subject.Check().ShouldBeOk();
+        }
+
+        [TestCase("__")]
+        [TestCase(":")]
+        public void should_return_error_if_vars_defined(string separator)
+        {
+            Environment.SetEnvironmentVariable(BuildInfo.AppName + separator + "Postgres" + separator + "Host", "localhost");
+            Environment.SetEnvironmentVariable(BuildInfo.AppName + separator + "Postgres" + separator + "Port", "localhost");
+
+            var result = Subject.Check();
+            result.ShouldBeError("Warning " + BuildInfo.AppName + separator + "Postgres" + separator + "Host, " +
+                                 BuildInfo.AppName + separator + "Postgres" + separator + "Port -> " +
+                                 BuildInfo.AppName + separator + "PostgresHost, " +
+                                 BuildInfo.AppName + separator + "PostgresPort");
+        }
+    }
+}
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
@@ -1,9 +1,11 @@
+using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.HealthCheck.Checks;
 using NzbDrone.Core.Localization;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Update;

 namespace NzbDrone.Core.Test.HealthCheck.Checks
 {
@@ -20,9 +22,9 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks

        private void GivenValidBranch(string branch)
        {
-            Mocker.GetMock<IConfigFileProvider>()
-                    .SetupGet(s => s.Branch)
-                    .Returns(branch);
+            Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>()
+                .Setup(s => s.CurrentValue)
+                .Returns(new ConfigFileOptions { Branch = branch });
        }

        [TestCase("aphrodite")]
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs
@@ -176,7 +176,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
        public void should_return_ok_on_movie_imported_event()
        {
            GivenFolderExists(_downloadRootPath);
-            var importEvent = new MovieFileImportedEvent(new LocalMovie(), new MovieFile(), new List<MovieFile>(), true, new DownloadClientItem());
+            var importEvent = new MovieImportedEvent(new LocalMovie(), new MovieFile(), new List<MovieFile>(), true, new DownloadClientItem());

            Subject.Check(importEvent).ShouldBeOk();
        }
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
@@ -19,6 +20,10 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
            Mocker.GetMock<ILocalizationService>()
                  .Setup(s => s.GetLocalizedString(It.IsAny<string>()))
                  .Returns("Some Warning Message");
+
+            Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>()
+                .Setup(c => c.CurrentValue)
+                .Returns(new ConfigFileOptions());
        }

        [Test]
@@ -44,9 +49,9 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks

            const string startupFolder = @"/opt/nzbdrone";

-            Mocker.GetMock<IConfigFileProvider>()
-                  .Setup(s => s.UpdateAutomatically)
-                  .Returns(true);
+            Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>()
+                  .Setup(s => s.CurrentValue)
+                  .Returns(new ConfigFileOptions { UpdateAutomatically = true });

            Mocker.GetMock<IAppFolderInfo>()
                  .Setup(s => s.StartUpFolder)
@@ -67,9 +72,9 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
            const string startupFolder = @"/opt/nzbdrone";
            const string uiFolder = @"/opt/nzbdrone/UI";

-            Mocker.GetMock<IConfigFileProvider>()
-                  .Setup(s => s.UpdateAutomatically)
-                  .Returns(true);
+            Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>()
+                .Setup(s => s.CurrentValue)
+                .Returns(new ConfigFileOptions { UpdateAutomatically = true });

            Mocker.GetMock<IAppFolderInfo>()
                  .Setup(s => s.StartUpFolder)
@@ -91,13 +96,9 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
        {
            PosixOnly();

-            Mocker.GetMock<IConfigFileProvider>()
-                  .Setup(s => s.UpdateAutomatically)
-                  .Returns(true);
-
-            Mocker.GetMock<IConfigFileProvider>()
-                  .Setup(s => s.UpdateMechanism)
-                  .Returns(UpdateMechanism.Script);
+            Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>()
+                .Setup(s => s.CurrentValue)
+                .Returns(new ConfigFileOptions { UpdateAutomatically = true, UpdateMechanism = UpdateMechanism.Script });

            Mocker.GetMock<IAppFolderInfo>()
                  .Setup(s => s.StartUpFolder)
--- a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
@@ -91,7 +91,7 @@ namespace NzbDrone.Core.Test.HistoryTests
                DownloadId = "abcd"
            };

-            Subject.Handle(new MovieFileImportedEvent(localMovie, movieFile, new List<MovieFile>(), true, downloadClientItem));
+            Subject.Handle(new MovieImportedEvent(localMovie, movieFile, new List<MovieFile>(), true, downloadClientItem));

            Mocker.GetMock<IHistoryRepository>()
                .Verify(v => v.Insert(It.Is<MovieHistory>(h => h.SourceTitle == Path.GetFileNameWithoutExtension(localMovie.Path))));
--- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedCollectionsFixture.cs
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedCollectionsFixture.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
        }

        [Test]
-        public void should_delete_orphaned_collection_with_meta_but_no_movie_items()
+        public void should_not_delete_unorphaned_collection_items()
        {
            var collection = Builder<MovieCollection>.CreateNew()
                                              .With(h => h.Id = 3)
@@ -40,27 +40,6 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers

            Db.Insert(movie);

-            Subject.Clean();
-            AllStoredModels.Should().HaveCount(0);
-        }
-
-        [Test]
-        public void should_not_delete_unorphaned_collection()
-        {
-            var collection = Builder<MovieCollection>.CreateNew()
-                                              .With(h => h.Id = 3)
-                                              .With(h => h.TmdbId = 123456)
-                                              .With(h => h.Title = "Some Credit")
-                                              .BuildNew();
-
-            Db.Insert(collection);
-
-            var movieMeta = Builder<MovieMetadata>.CreateNew().With(m => m.CollectionTmdbId = collection.TmdbId).BuildNew();
-            Db.Insert(movieMeta);
-
-            var movie = Builder<Movie>.CreateNew().With(m => m.MovieMetadataId = movieMeta.Id).BuildNew();
-            Db.Insert(movie);
-
            Subject.Clean();
            AllStoredModels.Should().HaveCount(1);
        }
--- a/src/NzbDrone.Core.Test/Languages/LanguageFixture.cs
+++ b/src/NzbDrone.Core.Test/Languages/LanguageFixture.cs
@@ -47,8 +47,6 @@ namespace NzbDrone.Core.Test.Languages
                new object[] { 32, Language.Ukrainian },
                new object[] { 33, Language.Persian },
                new object[] { 34, Language.Bengali },
-                new object[] { 35, Language.Slovak },
-                new object[] { 36, Language.Latvian },
            };

        public static object[] ToIntCases =
@@ -90,8 +88,6 @@ namespace NzbDrone.Core.Test.Languages
                new object[] { Language.Ukrainian, 32 },
                new object[] { Language.Persian, 33 },
                new object[] { Language.Bengali, 34 },
-                new object[] { Language.Slovak, 35 },
-                new object[] { Language.Latvian, 36 },
            };

        [Test]
--- a/src/NzbDrone.Core.Test/MediaCoverTests/MediaCoverServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaCoverTests/MediaCoverServiceFixture.cs
@@ -4,10 +4,12 @@ using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
+using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.Movies;
 using NzbDrone.Core.Movies.Events;
@@ -31,6 +33,10 @@ namespace NzbDrone.Core.Test.MediaCoverTests
                .Build();

            Mocker.GetMock<IMovieService>().Setup(m => m.GetMovie(It.Is<int>(id => id == _movie.Id))).Returns(_movie);
+
+            Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>()
+                .Setup(x => x.CurrentValue)
+                .Returns(new ConfigFileOptions());
        }

        [Test]
--- a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateLanguageFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateLanguageFixture.cs
@@ -70,7 +70,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
        [Test]
        public void should_return_default_if_no_info_is_known()
        {
-            var result = Subject.Aggregate(_localMovie, null);
+            var result = Subject.Aggregate(_localMovie, null, false);

            result.Languages.Should().Contain(_movie.MovieMetadata.Value.OriginalLanguage);
        }
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                            null,
                            null);

-            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.French });
+            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.French });
        }

        [Test]
@@ -94,7 +94,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                            null,
                            null);

-            var aggregation = Subject.Aggregate(_localMovie, null);
+            var aggregation = Subject.Aggregate(_localMovie, null, false);

            aggregation.Languages.Should().Equal(new List<Language> { Language.German });
        }
@@ -107,7 +107,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                            new List<Language> { Language.Spanish },
                            null);

-            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.Spanish });
+            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.Spanish });
        }

        [Test]
@@ -118,7 +118,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                            new List<Language> { Language.Unknown },
                            null);

-            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
+            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
        }

        [Test]
@@ -129,7 +129,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                            new List<Language> { Language.Unknown },
                            new List<Language> { Language.Japanese, Language.English });

-            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.Japanese, Language.English });
+            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.Japanese, Language.English });
        }

        [Test]
@@ -140,7 +140,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                            new List<Language> { Language.Unknown },
                            new List<Language> { Language.Unknown });

-            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
+            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
        }
    }
 }
--- a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators

            GivenAugmenters(_fileExtensionAugmenter, nullMock);

-            var result = Subject.Aggregate(new LocalMovie(), null);
+            var result = Subject.Aggregate(new LocalMovie(), null, false);

            result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Extension);
            result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.Extension);
@@ -72,7 +72,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
        {
            GivenAugmenters(_fileExtensionAugmenter, _nameAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), null);
+            var result = Subject.Aggregate(new LocalMovie(), null, false);

            result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Name);
            result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -84,7 +84,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
        {
            GivenAugmenters(_fileExtensionAugmenter, _mediaInfoAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), null);
+            var result = Subject.Aggregate(new LocalMovie(), null, false);

            result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Extension);
            result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.MediaInfo);
@@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
        {
            GivenAugmenters(_nameAugmenter, _mediaInfoAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), null);
+            var result = Subject.Aggregate(new LocalMovie(), null, false);

            result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Name);
            result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.MediaInfo);
@@ -108,7 +108,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
        {
            GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);

            result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Name);
            result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -120,7 +120,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
        {
            GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);

            result.Quality.Revision.Version.Should().Be(1);
            result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Unknown);
@@ -134,7 +134,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators

            GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);

            result.Quality.Revision.Version.Should().Be(2);
            result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -148,7 +148,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators

            GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);

            result.Quality.Revision.Version.Should().Be(0);
            result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -165,7 +165,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators

            GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);

-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);

            result.Quality.Revision.Version.Should().Be(2);
            result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Name);
--- a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateReleaseGroupFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateReleaseGroupFixture.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                Movie = _movie
            };

-            Subject.Aggregate(localMovie, null);
+            Subject.Aggregate(localMovie, null, false);

            localMovie.ReleaseGroup.Should().Be("Viva");
        }
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                Movie = _movie
            };

-            Subject.Aggregate(localMovie, null);
+            Subject.Aggregate(localMovie, null, false);

            localMovie.ReleaseGroup.Should().Be("Drone");
        }
@@ -75,7 +75,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                Movie = _movie
            };

-            Subject.Aggregate(localMovie, null);
+            Subject.Aggregate(localMovie, null, false);

            localMovie.ReleaseGroup.Should().Be("Wizzy");
        }
@@ -95,7 +95,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                Movie = _movie
            };

-            Subject.Aggregate(localMovie, null);
+            Subject.Aggregate(localMovie, null, false);

            localMovie.ReleaseGroup.Should().Be("FraMeSToR");
        }
@@ -115,7 +115,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                Movie = _movie
            };

-            Subject.Aggregate(localMovie, null);
+            Subject.Aggregate(localMovie, null, false);

            localMovie.ReleaseGroup.Should().Be("FraMeSToR");
        }
--- a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/GetSceneNameFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/GetSceneNameFixture.cs
@@ -1,153 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.MovieImport;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.MediaFiles.MovieImport
-{
-    [TestFixture]
-    public class GetSceneNameFixture : CoreTest
-    {
-        private LocalMovie _localMovie;
-        private string _movieName = "movie.title.2022.dvdrip.x264-ingot";
-
-        [SetUp]
-        public void Setup()
-        {
-            var movie = Builder<Movie>.CreateNew()
-                                        .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() })
-                                        .With(s => s.Path = @"C:\Test\Movies\Movie Title".AsOsAgnostic())
-                                        .Build();
-
-            _localMovie = new LocalMovie
-            {
-                Movie = movie,
-                Path = Path.Combine(movie.Path, "Movie Title - 2022 - Episode Title.mkv"),
-                Quality = new QualityModel(Quality.Bluray720p),
-                ReleaseGroup = "DRONE"
-            };
-        }
-
-        private void GivenExistingFileOnDisk()
-        {
-            Mocker.GetMock<IMediaFileService>()
-                  .Setup(s => s.GetFilesWithRelativePath(It.IsAny<int>(), It.IsAny<string>()))
-                  .Returns(new List<MovieFile>());
-        }
-
-        [Test]
-        public void should_use_download_client_item_title_as_scene_name()
-        {
-            _localMovie.DownloadClientMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = _movieName
-            };
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .Be(_movieName);
-        }
-
-        [Test]
-        public void should_not_use_download_client_item_title_as_scene_name_if_there_are_other_video_files()
-        {
-            _localMovie.OtherVideoFiles = true;
-            _localMovie.DownloadClientMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = _movieName
-            };
-
-            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName)
-                                     .AsOsAgnostic();
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .BeNull();
-        }
-
-        [Test]
-        public void should_use_file_name_as_scenename_only_if_it_looks_like_scenename()
-        {
-            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName + ".mkv")
-                                     .AsOsAgnostic();
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .Be(_movieName);
-        }
-
-        [Test]
-        public void should_not_use_file_name_as_scenename_if_it_doesnt_look_like_scenename()
-        {
-            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName, "aaaaa.mkv")
-                                     .AsOsAgnostic();
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .BeNull();
-        }
-
-        [Test]
-        public void should_use_folder_name_as_scenename_only_if_it_looks_like_scenename()
-        {
-            _localMovie.FolderMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = _movieName
-            };
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .Be(_movieName);
-        }
-
-        [Test]
-        public void should_not_use_folder_name_as_scenename_if_it_doesnt_look_like_scenename()
-        {
-            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName, "aaaaa.mkv")
-                                     .AsOsAgnostic();
-
-            _localMovie.FolderMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = "aaaaa"
-            };
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .BeNull();
-        }
-
-        [Test]
-        public void should_not_use_folder_name_as_scenename_if_there_are_other_video_files()
-        {
-            _localMovie.OtherVideoFiles = true;
-            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName, "aaaaa.mkv")
-                                     .AsOsAgnostic();
-
-            _localMovie.FolderMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = _movieName
-            };
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .BeNull();
-        }
-
-        [TestCase(".mkv")]
-        [TestCase(".par2")]
-        [TestCase(".nzb")]
-        public void should_remove_extension_from_nzb_title_for_scene_name(string extension)
-        {
-            _localMovie.DownloadClientMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = _movieName + extension
-            };
-
-            SceneNameCalculator.GetSceneName(_localMovie).Should()
-                               .Be(_movieName);
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ta264	c7c5d176be	fixup! Modernize startup and ConfigFileProvider	2022-06-21 21:05:53 +01:00
ta264	31f082e516	Support legacy postgres options	2022-06-20 21:53:25 +01:00
ta264	a84ef3cd2f	Rename configFileProvider	2022-06-20 21:35:11 +01:00
ta264	41e8f7aa45	Modernize startup and ConfigFileProvider	2022-06-20 21:35:11 +01:00