initial additions

2026-03-13 15:34:56 -04:00 · 2021-12-07 16:37:59 +00:00
311 changed files with 2393 additions and 3930 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,14 +7,13 @@ variables:
  outputFolder: './_output'
  artifactsFolder: './_artifacts'
  testsFolder: './_tests'
-  majorVersion: '4.0.5'
+  majorVersion: '4.0.0'
  minorVersion: $[counter('minorVersion', 2000)]
  radarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(radarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.101'
-  innoVersion: '6.2.0'
+  dotnetVersion: '6.0.100'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn

 trigger:
@@ -201,11 +200,16 @@ stages:
          artifactName: WindowsFrontend
          targetPath: _output
        displayName: Fetch Frontend
+      - bash: ./build.sh --packages
+        displayName: Create Packages
      - bash: |
-          ./build.sh --packages --installer
-          cp setup/output/Radarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
-          cp setup/output/Radarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
-        displayName: Create Installers
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net6.0 //DRuntime=win-x86
+          cp setup/output/Radarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
+        displayName: Create .NET Core Windows installer
+      - bash: |
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net6.0 //DRuntime=win-x64
+          cp setup/output/Radarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
+        displayName: Create .NET Core Windows installer
      - publish: $(Build.ArtifactStagingDirectory)
        artifact: 'WindowsInstaller'
        displayName: Publish Installer
--- a/build.sh
+++ b/build.sh
@@ -233,32 +233,6 @@ Package()
    esac
 }

-BuildInstaller()
-{
-    local framework="$1"
-    local runtime="$2"
-    
-    ./_inno/ISCC.exe setup/radarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
-}
-
-InstallInno()
-{
-    ProgressStart "Installing portable Inno Setup"
-    
-    rm -rf _inno
-    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.0}.exe"
-    mkdir _inno
-    ./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno
-    rm innosetup.exe
-    
-    ProgressEnd "Installed portable Inno Setup"
-}
-
-RemoveInno()
-{
-    rm -rf _inno
-}
-
 PackageTests()
 {
    local framework="$1"
@@ -290,7 +264,6 @@ if [ $# -eq 0 ]; then
    BACKEND=YES
    FRONTEND=YES
    PACKAGES=YES
-    INSTALLER=NO
    LINT=YES
    ENABLE_BSD=NO
 fi
@@ -326,10 +299,6 @@ case $key in
        PACKAGES=YES
        shift # past argument
        ;;
-    --installer)
-        INSTALLER=YES
-        shift # past argument
-        ;;
    --lint)
        LINT=YES
        shift # past argument
@@ -413,11 +382,3 @@ then
        Package "$FRAMEWORK" "$RID"
    fi
 fi
