Aphrodite merged health check

2026-03-16 16:04:52 -04:00 · 2020-09-26 22:49:59 -04:00
304 changed files with 1807 additions and 5496 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -185,9 +185,17 @@ dotnet_diagnostic.CA1814.severity = suggestion
 dotnet_diagnostic.CA1815.severity = suggestion
 dotnet_diagnostic.CA1816.severity = suggestion
 dotnet_diagnostic.CA1819.severity = suggestion
+dotnet_diagnostic.CA1820.severity = suggestion
+dotnet_diagnostic.CA1821.severity = suggestion
 dotnet_diagnostic.CA1822.severity = suggestion
 dotnet_diagnostic.CA1823.severity = suggestion
 dotnet_diagnostic.CA1824.severity = suggestion
+dotnet_diagnostic.CA1825.severity = suggestion
+dotnet_diagnostic.CA1826.severity = suggestion
+dotnet_diagnostic.CA1827.severity = suggestion
+dotnet_diagnostic.CA1828.severity = suggestion
+dotnet_diagnostic.CA1829.severity = suggestion
+dotnet_diagnostic.CA1834.severity = suggestion
 dotnet_diagnostic.CA2000.severity = suggestion
 dotnet_diagnostic.CA2002.severity = suggestion
 dotnet_diagnostic.CA2007.severity = suggestion
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -6,7 +6,7 @@

 **Just because you receive an exception in your logs, doesn't mean it's a bug and should be reported here. Often it's something else, such as a permission error. If you are unsure ask on the Discord or Subreddit first.**