-
-if [ "$INSTALLER" = "YES" ];
-then
-    InstallInno
-    BuildInstaller "net6.0" "win-x64"
-    BuildInstaller "net6.0" "win-x86"
-    RemoveInno
-fi
--- a/frontend/src/Activity/Blocklist/Blocklist.js
+++ b/frontend/src/Activity/Blocklist/Blocklist.js
@@ -120,7 +120,7 @@ class Blocklist extends Component {
        <PageToolbar>
          <PageToolbarSection>
            <PageToolbarButton
-              label={translate('RemoveSelected')}
+              label="Remove Selected"
              iconName={icons.REMOVE}
              isDisabled={!selectedIds.length}
              isSpinning={isRemoving}
--- a/frontend/src/Activity/History/Details/HistoryDetails.js
+++ b/frontend/src/Activity/History/Details/HistoryDetails.js
@@ -25,7 +25,6 @@ function HistoryDetails(props) {
      releaseGroup,
      nzbInfoUrl,
      downloadClient,
-      downloadClientName,
      downloadId,
      age,
      ageHours,
@@ -33,8 +32,6 @@ function HistoryDetails(props) {
      publishedDate
    } = data;

-    const downloadClientNameInfo = downloadClientName ?? downloadClient;
-
    return (
      <DescriptionList>
        <DescriptionListItem
@@ -74,12 +71,11 @@ function HistoryDetails(props) {
        }

        {
-          downloadClientNameInfo ?
+          !!downloadClient &&
            <DescriptionListItem
              title={translate('DownloadClient')}
-              data={downloadClientNameInfo}
-            /> :
-            null
+              data={downloadClient}
+            />
        }

        {
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js
@@ -161,7 +161,7 @@ class AddNewMovie extends Component {
                  {translate('YouCanAlsoSearch')}
                </div>
                <div>
-                  <Link to="https://wiki.servarr.com/radarr/faq#why-can-i-not-add-a-new-movie-to-radarr">
+                  <Link to="https://wiki.servarr.com/radarr/faq#why-cant-i-add-a-new-movie-to-radarr">
                    {translate('CantFindMovie')}
                  </Link>
                </div>
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
@@ -86,13 +86,6 @@ class AddNewMovieSearchResult extends Component {
    } = this.state;

    const linkProps = isExistingMovie ? { to: `/movie/${titleSlug}` } : { onPress: this.onPress };
-    const posterWidth = 167;
-    const posterHeight = 250;
-
-    const elementStyle = {
-      width: `${posterWidth}px`,
-      height: `${posterHeight}px`
-    };

    return (
      <div className={styles.searchResult}>
@@ -109,7 +102,6 @@ class AddNewMovieSearchResult extends Component {
                <div className={styles.posterContainer}>
                  <MoviePoster
                    className={styles.poster}
-                    style={elementStyle}
                    images={images}
                    size={250}
                    overflow={true}
@@ -122,7 +114,7 @@ class AddNewMovieSearchResult extends Component {
                      monitored={monitored}
                      hasFile={hasFile}
                      status={status}
-                      posterWidth={posterWidth}
+                      posterWidth={167}
                      detailedProgressBar={true}
                      queueStatus={queueStatus}
                      queueState={queueState}
@@ -191,7 +183,7 @@ class AddNewMovieSearchResult extends Component {
            <div>
              <Label size={sizes.LARGE}>
                <HeartRating
-                  ratings={ratings}
+                  rating={ratings.value}
                  iconSize={13}
                />
              </Label>
--- a/frontend/src/Calendar/Events/CalendarEvent.js
+++ b/frontend/src/Calendar/Events/CalendarEvent.js
@@ -43,15 +43,15 @@ class CalendarEvent extends Component {
    const link = `/movie/${titleSlug}`;
    const eventType = [];

-    if (inCinemas && moment(date).isSame(moment(inCinemas), 'day')) {
+    if (moment(date).isSame(moment(inCinemas), 'day')) {
      eventType.push('Cinemas');
    }

-    if (physicalRelease && moment(date).isSame(moment(physicalRelease), 'day')) {
+    if (moment(date).isSame(moment(physicalRelease), 'day')) {
      eventType.push('Physical');
    }

-    if (digitalRelease && moment(date).isSame(moment(digitalRelease), 'day')) {
+    if (moment(date).isSame(moment(digitalRelease), 'day')) {
      eventType.push('Digital');
    }

--- a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
@@ -166,9 +166,7 @@ class FilterBuilderModalContent extends Component {
            </div>
          </div>

-          <div className={styles.label}>
-            {translate('Filters')}
-          </div>
+          <div className={styles.label}>Filters</div>

          <div className={styles.rows}>
            {
--- a/frontend/src/Components/Form/AvailabilitySelectInput.js
+++ b/frontend/src/Components/Form/AvailabilitySelectInput.js
@@ -6,7 +6,8 @@ import SelectInput from './SelectInput';
 const availabilityOptions = [
  { key: 'announced', value: translate('Announced') },
  { key: 'inCinemas', value: translate('InCinemas') },
-  { key: 'released', value: translate('Released') }
+  { key: 'released', value: translate('Released') },
+  { key: 'preDB', value: translate('PreDB') }
 ];

 function AvailabilitySelectInput(props) {
--- a/frontend/src/Components/Form/DownloadClientSelectInputConnector.js
+++ b/frontend/src/Components/Form/DownloadClientSelectInputConnector.js
@@ -1,100 +0,0 @@
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchDownloadClients } from 'Store/Actions/settingsActions';
-import sortByName from 'Utilities/Array/sortByName';
-import EnhancedSelectInput from './EnhancedSelectInput';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.downloadClients,
-    (state, { includeAny }) => includeAny,
-    (state, { protocol }) => protocol,
-    (downloadClients, includeAny, protocolFilter) => {
-      const {
-        isFetching,
-        isPopulated,
-        error,
-        items
-      } = downloadClients;
-
-      const filteredItems = items.filter((item) => item.protocol === protocolFilter);
-
-      const values = _.map(filteredItems.sort(sortByName), (downloadClient) => {
-        return {
-          key: downloadClient.id,
-          value: downloadClient.name
-        };
-      });
-
-      if (includeAny) {
-        values.unshift({
-          key: 0,
-          value: '(Any)'
-        });
-      }
-
-      return {
-        isFetching,
-        isPopulated,
-        error,
-        values
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchFetchDownloadClients: fetchDownloadClients
-};
-
-class DownloadClientSelectInputConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    if (!this.props.isPopulated) {
-      this.props.dispatchFetchDownloadClients();
-    }
-  }
-
-  //
-  // Listeners
-
-  onChange = ({ name, value }) => {
-    this.props.onChange({ name, value: parseInt(value) });
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <EnhancedSelectInput
-        {...this.props}
-        onChange={this.onChange}
-      />
-    );
-  }
-}
-
-DownloadClientSelectInputConnector.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  includeAny: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired,
-  dispatchFetchDownloadClients: PropTypes.func.isRequired
-};
-
-DownloadClientSelectInputConnector.defaultProps = {
-  includeAny: false,
-  protocol: 'torrent'
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(DownloadClientSelectInputConnector);
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -8,7 +8,6 @@ import AvailabilitySelectInput from './AvailabilitySelectInput';
 import CaptchaInputConnector from './CaptchaInputConnector';
 import CheckInput from './CheckInput';
 import DeviceInputConnector from './DeviceInputConnector';
-import DownloadClientSelectInputConnector from './DownloadClientSelectInputConnector';
 import EnhancedSelectInput from './EnhancedSelectInput';
 import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
@@ -74,9 +73,6 @@ function getComponent(type) {
    case inputTypes.INDEXER_FLAGS_SELECT:
      return IndexerFlagsSelectInputConnector;

-    case inputTypes.DOWNLOAD_CLIENT_SELECT:
-      return DownloadClientSelectInputConnector;
-
    case inputTypes.LANGUAGE_SELECT:
      return LanguageSelectInputConnector;

--- a/frontend/src/Components/HeartRating.css
+++ b/frontend/src/Components/HeartRating.css
@@ -1,5 +1,4 @@
-.image {
-  align-content: center;
+.heart {
  margin-right: 5px;
-  vertical-align: -0.125em;
+  color: $themeRed;
 }
--- a/frontend/src/Components/HeartRating.js
+++ b/frontend/src/Components/HeartRating.js
--- a/frontend/src/Components/ImdbRating.css
+++ b/frontend/src/Components/ImdbRating.css
@@ -1,5 +0,0 @@
-.image {
-  align-content: center;
-  margin-right: 5px;
-  vertical-align: -0.125em;
-}
--- a/frontend/src/Components/ImdbRating.js
+++ b/frontend/src/Components/ImdbRating.js
--- a/frontend/src/Components/Page/Header/PageHeader.js
+++ b/frontend/src/Components/Page/Header/PageHeader.js
@@ -81,7 +81,7 @@ class PageHeader extends Component {
          <IconButton
            className={styles.donate}
            name={icons.HEART}
-            to="https://radarr.video/donate"
+            to="https://opencollective.com/radarr"
            size={14}
          />
          <IconButton
--- a/frontend/src/Components/Page/PageJumpBar.js
+++ b/frontend/src/Components/Page/PageJumpBar.js
@@ -100,9 +100,7 @@ class PageJumpBar extends Component {
  // Listeners

  onMeasure = ({ height }) => {
-    if (height > 0) {
-      this.setState({ height });
-    }
+    this.setState({ height });
  }

  //
--- a/frontend/src/Components/RottenTomatoRating.css
+++ b/frontend/src/Components/RottenTomatoRating.css
@@ -1,5 +0,0 @@
-.image {
-  align-content: center;
-  margin-right: 5px;
-  vertical-align: -0.125em;
-}
--- a/frontend/src/Components/RottenTomatoRating.js
+++ b/frontend/src/Components/RottenTomatoRating.js
@@ -1,58 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { PureComponent } from 'react';
-import styles from './RottenTomatoRating.css';
-
-class RottenTomatoRating extends PureComponent {
-
-  //
-  // Render
-
-  render() {
-
-    const {
-      ratings,
-      hideIcon,
-      iconSize
-    } = this.props;
-
-    const rtRotten = 'data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNTYwIDU2MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNDQ1LjE4NSA0NDQuNjg0Yy03OS4zNjkgNC4xNjctOTUuNTg3LTg2LjY1Mi0xMjYuNzI2LTg2LjAwNi0xMy4yNjguMjc5LTIzLjcyNiAxNC4xNTEtMTkuMTMzIDMwLjMyIDIuNTI1IDguODg4IDkuNTMgMjEuOTIzIDEzLjk0NCAzMC4wMTEgMTUuNTcgMjguNTQ0LTcuNDQ3IDYwLjg0NS0zNC4zODMgNjMuNTc3LTQ0Ljc2IDQuNTQtNjMuNDMzLTIxLjQyNi02Mi4yNzgtNDguMDA3IDEuMy0yOS44NCAyNi42LTYwLjMzMS42NS03My4zMDUtMjcuMTk0LTEzLjU5Ny00OS4zMDEgMzkuNTcyLTc1LjMyNSA1MS40MzktMjMuNTUzIDEwLjc0MS01Ni4yNDggMi40MTMtNjcuODcyLTIzLjc0MS04LjE2NC0xOC4zNzktNi42OC01My43NjggMjkuNjctNjcuMjcgMjIuNzA2LTguNDMzIDczLjMwNSAxMS4wMjkgNzUuOS0xMy42MjMgMi45OTItMjguNDE2LTUzLjE1NS0zMC44MTItNzAuMDYtMzcuNjI2LTI5LjkxMi0xMi4wNTUtNDcuNTY3LTM3Ljg1LTMzLjczNC02NS41MjIgMTAuMzc4LTIwLjc1NyA0MC45MTUtMjkuMjAzIDY0LjIyMy0yMC4xMSAyNy45MjIgMTAuODkyIDMyLjQwNCAzOS44NTMgNDYuNzEgNTEuODk3IDEyLjMyNCAxMC4zOCAyOS4xOSAxMS42OCA0MC4yMiA0LjU0MyA4LjEzNS01LjI2NSAxMC44NDMtMTYuODI4IDcuNzc0LTI3LjM5LTQuMDctMTQuMDIzLTE0Ljg3NS0yMi43NzMtMjUuNDE1LTMxLjM0Ni0xOC43NTgtMTUuMjQ5LTQ1LjI0LTI4LjM2LTI5LjIyMi02OS45ODMgMTMuMTMtMzQuMTEgNTEuNjQyLTM1LjM0IDUxLjY0Mi0zNS4zNCAxNS4zLTEuNzIgMjkuMDAyIDIuOSA0MC4xNjcgMTIuODc1IDE0LjkyNyAxMy4zMzUgMTcuODM0IDMxLjE2IDE1LjMzNiA1MC4xNzYtMi4yODMgMTcuMzU4LTguNDI2IDMyLjU2LTExLjYzIDQ5Ljc1OS0zLjcxNyAxOS45NjYgNi45NTQgNDAuMDg2IDI3LjI0OSA0MC44NjkgMjYuNjk0IDEuMDMxIDM0LjY5OC0xOS40ODYgMzcuOTY0LTMyLjQ5MiA0Ljc4Mi0xOS4wMjggMTEuMDU4LTM2LjY5NCAyOC43MTgtNDcuODIgMjUuMzQ2LTE1Ljk3IDYwLjU1Mi0xMi40NyA3Ni44ODYgMTguMjIyIDEyLjkyIDI0LjI4NCA4Ljc3MiA1Ny43MTUtMTEuMDQ3IDc1Ljk3LTguODkyIDguMTg4LTE5LjU4NCAxMS4wNzUtMzEuMTQ4IDExLjE1Ni0xNi41ODUuMTE3LTMzLjE2Mi0uMjktNDguNTU2IDcuNDcxLTEwLjQ4IDUuMjgxLTE1LjA0NyAxMy44ODgtMTUuMDQ1IDI1LjQyMyAwIDExLjI0MiA1Ljg1MyAxOC41ODUgMTUuMzM2IDIzLjM2MyAxNy44NiA5LjAwMyAzNy41NzcgMTAuODQzIDU2Ljg3MSAxNC4yMjIgMjcuOTggNC45IDUyLjU4MSAxNC43NTUgNjguMzc1IDQwLjcyLjE0Mi4yMjguMjguNDU4LjQxNS42OSAxOC4xMzkgMzAuNzQxLS44MzEgNzUuMDA1LTM2LjQ3NiA3Ni44NzgiIGZpbGw9IiMwQUM4NTUiLz48L3N2Zz4=';
-    const rtFresh = 'data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNTYwIDU2MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtNDc4LjI5IDI5Ni45OGMtMy45OS02My45NjYtMzYuNTItMTExLjgyLTg1LjQ2OC0xMzguNTggMC4yNzggMS41Ni0xLjEwOSAzLjUwOC0yLjY4OCAyLjgxOC0zMi4wMTYtMTQuMDA2LTg2LjMyOCAzMS4zMi0xMjQuMjggNy41ODQgMC4yODUgOC41MTktMS4zNzggNTAuMDcyLTU5LjkxNCA1Mi40ODMtMS4zODIgMC4wNTYtMi4xNDItMS4zNTUtMS4yNjgtMi4zNTQgNy44MjgtOC45MjkgMTUuNzMyLTMxLjUzNSA0LjM2Ny00My41ODYtMjQuMzM4IDIxLjgxLTM4LjQ3MiAzMC4wMTctODUuMTM4IDE5LjE4Ni0yOS44NzggMzEuMjQxLTQ2LjgwOSA3NC00My40ODUgMTI3LjI2IDYuNzggMTA4Ljc0IDEwOC42MyAxNzAuODkgMjExLjE5IDE2NC40OSAxMDIuNTYtNi4zOTUgMTkzLjQ3LTgwLjU3MiAxODYuNjgtMTg5LjMxIiBmaWxsPSIjRkEzMjBBIi8+PHBhdGggZD0iTTI5MS4zNzUgMTMyLjI5M2MyMS4wNzUtNS4wMjMgODEuNjkzLS40OSAxMDEuMTE0IDI1LjI3NCAxLjE2NiAxLjU0NS0uNDc1IDQuNDY4LTIuMzU1IDMuNjQ4LTMyLjAxNi0xNC4wMDYtODYuMzI4IDMxLjMyLTEyNC4yODIgNy41ODQuMjg1IDguNTE5LTEuMzc4IDUwLjA3Mi01OS45MTQgNTIuNDgzLTEuMzgyLjA1Ni0yLjE0Mi0xLjM1NS0xLjI2OC0yLjM1NCA3LjgyOC04LjkyOSAxNS43My0zMS41MzUgNC4zNjctNDMuNTg2LTI2LjUxMiAyMy43NTgtNDAuODg0IDMxLjM5Mi05OC40MjYgMTUuODM4LTEuODgzLS41MDgtMS4yNDEtMy41MzUuNzYyLTQuMjk4IDEwLjg3Ni00LjE1NyAzNS41MTUtMjIuMzYxIDU4LjgyNC0zMC4zODUgNC40MzgtMS41MjYgOC44NjItMi43MSAxMy4xOC0zLjQtMjUuNjY1LTIuMjkzLTM3LjIzNS01Ljg2Mi01My41NTktMy40LTEuNzg5LjI3LTMuMDA0LTEuODEzLTEuODk1LTMuMjQxIDIxLjk5NS0yOC4zMzIgNjIuNTEzLTM2Ljg4OCA4Ny41MTItMjEuODM3LTE1LjQxLTE5LjA5NC0yNy40OC0zNC4zMjEtMjcuNDgtMzQuMzIxbDI4LjYwMS0xNi4yNDZzMTEuODE3IDI2LjQgMjAuNDE0IDQ1LjYxNGMyMS4yNzUtMzEuNDM1IDYwLjg2LTM0LjMzNiA3Ny41ODUtMTIuMDMzLjk5MiAxLjMyNi0uMDQ1IDMuMjEtMS43MDIgMy4xNzEtMTMuNjEyLS4zMzEtMjEuMTA3IDEyLjA1LTIxLjY3NSAyMS40NjZsLjE5Ny4wMjMiIGZpbGw9IiMwMDkxMkQiLz48L3N2Zz4=';
-
-    const rating = ratings.rottenTomatoes;
-
-    let ratingString = '0%';
-
-    if (rating) {
-      ratingString = `${rating.value}%`;
-    }
-
-    return (
-      <span>
-        {
-          !hideIcon &&
-            <img
-              className={styles.image}
-              src={rating.value > 50 ? rtFresh : rtRotten}
-              style={{
-                height: `${iconSize}px`
-              }}
-            />
-        }
-
-        {ratingString}
-      </span>
-    );
-  }
-}
-
-RottenTomatoRating.propTypes = {
-  ratings: PropTypes.object.isRequired,
-  iconSize: PropTypes.number.isRequired,
-  hideIcon: PropTypes.bool
-};
-
-RottenTomatoRating.defaultProps = {
-  iconSize: 14
-};
-
-export default RottenTomatoRating;
--- a/frontend/src/Components/TmdbRating.css
+++ b/frontend/src/Components/TmdbRating.css
@@ -1,5 +0,0 @@
-.image {
-  align-content: center;
-  margin-right: 5px;
-  vertical-align: -0.125em;
-}
--- a/frontend/src/Components/TmdbRating.js
+++ b/frontend/src/Components/TmdbRating.js
@@ -1,57 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { PureComponent } from 'react';
-import styles from './TmdbRating.css';
-
-class TmdbRating extends PureComponent {
-
-  //
-  // Render
-
-  render() {
-
-    const {
-      ratings,
-      hideIcon,
-      iconSize
-    } = this.props;
-
-    const tmdbImage = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTAuMjQgODEuNTIiPjxkZWZzPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgeTE9IjQwLjc2IiB4Mj0iMTkwLjI0IiB5Mj0iNDAuNzYiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM5MGNlYTEiLz48c3RvcCBvZmZzZXQ9Ii41NiIgc3RvcC1jb2xvcj0iIzNjYmVjOSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzAwYjNlNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxwYXRoIGQ9Ik0xMDUuNjcgMzYuMDZoNjYuOWExNy42NyAxNy42NyAwIDAwMTcuNjctMTcuNjZBMTcuNjcgMTcuNjcgMCAwMDE3Mi41Ny43M2gtNjYuOUExNy42NyAxNy42NyAwIDAwODggMTguNGExNy42NyAxNy42NyAwIDAwMTcuNjcgMTcuNjZ6bS04OCA0NWg3Ni45YTE3LjY3IDE3LjY3IDAgMDAxNy42Ny0xNy42NiAxNy42NyAxNy42NyAwIDAwLTE3LjY3LTE3LjY3aC03Ni45QTE3LjY3IDE3LjY3IDAgMDAwIDYzLjRhMTcuNjcgMTcuNjcgMCAwMDE3LjY3IDE3LjY2em0tNy4yNi00NS42NGg3LjhWNi45MmgxMC4xVjBoLTI4djYuOWgxMC4xem0yOC4xIDBoNy44VjguMjVoLjFsOSAyNy4xNWg2bDkuMy0yNy4xNWguMVYzNS40aDcuOFYwSDY2Ljc2bC04LjIgMjMuMWgtLjFMNTAuMzEgMGgtMTEuOHptMTEzLjkyIDIwLjI1YTE1LjA3IDE1LjA3IDAgMDAtNC41Mi01LjUyIDE4LjU3IDE4LjU3IDAgMDAtNi42OC0zLjA4IDMzLjU0IDMzLjU0IDAgMDAtOC4wNy0xaC0xMS43djM1LjRoMTIuNzVhMjQuNTggMjQuNTggMCAwMDcuNTUtMS4xNSAxOS4zNCAxOS4zNCAwIDAwNi4zNS0zLjMyIDE2LjI3IDE2LjI3IDAgMDA0LjM3LTUuNSAxNi45MSAxNi45MSAwIDAwMS42My03LjU4IDE4LjUgMTguNSAwIDAwLTEuNjgtOC4yNXpNMTQ1IDY4LjZhOC44IDguOCAwIDAxLTIuNjQgMy40IDEwLjcgMTAuNyAwIDAxLTQgMS44MiAyMS41NyAyMS41NyAwIDAxLTUgLjU1aC00LjA1di0yMWg0LjZhMTcgMTcgMCAwMTQuNjcuNjMgMTEuNjYgMTEuNjYgMCAwMTMuODggMS44N0E5LjE0IDkuMTQgMCAwMTE0NSA1OWE5Ljg3IDkuODcgMCAwMTEgNC41MiAxMS44OSAxMS44OSAwIDAxLTEgNS4wOHptNDQuNjMtLjEzYTggOCAwIDAwLTEuNTgtMi42MiA4LjM4IDguMzggMCAwMC0yLjQyLTEuODUgMTAuMzEgMTAuMzEgMCAwMC0zLjE3LTF2LS4xYTkuMjIgOS4yMiAwIDAwNC40Mi0yLjgyIDcuNDMgNy40MyAwIDAwMS42OC01IDguNDIgOC40MiAwIDAwLTEuMTUtNC42NSA4LjA5IDguMDkgMCAwMC0zLTIuNzIgMTIuNTYgMTIuNTYgMCAwMC00LjE4LTEuMyAzMi44NCAzMi44NCAwIDAwLTQuNjItLjMzaC0xMy4ydjM1LjRoMTQuNWEyMi40MSAyMi40MSAwIDAwNC43Mi0uNSAxMy41MyAxMy41MyAwIDAwNC4yOC0xLjY1IDkuNDIgOS40MiAwIDAwMy4xLTMgOC41MiA4LjUyIDAgMDAxLjItNC42OCA5LjM5IDkuMzkgMCAwMC0uNTUtMy4xOHptLTE5LjQyLTE1Ljc1aDUuM2ExMCAxMCAwIDAxMS44NS4xOCA2LjE4IDYuMTggMCAwMTEuNy41NyAzLjM5IDMuMzkgMCAwMTEuMjIgMS4xMyAzLjIyIDMuMjIgMCAwMS40OCAxLjgyIDMuNjMgMy42MyAwIDAxLS40MyAxLjggMy40IDMuNCAwIDAxLTEuMTIgMS4yIDQuOTIgNC45MiAwIDAxLTEuNTguNjUgNy41MSA3LjUxIDAgMDEtMS43Ny4yaC01LjY1em0xMS43MiAyMGEzLjkgMy45IDAgMDEtMS4yMiAxLjMgNC42NCA0LjY0IDAgMDEtMS42OC43IDguMTggOC4xOCAwIDAxLTEuODIuMmgtN3YtOGg1LjlhMTUuMzUgMTUuMzUgMCAwMTIgLjE1IDguNDcgOC40NyAwIDAxMi4wNS41NSA0IDQgMCAwMTEuNTcgMS4xOCAzLjExIDMuMTEgMCAwMS42MyAyIDMuNzEgMy43MSAwIDAxLS40MyAxLjkyeiIgZmlsbD0idXJsKCNhKSIvPjwvc3ZnPg==';
-
-    const rating = ratings.tmdb;
-
-    let ratingString = '0%';
-
-    if (rating) {
-      ratingString = `${rating.value * 10}%`;
-    }
-
-    return (
-      <span title={`${rating.votes} votes`}>
-        {
-          !hideIcon &&
-            <img
-              className={styles.image}
-              src={tmdbImage}
-              style={{
-                height: `${iconSize}px`
-              }}
-            />
-        }
-
-        {ratingString}
-      </span>
-    );
-  }
-}
-
-TmdbRating.propTypes = {
-  ratings: PropTypes.object.isRequired,
-  iconSize: PropTypes.number.isRequired,
-  hideIcon: PropTypes.bool
-};
-
-TmdbRating.defaultProps = {
-  iconSize: 14
-};
-
-export default TmdbRating;
--- a/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js
+++ b/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js
@@ -73,7 +73,7 @@ function getInfoRowProps(row, props) {
    return {
      title: translate('Ratings'),
      iconName: icons.HEART,
-      label: `${props.ratings.tmdb.value * 10}%`
+      label: `${props.ratings.value * 10}%`
    };
  }

--- a/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js
+++ b/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js
@@ -112,7 +112,7 @@ function DiscoverMoviePosterInfo(props) {
    return (
      <div className={styles.info}>
        <HeartRating
-          ratings={ratings}
+          rating={ratings.value}
        />
      </div>
    );
@@ -129,7 +129,7 @@ DiscoverMoviePosterInfo.propTypes = {
  digitalRelease: PropTypes.string,
  physicalRelease: PropTypes.string,
  runtime: PropTypes.number,
-  ratings: PropTypes.arrayOf(PropTypes.object).isRequired,
+  ratings: PropTypes.object,
  sortKey: PropTypes.string.isRequired,
  showRelativeDates: PropTypes.bool.isRequired,
  shortDateFormat: PropTypes.string.isRequired,
--- a/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
+++ b/frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js
@@ -246,7 +246,7 @@ class DiscoverMovieRow extends Component {
                  className={styles[name]}
                >
                  <HeartRating
-                    ratings={ratings}
+                    rating={ratings.value}
                  />
                </VirtualTableRowCell>
              );
@@ -373,7 +373,7 @@ DiscoverMovieRow.propTypes = {
  digitalRelease: PropTypes.string,
  runtime: PropTypes.number,
  genres: PropTypes.arrayOf(PropTypes.string).isRequired,
-  ratings: PropTypes.arrayOf(PropTypes.object).isRequired,
+  ratings: PropTypes.object.isRequired,
  certification: PropTypes.string,
  collection: PropTypes.object,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
--- a/frontend/src/Helpers/Props/inputTypes.js
+++ b/frontend/src/Helpers/Props/inputTypes.js
@@ -13,7 +13,6 @@ export const QUALITY_PROFILE_SELECT = 'qualityProfileSelect';
 export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
 export const INDEXER_FLAGS_SELECT = 'indexerFlagsSelect';
 export const LANGUAGE_SELECT = 'languageSelect';
-export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
 export const SELECT = 'select';
 export const DYNAMIC_SELECT = 'dynamicSelect';
 export const TAG = 'tag';
@@ -36,7 +35,6 @@ export const all = [
  PASSWORD,
  PATH,
  QUALITY_PROFILE_SELECT,
-  DOWNLOAD_CLIENT_SELECT,
  ROOT_FOLDER_SELECT,
  INDEXER_FLAGS_SELECT,
  LANGUAGE_SELECT,
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
@@ -19,7 +19,6 @@ import { align, icons, kinds, scrollDirections } from 'Helpers/Props';
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
-import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
@@ -41,11 +40,6 @@ const columns = [
    isSortable: true,
    isVisible: true
  },
-  {
-    name: 'releaseGroup',
-    label: translate('ReleaseGroup'),
-    isVisible: true
-  },
  {
    name: 'quality',
    label: translate('Quality'),
@@ -89,7 +83,6 @@ const SELECT = 'select';
 const MOVIE = 'movie';
 const LANGUAGE = 'language';
 const QUALITY = 'quality';
-const RELEASE_GROUP = 'releaseGroup';

 class InteractiveImportModalContent extends Component {

@@ -209,11 +202,10 @@ class InteractiveImportModalContent extends Component {
    const errorMessage = getErrorMessage(error, translate('UnableToLoadManualImportItems'));

    const bulkSelectOptions = [
-      { key: SELECT, value: translate('SelectDotDot'), disabled: true },
+      {
+        key: SELECT, value: translate('SelectDotDot'), disabled: true },
      { key: LANGUAGE, value: translate('SelectLanguage') },
-      { key: QUALITY, value: translate('SelectQuality') },
-      { key: RELEASE_GROUP, value: translate('SelectReleaseGroup') }
-    ];
+      { key: QUALITY, value: translate('SelectQuality') }];

    if (allowMovieChange) {
      bulkSelectOptions.splice(1, 0, {
@@ -380,13 +372,6 @@ class InteractiveImportModalContent extends Component {
          real={false}
          onModalClose={this.onSelectModalClose}
        />
-
-        <SelectReleaseGroupModal
-          isOpen={selectModalOpen === RELEASE_GROUP}
-          ids={selectedIds}
-          releaseGroup=""
-          onModalClose={this.onSelectModalClose}
-        />
      </ModalContent>
    );
  }
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js
@@ -110,8 +110,7 @@ class InteractiveImportModalContentConnector extends Component {
        const {
          movie,
          quality,
-          languages,
-          releaseGroup
+          languages
        } = item;

        if (!movie) {
@@ -133,7 +132,6 @@ class InteractiveImportModalContentConnector extends Component {
          path: item.path,
          folderName: item.folderName,
          movieId: movie.id,
-          releaseGroup,
          quality,
          languages,
          downloadId: this.props.downloadId
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
@@ -11,7 +11,6 @@ import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
-import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import formatBytes from 'Utilities/Number/formatBytes';
@@ -29,7 +28,6 @@ class InteractiveImportRow extends Component {

    this.state = {
      isSelectMovieModalOpen: false,
-      isSelectReleaseGroupModalOpen: false,
      isSelectQualityModalOpen: false,
      isSelectLanguageModalOpen: false
    };
@@ -105,10 +103,6 @@ class InteractiveImportRow extends Component {
    this.setState({ isSelectMovieModalOpen: true });
  }

-  onSelectReleaseGroupPress = () => {
-    this.setState({ isSelectReleaseGroupModalOpen: true });
-  }
-
  onSelectQualityPress = () => {
    this.setState({ isSelectQualityModalOpen: true });
  }
@@ -122,11 +116,6 @@ class InteractiveImportRow extends Component {
    this.selectRowAfterChange(changed);
  }

-  onSelectReleaseGroupModalClose = (changed) => {
-    this.setState({ isSelectReleaseGroupModalOpen: false });
-    this.selectRowAfterChange(changed);
-  }
-
  onSelectQualityModalClose = (changed) => {
    this.setState({ isSelectQualityModalOpen: false });
    this.selectRowAfterChange(changed);
@@ -148,7 +137,6 @@ class InteractiveImportRow extends Component {
      movie,
      quality,
      languages,
-      releaseGroup,
      size,
      rejections,
      isReprocessing,
@@ -159,8 +147,7 @@ class InteractiveImportRow extends Component {
    const {
      isSelectMovieModalOpen,
      isSelectQualityModalOpen,
-      isSelectLanguageModalOpen,
-      isSelectReleaseGroupModalOpen
+      isSelectLanguageModalOpen
    } = this.state;

    const movieTitle = movie ? movie.title + ( movie.year > 0 ? ` (${movie.year})` : '') : '';
@@ -168,7 +155,6 @@ class InteractiveImportRow extends Component {
    const showMoviePlaceholder = isSelected && !movie;
    const showQualityPlaceholder = isSelected && !quality;
    const showLanguagePlaceholder = isSelected && !languages && !isReprocessing;
-    const showReleaseGroupPlaceholder = isSelected && !releaseGroup;

    return (
      <TableRow>
@@ -195,17 +181,6 @@ class InteractiveImportRow extends Component {
          }
        </TableRowCellButton>

-        <TableRowCellButton
-          title={translate('ClickToChangeReleaseGroup')}
-          onPress={this.onSelectReleaseGroupPress}
-        >
-          {
-            showReleaseGroupPlaceholder ?
-              <InteractiveImportRowCellPlaceholder /> :
-              releaseGroup
-          }
-        </TableRowCellButton>
-
        <TableRowCellButton
          className={styles.quality}
          title={translate('ClickToChangeQuality')}
@@ -293,13 +268,6 @@ class InteractiveImportRow extends Component {
          onModalClose={this.onSelectMovieModalClose}
        />

-        <SelectReleaseGroupModal
-          isOpen={isSelectReleaseGroupModalOpen}
-          ids={[id]}
-          releaseGroup={releaseGroup ?? ''}
-          onModalClose={this.onSelectReleaseGroupModalClose}
-        />
-
        <SelectQualityModal
          isOpen={isSelectQualityModalOpen}
          ids={[id]}
@@ -328,7 +296,6 @@ InteractiveImportRow.propTypes = {
  movie: PropTypes.object,
  quality: PropTypes.object,
  languages: PropTypes.arrayOf(PropTypes.object),
-  releaseGroup: PropTypes.string,
  size: PropTypes.number.isRequired,
  rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
  isReprocessing: PropTypes.bool,
--- a/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js
+++ b/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js
@@ -128,7 +128,7 @@ class SelectLanguageModalContent extends Component {
            kind={kinds.SUCCESS}
            onPress={this.onLanguageSelect}
          >
-            {translate('SelectLanguages')}
+            {translate('SelectLanguges')}
          </Button>
        </ModalFooter>
      </ModalContent>
--- a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.js
+++ b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.js
@@ -1,37 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Modal from 'Components/Modal/Modal';
-import SelectReleaseGroupModalContentConnector from './SelectReleaseGroupModalContentConnector';
-
-class SelectReleaseGroupModal extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      isOpen,
-      onModalClose,
-      ...otherProps
-    } = this.props;
-
-    return (
-      <Modal
-        isOpen={isOpen}
-        onModalClose={onModalClose}
-      >
-        <SelectReleaseGroupModalContentConnector
-          {...otherProps}
-          onModalClose={onModalClose}
-        />
-      </Modal>
-    );
-  }
-}
-
-SelectReleaseGroupModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default SelectReleaseGroupModal;
--- a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js
+++ b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js
@@ -1,99 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Form from 'Components/Form/Form';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-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 } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-
-class SelectReleaseGroupModalContent extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    const {
-      releaseGroup
-    } = props;
-
-    this.state = {
-      releaseGroup
-    };
-  }
-
-  //
-  // Listeners
-
-  onReleaseGroupChange = ({ value }) => {
-    this.setState({ releaseGroup: value });
-  }
-
-  onReleaseGroupSelect = () => {
-    this.props.onReleaseGroupSelect(this.state);
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      onModalClose
-    } = this.props;
-
-    const {
-      releaseGroup
-    } = this.state;
-
-    return (
-      <ModalContent onModalClose={onModalClose}>
-        <ModalHeader>
-          {translate('ManualImportSetReleaseGroup')}
-        </ModalHeader>
-
-        <ModalBody>
-          <Form>
-            <FormGroup>
-              <FormLabel>{translate('ReleaseGroup')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.TEXT}
-                name="releaseGroup"
-                value={releaseGroup}
-                onChange={this.onReleaseGroupChange}
-              />
-            </FormGroup>
-          </Form>
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={onModalClose}>
-            {translate('Cancel')}
-          </Button>
-
-          <Button
-            kind={kinds.SUCCESS}
-            onPress={this.onReleaseGroupSelect}
-          >
-            {translate('SetReleaseGroup')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    );
-  }
-}
-
-SelectReleaseGroupModalContent.propTypes = {
-  releaseGroup: PropTypes.string.isRequired,
-  onReleaseGroupSelect: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default SelectReleaseGroupModalContent;
--- a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContentConnector.js
+++ b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContentConnector.js
@@ -1,54 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { reprocessInteractiveImportItems, updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
-import SelectReleaseGroupModalContent from './SelectReleaseGroupModalContent';
-
-const mapDispatchToProps = {
-  dispatchUpdateInteractiveImportItems: updateInteractiveImportItems,
-  dispatchReprocessInteractiveImportItems: reprocessInteractiveImportItems
-};
-
-class SelectReleaseGroupModalContentConnector extends Component {
-
-  //
-  // Listeners
-
-  onReleaseGroupSelect = ({ releaseGroup }) => {
-    const {
-      ids,
-      dispatchUpdateInteractiveImportItems,
-      dispatchReprocessInteractiveImportItems
-    } = this.props;
-
-    dispatchUpdateInteractiveImportItems({
-      ids,
-      releaseGroup
-    });
-
-    dispatchReprocessInteractiveImportItems({ ids });
-
-    this.props.onModalClose(true);
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <SelectReleaseGroupModalContent
-        {...this.props}
-        onReleaseGroupSelect={this.onReleaseGroupSelect}
-      />
-    );
-  }
-}
-
-SelectReleaseGroupModalContentConnector.propTypes = {
-  ids: PropTypes.arrayOf(PropTypes.number).isRequired,
-  dispatchUpdateInteractiveImportItems: PropTypes.func.isRequired,
-  dispatchReprocessInteractiveImportItems: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default connect(null, mapDispatchToProps)(SelectReleaseGroupModalContentConnector);
--- a/frontend/src/Movie/Delete/DeleteMovieModalContent.js
+++ b/frontend/src/Movie/Delete/DeleteMovieModalContent.js
@@ -155,7 +155,7 @@ DeleteMovieModalContent.propTypes = {
  title: PropTypes.string.isRequired,
  path: PropTypes.string.isRequired,
  hasFile: PropTypes.bool.isRequired,
-  sizeOnDisk: PropTypes.number.isRequired,
+  sizeOnDisk: PropTypes.string.isRequired,
  onDeletePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
--- a/frontend/src/Movie/Details/MovieDetails.css
+++ b/frontend/src/Movie/Details/MovieDetails.css
@@ -5,7 +5,7 @@
 .header {
  position: relative;
  width: 100%;
-  height: 375px;
+  height: 350px;
 }

 .errorMessage {
@@ -41,8 +41,8 @@
 .poster {
  flex-shrink: 0;
  margin-right: 35px;
-  width: 217px;
-  height: 319px;
+  width: 200px;
+  height: 294px;
 }

 .info {
--- a/frontend/src/Movie/Details/MovieDetails.js
+++ b/frontend/src/Movie/Details/MovieDetails.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import TextTruncate from 'react-text-truncate';
+import HeartRating from 'Components/HeartRating';
 import Icon from 'Components/Icon';
-import ImdbRating from 'Components/ImdbRating';
 import InfoLabel from 'Components/InfoLabel';
 import IconButton from 'Components/Link/IconButton';
 import Marquee from 'Components/Marquee';
@@ -16,8 +16,6 @@ import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
-import RottenTomatoRating from 'Components/RottenTomatoRating';
-import TmdbRating from 'Components/TmdbRating';
 import Popover from 'Components/Tooltip/Popover';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
@@ -451,6 +449,17 @@ class MovieDetails extends Component {
                        </span>
                    }

+                    {
+                      !!ratings &&
+                        <span className={styles.rating}>
+                          <HeartRating
+                            rating={ratings.value}
+                            iconSize={20}
+                            hideHeart={isSmallScreen}
+                          />
+                        </span>
+                    }
+
                    {
                      <span className={styles.links}>
                        <Tooltip
@@ -492,36 +501,6 @@ class MovieDetails extends Component {
                  </div>
                </div>

-                <div className={styles.details}>
-                  {
-                    !!ratings.tmdb &&
-                      <span className={styles.rating}>
-                        <TmdbRating
-                          ratings={ratings}
-                          iconSize={20}
-                        />
-                      </span>
-                  }
-                  {
-                    !!ratings.imdb &&
-                      <span className={styles.rating}>
-                        <ImdbRating
-                          ratings={ratings}
-                          iconSize={20}
-                        />
-                      </span>
-                  }
-                  {
-                    !!ratings.rottenTomatoes &&
-                      <span className={styles.rating}>
-                        <RottenTomatoRating
-                          ratings={ratings}
-                          iconSize={20}
-                        />
-                      </span>
-                  }
-                </div>
-
                <div className={styles.detailsLabels}>
                  <InfoLabel
                    className={styles.detailsInfoLabel}
--- a/frontend/src/Movie/History/MovieHistoryRow.js
+++ b/frontend/src/Movie/History/MovieHistoryRow.js
@@ -67,7 +67,8 @@ class MovieHistoryRow extends Component {
      data,
      isMarkingAsFailed,
      shortDateFormat,
-      timeFormat
+      timeFormat,
+      onMarkAsFailedPress
    } = this.props;

    const {
@@ -142,7 +143,7 @@ class MovieHistoryRow extends Component {
          isMarkingAsFailed={isMarkingAsFailed}
          shortDateFormat={shortDateFormat}
          timeFormat={timeFormat}
-          onMarkAsFailedPress={this.onMarkAsFailedPress}
+          onMarkAsFailedPress={onMarkAsFailedPress}
          onModalClose={this.onDetailsModalClose}
        />
      </TableRow>
--- a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js
+++ b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js
@@ -101,15 +101,6 @@ function MovieIndexSortMenu(props) {
          {translate('DigitalRelease')}
        </SortMenuItem>

-        <SortMenuItem
-          name="ratings"
-          sortKey={sortKey}
-          sortDirection={sortDirection}
-          onPress={onSortSelect}
-        >
-          {translate('Ratings')}
-        </SortMenuItem>
-
        <SortMenuItem
          name="path"
          sortKey={sortKey}
--- a/frontend/src/Movie/Index/Table/MovieIndexRow.js
+++ b/frontend/src/Movie/Index/Table/MovieIndexRow.js
@@ -332,7 +332,7 @@ class MovieIndexRow extends Component {
                  className={styles[name]}
                >
                  <HeartRating
-                    ratings={ratings}
+                    rating={ratings.value}
                  />
                </VirtualTableRowCell>
              );
--- a/frontend/src/Movie/MovieStatus.js
+++ b/frontend/src/Movie/MovieStatus.js
@@ -6,7 +6,7 @@ export function getMovieStatusDetails(status) {
  let statusDetails = {
    icon: icons.ANNOUNCED,
    title: translate('Announced'),
-    message: translate('AnnouncedMsg')
+    message: translate('AnnoucedMsg')
  };

  if (status === 'deleted') {
--- a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css
@@ -4,11 +4,6 @@
  margin-right: auto;
 }

-.rightButtons {
-  justify-content: flex-end;
-  margin-right: auto;
-}
-
 .addSpecification {
  composes: customFormat from '~./CustomFormat.css';

--- a/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js
@@ -198,25 +198,26 @@ class EditCustomFormatModalContent extends Component {
          </div>
        </ModalBody>
        <ModalFooter>
-          <div className={styles.rightButtons}>
-            {
-              id &&
-                <Button
-                  className={styles.deleteButton}
-                  kind={kinds.DANGER}
-                  onPress={onDeleteCustomFormatPress}
-                >
-                  {translate('Delete')}
-                </Button>
-            }
+          {
+            id &&
+              <Button
+                className={styles.deleteButton}
+                kind={kinds.DANGER}
+                onPress={onDeleteCustomFormatPress}
+              >
+                {translate('Delete')}
+              </Button>
+          }

-            <Button
-              className={styles.deleteButton}
-              onPress={this.onImportPress}
-            >
-              {translate('Import')}
-            </Button>
-          </div>
+          {
+            !id &&
+              <Button
+                className={styles.deleteButton}
+                onPress={this.onImportPress}
+              >
+                {translate('Import')}
+              </Button>
+          }

          <Button
            onPress={onModalClose}
--- a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js
+++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js
@@ -51,15 +51,9 @@ class RemotePathMappings extends Component {
          {...otherProps}
        >
          <div className={styles.remotePathMappingsHeader}>
-            <div className={styles.host}>
-              {translate('Host')}
-            </div>
-            <div className={styles.path}>
-              {translate('RemotePath')}
-            </div>
-            <div className={styles.path}>
-              {translate('LocalPath')}
-            </div>
+            <div className={styles.host}>Host</div>
+            <div className={styles.path}>Remote Path</div>
+            <div className={styles.path}>Local Path</div>
          </div>

          <div>
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModal.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModal.js
@@ -2,16 +2,16 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
 import { sizes } from 'Helpers/Props';
-import EditImportListExclusionModalContentConnector from './EditImportListExclusionModalContentConnector';
+import EditImportExclusionModalContentConnector from './EditImportExclusionModalContentConnector';

-function EditImportListExclusionModal({ isOpen, onModalClose, ...otherProps }) {
+function EditImportExclusionModal({ isOpen, onModalClose, ...otherProps }) {
  return (
    <Modal
      size={sizes.MEDIUM}
      isOpen={isOpen}
      onModalClose={onModalClose}
    >
-      <EditImportListExclusionModalContentConnector
+      <EditImportExclusionModalContentConnector
        {...otherProps}
        onModalClose={onModalClose}
      />
@@ -19,9 +19,9 @@ function EditImportListExclusionModal({ isOpen, onModalClose, ...otherProps }) {
  );
 }

-EditImportListExclusionModal.propTypes = {
+EditImportExclusionModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  onModalClose: PropTypes.func.isRequired
 };

-export default EditImportListExclusionModal;
+export default EditImportExclusionModal;
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { clearPendingChanges } from 'Store/Actions/baseActions';
-import EditImportListExclusionModal from './EditImportListExclusionModal';
+import EditImportExclusionModal from './EditImportExclusionModal';

 function mapStateToProps() {
  return {};
@@ -12,7 +12,7 @@ const mapDispatchToProps = {
  clearPendingChanges
 };

-class EditImportListExclusionModalConnector extends Component {
+class EditImportExclusionModalConnector extends Component {

  //
  // Listeners
@@ -27,7 +27,7 @@ class EditImportListExclusionModalConnector extends Component {

  render() {
    return (
-      <EditImportListExclusionModal
+      <EditImportExclusionModal
        {...this.props}
        onModalClose={this.onModalClose}
      />
@@ -35,9 +35,9 @@ class EditImportListExclusionModalConnector extends Component {
  }
 }

-EditImportListExclusionModalConnector.propTypes = {
+EditImportExclusionModalConnector.propTypes = {
  onModalClose: PropTypes.func.isRequired,
  clearPendingChanges: PropTypes.func.isRequired
 };

-export default connect(mapStateToProps, mapDispatchToProps)(EditImportListExclusionModalConnector);
+export default connect(mapStateToProps, mapDispatchToProps)(EditImportExclusionModalConnector);
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.css
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.css
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js
@@ -13,9 +13,9 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import styles from './EditImportListExclusionModalContent.css';
+import styles from './EditImportExclusionModalContent.css';

-function EditImportListExclusionModalContent(props) {
+function EditImportExclusionModalContent(props) {
  const {
    id,
    isFetching,
@@ -130,7 +130,7 @@ function EditImportListExclusionModalContent(props) {
  );
 }

-EditImportListExclusionModalContent.propTypes = {
+EditImportExclusionModalContent.propTypes = {
  id: PropTypes.number,
  isFetching: PropTypes.bool.isRequired,
  error: PropTypes.object,
@@ -143,4 +143,4 @@ EditImportListExclusionModalContent.propTypes = {
  onDeleteImportExclusionPress: PropTypes.func
 };

-export default EditImportListExclusionModalContent;
+export default EditImportExclusionModalContent;
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { saveImportExclusion, setImportExclusionValue } from 'Store/Actions/settingsActions';
 import selectSettings from 'Store/Selectors/selectSettings';
-import EditImportListExclusionModalContent from './EditImportListExclusionModalContent';
+import EditImportExclusionModalContent from './EditImportExclusionModalContent';

 const newImportExclusion = {
  movieTitle: '',
@@ -97,7 +97,7 @@ class EditImportExclusionModalContentConnector extends Component {

  render() {
    return (
-      <EditImportListExclusionModalContent
+      <EditImportExclusionModalContent
        {...this.props}
        onSavePress={this.onSavePress}
        onInputChange={this.onInputChange}
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css
@@ -8,14 +8,12 @@
 }

 .movieTitle {
-  @add-mixin truncate;
-
-  flex: 0 0 600px;
+  flex: 0 0 400px;
 }

 .tmdbId,
 .movieYear {
-  flex: 0 0 70px;
+  flex: 0 0 200px;
 }

 .actions {
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js
@@ -6,10 +6,10 @@ import Link from 'Components/Link/Link';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import { icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import EditImportListExclusionModalConnector from './EditImportListExclusionModalConnector';
-import styles from './ImportListExclusion.css';
+import EditImportExclusionModalConnector from './EditImportExclusionModalConnector';
+import styles from './ImportExclusion.css';

-class ImportListExclusion extends Component {
+class ImportExclusion extends Component {

  //
  // Lifecycle
@@ -78,7 +78,7 @@ class ImportListExclusion extends Component {
          </Link>
        </div>

-        <EditImportListExclusionModalConnector
+        <EditImportExclusionModalConnector
          id={id}
          isOpen={this.state.isEditImportExclusionModalOpen}
          onModalClose={this.onEditImportExclusionModalClose}
@@ -99,7 +99,7 @@ class ImportListExclusion extends Component {
  }
 }

-ImportListExclusion.propTypes = {
+ImportExclusion.propTypes = {
  id: PropTypes.number.isRequired,
  movieTitle: PropTypes.string.isRequired,
  tmdbId: PropTypes.number.isRequired,
@@ -107,9 +107,9 @@ ImportListExclusion.propTypes = {
  onConfirmDeleteImportExclusion: PropTypes.func.isRequired
 };

-ImportListExclusion.defaultProps = {
+ImportExclusion.defaultProps = {
  // The drag preview will not connect the drag handle.
  connectDragSource: (node) => node
 };

-export default ImportListExclusion;
+export default ImportExclusion;
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css
@@ -1,16 +1,16 @@
-.importListExclusionsHeader {
+.importExclusionsHeader {
  display: flex;
  margin-bottom: 10px;
  font-weight: bold;
 }

 .title {
-  flex: 0 0 600px;
+  flex: 0 0 400px;
 }

 .tmdbId,
 .movieYear {
-  flex: 0 0 70px;
+  flex: 0 0 200px;
 }

 .addImportExclusion {
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js
@@ -6,11 +6,11 @@ import Link from 'Components/Link/Link';
 import PageSectionContent from 'Components/Page/PageSectionContent';
 import { icons } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import EditImportListExclusionModalConnector from './EditImportListExclusionModalConnector';
-import ImportListExclusion from './ImportListExclusion';
-import styles from './ImportListExclusions.css';
+import EditImportExclusionModalConnector from './EditImportExclusionModalConnector';
+import ImportExclusion from './ImportExclusion';
+import styles from './ImportExclusions.css';

-class ImportListExclusions extends Component {
+class ImportExclusions extends Component {

  //
  // Lifecycle
@@ -50,23 +50,17 @@ class ImportListExclusions extends Component {
          errorMessage={translate('UnableToLoadListExclusions')}
          {...otherProps}
        >
-          <div className={styles.importListExclusionsHeader}>
-            <div className={styles.tmdbId}>
-              TMDb Id
-            </div>
-            <div className={styles.title}>
-              {translate('Title')}
-            </div>
-            <div className={styles.movieYear}>
-              {translate('Year')}
-            </div>
+          <div className={styles.importExclusionsHeader}>
+            <div className={styles.tmdbId}>TMDB Id</div>
+            <div className={styles.title}>Title</div>
+            <div className={styles.movieYear}>Year</div>
          </div>

          <div>
            {
              items.map((item, index) => {
                return (
-                  <ImportListExclusion
+                  <ImportExclusion
                    key={item.id}
                    {...item}
                    {...otherProps}
@@ -87,7 +81,7 @@ class ImportListExclusions extends Component {
            </Link>
          </div>

-          <EditImportListExclusionModalConnector
+          <EditImportExclusionModalConnector
            isOpen={this.state.isAddImportExclusionModalOpen}
            onModalClose={this.onModalClose}
          />
@@ -98,11 +92,11 @@ class ImportListExclusions extends Component {
  }
 }

-ImportListExclusions.propTypes = {
+ImportExclusions.propTypes = {
  isFetching: PropTypes.bool.isRequired,
  error: PropTypes.object,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  onConfirmDeleteImportExclusion: PropTypes.func.isRequired
 };

-export default ImportListExclusions;
+export default ImportExclusions;
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { deleteImportExclusion, fetchImportExclusions } from 'Store/Actions/settingsActions';
-import ImportListExclusions from './ImportListExclusions';
+import ImportExclusions from './ImportExclusions';

 function createMapStateToProps() {
  return createSelector(
@@ -42,7 +42,7 @@ class ImportExclusionsConnector extends Component {

  render() {
    return (
-      <ImportListExclusions
+      <ImportExclusions
        {...this.state}
        {...this.props}
        onConfirmDeleteImportExclusion={this.onConfirmDeleteImportExclusion}
--- a/frontend/src/Settings/ImportLists/ImportListSettings.js
+++ b/frontend/src/Settings/ImportLists/ImportListSettings.js
@@ -7,7 +7,7 @@ import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import { icons } from 'Helpers/Props';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import translate from 'Utilities/String/translate';
-import ImportListExclusionsConnector from './ImportListExclusions/ImportListExclusionsConnector';
+import ImportExclusionsConnector from './ImportExclusions/ImportExclusionsConnector';
 import ImportListsConnector from './ImportLists/ImportListsConnector';
 import ImportListOptionsConnector from './Options/ImportListOptionsConnector';

@@ -86,7 +86,7 @@ class ImportListSettings extends Component {
            onChildStateChange={this.onChildStateChange}
          />

-          <ImportListExclusionsConnector />
+          <ImportExclusionsConnector />

        </PageContentBody>
      </PageContent>
--- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js
+++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js
@@ -45,9 +45,7 @@ function EditIndexerModalContent(props) {
    supportsSearch,
    tags,
    fields,
-    priority,
-    protocol,
-    downloadClientId
+    priority
  } = item;

  return (
@@ -156,25 +154,8 @@ function EditIndexerModalContent(props) {
                />
              </FormGroup>

-              <FormGroup
-                advancedSettings={advancedSettings}
-                isAdvanced={true}
-              >
-                <FormLabel>{translate('DownloadClient')}</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.DOWNLOAD_CLIENT_SELECT}
-                  name="downloadClientId"
-                  helpText={translate('IndexerDownloadClientHelpText')}
-                  {...downloadClientId}
-                  includeAny={true}
-                  protocol={protocol.value}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
-
              <FormGroup>
-                <FormLabel>{translate('Tags')}</FormLabel>
+                <FormLabel>Tags</FormLabel>

                <FormInputGroup
                  type={inputTypes.TAG}
--- a/frontend/src/Settings/Indexers/Options/IndexerOptions.js
+++ b/frontend/src/Settings/Indexers/Options/IndexerOptions.js
@@ -85,7 +85,7 @@ function IndexerOptions(props) {
                type={inputTypes.CHECK}
                name="preferIndexerFlags"
                helpText={translate('PreferIndexerFlagsHelpText')}
-                helpLink="https://wiki.servarr.com/radarr/settings#indexer-flags"
+                helpLink="https://wiki.servarr.com/Definitions#Indexer_Flags"
                onChange={onInputChange}
                {...settings.preferIndexerFlags}
              />
@@ -97,7 +97,7 @@ function IndexerOptions(props) {
              <FormInputGroup
                type={inputTypes.NUMBER}
                name="availabilityDelay"
-                unit="days"
+                unit="Days"
                helpText={translate('AvailabilityDelayHelpText')}
                onChange={onInputChange}
                {...settings.availabilityDelay}
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -147,8 +147,7 @@ class NamingModal extends Component {

      { token: '{MediaInfo VideoCodec}', example: 'x264' },
      { token: '{MediaInfo VideoBitDepth}', example: '10' },
-      { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' },
-      { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' }
+      { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' }
    ];

    const releaseGroupTokens = [
--- a/frontend/src/Settings/Notifications/Notifications/Notification.js
+++ b/frontend/src/Settings/Notifications/Notifications/Notification.js
@@ -63,7 +63,6 @@ class Notification extends Component {
      onMovieFileDelete,
      onMovieFileDeleteForUpgrade,
      onHealthIssue,
-      onApplicationUpdate,
      supportsOnGrab,
      supportsOnDownload,
      supportsOnUpgrade,
@@ -71,8 +70,7 @@ class Notification extends Component {
      supportsOnMovieDelete,
      supportsOnMovieFileDelete,
      supportsOnMovieFileDeleteForUpgrade,
-      supportsOnHealthIssue,
-      supportsOnApplicationUpdate
+      supportsOnHealthIssue
    } = this.props;

    return (
@@ -125,14 +123,6 @@ class Notification extends Component {
            null
        }

-        {
-          supportsOnApplicationUpdate && onApplicationUpdate ?
-            <Label kind={kinds.SUCCESS}>
-              {translate('OnApplicationUpdate')}
-            </Label> :
-            null
-        }
-
        {
          supportsOnMovieDelete && onMovieDelete ?
            <Label kind={kinds.SUCCESS}>
@@ -158,7 +148,7 @@ class Notification extends Component {
        }

        {
-          !onGrab && !onDownload && !onRename && !onHealthIssue && !onApplicationUpdate && !onMovieDelete && !onMovieFileDelete ?
+          !onGrab && !onDownload && !onRename && !onHealthIssue && !onMovieDelete && !onMovieFileDelete ?
            <Label
              kind={kinds.DISABLED}
              outline={true}
@@ -200,7 +190,6 @@ Notification.propTypes = {
  onMovieFileDelete: PropTypes.bool.isRequired,
  onMovieFileDeleteForUpgrade: PropTypes.bool.isRequired,
  onHealthIssue: PropTypes.bool.isRequired,
-  onApplicationUpdate: PropTypes.bool.isRequired,
  supportsOnGrab: PropTypes.bool.isRequired,
  supportsOnDownload: PropTypes.bool.isRequired,
  supportsOnMovieDelete: PropTypes.bool.isRequired,
@@ -209,7 +198,6 @@ Notification.propTypes = {
  supportsOnUpgrade: PropTypes.bool.isRequired,
  supportsOnRename: PropTypes.bool.isRequired,
  supportsOnHealthIssue: PropTypes.bool.isRequired,
-  supportsOnApplicationUpdate: PropTypes.bool.isRequired,
  onConfirmDeleteNotification: PropTypes.func.isRequired
 };

--- a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
+++ b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
@@ -23,7 +23,6 @@ function NotificationEventItems(props) {
    onMovieFileDelete,
    onMovieFileDeleteForUpgrade,
    onHealthIssue,
-    onApplicationUpdate,
    supportsOnGrab,
    supportsOnDownload,
    supportsOnUpgrade,
@@ -31,7 +30,6 @@ function NotificationEventItems(props) {
    supportsOnMovieDelete,
    supportsOnMovieFileDelete,
    supportsOnMovieFileDeleteForUpgrade,
-    supportsOnApplicationUpdate,
    supportsOnHealthIssue,
    includeHealthWarnings
  } = item;
@@ -152,17 +150,6 @@ function NotificationEventItems(props) {
                />
              </div>
          }
-
-          <div>
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="onApplicationUpdate"
-              helpText={translate('OnApplicationUpdateHelpText')}
-              isDisabled={!supportsOnApplicationUpdate.value}
-              {...onApplicationUpdate}
-              onChange={onInputChange}
-            />
-          </div>
        </div>
      </div>
    </FormGroup>
--- a/frontend/src/Settings/Profiles/Delay/DelayProfiles.js
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfiles.js
@@ -82,18 +82,10 @@ class DelayProfiles extends Component {
            >
              <div>
                <div className={styles.delayProfilesHeader}>
-                  <div className={styles.column}>
-                    {translate('Protocol')}
-                  </div>
-                  <div className={styles.column}>
-                    {translate('UsenetDelay')}
-                  </div>
-                  <div className={styles.column}>
-                    {translate('TorrentDelay')}
-                  </div>
-                  <div className={styles.tags}>
-                    {translate('Tags')}
-                  </div>
+                  <div className={styles.column}>Protocol</div>
+                  <div className={styles.column}>Usenet Delay</div>
+                  <div className={styles.column}>Torrent Delay</div>
+                  <div className={styles.tags}>Tags</div>
                </div>

                <div className={styles.delayProfiles}>
--- a/frontend/src/Settings/Quality/Definition/QualityDefinitions.js
+++ b/frontend/src/Settings/Quality/Definition/QualityDefinitions.js
@@ -25,15 +25,9 @@ class QualityDefinitions extends Component {
          {...otherProps}
        >
          <div className={styles.header}>
-            <div className={styles.quality}>
-              {translate('Quality')}
-            </div>
-            <div className={styles.title}>
-              {translate('Title')}
-            </div>
-            <div className={styles.sizeLimit}>
-              {translate('SizeLimit')}
-            </div>
+            <div className={styles.quality}>Quality</div>
+            <div className={styles.title}>Title</div>
+            <div className={styles.sizeLimit}>Size Limit</div>

            {
              advancedSettings ?
--- a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
+++ b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
@@ -152,7 +152,7 @@ function TagDetailsModalContent(props) {

        {
          indexers.length ?
-            <FieldSet legend={translate('Indexers')}>
+            <FieldSet legend="Indexers">
              {
                indexers.map((item) => {
                  return (
--- a/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js
+++ b/frontend/src/Store/Actions/Creators/createRemoveItemHandler.js
@@ -14,6 +14,7 @@ function createRemoveItemHandler(section, url) {

    const ajaxOptions = {
      url: `${url}/${id}?${$.param(queryParams, true)}`,
+      dataType: 'text',
      method: 'DELETE'
    };

--- a/frontend/src/Store/Actions/Settings/notifications.js
+++ b/frontend/src/Store/Actions/Settings/notifications.js
@@ -109,7 +109,6 @@ export default {
        selectedSchema.onMovieDelete = selectedSchema.supportsOnMovieDelete;
        selectedSchema.onMovieFileDelete = selectedSchema.supportsOnMovieFileDelete;
        selectedSchema.onMovieFileDeleteForUpgrade = selectedSchema.supportsOnMovieFileDeleteForUpgrade;
-        selectedSchema.onApplicationUpdate = selectedSchema.supportsOnApplicationUpdate;

        return selectedSchema;
      });
--- a/frontend/src/Store/Actions/discoverMovieActions.js
+++ b/frontend/src/Store/Actions/discoverMovieActions.js
@@ -200,7 +200,7 @@ export const defaultState = {
    ratings: function(item) {
      const { ratings = {} } = item;

-      return ratings.tmdb? ratings.tmdb.value : 0;
+      return ratings.value;
    }
  },

@@ -330,23 +330,8 @@ export const defaultState = {
      valueType: filterBuilderValueTypes.MINIMUM_AVAILABILITY
    },
    {
-      name: 'tmdbRating',
-      label: translate('TmdbRating'),
-      type: filterBuilderTypes.NUMBER
-    },
-    {
-      name: 'tmdbVotes',
-      label: translate('TmdbVotes'),
-      type: filterBuilderTypes.NUMBER
-    },
-    {
-      name: 'imdbRating',
-      label: translate('ImdbRating'),
-      type: filterBuilderTypes.NUMBER
-    },
-    {
-      name: 'imdbVotes',
-      label: translate('ImdbVotes'),
+      name: 'ratings',
+      label: 'Rating',
      type: filterBuilderTypes.NUMBER
    },
    {
--- a/frontend/src/Store/Actions/interactiveImportActions.js
+++ b/frontend/src/Store/Actions/interactiveImportActions.js
@@ -148,10 +148,9 @@ export const actionHandlers = handleThunks({
      return {
        id,
        path: item.path,
-        movieId: item.movie ? item.movie.id : undefined,
+        movieId: item.movie.id,
        quality: item.quality,
        languages: item.languages,
-        releaseGroup: item.releaseGroup,
        downloadId: item.downloadId
      };
    });
--- a/frontend/src/Store/Actions/movieActions.js
+++ b/frontend/src/Store/Actions/movieActions.js
@@ -131,38 +131,10 @@ export const filterPredicates = {
    return dateFilterPredicate(item.digitalRelease, filterValue, type);
  },

-  tmdbRating: function(item, filterValue, type) {
+  ratings: function(item, filterValue, type) {
    const predicate = filterTypePredicates[type];

-    const rating = item.ratings.tmdb ? item.ratings.tmdb.value : 0;
-
-    return predicate(rating * 10, filterValue);
-  },
-
-  tmdbVotes: function(item, filterValue, type) {
-    const predicate = filterTypePredicates[type];
-
-    const rating = item.ratings.tmdb ? item.ratings.tmdb.votes : 0;
-
-    return predicate(rating, filterValue);
-  },
-
-  imdbRating: function(item, filterValue, type) {
-    const predicate = filterTypePredicates[type];
-
-    console.log(item.ratings);
-
-    const rating = item.ratings.imdb ? item.ratings.imdb.value : 0;
-
-    return predicate(rating, filterValue);
-  },
-
-  imdbVotes: function(item, filterValue, type) {
-    const predicate = filterTypePredicates[type];
-
-    const rating = item.ratings.imdb ? item.ratings.imdb.votes : 0;
-
-    return predicate(rating, filterValue);
+    return predicate(item.ratings.value * 10, filterValue);
  },

  qualityCutoffNotMet: function(item) {
--- a/frontend/src/Store/Actions/movieIndexActions.js
+++ b/frontend/src/Store/Actions/movieIndexActions.js
@@ -209,7 +209,7 @@ export const defaultState = {
    ratings: function(item) {
      const { ratings = {} } = item;

-      return ratings.tmdb? ratings.tmdb.value : 0;
+      return ratings.value;
    }
  },

@@ -357,23 +357,8 @@ export const defaultState = {
      }
    },
    {
-      name: 'tmdbRating',
-      label: translate('TmdbRating'),
-      type: filterBuilderTypes.NUMBER
-    },
-    {
-      name: 'tmdbVotes',
-      label: translate('TmdbVotes'),
-      type: filterBuilderTypes.NUMBER
-    },
-    {
-      name: 'imdbRating',
-      label: translate('ImdbRating'),
-      type: filterBuilderTypes.NUMBER
-    },
-    {
-      name: 'imdbVotes',
-      label: translate('ImdbVotes'),
+      name: 'ratings',
+      label: translate('Ratings'),
      type: filterBuilderTypes.NUMBER
    },
    {
--- a/frontend/src/Store/Actions/queueActions.js
+++ b/frontend/src/Store/Actions/queueActions.js
@@ -27,7 +27,7 @@ const paged = `${section}.paged`;

 export const defaultState = {
  options: {
-    includeUnknownMovieItems: true
+    includeUnknownMovieItems: false
  },

  status: {
--- a/frontend/src/Store/Middleware/createSentryMiddleware.js
+++ b/frontend/src/Store/Middleware/createSentryMiddleware.js
@@ -100,7 +100,7 @@ export default function createSentryMiddleware() {
    return;
  }

-  const dsn = isProduction ? 'https://7794f2858478485ea337fb5535624fbd@sentry.servarr.com/12' :
+  const dsn = isProduction ? 'https://b0fb75c38ef4487dbf742f79c4ba62d2@sentry.servarr.com/12' :
    'https://da610619280249f891ec3ee306906793@sentry.servarr.com/13';

  sentry.init({
--- a/frontend/src/Store/Migrators/migrate.js
+++ b/frontend/src/Store/Migrators/migrate.js
@@ -1,7 +1,5 @@
 import migrateBlacklistToBlocklist from './migrateBlacklistToBlocklist';
-import migratePreDbToReleased from './migratePreDbToReleased';

 export default function migrate(persistedState) {
  migrateBlacklistToBlocklist(persistedState);
-  migratePreDbToReleased(persistedState);
 }
--- a/frontend/src/Store/Migrators/migratePreDbToReleased.js
+++ b/frontend/src/Store/Migrators/migratePreDbToReleased.js
@@ -1,18 +0,0 @@
-import get from 'lodash';
-
-export default function migratePreDbToReleased(persistedState) {
-  const addMovie = get(persistedState, 'addMovie.defaults.minimumAvailability');
-  const discoverMovie = get(persistedState, 'discoverMovie.defaults.minimumAvailability');
-
-  if (!addMovie && !discoverMovie) {
-    return;
-  }
-
-  if (addMovie === 'preDB') {
-    persistedState.addMovie.defaults.minimumAvailability = 'released';
-  }
-
-  if (discoverMovie === 'preDB') {
-    persistedState.discoverMovie.defaults.minimumAvailability = 'released';
-  }
-}
--- a/frontend/src/System/Backup/BackupRow.js
+++ b/frontend/src/System/Backup/BackupRow.js
@@ -8,7 +8,6 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
-import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
 import RestoreBackupModalConnector from './RestoreBackupModalConnector';
 import styles from './BackupRow.css';
@@ -66,7 +65,6 @@ class BackupRow extends Component {
      type,
      name,
      path,
-      size,
      time
    } = this.props;

@@ -106,10 +104,6 @@ class BackupRow extends Component {
          </Link>
        </TableRowCell>

-        <TableRowCell>
-          {formatBytes(size)}
-        </TableRowCell>
-
        <RelativeDateCellConnector
          date={time}
        />
@@ -153,7 +147,6 @@ BackupRow.propTypes = {
  type: PropTypes.string.isRequired,
  name: PropTypes.string.isRequired,
  path: PropTypes.string.isRequired,
-  size: PropTypes.number.isRequired,
  time: PropTypes.string.isRequired,
  onDeleteBackupPress: PropTypes.func.isRequired
 };
--- a/frontend/src/System/Backup/Backups.js
+++ b/frontend/src/System/Backup/Backups.js
@@ -23,11 +23,6 @@ const columns = [
    label: translate('Name'),
    isVisible: true
  },
-  {
-    name: 'size',
-    label: 'Size',
-    isVisible: true
-  },
  {
    name: 'time',
    label: translate('Time'),
@@ -132,7 +127,6 @@ class Backups extends Component {
                        type,
                        name,
                        path,
-                        size,
                        time
                      } = item;

@@ -143,7 +137,6 @@ class Backups extends Component {
                          type={type}
                          name={name}
                          path={path}
-                          size={size}
                          time={time}
                          onDeleteBackupPress={onDeleteBackupPress}
                        />
--- a/frontend/src/System/Status/Donations/Donations.js
+++ b/frontend/src/System/Status/Donations/Donations.js
@@ -13,7 +13,7 @@ class Donations extends Component {
    return (
      <FieldSet legend={translate('Donations')}>
        <div className={styles.logoContainer} title="Radarr">
-          <Link to="https://radarr.video/donate">
+          <Link to="https://opencollective.com/radarr">
            <img
              className={styles.logo}
              src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-radarr.png`}
@@ -21,7 +21,7 @@ class Donations extends Component {
          </Link>
        </div>
        <div className={styles.logoContainer} title="Lidarr">
-          <Link to="https://lidarr.audio/donate">
+          <Link to="https://opencollective.com/lidarr">
            <img
              className={styles.logo}
              src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-lidarr.png`}
@@ -29,7 +29,7 @@ class Donations extends Component {
          </Link>
        </div>
        <div className={styles.logoContainer} title="Readarr">
-          <Link to="https://readarr.com/donate">
+          <Link to="https://opencollective.com/readarr">
            <img
              className={styles.logo}
              src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-readarr.png`}
@@ -37,7 +37,7 @@ class Donations extends Component {
          </Link>
        </div>
        <div className={styles.logoContainer} title="Prowlarr">
-          <Link to="https://prowlarr.com/donate">
+          <Link to="https://opencollective.com/prowlarr">
            <img
              className={styles.logo}
              src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-prowlarr.png`}
@@ -45,7 +45,7 @@ class Donations extends Component {
          </Link>
        </div>
        <div className={styles.logoContainer} title="Sonarr">
-          <Link to="https://sonarr.tv/donate">
+          <Link to="https://opencollective.com/sonarr">
            <img
              className={styles.logo}
              src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-sonarr.png`}
--- a/frontend/src/System/Status/Health/Health.js
+++ b/frontend/src/System/Status/Health/Health.js
@@ -19,7 +19,6 @@ function getInternalLink(source) {
    case 'IndexerRssCheck':
    case 'IndexerSearchCheck':
    case 'IndexerStatusCheck':
-    case 'IndexerJackettAllCheck':
    case 'IndexerLongTermStatusCheck':
      return (
        <IconButton
--- a/frontend/src/System/Tasks/Queued/QueuedTaskRow.js
+++ b/frontend/src/System/Tasks/Queued/QueuedTaskRow.js
@@ -200,7 +200,7 @@ class QueuedTaskRow extends Component {
          {
            clientUserAgent ?
              <span className={styles.userAgent} title={translate('TaskUserAgentTooltip')}>
-                {translate('From')}: {clientUserAgent}
+                {translate('from')}: {clientUserAgent}
              </span> :
              null
          }
--- a/frontend/src/Utilities/Movie/getStatusStyle.js
+++ b/frontend/src/Utilities/Movie/getStatusStyle.js
@@ -2,7 +2,7 @@ import { kinds } from 'Helpers/Props';

 function getStatusStyle(status, monitored, hasFile, isAvailable, returnType, queue = false) {
  if (queue) {
-    return returnType === 'kinds' ? kinds.QUEUE : 'queue';
+    return returnType === 'kinds' ? kinds.SUCCESS : 'queue';
  }

  if (hasFile && monitored) {
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
    "@fortawesome/free-regular-svg-icons": "5.15.3",
    "@fortawesome/free-solid-svg-icons": "5.15.3",
    "@fortawesome/react-fontawesome": "0.1.14",
-    "@microsoft/signalr": "6.0.1",
+    "@microsoft/signalr": "6.0.0",
    "@sentry/browser": "6.13.2",
    "@sentry/integrations": "6.13.2",
    "classnames": "2.3.1",
--- a/setup/build.bat
+++ b/setup/build.bat
@@ -0,0 +1,3 @@
+#SET BUILD_NUMBER=1
+#SET branch=develop
+inno\ISCC.exe radarr.iss
--- a/setup/inno/Default.isl
+++ b/setup/inno/Default.isl
@@ -0,0 +1,336 @@
+; *** Inno Setup version 5.5.3+ English messages ***
+;
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=English
+LanguageID=$0409
+LanguageCodePage=0
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Setup
+SetupWindowTitle=Setup - %1
+UninstallAppTitle=Uninstall
+UninstallAppFullTitle=%1 Uninstall
+
+; *** Misc. common
+InformationTitle=Information
+ConfirmTitle=Confirm
+ErrorTitle=Error
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=This will install %1. Do you wish to continue?
+LdrCannotCreateTemp=Unable to create a temporary file. Setup aborted
+LdrCannotExecTemp=Unable to execute file in the temporary directory. Setup aborted
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nError %2: %3
+SetupFileMissing=The file %1 is missing from the installation directory. Please correct the problem or obtain a new copy of the program.
+SetupFileCorrupt=The setup files are corrupted. Please obtain a new copy of the program.
+SetupFileCorruptOrWrongVer=The setup files are corrupted, or are incompatible with this version of Setup. Please correct the problem or obtain a new copy of the program.
+InvalidParameter=An invalid parameter was passed on the command line:%n%n%1
+SetupAlreadyRunning=Setup is already running.
+WindowsVersionNotSupported=This program does not support the version of Windows your computer is running.
+WindowsServicePackRequired=This program requires %1 Service Pack %2 or later.
+NotOnThisPlatform=This program will not run on %1.
+OnlyOnThisPlatform=This program must be run on %1.
+OnlyOnTheseArchitectures=This program can only be installed on versions of Windows designed for the following processor architectures:%n%n%1
+MissingWOW64APIs=The version of Windows you are running does not include functionality required by Setup to perform a 64-bit installation. To correct this problem, please install Service Pack %1.
+WinVersionTooLowError=This program requires %1 version %2 or later.
+WinVersionTooHighError=This program cannot be installed on %1 version %2 or later.
+AdminPrivilegesRequired=You must be logged in as an administrator when installing this program.
+PowerUserPrivilegesRequired=You must be logged in as an administrator or as a member of the Power Users group when installing this program.
+SetupAppRunningError=Setup has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
+UninstallAppRunningError=Uninstall has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
+
+; *** Misc. errors
+ErrorCreatingDir=Setup was unable to create the directory "%1"
+ErrorTooManyFilesInDir=Unable to create a file in the directory "%1" because it contains too many files
+
+; *** Setup common messages
+ExitSetupTitle=Exit Setup
+ExitSetupMessage=Setup is not complete. If you exit now, the program will not be installed.%n%nYou may run Setup again at another time to complete the installation.%n%nExit Setup?
+AboutSetupMenuItem=&About Setup...
+AboutSetupTitle=About Setup
+AboutSetupMessage=%1 version %2%n%3%n%n%1 home page:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Back
+ButtonNext=&Next >
+ButtonInstall=&Install
+ButtonOK=OK
+ButtonCancel=Cancel
+ButtonYes=&Yes
+ButtonYesToAll=Yes to &All
+ButtonNo=&No
+ButtonNoToAll=N&o to All
+ButtonFinish=&Finish
+ButtonBrowse=&Browse...
+ButtonWizardBrowse=B&rowse...
+ButtonNewFolder=&Make New Folder
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Select Setup Language
+SelectLanguageLabel=Select the language to use during the installation:
+
+; *** Common wizard text
+ClickNext=Click Next to continue, or Cancel to exit Setup.
+BeveledLabel=
+BrowseDialogTitle=Browse For Folder
+BrowseDialogLabel=Select a folder in the list below, then click OK.
+NewFolderName=New Folder
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Welcome to the [name] Setup Wizard
+WelcomeLabel2=This will install [name/ver] on your computer.%n%nIt is recommended that you close all other applications before continuing.
+
+; *** "Password" wizard page
+WizardPassword=Password
+PasswordLabel1=This installation is password protected.
+PasswordLabel3=Please provide the password, then click Next to continue. Passwords are case-sensitive.
+PasswordEditLabel=&Password:
+IncorrectPassword=The password you entered is not correct. Please try again.
+
+; *** "License Agreement" wizard page
+WizardLicense=License Agreement
+LicenseLabel=Please read the following important information before continuing.
+LicenseLabel3=Please read the following License Agreement. You must accept the terms of this agreement before continuing with the installation.
+LicenseAccepted=I &accept the agreement
+LicenseNotAccepted=I &do not accept the agreement
+
+; *** "Information" wizard pages
+WizardInfoBefore=Information
+InfoBeforeLabel=Please read the following important information before continuing.
+InfoBeforeClickLabel=When you are ready to continue with Setup, click Next.
+WizardInfoAfter=Information
+InfoAfterLabel=Please read the following important information before continuing.
+InfoAfterClickLabel=When you are ready to continue with Setup, click Next.
+
+; *** "User Information" wizard page
+WizardUserInfo=User Information
+UserInfoDesc=Please enter your information.
+UserInfoName=&User Name:
+UserInfoOrg=&Organization:
+UserInfoSerial=&Serial Number:
+UserInfoNameRequired=You must enter a name.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Select Destination Location
+SelectDirDesc=Where should [name] be installed?
+SelectDirLabel3=Setup will install [name] into the following folder.
+SelectDirBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
+DiskSpaceMBLabel=At least [mb] MB of free disk space is required.
+CannotInstallToNetworkDrive=Setup cannot install to a network drive.
+CannotInstallToUNCPath=Setup cannot install to a UNC path.
+InvalidPath=You must enter a full path with drive letter; for example:%n%nC:\APP%n%nor a UNC path in the form:%n%n\\server\share
+InvalidDrive=The drive or UNC share you selected does not exist or is not accessible. Please select another.
+DiskSpaceWarningTitle=Not Enough Disk Space
+DiskSpaceWarning=Setup requires at least %1 KB of free space to install, but the selected drive only has %2 KB available.%n%nDo you want to continue anyway?
+DirNameTooLong=The folder name or path is too long.
+InvalidDirName=The folder name is not valid.
+BadDirName32=Folder names cannot include any of the following characters:%n%n%1
+DirExistsTitle=Folder Exists
+DirExists=The folder:%n%n%1%n%nalready exists. Would you like to install to that folder anyway?
+DirDoesntExistTitle=Folder Does Not Exist
+DirDoesntExist=The folder:%n%n%1%n%ndoes not exist. Would you like the folder to be created?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Select Components
+SelectComponentsDesc=Which components should be installed?
+SelectComponentsLabel2=Select the components you want to install; clear the components you do not want to install. Click Next when you are ready to continue.
+FullInstallation=Full installation
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Compact installation
+CustomInstallation=Custom installation
+NoUninstallWarningTitle=Components Exist
+NoUninstallWarning=Setup has detected that the following components are already installed on your computer:%n%n%1%n%nDeselecting these components will not uninstall them.%n%nWould you like to continue anyway?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Current selection requires at least [mb] MB of disk space.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Select Additional Tasks
+SelectTasksDesc=Which additional tasks should be performed?
+SelectTasksLabel2=Select the additional tasks you would like Setup to perform while installing [name], then click Next.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Select Start Menu Folder
+SelectStartMenuFolderDesc=Where should Setup place the program's shortcuts?
+SelectStartMenuFolderLabel3=Setup will create the program's shortcuts in the following Start Menu folder.
+SelectStartMenuFolderBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
+MustEnterGroupName=You must enter a folder name.
+GroupNameTooLong=The folder name or path is too long.
+InvalidGroupName=The folder name is not valid.
+BadGroupName=The folder name cannot include any of the following characters:%n%n%1
+NoProgramGroupCheck2=&Don't create a Start Menu folder
+
+; *** "Ready to Install" wizard page
+WizardReady=Ready to Install
+ReadyLabel1=Setup is now ready to begin installing [name] on your computer.
+ReadyLabel2a=Click Install to continue with the installation, or click Back if you want to review or change any settings.
+ReadyLabel2b=Click Install to continue with the installation.
+ReadyMemoUserInfo=User information:
+ReadyMemoDir=Destination location:
+ReadyMemoType=Setup type:
+ReadyMemoComponents=Selected components:
+ReadyMemoGroup=Start Menu folder:
+ReadyMemoTasks=Additional tasks:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Preparing to Install
+PreparingDesc=Setup is preparing to install [name] on your computer.
+PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
+CannotContinue=Setup cannot continue. Please click Cancel to exit.
+ApplicationsFound=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications.
+ApplicationsFound2=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications. After the installation has completed, Setup will attempt to restart the applications.
+CloseApplications=&Automatically close the applications
+DontCloseApplications=&Do not close the applications
+ErrorCloseApplications=Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
+
+; *** "Installing" wizard page
+WizardInstalling=Installing
+InstallingLabel=Please wait while Setup installs [name] on your computer.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Completing the [name] Setup Wizard
+FinishedLabelNoIcons=Setup has finished installing [name] on your computer.
+FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed icons.
+ClickFinish=Click Finish to exit Setup.
+FinishedRestartLabel=To complete the installation of [name], Setup must restart your computer. Would you like to restart now?
+FinishedRestartMessage=To complete the installation of [name], Setup must restart your computer.%n%nWould you like to restart now?
+ShowReadmeCheck=Yes, I would like to view the README file
+YesRadio=&Yes, restart the computer now
+NoRadio=&No, I will restart the computer later
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Run %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=View %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Setup Needs the Next Disk
+SelectDiskLabel2=Please insert Disk %1 and click OK.%n%nIf the files on this disk can be found in a folder other than the one displayed below, enter the correct path or click Browse.
+PathLabel=&Path:
+FileNotInDir2=The file "%1" could not be located in "%2". Please insert the correct disk or select another folder.
+SelectDirectoryLabel=Please specify the location of the next disk.
+
+; *** Installation phase messages
+SetupAborted=Setup was not completed.%n%nPlease correct the problem and run Setup again.
+EntryAbortRetryIgnore=Click Retry to try again, Ignore to proceed anyway, or Abort to cancel installation.
+
+; *** Installation status messages
+StatusClosingApplications=Closing applications...
+StatusCreateDirs=Creating directories...
+StatusExtractFiles=Extracting files...
+StatusCreateIcons=Creating shortcuts...
+StatusCreateIniEntries=Creating INI entries...
+StatusCreateRegistryEntries=Creating registry entries...
+StatusRegisterFiles=Registering files...
+StatusSavingUninstall=Saving uninstall information...
+StatusRunProgram=Finishing installation...
+StatusRestartingApplications=Restarting applications...
+StatusRollback=Rolling back changes...
+
+; *** Misc. errors
+ErrorInternal2=Internal error: %1
+ErrorFunctionFailedNoCode=%1 failed
+ErrorFunctionFailed=%1 failed; code %2
+ErrorFunctionFailedWithMessage=%1 failed; code %2.%n%3
+ErrorExecutingProgram=Unable to execute file:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Error opening registry key:%n%1\%2
+ErrorRegCreateKey=Error creating registry key:%n%1\%2
+ErrorRegWriteKey=Error writing to registry key:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Error creating INI entry in file "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Click Retry to try again, Ignore to skip this file (not recommended), or Abort to cancel installation.
+FileAbortRetryIgnore2=Click Retry to try again, Ignore to proceed anyway (not recommended), or Abort to cancel installation.
+SourceIsCorrupted=The source file is corrupted
+SourceDoesntExist=The source file "%1" does not exist
+ExistingFileReadOnly=The existing file is marked as read-only.%n%nClick Retry to remove the read-only attribute and try again, Ignore to skip this file, or Abort to cancel installation.
+ErrorReadingExistingDest=An error occurred while trying to read the existing file:
+FileExists=The file already exists.%n%nWould you like Setup to overwrite it?
+ExistingFileNewer=The existing file is newer than the one Setup is trying to install. It is recommended that you keep the existing file.%n%nDo you want to keep the existing file?
+ErrorChangingAttr=An error occurred while trying to change the attributes of the existing file:
+ErrorCreatingTemp=An error occurred while trying to create a file in the destination directory:
+ErrorReadingSource=An error occurred while trying to read the source file:
+ErrorCopying=An error occurred while trying to copy a file:
+ErrorReplacingExistingFile=An error occurred while trying to replace the existing file:
+ErrorRestartReplace=RestartReplace failed:
+ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
+ErrorRegisterServer=Unable to register the DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
+ErrorRegisterTypeLib=Unable to register the type library: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=An error occurred while trying to open the README file.
+ErrorRestartingComputer=Setup was unable to restart the computer. Please do this manually.
+
+; *** Uninstaller messages
+UninstallNotFound=File "%1" does not exist. Cannot uninstall.
+UninstallOpenError=File "%1" could not be opened. Cannot uninstall
+UninstallUnsupportedVer=The uninstall log file "%1" is in a format not recognized by this version of the uninstaller. Cannot uninstall
+UninstallUnknownEntry=An unknown entry (%1) was encountered in the uninstall log
+ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components?
+UninstallOnlyOnWin64=This installation can only be uninstalled on 64-bit Windows.
+OnlyAdminCanUninstall=This installation can only be uninstalled by a user with administrative privileges.
+UninstallStatusLabel=Please wait while %1 is removed from your computer.
+UninstalledAll=%1 was successfully removed from your computer.
+UninstalledMost=%1 uninstall complete.%n%nSome elements could not be removed. These can be removed manually.
+UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
+UninstallDataCorrupted="%1" file is corrupted. Cannot uninstall
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Remove Shared File?
+ConfirmDeleteSharedFile2=The system indicates that the following shared file is no longer in use by any programs. Would you like for Uninstall to remove this shared file?%n%nIf any programs are still using this file and it is removed, those programs may not function properly. If you are unsure, choose No. Leaving the file on your system will not cause any harm.
+SharedFileNameLabel=File name:
+SharedFileLocationLabel=Location:
+WizardUninstalling=Uninstall Status
+StatusUninstalling=Uninstalling %1...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=Installing %1.
+ShutdownBlockReasonUninstallingApp=Uninstalling %1.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 version %2
+AdditionalIcons=Additional icons:
+CreateDesktopIcon=Create a &desktop icon
+CreateQuickLaunchIcon=Create a &Quick Launch icon
+ProgramOnTheWeb=%1 on the Web
+UninstallProgram=Uninstall %1
+LaunchProgram=Launch %1
+AssocFileExtension=&Associate %1 with the %2 file extension
+AssocingFileExtension=Associating %1 with the %2 file extension...
+AutoStartProgramGroupDescription=Startup:
+AutoStartProgram=Automatically start %1
+AddonHostProgramNotFound=%1 could not be located in the folder you selected.%n%nDo you want to continue anyway?
--- a/setup/inno/ISCC.exe
+++ b/setup/inno/ISCC.exe
--- a/setup/inno/ISCmplr.dll
+++ b/setup/inno/ISCmplr.dll
--- a/setup/inno/ISPP.dll
+++ b/setup/inno/ISPP.dll
--- a/setup/inno/Setup.e32
+++ b/setup/inno/Setup.e32
--- a/setup/inno/SetupLdr.e32
+++ b/setup/inno/SetupLdr.e32
--- a/setup/inno/WizModernImage.bmp
+++ b/setup/inno/WizModernImage.bmp
--- a/setup/inno/WizModernSmallImage.bmp
+++ b/setup/inno/WizModernSmallImage.bmp
--- a/setup/inno/islzma.dll
+++ b/setup/inno/islzma.dll
--- a/setup/radarr.iss
+++ b/setup/radarr.iss
@@ -4,11 +4,12 @@
 #define AppName "Radarr"
 #define AppPublisher "Team Radarr"
 #define AppURL "https://radarr.video/"
-#define ForumsURL "https://radarr.video/discord"
+#define ForumsURL "https://forums.radarr.video/"
 #define AppExeName "Radarr.exe"
 #define BaseVersion GetEnv('MAJORVERSION')
 #define BuildNumber GetEnv('MINORVERSION')
 #define BuildVersion GetEnv('RADARRVERSION')
+#define BranchName GetEnv('BUILD_SOURCEBRANCHNAME')

 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -21,15 +22,15 @@ AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#ForumsURL}
 AppUpdatesURL={#AppURL}
-DefaultDirName={commonappdata}\Radarr
+DefaultDirName={commonappdata}\Radarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Radarr.{#BuildVersion}.{#Runtime}
+OutputBaseFilename=Radarr.{#BranchName}.{#BuildVersion}.windows.{#Framework}
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False
-UninstallDisplayIcon={app}\bin\Radarr.exe
+UninstallDisplayIcon={app}\Radarr.exe
 DisableReadyPage=True
 CompressionThreads=2
 Compression=lzma2/normal
@@ -37,7 +38,6 @@ AppContact={#ForumsURL}
 VersionInfoVersion={#BaseVersion}.{#BuildNumber}
 SetupLogging=yes
 OutputDir=output
-WizardStyle=modern

 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -48,31 +48,28 @@ Name: "windowsService"; Description: "Install Windows Service (Starts when the c
 Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked

-[Dirs]
-Name: "{app}"; Permissions: users-modify
-
 [Files]
-Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\Radarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\*"; Excludes: "Radarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\Radarr.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\*"; Excludes: "Radarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

 [Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"
-Name: "{commondesktop}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
-Name: "{userstartup}\{#AppName}"; Filename: "{app}\bin\Radarr.exe"; WorkingDir: "{app}\bin"; Tasks: startupShortcut
+Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
+Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
+Name: "{userstartup}\{#AppName}"; Filename: "{app}\Radarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut

 [InstallDelete]
-Name: "{app}\bin"; Type: filesandordirs
+Name: "{app}"; Type: filesandordirs

 [Run]
-Filename: "{app}\bin\Radarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
-Filename: "{app}\bin\Radarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl /exitimmediately"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
-Filename: "{app}\bin\Radarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
-Filename: "{app}\bin\Radarr.exe"; Description: "Open Radarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
-Filename: "{app}\bin\Radarr.exe"; Description: "Start Radarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
+Filename: "{app}\Radarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
+Filename: "{app}\Radarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl /exitimmediately"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
+Filename: "{app}\Radarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
+Filename: "{app}\Radarr.exe"; Description: "Open Radarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
+Filename: "{app}\Radarr.exe"; Description: "Start Radarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;

 [UninstallRun]
-Filename: "{app}\bin\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist

 [Code]
 function PrepareToInstall(var NeedsRestart: Boolean): String;
--- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
@@ -146,7 +146,7 @@ namespace NzbDrone.Common.Test.Http
            var request = new HttpRequest($"https://expired.badssl.com");

            Assert.Throws<HttpRequestException>(() => Subject.Execute(request));
-            ExceptionVerification.ExpectedErrors(1);
+            ExceptionVerification.ExpectedErrors(2);
        }

        [Test]
--- a/src/NzbDrone.Common/Cloud/RadarrCloudRequestBuilder.cs
+++ b/src/NzbDrone.Common/Cloud/RadarrCloudRequestBuilder.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Common.Cloud
                .SetHeader("Authorization", $"Bearer {AuthToken}")
                .CreateFactory();

-            RadarrMetadata = new HttpRequestBuilder("https://api.radarr.video/v1/{route}")
+            RadarrMetadata = new HttpRequestBuilder("https://radarrapi.servarr.com/v1/{route}")
                .CreateFactory();
        }

--- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
@@ -14,7 +14,7 @@ namespace NzbDrone.Common.EnvironmentInfo
        private readonly Logger _logger;
        private readonly DateTime _startTime = DateTime.UtcNow;

-        public RuntimeInfo(Logger logger, IHostLifetime hostLifetime = null)
+        public RuntimeInfo(IHostLifetime hostLifetime, Logger logger)
        {
            _logger = logger;

--- a/src/NzbDrone.Common/Extensions/StringExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/StringExtensions.cs
@@ -171,26 +171,5 @@ namespace NzbDrone.Common.Extensions
        {
            return source.Contains(value, StringComparer.InvariantCultureIgnoreCase);
        }
-
-        public static string EncodeRFC3986(this string value)
-        {
-            // From Twitterizer http://www.twitterizer.net/
-            if (string.IsNullOrEmpty(value))
-            {
-                return string.Empty;
-            }
-
-            var encoded = Uri.EscapeDataString(value);
-
-            return Regex
-                .Replace(encoded, "(%[0-9a-f][0-9a-f])", c => c.Value.ToUpper())
-                .Replace("(", "%28")
-                .Replace(")", "%29")
-                .Replace("$", "%24")
-                .Replace("!", "%21")
-                .Replace("*", "%2A")
-                .Replace("'", "%27")
-                .Replace("%7E", "~");
-        }
    }
 }
--- a/src/NzbDrone.Common/Http/BasicNetworkCredential.cs
+++ b/src/NzbDrone.Common/Http/BasicNetworkCredential.cs
@@ -1,12 +0,0 @@
-using System.Net;
-
-namespace NzbDrone.Common.Http
-{
-    public class BasicNetworkCredential : NetworkCredential
-    {
-        public BasicNetworkCredential(string user, string pass)
-        : base(user, pass)
-        {
-        }
-    }
-}
--- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
@@ -4,9 +4,9 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Security;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Proxy;
@@ -26,21 +26,22 @@ namespace NzbDrone.Common.Http.Dispatchers
        private readonly ICertificateValidationService _certificateValidationService;
        private readonly IUserAgentBuilder _userAgentBuilder;
        private readonly ICached<System.Net.Http.HttpClient> _httpClientCache;
-        private readonly ICached<CredentialCache> _credentialCache;
+        private readonly Logger _logger;

        public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider,
            ICreateManagedWebProxy createManagedWebProxy,
            ICertificateValidationService certificateValidationService,
            IUserAgentBuilder userAgentBuilder,
-            ICacheManager cacheManager)
+            ICacheManager cacheManager,
+            Logger logger)
        {
            _proxySettingsProvider = proxySettingsProvider;
            _createManagedWebProxy = createManagedWebProxy;
            _certificateValidationService = certificateValidationService;
            _userAgentBuilder = userAgentBuilder;
+            _logger = logger;

            _httpClientCache = cacheManager.GetCache<System.Net.Http.HttpClient>(typeof(ManagedHttpDispatcher));
-            _credentialCache = cacheManager.GetCache<CredentialCache>(typeof(ManagedHttpDispatcher), "credentialcache");
        }

        public HttpResponse GetResponse(HttpRequest request, CookieContainer cookies)
@@ -66,26 +67,6 @@ namespace NzbDrone.Common.Http.Dispatchers
                cts.CancelAfter(TimeSpan.FromSeconds(100));
            }

-            if (request.Credentials != null)
-            {
-                if (request.Credentials is BasicNetworkCredential bc)
-                {
-                    // Manually set header to avoid initial challenge response
-                    var authInfo = bc.UserName + ":" + bc.Password;
-                    authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
-                    requestMessage.Headers.Add("Authorization", "Basic " + authInfo);
-                }
-                else if (request.Credentials is NetworkCredential nc)
-                {
-                    var creds = GetCredentialCache();
-                    foreach (var authtype in new[] { "Basic", "Digest" })
-                    {
-                        creds.Remove((Uri)request.Url, authtype);
-                        creds.Add((Uri)request.Url, authtype, nc);
-                    }
-                }
-            }
-
            if (request.ContentData != null)
            {
                requestMessage.Content = new ByteArrayContent(request.ContentData);
@@ -98,32 +79,49 @@ namespace NzbDrone.Common.Http.Dispatchers

            var httpClient = GetClient(request.Url);

-            using var responseMessage = httpClient.Send(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
+            HttpResponseMessage responseMessage;
+
+            try
            {
-                byte[] data = null;
-
-                try
-                {
-                    if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
-                    {
-                        responseMessage.Content.CopyTo(request.ResponseStream, null, cts.Token);
-                    }
-                    else
-                    {
-                        data = responseMessage.Content.ReadAsByteArrayAsync(cts.Token).GetAwaiter().GetResult();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
-                }
-
-                var headers = responseMessage.Headers.ToNameValueCollection();
-
-                headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
-
-                return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode);
+                responseMessage = httpClient.Send(requestMessage, cts.Token);
            }
+            catch (HttpRequestException e)
+            {
+                _logger.Error(e, "HttpClient error");
+                throw;
+            }
+
+            byte[] data = null;
+
+            using (var responseStream = responseMessage.Content.ReadAsStream())
+            {
+                if (responseStream != null && responseStream != Stream.Null)
+                {
+                    try
+                    {
+                        if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
+                        {
+                            // A target ResponseStream was specified, write to that instead.
+                            // But only on the OK status code, since we don't want to write failures and redirects.
+                            responseStream.CopyTo(request.ResponseStream);
+                        }
+                        else
+                        {
+                            data = responseStream.ToBytes();
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
+                    }
+                }
+            }
+
+            var headers = responseMessage.Headers.ToNameValueCollection();
+
+            headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
+
+            return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode);
        }

        protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri)
@@ -142,8 +140,6 @@ namespace NzbDrone.Common.Http.Dispatchers
                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Brotli,
                UseCookies = false, // sic - we don't want to use a shared cookie container
                AllowAutoRedirect = false,
-                Credentials = GetCredentialCache(),
-                PreAuthenticate = true,
                MaxConnectionsPerServer = 12,
                ConnectCallback = onConnect,
                SslOptions = new SslClientAuthenticationOptions
@@ -228,11 +224,6 @@ namespace NzbDrone.Common.Http.Dispatchers
            headers.Add(header, value);
        }

-        private CredentialCache GetCredentialCache()
-        {
-            return _credentialCache.Get("credentialCache", () => new CredentialCache());
-        }
-
        private static async ValueTask<Stream> onConnect(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
        {
            // Until .NET supports an implementation of Happy Eyeballs (https://tools.ietf.org/html/rfc8305#section-2), let's make IPv4 fallback work in a simple way.
--- a/src/NzbDrone.Common/Http/HttpRequest.cs
+++ b/src/NzbDrone.Common/Http/HttpRequest.cs
@@ -38,7 +38,6 @@ namespace NzbDrone.Common.Http
        public HttpHeader Headers { get; set; }
        public byte[] ContentData { get; set; }
        public string ContentSummary { get; set; }
-        public ICredentials Credentials { get; set; }
        public bool SuppressHttpError { get; set; }
        public IEnumerable<HttpStatusCode> SuppressHttpErrorStatusCodes { get; set; }
        public bool UseSimplifiedUserAgent { get; set; }
@@ -90,5 +89,12 @@ namespace NzbDrone.Common.Http
            var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
            ContentData = encoding.GetBytes(data);
        }
+
+        public void AddBasicAuthentication(string username, string password)
+        {
+            var authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes($"{username}:{password}"));
+
+            Headers.Set("Authorization", "Basic " + authInfo);
+        }
    }
 }
--- a/src/NzbDrone.Common/Http/HttpRequestBuilder.cs
+++ b/src/NzbDrone.Common/Http/HttpRequestBuilder.cs
@@ -26,9 +26,10 @@ namespace NzbDrone.Common.Http
        public bool ConnectionKeepAlive { get; set; }
        public TimeSpan RateLimit { get; set; }
        public bool LogResponseContent { get; set; }
-        public ICredentials NetworkCredential { get; set; }
+        public NetworkCredential NetworkCredential { get; set; }
        public Dictionary<string, string> Cookies { get; private set; }
        public List<HttpFormData> FormData { get; private set; }
+
        public Action<HttpRequest> PostProcess { get; set; }

        public HttpRequestBuilder(string baseUrl)
@@ -108,7 +109,13 @@ namespace NzbDrone.Common.Http
            request.ConnectionKeepAlive = ConnectionKeepAlive;
            request.RateLimit = RateLimit;
            request.LogResponseContent = LogResponseContent;
-            request.Credentials = NetworkCredential;
+
+            if (NetworkCredential != null)
+            {
+                var authInfo = NetworkCredential.UserName + ":" + NetworkCredential.Password;
+                authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
+                request.Headers.Set("Authorization", "Basic " + authInfo);
+            }

            foreach (var header in Headers)
            {
--- a/src/NzbDrone.Common/Http/XmlRpcRequestBuilder.cs
+++ b/src/NzbDrone.Common/Http/XmlRpcRequestBuilder.cs
@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Xml.Linq;
-using NLog;
-using NzbDrone.Common.Instrumentation;
-
-namespace NzbDrone.Common.Http
-{
-    public class XmlRpcRequestBuilder : HttpRequestBuilder
-    {
-        public static string XmlRpcContentType = "text/xml";
-
-        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(XmlRpcRequestBuilder));
-
-        public string XmlMethod { get; private set; }
-        public List<object> XmlParameters { get; private set; }
-
-        public XmlRpcRequestBuilder(string baseUrl)
-            : base(baseUrl)
-        {
-            Method = HttpMethod.Post;
-            XmlParameters = new List<object>();
-        }
-
-        public XmlRpcRequestBuilder(bool useHttps, string host, int port, string urlBase = null)
-            : this(BuildBaseUrl(useHttps, host, port, urlBase))
-        {
-        }
-
-        public override HttpRequestBuilder Clone()
-        {
-            var clone = base.Clone() as XmlRpcRequestBuilder;
-            clone.XmlParameters = new List<object>(XmlParameters);
-            return clone;
-        }
-
-        public XmlRpcRequestBuilder Call(string method, params object[] parameters)
-        {
-            var clone = Clone() as XmlRpcRequestBuilder;
-            clone.XmlMethod = method;
-            clone.XmlParameters = parameters.ToList();
-            return clone;
-        }
-
-        protected override void Apply(HttpRequest request)
-        {
-            base.Apply(request);
-
-            request.Headers.ContentType = XmlRpcContentType;
-
-            var methodCallElements = new List<XElement> { new XElement("methodName", XmlMethod) };
-
-            if (XmlParameters.Any())
-            {
-                var argElements = XmlParameters.Select(x => new XElement("param", ConvertParameter(x))).ToList();
-                var paramsElement = new XElement("params", argElements);
-                methodCallElements.Add(paramsElement);
-            }
-
-            var message = new XDocument(
-                new XDeclaration("1.0", "utf-8", "yes"),
-                new XElement("methodCall", methodCallElements));
-
-            var body = message.ToString();
-
-            Logger.Debug($"Executing remote method: {XmlMethod}");
-
-            Logger.Trace($"methodCall {XmlMethod} body:\n{body}");
-
-            request.SetContent(body);
-        }
-
-        private static XElement ConvertParameter(object value)
-        {
-            XElement data;
-
-            if (value is string s)
-            {
-                data = new XElement("string", s);
-            }
-            else if (value is List<string> l)
-            {
-                data = new XElement("array", new XElement("data", l.Select(x => new XElement("value", new XElement("string", x)))));
-            }
-            else if (value is int i)
-            {
-                data = new XElement("int", i);
-            }
-            else if (value is byte[] bytes)
-            {
-                data = new XElement("base64", Convert.ToBase64String(bytes));
-            }
-            else
-            {
-                throw new InvalidOperationException($"Unhandled argument type {value.GetType().Name}");
-            }
-
-            return new XElement("value", data);
-        }
-    }
-}
--- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
+++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
@@ -71,7 +71,7 @@ namespace NzbDrone.Common.Instrumentation
            else
            {
                dsn = RuntimeInfo.IsProduction
-                    ? "https://26668106d708406b9ddf5a2bda34fcbb@sentry.servarr.com/9"
+                    ? "https://39b572f7f3f04899b2c3254c7ac126d0@sentry.servarr.com/9"
                    : "https://998b4673d4c849ccb5277b5966ed5bc2@sentry.servarr.com/10";
            }

--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
@@ -136,7 +136,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry

                scope.SetTag("culture", Thread.CurrentThread.CurrentCulture.Name);
                scope.SetTag("branch", BuildInfo.Branch);
-                scope.SetTag("runtime_identifier", System.Runtime.InteropServices.RuntimeInformation.RuntimeIdentifier);
            });
        }

--- a/Show More
+++ b/Show More