-Visit our [Discord server](https://discord.gg/r5wJPt9) or [Subreddit](https://reddit.com/r/radarr) for support or longer discussions. Support questions posed on here will be closed immediately.
+Visit our [Discord server](https://discord.gg/NWYch8M) or [Subreddit](https://reddit.com/r/radarr) for support or longer discussions. Support questions posed on here will be closed immediately.

 Provide a description of the feature request or bug here, the more details the better. 
 Please also include the following if you are reporting a bug. If you do not include it, the issue will probably be closed as we cannot help you. -->
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Support via Discord
-    url: https://discord.gg/r5wJPt9
+    url: https://discord.gg/AD3UP37
    about: Chat with users and devs on support and setup related topics.
  - name: Support via Reddit
    url: https://reddit.com/r/radarr
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -7,10 +7,7 @@ exemptLabels:
  - feature request
  - parser
  - confirmed
-  - sonarr-pull
-  - lidarr-pull
-  - readarr-pull
-  - v3
+  - aphrodite
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
--- a/.github/support.yml
+++ b/.github/support.yml
@@ -6,7 +6,7 @@ supportLabel: support
 # to a support page, or set to `false` to disable
 supportComment: >
  We use the issue tracker exclusively for bug reports and feature requests.
-  However, this issue appears to be a support request. Please hop over onto our [Discord](https://discord.gg/r5wJPt9) or [Subreddit](https://reddit.com/r/radarr)
+  However, this issue appears to be a support request. Please hop over onto our [Discord](https://discord.gg/ZDmT7qb) or [Subreddit](https://reddit.com/r/radarr)
 # Whether to close issues marked as support requests
 close: true
 # Whether to lock issues marked as support requests
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ See the readme for information on setting up your development environment.
 - Rebase from Radarr's develop branch, don't merge
 - Make meaningful commits, or squash them
 - Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
- Reach out to us on the discord if you have any questions
+- Reach out to us on the forums or on IRC if you have any questions
 - Add tests (unit/integration)
 - Commit with *nix line endings for consistency (We checkout Windows and commit *nix)
 - One feature/bug fix per pull request to keep things clean and easy to understand
--- a/README.md
+++ b/README.md
@@ -28,18 +28,15 @@ If you are using Docker please ensure your Docker paths are setup correctly usin
 ## Downloads
 Please note that v0.2 will only have critical bugs resolved as of August 2020. Any additional development or features will be soley in V3.

-Each push to the "develop" branch creates a build on "nightly" release channel (release channel is the "branch" within radarr's settings), once we push a build to Github it will show up on "develop" release channel.
-
-
-| Release Channel Type    | Branch: develop (stable) (v0.2)                                                                                                                                                    | Branch: nightly (semi-unstable) (v3.0)                                                                                                                                                               |
-|-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Binary Releases | [![GitHub Releases](https://img.shields.io/badge/downloads-releases-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases)                 |  [![Azure Build](https://img.shields.io/badge/downloads-Windows_X64-green.svg?maxAge=60&style=flat-square)](https://radarr.servarr.com/v1/update/nightly/updatefile?os=windows&runtime=netcore&arch=x64) <br> [![Azure Build](https://img.shields.io/badge/downloads-Linux_X64-green.svg?maxAge=60&style=flat-square)](https://radarr.servarr.com/v1/update/nightly/updatefile?os=linux&runtime=netcore&arch=x64) <br> [![Azure Build](https://img.shields.io/badge/downloads-Linux_ARM64-green.svg?maxAge=60&style=flat-square)](https://radarr.servarr.com/v1/update/nightly/updatefile?os=linux&runtime=netcore&arch=arm64) [![Azure Build](https://img.shields.io/badge/downloads-Linux_ARM-green.svg?maxAge=60&style=flat-square)](https://radarr.servarr.com/v1/update/nightly/updatefile?os=linux&runtime=netcore&arch=arm) <br> [![Azure Build](https://img.shields.io/badge/downloads-macOS-green.svg?maxAge=60&style=flat-square)](https://radarr.servarr.com/v1/update/nightly/updatefile?os=osx&runtime=netcore&arch=x64)                                                                                                                                                                    
-| Docker - lsio   | [![Docker release](https://img.shields.io/badge/linuxserver-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)  | [![Docker nightly](https://img.shields.io/badge/linuxserver-radarr:nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)                   |
-| Docker - hotio  | [![Docker release](https://img.shields.io/badge/hotio-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)              | [![Docker nightly](https://img.shields.io/badge/hotio-radarr:nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)                              | 
+| Release Type    | Branch: develop (stable)                                                                                                                                                     | Branch: nightly (semi-unstable)                                                                                                                                                                | Branch: aphrodite (very-unstable)                                                                                                                                              |
+|-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Binary Releases | [![GitHub Releases](https://img.shields.io/badge/downloads-releases-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases)                 | [![AppVeyor Builds](https://img.shields.io/badge/downloads-nightly-green.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/radarr-usby1/branch/develop/artifacts)    |                                                                                                                                                                                |
+| Docker - lsio   | [![Docker release](https://img.shields.io/badge/linuxserver-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)  | [![Docker nightly](https://img.shields.io/badge/linuxserver-radarr:nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)                   | [![Docker aphrodite](https://img.shields.io/badge/linuxserver-radarr:preview-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr) |
+| Docker - hotio  | [![Docker release](https://img.shields.io/badge/hotio-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)              | [![Docker nightly](https://img.shields.io/badge/hotio-radarr:unstable-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)                              | [![Docker aphrodite](https://img.shields.io/badge/hotio-radarr:aphrodite-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)           |

 ## Support

-[![Discord](https://img.shields.io/badge/discord-chat-r5wJPt9.svg?maxAge=60&style=flat-square)](https://discord.gg/r5wJPt9)
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/AD3UP37)
 [![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60&style=flat-square)](https://www.reddit.com/r/radarr)
 [![GitHub](https://img.shields.io/badge/github-issues-red.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
 [![GitHub Wiki](https://img.shields.io/badge/github-wiki-181717.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,10 +20,11 @@ trigger:
  branches:
    include:
    - develop
-    - master
+    - aphrodite

 pr:
 - develop
+- aphrodite

 stages:
  - stage: Setup
@@ -39,7 +40,7 @@ stages:
        displayName: Set Build Name
      - bash: |
          if [[ $BUILD_REASON == "PullRequest" ]]; then
-          git diff origin/develop...HEAD  --name-only | grep -E "^(src/|azure-pipelines.yml)"
+          git diff origin/aphrodite...HEAD  --name-only | grep -E "^(src/|azure-pipelines.yml)"
          echo $? > not_backend_update
          else
          echo 0 > not_backend_update
@@ -301,22 +302,14 @@ stages:
          sentry-cli releases new --finalize -p radarr -p radarr-ui -p radarr-update "${RELEASENAME}"
          sentry-cli releases -p radarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite
          sentry-cli releases set-commits --auto "${RELEASENAME}"
-          if [[ ${BUILD_SOURCEBRANCH} == "refs/heads/develop" ]]; then
-          sentry-cli releases deploys "${RELEASENAME}" new -e nightly
-          else
-          sentry-cli releases deploys "${RELEASENAME}" new -e production
-          fi
+          sentry-cli releases deploys "${RELEASENAME}" new -e aphrodite
          if [ $? -gt 0 ]; then
            echo "##vso[task.logissue type=warning]Error uploading source maps."
          fi
          exit 0
        displayName: Publish Sentry Source Maps
-        condition: |
-          or
-          (
-            and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')),
-            and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-          )
+        continueOnError: true
+        condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/aphrodite'))
        env:
          SENTRY_AUTH_TOKEN: $(sentryAuthTokenServarr)
          SENTRY_ORG: $(sentryOrg)
@@ -386,6 +379,11 @@ stages:
      - powershell: Set-Service SCardSvr -StartupType Manual
        displayName: Enable Windows Test Service
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      - bash: |
+          wget https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-fpcalc-1.4.3-linux-x86_64.tar.gz
+          sudo tar xf chromaprint-fpcalc-1.4.3-linux-x86_64.tar.gz --strip-components=1 --directory /usr/bin
+        displayName: Install fpcalc
+        condition: and(succeeded(), eq(variables['osName'], 'Linux'))
      - bash: |
          SYMLINK=6_6_0
          MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
@@ -688,21 +686,24 @@ stages:
          mkdir -p ./bin/
          cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Radarr/. ./bin/
        displayName: Move Package Contents
+      - bash: |
+          if [[ $OSNAME == "Mac" ]]; then
+          url=https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-macos.tar.gz
+          elif [[ $OSNAME == "Linux" ]]; then
+          url=https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz
+          else
+          echo "Unhandled OS"
+          exit 1
+          fi
+          curl -s -L "$url" | tar -xz
+          chmod +x geckodriver
+          mv geckodriver _tests
+        displayName: Install Gecko Driver
+        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
      - bash: |
          chmod a+x ${TESTSFOLDER}/test.sh
          ${TESTSFOLDER}/test.sh ${OSNAME} Automation Test
        displayName: Run Automation Tests
-      - task: CopyFiles@2
-        displayName: 'Copy Screenshot to: $(Build.ArtifactStagingDirectory)'
-        inputs:
-          SourceFolder: '$(Build.SourcesDirectory)'
-          Contents: |
-            **/*_test_screenshot.png
-          TargetFolder: '$(Build.ArtifactStagingDirectory)/screenshots'
-      - publish: $(Build.ArtifactStagingDirectory)/screenshots
-        artifact: '$(osName)AutomationScreenshots'
-        displayName: Publish Screenshot Bundle
-        condition: and(succeeded(), eq(variables['System.JobAttempt'], '1'))
      - task: PublishTestResults@2
        inputs:
          testResultsFormat: 'NUnit'
@@ -851,15 +852,8 @@ stages:
    - job:
      displayName: Discord Notification
      pool:
-        vmImage: 'windows-2019'
+        vmImage: 'ubuntu-18.04'
      steps:
-        - task: DownloadPipelineArtifact@2
-          continueOnError: true
-          displayName: Download Screenshot Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: 'WindowsAutomationScreenshots'
-            targetPath: $(Build.SourcesDirectory)
        - checkout: none
        - powershell: |
            iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Servarr/AzureDiscordNotify/master/DiscordNotify.ps1'))
--- a/frontend/.stylelintrc
+++ b/frontend/.stylelintrc
@@ -75,7 +75,7 @@
    "function-parentheses-newline-inside": "never-multi-line",
    "function-parentheses-space-inside": "never",
    "function-url-quotes": "always",
-    "function-url-scheme-disallowed-list": [
+    "function-url-scheme-blacklist": [
      "data"
    ],
    "function-whitespace-after": "always",
--- a/frontend/gulp/webpack.js
+++ b/frontend/gulp/webpack.js
@@ -7,7 +7,6 @@ const errorHandler = require('./helpers/errorHandler');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const HtmlWebpackPluginHtmlTags = require('html-webpack-plugin/lib/html-tags');
 const TerserPlugin = require('terser-webpack-plugin');

 const uiFolder = 'UI';
@@ -15,7 +14,7 @@ const frontendFolder = path.join(__dirname, '..');
 const srcFolder = path.join(frontendFolder, 'src');
 const isProduction = process.argv.indexOf('--production') > -1;
 const isProfiling = isProduction && process.argv.indexOf('--profile') > -1;
-const inlineWebWorkers = 'no-fallback';
+const inlineWebWorkers = true;

 const distFolder = path.resolve(frontendFolder, '..', '_output', uiFolder);

@@ -33,19 +32,14 @@ const cssVarsFiles = [
 ].map(require.resolve);

 // Override the way HtmlWebpackPlugin injects the scripts
-// TODO: Find a better way to get these paths without
 HtmlWebpackPlugin.prototype.injectAssetsIntoHtml = function(html, assets, assetTags) {
-  const head = assetTags.headTags.map((v) => {
-    const href = v.attributes.href
-      .replace('\\', '/')
-      .replace('%5C', '/');
-
-    v.attributes = { rel: 'stylesheet', type: 'text/css', href: `/${href}` };
-    return HtmlWebpackPluginHtmlTags.htmlTagObjectToString(v, this.options.xhtml);
+  const head = assetTags.head.map((v) => {
+    v.attributes = { rel: 'stylesheet', type: 'text/css', href: `/${v.attributes.href.replace('\\', '/')}` };
+    return this.createHtmlTag(v);
  });
-  const body = assetTags.bodyTags.map((v) => {
+  const body = assetTags.body.map((v) => {
    v.attributes = { src: `/${v.attributes.src}` };
-    return HtmlWebpackPluginHtmlTags.htmlTagObjectToString(v, this.options.xhtml);
+    return this.createHtmlTag(v);
  });

  return html
@@ -131,8 +125,9 @@ const config = {
        use: {
          loader: 'worker-loader',
          options: {
-            filename: '[name].js',
-            inline: inlineWebWorkers
+            name: '[name].js',
+            inline: inlineWebWorkers,
+            fallback: !inlineWebWorkers
          }
        }
      },
--- a/frontend/src/Activity/Blacklist/Blacklist.js
+++ b/frontend/src/Activity/Blacklist/Blacklist.js
@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@@ -11,84 +10,12 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons, kinds } from 'Helpers/Props';
-import getRemovedItems from 'Utilities/Object/getRemovedItems';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import { align, icons } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import getSelectedIds from 'Utilities/Table/getSelectedIds';
-import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
-import selectAll from 'Utilities/Table/selectAll';
-import toggleSelected from 'Utilities/Table/toggleSelected';
 import BlacklistRowConnector from './BlacklistRowConnector';

 class Blacklist extends Component {

-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      allSelected: false,
-      allUnselected: false,
-      lastToggled: null,
-      selectedState: {},
-      isConfirmRemoveModalOpen: false,
-      items: props.items
-    };
-  }
-
-  componentDidUpdate(prevProps) {
-    const {
-      items
-    } = this.props;
-
-    if (hasDifferentItems(prevProps.items, items)) {
-      this.setState((state) => {
-        return {
-          ...removeOldSelectedState(state, getRemovedItems(prevProps.items, items)),
-          items
-        };
-      });
-
-      return;
-    }
-  }
-
-  //
-  // Control
-
-  getSelectedIds = () => {
-    return getSelectedIds(this.state.selectedState);
-  }
-
-  //
-  // Listeners
-
-  onSelectAllChange = ({ value }) => {
-    this.setState(selectAll(this.state.selectedState, value));
-  }
-
-  onSelectedChange = ({ id, value, shiftKey = false }) => {
-    this.setState((state) => {
-      return toggleSelected(state, this.props.items, id, value, shiftKey);
-    });
-  }
-
-  onRemoveSelectedPress = () => {
-    this.setState({ isConfirmRemoveModalOpen: true });
-  }
-
-  onRemoveSelectedConfirmed = () => {
-    this.props.onRemoveSelected(this.getSelectedIds());
-    this.setState({ isConfirmRemoveModalOpen: false });
-  }
-
-  onConfirmRemoveModalClose = () => {
-    this.setState({ isConfirmRemoveModalOpen: false });
-  }
-
  //
  // Render

@@ -100,33 +27,15 @@ class Blacklist extends Component {
      items,
      columns,
      totalRecords,
-      isRemoving,
      isClearingBlacklistExecuting,
      onClearBlacklistPress,
      ...otherProps
    } = this.props;

-    const {
-      allSelected,
-      allUnselected,
-      selectedState,
-      isConfirmRemoveModalOpen
-    } = this.state;
-
-    const selectedIds = this.getSelectedIds();
-
    return (
      <PageContent title={translate('Blacklist')}>
        <PageToolbar>
          <PageToolbarSection>
-            <PageToolbarButton
-              label="Remove Selected"
-              iconName={icons.REMOVE}
-              isDisabled={!selectedIds.length}
-              isSpinning={isRemoving}
-              onPress={this.onRemoveSelectedPress}
-            />
-
            <PageToolbarButton
              label={translate('Clear')}
              iconName={icons.CLEAR}
@@ -172,12 +81,8 @@ class Blacklist extends Component {
            isPopulated && !error && !!items.length &&
              <div>
                <Table
-                  selectAll={true}
-                  allSelected={allSelected}
-                  allUnselected={allUnselected}
                  columns={columns}
                  {...otherProps}
-                  onSelectAllChange={this.onSelectAllChange}
                >
                  <TableBody>
                    {
@@ -185,10 +90,8 @@ class Blacklist extends Component {
                        return (
                          <BlacklistRowConnector
                            key={item.id}
-                            isSelected={selectedState[item.id] || false}
                            columns={columns}
                            {...item}
-                            onSelectedChange={this.onSelectedChange}
                          />
                        );
                      })
@@ -204,16 +107,6 @@ class Blacklist extends Component {
              </div>
          }
        </PageContentBody>
-
-        <ConfirmModal
-          isOpen={isConfirmRemoveModalOpen}
-          kind={kinds.DANGER}
-          title="Remove Selected"
-          message={'Are you sure you want to remove the selected items from the blacklist?'}
-          confirmLabel="Remove Selected"
-          onConfirm={this.onRemoveSelectedConfirmed}
-          onCancel={this.onConfirmRemoveModalClose}
-        />
      </PageContent>
    );
  }
@@ -226,9 +119,7 @@ Blacklist.propTypes = {
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  totalRecords: PropTypes.number,
-  isRemoving: PropTypes.bool.isRequired,
  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
-  onRemoveSelected: PropTypes.func.isRequired,
  onClearBlacklistPress: PropTypes.func.isRequired
 };

--- a/frontend/src/Activity/Blacklist/BlacklistConnector.js
+++ b/frontend/src/Activity/Blacklist/BlacklistConnector.js
@@ -89,10 +89,6 @@ class BlacklistConnector extends Component {
    this.props.gotoBlacklistPage({ page });
  }

-  onRemoveSelected = (ids) => {
-    this.props.removeBlacklistItems({ ids });
-  }
-
  onSortPress = (sortKey) => {
    this.props.setBlacklistSort({ sortKey });
  }
@@ -128,7 +124,6 @@ class BlacklistConnector extends Component {
        onNextPagePress={this.onNextPagePress}
        onLastPagePress={this.onLastPagePress}
        onPageSelect={this.onPageSelect}
-        onRemoveSelected={this.onRemoveSelected}
        onSortPress={this.onSortPress}
        onTableOptionChange={this.onTableOptionChange}
        onClearBlacklistPress={this.onClearBlacklistPress}
@@ -148,7 +143,6 @@ BlacklistConnector.propTypes = {
  gotoBlacklistNextPage: PropTypes.func.isRequired,
  gotoBlacklistLastPage: PropTypes.func.isRequired,
  gotoBlacklistPage: PropTypes.func.isRequired,
-  removeBlacklistItems: PropTypes.func.isRequired,
  setBlacklistSort: PropTypes.func.isRequired,
  setBlacklistTableOption: PropTypes.func.isRequired,
  clearBlacklist: PropTypes.func.isRequired,
--- a/frontend/src/Activity/Blacklist/BlacklistRow.js
+++ b/frontend/src/Activity/Blacklist/BlacklistRow.js
@@ -3,7 +3,6 @@ import React, { Component } from 'react';
 import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
@@ -43,7 +42,6 @@ class BlacklistRow extends Component {

  render() {
    const {
-      id,
      movie,
      sourceTitle,
      quality,
@@ -53,9 +51,7 @@ class BlacklistRow extends Component {
      protocol,
      indexer,
      message,
-      isSelected,
      columns,
-      onSelectedChange,
      onRemovePress
    } = this.props;

@@ -65,12 +61,6 @@ class BlacklistRow extends Component {

    return (
      <TableRow>
-        <TableSelectCell
-          id={id}
-          isSelected={isSelected}
-          onSelectedChange={onSelectedChange}
-        />
-
        {
          columns.map((column) => {
            const {
@@ -204,9 +194,7 @@ BlacklistRow.propTypes = {
  protocol: PropTypes.string.isRequired,
  indexer: PropTypes.string,
  message: PropTypes.string,
-  isSelected: PropTypes.bool.isRequired,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onSelectedChange: PropTypes.func.isRequired,
  onRemovePress: PropTypes.func.isRequired
 };

--- a/frontend/src/Activity/Blacklist/BlacklistRowConnector.js
+++ b/frontend/src/Activity/Blacklist/BlacklistRowConnector.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { removeBlacklistItem } from 'Store/Actions/blacklistActions';
+import { removeFromBlacklist } from 'Store/Actions/blacklistActions';
 import createMovieSelector from 'Store/Selectors/createMovieSelector';
 import BlacklistRow from './BlacklistRow';

@@ -18,7 +18,7 @@ function createMapStateToProps() {
 function createMapDispatchToProps(dispatch, props) {
  return {
    onRemovePress() {
-      dispatch(removeBlacklistItem({ id: props.id }));
+      dispatch(removeFromBlacklist({ id: props.id }));
    }
  };
 }
--- a/frontend/src/Activity/History/Details/HistoryDetailsConnector.js
+++ b/frontend/src/Activity/History/Details/HistoryDetailsConnector.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,10 +8,10 @@ function createMapStateToProps() {
  return createSelector(
    createUISettingsSelector(),
    (uiSettings) => {
-      return {
-        shortDateFormat: uiSettings.shortDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
+      return _.pick(uiSettings, [
+        'shortDateFormat',
+        'timeFormat'
+      ]);
    }
  );
 }
--- a/frontend/src/Activity/Queue/QueueDetails.js
+++ b/frontend/src/Activity/Queue/QueueDetails.js
@@ -11,14 +11,14 @@ function QueueDetails(props) {
    size,
    sizeleft,
    estimatedCompletionTime,
-    status,
-    trackedDownloadState,
-    trackedDownloadStatus,
+    status: queueStatus,
    errorMessage,
    progressBar
  } = props;

-  const progress = size ? (100 - sizeleft / size * 100) : 0;
+  const status = queueStatus.toLowerCase();
+
+  const progress = (100 - sizeleft / size * 100);

  if (status === 'pending') {
    return (
@@ -40,35 +40,7 @@ function QueueDetails(props) {
      );
    }

-    if (trackedDownloadStatus === 'warning') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.WARNING}
-          title={'Downloaded - Unable to Import: check logs for details'}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importPending') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={`${translate('Downloaded')} - ${translate('WaitingToImport')}`}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importing') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={`${translate('Downloaded')} - ${translate('Importing')}`}
-        />
-      );
-    }
+    // TODO: show an icon when download is complete, but not imported yet?
  }

  if (errorMessage) {
@@ -119,8 +91,6 @@ QueueDetails.propTypes = {
  sizeleft: PropTypes.number.isRequired,
  estimatedCompletionTime: PropTypes.string,
  status: PropTypes.string.isRequired,
-  trackedDownloadState: PropTypes.string.isRequired,
-  trackedDownloadStatus: PropTypes.string.isRequired,
  errorMessage: PropTypes.string,
  progressBar: PropTypes.node.isRequired
 };
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js
@@ -117,7 +117,7 @@ class AddNewMovieModalContent extends Component {

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

                  <FormInputGroup
@@ -168,7 +168,7 @@ class AddNewMovieModalContent extends Component {
        <ModalFooter className={styles.modalFooter}>
          <label className={styles.searchForMissingMovieLabelContainer}>
            <span className={styles.searchForMissingMovieLabel}>
-              {translate('StartSearchForMissingMovie')}
+              Start search for missing movie
            </span>

            <CheckInput
@@ -186,7 +186,7 @@ class AddNewMovieModalContent extends Component {
            isSpinning={isAdding}
            onPress={this.onAddMoviePress}
          >
-            {translate('AddMovie')}
+            Add {title}
          </SpinnerButton>
        </ModalFooter>
      </ModalContent>
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
@@ -170,7 +170,6 @@ class AddNewMovieSearchResult extends Component {
                    imdbId={imdbId}
                  />
                }
-                canFlip={true}
                kind={kinds.INVERSE}
                position={tooltipPositions.BOTTOM}
              />
--- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js
@@ -10,7 +10,6 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContentFooter from 'Components/Page/PageContentFooter';
 import Popover from 'Components/Tooltip/Popover';
 import { icons, inputTypes, kinds, tooltipPositions } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import styles from './ImportMovieFooter.css';

 const MIXED = 'mixed';
@@ -113,7 +112,7 @@ class ImportMovieFooter extends Component {
      <PageContentFooter>
        <div className={styles.inputContainer}>
          <div className={styles.label}>
-            {translate('Monitor')}
+            Monitor
          </div>

          <FormInputGroup
@@ -128,7 +127,7 @@ class ImportMovieFooter extends Component {

        <div className={styles.inputContainer}>
          <div className={styles.label}>
-            {translate('MinimumAvailability')}
+            Minimum Availability
          </div>

          <FormInputGroup
@@ -143,7 +142,7 @@ class ImportMovieFooter extends Component {

        <div className={styles.inputContainer}>
          <div className={styles.label}>
-            {translate('QualityProfile')}
+            Quality Profile
          </div>

          <FormInputGroup
@@ -169,7 +168,7 @@ class ImportMovieFooter extends Component {
              isDisabled={!selectedCount || isLookingUpMovie}
              onPress={onImportPress}
            >
-              {translate('Import')} {selectedCount} {selectedCount > 1 ? translate('Movies') : translate('Movie')}
+              Import {selectedCount} {selectedCount > 1 ? 'Movies' : 'Movie'}
            </SpinnerButton>

            {
@@ -179,7 +178,7 @@ class ImportMovieFooter extends Component {
                  kind={kinds.WARNING}
                  onPress={onCancelLookupPress}
                >
-                  {translate('CancelProcessing')}
+                  Cancel Processing
                </Button> :
                null
            }
@@ -191,7 +190,7 @@ class ImportMovieFooter extends Component {
                  kind={kinds.SUCCESS}
                  onPress={onLookupPress}
                >
-                  {translate('StartProcessing')}
+                  Start Processing
                </Button> :
                null
            }
@@ -207,7 +206,7 @@ class ImportMovieFooter extends Component {

            {
              isLookingUpMovie ?
-                translate('ProcessingFolders') :
+                'Processing Folders' :
                null
            }

@@ -221,7 +220,7 @@ class ImportMovieFooter extends Component {
                      kind={kinds.WARNING}
                    />
                  }
-                  title={translate('ImportErrors')}
+                  title="Import Errors"
                  body={
                    <ul>
                      {
--- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieHeader.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieHeader.js
@@ -3,7 +3,6 @@ import React from 'react';
 import VirtualTableHeader from 'Components/Table/VirtualTableHeader';
 import VirtualTableHeaderCell from 'Components/Table/VirtualTableHeaderCell';
 import VirtualTableSelectAllHeaderCell from 'Components/Table/VirtualTableSelectAllHeaderCell';
-import translate from 'Utilities/String/translate';
 import styles from './ImportMovieHeader.css';

 function ImportMovieHeader(props) {
@@ -25,35 +24,35 @@ function ImportMovieHeader(props) {
        className={styles.folder}
        name="folder"
      >
-        {translate('Folder')}
+        Folder
      </VirtualTableHeaderCell>

      <VirtualTableHeaderCell
        className={styles.monitor}
        name="monitor"
      >
-        {translate('Monitor')}
+        Monitor
      </VirtualTableHeaderCell>

      <VirtualTableHeaderCell
        className={styles.minimumAvailability}
        name="minimumAvailability"
      >
-        {translate('MinAvailability')}
+        Min Availability
      </VirtualTableHeaderCell>

      <VirtualTableHeaderCell
        className={styles.qualityProfile}
        name="qualityProfileId"
      >
-        {translate('QualityProfile')}
+        Quality Profile
      </VirtualTableHeaderCell>

      <VirtualTableHeaderCell
        className={styles.movie}
        name="movie"
      >
-        {translate('Movie')}
+        Movie
      </VirtualTableHeaderCell>
    </VirtualTableHeader>
  );
--- a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js
@@ -9,7 +9,6 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Portal from 'Components/Portal';
 import { icons, kinds } from 'Helpers/Props';
 import getUniqueElememtId from 'Utilities/getUniqueElementId';
-import translate from 'Utilities/String/translate';
 import ImportMovieSearchResultConnector from './ImportMovieSearchResultConnector';
 import ImportMovieTitle from './ImportMovieTitle';
 import styles from './ImportMovieSelectMovie.css';
@@ -175,7 +174,7 @@ class ImportMovieSelectMovie extends Component {
                        kind={kinds.WARNING}
                      />

-                      {translate('NoMatchFound')}
+                      No match found!
                    </div> :
                    null
                }
@@ -190,7 +189,7 @@ class ImportMovieSelectMovie extends Component {
                        kind={kinds.WARNING}
                      />

-                      {translate('SearchFailedPleaseTryAgainLater')}
+                      Search failed, please try again later.
                    </div> :
                    null
                }
--- a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.js
@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Label from 'Components/Label';
 import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import styles from './ImportMovieTitle.css';

 function ImportMovieTitle(props) {
@@ -34,7 +33,7 @@ function ImportMovieTitle(props) {
          <Label
            kind={kinds.WARNING}
          >
-            {translate('Existing')}
+            Existing
          </Label>
      }
    </div>
--- a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js
+++ b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js
@@ -101,8 +101,12 @@ class ImportMovieSelectFolder extends Component {
                <div className={styles.tips}>
                  {translate('ImportTipsMessage')}
                  <ul>
-                    <li className={styles.tip} dangerouslySetInnerHTML={{ __html: translate('ImportIncludeQuality', ['<code>movie.2008.bluray.mkv</code>']) }} />
-                    <li className={styles.tip} dangerouslySetInnerHTML={{ __html: translate('ImportRootPath', [`<code>${isWindows ? 'C:\\movies' : '/movies'}</code>`, `<code>${isWindows ? 'C:\\movies\\the matrix' : '/movies/the matrix'}</code>`]) }} />
+                    <li className={styles.tip}>
+                      Make sure that your files include the quality in their filenames. eg. <span className={styles.code}>movie.2008.bluray.mkv</span>
+                    </li>
+                    <li className={styles.tip}>
+                      Point Radarr to the folder containing all of your movies, not a specific one. eg. <span className={styles.code}>"{isWindows ? 'C:\\movies' : '/movies'}"</span> and not <span className={styles.code}>"{isWindows ? 'C:\\movies\\the matrix' : '/movies/the matrix'}"</span>
+                    </li>
                  </ul>
                </div>

@@ -154,7 +158,7 @@ class ImportMovieSelectFolder extends Component {
                          className={styles.importButtonIcon}
                          name={icons.DRIVE}
                        />
-                        {translate('StartImport')}
+                        Start Import
                      </Button>
                    </div>
                }
--- a/frontend/src/Calendar/Agenda/Agenda.js
+++ b/frontend/src/Calendar/Agenda/Agenda.js
@@ -6,38 +6,9 @@ import styles from './Agenda.css';

 function Agenda(props) {
  const {
-    items,
-    start,
-    end
+    items
  } = props;

-  const startDateParsed = Date.parse(start);
-  const endDateParsed = Date.parse(end);
-
-  items.forEach((item) => {
-    const cinemaDateParsed = Date.parse(item.inCinemas);
-    const digitalDateParsed = Date.parse(item.digitalRelease);
-    const physicalDateParsed = Date.parse(item.physicalRelease);
-    const dates = [];
-
-    if (cinemaDateParsed > 0 && cinemaDateParsed >= startDateParsed && cinemaDateParsed <= endDateParsed) {
-      dates.push(cinemaDateParsed);
-    }
-    if (digitalDateParsed > 0 && digitalDateParsed >= startDateParsed && digitalDateParsed <= endDateParsed) {
-      dates.push(digitalDateParsed);
-    }
-    if (physicalDateParsed > 0 && physicalDateParsed >= startDateParsed && physicalDateParsed <= endDateParsed) {
-      dates.push(physicalDateParsed);
-    }
-
-    item.sortDate = Math.min(...dates);
-    item.cinemaDateParsed = cinemaDateParsed;
-    item.digitalDateParsed = digitalDateParsed;
-    item.physicalDateParsed = physicalDateParsed;
-  });
-
-  items.sort((a, b) => ((a.sortDate > b.sortDate) ? 1 : -1));
-
  return (
    <div className={styles.agenda}>
      {
@@ -61,9 +32,7 @@ function Agenda(props) {
 }

 Agenda.propTypes = {
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  start: PropTypes.string.isRequired,
-  end: PropTypes.string.isRequired
+  items: PropTypes.arrayOf(PropTypes.object).isRequired
 };

 export default Agenda;
--- a/frontend/src/Calendar/Agenda/AgendaEvent.css
+++ b/frontend/src/Calendar/Agenda/AgendaEvent.css
@@ -92,5 +92,6 @@
 }

 .dateIcon {
-  width: 25px;
+  display: inline;
+  margin-right: 10px;
 }
--- a/frontend/src/Calendar/Agenda/AgendaEvent.js
+++ b/frontend/src/Calendar/Agenda/AgendaEvent.js
@@ -55,26 +55,23 @@ class AgendaEvent extends Component {
      showCutoffUnmetIcon,
      longDateFormat,
      colorImpairedMode,
-      cinemaDateParsed,
-      digitalDateParsed,
-      physicalDateParsed,
-      sortDate
+      startDate,
+      endDate
    } = this.props;

-    let startTime = null;
-    let releaseIcon = null;
+    const agendaStart = Date.parse(startDate);
+    const agendaEnd = Date.parse(endDate);
+    const cinemaDate = Date.parse(inCinemas);
+    const digitalDate = Date.parse(digitalRelease);
+    let startTime = physicalRelease;
+    let releaseIcon = icons.DISC;

-    if (physicalDateParsed === sortDate) {
-      startTime = physicalRelease;
-      releaseIcon = icons.DISC;
-    }
-
-    if (digitalDateParsed === sortDate) {
+    if (digitalDate >= agendaStart && digitalDate <= agendaEnd) {
      startTime = digitalRelease;
      releaseIcon = icons.MOVIE_FILE;
    }

-    if (cinemaDateParsed === sortDate) {
+    if (cinemaDate >= agendaStart && cinemaDate <= agendaEnd) {
      startTime = inCinemas;
      releaseIcon = icons.IN_CINEMAS;
    }
@@ -95,14 +92,13 @@ class AgendaEvent extends Component {
          )}
          to={link}
        >
-          <div className={styles.dateIcon}>
-            <Icon
-              name={releaseIcon}
-              kind={kinds.DEFAULT}
-            />
-          </div>
-
          <div className={styles.date}>
+            <div className={styles.dateIcon}>
+              <Icon
+                name={releaseIcon}
+                kind={kinds.DEFAULT}
+              />
+            </div>
            {(showDate) ? startTime.format(longDateFormat) : null}
          </div>

@@ -180,10 +176,8 @@ AgendaEvent.propTypes = {
  timeFormat: PropTypes.string.isRequired,
  longDateFormat: PropTypes.string.isRequired,
  colorImpairedMode: PropTypes.bool.isRequired,
-  cinemaDateParsed: PropTypes.number,
-  digitalDateParsed: PropTypes.number,
-  physicalDateParsed: PropTypes.number,
-  sortDate: PropTypes.number
+  startDate: PropTypes.date,
+  endDate: PropTypes.date
 };

 AgendaEvent.defaultProps = {
--- a/frontend/src/Calendar/Agenda/AgendaEventConnector.js
+++ b/frontend/src/Calendar/Agenda/AgendaEventConnector.js
@@ -13,7 +13,9 @@ function createMapStateToProps() {
    createMovieFileSelector(),
    createQueueItemSelector(),
    createUISettingsSelector(),
-    (calendarOptions, movie, movieFile, queueItem, uiSettings) => {
+    (state) => state.calendar.start,
+    (state) => state.calendar.end,
+    (calendarOptions, movie, movieFile, queueItem, uiSettings, startDate, endDate) => {
      return {
        movie,
        movieFile,
@@ -21,7 +23,9 @@ function createMapStateToProps() {
        ...calendarOptions,
        timeFormat: uiSettings.timeFormat,
        longDateFormat: uiSettings.longDateFormat,
-        colorImpairedMode: uiSettings.enableColorImpairedMode
+        colorImpairedMode: uiSettings.enableColorImpairedMode,
+        startDate,
+        endDate
      };
    }
  );
--- a/frontend/src/Calendar/Events/CalendarEventQueueDetails.js
+++ b/frontend/src/Calendar/Events/CalendarEventQueueDetails.js
@@ -12,12 +12,10 @@ function CalendarEventQueueDetails(props) {
    sizeleft,
    estimatedCompletionTime,
    status,
-    trackedDownloadState,
-    trackedDownloadStatus,
    errorMessage
  } = props;

-  const progress = size ? (100 - sizeleft / size * 100) : 0;
+  const progress = (100 - sizeleft / size * 100);

  return (
    <QueueDetails
@@ -26,8 +24,6 @@ function CalendarEventQueueDetails(props) {
      sizeleft={sizeleft}
      estimatedCompletionTime={estimatedCompletionTime}
      status={status}
-      trackedDownloadState={trackedDownloadState}
-      trackedDownloadStatus={trackedDownloadStatus}
      errorMessage={errorMessage}
      progressBar={
        <div title={translate('MovieIsDownloadingInterp', [progress.toFixed(1), title])}>
@@ -49,8 +45,6 @@ CalendarEventQueueDetails.propTypes = {
  sizeleft: PropTypes.number.isRequired,
  estimatedCompletionTime: PropTypes.string,
  status: PropTypes.string.isRequired,
-  trackedDownloadState: PropTypes.string.isRequired,
-  trackedDownloadStatus: PropTypes.string.isRequired,
  errorMessage: PropTypes.string
 };

--- a/frontend/src/Calendar/Header/CalendarHeader.js
+++ b/frontend/src/Calendar/Header/CalendarHeader.js
@@ -24,7 +24,7 @@ function getTitle(time, start, end, view, longDateFormat) {
  } else if (view === 'month') {
    return timeMoment.format('MMMM YYYY');
  } else if (view === 'agenda') {
-    return `Agenda: ${startMoment.format('MMM D')} - ${endMoment.format('MMM D')}`;
+    return 'Agenda';
  }

  let startFormat = 'MMM D YYYY';
--- a/frontend/src/Calendar/Header/CalendarHeaderConnector.js
+++ b/frontend/src/Calendar/Header/CalendarHeaderConnector.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -13,16 +14,19 @@ function createMapStateToProps() {
    createDimensionsSelector(),
    createUISettingsSelector(),
    (calendar, dimensions, uiSettings) => {
-      return {
-        isFetching: calendar.isFetching,
-        view: calendar.view,
-        time: calendar.time,
-        start: calendar.start,
-        end: calendar.end,
-        isSmallScreen: dimensions.isSmallScreen,
-        collapseViewButtons: dimensions.isLargeScreen,
-        longDateFormat: uiSettings.longDateFormat
-      };
+      const result = _.pick(calendar, [
+        'isFetching',
+        'view',
+        'time',
+        'start',
+        'end'
+      ]);
+
+      result.isSmallScreen = dimensions.isSmallScreen;
+      result.collapseViewButtons = dimensions.isLargeScreen;
+      result.longDateFormat = uiSettings.longDateFormat;
+
+      return result;
    }
  );
 }
--- a/frontend/src/Components/Form/EnhancedSelectInput.js
+++ b/frontend/src/Components/Form/EnhancedSelectInput.js
@@ -58,30 +58,11 @@ function getSelectedIndex(props) {
    values
  } = props;

-  if (Array.isArray(value)) {
-    return values.findIndex((v) => {
-      return value.size && v.key === value[0];
-    });
-  }
-
  return values.findIndex((v) => {
    return v.key === value;
  });
 }

-function isSelectedItem(index, props) {
-  const {
-    value,
-    values
-  } = props;
-
-  if (Array.isArray(value)) {
-    return value.includes(values[index].key);
-  }
-
-  return values[index].key === value;
-}
-
 function getKey(selectedIndex, values) {
  return values[selectedIndex].key;
 }
@@ -111,7 +92,7 @@ class EnhancedSelectInput extends Component {
      this._scheduleUpdate();
    }

-    if (!Array.isArray(this.props.value) && prevProps.value !== this.props.value) {
+    if (prevProps.value !== this.props.value) {
      this.setState({
        selectedIndex: getSelectedIndex(this.props)
      });
@@ -153,7 +134,7 @@ class EnhancedSelectInput extends Component {
    const button = document.getElementById(this._buttonId);
    const options = document.getElementById(this._optionsId);

-    if (!button || !event.target.isConnected || this.state.isMobile) {
+    if (!button || this.state.isMobile) {
      return;
    }

@@ -196,7 +177,7 @@ class EnhancedSelectInput extends Component {
      }

      if (
-        selectedIndex == null || selectedIndex === -1 ||
+        selectedIndex == null ||
        getSelectedOption(selectedIndex, values).isDisabled
      ) {
        if (keyCode === keyCodes.UP_ARROW) {
@@ -254,27 +235,12 @@ class EnhancedSelectInput extends Component {
  }

  onSelect = (value) => {
-    if (Array.isArray(this.props.value)) {
-      let newValue = null;
-      const index = this.props.value.indexOf(value);
-      if (index === -1) {
-        newValue = this.props.values.map((v) => v.key).filter((v) => (v === value) || this.props.value.includes(v));
-      } else {
-        newValue = [...this.props.value];
-        newValue.splice(index, 1);
-      }
-      this.props.onChange({
-        name: this.props.name,
-        value: newValue
-      });
-    } else {
-      this.setState({ isOpen: false });
+    this.setState({ isOpen: false });

-      this.props.onChange({
-        name: this.props.name,
-        value
-      });
-    }
+    this.props.onChange({
+      name: this.props.name,
+      value
+    });
  }

  onMeasure = ({ width }) => {
@@ -292,7 +258,6 @@ class EnhancedSelectInput extends Component {
    const {
      className,
      disabledClassName,
-      value,
      values,
      isDisabled,
      hasError,
@@ -310,7 +275,6 @@ class EnhancedSelectInput extends Component {
      isMobile
    } = this.state;

-    const isMultiSelect = Array.isArray(value);
    const selectedOption = getSelectedOption(selectedIndex, values);

    return (
@@ -339,12 +303,9 @@ class EnhancedSelectInput extends Component {
                    onPress={this.onPress}
                  >
                    <SelectedValueComponent
-                      value={value}
-                      values={values}
                      {...selectedValueOptions}
                      {...selectedOption}
                      isDisabled={isDisabled}
-                      isMultiSelect={isMultiSelect}
                    >
                      {selectedOption ? selectedOption.value : null}
                    </SelectedValueComponent>
@@ -398,17 +359,11 @@ class EnhancedSelectInput extends Component {
                        >
                          {
                            values.map((v, index) => {
-                              const hasParent = v.parentKey !== undefined;
-                              const depth = hasParent ? 1 : 0;
-                              const parentSelected = hasParent && value.includes(v.parentKey);
                              return (
                                <OptionComponent
                                  key={v.key}
                                  id={v.key}
-                                  depth={depth}
-                                  isSelected={isSelectedItem(index, this.props)}
-                                  isDisabled={parentSelected}
-                                  isMultiSelect={isMultiSelect}
+                                  isSelected={index === selectedIndex}
                                  {...valueOptions}
                                  {...v}
                                  isMobile={false}
@@ -446,17 +401,11 @@ class EnhancedSelectInput extends Component {
                <Scroller className={styles.optionsModalScroller}>
                  {
                    values.map((v, index) => {
-                      const hasParent = v.parentKey !== undefined;
-                      const depth = hasParent ? 1 : 0;
-                      const parentSelected = hasParent && value.includes(v.parentKey);
                      return (
                        <OptionComponent
                          key={v.key}
                          id={v.key}
-                          depth={depth}
-                          isSelected={isSelectedItem(index, this.props)}
-                          isMultiSelect={isMultiSelect}
-                          isDisabled={parentSelected}
+                          isSelected={index === selectedIndex}
                          {...valueOptions}
                          {...v}
                          isMobile={true}
@@ -480,9 +429,9 @@ EnhancedSelectInput.propTypes = {
  className: PropTypes.string,
  disabledClassName: PropTypes.string,
  name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.number)]).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  isDisabled: PropTypes.bool.isRequired,
+  isDisabled: PropTypes.bool,
  hasError: PropTypes.bool,
  hasWarning: PropTypes.bool,
  valueOptions: PropTypes.object.isRequired,
--- a/frontend/src/Components/Form/EnhancedSelectInputOption.css
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.css
@@ -11,18 +11,6 @@
  }
 }

-.optionCheck {
-  composes: container from '~./CheckInput.css';
-
-  flex: 0 0 0;
-}
-
-.optionCheckInput {
-  composes: input from '~./CheckInput.css';
-
-  margin-top: 0;
-}
-
 .isSelected {
  background-color: #e2e2e2;

--- a/frontend/src/Components/Form/EnhancedSelectInputOption.js
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.js
@@ -4,7 +4,6 @@ import React, { Component } from 'react';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
-import CheckInput from './CheckInput';
 import styles from './EnhancedSelectInputOption.css';

 class EnhancedSelectInputOption extends Component {
@@ -21,21 +20,15 @@ class EnhancedSelectInputOption extends Component {
    onSelect(id);
  }

-  onCheckPress = () => {
-    // CheckInput requires a handler. Swallow the change event because onPress will already handle it via event propagation.
-  }
-
  //
  // Render

  render() {
    const {
      className,
-      id,
      isSelected,
      isDisabled,
      isHidden,
-      isMultiSelect,
      isMobile,
      children
    } = this.props;
@@ -44,8 +37,8 @@ class EnhancedSelectInputOption extends Component {
      <Link
        className={classNames(
          className,
-          isSelected && !isMultiSelect && styles.isSelected,
-          isDisabled && !isMultiSelect && styles.isDisabled,
+          isSelected && styles.isSelected,
+          isDisabled && styles.isDisabled,
          isHidden && styles.isHidden,
          isMobile && styles.isMobile
        )}
@@ -53,19 +46,6 @@ class EnhancedSelectInputOption extends Component {
        isDisabled={isDisabled}
        onPress={this.onPress}
      >
-
-        {
-          isMultiSelect &&
-            <CheckInput
-              className={styles.optionCheckInput}
-              containerClassName={styles.optionCheck}
-              name={`select-${id}`}
-              value={isSelected}
-              isDisabled={isDisabled}
-              onChange={this.onCheckPress}
-            />
-        }
-
        {children}

        {
@@ -87,7 +67,6 @@ EnhancedSelectInputOption.propTypes = {
  isSelected: PropTypes.bool.isRequired,
  isDisabled: PropTypes.bool.isRequired,
  isHidden: PropTypes.bool.isRequired,
-  isMultiSelect: PropTypes.bool.isRequired,
  isMobile: PropTypes.bool.isRequired,
  children: PropTypes.node.isRequired,
  onSelect: PropTypes.func.isRequired
@@ -96,8 +75,7 @@ EnhancedSelectInputOption.propTypes = {
 EnhancedSelectInputOption.defaultProps = {
  className: styles.option,
  isDisabled: false,
-  isHidden: false,
-  isMultiSelect: false
+  isHidden: false
 };

 export default EnhancedSelectInputOption;
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -10,7 +10,6 @@ import CheckInput from './CheckInput';
 import DeviceInputConnector from './DeviceInputConnector';
 import EnhancedSelectInput from './EnhancedSelectInput';
 import FormInputHelpText from './FormInputHelpText';
-import IndexerFlagsSelectInputConnector from './IndexerFlagsSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
 import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
 import NumberInput from './NumberInput';
@@ -67,9 +66,6 @@ function getComponent(type) {
    case inputTypes.ROOT_FOLDER_SELECT:
      return RootFolderSelectInputConnector;

-    case inputTypes.INDEXER_FLAGS_SELECT:
-      return IndexerFlagsSelectInputConnector;
-
    case inputTypes.SELECT:
      return EnhancedSelectInput;

--- a/frontend/src/Components/Form/HintedSelectInputOption.js
+++ b/frontend/src/Components/Form/HintedSelectInputOption.js
@@ -6,23 +6,14 @@ import styles from './HintedSelectInputOption.css';

 function HintedSelectInputOption(props) {
  const {
-    id,
    value,
    hint,
-    isSelected,
-    isDisabled,
-    isMultiSelect,
    isMobile,
    ...otherProps
  } = props;

  return (
    <EnhancedSelectInputOption
-      id={id}
-      isSelected={isSelected}
-      isDisabled={isDisabled}
-      isHidden={isDisabled}
-      isMultiSelect={isMultiSelect}
      isMobile={isMobile}
      {...otherProps}
    >
@@ -45,19 +36,9 @@ function HintedSelectInputOption(props) {
 }

 HintedSelectInputOption.propTypes = {
-  id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
  value: PropTypes.string.isRequired,
  hint: PropTypes.node,
-  isSelected: PropTypes.bool.isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  isMultiSelect: PropTypes.bool.isRequired,
  isMobile: PropTypes.bool.isRequired
 };

-HintedSelectInputOption.defaultProps = {
-  isDisabled: false,
-  isHidden: false,
-  isMultiSelect: false
-};
-
 export default HintedSelectInputOption;
--- a/frontend/src/Components/Form/HintedSelectInputSelectedValue.js
+++ b/frontend/src/Components/Form/HintedSelectInputSelectedValue.js
@@ -1,43 +1,23 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
-import Label from 'Components/Label';
 import EnhancedSelectInputSelectedValue from './EnhancedSelectInputSelectedValue';
 import styles from './HintedSelectInputSelectedValue.css';

 function HintedSelectInputSelectedValue(props) {
  const {
    value,
-    values,
    hint,
-    isMultiSelect,
    includeHint,
    ...otherProps
  } = props;

-  const valuesMap = isMultiSelect && _.keyBy(values, 'key');
-
  return (
    <EnhancedSelectInputSelectedValue
      className={styles.selectedValue}
      {...otherProps}
    >
      <div className={styles.valueText}>
-        {
-          isMultiSelect &&
-            value.map((key, index) => {
-              const v = valuesMap[key];
-              return (
-                <Label key={key}>
-                  {v ? v.value : key}
-                </Label>
-              );
-            })
-        }
-
-        {
-          !isMultiSelect && value
-        }
+        {value}
      </div>

      {
@@ -51,15 +31,12 @@ function HintedSelectInputSelectedValue(props) {
 }

 HintedSelectInputSelectedValue.propTypes = {
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
+  value: PropTypes.string,
  hint: PropTypes.string,
-  isMultiSelect: PropTypes.bool.isRequired,
  includeHint: PropTypes.bool.isRequired
 };

 HintedSelectInputSelectedValue.defaultProps = {
-  isMultiSelect: false,
  includeHint: true
 };

--- a/frontend/src/Components/Form/IndexerFlagsSelectInputConnector.js
+++ b/frontend/src/Components/Form/IndexerFlagsSelectInputConnector.js
@@ -1,70 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import EnhancedSelectInput from './EnhancedSelectInput';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state, { indexerFlags }) => indexerFlags,
-    (state) => state.settings.indexerFlags,
-    (selectedFlags, indexerFlags) => {
-      const value = [];
-
-      indexerFlags.items.forEach((item) => {
-        // eslint-disable-next-line no-bitwise
-        if ((selectedFlags & item.id) === item.id) {
-          value.push(item.id);
-        }
-      });
-
-      const values = indexerFlags.items.map(({ id, name }) => {
-        return {
-          key: id,
-          value: name
-        };
-      });
-
-      return {
-        value,
-        values
-      };
-    }
-  );
-}
-
-class IndexerFlagsSelectInputConnector extends Component {
-
-  onChange = ({ name, value }) => {
-    let indexerFlags = 0;
-
-    value.forEach((flagId) => {
-      indexerFlags += flagId;
-    });
-
-    this.props.onChange({ name, value: indexerFlags });
-  }
-
-  //
-  // Render
-
-  render() {
-
-    return (
-      <EnhancedSelectInput
-        {...this.props}
-        onChange={this.onChange}
-      />
-    );
-  }
-}
-
-IndexerFlagsSelectInputConnector.propTypes = {
-  name: PropTypes.string.isRequired,
-  indexerFlags: PropTypes.number.isRequired,
-  value: PropTypes.arrayOf(PropTypes.number).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onChange: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps)(IndexerFlagsSelectInputConnector);
--- a/frontend/src/Components/Form/PasswordInput.js
+++ b/frontend/src/Components/Form/PasswordInput.js
@@ -3,17 +3,10 @@ import React from 'react';
 import TextInput from './TextInput';
 import styles from './PasswordInput.css';

-// Prevent a user from copying (or cutting) the password from the input
-function onCopy(e) {
-  e.preventDefault();
-  e.nativeEvent.stopImmediatePropagation();
-}
-
 function PasswordInput(props) {
  return (
    <TextInput
      {...props}
-      onCopy={onCopy}
    />
  );
 }
--- a/frontend/src/Components/Form/ProviderFieldFormGroup.js
+++ b/frontend/src/Components/Form/ProviderFieldFormGroup.js
@@ -6,7 +6,7 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import { inputTypes } from 'Helpers/Props';

-function getType(type, value) {
+function getType(type) {
  switch (type) {
    case 'captcha':
      return inputTypes.CAPTCHA;
@@ -45,8 +45,7 @@ function getSelectValues(selectOptions) {
  return _.reduce(selectOptions, (result, option) => {
    result.push({
      key: option.value,
-      value: option.name,
-      hint: option.hint
+      value: option.name
    });

    return result;
@@ -88,7 +87,7 @@ function ProviderFieldFormGroup(props) {
      <FormLabel>{label}</FormLabel>

      <FormInputGroup
-        type={getType(type, value)}
+        type={getType(type)}
        name={name}
        label={label}
        helpText={helpText}
--- a/frontend/src/Components/Form/RootFolderSelectInputOption.css
+++ b/frontend/src/Components/Form/RootFolderSelectInputOption.css
@@ -15,12 +15,10 @@

 .value {
  display: flex;
-  max-width: 500px;
 }

 .movieFolder {
-  @add-mixin truncate;
-
+  flex: 0 0 auto;
  color: $disabledColor;
 }

--- a/frontend/src/Components/Form/TextInput.js
+++ b/frontend/src/Components/Form/TextInput.js
@@ -130,8 +130,7 @@ class TextInput extends Component {
      step,
      min,
      max,
-      onBlur,
-      onCopy
+      onBlur
    } = this.props;

    return (
@@ -156,8 +155,6 @@ class TextInput extends Component {
        onChange={this.onChange}
        onFocus={this.onFocus}
        onBlur={onBlur}
-        onCopy={onCopy}
-        onCut={onCopy}
        onKeyUp={this.onKeyUp}
        onMouseDown={this.onMouseDown}
        onMouseUp={this.onMouseUp}
@@ -183,7 +180,6 @@ TextInput.propTypes = {
  onChange: PropTypes.func.isRequired,
  onFocus: PropTypes.func,
  onBlur: PropTypes.func,
-  onCopy: PropTypes.func,
  onSelectionChange: PropTypes.func
 };

--- a/frontend/src/Components/Loading/LoadingMessage.js
+++ b/frontend/src/Components/Loading/LoadingMessage.js
@@ -2,24 +2,8 @@ import React from 'react';
 import styles from './LoadingMessage.css';

 const messages = [
-  'Downloading more RAM',
-  'Now in Technicolor',
-  'Previously on Radarr...',
-  'Bleep Bloop.',
-  'Locating the required gigapixels to render...',
-  'Spinning up the hamster wheel...',
-  'At least you\'re not on hold',
-  'Hum something loud while others stare',
-  'Loading humorous message... Please Wait',
-  'I could\'ve been faster in Python',
-  'Don\'t forget to rewind your tracks',
-  'Congratulations! you are the 1000th visitor.',
-  'HELP! I\'m being held hostage and forced to write these stupid lines!',
-  'RE-calibrating the internet...',
-  'I\'ll be here all week',
-  'Don\'t forget to tip your waitress',
-  'Apply directly to the forehead',
-  'Loading Battlestation'
+  'Welcome to Radarr Aphrodite Preview. Enjoy'
+  // TODO Add some messages here
 ];

 let message = null;
--- a/frontend/src/Components/Page/PageConnector.js
+++ b/frontend/src/Components/Page/PageConnector.js
@@ -6,7 +6,7 @@ import { createSelector } from 'reselect';
 import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
 import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
 import { fetchMovies } from 'Store/Actions/movieActions';
-import { fetchImportLists, fetchIndexerFlags, fetchLanguages, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
+import { fetchImportLists, fetchLanguages, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
 import { fetchStatus } from 'Store/Actions/systemActions';
 import { fetchTags } from 'Store/Actions/tagActions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
@@ -48,7 +48,6 @@ const selectIsPopulated = createSelector(
  (state) => state.settings.ui.isPopulated,
  (state) => state.settings.qualityProfiles.isPopulated,
  (state) => state.settings.languages.isPopulated,
-  (state) => state.settings.indexerFlags.isPopulated,
  (state) => state.settings.importLists.isPopulated,
  (state) => state.system.status.isPopulated,
  (
@@ -57,7 +56,6 @@ const selectIsPopulated = createSelector(
    uiSettingsIsPopulated,
    qualityProfilesIsPopulated,
    languagesIsPopulated,
-    indexerFlagsIsPopulated,
    importListsIsPopulated,
    systemStatusIsPopulated
  ) => {
@@ -67,7 +65,6 @@ const selectIsPopulated = createSelector(
      uiSettingsIsPopulated &&
      qualityProfilesIsPopulated &&
      languagesIsPopulated &&
-      indexerFlagsIsPopulated &&
      importListsIsPopulated &&
      systemStatusIsPopulated
    );
@@ -80,7 +77,6 @@ const selectErrors = createSelector(
  (state) => state.settings.ui.error,
  (state) => state.settings.qualityProfiles.error,
  (state) => state.settings.languages.error,
-  (state) => state.settings.indexerFlags.error,
  (state) => state.settings.importLists.error,
  (state) => state.system.status.error,
  (
@@ -89,7 +85,6 @@ const selectErrors = createSelector(
    uiSettingsError,
    qualityProfilesError,
    languagesError,
-    indexerFlagsError,
    importListsError,
    systemStatusError
  ) => {
@@ -99,7 +94,6 @@ const selectErrors = createSelector(
      uiSettingsError ||
      qualityProfilesError ||
      languagesError ||
-      indexerFlagsError ||
      importListsError ||
      systemStatusError
    );
@@ -111,7 +105,6 @@ const selectErrors = createSelector(
      uiSettingsError,
      qualityProfilesError,
      languagesError,
-      indexerFlagsError,
      importListsError,
      systemStatusError
    };
@@ -160,9 +153,6 @@ function createMapDispatchToProps(dispatch, props) {
    dispatchFetchLanguages() {
      dispatch(fetchLanguages());
    },
-    dispatchFetchIndexerFlags() {
-      dispatch(fetchIndexerFlags());
-    },
    dispatchFetchImportLists() {
      dispatch(fetchImportLists());
    },
@@ -201,7 +191,6 @@ class PageConnector extends Component {
      this.props.dispatchFetchTags();
      this.props.dispatchFetchQualityProfiles();
      this.props.dispatchFetchLanguages();
-      this.props.dispatchFetchIndexerFlags();
      this.props.dispatchFetchImportLists();
      this.props.dispatchFetchUISettings();
      this.props.dispatchFetchStatus();
@@ -226,7 +215,6 @@ class PageConnector extends Component {
      dispatchFetchTags,
      dispatchFetchQualityProfiles,
      dispatchFetchLanguages,
-      dispatchFetchIndexerFlags,
      dispatchFetchImportLists,
      dispatchFetchUISettings,
      dispatchFetchStatus,
@@ -266,7 +254,6 @@ PageConnector.propTypes = {
  dispatchFetchTags: PropTypes.func.isRequired,
  dispatchFetchQualityProfiles: PropTypes.func.isRequired,
  dispatchFetchLanguages: PropTypes.func.isRequired,
-  dispatchFetchIndexerFlags: PropTypes.func.isRequired,
  dispatchFetchImportLists: PropTypes.func.isRequired,
  dispatchFetchUISettings: PropTypes.func.isRequired,
  dispatchFetchStatus: PropTypes.func.isRequired,
--- a/frontend/src/Components/Table/Cells/RelativeDateCellConnector.js
+++ b/frontend/src/Components/Table/Cells/RelativeDateCellConnector.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,12 +8,12 @@ function createMapStateToProps() {
  return createSelector(
    createUISettingsSelector(),
    (uiSettings) => {
-      return {
-        showRelativeDates: uiSettings.showRelativeDates,
-        shortDateFormat: uiSettings.shortDateFormat,
-        longDateFormat: uiSettings.longDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
+      return _.pick(uiSettings, [
+        'showRelativeDates',
+        'shortDateFormat',
+        'longDateFormat',
+        'timeFormat'
+      ]);
    }
  );
 }
--- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { DndProvider } from 'react-dnd';
-import { HTML5Backend } from 'react-dnd-html5-backend';
+import HTML5Backend from 'react-dnd-html5-backend';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
--- a/frontend/src/Components/Tooltip/Tooltip.css
+++ b/frontend/src/Components/Tooltip/Tooltip.css
@@ -156,35 +156,3 @@
 .body {
  padding: 5px;
 }
-
-.verticalContainer {
-  max-height: 300px;
-}
-
-.horizontalContainer {
-  max-width: calc($breakpointExtraSmall - 20px);
-}
-
-@media only screen and (min-width: $breakpointExtraSmall) {
-  .horizontalContainer {
-    max-width: calc($breakpointSmall * 0.8);
-  }
-}
-
-@media only screen and (min-width: $breakpointSmall) {
-  .horizontalContainer {
-    max-width: calc($breakpointMedium * 0.8);
-  }
-}
-
-@media only screen and (min-width: $breakpointMedium) {
-  .horizontalContainer {
-    max-width: calc($breakpointLarge * 0.8);
-  }
-}
-
-/* @media only screen and (max-width: $breakpointLarge) {
-  .horizontalContainer {
-    max-width: calc($breakpointLarge * 0.8);
-  }
-} */
--- a/frontend/src/Components/Tooltip/Tooltip.js
+++ b/frontend/src/Components/Tooltip/Tooltip.js
@@ -4,26 +4,9 @@ import React, { Component } from 'react';
 import { Manager, Popper, Reference } from 'react-popper';
 import Portal from 'Components/Portal';
 import { kinds, tooltipPositions } from 'Helpers/Props';
-import dimensions from 'Styles/Variables/dimensions';
 import { isMobile as isMobileUtil } from 'Utilities/mobile';
 import styles from './Tooltip.css';

-let maxWidth = null;
-
-function getMaxWidth() {
-  const windowWidth = window.innerWidth;
-
-  if (windowWidth >= parseInt(dimensions.breakpointLarge)) {
-    maxWidth = 800;
-  } else if (windowWidth >= parseInt(dimensions.breakpointMedium)) {
-    maxWidth = 650;
-  } else if (windowWidth >= parseInt(dimensions.breakpointSmall)) {
-    maxWidth = 500;
-  } else {
-    maxWidth = 450;
-  }
-}
-
 class Tooltip extends Component {

  //
@@ -34,7 +17,6 @@ class Tooltip extends Component {

    this._scheduleUpdate = null;
    this._closeTimeout = null;
-    this._maxWidth = maxWidth || getMaxWidth();

    this.state = {
      isOpen: false
@@ -72,11 +54,9 @@ class Tooltip extends Component {
    } else if ((/^bottom/).test(data.placement)) {
      data.styles.maxHeight = windowHeight - bottom - 20;
    } else if ((/^right/).test(data.placement)) {
-      data.styles.maxWidth = Math.min(this._maxWidth, windowWidth - right - 20);
-      data.styles.maxHeight = top - 20;
+      data.styles.maxWidth = windowWidth - right - 50;
    } else {
-      data.styles.maxWidth = Math.min(this._maxWidth, left - 20);
-      data.styles.maxHeight = top - 20;
+      data.styles.maxWidth = left - 35;
    }

    return data;
@@ -164,16 +144,10 @@ class Tooltip extends Component {
            {({ ref, style, placement, arrowProps, scheduleUpdate }) => {
              this._scheduleUpdate = scheduleUpdate;

-              const popperPlacement = placement ? placement.split('-')[0] : position;
-              const vertical = popperPlacement === 'top' || popperPlacement === 'bottom';
-
              return (
                <div
                  ref={ref}
-                  className={classNames(
-                    styles.tooltipContainer,
-                    vertical ? styles.verticalContainer : styles.horizontalContainer
-                  )}
+                  className={styles.tooltipContainer}
                  style={style}
                  onMouseEnter={this.onMouseEnter}
                  onMouseLeave={this.onMouseLeave}
@@ -182,7 +156,7 @@ class Tooltip extends Component {
                    className={this.state.isOpen ? classNames(
                      styles.arrow,
                      styles[kind],
-                      styles[popperPlacement]
+                      styles[placement.split('-')[0]]
                    ) : styles.arrowDisabled}
                    ref={arrowProps.ref}
                    style={arrowProps.style}
@@ -227,7 +201,7 @@ Tooltip.defaultProps = {
  bodyClassName: styles.body,
  kind: kinds.DEFAULT,
  position: tooltipPositions.TOP,
-  canFlip: false
+  canFlip: true
 };

 export default Tooltip;
--- a/frontend/src/Helpers/Props/inputTypes.js
+++ b/frontend/src/Helpers/Props/inputTypes.js
@@ -10,7 +10,6 @@ export const PASSWORD = 'password';
 export const PATH = 'path';
 export const QUALITY_PROFILE_SELECT = 'qualityProfileSelect';
 export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
-export const INDEXER_FLAGS_SELECT = 'indexerFlagsSelect';
 export const SELECT = 'select';
 export const TAG = 'tag';
 export const TEXT = 'text';
@@ -31,7 +30,6 @@ export const all = [
  PATH,
  QUALITY_PROFILE_SELECT,
  ROOT_FOLDER_SELECT,
-  INDEXER_FLAGS_SELECT,
  SELECT,
  TAG,
  TEXT,
--- a/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js
+++ b/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js
@@ -18,14 +18,11 @@ function createMapStateToProps() {
        items
      } = languages;

-      const filterItems = ['Any', 'Original'];
-      const filteredLanguages = items.filter((lang) => !filterItems.includes(lang.name));
-
      return {
        isFetching,
        isPopulated,
        error,
-        items: filteredLanguages
+        items
      };
    }
  );
@@ -57,9 +54,7 @@ class SelectLanguageModalContentConnector extends Component {
      const language = _.find(this.props.items,
        (item) => item.id === parseInt(languageId));

-      if (language !== undefined) {
-        languages.push(language);
-      }
+      languages.push(language);
    });

    this.props.dispatchUpdateInteractiveImportItems({
--- a/frontend/src/InteractiveSearch/InteractiveSearchRowConnector.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRowConnector.js
@@ -8,8 +8,8 @@ function createMapStateToProps() {
  return createSelector(
    (state, { guid }) => guid,
    (state) => state.movieHistory.items,
-    (state) => state.movieBlacklist.items,
-    (guid, movieHistory, movieBlacklist) => {
+    (state) => state.blacklist.items,
+    (guid, movieHistory, blacklist) => {

      let blacklistData = {};
      let historyFailedData = {};
@@ -17,7 +17,7 @@ function createMapStateToProps() {
      const historyGrabbedData = movieHistory.find((movie) => movie.eventType === 'grabbed' && movie.data.guid === guid);
      if (historyGrabbedData) {
        historyFailedData = movieHistory.find((movie) => movie.eventType === 'downloadFailed' && movie.sourceTitle === historyGrabbedData.sourceTitle);
-        blacklistData = movieBlacklist.find((item) => item.sourceTitle === historyGrabbedData.sourceTitle);
+        blacklistData = blacklist.find((item) => item.sourceTitle === historyGrabbedData.sourceTitle);
      }

      return {
--- a/frontend/src/Movie/Delete/DeleteMovieModalContentConnector.js
+++ b/frontend/src/Movie/Delete/DeleteMovieModalContentConnector.js
@@ -35,8 +35,8 @@ class DeleteMovieModalContentConnector extends Component {

    this.props.onModalClose(true);

-    if (this.props.nextMovieRelativePath) {
-      this.props.push(window.Radarr.urlBase + this.props.nextMovieRelativePath);
+    if (this.props.previousMovie) {
+      this.props.push(this.props.previousMovie);
    }
  }

@@ -58,7 +58,7 @@ DeleteMovieModalContentConnector.propTypes = {
  onModalClose: PropTypes.func.isRequired,
  deleteMovie: PropTypes.func.isRequired,
  push: PropTypes.func.isRequired,
-  nextMovieRelativePath: PropTypes.string
+  previousMovie: PropTypes.string
 };

 export default connect(createMapStateToProps, mapDispatchToProps)(DeleteMovieModalContentConnector);
--- a/frontend/src/Movie/Details/MovieDetails.js
+++ b/frontend/src/Movie/Details/MovieDetails.js
@@ -17,7 +17,6 @@ import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import Popover from 'Components/Tooltip/Popover';
-import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
 import InteractiveSearchFilterMenuConnector from 'InteractiveSearch/InteractiveSearchFilterMenuConnector';
@@ -101,7 +100,6 @@ class MovieDetails extends Component {
    window.removeEventListener('touchend', this.onTouchEnd);
    window.removeEventListener('touchcancel', this.onTouchCancel);
    window.removeEventListener('touchmove', this.onTouchMove);
-    window.removeEventListener('keyup', this.onKeyUp);
  }

  //
@@ -178,13 +176,11 @@ class MovieDetails extends Component {
  }

  onKeyUp = (event) => {
-    if (event.path.length === 4) {
-      if (event.keyCode === keyCodes.LEFT_ARROW) {
-        this.props.onGoToMovie(this.props.previousMovie.titleSlug);
-      }
-      if (event.keyCode === keyCodes.RIGHT_ARROW) {
-        this.props.onGoToMovie(this.props.nextMovie.titleSlug);
-      }
+    if (event.keyCode === keyCodes.LEFT_ARROW) {
+      this.props.onGoToMovie(this.props.previousMovie.titleSlug);
+    }
+    if (event.keyCode === keyCodes.RIGHT_ARROW) {
+      this.props.onGoToMovie(this.props.nextMovie.titleSlug);
    }
  }

@@ -240,10 +236,6 @@ class MovieDetails extends Component {
    }
  }

-  onTabSelect = (index, lastIndex) => {
-    this.setState({ selectedTabIndex: index });
-  }
-
  //
  // Render

@@ -462,14 +454,15 @@ class MovieDetails extends Component {

                    {
                      <span className={styles.links}>
-                        <Tooltip
+                        <Popover
                          anchor={
                            <Icon
                              name={icons.EXTERNAL_LINK}
                              size={20}
                            />
                          }
-                          tooltip={
+                          title={translate('Links')}
+                          body={
                            <MovieDetailsLinks
                              tmdbId={tmdbId}
                              imdbId={imdbId}
@@ -484,14 +477,15 @@ class MovieDetails extends Component {
                    {
                      !!tags.length &&
                        <span>
-                          <Tooltip
+                          <Popover
                            anchor={
                              <Icon
                                name={icons.TAGS}
                                size={20}
                              />
                            }
-                            tooltip={
+                            title={translate('Tags')}
+                            body={
                              <MovieTagsConnector movieId={id} />
                            }
                            position={tooltipPositions.BOTTOM}
@@ -549,7 +543,7 @@ class MovieDetails extends Component {
                  >
                    <span className={styles.sizeOnDisk}>
                      {
-                        formatBytes(sizeOnDisk || 0)
+                        formatBytes(sizeOnDisk)
                      }
                    </span>
                  </InfoLabel>
@@ -619,7 +613,7 @@ class MovieDetails extends Component {
                </div>
            }

-            <Tabs selectedIndex={this.state.tabIndex} onSelect={this.onTabSelect}>
+            <Tabs selectedIndex={this.state.tabIndex} onSelect={(tabIndex) => this.setState({ selectedTabIndex: tabIndex })}>
              <TabList
                className={styles.tabList}
              >
@@ -733,7 +727,7 @@ class MovieDetails extends Component {
            isOpen={isDeleteMovieModalOpen}
            movieId={id}
            onModalClose={this.onDeleteMovieModalClose}
-            nextMovieRelativePath={`/movie/${nextMovie.titleSlug}`}
+            previousMovie={`/movie/${previousMovie.titleSlug}`}
          />

          <InteractiveImportModal
--- a/frontend/src/Movie/Details/MovieDetailsConnector.js
+++ b/frontend/src/Movie/Details/MovieDetailsConnector.js
@@ -5,10 +5,10 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import * as commandNames from 'Commands/commandNames';
+import { fetchBlacklist } from 'Store/Actions/blacklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
 import { clearExtraFiles, fetchExtraFiles } from 'Store/Actions/extraFileActions';
 import { toggleMovieMonitored } from 'Store/Actions/movieActions';
-import { clearMovieBlacklist, fetchMovieBlacklist } from 'Store/Actions/movieBlacklistActions';
 import { clearMovieCredits, fetchMovieCredits } from 'Store/Actions/movieCreditsActions';
 import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions';
 import { clearMovieHistory, fetchMovieHistory } from 'Store/Actions/movieHistoryActions';
@@ -222,11 +222,9 @@ function createMapDispatchToProps(dispatch, props) {
    onGoToMovie(titleSlug) {
      dispatch(push(`${window.Radarr.urlBase}/movie/${titleSlug}`));
    },
-    dispatchFetchMovieBlacklist({ movieId }) {
-      dispatch(fetchMovieBlacklist({ movieId }));
-    },
-    dispatchClearMovieBlacklist() {
-      dispatch(clearMovieBlacklist());
+    dispatchFetchBlacklist() {
+      // TODO: Allow for passing a movie id to fetch a single movie's blacklist data
+      dispatch(fetchBlacklist());
    }
  };
 }
@@ -280,17 +278,20 @@ class MovieDetailsConnector extends Component {
    const movieId = this.props.id;

    this.props.dispatchFetchMovieFiles({ movieId });
-    this.props.dispatchFetchMovieBlacklist({ movieId });
    this.props.dispatchFetchMovieHistory({ movieId });
    this.props.dispatchFetchExtraFiles({ movieId });
    this.props.dispatchFetchMovieCredits({ movieId });
    this.props.dispatchFetchQueueDetails({ movieId });
    this.props.dispatchFetchImportListSchema();
+    this.props.dispatchFetchBlacklist();
+  }
+
+  repopulate = () => {
+    this.props.dispatchFetchBlacklist();
  }

  unpopulate = () => {
    this.props.dispatchCancelFetchReleases();
-    this.props.dispatchClearMovieBlacklist();
    this.props.dispatchClearMovieFiles();
    this.props.dispatchClearMovieHistory();
    this.props.dispatchClearExtraFiles();
@@ -362,8 +363,7 @@ MovieDetailsConnector.propTypes = {
  dispatchClearQueueDetails: PropTypes.func.isRequired,
  dispatchFetchImportListSchema: PropTypes.func.isRequired,
  dispatchExecuteCommand: PropTypes.func.isRequired,
-  dispatchFetchMovieBlacklist: PropTypes.func.isRequired,
-  dispatchClearMovieBlacklist: PropTypes.func.isRequired,
+  dispatchFetchBlacklist: PropTypes.func.isRequired,
  onGoToMovie: PropTypes.func.isRequired
 };

--- a/frontend/src/Movie/Details/MovieReleaseDatesConnector.js
+++ b/frontend/src/Movie/Details/MovieReleaseDatesConnector.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,12 +8,12 @@ function createMapStateToProps() {
  return createSelector(
    createUISettingsSelector(),
    (uiSettings) => {
-      return {
-        showRelativeDates: uiSettings.showRelativeDates,
-        shortDateFormat: uiSettings.shortDateFormat,
-        longDateFormat: uiSettings.longDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
+      return _.pick(uiSettings, [
+        'showRelativeDates',
+        'shortDateFormat',
+        'longDateFormat',
+        'timeFormat'
+      ]);
    }
  );
 }
--- a/frontend/src/Movie/Edit/EditMovieModalContentConnector.js
+++ b/frontend/src/Movie/Edit/EditMovieModalContentConnector.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -35,13 +36,13 @@ function createMapStateToProps() {
        pendingChanges
      } = moviesState;

-      const movieSettings = {
-        monitored: movie.monitored,
-        qualityProfileId: movie.qualityProfileId,
-        minimumAvailability: movie.minimumAvailability,
-        path: movie.path,
-        tags: movie.tags
-      };
+      const movieSettings = _.pick(movie, [
+        'monitored',
+        'qualityProfileId',
+        'minimumAvailability',
+        'path',
+        'tags'
+      ]);

      const settings = selectSettings(movieSettings, pendingChanges, saveError);

--- a/frontend/src/Movie/Index/Overview/MovieIndexOverviews.js
+++ b/frontend/src/Movie/Index/Overview/MovieIndexOverviews.js
@@ -72,8 +72,7 @@ class MovieIndexOverviews extends Component {
      sortKey,
      overviewOptions,
      jumpToCharacter,
-      isMovieEditorActive,
-      isSmallScreen
+      isMovieEditorActive
    } = this.props;

    const {
@@ -83,15 +82,13 @@ class MovieIndexOverviews extends Component {

    if (prevProps.sortKey !== sortKey ||
        prevProps.overviewOptions !== overviewOptions) {
-      this.calculateGrid(this.state.width, isSmallScreen);
+      this.calculateGrid();
    }

-    if (
-      this._grid &&
+    if (this._grid &&
        (prevState.width !== width ||
            prevState.rowHeight !== rowHeight ||
            hasDifferentItemsOrOrder(prevProps.items, items) ||
-            prevProps.overviewOptions !== overviewOptions ||
            prevProps.isMovieEditorActive !== isMovieEditorActive)) {
      // recomputeGridSize also forces Grid to discard its cache of rendered cells
      this._grid.recomputeGridSize();
--- a/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.js
+++ b/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.js
@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import formatBytes from 'Utilities/Number/formatBytes';
-import translate from 'Utilities/String/translate';
 import styles from './MovieIndexPosterInfo.css';

 function MovieIndexPosterInfo(props) {
@@ -52,7 +51,7 @@ function MovieIndexPosterInfo(props) {

    return (
      <div className={styles.info}>
-        {translate('Added')}: {addedDate}
+        {`Added ${addedDate}`}
      </div>
    );
  }
@@ -70,7 +69,7 @@ function MovieIndexPosterInfo(props) {

    return (
      <div className={styles.info}>
-        {translate('InCinemas')}: {inCinemasDate}
+        {`In Cinemas ${inCinemasDate}`}
      </div>
    );
  }
@@ -88,7 +87,7 @@ function MovieIndexPosterInfo(props) {

    return (
      <div className={styles.info}>
-        {translate('Digital')}: {digitalReleaseDate}
+        {`Digital ${digitalReleaseDate}`}
      </div>
    );
  }
@@ -106,7 +105,7 @@ function MovieIndexPosterInfo(props) {

    return (
      <div className={styles.info}>
-        {translate('Released')}: {physicalReleaseDate}
+        {`Released ${physicalReleaseDate}`}
      </div>
    );
  }
--- a/frontend/src/Movie/Index/Table/MovieIndexRow.js
+++ b/frontend/src/Movie/Index/Table/MovieIndexRow.js
@@ -8,8 +8,8 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
 import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
 import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell';
 import TagListConnector from 'Components/TagListConnector';
-import Tooltip from 'Components/Tooltip/Tooltip';
-import { icons, kinds } from 'Helpers/Props';
+import Popover from 'Components/Tooltip/Popover';
+import { icons } from 'Helpers/Props';
 import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
 import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
@@ -369,22 +369,21 @@ class MovieIndexRow extends Component {
                  className={styles[name]}
                >
                  <span className={styles.externalLinks}>
-                    <Tooltip
+                    <Popover
                      anchor={
                        <Icon
                          name={icons.EXTERNAL_LINK}
                          size={12}
                        />
                      }
-                      tooltip={
+                      title={translate('Links')}
+                      body={
                        <MovieDetailsLinks
                          tmdbId={tmdbId}
                          imdbId={imdbId}
                          youTubeTrailerId={youTubeTrailerId}
                        />
                      }
-                      canFlip={true}
-                      kind={kinds.INVERSE}
                    />
                  </span>

--- a/frontend/src/Movie/MovieFileStatusConnector.js
+++ b/frontend/src/Movie/MovieFileStatusConnector.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -9,13 +10,16 @@ function createMapStateToProps() {
  return createSelector(
    createMovieSelector(),
    (movie) => {
-      return {
-        inCinemas: movie.inCinemas,
-        isAvailable: movie.isAvailable,
-        monitored: movie.monitored,
-        grabbed: movie.grabbed,
-        movieFile: movie.movieFile
-      };
+      const result = _.pick(movie, [
+        'inCinemas',
+        'isAvailable',
+        'monitored',
+        'grabbed'
+      ]);
+
+      result.movieFile = movie.movieFile;
+
+      return result;
    }
  );
 }
--- a/frontend/src/MovieFile/Edit/FileEditModal.js
+++ b/frontend/src/MovieFile/Edit/FileEditModal.js
@@ -1,37 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Modal from 'Components/Modal/Modal';
-import FileEditModalContentConnector from './FileEditModalContentConnector';
-
-class FileEditModal extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      isOpen,
-      onModalClose,
-      ...otherProps
-    } = this.props;
-
-    return (
-      <Modal
-        isOpen={isOpen}
-        onModalClose={onModalClose}
-      >
-        <FileEditModalContentConnector
-          {...otherProps}
-          onModalClose={onModalClose}
-        />
-      </Modal>
-    );
-  }
-}
-
-FileEditModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default FileEditModal;
--- a/frontend/src/MovieFile/Edit/FileEditModalContent.js
+++ b/frontend/src/MovieFile/Edit/FileEditModalContent.js
@@ -1,237 +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 LoadingIndicator from 'Components/Loading/LoadingIndicator';
-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 FileEditModalContent extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    const {
-      qualityId,
-      languageIds,
-      indexerFlags,
-      proper,
-      real,
-      edition,
-      releaseGroup
-    } = props;
-
-    this.state = {
-      qualityId,
-      languageIds,
-      indexerFlags,
-      proper,
-      real,
-      edition,
-      releaseGroup
-    };
-  }
-
-  //
-  // Listeners
-
-  onQualityChange = ({ value }) => {
-    this.setState({ qualityId: parseInt(value) });
-  }
-
-  onInputChange = ({ name, value }) => {
-    this.setState({ [name]: value });
-  }
-
-  onSaveInputs = () => {
-    this.props.onSaveInputs(this.state);
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      isFetching,
-      isPopulated,
-      error,
-      qualities,
-      languages,
-      relativePath,
-      onModalClose
-    } = this.props;
-
-    const {
-      qualityId,
-      languageIds,
-      indexerFlags,
-      proper,
-      real,
-      edition,
-      releaseGroup
-    } = this.state;
-
-    const qualityOptions = qualities.map(({ id, name }) => {
-      return {
-        key: id,
-        value: name
-      };
-    });
-
-    const languageOptions = languages.map(({ id, name }) => {
-      return {
-        key: id,
-        value: name
-      };
-    });
-
-    return (
-      <ModalContent onModalClose={onModalClose}>
-        <ModalHeader>
-          {translate('EditMovieFile')} - {relativePath}
-        </ModalHeader>
-
-        <ModalBody>
-          {
-            isFetching &&
-              <LoadingIndicator />
-          }
-
-          {
-            !isFetching && !!error &&
-              <div>
-                {translate('UnableToLoadQualities')}
-              </div>
-          }
-
-          {
-            isPopulated && !error &&
-              <Form>
-                <FormGroup>
-                  <FormLabel>{translate('Quality')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.SELECT}
-                    name="quality"
-                    value={qualityId}
-                    values={qualityOptions}
-                    onChange={this.onQualityChange}
-                  />
-                </FormGroup>
-
-                <FormGroup>
-                  <FormLabel>{translate('Proper')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="proper"
-                    value={proper}
-                    onChange={this.onInputChange}
-                  />
-                </FormGroup>
-
-                <FormGroup>
-                  <FormLabel>{translate('Real')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="real"
-                    value={real}
-                    onChange={this.onInputChange}
-                  />
-                </FormGroup>
-
-                <FormGroup>
-                  <FormLabel>{translate('Languages')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.SELECT}
-                    name="languageIds"
-                    value={languageIds}
-                    values={languageOptions}
-                    onChange={this.onInputChange}
-                  />
-                </FormGroup>
-
-                <FormGroup>
-                  <FormLabel>{translate('IndexerFlags')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.INDEXER_FLAGS_SELECT}
-                    name="indexerFlags"
-                    indexerFlags={indexerFlags}
-                    onChange={this.onInputChange}
-                  />
-                </FormGroup>
-
-                <FormGroup>
-                  <FormLabel>{translate('Edition')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.TEXT}
-                    name="edition"
-                    value={edition}
-                    onChange={this.onInputChange}
-                  />
-                </FormGroup>
-
-                <FormGroup>
-                  <FormLabel>{translate('ReleaseGroup')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.TEXT}
-                    name="releaseGroup"
-                    value={releaseGroup}
-                    onChange={this.onInputChange}
-                  />
-                </FormGroup>
-              </Form>
-          }
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={onModalClose}>
-            {translate('Cancel')}
-          </Button>
-
-          <Button
-            kind={kinds.SUCCESS}
-            onPress={this.onSaveInputs}
-          >
-            {translate('Save')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    );
-  }
-}
-
-FileEditModalContent.propTypes = {
-  qualityId: PropTypes.number.isRequired,
-  proper: PropTypes.bool.isRequired,
-  real: PropTypes.bool.isRequired,
-  relativePath: PropTypes.string.isRequired,
-  edition: PropTypes.string.isRequired,
-  releaseGroup: PropTypes.string.isRequired,
-  languageIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
-  indexerFlags: PropTypes.number.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onSaveInputs: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default FileEditModalContent;
--- a/frontend/src/MovieFile/Edit/FileEditModalContentConnector.js
+++ b/frontend/src/MovieFile/Edit/FileEditModalContentConnector.js
@@ -1,139 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { updateMovieFiles } from 'Store/Actions/movieFileActions';
-import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
-import createMovieFileSelector from 'Store/Selectors/createMovieFileSelector';
-import getQualities from 'Utilities/Quality/getQualities';
-import FileEditModalContent from './FileEditModalContent';
-
-function createMapStateToProps() {
-  return createSelector(
-    createMovieFileSelector(),
-    (state) => state.settings.qualityProfiles,
-    (state) => state.settings.languages,
-    (movieFile, qualityProfiles, languages) => {
-
-      const filterItems = ['Any', 'Original'];
-      const filteredLanguages = languages.items.filter((lang) => !filterItems.includes(lang.name));
-
-      const quality = movieFile.quality;
-
-      return {
-        isFetching: qualityProfiles.isSchemaFetching || languages.isFetching,
-        isPopulated: qualityProfiles.isSchemaPopulated && languages.isPopulated,
-        error: qualityProfiles.error || languages.error,
-        qualityId: quality ? quality.quality.id : 0,
-        real: quality ? quality.revision.real > 0 : false,
-        proper: quality ? quality.revision.version > 1 : false,
-        qualities: getQualities(qualityProfiles.schema.items),
-        languageIds: movieFile.languages ? movieFile.languages.map((l) => l.id) : [],
-        languages: filteredLanguages,
-        indexerFlags: movieFile.indexerFlags,
-        edition: movieFile.edition,
-        releaseGroup: movieFile.releaseGroup,
-        relativePath: movieFile.relativePath
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchFetchQualityProfileSchema: fetchQualityProfileSchema,
-  dispatchUpdateMovieFiles: updateMovieFiles
-};
-
-class FileEditModalContentConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount = () => {
-    if (!this.props.isPopulated) {
-      this.props.dispatchFetchQualityProfileSchema();
-    }
-  }
-
-  //
-  // Listeners
-
-  onSaveInputs = ( payload ) => {
-    const {
-      qualityId,
-      real,
-      proper,
-      languageIds,
-      edition,
-      releaseGroup,
-      indexerFlags
-    } = payload;
-
-    const quality = this.props.qualities.find((item) => item.id === qualityId);
-
-    const languages = [];
-
-    languageIds.forEach((languageId) => {
-      const language = this.props.languages.find((item) => item.id === parseInt(languageId));
-
-      if (language !== undefined) {
-        languages.push(language);
-      }
-    });
-
-    const revision = {
-      version: proper ? 2 : 1,
-      real: real ? 1 : 0
-    };
-
-    const movieFileIds = [this.props.movieFileId];
-
-    this.props.dispatchUpdateMovieFiles({
-      movieFileIds,
-      languages,
-      indexerFlags,
-      edition,
-      releaseGroup,
-      quality: {
-        quality,
-        revision
-      }
-    });
-
-    this.props.onModalClose(true);
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <FileEditModalContent
-        {...this.props}
-        onSaveInputs={this.onSaveInputs}
-      />
-    );
-  }
-}
-
-FileEditModalContentConnector.propTypes = {
-  movieFileId: PropTypes.number.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
-  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
-  languageIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  indexerFlags: PropTypes.number.isRequired,
-  qualityId: PropTypes.number.isRequired,
-  real: PropTypes.bool.isRequired,
-  edition: PropTypes.string.isRequired,
-  releaseGroup: PropTypes.string.isRequired,
-  relativePath: PropTypes.string.isRequired,
-  proper: PropTypes.bool.isRequired,
-  dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
-  dispatchUpdateMovieFiles: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(FileEditModalContentConnector);
--- a/frontend/src/MovieFile/Editor/MovieFileEditorRow.js
+++ b/frontend/src/MovieFile/Editor/MovieFileEditorRow.js
@@ -3,14 +3,16 @@ import React, { Component } from 'react';
 import IconButton from 'Components/Link/IconButton';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRowCellButton from 'Components/Table/Cells/TableRowCellButton';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
-import FileEditModal from 'MovieFile/Edit/FileEditModal';
+import SelectLanguageModal from 'MovieFile/Language/SelectLanguageModal';
 import MediaInfoConnector from 'MovieFile/MediaInfoConnector';
 import * as mediaInfoTypes from 'MovieFile/mediaInfoTypes';
+import SelectQualityModal from 'MovieFile/Quality/SelectQualityModal';
 import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
 import FileDetailsModal from '../FileDetailsModal';
@@ -26,15 +28,32 @@ class MovieFileEditorRow extends Component {
    super(props, context);

    this.state = {
+      isSelectQualityModalOpen: false,
+      isSelectLanguageModalOpen: false,
      isConfirmDeleteModalOpen: false,
-      isFileDetailsModalOpen: false,
-      isFileEditModalOpen: false
+      isFileDetailsModalOpen: false
    };
  }

  //
  // Listeners

+  onSelectQualityPress = () => {
+    this.setState({ isSelectQualityModalOpen: true });
+  }
+
+  onSelectLanguagePress = () => {
+    this.setState({ isSelectLanguageModalOpen: true });
+  }
+
+  onSelectQualityModalClose = () => {
+    this.setState({ isSelectQualityModalOpen: false });
+  }
+
+  onSelectLanguageModalClose = () => {
+    this.setState({ isSelectLanguageModalOpen: false });
+  }
+
  onDeletePress = () => {
    this.setState({ isConfirmDeleteModalOpen: true });
  }
@@ -57,14 +76,6 @@ class MovieFileEditorRow extends Component {
    this.setState({ isFileDetailsModalOpen: false });
  }

-  onFileEditPress = () => {
-    this.setState({ isFileEditModalOpen: true });
-  }
-
-  onFileEditModalClose = () => {
-    this.setState({ isFileEditModalOpen: false });
-  }
-
  //
  // Render

@@ -81,8 +92,9 @@ class MovieFileEditorRow extends Component {
    } = this.props;

    const {
+      isSelectQualityModalOpen,
+      isSelectLanguageModalOpen,
      isFileDetailsModalOpen,
-      isFileEditModalOpen,
      isConfirmDeleteModalOpen
    } = this.state;

@@ -120,8 +132,10 @@ class MovieFileEditorRow extends Component {
          {formatBytes(size)}
        </TableRowCell>

-        <TableRowCell
+        <TableRowCellButton
          className={styles.language}
+          title={translate('ClickToChangeLanguage')}
+          onPress={this.onSelectLanguagePress}
        >
          {
            showLanguagePlaceholder &&
@@ -135,10 +149,12 @@ class MovieFileEditorRow extends Component {
                languages={languages}
              />
          }
-        </TableRowCell>
+        </TableRowCellButton>

-        <TableRowCell
+        <TableRowCellButton
          className={styles.quality}
+          title={translate('ClickToChangeQuality')}
+          onPress={this.onSelectQualityPress}
        >
          {
            showQualityPlaceholder &&
@@ -153,7 +169,7 @@ class MovieFileEditorRow extends Component {
                isCutoffNotMet={qualityCutoffNotMet}
              />
          }
-        </TableRowCell>
+        </TableRowCellButton>

        <TableRowCell
          className={styles.formats}
@@ -164,11 +180,6 @@ class MovieFileEditorRow extends Component {
        </TableRowCell>

        <TableRowCell className={styles.actions}>
-          <IconButton
-            name={icons.EDIT}
-            onPress={this.onFileEditPress}
-          />
-
          <IconButton
            name={icons.MEDIA_INFO}
            onPress={this.onFileDetailsPress}
@@ -187,12 +198,6 @@ class MovieFileEditorRow extends Component {
          mediaInfo={mediaInfo}
        />

-        <FileEditModal
-          movieFileId={id}
-          isOpen={isFileEditModalOpen}
-          onModalClose={this.onFileEditModalClose}
-        />
-
        <ConfirmModal
          isOpen={isConfirmDeleteModalOpen}
          ids={[id]}
@@ -203,6 +208,22 @@ class MovieFileEditorRow extends Component {
          onConfirm={this.onConfirmDelete}
          onCancel={this.onConfirmDeleteModalClose}
        />
+
+        <SelectQualityModal
+          isOpen={isSelectQualityModalOpen}
+          ids={[id]}
+          qualityId={quality ? quality.quality.id : 0}
+          proper={quality ? quality.revision.version > 1 : false}
+          real={quality ? quality.revision.real > 0 : false}
+          onModalClose={this.onSelectQualityModalClose}
+        />
+
+        <SelectLanguageModal
+          isOpen={isSelectLanguageModalOpen}
+          ids={[id]}
+          languageIds={languages ? languages.map((l) => l.id) : []}
+          onModalClose={this.onSelectLanguageModalClose}
+        />
      </TableRow>
    );
  }
--- a/frontend/src/MovieFile/Language/SelectLanguageModalContentConnector.js
+++ b/frontend/src/MovieFile/Language/SelectLanguageModalContentConnector.js
@@ -18,7 +18,7 @@ function createMapStateToProps() {
        items
      } = languages;

-      const filterItems = ['Any', 'Original'];
+      const filterItems = ['Any'];
      const filteredLanguages = items.filter((lang) => !filterItems.includes(lang.name));

      return {
@@ -57,9 +57,7 @@ class SelectLanguageModalContentConnector extends Component {
      const language = _.find(this.props.items,
        (item) => item.id === parseInt(languageId));

-      if (language !== undefined) {
-        languages.push(language);
-      }
+      languages.push(language);
    });

    this.props.dispatchupdateMovieFiles({
--- a/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js
+++ b/frontend/src/Settings/CustomFormats/CustomFormatSettingsConnector.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { DndProvider } from 'react-dnd';
-import { HTML5Backend } from 'react-dnd-html5-backend';
+import HTML5Backend from 'react-dnd-html5-backend';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
--- a/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js
+++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js
@@ -143,7 +143,7 @@ EditRemotePathMappingModalContent.propTypes = {
  isSaving: PropTypes.bool.isRequired,
  saveError: PropTypes.object,
  item: PropTypes.shape(remotePathMappingShape).isRequired,
-  downloadClientHosts: PropTypes.arrayOf(PropTypes.object).isRequired,
+  downloadClientHosts: PropTypes.arrayOf(PropTypes.string).isRequired,
  onInputChange: PropTypes.func.isRequired,
  onSavePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired,
--- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
+++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
@@ -49,12 +49,6 @@ function EditImportListModalContent(props) {
    fields
  } = item;

-  const importListTypeOptions = [
-    { key: 'manual', value: 'Manual' },
-    { key: 'automatic', value: 'Automatic Add' },
-    { key: 'exclusion', value: 'Exclusion List' }
-  ];
-
  return (
    <ModalContent onModalClose={onModalClose}>
      <ModalHeader>
@@ -106,9 +100,8 @@ function EditImportListModalContent(props) {
                <FormLabel>{translate('EnableAutomaticAdd')}</FormLabel>

                <FormInputGroup
-                  type={inputTypes.SELECT}
+                  type={inputTypes.CHECK}
                  name="enableAuto"
-                  values={importListTypeOptions}
                  helpText={translate('EnableAutoHelpText')}
                  {...enableAuto}
                  onChange={onInputChange}
@@ -180,7 +173,7 @@ function EditImportListModalContent(props) {
                <FormInputGroup
                  type={inputTypes.TAG}
                  name="tags"
-                  helpText={translate('ListTagsHelpText')}
+                  helpText={translate('TagsHelpText')}
                  {...tags}
                  onChange={onInputChange}
                />
--- a/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContent.js
+++ b/frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContent.js
@@ -36,7 +36,7 @@ function EditRestrictionModalContent(props) {
  return (
    <ModalContent onModalClose={onModalClose}>
      <ModalHeader>
-        {id ? translate('EditRestriction') : translate('AddRestriction')}
+        {id ? 'Edit Restriction' : 'Add Restriction'}
      </ModalHeader>

      <ModalBody>
@@ -51,7 +51,7 @@ function EditRestrictionModalContent(props) {
              name="required"
              helpText={translate('RequiredHelpText')}
              kind={kinds.SUCCESS}
-              placeholder={translate('RequiredRestrictionPlaceHolder')}
+              placeholder={translate('RequiredPlaceHolder')}
              {...required}
              onChange={onInputChange}
            />
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -116,10 +116,8 @@ class NamingModal extends Component {

    const movieTokens = [
      { token: '{Movie Title}', example: 'Movie Title!' },
-      { token: '{Movie Title:DE}', example: 'Filetitle' },
      { token: '{Movie CleanTitle}', example: 'Movie Title' },
      { token: '{Movie TitleThe}', example: 'Movie Title, The' },
-      { token: '{Movie OriginalTitle}', example: 'Τίτλος ταινίας' },
      { token: '{Movie TitleFirstCharacter}', example: 'M' },
      { token: '{Movie Collection}', example: 'The Movie Collection' },
      { token: '{Movie Certification}', example: 'R' },
--- a/frontend/src/Settings/Profiles/Profiles.js
+++ b/frontend/src/Settings/Profiles/Profiles.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { DndProvider } from 'react-dnd';
-import { HTML5Backend } from 'react-dnd-html5-backend';
+import HTML5Backend from 'react-dnd-html5-backend';
 import Link from 'Components/Link/Link';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.css
@@ -3,8 +3,7 @@
  flex-wrap: wrap;
 }

-.formGroupWrapper,
-.formatItemLarge {
+.formGroupWrapper {
  flex: 0 0 calc($formGroupSmallWidth - 100px);
 }

@@ -12,20 +11,8 @@
  margin-right: auto;
 }

-.formatItemSmall {
-  display: none;
-}
-
-@media only screen and (max-width: calc($breakpointLarge + 100px)) {
+@media only screen and (max-width: $breakpointLarge) {
  .formGroupsContainer {
    display: block;
  }
-
-  .formatItemSmall {
-    display: block;
-  }
-
-  .formatItemLarge {
-    display: none;
-  }
 }
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
@@ -21,17 +21,6 @@ import styles from './EditQualityProfileModalContent.css';

 const MODAL_BODY_PADDING = parseInt(dimensions.modalBodyPadding);

-function getCustomFormatRender(formatItems, otherProps) {
-  return (
-    <QualityProfileFormatItems
-      profileFormatItems={formatItems.value}
-      errors={formatItems.errors}
-      warnings={formatItems.warnings}
-      {...otherProps}
-    />
-  );
-}
-
 class EditQualityProfileModalContent extends Component {

  //
@@ -262,10 +251,6 @@ class EditQualityProfileModalContent extends Component {
                            onChange={onLanguageChange}
                          />
                        </FormGroup>
-
-                        <div className={styles.formatItemLarge}>
-                          {getCustomFormatRender(formatItems, ...otherProps)}
-                        </div>
                      </div>

                      <div className={styles.formGroupWrapper}>
@@ -278,8 +263,13 @@ class EditQualityProfileModalContent extends Component {
                        />
                      </div>

-                      <div className={styles.formatItemSmall}>
-                        {getCustomFormatRender(formatItems, otherProps)}
+                      <div className={styles.formGroupWrapper}>
+                        <QualityProfileFormatItems
+                          profileFormatItems={formatItems.value}
+                          errors={formatItems.errors}
+                          warnings={formatItems.warnings}
+                          {...otherProps}
+                        />
                      </div>
                    </div>
                  </Form>
--- a/frontend/src/Settings/UI/UISettings.js
+++ b/frontend/src/Settings/UI/UISettings.js
@@ -65,8 +65,6 @@ class UISettings extends Component {
      ...otherProps
    } = this.props;

-    const uiLanguages = languages.filter((item) => item.value !== 'Original');
-
    return (
      <PageContent title={translate('UISettings')}>
        <SettingsToolbarConnector
@@ -215,7 +213,7 @@ class UISettings extends Component {
                    <FormInputGroup
                      type={inputTypes.SELECT}
                      name="uiLanguage"
-                      values={uiLanguages}
+                      values={languages}
                      helpText={translate('UILanguageHelpText')}
                      helpTextWarning={translate('UILanguageHelpTextWarning')}
                      onChange={onInputChange}
--- a/frontend/src/Store/Actions/Creators/createSaveProviderHandler.js
+++ b/frontend/src/Store/Actions/Creators/createSaveProviderHandler.js
@@ -1,12 +1,10 @@
 import $ from 'jquery';
-import _ from 'lodash';
 import { batchActions } from 'redux-batched-actions';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import getProviderState from 'Utilities/State/getProviderState';
 import { set, updateItem } from '../baseActions';

 const abortCurrentRequests = {};
-let lastSaveData = null;

 export function createCancelSaveProviderHandler(section) {
  return function(getState, payload, dispatch) {
@@ -28,33 +26,25 @@ function createSaveProviderHandler(section, url, options = {}) {
    } = payload;

    const saveData = getProviderState({ id, ...otherPayload }, getState, section);
-    const requestUrl = id ? `${url}/${id}` : url;
-    const params = { ...queryParams };
-
-    // If the user is re-saving the same provider without changes
-    // force it to be saved. Only applies to editing existing providers.
-
-    if (id && _.isEqual(saveData, lastSaveData)) {
-      params.forceSave = true;
-    }
-
-    lastSaveData = saveData;

    const ajaxOptions = {
-      url: `${requestUrl}?${$.param(params, true)}`,
-      method: id ? 'PUT' : 'POST',
+      url: `${url}?${$.param(queryParams, true)}`,
+      method: 'POST',
      contentType: 'application/json',
      dataType: 'json',
      data: JSON.stringify(saveData)
    };

+    if (id) {
+      ajaxOptions.url = `${url}/${id}?${$.param(queryParams, true)}`;
+      ajaxOptions.method = 'PUT';
+    }
+
    const { request, abortRequest } = createAjaxRequest(ajaxOptions);

    abortCurrentRequests[section] = abortRequest;

    request.done((data) => {
-      lastSaveData = null;
-
      dispatch(batchActions([
        updateItem({ section, ...data }),

--- a/frontend/src/Store/Actions/Settings/indexerFlags.js
+++ b/frontend/src/Store/Actions/Settings/indexerFlags.js
@@ -1,48 +0,0 @@
-import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
-import { createThunk } from 'Store/thunks';
-
-//
-// Variables
-
-const section = 'settings.indexerFlags';
-
-//
-// Actions Types
-
-export const FETCH_INDEXER_FLAGS = 'settings/indexerFlags/fetchIndexerFlags';
-
-//
-// Action Creators
-
-export const fetchIndexerFlags = createThunk(FETCH_INDEXER_FLAGS);
-
-//
-// Details
-
-export default {
-
-  //
-  // State
-
-  defaultState: {
-    isFetching: false,
-    isPopulated: false,
-    error: null,
-    items: []
-  },
-
-  //
-  // Action Handlers
-
-  actionHandlers: {
-    [FETCH_INDEXER_FLAGS]: createFetchHandler(section, '/indexerFlag')
-  },
-
-  //
-  // Reducers
-
-  reducers: {
-
-  }
-
-};
--- a/frontend/src/Store/Actions/blacklistActions.js
+++ b/frontend/src/Store/Actions/blacklistActions.js
@@ -1,11 +1,8 @@
 import { createAction } from 'redux-actions';
-import { batchActions } from 'redux-batched-actions';
 import { sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
-import createAjaxRequest from 'Utilities/createAjaxRequest';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
 import translate from 'Utilities/String/translate';
-import { set, updateItem } from './baseActions';
 import createHandleActions from './Creators/createHandleActions';
 import createRemoveItemHandler from './Creators/createRemoveItemHandler';
 import createServerSideCollectionHandlers from './Creators/createServerSideCollectionHandlers';
@@ -28,7 +25,6 @@ export const defaultState = {
  sortDirection: sortDirections.DESCENDING,
  error: null,
  items: [],
-  isRemoving: false,

  columns: [
    {
@@ -100,8 +96,7 @@ export const GOTO_LAST_BLACKLIST_PAGE = 'blacklist/gotoBlacklistLastPage';
 export const GOTO_BLACKLIST_PAGE = 'blacklist/gotoBlacklistPage';
 export const SET_BLACKLIST_SORT = 'blacklist/setBlacklistSort';
 export const SET_BLACKLIST_TABLE_OPTION = 'blacklist/setBlacklistTableOption';
-export const REMOVE_BLACKLIST_ITEM = 'blacklist/removeBlacklistItem';
-export const REMOVE_BLACKLIST_ITEMS = 'blacklist/removeBlacklistItems';
+export const REMOVE_FROM_BLACKLIST = 'blacklist/removeFromBlacklist';
 export const CLEAR_BLACKLIST = 'blacklist/clearBlacklist';

 //
@@ -115,8 +110,7 @@ export const gotoBlacklistLastPage = createThunk(GOTO_LAST_BLACKLIST_PAGE);
 export const gotoBlacklistPage = createThunk(GOTO_BLACKLIST_PAGE);
 export const setBlacklistSort = createThunk(SET_BLACKLIST_SORT);
 export const setBlacklistTableOption = createAction(SET_BLACKLIST_TABLE_OPTION);
-export const removeBlacklistItem = createThunk(REMOVE_BLACKLIST_ITEM);
-export const removeBlacklistItems = createThunk(REMOVE_BLACKLIST_ITEMS);
+export const removeFromBlacklist = createThunk(REMOVE_FROM_BLACKLIST);
 export const clearBlacklist = createAction(CLEAR_BLACKLIST);

 //
@@ -137,53 +131,7 @@ export const actionHandlers = handleThunks({
      [serverSideCollectionHandlers.SORT]: SET_BLACKLIST_SORT
    }),

-  [REMOVE_BLACKLIST_ITEM]: createRemoveItemHandler(section, '/blacklist'),
-
-  [REMOVE_BLACKLIST_ITEMS]: function(getState, payload, dispatch) {
-    const {
-      ids
-    } = payload;
-
-    dispatch(batchActions([
-      ...ids.map((id) => {
-        return updateItem({
-          section,
-          id,
-          isRemoving: true
-        });
-      }),
-
-      set({ section, isRemoving: true })
-    ]));
-
-    const promise = createAjaxRequest({
-      url: '/blacklist/bulk',
-      method: 'DELETE',
-      dataType: 'json',
-      data: JSON.stringify({ ids })
-    }).request;
-
-    promise.done((data) => {
-      // Don't use batchActions with thunks
-      dispatch(fetchBlacklist());
-
-      dispatch(set({ section, isRemoving: false }));
-    });
-
-    promise.fail((xhr) => {
-      dispatch(batchActions([
-        ...ids.map((id) => {
-          return updateItem({
-            section,
-            id,
-            isRemoving: false
-          });
-        }),
-
-        set({ section, isRemoving: false })
-      ]));
-    });
-  }
+  [REMOVE_FROM_BLACKLIST]: createRemoveItemHandler(section, '/blacklist')
 });

 //
--- a/frontend/src/Store/Actions/index.js
+++ b/frontend/src/Store/Actions/index.js
@@ -11,7 +11,6 @@ import * as history from './historyActions';
 import * as importMovie from './importMovieActions';
 import * as interactiveImportActions from './interactiveImportActions';
 import * as movies from './movieActions';
-import * as movieBlacklist from './movieBlacklistActions';
 import * as movieCredits from './movieCreditsActions';
 import * as movieFiles from './movieFileActions';
 import * as movieHistory from './movieHistoryActions';
@@ -49,7 +48,6 @@ export default [
  releases,
  rootFolders,
  movies,
-  movieBlacklist,
  movieHistory,
  movieIndex,
  movieCredits,
--- a/frontend/src/Store/Actions/movieBlacklistActions.js
+++ b/frontend/src/Store/Actions/movieBlacklistActions.js
@@ -1,82 +0,0 @@
-import { createAction } from 'redux-actions';
-import { batchActions } from 'redux-batched-actions';
-import { createThunk, handleThunks } from 'Store/thunks';
-import createAjaxRequest from 'Utilities/createAjaxRequest';
-import { set, update } from './baseActions';
-import createHandleActions from './Creators/createHandleActions';
-
-//
-// Variables
-
-export const section = 'movieBlacklist';
-
-//
-// State
-
-export const defaultState = {
-  isFetching: false,
-  isPopulated: false,
-  error: null,
-  items: []
-};
-
-//
-// Actions Types
-
-export const FETCH_MOVIE_BLACKLIST = 'movieBlacklist/fetchMovieBlacklist';
-export const CLEAR_MOVIE_BLACKLIST = 'movieBlacklist/clearMovieBlacklist';
-
-//
-// Action Creators
-
-export const fetchMovieBlacklist = createThunk(FETCH_MOVIE_BLACKLIST);
-export const clearMovieBlacklist = createAction(CLEAR_MOVIE_BLACKLIST);
-
-//
-// Action Handlers
-
-export const actionHandlers = handleThunks({
-
-  [FETCH_MOVIE_BLACKLIST]: function(getState, payload, dispatch) {
-    dispatch(set({ section, isFetching: true }));
-
-    const promise = createAjaxRequest({
-      url: '/blacklist/movie',
-      data: payload
-    }).request;
-
-    promise.done((data) => {
-      dispatch(batchActions([
-        update({ section, data }),
-
-        set({
-          section,
-          isFetching: false,
-          isPopulated: true,
-          error: null
-        })
-      ]));
-    });
-
-    promise.fail((xhr) => {
-      dispatch(set({
-        section,
-        isFetching: false,
-        isPopulated: false,
-        error: xhr
-      }));
-    });
-  }
-});
-
-//
-// Reducers
-
-export const reducers = createHandleActions({
-
-  [CLEAR_MOVIE_BLACKLIST]: (state) => {
-    return Object.assign({}, state, defaultState);
-  }
-
-}, defaultState, section);
-
--- a/frontend/src/Store/Actions/movieFileActions.js
+++ b/frontend/src/Store/Actions/movieFileActions.js
@@ -141,10 +141,7 @@ export const actionHandlers = handleThunks({
    const {
      movieFileIds,
      languages,
-      indexerFlags,
-      quality,
-      edition,
-      releaseGroup
+      quality
    } = payload;

    dispatch(set({ section, isSaving: true }));
@@ -157,22 +154,10 @@ export const actionHandlers = handleThunks({
      data.languages = languages;
    }

-    if (indexerFlags !== undefined) {
-      data.indexerFlags = indexerFlags;
-    }
-
    if (quality) {
      data.quality = quality;
    }

-    if (releaseGroup) {
-      data.releaseGroup = releaseGroup;
-    }
-
-    if (edition) {
-      data.edition = edition;
-    }
-
    const promise = createAjaxRequest({
      url: '/movieFile/editor',
      method: 'PUT',
@@ -189,22 +174,10 @@ export const actionHandlers = handleThunks({
            props.languages = languages;
          }

-          if (indexerFlags) {
-            props.indexerFlags = indexerFlags;
-          }
-
          if (quality) {
            props.quality = quality;
          }

-          if (edition) {
-            props.edition = edition;
-          }
-
-          if (releaseGroup) {
-            props.releaseGroup = releaseGroup;
-          }
-
          return updateItem({ section, id, ...props });
        }),

--- a/frontend/src/Store/Actions/queueActions.js
+++ b/frontend/src/Store/Actions/queueActions.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import moment from 'moment';
 import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
 import { sortDirections } from 'Helpers/Props';
@@ -143,11 +142,6 @@ export const defaultState = {
        isModifiable: false
      }
    ]
-  },
-  sortPredicates: {
-    estimatedCompletionTime: function(item, direction) {
-      return moment.duration(item.timeleft).asMilliseconds();
-    }
  }
 };

@@ -314,9 +308,9 @@ export const actionHandlers = handleThunks({
    }).request;

    promise.done((data) => {
-      dispatch(fetchQueue());
-
      dispatch(batchActions([
+        fetchQueue(),
+
        ...ids.map((id) => {
          return updateItem({
            section: paged,
@@ -400,10 +394,10 @@ export const actionHandlers = handleThunks({
    }).request;

    promise.done((data) => {
-      // Don't use batchActions with thunks
-      dispatch(fetchQueue());
-
-      dispatch(set({ section: paged, isRemoving: false }));
+      dispatch(batchActions([
+        set({ section: paged, isRemoving: false }),
+        fetchQueue()
+      ]));
    });

    promise.fail((xhr) => {
--- a/frontend/src/Store/Actions/settingsActions.js
+++ b/frontend/src/Store/Actions/settingsActions.js
@@ -10,7 +10,6 @@ import general from './Settings/general';
 import importExclusions from './Settings/importExclusions';
 import importListOptions from './Settings/importListOptions';
 import importLists from './Settings/importLists';
-import indexerFlags from './Settings/indexerFlags';
 import indexerOptions from './Settings/indexerOptions';
 import indexers from './Settings/indexers';
 import languages from './Settings/languages';
@@ -32,7 +31,6 @@ export * from './Settings/delayProfiles';
 export * from './Settings/downloadClients';
 export * from './Settings/downloadClientOptions';
 export * from './Settings/general';
-export * from './Settings/indexerFlags';
 export * from './Settings/indexerOptions';
 export * from './Settings/indexers';
 export * from './Settings/languages';
@@ -68,7 +66,6 @@ export const defaultState = {
  downloadClients: downloadClients.defaultState,
  downloadClientOptions: downloadClientOptions.defaultState,
  general: general.defaultState,
-  indexerFlags: indexerFlags.defaultState,
  indexerOptions: indexerOptions.defaultState,
  indexers: indexers.defaultState,
  languages: languages.defaultState,
@@ -112,7 +109,6 @@ export const actionHandlers = handleThunks({
  ...downloadClients.actionHandlers,
  ...downloadClientOptions.actionHandlers,
  ...general.actionHandlers,
-  ...indexerFlags.actionHandlers,
  ...indexerOptions.actionHandlers,
  ...indexers.actionHandlers,
  ...languages.actionHandlers,
@@ -147,7 +143,6 @@ export const reducers = createHandleActions({
  ...downloadClients.reducers,
  ...downloadClientOptions.reducers,
  ...general.reducers,
-  ...indexerFlags.reducers,
  ...indexerOptions.reducers,
  ...indexers.reducers,
  ...languages.reducers,
--- 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 'IndexerLongTermStatusCheck':
      return (
        <IconButton
          name={icons.SETTINGS}
--- a/frontend/src/System/Status/MoreInfo/MoreInfo.js
+++ b/frontend/src/System/Status/MoreInfo/MoreInfo.js
@@ -22,7 +22,7 @@ class MoreInfo extends Component {

          <DescriptionListItemTitle>Discord</DescriptionListItemTitle>
          <DescriptionListItemDescription>
-            <Link to="https://discord.gg/r5wJPt9">discord.gg/r5wJPt9</Link>
+            <Link to="https://discord.gg/AD3UP37">discord.gg/AD3UP37</Link>
          </DescriptionListItemDescription>

          <DescriptionListItemTitle>Wiki</DescriptionListItemTitle>
--- a/frontend/src/System/Updates/UpdateChanges.js
+++ b/frontend/src/System/Updates/UpdateChanges.js
@@ -24,13 +24,9 @@ class UpdateChanges extends Component {
        <ul>
          {
            changes.map((change, index) => {
-              const checkChange = change.replace(/#\d{4,5}\b/g, (match, contents) => {
-                return `[${match}](https://github.com/Radarr/Radarr/issues/${match.substring(1)})`;
-              });
-
              return (
                <li key={index}>
-                  <InlineMarkdown data={checkChange} />
+                  <InlineMarkdown data={change} />
                </li>
              );
            })
--- a/frontend/src/Utilities/Date/formatTimeSpan.js
+++ b/frontend/src/Utilities/Date/formatTimeSpan.js
@@ -7,8 +7,7 @@ function formatTimeSpan(timeSpan) {
  }

  const duration = moment.duration(timeSpan);
-
-  const days = Math.floor(duration.asDays());
+  const days = duration.get('days');
  const hours = padNumber(duration.get('hours'), 2);
  const minutes = padNumber(duration.get('minutes'), 2);
  const seconds = padNumber(duration.get('seconds'), 2);
--- a/frontend/src/Utilities/Date/getRelativeDate.js
+++ b/frontend/src/Utilities/Date/getRelativeDate.js
@@ -4,7 +4,6 @@ import isInNextWeek from 'Utilities/Date/isInNextWeek';
 import isToday from 'Utilities/Date/isToday';
 import isTomorrow from 'Utilities/Date/isTomorrow';
 import isYesterday from 'Utilities/Date/isYesterday';
-import translate from 'Utilities/String/translate';

 function getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat, includeSeconds = false, timeForToday = false } = {}) {
  if (!date) {
@@ -22,15 +21,15 @@ function getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat,
  }

  if (isYesterday(date)) {
-    return translate('Yesterday');
+    return 'Yesterday';
  }

  if (isTodayDate) {
-    return translate('Today');
+    return 'Today';
  }

  if (isTomorrow(date)) {
-    return translate('Tomorrow');
+    return 'Tomorrow';
  }

  if (isInNextWeek(date)) {
--- a/frontend/src/Utilities/Date/isToday.js
+++ b/frontend/src/Utilities/Date/isToday.js
@@ -1,12 +1,11 @@
+import moment from 'moment';
+
 function isToday(date) {
  if (!date) {
    return false;
  }

-  const dateObj = (typeof date === 'object') ? date : new Date(date);
-  const today = new Date();
-
-  return dateObj.getDate() === today.getDate() && dateObj.getMonth() === today.getMonth() && dateObj.getFullYear() === today.getFullYear();
+  return moment(date).isSame(moment(), 'day');
 }

 export default isToday;
--- a/frontend/src/Utilities/Date/isTomorrow.js
+++ b/frontend/src/Utilities/Date/isTomorrow.js
@@ -1,13 +1,11 @@
+import moment from 'moment';
+
 function isTomorrow(date) {
  if (!date) {
    return false;
  }

-  const dateObj = (typeof date === 'object') ? date : new Date(date);
-  const today = new Date();
-  const tomorrow = new Date((today.setDate(today.getDate() + 1)));
-
-  return dateObj.getDate() === tomorrow.getDate() && dateObj.getMonth() === tomorrow.getMonth() && dateObj.getFullYear() === tomorrow.getFullYear();
+  return moment(date).isSame(moment().add(1, 'day'), 'day');
 }

 export default isTomorrow;
--- a/frontend/src/Utilities/Date/isYesterday.js
+++ b/frontend/src/Utilities/Date/isYesterday.js
@@ -1,13 +1,11 @@
+import moment from 'moment';
+
 function isYesterday(date) {
  if (!date) {
    return false;
  }

-  const dateObj = (typeof date === 'object') ? date : new Date(date);
-  const today = new Date();
-  const yesterday = new Date((today.setDate(today.getDate() - 1)));
-
-  return dateObj.getDate() === yesterday.getDate() && dateObj.getMonth() === yesterday.getMonth() && dateObj.getFullYear() === yesterday.getFullYear();
+  return moment(date).isSame(moment().subtract(1, 'day'), 'day');
 }

 export default isYesterday;
--- a/frontend/src/Utilities/String/parseUrl.js
+++ b/frontend/src/Utilities/String/parseUrl.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import qs from 'qs';

 // See: https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils
@@ -9,17 +10,18 @@ export default function parseUrl(url) {
  // The `origin`, `password`, and `username` properties are unavailable in
  // Opera Presto. We synthesize `origin` if it's not present. While `password`
  // and `username` are ignored intentionally.
-  const properties = {
-    hash: anchor.hash,
-    host: anchor.host,
-    hostname: anchor.hostname,
-    href: anchor.href,
-    origin: anchor.origin,
-    pathname: anchor.pathname,
-    port: anchor.port,
-    protocol: anchor.protocol,
-    search: anchor.search
-  };
+  const properties = _.pick(
+    anchor,
+    'hash',
+    'host',
+    'hostname',
+    'href',
+    'origin',
+    'pathname',
+    'port',
+    'protocol',
+    'search'
+  );

  properties.isAbsolute = (/^[\w:]*\/\//).test(url);

--- a/macOS/Radarr
+++ b/macOS/Radarr
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+#get the bundle's MacOS directory full path
+DIR=$(cd "$(dirname "$0")"; pwd)
+
+#change these values to match your app
+EXE_PATH="$DIR/Radarr.exe"
+APPNAME="Radarr"
+
+#set up environment
+if [[ -x '/opt/local/bin/mono' ]]; then
+    # Macports and mono-supplied installer path
+    export PATH="/opt/local/bin:$PATH"
+elif [[ -x '/usr/local/bin/mono' ]]; then
+    # Homebrew-supplied path to mono
+    export PATH="/usr/local/bin:$PATH"
+fi
+
+export DYLD_FALLBACK_LIBRARY_PATH="$DIR"
+
+if [ -e /Library/Frameworks/Mono.framework ]; then
+	MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
+	export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
+	export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$MONO_FRAMEWORK_PATH/lib"
+fi
+
+if [[ -f '/opt/local/lib/libsqlite3.0.dylib' ]]; then
+	export DYLD_FALLBACK_LIBRARY_PATH="/opt/local/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+fi
+
+export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/local/lib:/lib:/usr/lib"
+
+#mono version check
+REQUIRED_MAJOR=4
+REQUIRED_MINOR=6
+
+VERSION_TITLE="Cannot launch $APPNAME"
+VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later."
+DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac"
+
+MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' |  cut -f5 -d\ )"
+# if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi
+
+
+MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)"
+MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)"
+if [ -z "$MONO_VERSION" ] \
+    || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \
+    || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ]
+then
+    osascript \
+    -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \
+    -e "if button returned of question is equal to \"Download...\" then open location \"$DOWNLOAD_URL\""
+    echo "$VERSION_TITLE"
+    echo "$VERSION_MSG"
+    exit 1
+fi
+
+MONO_EXEC="exec mono --debug"
+
+#run app using mono
+$MONO_EXEC "$EXE_PATH"
--- a/package.json
+++ b/package.json
@@ -17,27 +17,28 @@
  "license": "GPL-3.0",
  "readmeFilename": "readme.md",
  "dependencies": {
-    "@babel/core": "7.11.6",
-    "@babel/plugin-proposal-class-properties": "7.10.4",
-    "@babel/plugin-proposal-decorators": "7.10.5",
-    "@babel/plugin-proposal-export-default-from": "7.10.4",
-    "@babel/plugin-proposal-export-namespace-from": "7.10.4",
-    "@babel/plugin-proposal-function-sent": "7.10.4",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.4",
-    "@babel/plugin-proposal-numeric-separator": "7.10.4",
-    "@babel/plugin-proposal-optional-chaining": "7.11.0",
-    "@babel/plugin-proposal-throw-expressions": "7.10.4",
+    "@babel/core": "7.9.6",
+    "@babel/plugin-proposal-class-properties": "7.8.3",
+    "@babel/plugin-proposal-decorators": "7.8.3",
+    "@babel/plugin-proposal-export-default-from": "7.8.3",
+    "@babel/plugin-proposal-export-namespace-from": "7.8.3",
+    "@babel/plugin-proposal-function-sent": "7.8.3",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.8.3",
+    "@babel/plugin-proposal-numeric-separator": "7.8.3",
+    "@babel/plugin-proposal-optional-chaining": "7.9.0",
+    "@babel/plugin-proposal-throw-expressions": "7.8.3",
    "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/preset-env": "7.11.5",
-    "@babel/preset-react": "7.10.4",
-    "@fortawesome/fontawesome-free": "5.15.0",
-    "@fortawesome/fontawesome-svg-core": "1.2.31",
-    "@fortawesome/free-regular-svg-icons": "5.15.0",
-    "@fortawesome/free-solid-svg-icons": "5.15.0",
-    "@fortawesome/react-fontawesome": "0.1.11",
+    "@babel/preset-env": "7.9.6",
+    "@babel/preset-react": "7.9.4",
+    "@fortawesome/fontawesome-free": "5.13.0",
+    "@fortawesome/fontawesome-svg-core": "1.2.28",
+    "@fortawesome/free-regular-svg-icons": "5.13.0",
+    "@fortawesome/free-solid-svg-icons": "5.13.0",
+    "@fortawesome/react-fontawesome": "0.1.9",
    "@microsoft/signalr": "3.1.7",
-    "@sentry/browser": "5.24.2",
-    "@sentry/integrations": "5.24.2",
+    "@popperjs/core": "2.2.1",
+    "@sentry/browser": "5.15.5",
+    "@sentry/integrations": "5.15.5",
    "ansi-colors": "4.1.1",
    "autoprefixer": "9.7.5",
    "babel-eslint": "10.1.0",
@@ -47,19 +48,19 @@
    "classnames": "2.2.6",
    "clipboard": "2.0.6",
    "connected-react-router": "6.8.0",
-    "core-js": "3.6.5",
+    "core-js": "3",
    "css-loader": "3.4.2",
-    "del": "6.0.0",
+    "del": "5.1.0",
    "element-class": "0.2.2",
-    "eslint": "7.10.0",
+    "eslint": "7.5.0",
    "eslint-plugin-filenames": "1.3.2",
    "eslint-plugin-import": "2.22.0",
-    "eslint-plugin-react": "7.21.3",
+    "eslint-plugin-react": "7.20.5",
    "eslint-plugin-simple-import-sort": "5.0.3",
    "esprint": "0.7.0",
-    "file-loader": "6.1.0",
+    "file-loader": "6.0.0",
    "filesize": "6.1.0",
-    "fuse.js": "6.4.1",
+    "fuse.js": "6.0.4",
    "gulp": "4.0.2",
    "gulp-cached": "1.1.1",
    "gulp-concat": "2.6.1",
@@ -70,14 +71,14 @@
    "gulp-watch": "5.0.1",
    "gulp-wrap": "0.15.0",
    "history": "4.10.1",
-    "html-webpack-plugin": "4.5.0",
+    "html-webpack-plugin": "3.2.0",
    "jdu": "1.0.0",
    "jquery": "3.5.1",
    "loader-utils": "^2.0.0",
    "lodash": "4.17.20",
    "mini-css-extract-plugin": "0.9.0",
    "mobile-detect": "1.4.4",
-    "moment": "2.29.0",
+    "moment": "2.24.0",
    "mousetrap": "1.6.5",
    "normalize.css": "8.0.1",
    "optimize-css-assets-webpack-plugin": "5.0.3",
@@ -91,22 +92,22 @@
    "qs": "6.9.4",
    "react": "16.13.1",
    "react-addons-shallow-compare": "15.6.2",
-    "react-async-script": "1.2.0",
+    "react-async-script": "1.1.1",
    "react-autosuggest": "10.0.2",
    "react-custom-scrollbars": "4.2.1",
-    "react-dnd": "11.1.3",
-    "react-dnd-html5-backend": "11.1.3",
+    "react-dnd": "10.0.2",
+    "react-dnd-html5-backend": "10.0.2",
    "react-document-title": "2.0.3",
    "react-dom": "16.13.1",
-    "react-focus-lock": "2.4.1",
-    "react-google-recaptcha": "2.1.0",
-    "react-lazyload": "3.0.0",
+    "react-focus-lock": "2.3.1",
+    "react-google-recaptcha": "2.0.1",
+    "react-lazyload": "2.6.7",
    "react-measure": "1.4.7",
    "react-popper": "1.3.7",
-    "react-redux": "7.2.1",
-    "react-router": "5.2.0",
-    "react-router-dom": "5.2.0",
-    "react-slider": "1.0.11",
+    "react-redux": "7.2.0",
+    "react-router": "5.1.2",
+    "react-router-dom": "5.1.2",
+    "react-slider": "1.0.7",
    "react-tabs": "3.1.1",
    "react-text-truncate": "0.16.0",
    "react-virtualized": "9.21.1",
@@ -120,12 +121,12 @@
    "run-sequence": "2.2.1",
    "streamqueue": "1.1.2",
    "style-loader": "1.2.1",
-    "stylelint": "13.7.2",
+    "stylelint": "13.6.1",
    "stylelint-order": "4.1.0",
    "url-loader": "4.1.0",
-    "webpack": "4.44.2",
-    "webpack-stream": "6.1.0",
-    "worker-loader": "3.0.3"
+    "webpack": "4.42.1",
+    "webpack-stream": "5.2.1",
+    "worker-loader": "2.0.0"
  },
  "main": "index.js",
  "browserslist": [
--- a/setup/radarr.iss
+++ b/setup/radarr.iss
@@ -37,14 +37,13 @@ Compression=lzma2/normal
 AppContact={#ForumsURL}
 VersionInfoVersion={#BaseVersion}.{#BuildNumber}
 SetupLogging=yes
-OutputDir=output

 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"

 [Tasks]
 Name: "desktopIcon"; Description: "{cm:CreateDesktopIcon}"
-Name: "windowsService"; Description: "Install Windows Service (Starts when the computer starts as the LocalService user, you will need to change the user to access network shares)"; GroupDescription: "Start automatically"; Flags: exclusive
+Name: "windowsService"; Description: "Install Windows Service (Starts when the computer starts)"; GroupDescription: "Start automatically"; Flags: exclusive
 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

@@ -58,9 +57,6 @@ 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}"; Type: filesandordirs
-
 [Run]
 Filename: "{app}\Radarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u"; Flags: runhidden waituntilterminated;
 Filename: "{app}\Radarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
@@ -76,6 +72,5 @@ function PrepareToInstall(var NeedsRestart: Boolean): String;
 var
  ResultCode: Integer;
 begin
-  Exec('net', 'stop radarr', '', 0, ewWaitUntilTerminated, ResultCode)
-  Exec('sc', 'delete radarr', '', 0, ewWaitUntilTerminated, ResultCode)
+  Exec(ExpandConstant('{commonappdata}\Radarr\bin\Radarr.Console.exe'), '/u', '', 0, ewWaitUntilTerminated, ResultCode)
 end;
--- a/src/NzbDrone.Api/FileSystem/FileSystemModule.cs
+++ b/src/NzbDrone.Api/FileSystem/FileSystemModule.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using System.Linq;
 using Nancy;
@@ -58,7 +57,7 @@ namespace NzbDrone.Api.FileSystem

            if (!_diskProvider.FolderExists(path))
            {
-                return Array.Empty<string>();
+                return new string[0];
            }

            return _diskScanService.GetVideoFiles(path).Select(f => new
--- a/src/NzbDrone.Api/Indexers/ReleaseResource.cs
+++ b/src/NzbDrone.Api/Indexers/ReleaseResource.cs
@@ -56,7 +56,9 @@ namespace NzbDrone.Api.Indexers
        public int? Leechers { get; set; }
        public DownloadProtocol Protocol { get; set; }

-        // JsonIgnore so we don't serialize it, but can still parse it, removed in v3
+        // TODO: Remove in v3
+        // Used to support the original Release Push implementation
+        // JsonIgnore so we don't serialize it, but can still parse it
        [JsonIgnore]
        public DownloadProtocol DownloadProtocol
        {
--- a/src/NzbDrone.Api/NetImport/NetImportModule.cs
+++ b/src/NzbDrone.Api/NetImport/NetImportModule.cs
@@ -21,7 +21,7 @@ namespace NzbDrone.Api.ImportList
            base.MapToResource(resource, definition);

            resource.Enabled = definition.Enabled;
-            resource.EnableAuto = (int)definition.EnableAuto;
+            resource.EnableAuto = definition.EnableAuto;
            resource.ProfileId = definition.ProfileId;
            resource.RootFolderPath = definition.RootFolderPath;
            resource.ShouldMonitor = definition.ShouldMonitor;
@@ -34,7 +34,7 @@ namespace NzbDrone.Api.ImportList
            base.MapToModel(definition, resource);

            definition.Enabled = resource.Enabled;
-            definition.EnableAuto = (ImportListType)resource.EnableAuto;
+            definition.EnableAuto = resource.EnableAuto;
            definition.ProfileId = resource.ProfileId;
            definition.RootFolderPath = resource.RootFolderPath;
            definition.ShouldMonitor = resource.ShouldMonitor;
--- a/src/NzbDrone.Api/NetImport/NetImportResource.cs
+++ b/src/NzbDrone.Api/NetImport/NetImportResource.cs
@@ -6,7 +6,7 @@ namespace NzbDrone.Api.ImportList
    public class ImportListResource : ProviderResource
    {
        public bool Enabled { get; set; }
-        public int EnableAuto { get; set; }
+        public bool EnableAuto { get; set; }
        public bool ShouldMonitor { get; set; }
        public string RootFolderPath { get; set; }
        public int ProfileId { get; set; }
--- a/src/NzbDrone.Api/ProviderModuleBase.cs
+++ b/src/NzbDrone.Api/ProviderModuleBase.cs
@@ -147,7 +147,7 @@ namespace NzbDrone.Api
        {
            var defaultDefinitions = _providerFactory.GetDefaultDefinitions().OrderBy(p => p.ImplementationName).ToList();

-            var result = new List<TProviderResource>(defaultDefinitions.Count);
+            var result = new List<TProviderResource>(defaultDefinitions.Count());

            foreach (var providerDefinition in defaultDefinitions)
            {
--- a/src/NzbDrone.Automation.Test/AutomationTest.cs
+++ b/src/NzbDrone.Automation.Test/AutomationTest.cs
@@ -42,8 +42,6 @@ namespace NzbDrone.Automation.Test
            // Timeout as windows automation tests seem to take alot longer to get going
            driver = new ChromeDriver(service, options, new TimeSpan(0, 3, 0));

-            driver.Manage().Window.Size = new System.Drawing.Size(1920, 1080);
-
            _runner = new NzbDroneRunner(LogManager.GetCurrentClassLogger());
            _runner.KillAll();
            _runner.Start();
@@ -64,19 +62,6 @@ namespace NzbDrone.Automation.Test
                .Select(e => e.Text);
        }

-        protected void TakeScreenshot(string name)
-        {
-            try
-            {
-                Screenshot image = ((ITakesScreenshot)driver).GetScreenshot();
-                image.SaveAsFile($"./{name}_test_screenshot.png", ScreenshotImageFormat.Png);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Failed to save screenshot {name}, {ex.Message}");
-            }
-        }
-
        [OneTimeTearDown]
        public void SmokeTestTearDown()
        {
--- a/src/NzbDrone.Automation.Test/MainPagesTest.cs
+++ b/src/NzbDrone.Automation.Test/MainPagesTest.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Automation.Test.PageModel;
 using OpenQA.Selenium;
@@ -22,10 +21,6 @@ namespace NzbDrone.Automation.Test
        {
            _page.MovieNavIcon.Click();
            _page.WaitForNoSpinner();
-
-            var imageName = MethodBase.GetCurrentMethod().Name;
-            TakeScreenshot(imageName);
-
            _page.Find(By.CssSelector("div[class*='MovieIndex']")).Should().NotBeNull();
        }

@@ -35,9 +30,6 @@ namespace NzbDrone.Automation.Test
            _page.CalendarNavIcon.Click();
            _page.WaitForNoSpinner();

-            var imageName = MethodBase.GetCurrentMethod().Name;
-            TakeScreenshot(imageName);
-
            _page.Find(By.CssSelector("div[class*='CalendarPage']")).Should().NotBeNull();
        }

@@ -47,9 +39,6 @@ namespace NzbDrone.Automation.Test
            _page.ActivityNavIcon.Click();
            _page.WaitForNoSpinner();

-            var imageName = MethodBase.GetCurrentMethod().Name;
-            TakeScreenshot(imageName);
-
            _page.Find(By.LinkText("Queue")).Should().NotBeNull();
            _page.Find(By.LinkText("History")).Should().NotBeNull();
            _page.Find(By.LinkText("Blacklist")).Should().NotBeNull();
@@ -61,9 +50,6 @@ namespace NzbDrone.Automation.Test
            _page.SystemNavIcon.Click();
            _page.WaitForNoSpinner();

-            var imageName = MethodBase.GetCurrentMethod().Name;
-            TakeScreenshot(imageName);
-
            _page.Find(By.CssSelector("div[class*='Health']")).Should().NotBeNull();
        }

@@ -72,11 +58,10 @@ namespace NzbDrone.Automation.Test
        {
            _page.MovieNavIcon.Click();
            _page.WaitForNoSpinner();
-            _page.Find(By.LinkText("Add New")).Click();
-            _page.WaitForNoSpinner();

-            var imageName = MethodBase.GetCurrentMethod().Name;
-            TakeScreenshot(imageName);
+            _page.Find(By.LinkText("Add New")).Click();
+
+            _page.WaitForNoSpinner();

            _page.Find(By.CssSelector("input[class*='AddNewMovie-searchInput']")).Should().NotBeNull();
        }
--- a/Show More
+++ b/Show More