Fix Tests from Site Image Changes

2026-03-18 16:24:34 -04:00 · 2021-02-02 22:36:32 -05:00
1061 changed files with 29918 additions and 24694 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -110,13 +110,13 @@ dotnet_diagnostic.SA1643.severity = none
 dotnet_diagnostic.SA1648.severity = none
 dotnet_diagnostic.SA1649.severity = none
 dotnet_diagnostic.SA1651.severity = none
+dotnet_diagnostic.SX1101.severity = warning
 dotnet_diagnostic.SX1309.severity = warning

 # Microsoft Analyzers that fail and need to be sorted thru
 dotnet_diagnostic.ASP0000.severity = suggestion
 dotnet_diagnostic.CA1000.severity = suggestion
 dotnet_diagnostic.CA1001.severity = suggestion
-dotnet_diagnostic.CA1002.severity = suggestion
 dotnet_diagnostic.CA1003.severity = suggestion
 dotnet_diagnostic.CA1008.severity = suggestion
 dotnet_diagnostic.CA1010.severity = suggestion
@@ -163,16 +163,10 @@ dotnet_diagnostic.CA1304.severity = suggestion
 dotnet_diagnostic.CA1305.severity = suggestion
 dotnet_diagnostic.CA1307.severity = suggestion
 dotnet_diagnostic.CA1308.severity = suggestion
-dotnet_diagnostic.CA1309.severity = suggestion
-dotnet_diagnostic.CA1310.severity = suggestion
 dotnet_diagnostic.CA1401.severity = suggestion
-dotnet_diagnostic.CA1416.severity = suggestion
 dotnet_diagnostic.CA1507.severity = suggestion
-dotnet_diagnostic.CA1508.severity = suggestion
 dotnet_diagnostic.CA1707.severity = suggestion
-dotnet_diagnostic.CA1708.severity = suggestion
 dotnet_diagnostic.CA1710.severity = suggestion
-dotnet_diagnostic.CA1711.severity = suggestion
 dotnet_diagnostic.CA1712.severity = suggestion
 dotnet_diagnostic.CA1714.severity = suggestion
 dotnet_diagnostic.CA1715.severity = suggestion
@@ -181,14 +175,12 @@ dotnet_diagnostic.CA1717.severity = suggestion
 dotnet_diagnostic.CA1720.severity = suggestion
 dotnet_diagnostic.CA1721.severity = suggestion
 dotnet_diagnostic.CA1724.severity = suggestion
-dotnet_diagnostic.CA1725.severity = suggestion
 dotnet_diagnostic.CA1801.severity = suggestion
 dotnet_diagnostic.CA1802.severity = suggestion
 dotnet_diagnostic.CA1805.severity = suggestion
 dotnet_diagnostic.CA1806.severity = suggestion
 dotnet_diagnostic.CA1810.severity = suggestion
 dotnet_diagnostic.CA1812.severity = suggestion
-dotnet_diagnostic.CA1813.severity = suggestion
 dotnet_diagnostic.CA1814.severity = suggestion
 dotnet_diagnostic.CA1815.severity = suggestion
 dotnet_diagnostic.CA1816.severity = suggestion
@@ -210,7 +202,6 @@ dotnet_diagnostic.CA2101.severity = suggestion
 dotnet_diagnostic.CA2119.severity = suggestion
 dotnet_diagnostic.CA2153.severity = suggestion
 dotnet_diagnostic.CA2200.severity = suggestion
-dotnet_diagnostic.CA2201.severity = suggestion
 dotnet_diagnostic.CA2207.severity = suggestion
 dotnet_diagnostic.CA2208.severity = suggestion
 dotnet_diagnostic.CA2211.severity = suggestion
@@ -256,8 +247,6 @@ dotnet_diagnostic.CA5374.severity = suggestion
 dotnet_diagnostic.CA5379.severity = suggestion
 dotnet_diagnostic.CA5384.severity = suggestion
 dotnet_diagnostic.CA5385.severity = suggestion
-dotnet_diagnostic.CA5392.severity = suggestion
-dotnet_diagnostic.CA5394.severity = suggestion
 dotnet_diagnostic.CA5397.severity = suggestion


--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug Report
+about: Support Requests will be closed immediately, if you are unsure go to our Reddit or Discord first. Exceptions do not mean you found a bug!
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Platform Information (please complete the following information):**
+ - OS: [e.g. Windows 10 2004 / Ubuntu 20.10]
+ - Docker: [Yes/No]
+ - Mono or.NET Core Version: [e.g. Mono 5.8 or .Net Core 3.1.10] (found under System -> Status)
+ - Browser and Version [e.g. chrome 86.0.4240.198] (Only needed for UI issues)
+ - Radarr Version [e.g. 3.0.0.2956]
+ - Radarr Branch [e.g. master]
+
+**Trace Logs**
+Turn on Trace logs under Settings -> General and wait for the bug to occur again. **Upload the full log file here (or another site (e.g. pastebin) and link it). Issues will be closed, if they do not include this!**
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,75 +0,0 @@
-name: Bug Report
-title: "[BUG]: "
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Reddit or Discord first'
-labels: ['Type: Bug', 'Status: Needs Triage']
-body:
- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
-      required: true
- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    placeholder: |
-      1. In this environment...
-      2. With this config...
-      3. Run '...'
-      4. See error...
-  validations:
-    required: false
- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      examples:
-        - **OS**: Ubuntu 20.04
-        - **Radarr**: Radarr 3.0.1.4259
-        - **Docker Install**: Yes
-        - **Using Reverse Proxy**: No
-        - **Browser**: Firefox 90 (If UI related)
-    value: |
-        - OS: 
-        - Radarr:
-        - Docker Install:
-        - Using Reverse Proxy:
-        - Browser:
-    render: markdown
-  validations:
-    required: true
- type: dropdown
-  attributes:
-    label: What branch are you running?
-    options:
-      - Master
-      - Develop
-      - Nightly
-      - Other (This issue will be closed)
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Trace Logs (https://wiki.servarr.com/radarr/troubleshooting#logging-and-log-files) 
-      Links? References? Anything that will give us more context about the issue you are encountering!
-      ***Generally speaking, all bug reports must have trace logs provided.***
-
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: true
--- 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://radarr.video/discord
+    url: https://discord.gg/r5wJPt9
    about: Chat with users and devs on support and setup related topics.
  - name: Support via Reddit
    url: https://reddit.com/r/radarr
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,39 +0,0 @@
-name: Feature Request
-title: "[FEAT]: "
-description: 'Suggest an idea for Radarr'
-labels: ['Type: Feature Request', 'Status: Needs Triage']
-body:
- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the feature you are requesting.
-    options:
-    - label: I have searched the existing issues
-      required: true
- type: textarea
-  attributes:
-    label: Is your feature request related to a problem? Please describe
-    description: A clear and concise description of what the problem is.
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Describe the solution you'd like
-    description: A clear and concise description of what you want to happen.
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Describe alternatives you've considered
-    description: A clear and concise description of any alternative solutions or features you've considered.
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? References? Mockups? Anything that will give us more context about the feature you are encountering!
-      
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: true
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +1,15 @@
 #### Database Migration
-YES - XXXX | NO
+YES | NO

 #### Description
-A few sentences describing the overall goals of the pull request's commits.

 #### Screenshot (if UI related)

 #### Todos
 - [ ] Tests
- [ ] Translation Keys (./src/NzbDrone.Core/Localization/Core/en.json)
- [ ] [Wiki Updates](https://wiki.servarr.com)
+- [ ] Translation Keys
+- [ ] Wiki Updates

 #### Issues Fixed or Closed by this PR

-* Fixes #XXXX
+* Fixes #XXXX
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -0,0 +1,2 @@
+todo:
+  keyword: "TODO"
--- a/.github/reaction.yml
+++ b/.github/reaction.yml
@@ -0,0 +1 @@
+
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -4,12 +4,13 @@ daysUntilStale: 60
 daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
-  - feature request #legacy
-  - 'Type: Feature Request'
-  - 'Status: Confirmed'
+  - feature request
+  - parser
+  - confirmed
  - sonarr-pull
  - lidarr-pull
  - readarr-pull
+  - v3
 # 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
@@ -0,0 +1,13 @@
+# Configuration for support-requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: support
+# Comment to post on issues marked as support requests. Add a link
+# 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)
+# Whether to close issues marked as support requests
+close: true
+# Whether to lock issues marked as support requests
+lock: false
--- a/.github/workflows/azuresync.yml
+++ b/.github/workflows/azuresync.yml
@@ -1,41 +0,0 @@
-name: Sync issue to Azure DevOps work item
-
-on:
-  issues:
-    types:
-      [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned]
-
-concurrency: azuresync-${{ github.event.issue.number }}
-
-jobs:
-  alert:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: danhellem/github-actions-issue-to-work-item@master
-        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == true }}"
-        env:
-          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ github.token }}"
-          ado_organization: "Servarr"
-          ado_project: "Servarr"
-          ado_area_path: "Servarr\\Radarr"
-          ado_wit: "Bug"
-          ado_new_state: "New"
-          ado_active_state: "Active"
-          ado_close_state: "Closed"
-          ado_bypassrules: true
-          log_level: 100
-      - uses: danhellem/github-actions-issue-to-work-item@master
-        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == false }}"
-        env:
-          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ github.token }}"
-          ado_organization: "Servarr"
-          ado_project: "Servarr"
-          ado_area_path: "Servarr\\Radarr"
-          ado_wit: "User Story"
-          ado_new_state: "New"
-          ado_active_state: "Active"
-          ado_close_state: "Closed"
-          ado_bypassrules: true
-          log_level: 100
--- a/.github/workflows/support.yml
+++ b/.github/workflows/support.yml
@@ -1,21 +0,0 @@
-name: 'Support requests'
-
-on:
-  issues:
-    types: [labeled, unlabeled, reopened]
-
-jobs:
-  support:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/support-requests@v2
-        with:
-          github-token: ${{ github.token }}
-          support-label: 'Type: Support'
-          issue-comment: >
-            :wave: @{issue-author}, 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://radarr.video/discord) 
-            or [Subreddit](https://reddit.com/r/radarr)
-          close-issue: true
-          lock-issue: false
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,49 @@
-# How to Contribute
+# How to Contribute #

 We're always looking for people to help make Radarr even better, there are a number of ways to contribute.

-This file has been moved to the wiki for the latest details please see the [contributing wiki page](https://wiki.servarr.com/radarr/contributing).
+## Documentation ##
+Setup guides, FAQ, the more information we have on the [wiki](https://wiki.servarr.com/Radarr) the better.

-## Documentation
+## Development ##

-Setup guides, [FAQ](https://wiki.servarr.com/radarr/faq), the more information we have on the [wiki](https://wiki.servarr.com/radarr) the better.
+### Tools required ###
+- Visual Studio 2019 or higher (https://www.visualstudio.com/vs/).  The community version is free and works (https://www.visualstudio.com/downloads/).
+- HTML/Javascript editor of choice (VS Code/Sublime Text/Webstorm/Atom/etc)
+- [Git](https://git-scm.com/downloads)
+- [NodeJS](https://nodejs.org/en/download/) (Node 10.X.X or higher)
+- [Yarn](https://yarnpkg.com/)
+- .NET Core 3.1. 

-## Development
+### Getting started ###

-See the [Wiki Page](https://wiki.servarr.com/radarr/contributing)
+1. Fork Radarr
+2. Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
+3. Install the required Node Packages `yarn install`
+4. Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
+5. Build the project in Visual Studio, Setting startup project to `Radarr.Console` and framework to `netcoreapp31`
+6. Debug the project in Visual Studio
+7. Open http://localhost:7878
+
+### Contributing Code ###
+- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Radarr/Radarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
+- 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
+- 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
+- Use 4 spaces instead of tabs, this is the default for VS 2019 and WebStorm (to my knowledge)
+
+### Pull Requesting ###
+- Only make pull requests to develop, never master, if you make a PR to master we'll comment on it and close it
+- You're probably going to get some comments or questions from us, they will be to ensure consistency and maintainability
+- We'll try to respond to pull requests as soon as possible, if its been a day or two, please reach out to us, we may have missed it
+- Each PR should come from its own [feature branch](http://martinfowler.com/bliki/FeatureBranch.html) not develop in your fork, it should have a meaningful branch name (what is being added/fixed)
+  - new-feature (Good)
+  - fix-bug (Good)
+  - patch (Bad)
+  - develop (Bad)
+
+If you have any questions about any of this, please let us know.
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![Build Status](https://dev.azure.com/Radarr/Radarr/_apis/build/status/Radarr.Radarr?branchName=develop)](https://dev.azure.com/Radarr/Radarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/radarr/-/radarr/svg-badge.svg)](https://translate.servarr.com/engage/radarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/radarr/installation#docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/Radarr_Installation#Docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg)
 [![Backers on Open Collective](https://opencollective.com/Radarr/backers/badge.svg)](#backers) 
 [![Sponsors on Open Collective](https://opencollective.com/Radarr/sponsors/badge.svg)](#sponsors)
@@ -31,10 +31,14 @@ Radarr is a movie collection manager for Usenet and BitTorrent users. It can mon
 ## Support
 Note: GitHub Issues are for Bugs and Feature Requests Only

-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://radarr.video/discord)
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://discord.gg/r5wJPt9)
 [![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Radarr)
 [![GitHub - Bugs and Feature Requests Only](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Radarr/Radarr/issues)
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/radarr)
+[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/Radarr)
+
+## Feature Requests
+
+[Feature Requests](https://github.com/Radarr/Radarr/issues/new?assignees=&labels=Type%3A+Enhancement&template=feature_request.md&title=)

 ## Contributors & Developers
 [API Documentation](https://radarr.video/docs/api/)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,13 +7,13 @@ variables:
  outputFolder: './_output'
  artifactsFolder: './_artifacts'
  testsFolder: './_tests'
-  majorVersion: '4.0.0'
+  majorVersion: '3.0.2'
  minorVersion: $[counter('minorVersion', 2000)]
  radarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(radarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '5.0.401'
+  dotnetVersion: '3.1.404'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn

 trigger:
@@ -23,12 +23,7 @@ trigger:
    - master

 pr:
-  branches:
-    include:
-    - develop
-  paths:
-    exclude:
-    - src/NzbDrone.Core/Localization/Core
+- develop

 stages:
  - stage: Setup
@@ -64,21 +59,18 @@ stages:
          Linux:
            osName: 'Linux'
            imageName: 'ubuntu-18.04'
-            enableAnalysis: 'true'
          Mac:
            osName: 'Mac'
-            imageName: 'macos-10.15'
-            enableAnalysis: 'false'
+            imageName: 'macos-10.14'
          Windows:
            osName: 'Windows'
            imageName: 'windows-2019'
-            enableAnalysis: 'false'

      pool:
        vmImage: $(imageName)
      variables:
        # Disable stylecop here - linting errors get caught by the analyze task
-        EnableAnalyzers: $(enableAnalysis)
+        EnableAnalyzers: 'false'
      steps:
      - checkout: self
        submodules: true
@@ -87,18 +79,7 @@ stages:
        displayName: 'Install .net core'
        inputs:
          version: $(dotnetVersion)
-      - bash: |
-          BUNDLEDVERSIONS=${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}/Microsoft.NETCoreSdk.BundledVersions.props
-          echo $BUNDLEDVERSIONS
-          grep osx-x64 $BUNDLEDVERSIONS
-          if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-            echo "BSD already enabled"
-          else
-            echo "Enabling BSD support"
-            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' $BUNDLEDVERSIONS
-          fi
-        displayName: Enable FreeBSD Support
-      - bash: ./build.sh --backend --enable-bsd
+      - bash: ./build.sh --backend
        displayName: Build Radarr Backend
      - bash: |
          find ${OUTPUTFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
@@ -111,23 +92,23 @@ stages:
        artifact: '$(osName)Backend'
        displayName: Publish Backend
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/win-x64/publish'
+      - publish: '$(testsFolder)/netcoreapp3.1/win-x64/publish'
        artifact: WindowsCoreTests
        displayName: Publish Windows Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/linux-x64/publish'
+      - publish: '$(testsFolder)/net462/linux-x64/publish'
+        artifact: LinuxTests
+        displayName: Publish Linux Mono Test Package
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      - publish: '$(testsFolder)/netcoreapp3.1/linux-x64/publish'
        artifact: LinuxCoreTests
        displayName: Publish Linux Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/linux-musl-x64/publish'
+      - publish: '$(testsFolder)/netcoreapp3.1/linux-musl-x64/publish'
        artifact: LinuxMuslCoreTests
        displayName: Publish Linux Musl Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/freebsd-x64/publish'
-        artifact: FreebsdCoreTests
-        displayName: Publish FreeBSD Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/osx-x64/publish'
+      - publish: '$(testsFolder)/netcoreapp3.1/osx-x64/publish'
        artifact: MacCoreTests
        displayName: Publish MacOS Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
@@ -144,7 +125,7 @@ stages:
            imageName: 'ubuntu-18.04'
          Mac:
            osName: 'Mac'
-            imageName: 'macos-10.15'
+            imageName: 'macos-10.14'
          Windows:
            osName: 'Windows'
            imageName: 'windows-2019'
@@ -154,7 +135,7 @@ stages:
      - task: NodeTool@0
        displayName: Set Node.js version
        inputs:
-          versionSpec: '12.x'
+          versionSpec: '10.x'
      - checkout: self
        submodules: true
        fetchDepth: 1
@@ -203,12 +184,12 @@ stages:
      - bash: ./build.sh --packages
        displayName: Create Packages
      - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net5.0 //DRuntime=win-x86
-          cp setup/output/Radarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x86
+          cp setup/output/Radarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
        displayName: Create .NET Core Windows installer
      - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net5.0 //DRuntime=win-x64
-          cp setup/output/Radarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x64
+          cp setup/output/Radarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
        displayName: Create .NET Core Windows installer
      - publish: $(Build.ArtifactStagingDirectory)
        artifact: 'WindowsInstaller'
@@ -238,10 +219,9 @@ stages:
          artifactName: WindowsFrontend
          targetPath: _output
        displayName: Fetch Frontend
-      - bash: ./build.sh --packages --enable-bsd
+      - bash: ./build.sh --packages
        displayName: Create Packages
      - bash: |
-          find . -name "ffprobe" -exec chmod a+x {} \;
          find . -name "Radarr" -exec chmod a+x {} \;
          find . -name "Radarr.Update" -exec chmod a+x {} \;
        displayName: Set executable bits
@@ -251,21 +231,21 @@ stages:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x64.zip'
          archiveType: 'zip'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/win-x64/netcoreapp3.1
      - task: ArchiveFiles@2
        displayName: Create Windows x86 Core zip
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x86.zip'
          archiveType: 'zip'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x86/net5.0
+          rootFolderOrFile: $(artifactsFolder)/win-x86/netcoreapp3.1
      - task: ArchiveFiles@2
        displayName: Create MacOS Core app
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).osx-app-core-x64.zip'
          archiveType: 'zip'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/macos-app/net5.0
+          rootFolderOrFile: $(artifactsFolder)/macos-app/netcoreapp3.1
      - task: ArchiveFiles@2
        displayName: Create MacOS Core tar
        inputs:
@@ -273,7 +253,15 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/macos/net5.0
+          rootFolderOrFile: $(artifactsFolder)/macos/netcoreapp3.1
+      - task: ArchiveFiles@2
+        displayName: Create Linux Mono tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).linux.tar.gz'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/linux-x64/net462
      - task: ArchiveFiles@2
        displayName: Create Linux Core tar
        inputs:
@@ -281,7 +269,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-x64/netcoreapp3.1
      - task: ArchiveFiles@2
        displayName: Create Linux Musl Core tar
        inputs:
@@ -289,7 +277,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/netcoreapp3.1
      - task: ArchiveFiles@2
        displayName: Create ARM32 Linux Core tar
        inputs:
@@ -297,7 +285,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm/netcoreapp3.1
      - task: ArchiveFiles@2
        displayName: Create ARM64 Linux Core tar
        inputs:
@@ -305,7 +293,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm64/netcoreapp3.1
      - task: ArchiveFiles@2
        displayName: Create ARM64 Linux Musl Core tar
        inputs:
@@ -313,15 +301,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net5.0
-      - task: ArchiveFiles@2
-        displayName: Create FreeBSD Core Core tar
-        inputs:
-          archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).freebsd-core-x64.tar.gz'
-          archiveType: 'tar'
-          tarCompression: 'gz'
-          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/netcoreapp3.1
      - publish: $(Build.ArtifactStagingDirectory)
        artifact: 'Packages'
        displayName: Publish Packages
@@ -375,34 +355,24 @@ stages:
      displayName: Unit Native
      dependsOn: Prepare
      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      workspace:
-        clean: all

      strategy:
        matrix:
          MacCore:
            osName: 'Mac'
            testName: 'MacCore'
-            poolName: 'Azure Pipelines'
-            imageName: 'macos-10.15'
+            imageName: 'macos-10.14'
          WindowsCore:
            osName: 'Windows'
            testName: 'WindowsCore'
-            poolName: 'Azure Pipelines'
            imageName: 'windows-2019'
          LinuxCore:
            osName: 'Linux'
            testName: 'LinuxCore'
-            poolName: 'Azure Pipelines'
            imageName: 'ubuntu-18.04'
-          FreebsdCore:
-            osName: 'Linux'
-            testName: 'FreebsdCore'
-            poolName: 'FreeBSD'
-            imageName:
+            pattern: 'Radarr.**.linux-core-x64.tar.gz'

      pool:
-        name: $(poolName)
        vmImage: $(imageName)

      steps:
@@ -411,20 +381,30 @@ stages:
        displayName: 'Install .net core'
        inputs:
          version: $(dotnetVersion)
-        condition: ne(variables['poolName'], 'FreeBSD')
      - task: DownloadPipelineArtifact@2
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
          artifactName: '$(testName)Tests'
          targetPath: $(testsFolder)
+      - bash: |
+          wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-11_all.deb
+          sudo dpkg -i repo-mediaarea_1.0-11_all.deb
+          sudo apt-get update
+          sudo apt-get install -y --allow-unauthenticated libmediainfo-dev libmediainfo0v5 mediainfo
+        displayName: Install mediainfo
+        condition: and(succeeded(), eq(variables['osName'], 'Linux'))
      - powershell: Set-Service SCardSvr -StartupType Manual
        displayName: Enable Windows Test Service
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
      - bash: |
-          chmod a+x _tests/ffprobe
-        displayName: Make ffprobe Executable
-        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
+          SYMLINK=6_6_0
+          MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
+          echo "##vso[task.setvariable variable=MONOPREFIX;]$MONOPREFIX"
+          echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+          echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+        displayName: Set Mono Version
+        condition: and(succeeded(), eq(variables['osName'], 'Mac'))
      - bash: find ${TESTSFOLDER} -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
        displayName: Make Test Dummy Executable
        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
@@ -448,10 +428,22 @@ stages:
      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
      strategy:
        matrix:
+          mono520:
+            testName: 'Mono 5.20'
+            artifactName: LinuxTests
+            containerImage: servarr/testimages:mono-5.20
+          mono610:
+            testName: 'Mono 6.10'
+            artifactName: LinuxTests
+            containerImage: servarr/testimages:mono-6.10
+          mono612:
+            testName: 'Mono 6.12'
+            artifactName: LinuxTests
+            containerImage: servarr/testimages:mono-6.12
          alpine:
            testName: 'Musl Net Core'
            artifactName: LinuxMuslCoreTests
-            containerImage: ghcr.io/servarr/testimages:alpine
+            containerImage: servarr/testimages:alpine

      pool:
        vmImage: 'ubuntu-18.04'
@@ -472,9 +464,6 @@ stages:
          buildType: 'current'
          artifactName: $(artifactName)
          targetPath: $(testsFolder)
-      - bash: |
-          chmod a+x _tests/ffprobe
-        displayName: Make ffprobe Executable
      - bash: find ${TESTSFOLDER} -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
        displayName: Make Test Dummy Executable
        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
@@ -518,23 +507,31 @@ stages:
          MacCore:
            osName: 'Mac'
            testName: 'MacCore'
-            imageName: 'macos-10.15'
-            pattern: 'Radarr.*.osx-core-x64.tar.gz'
+            imageName: 'macos-10.14'
+            pattern: 'Radarr.**.osx-core-x64.tar.gz'
          WindowsCore:
            osName: 'Windows'
            testName: 'WindowsCore'
            imageName: 'windows-2019'
-            pattern: 'Radarr.*.windows-core-x64.zip'
+            pattern: 'Radarr.**.windows-core-x64.zip'
          LinuxCore:
            osName: 'Linux'
            testName: 'LinuxCore'
            imageName: 'ubuntu-18.04'
-            pattern: 'Radarr.*.linux-core-x64.tar.gz'
+            pattern: 'Radarr.**.linux-core-x64.tar.gz'

      pool:
        vmImage: $(imageName)
        
      steps:
+      - bash: |
+          SYMLINK=6_6_0
+          MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
+          echo "##vso[task.setvariable variable=MONOPREFIX;]$MONOPREFIX"
+          echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+          echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+        displayName: Set Mono Version
+        condition: and(succeeded(), eq(variables['osName'], 'Mac'))
      - task: UseDotNet@2
        displayName: 'Install .net core'
        inputs:
@@ -574,63 +571,32 @@ stages:
          failTaskOnFailedTests: true
        displayName: Publish Test Results

-    - job: Integration_FreeBSD
-      displayName: Integration Native FreeBSD
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      workspace:
-        clean: all
-      variables:
-        pattern: 'Radarr.*.freebsd-core-x64.tar.gz'
-      pool:
-        name: 'FreeBSD'
-
-      steps:
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Test Artifact
-        inputs:
-          buildType: 'current'
-          artifactName: 'FreebsdCoreTests'
-          targetPath: $(testsFolder)
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Build Artifact
-        inputs:
-          buildType: 'current'
-          artifactName: Packages
-          itemPattern: '/$(pattern)'
-          targetPath: $(Build.ArtifactStagingDirectory)
-      - bash: |
-          mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
-          tar xf ${BUILD_ARTIFACTSTAGINGDIRECTORY}/$(pattern) -C ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
-        displayName: Extract Package
-      - bash: |
-          mkdir -p ./bin/
-          cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Radarr/. ./bin/
-        displayName: Move Package Contents
-      - bash: |
-          chmod a+x ${TESTSFOLDER}/test.sh
-          ${TESTSFOLDER}/test.sh Linux Integration Test
-        displayName: Run Integration Tests
-      - task: PublishTestResults@2
-        inputs:
-          testResultsFormat: 'NUnit'
-          testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'FreeBSD Integration Tests'
-          failTaskOnFailedTests: true
-        displayName: Publish Test Results
-
    - job: Integration_Docker
      displayName: Integration Docker
      dependsOn: Prepare
      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
      strategy:
        matrix:
+          mono520:
+            testName: 'Mono 5.20'
+            artifactName: LinuxTests
+            containerImage: servarr/testimages:mono-5.20
+            pattern: 'Radarr.**.linux.tar.gz'
+          mono610:
+            testName: 'Mono 6.10'
+            artifactName: LinuxTests
+            containerImage: servarr/testimages:mono-6.10
+            pattern: 'Radarr.**.linux.tar.gz'
+          mono612:
+            testName: 'Mono 6.12'
+            artifactName: LinuxTests
+            containerImage: servarr/testimages:mono-6.12
+            pattern: 'Radarr.**.linux.tar.gz'
          alpine:
            testName: 'Musl Net Core'
            artifactName: LinuxMuslCoreTests
-            containerImage: ghcr.io/servarr/testimages:alpine
-            pattern: 'Radarr.*.linux-musl-core-x64.tar.gz'
+            containerImage: servarr/testimages:alpine
+            pattern: 'Radarr.**.linux-musl-core-x64.tar.gz'
      pool:
        vmImage: 'ubuntu-18.04'

@@ -689,17 +655,17 @@ stages:
          Linux:
            osName: 'Linux'
            imageName: 'ubuntu-18.04'
-            pattern: 'Radarr.*.linux-core-x64.tar.gz'
+            pattern: 'Radarr.**.linux-core-x64.tar.gz'
            failBuild: true
          Mac:
            osName: 'Mac'
-            imageName: 'macos-10.15'
-            pattern: 'Radarr.*.osx-core-x64.tar.gz'
+            imageName: 'macos-10.14'
+            pattern: 'Radarr.**.osx-core-x64.tar.gz'
            failBuild: true
          Windows:
            osName: 'Windows'
            imageName: 'windows-2019'
-            pattern: 'Radarr.*.windows-core-x64.zip'
+            pattern: 'Radarr.**.windows-core-x64.zip'
            failBuild: true

      pool:
@@ -791,7 +757,7 @@ stages:
      - task: NodeTool@0
        displayName: Set Node.js version
        inputs:
-          versionSpec: '12.x'
+          versionSpec: '10.x'
      - checkout: self
        submodules: true
        fetchDepth: 1
@@ -837,7 +803,6 @@ stages:

      variables:
        disable.coverage.autogenerate: 'true'
-        EnableAnalyzers: 'false'

      pool:
        vmImage: windows-2019
@@ -862,12 +827,12 @@ stages:
          projectVersion: '$(radarrVersion)'
          extraProperties: |
            sonar.exclusions=**/obj/**,**/*.dll,**/NzbDrone.Core.Test/Files/**/*,./frontend/**,**/ExternalModules/**,./src/Libraries/**
-            sonar.coverage.exclusions=**/Radarr.Api.V3/**/*
+            sonar.coverage.exclusions=**/Radarr.Api.V3/**/*,**/NzbDrone.Api/**/*,**/MonoTorrent/**/*,**/Marr.Data/**/*
            sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
            sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
      - bash: |
-          ./build.sh --backend -f net5.0 -r win-x64
-          TEST_DIR=_tests/net5.0/win-x64/publish/ ./test.sh Windows Unit Coverage
+          ./build.sh --backend -f netcoreapp3.1 -r win-x64
+          TEST_DIR=_tests/netcoreapp3.1/win-x64/publish/ ./test.sh Windows Unit Coverage
        displayName: Coverage Unit Tests
      - task: SonarCloudAnalyze@1
        condition: eq(variables['System.PullRequest.IsFork'], 'False')
@@ -897,7 +862,7 @@ stages:
    - job:
      displayName: Discord Notification
      pool:
-        vmImage: 'ubuntu-18.04'
+        vmImage: 'windows-2019'
      steps:
        - task: DownloadPipelineArtifact@2
          continueOnError: true
@@ -907,7 +872,7 @@ stages:
            artifactName: 'WindowsAutomationScreenshots'
            targetPath: $(Build.SourcesDirectory)
        - checkout: none
-        - pwsh: |
+        - powershell: |
            iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Servarr/AzureDiscordNotify/master/DiscordNotify.ps1'))
          env:
            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#! /bin/bash
 set -e

 outputFolder='_output'
@@ -25,17 +25,6 @@ UpdateVersionNumber()
    fi
 }

-EnableBsdSupport()
-{
-    #todo enable sdk with
-    #SDK_PATH=$(dotnet --list-sdks | grep -P '5\.\d\.\d+' | head -1 | sed 's/\(5\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
-    # BUNDLED_VERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
-
-    if grep -qv freebsd-x64 src/Directory.Build.props; then
-        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64</RuntimeIdentifiers>^g" src/Directory.Build.props
-    fi
-}
-
 LintUI()
 {
    ProgressStart 'ESLint'
@@ -86,11 +75,11 @@ YarnInstall()
    ProgressEnd 'yarn install'
 }

-RunWebpack()
+RunGulp()
 {
-    ProgressStart 'Running webpack'
-    yarn run build --env production
-    ProgressEnd 'Running webpack'
+    ProgressStart 'Running gulp'
+    yarn run build --production
+    ProgressEnd 'Running gulp'
 }

 PackageFiles()
@@ -129,7 +118,7 @@ PackageLinux()

    echo "Adding Radarr.Mono to UpdatePackage"
    cp $folder/Radarr.Mono.* $folder/Radarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "netcoreapp3.1" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Radarr.Update
    fi
@@ -147,6 +136,11 @@ PackageMacOS()

    PackageFiles "$folder" "$framework" "osx-x64"

+    if [ "$framework" = "net462" ]; then
+        echo "Adding Startup script"
+        cp macOS/Radarr $folder
+    fi
+
    echo "Removing Service helpers"
    rm -f $folder/ServiceUninstall.*
    rm -f $folder/ServiceInstall.*
@@ -156,7 +150,7 @@ PackageMacOS()

    echo "Adding Radarr.Mono to UpdatePackage"
    cp $folder/Radarr.Mono.* $folder/Radarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "netcoreapp3.1" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Radarr.Update
    fi
@@ -196,7 +190,6 @@ PackageWindows()
    local folder=$artifactsFolder/$runtime/$framework/Radarr
    
    PackageFiles "$folder" "$framework" "$runtime"
-    cp -r $outputFolder/$framework-windows/$runtime/publish/* $folder

    echo "Removing Radarr.Mono"
    rm -f $folder/Radarr.Mono.*
@@ -218,7 +211,7 @@ Package()
    IFS='-' read -ra SPLIT <<< "$runtime"

    case "${SPLIT[0]}" in
-        linux|freebsd*)
+        linux)
            PackageLinux "$framework" "$runtime"
            ;;
        win)
@@ -263,7 +256,6 @@ if [ $# -eq 0 ]; then
    FRONTEND=YES
    PACKAGES=YES
    LINT=YES
-    ENABLE_BSD=NO
 fi

 while [[ $# -gt 0 ]]
@@ -275,10 +267,6 @@ case $key in
        BACKEND=YES
        shift # past argument
        ;;
-    --enable-bsd)
-        ENABLE_BSD=YES
-        shift # past argument
-        ;;
    -r|--runtime)
        RID="$2"
        shift # past argument
@@ -319,22 +307,15 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
 if [ "$BACKEND" = "YES" ];
 then
    UpdateVersionNumber
-    if [ "$ENABLE_BSD" = "YES" ];
-    then
-        EnableBsdSupport
-    fi
    Build
    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
-        PackageTests "net5.0" "win-x64"
-        PackageTests "net5.0" "win-x86"
-        PackageTests "net5.0" "linux-x64"
-        PackageTests "net5.0" "linux-musl-x64"
-        PackageTests "net5.0" "osx-x64"
-        if [ "$ENABLE_BSD" = "YES" ];
-        then
-            PackageTests "net5.0" "freebsd-x64"
-        fi
+        PackageTests "netcoreapp3.1" "win-x64"
+        PackageTests "netcoreapp3.1" "win-x86"
+        PackageTests "netcoreapp3.1" "linux-x64"
+        PackageTests "netcoreapp3.1" "linux-musl-x64"
+        PackageTests "netcoreapp3.1" "osx-x64"
+        PackageTests "net462" "linux-x64"
    else
        PackageTests "$FRAMEWORK" "$RID"
    fi
@@ -343,7 +324,7 @@ fi
 if [ "$FRONTEND" = "YES" ];
 then
    YarnInstall
-    RunWebpack
+    RunGulp
 fi

 if [ "$LINT" = "YES" ];
@@ -362,18 +343,15 @@ then

    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
-        Package "net5.0" "win-x64"
-        Package "net5.0" "win-x86"
-        Package "net5.0" "linux-x64"
-        Package "net5.0" "linux-musl-x64"
-        Package "net5.0" "linux-arm64"
-        Package "net5.0" "linux-musl-arm64"
-        Package "net5.0" "linux-arm"
-        Package "net5.0" "osx-x64"
-        if [ "$ENABLE_BSD" = "YES" ];
-        then
-            Package "net5.0" "freebsd-x64"
-        fi
+        Package "netcoreapp3.1" "win-x64"
+        Package "netcoreapp3.1" "win-x86"
+        Package "netcoreapp3.1" "linux-x64"
+        Package "netcoreapp3.1" "linux-musl-x64"
+        Package "netcoreapp3.1" "linux-arm64"
+        Package "netcoreapp3.1" "linux-musl-arm64"
+        Package "netcoreapp3.1" "linux-arm"
+        Package "netcoreapp3.1" "osx-x64"
+        Package "net462" "linux-x64"
    else
        Package "$FRAMEWORK" "$RID"
    fi
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -6,10 +6,8 @@ const dirs = fs
  .map((dirent) => dirent.name)
  .join('|');

-const frontendFolder = __dirname;
-
 module.exports = {
-  parser: '@babel/eslint-parser',
+  parser: 'babel-eslint',

  env: {
    browser: true,
@@ -27,9 +25,6 @@ module.exports = {
  parserOptions: {
    ecmaVersion: 6,
    sourceType: 'module',
-    babelOptions: {
-      configFile: `${frontendFolder}/babel.config.js`
-    },
    ecmaFeatures: {
      modules: true,
      impliedStrict: true
@@ -276,7 +271,7 @@ module.exports = {

    // ImportSort

-    'simple-import-sort/imports': 'error',
+    'simple-import-sort/sort': 'error',
    'import/newline-after-import': 'error',

    // React
@@ -314,7 +309,7 @@ module.exports = {
    {
      files: ['*.js'],
      rules: {
-        'simple-import-sort/imports': [
+        'simple-import-sort/sort': [
          'error',
          {
            groups: [
--- a/frontend/.stylelintrc
+++ b/frontend/.stylelintrc
@@ -4,7 +4,6 @@
 ],
 "ignoreFiles": [
  "frontend/src/Styles/scaffolding.css",
-  "**/Theme.Park/**/*.css",
  "**/*.js"
 ],
 "rules": {
--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@@ -1,297 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const FileManagerPlugin = require('filemanager-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const LiveReloadPlugin = require('webpack-livereload-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-
-module.exports = (env) => {
-  const uiFolder = 'UI';
-  const frontendFolder = path.join(__dirname, '..');
-  const srcFolder = path.join(frontendFolder, 'src');
-  const isProduction = !!env.production;
-  const isProfiling = isProduction && !!env.profile;
-  const inlineWebWorkers = 'no-fallback';
-
-  const distFolder = path.resolve(frontendFolder, '..', '_output', uiFolder);
-
-  console.log('Source Folder:', srcFolder);
-  console.log('Output Folder:', distFolder);
-  console.log('isProduction:', isProduction);
-  console.log('isProfiling:', isProfiling);
-
-  const config = {
-    mode: isProduction ? 'production' : 'development',
-    devtool: isProduction ? 'source-map' : 'eval-source-map',
-
-    stats: {
-      children: false
-    },
-
-    watchOptions: {
-      ignored: /node_modules/
-    },
-
-    entry: {
-      index: 'index.js'
-    },
-
-    resolve: {
-      modules: [
-        srcFolder,
-        path.join(srcFolder, 'Shims'),
-        'node_modules'
-      ],
-      alias: {
-        jquery: 'jquery/src/jquery'
-      },
-      fallback: {
-        buffer: false,
-        http: false,
-        https: false,
-        url: false,
-        util: false,
-        net: false
-      }
-    },
-
-    output: {
-      path: distFolder,
-      publicPath: '/',
-      filename: '[name].js',
-      sourceMapFilename: '[file].map'
-    },
-
-    optimization: {
-      moduleIds: 'deterministic',
-      chunkIds: 'named',
-      splitChunks: {
-        chunks: 'initial',
-        name: 'vendors'
-      }
-    },
-
-    performance: {
-      hints: false
-    },
-
-    plugins: [
-      new webpack.DefinePlugin({
-        __DEV__: !isProduction,
-        'process.env.NODE_ENV': isProduction ? JSON.stringify('production') : JSON.stringify('development')
-      }),
-
-      new MiniCssExtractPlugin({
-        filename: 'Content/styles.css'
-      }),
-
-      new HtmlWebpackPlugin({
-        template: 'frontend/src/index.ejs',
-        filename: 'index.html',
-        publicPath: '/'
-      }),
-
-      new FileManagerPlugin({
-        events: {
-          onEnd: {
-            copy: [
-              // HTML
-              {
-                source: 'frontend/src/*.html',
-                destination: distFolder
-              },
-
-              // Fonts
-              {
-                source: 'frontend/src/Content/Fonts/*.*',
-                destination: path.join(distFolder, 'Content/Fonts')
-              },
-
-              // Icon Images
-              {
-                source: 'frontend/src/Content/Images/Icons/*.*',
-                destination: path.join(distFolder, 'Content/Images/Icons')
-              },
-
-              // Images
-              {
-                source: 'frontend/src/Content/Images/*.*',
-                destination: path.join(distFolder, 'Content/Images')
-              },
-
-              // Robots
-              {
-                source: 'frontend/src/Content/robots.txt',
-                destination: path.join(distFolder, 'Content/robots.txt')
-              },
-
-              // Theme.Park
-              {
-                source: 'frontend/src/Content/Theme.Park/*',
-                destination: path.join(distFolder, 'Content/Theme.Park')
-              },
-              {
-                source: 'frontend/src/Content/Theme.Park/Themes/*',
-                destination: path.join(distFolder, 'Content/Theme.Park/Themes')
-              },
-              {
-                source: 'frontend/src/Content/Theme.Park/Resources/*',
-                destination: path.join(distFolder, 'Content/Theme.Park/Resources')
-              }
-            ]
-          }
-        }
-      }),
-
-      new LiveReloadPlugin()
-    ],
-
-    resolveLoader: {
-      modules: [
-        'node_modules',
-        'frontend/build/webpack/'
-      ]
-    },
-
-    module: {
-      rules: [
-        {
-          test: /\.worker\.js$/,
-          use: {
-            loader: 'worker-loader',
-            options: {
-              filename: '[name].js',
-              inline: inlineWebWorkers
-            }
-          }
-        },
-        {
-          test: /\.js?$/,
-          exclude: /(node_modules|JsLibraries)/,
-          use: [
-            {
-              loader: 'babel-loader',
-              options: {
-                configFile: `${frontendFolder}/babel.config.js`,
-                envName: isProduction ? 'production' : 'development',
-                presets: [
-                  [
-                    '@babel/preset-env',
-                    {
-                      modules: false,
-                      loose: true,
-                      debug: false,
-                      useBuiltIns: 'entry',
-                      corejs: 3
-                    }
-                  ]
-                ]
-              }
-            }
-          ]
-        },
-
-        // CSS Modules
-        {
-          test: /\.css$/,
-          exclude: /(node_modules|globals.css)/,
-          use: [
-            { loader: MiniCssExtractPlugin.loader },
-            {
-              loader: 'css-loader',
-              options: {
-                importLoaders: 1,
-                modules: {
-                  localIdentName: '[name]/[local]/[hash:base64:5]'
-                }
-              }
-            },
-            {
-              loader: 'postcss-loader',
-              options: {
-                postcssOptions: {
-                  config: 'frontend/postcss.config.js'
-                }
-              }
-            }
-          ]
-        },
-
-        // Global styles
-        {
-          test: /\.css$/,
-          include: /(node_modules|globals.css)/,
-          use: [
-            'style-loader',
-            {
-              loader: 'css-loader'
-            }
-          ]
-        },
-
-        // Fonts
-        {
-          test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-          use: [
-            {
-              loader: 'url-loader',
-              options: {
-                limit: 10240,
-                mimetype: 'application/font-woff',
-                emitFile: false,
-                name: 'Content/Fonts/[name].[ext]'
-              }
-            }
-          ]
-        },
-
-        {
-          test: /\.(ttf|eot|eot?#iefix|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-          use: [
-            {
-              loader: 'file-loader',
-              options: {
-                emitFile: false,
-                name: 'Content/Fonts/[name].[ext]'
-              }
-            }
-          ]
-        },
-
-        {
-          test: /\.(png)?$/,
-          use: [
-            {
-              loader: 'file-loader',
-              options: {
-                emitFile: false,
-                name: 'Content/Theme.Park/Resources/[name].[ext]'
-              }
-            }
-          ]
-        }
-      ]
-    }
-  };
-
-  if (isProfiling) {
-    config.resolve.alias['react-dom$'] = 'react-dom/profiling';
-    config.resolve.alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
-
-    config.optimization.minimizer = [
-      new TerserPlugin({
-        cache: true,
-        parallel: true,
-        sourceMap: true, // Must be set to true if using source-maps in production
-        terserOptions: {
-          mangle: false,
-          keep_classnames: true,
-          keep_fnames: true
-        }
-      })
-    ];
-  }
-
-  return config;
-};
--- a/frontend/gulp/build.js
+++ b/frontend/gulp/build.js
@@ -0,0 +1,18 @@
+const gulp = require('gulp');
+
+require('./clean');
+require('./copy');
+require('./webpack');
+
+gulp.task('build',
+  gulp.series('clean',
+    gulp.parallel(
+      'webpack',
+      'copyHtml',
+      'copyFonts',
+      'copyImages',
+      'copyRobots'
+    )
+  )
+);
+
--- a/frontend/gulp/clean.js
+++ b/frontend/gulp/clean.js
@@ -0,0 +1,8 @@
+const gulp = require('gulp');
+const del = require('del');
+
+const paths = require('./helpers/paths');
+
+gulp.task('clean', () => {
+  return del([paths.dest.root]);
+});
--- a/frontend/gulp/copy.js
+++ b/frontend/gulp/copy.js
@@ -0,0 +1,42 @@
+const path = require('path');
+const gulp = require('gulp');
+const print = require('gulp-print').default;
+const cache = require('gulp-cached');
+const livereload = require('gulp-livereload');
+const paths = require('./helpers/paths.js');
+
+gulp.task('copyHtml', () => {
+  return gulp.src(paths.src.html, { base: paths.src.root })
+    .pipe(cache('copyHtml'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});
+
+gulp.task('copyFonts', () => {
+  return gulp.src(
+    path.join(paths.src.fonts, '**', '*.*'), { base: paths.src.root }
+  )
+    .pipe(cache('copyFonts'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});
+
+gulp.task('copyImages', () => {
+  return gulp.src(
+    path.join(paths.src.images, '**', '*.*'), { base: paths.src.root }
+  )
+    .pipe(cache('copyImages'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});
+
+gulp.task('copyRobots', () => {
+  return gulp.src(paths.src.robots, { base: paths.src.root })
+    .pipe(cache('copyRobots'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});
--- a/frontend/gulp/gulpFile.js
+++ b/frontend/gulp/gulpFile.js
@@ -0,0 +1,5 @@
+require('./build.js');
+require('./clean.js');
+require('./copy.js');
+require('./watch.js');
+require('./webpack.js');
--- a/frontend/gulp/helpers/errorHandler.js
+++ b/frontend/gulp/helpers/errorHandler.js
@@ -0,0 +1,6 @@
+const colors = require('ansi-colors');
+
+module.exports = function errorHandler(error) {
+  console.log(colors.red(`Error (${error.plugin}): ${error.message}`));
+  this.emit('end');
+};
--- a/frontend/gulp/helpers/paths.js
+++ b/frontend/gulp/helpers/paths.js
@@ -0,0 +1,24 @@
+const root = './frontend/src';
+
+const paths = {
+  src: {
+    root,
+    html: `${root}/*.html`,
+    scripts: `${root}/**/*.js`,
+    content: `${root}/Content/`,
+    fonts: `${root}/Content/Fonts/`,
+    images: `${root}/Content/Images/`,
+    robots: `${root}/Content/robots.txt`,
+    exclude: {
+      libs: `!${root}/JsLibraries/**`
+    }
+  },
+  dest: {
+    root: './_output/UI/',
+    content: './_output/UI/Content/',
+    fonts: './_output/UI/Content/Fonts/',
+    images: './_output/UI/Content/Images/'
+  }
+};
+
+module.exports = paths;
--- a/frontend/gulp/watch.js
+++ b/frontend/gulp/watch.js
@@ -0,0 +1,19 @@
+const gulp = require('gulp');
+const livereload = require('gulp-livereload');
+const gulpWatch = require('gulp-watch');
+const paths = require('./helpers/paths.js');
+
+require('./copy.js');
+require('./webpack.js');
+
+function watch() {
+  livereload.listen({ start: true });
+
+  gulp.task('webpackWatch')();
+  gulpWatch(paths.src.html, gulp.series('copyHtml'));
+  gulpWatch(`${paths.src.fonts}**/*.*`, gulp.series('copyFonts'));
+  gulpWatch(`${paths.src.images}**/*.*`, gulp.series('copyImages'));
+  gulpWatch(paths.src.robots, gulp.series('copyRobots'));
+}
+
+gulp.task('watch', gulp.series('build', watch));
--- a/frontend/gulp/webpack.js
+++ b/frontend/gulp/webpack.js
@@ -0,0 +1,271 @@
+const gulp = require('gulp');
+const webpackStream = require('webpack-stream');
+const livereload = require('gulp-livereload');
+const path = require('path');
+const webpack = require('webpack');
+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';
+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 distFolder = path.resolve(frontendFolder, '..', '_output', uiFolder);
+
+console.log('Source Folder:', srcFolder);
+console.log('Output Folder:', distFolder);
+console.log('isProduction:', isProduction);
+console.log('isProfiling:', isProfiling);
+
+const cssVarsFiles = [
+  '../src/Styles/Variables/colors',
+  '../src/Styles/Variables/dimensions',
+  '../src/Styles/Variables/fonts',
+  '../src/Styles/Variables/animations',
+  '../src/Styles/Variables/zIndexes'
+].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 body = assetTags.bodyTags.map((v) => {
+    v.attributes = { src: `/${v.attributes.src}` };
+    return HtmlWebpackPluginHtmlTags.htmlTagObjectToString(v, this.options.xhtml);
+  });
+
+  return html
+    .replace('<!-- webpack bundles head -->', head.join('\r\n  '))
+    .replace('<!-- webpack bundles body -->', body.join('\r\n  '));
+};
+
+const plugins = [
+  new OptimizeCssAssetsPlugin({}),
+
+  new webpack.DefinePlugin({
+    __DEV__: !isProduction,
+    'process.env.NODE_ENV': isProduction ? JSON.stringify('production') : JSON.stringify('development')
+  }),
+
+  new MiniCssExtractPlugin({
+    filename: path.join('Content', 'styles.css')
+  }),
+
+  new HtmlWebpackPlugin({
+    template: 'frontend/src/index.html',
+    filename: 'index.html'
+  })
+];
+
+const config = {
+  mode: isProduction ? 'production' : 'development',
+  devtool: '#source-map',
+
+  stats: {
+    children: false
+  },
+
+  watchOptions: {
+    ignored: /node_modules/
+  },
+
+  entry: {
+    index: 'index.js'
+  },
+
+  resolve: {
+    modules: [
+      srcFolder,
+      path.join(srcFolder, 'Shims'),
+      'node_modules'
+    ],
+    alias: {
+      jquery: 'jquery/src/jquery'
+    }
+  },
+
+  output: {
+    path: distFolder,
+    filename: '[name].js',
+    sourceMapFilename: '[file].map'
+  },
+
+  optimization: {
+    chunkIds: 'named',
+    splitChunks: {
+      chunks: 'initial'
+    }
+  },
+
+  performance: {
+    hints: false
+  },
+
+  plugins,
+
+  resolveLoader: {
+    modules: [
+      'node_modules',
+      'frontend/gulp/webpack/'
+    ]
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.worker\.js$/,
+        use: {
+          loader: 'worker-loader',
+          options: {
+            filename: '[name].js',
+            inline: inlineWebWorkers
+          }
+        }
+      },
+      {
+        test: /\.js?$/,
+        exclude: /(node_modules|JsLibraries)/,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              configFile: `${frontendFolder}/babel.config.js`,
+              envName: isProduction ? 'production' : 'development',
+              presets: [
+                [
+                  '@babel/preset-env',
+                  {
+                    modules: false,
+                    loose: true,
+                    debug: false,
+                    useBuiltIns: 'entry',
+                    corejs: 3
+                  }
+                ]
+              ]
+            }
+          }
+        ]
+      },
+
+      // CSS Modules
+      {
+        test: /\.css$/,
+        exclude: /(node_modules|globals.css)/,
+        use: [
+          { loader: MiniCssExtractPlugin.loader },
+          {
+            loader: 'css-loader',
+            options: {
+              importLoaders: 1,
+              modules: {
+                localIdentName: '[name]/[local]/[hash:base64:5]'
+              }
+            }
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              ident: 'postcss',
+              config: {
+                ctx: {
+                  cssVarsFiles
+                },
+                path: 'frontend/postcss.config.js'
+              }
+            }
+          }
+        ]
+      },
+
+      // Global styles
+      {
+        test: /\.css$/,
+        include: /(node_modules|globals.css)/,
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader'
+          }
+        ]
+      },
+
+      // Fonts
+      {
+        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10240,
+              mimetype: 'application/font-woff',
+              emitFile: false,
+              name: 'Content/Fonts/[name].[ext]'
+            }
+          }
+        ]
+      },
+
+      {
+        test: /\.(ttf|eot|eot?#iefix|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              emitFile: false,
+              name: 'Content/Fonts/[name].[ext]'
+            }
+          }
+        ]
+      }
+    ]
+  }
+};
+
+if (isProfiling) {
+  config.resolve.alias['react-dom$'] = 'react-dom/profiling';
+  config.resolve.alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
+
+  config.optimization.minimizer = [
+    new TerserPlugin({
+      cache: true,
+      parallel: true,
+      sourceMap: true, // Must be set to true if using source-maps in production
+      terserOptions: {
+        mangle: false,
+        keep_classnames: true,
+        keep_fnames: true
+      }
+    })
+  ];
+}
+
+gulp.task('webpack', () => {
+  return webpackStream(config)
+    .pipe(gulp.dest('_output/UI'));
+});
+
+gulp.task('webpackWatch', () => {
+  config.watch = true;
+
+  return webpackStream(config, webpack)
+    .on('error', errorHandler)
+    .pipe(gulp.dest('_output/UI'))
+    .on('error', errorHandler)
+    .pipe(livereload())
+    .on('error', errorHandler);
+});
--- a/frontend/build/webpack/css-variables-loader.js
+++ b/frontend/build/webpack/css-variables-loader.js
--- a/frontend/postcss.config.js
+++ b/frontend/postcss.config.js
@@ -1,32 +1,23 @@
 const reload = require('require-nocache')(module);

-const cssVarsFiles = [
-  './src/Styles/Variables/colors',
-  './src/Styles/Variables/dimensions',
-  './src/Styles/Variables/fonts',
-  './src/Styles/Variables/animations',
-  './src/Styles/Variables/zIndexes'
-].map(require.resolve);
+module.exports = (ctx, configPath, options) => {
+  const config = {
+    plugins: {
+      'postcss-mixins': {
+        mixinsDir: [
+          'frontend/src/Styles/Mixins'
+        ]
+      },
+      'postcss-simple-vars': {
+        variables: () =>
+          ctx.options.cssVarsFiles.reduce((acc, vars) => {
+            return Object.assign(acc, reload(vars));
+          }, {})
+      },
+      'postcss-color-function': {},
+      'postcss-nested': {}
+    }
+  };

-const mixinsFiles = [
-  'frontend/src/Styles/Mixins/cover.css',
-  'frontend/src/Styles/Mixins/linkOverlay.css',
-  'frontend/src/Styles/Mixins/scroller.css',
-  'frontend/src/Styles/Mixins/truncate.css'
-];
-
-module.exports = {
-  plugins: [
-    ['postcss-mixins', {
-      mixinsFiles
-    }],
-    ['postcss-simple-vars', {
-      variables: () =>
-        cssVarsFiles.reduce((acc, vars) => {
-          return Object.assign(acc, reload(vars));
-        }, {})
-    }],
-    'postcss-color-function',
-    'postcss-nested'
-  ]
-};
+  return config;
+};
--- a/frontend/src/Activity/Blacklist/Blacklist.js
+++ b/frontend/src/Activity/Blacklist/Blacklist.js
@@ -19,9 +19,9 @@ 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 BlocklistRowConnector from './BlocklistRowConnector';
+import BlacklistRowConnector from './BlacklistRowConnector';

-class Blocklist extends Component {
+class Blacklist extends Component {

  //
  // Lifecycle
@@ -101,8 +101,8 @@ class Blocklist extends Component {
      columns,
      totalRecords,
      isRemoving,
-      isClearingBlocklistExecuting,
-      onClearBlocklistPress,
+      isClearingBlacklistExecuting,
+      onClearBlacklistPress,
      ...otherProps
    } = this.props;

@@ -116,7 +116,7 @@ class Blocklist extends Component {
    const selectedIds = this.getSelectedIds();

    return (
-      <PageContent title={translate('Blocklist')}>
+      <PageContent title={translate('Blacklist')}>
        <PageToolbar>
          <PageToolbarSection>
            <PageToolbarButton
@@ -130,8 +130,8 @@ class Blocklist extends Component {
            <PageToolbarButton
              label={translate('Clear')}
              iconName={icons.CLEAR}
-              isSpinning={isClearingBlocklistExecuting}
-              onPress={onClearBlocklistPress}
+              isSpinning={isClearingBlacklistExecuting}
+              onPress={onClearBlacklistPress}
            />
          </PageToolbarSection>

@@ -157,7 +157,7 @@ class Blocklist extends Component {
          {
            !isFetching && !!error &&
              <div>
-                {translate('UnableToLoadBlocklist')}
+                {translate('UnableToLoadBlacklist')}
              </div>
          }

@@ -183,7 +183,7 @@ class Blocklist extends Component {
                    {
                      items.map((item) => {
                        return (
-                          <BlocklistRowConnector
+                          <BlacklistRowConnector
                            key={item.id}
                            isSelected={selectedState[item.id] || false}
                            columns={columns}
@@ -209,7 +209,7 @@ class Blocklist extends Component {
          isOpen={isConfirmRemoveModalOpen}
          kind={kinds.DANGER}
          title={translate('RemoveSelected')}
-          message={translate('AreYouSureYouWantToRemoveTheSelectedItemsFromBlocklist')}
+          message={translate('AreYouSureYouWantToRemoveTheSelectedItemsFromBlacklist')}
          confirmLabel={translate('RemoveSelected')}
          onConfirm={this.onRemoveSelectedConfirmed}
          onCancel={this.onConfirmRemoveModalClose}
@@ -219,7 +219,7 @@ class Blocklist extends Component {
  }
 }

-Blocklist.propTypes = {
+Blacklist.propTypes = {
  isFetching: PropTypes.bool.isRequired,
  isPopulated: PropTypes.bool.isRequired,
  error: PropTypes.object,
@@ -227,9 +227,9 @@ Blocklist.propTypes = {
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  totalRecords: PropTypes.number,
  isRemoving: PropTypes.bool.isRequired,
-  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
+  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
  onRemoveSelected: PropTypes.func.isRequired,
-  onClearBlocklistPress: PropTypes.func.isRequired
+  onClearBlacklistPress: PropTypes.func.isRequired
 };

-export default Blocklist;
+export default Blacklist;
--- a/frontend/src/Activity/Blacklist/BlacklistConnector.js
+++ b/frontend/src/Activity/Blacklist/BlacklistConnector.js
@@ -0,0 +1,160 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import * as commandNames from 'Commands/commandNames';
+import withCurrentPage from 'Components/withCurrentPage';
+import * as blacklistActions from 'Store/Actions/blacklistActions';
+import { executeCommand } from 'Store/Actions/commandActions';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import Blacklist from './Blacklist';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.blacklist,
+    createCommandExecutingSelector(commandNames.CLEAR_BLACKLIST),
+    (blacklist, isClearingBlacklistExecuting) => {
+      return {
+        isClearingBlacklistExecuting,
+        ...blacklist
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  ...blacklistActions,
+  executeCommand
+};
+
+class BlacklistConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    const {
+      useCurrentPage,
+      fetchBlacklist,
+      gotoBlacklistFirstPage
+    } = this.props;
+
+    registerPagePopulator(this.repopulate);
+
+    if (useCurrentPage) {
+      fetchBlacklist();
+    } else {
+      gotoBlacklistFirstPage();
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (prevProps.isClearingBlacklistExecuting && !this.props.isClearingBlacklistExecuting) {
+      this.props.gotoBlacklistFirstPage();
+    }
+  }
+
+  componentWillUnmount() {
+    this.props.clearBlacklist();
+    unregisterPagePopulator(this.repopulate);
+  }
+
+  //
+  // Control
+
+  repopulate = () => {
+    this.props.fetchBlacklist();
+  }
+  //
+  // Listeners
+
+  onFirstPagePress = () => {
+    this.props.gotoBlacklistFirstPage();
+  }
+
+  onPreviousPagePress = () => {
+    this.props.gotoBlacklistPreviousPage();
+  }
+
+  onNextPagePress = () => {
+    this.props.gotoBlacklistNextPage();
+  }
+
+  onLastPagePress = () => {
+    this.props.gotoBlacklistLastPage();
+  }
+
+  onPageSelect = (page) => {
+    this.props.gotoBlacklistPage({ page });
+  }
+
+  onRemoveSelected = (ids) => {
+    this.props.removeBlacklistItems({ ids });
+  }
+
+  onSortPress = (sortKey) => {
+    this.props.setBlacklistSort({ sortKey });
+  }
+
+  onTableOptionChange = (payload) => {
+    this.props.setBlacklistTableOption(payload);
+
+    if (payload.pageSize) {
+      this.props.gotoBlacklistFirstPage();
+    }
+  }
+
+  onClearBlacklistPress = () => {
+    this.props.executeCommand({ name: commandNames.CLEAR_BLACKLIST });
+  }
+
+  onTableOptionChange = (payload) => {
+    this.props.setBlacklistTableOption(payload);
+
+    if (payload.pageSize) {
+      this.props.gotoBlacklistFirstPage();
+    }
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <Blacklist
+        onFirstPagePress={this.onFirstPagePress}
+        onPreviousPagePress={this.onPreviousPagePress}
+        onNextPagePress={this.onNextPagePress}
+        onLastPagePress={this.onLastPagePress}
+        onPageSelect={this.onPageSelect}
+        onRemoveSelected={this.onRemoveSelected}
+        onSortPress={this.onSortPress}
+        onTableOptionChange={this.onTableOptionChange}
+        onClearBlacklistPress={this.onClearBlacklistPress}
+        {...this.props}
+      />
+    );
+  }
+}
+
+BlacklistConnector.propTypes = {
+  useCurrentPage: PropTypes.bool.isRequired,
+  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  fetchBlacklist: PropTypes.func.isRequired,
+  gotoBlacklistFirstPage: PropTypes.func.isRequired,
+  gotoBlacklistPreviousPage: PropTypes.func.isRequired,
+  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,
+  executeCommand: PropTypes.func.isRequired
+};
+
+export default withCurrentPage(
+  connect(createMapStateToProps, mapDispatchToProps)(BlacklistConnector)
+);
--- a/frontend/src/Activity/Blacklist/BlacklistDetailsModal.js
+++ b/frontend/src/Activity/Blacklist/BlacklistDetailsModal.js
@@ -10,7 +10,7 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import translate from 'Utilities/String/translate';

-class BlocklistDetailsModal extends Component {
+class BlacklistDetailsModal extends Component {

  //
  // Render
@@ -78,7 +78,7 @@ class BlocklistDetailsModal extends Component {
  }
 }

-BlocklistDetailsModal.propTypes = {
+BlacklistDetailsModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  sourceTitle: PropTypes.string.isRequired,
  protocol: PropTypes.string.isRequired,
@@ -87,4 +87,4 @@ BlocklistDetailsModal.propTypes = {
  onModalClose: PropTypes.func.isRequired
 };

-export default BlocklistDetailsModal;
+export default BlacklistDetailsModal;
--- a/frontend/src/Activity/Blacklist/BlacklistRow.css
+++ b/frontend/src/Activity/Blacklist/BlacklistRow.css
--- a/frontend/src/Activity/Blacklist/BlacklistRow.js
+++ b/frontend/src/Activity/Blacklist/BlacklistRow.js
@@ -11,10 +11,10 @@ import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import MovieTitleLink from 'Movie/MovieTitleLink';
 import translate from 'Utilities/String/translate';
-import BlocklistDetailsModal from './BlocklistDetailsModal';
-import styles from './BlocklistRow.css';
+import BlacklistDetailsModal from './BlacklistDetailsModal';
+import styles from './BlacklistRow.css';

-class BlocklistRow extends Component {
+class BlacklistRow extends Component {

  //
  // Lifecycle
@@ -166,7 +166,7 @@ class BlocklistRow extends Component {
                  />

                  <IconButton
-                    title={translate('RemoveFromBlocklist')}
+                    title={translate('RemoveFromBlacklist')}
                    name={icons.REMOVE}
                    kind={kinds.DANGER}
                    onPress={onRemovePress}
@@ -179,7 +179,7 @@ class BlocklistRow extends Component {
          })
        }

-        <BlocklistDetailsModal
+        <BlacklistDetailsModal
          isOpen={this.state.isDetailsModalOpen}
          sourceTitle={sourceTitle}
          protocol={protocol}
@@ -193,7 +193,7 @@ class BlocklistRow extends Component {

 }

-BlocklistRow.propTypes = {
+BlacklistRow.propTypes = {
  id: PropTypes.number.isRequired,
  movie: PropTypes.object.isRequired,
  sourceTitle: PropTypes.string.isRequired,
@@ -210,4 +210,4 @@ BlocklistRow.propTypes = {
  onRemovePress: PropTypes.func.isRequired
 };

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

 function createMapStateToProps() {
  return createSelector(
@@ -18,9 +18,9 @@ function createMapStateToProps() {
 function createMapDispatchToProps(dispatch, props) {
  return {
    onRemovePress() {
-      dispatch(removeBlocklistItem({ id: props.id }));
+      dispatch(removeBlacklistItem({ id: props.id }));
    }
  };
 }

-export default connect(createMapStateToProps, createMapDispatchToProps)(BlocklistRow);
+export default connect(createMapStateToProps, createMapDispatchToProps)(BlacklistRow);
--- a/frontend/src/Activity/Blocklist/BlocklistConnector.js
+++ b/frontend/src/Activity/Blocklist/BlocklistConnector.js
@@ -1,152 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import * as commandNames from 'Commands/commandNames';
-import withCurrentPage from 'Components/withCurrentPage';
-import * as blocklistActions from 'Store/Actions/blocklistActions';
-import { executeCommand } from 'Store/Actions/commandActions';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
-import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
-import Blocklist from './Blocklist';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.blocklist,
-    createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
-    (blocklist, isClearingBlocklistExecuting) => {
-      return {
-        isClearingBlocklistExecuting,
-        ...blocklist
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  ...blocklistActions,
-  executeCommand
-};
-
-class BlocklistConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    const {
-      useCurrentPage,
-      fetchBlocklist,
-      gotoBlocklistFirstPage
-    } = this.props;
-
-    registerPagePopulator(this.repopulate);
-
-    if (useCurrentPage) {
-      fetchBlocklist();
-    } else {
-      gotoBlocklistFirstPage();
-    }
-  }
-
-  componentDidUpdate(prevProps) {
-    if (prevProps.isClearingBlocklistExecuting && !this.props.isClearingBlocklistExecuting) {
-      this.props.gotoBlocklistFirstPage();
-    }
-  }
-
-  componentWillUnmount() {
-    this.props.clearBlocklist();
-    unregisterPagePopulator(this.repopulate);
-  }
-
-  //
-  // Control
-
-  repopulate = () => {
-    this.props.fetchBlocklist();
-  }
-  //
-  // Listeners
-
-  onFirstPagePress = () => {
-    this.props.gotoBlocklistFirstPage();
-  }
-
-  onPreviousPagePress = () => {
-    this.props.gotoBlocklistPreviousPage();
-  }
-
-  onNextPagePress = () => {
-    this.props.gotoBlocklistNextPage();
-  }
-
-  onLastPagePress = () => {
-    this.props.gotoBlocklistLastPage();
-  }
-
-  onPageSelect = (page) => {
-    this.props.gotoBlocklistPage({ page });
-  }
-
-  onRemoveSelected = (ids) => {
-    this.props.removeBlocklistItems({ ids });
-  }
-
-  onSortPress = (sortKey) => {
-    this.props.setBlocklistSort({ sortKey });
-  }
-
-  onTableOptionChange = (payload) => {
-    this.props.setBlocklistTableOption(payload);
-
-    if (payload.pageSize) {
-      this.props.gotoBlocklistFirstPage();
-    }
-  }
-
-  onClearBlocklistPress = () => {
-    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <Blocklist
-        onFirstPagePress={this.onFirstPagePress}
-        onPreviousPagePress={this.onPreviousPagePress}
-        onNextPagePress={this.onNextPagePress}
-        onLastPagePress={this.onLastPagePress}
-        onPageSelect={this.onPageSelect}
-        onRemoveSelected={this.onRemoveSelected}
-        onSortPress={this.onSortPress}
-        onTableOptionChange={this.onTableOptionChange}
-        onClearBlocklistPress={this.onClearBlocklistPress}
-        {...this.props}
-      />
-    );
-  }
-}
-
-BlocklistConnector.propTypes = {
-  useCurrentPage: PropTypes.bool.isRequired,
-  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  fetchBlocklist: PropTypes.func.isRequired,
-  gotoBlocklistFirstPage: PropTypes.func.isRequired,
-  gotoBlocklistPreviousPage: PropTypes.func.isRequired,
-  gotoBlocklistNextPage: PropTypes.func.isRequired,
-  gotoBlocklistLastPage: PropTypes.func.isRequired,
-  gotoBlocklistPage: PropTypes.func.isRequired,
-  removeBlocklistItems: PropTypes.func.isRequired,
-  setBlocklistSort: PropTypes.func.isRequired,
-  setBlocklistTableOption: PropTypes.func.isRequired,
-  clearBlocklist: PropTypes.func.isRequired,
-  executeCommand: PropTypes.func.isRequired
-};
-
-export default withCurrentPage(
-  connect(createMapStateToProps, mapDispatchToProps)(BlocklistConnector)
-);
--- a/frontend/src/Activity/Queue/Queue.js
+++ b/frontend/src/Activity/Queue/Queue.js
@@ -32,8 +32,6 @@ class Queue extends Component {
  constructor(props, context) {
    super(props, context);

-    this._shouldBlockRefresh = false;
-
    this.state = {
      allSelected: false,
      allUnselected: false,
@@ -45,14 +43,6 @@ class Queue extends Component {
    };
  }

-  shouldComponentUpdate() {
-    if (this._shouldBlockRefresh) {
-      return false;
-    }
-
-    return true;
-  }
-
  componentDidUpdate(prevProps) {
    const {
      items,
@@ -95,10 +85,6 @@ class Queue extends Component {
  //
  // Listeners

-  onQueueRowModalOpenOrClose = (isOpen) => {
-    this._shouldBlockRefresh = isOpen;
-  }
-
  onSelectAllChange = ({ value }) => {
    this.setState(selectAll(this.state.selectedState, value));
  }
@@ -114,19 +100,15 @@ class Queue extends Component {
  }

  onRemoveSelectedPress = () => {
-    this.setState({ isConfirmRemoveModalOpen: true }, () => {
-      this._shouldBlockRefresh = true;
-    });
+    this.setState({ isConfirmRemoveModalOpen: true });
  }

  onRemoveSelectedConfirmed = (payload) => {
-    this._shouldBlockRefresh = false;
    this.props.onRemoveSelectedPress({ ids: this.getSelectedIds(), ...payload });
    this.setState({ isConfirmRemoveModalOpen: false });
  }

  onConfirmRemoveModalClose = () => {
-    this._shouldBlockRefresh = false;
    this.setState({ isConfirmRemoveModalOpen: false });
  }

@@ -226,7 +208,7 @@ class Queue extends Component {
          }

          {
-            isAllPopulated && !hasError && !items.length &&
+            isPopulated && !hasError && !items.length &&
              <div>
                {translate('QueueIsEmpty')}
              </div>
@@ -255,7 +237,6 @@ class Queue extends Component {
                            columns={columns}
                            {...item}
                            onSelectedChange={this.onSelectedChange}
-                            onQueueRowModalOpenOrClose={this.onQueueRowModalOpenOrClose}
                          />
                        );
                      })
@@ -282,17 +263,6 @@ class Queue extends Component {
              return !!(item && item.movieId);
            })
          )}
-          allPending={isConfirmRemoveModalOpen && (
-            selectedIds.every((id) => {
-              const item = items.find((i) => i.id === id);
-
-              if (!item) {
-                return false;
-              }
-
-              return item.status === 'delay' || item.status === 'downloadClientUnavailable';
-            })
-          )}
          onRemovePress={this.onRemoveSelectedConfirmed}
          onModalClose={this.onConfirmRemoveModalClose}
        />
--- a/frontend/src/Activity/Queue/QueueConnector.js
+++ b/frontend/src/Activity/Queue/QueueConnector.js
@@ -43,7 +43,6 @@ class QueueConnector extends Component {
    const {
      useCurrentPage,
      fetchQueue,
-      fetchQueueStatus,
      gotoQueueFirstPage
    } = this.props;

@@ -54,8 +53,6 @@ class QueueConnector extends Component {
    } else {
      gotoQueueFirstPage();
    }
-
-    fetchQueueStatus();
  }

  componentDidUpdate(prevProps) {
@@ -155,7 +152,6 @@ QueueConnector.propTypes = {
  useCurrentPage: PropTypes.bool.isRequired,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  fetchQueue: PropTypes.func.isRequired,
-  fetchQueueStatus: PropTypes.func.isRequired,
  gotoQueueFirstPage: PropTypes.func.isRequired,
  gotoQueuePreviousPage: PropTypes.func.isRequired,
  gotoQueueNextPage: PropTypes.func.isRequired,
--- a/frontend/src/Activity/Queue/QueueRow.js
+++ b/frontend/src/Activity/Queue/QueueRow.js
@@ -42,33 +42,20 @@ class QueueRow extends Component {
    this.setState({ isRemoveQueueItemModalOpen: true });
  }

-  onRemoveQueueItemModalConfirmed = (blocklist) => {
-    const {
-      onRemoveQueueItemPress,
-      onQueueRowModalOpenOrClose
-    } = this.props;
-
-    onQueueRowModalOpenOrClose(false);
-    onRemoveQueueItemPress(blocklist);
-
+  onRemoveQueueItemModalConfirmed = (blacklist) => {
+    this.props.onRemoveQueueItemPress(blacklist);
    this.setState({ isRemoveQueueItemModalOpen: false });
  }

  onRemoveQueueItemModalClose = () => {
-    this.props.onQueueRowModalOpenOrClose(false);
-
    this.setState({ isRemoveQueueItemModalOpen: false });
  }

  onInteractiveImportPress = () => {
-    this.props.onQueueRowModalOpenOrClose(true);
-
    this.setState({ isInteractiveImportModalOpen: true });
  }

  onInteractiveImportModalClose = () => {
-    this.props.onQueueRowModalOpenOrClose(false);
-
    this.setState({ isInteractiveImportModalOpen: false });
  }

@@ -332,7 +319,6 @@ class QueueRow extends Component {
          isOpen={isRemoveQueueItemModalOpen}
          sourceTitle={title}
          canIgnore={!!movie}
-          isPending={isPending}
          onRemovePress={this.onRemoveQueueItemModalConfirmed}
          onModalClose={this.onRemoveQueueItemModalClose}
        />
@@ -373,8 +359,7 @@ QueueRow.propTypes = {
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  onSelectedChange: PropTypes.func.isRequired,
  onGrabPress: PropTypes.func.isRequired,
-  onRemoveQueueItemPress: PropTypes.func.isRequired,
-  onQueueRowModalOpenOrClose: PropTypes.func.isRequired
+  onRemoveQueueItemPress: PropTypes.func.isRequired
 };

 QueueRow.defaultProps = {
--- a/frontend/src/Activity/Queue/RemoveQueueItemModal.js
+++ b/frontend/src/Activity/Queue/RemoveQueueItemModal.js
@@ -22,7 +22,7 @@ class RemoveQueueItemModal extends Component {

    this.state = {
      remove: true,
-      blocklist: false
+      blacklist: false
    };
  }

@@ -32,7 +32,7 @@ class RemoveQueueItemModal extends Component {
  resetState = function() {
    this.setState({
      remove: true,
-      blocklist: false
+      blacklist: false
    });
  }

@@ -43,8 +43,8 @@ class RemoveQueueItemModal extends Component {
    this.setState({ remove: value });
  }

-  onBlocklistChange = ({ value }) => {
-    this.setState({ blocklist: value });
+  onBlacklistChange = ({ value }) => {
+    this.setState({ blacklist: value });
  }

  onRemoveConfirmed = () => {
@@ -66,11 +66,10 @@ class RemoveQueueItemModal extends Component {
    const {
      isOpen,
      sourceTitle,
-      canIgnore,
-      isPending
+      canIgnore
    } = this.props;

-    const { remove, blocklist } = this.state;
+    const { remove, blacklist } = this.state;

    return (
      <Modal
@@ -90,31 +89,27 @@ class RemoveQueueItemModal extends Component {
              {translate('RemoveFromQueueText', [sourceTitle])}
            </div>

-            {
-              isPending ?
-                null :
-                <FormGroup>
-                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="remove"
-                    value={remove}
-                    helpTextWarning={translate('RemoveHelpTextWarning')}
-                    isDisabled={!canIgnore}
-                    onChange={this.onRemoveChange}
-                  />
-                </FormGroup>
-            }
-
            <FormGroup>
-              <FormLabel>{translate('BlocklistRelease')}</FormLabel>
+              <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
+
              <FormInputGroup
                type={inputTypes.CHECK}
-                name="blocklist"
-                value={blocklist}
-                helpText={translate('BlocklistHelpText')}
-                onChange={this.onBlocklistChange}
+                name="remove"
+                value={remove}
+                helpTextWarning={translate('RemoveHelpTextWarning')}
+                isDisabled={!canIgnore}
+                onChange={this.onRemoveChange}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>{translate('BlacklistRelease')}</FormLabel>
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="blacklist"
+                value={blacklist}
+                helpText={translate('BlacklistHelpText')}
+                onChange={this.onBlacklistChange}
              />
            </FormGroup>

@@ -142,7 +137,6 @@ RemoveQueueItemModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  sourceTitle: PropTypes.string.isRequired,
  canIgnore: PropTypes.bool.isRequired,
-  isPending: PropTypes.bool.isRequired,
  onRemovePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
--- a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js
+++ b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js
@@ -23,7 +23,7 @@ class RemoveQueueItemsModal extends Component {

    this.state = {
      remove: true,
-      blocklist: false
+      blacklist: false
    };
  }

@@ -33,7 +33,7 @@ class RemoveQueueItemsModal extends Component {
   resetState = function() {
     this.setState({
       remove: true,
-       blocklist: false
+       blacklist: false
     });
   }

@@ -44,8 +44,8 @@ class RemoveQueueItemsModal extends Component {
     this.setState({ remove: value });
   }

-  onBlocklistChange = ({ value }) => {
-    this.setState({ blocklist: value });
+  onBlacklistChange = ({ value }) => {
+    this.setState({ blacklist: value });
  }

  onRemoveConfirmed = () => {
@@ -67,11 +67,10 @@ class RemoveQueueItemsModal extends Component {
    const {
      isOpen,
      selectedCount,
-      canIgnore,
-      allPending
+      canIgnore
    } = this.props;

-    const { remove, blocklist } = this.state;
+    const { remove, blacklist } = this.state;

    return (
      <Modal
@@ -83,42 +82,38 @@ class RemoveQueueItemsModal extends Component {
          onModalClose={this.onModalClose}
        >
          <ModalHeader>
-            {selectedCount > 1 ? translate('RemoveSelectedItems') : translate('RemoveSelectedItem')}
+            Remove Selected Item{selectedCount > 1 ? 's' : ''}
          </ModalHeader>

          <ModalBody>
            <div className={styles.message}>
-              {selectedCount > 1 ? translate('AreYouSureYouWantToRemoveSelectedItemsFromQueue', selectedCount) : translate('AreYouSureYouWantToRemoveSelectedItemFromQueue')}
+              {translate('AreYouSureYouWantToRemoveSelectedItemsFromQueue', [selectedCount, selectedCount > 1 ? 's' : ''])}
            </div>

-            {
-              allPending ?
-                null :
-                <FormGroup>
-                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
+            <FormGroup>
+              <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>

-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="remove"
-                    value={remove}
-                    helpTextWarning={translate('RemoveHelpTextWarning')}
-                    isDisabled={!canIgnore}
-                    onChange={this.onRemoveChange}
-                  />
-                </FormGroup>
-            }
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="remove"
+                value={remove}
+                helpTextWarning={translate('RemoveHelpTextWarning')}
+                isDisabled={!canIgnore}
+                onChange={this.onRemoveChange}
+              />
+            </FormGroup>

            <FormGroup>
              <FormLabel>
-                {selectedCount > 1 ? translate('BlocklistReleases') : translate('BlocklistRelease')}
+                Blacklist Release{selectedCount > 1 ? 's' : ''}
              </FormLabel>

              <FormInputGroup
                type={inputTypes.CHECK}
-                name="blocklist"
-                value={blocklist}
-                helpText={translate('BlocklistHelpText')}
-                onChange={this.onBlocklistChange}
+                name="blacklist"
+                value={blacklist}
+                helpText={translate('BlacklistHelpText')}
+                onChange={this.onBlacklistChange}
              />
            </FormGroup>

@@ -146,7 +141,6 @@ RemoveQueueItemsModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  selectedCount: PropTypes.number.isRequired,
  canIgnore: PropTypes.bool.isRequired,
-  allPending: PropTypes.bool.isRequired,
  onRemovePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js
@@ -81,8 +81,7 @@ class AddNewMovie extends Component {
    const {
      error,
      items,
-      hasExistingMovies,
-      colorImpairedMode
+      hasExistingMovies
    } = this.props;

    const term = this.state.term;
@@ -103,7 +102,7 @@ class AddNewMovie extends Component {
              className={styles.searchInput}
              name="movieLookup"
              value={term}
-              placeholder="e.g. The Dark Knight, tmdb:155, imdb:tt0468569"
+              placeholder="eg. The Dark Knight, tmdb:155, imdb:tt0468569"
              autoFocus={true}
              onChange={this.onSearchInputChange}
            />
@@ -142,7 +141,6 @@ class AddNewMovie extends Component {
                    return (
                      <AddNewMovieSearchResultConnector
                        key={item.tmdbId}
-                        colorImpairedMode={colorImpairedMode}
                        {...item}
                      />
                    );
@@ -161,7 +159,7 @@ class AddNewMovie extends Component {
                  {translate('YouCanAlsoSearch')}
                </div>
                <div>
-                  <Link to="https://wiki.servarr.com/radarr/faq#why-cant-i-add-a-new-movie-to-radarr">
+                  <Link to="https://wiki.servarr.com/Radarr_FAQ#Why_cant_I_add_a_new_movie_to_Radarr">
                    {translate('CantFindMovie')}
                  </Link>
                </div>
@@ -215,8 +213,7 @@ AddNewMovie.propTypes = {
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  hasExistingMovies: PropTypes.bool.isRequired,
  onMovieLookupChange: PropTypes.func.isRequired,
-  onClearMovieLookup: PropTypes.func.isRequired,
-  colorImpairedMode: PropTypes.bool.isRequired
+  onClearMovieLookup: PropTypes.func.isRequired
 };

 export default AddNewMovie;
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js
@@ -3,10 +3,8 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { clearAddMovie, lookupMovie } from 'Store/Actions/addMovieActions';
-import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import { fetchImportExclusions } from 'Store/Actions/Settings/importExclusions';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import parseUrl from 'Utilities/String/parseUrl';
 import AddNewMovie from './AddNewMovie';

@@ -15,15 +13,13 @@ function createMapStateToProps() {
    (state) => state.addMovie,
    (state) => state.movies.items.length,
    (state) => state.router.location,
-    createUISettingsSelector(),
-    (addMovie, existingMoviesCount, location, uiSettings) => {
+    (addMovie, existingMoviesCount, location) => {
      const { params } = parseUrl(location.search);

      return {
        ...addMovie,
        term: params.term,
-        hasExistingMovies: existingMoviesCount > 0,
-        colorImpairedMode: uiSettings.enableColorImpairedMode
+        hasExistingMovies: existingMoviesCount > 0
      };
    }
  );
@@ -33,9 +29,7 @@ const mapDispatchToProps = {
  lookupMovie,
  clearAddMovie,
  fetchRootFolders,
-  fetchImportExclusions,
-  fetchQueueDetails,
-  clearQueueDetails
+  fetchImportExclusions
 };

 class AddNewMovieConnector extends Component {
@@ -52,7 +46,6 @@ class AddNewMovieConnector extends Component {
  componentDidMount() {
    this.props.fetchRootFolders();
    this.props.fetchImportExclusions();
-    this.props.fetchQueueDetails();
  }

  componentWillUnmount() {
@@ -61,7 +54,6 @@ class AddNewMovieConnector extends Component {
    }

    this.props.clearAddMovie();
-    this.props.clearQueueDetails();
  }

  //
@@ -110,9 +102,7 @@ AddNewMovieConnector.propTypes = {
  lookupMovie: PropTypes.func.isRequired,
  clearAddMovie: PropTypes.func.isRequired,
  fetchRootFolders: PropTypes.func.isRequired,
-  fetchImportExclusions: PropTypes.func.isRequired,
-  fetchQueueDetails: PropTypes.func.isRequired,
-  clearQueueDetails: PropTypes.func.isRequired
+  fetchImportExclusions: PropTypes.func.isRequired
 };

 export default connect(createMapStateToProps, mapDispatchToProps)(AddNewMovieConnector);
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css
@@ -27,11 +27,9 @@
 }

 .poster {
-  position: relative;
-  display: block;
+  flex: 0 0 170px;
  margin-right: 20px;
  height: 250px;
-  background-color: $defaultColor;
 }

 .content {
@@ -88,28 +86,6 @@
  pointer-events: all;
 }

-.posterContainer {
-  position: relative;
-}
-
-.certification {
-  margin-left: 2px;
-  padding: 0 5px;
-  border: 1px solid;
-  border-radius: 5px;
-  font-size: 16px;
-}
-
-.runtime {
-  margin-left: 8px;
-  font-size: 16px;
-}
-
-.statusContainer {
-  margin-right: 22px;
-  font-weight: bold;
-}
-
@media only screen and (max-width: $breakpointMedium) {
  .titleRow {
    justify-content: space-between;
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
@@ -7,10 +7,7 @@ import Link from 'Components/Link/Link';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
 import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
-import MovieStatusLabel from 'Movie/Details/MovieStatusLabel';
-import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
 import MoviePoster from 'Movie/MoviePoster';
-import formatRuntime from 'Utilities/Date/formatRuntime';
 import translate from 'Utilities/String/translate';
 import AddNewMovieModal from './AddNewMovieModal';
 import styles from './AddNewMovieSearchResult.css';
@@ -68,17 +65,7 @@ class AddNewMovieSearchResult extends Component {
      images,
      isExistingMovie,
      isExclusionMovie,
-      isSmallScreen,
-      colorImpairedMode,
-      id,
-      monitored,
-      hasFile,
-      isAvailable,
-      queueStatus,
-      queueState,
-      runtime,
-      movieRuntimeFormat,
-      certification
+      isSmallScreen
    } = this.props;

    const {
@@ -98,30 +85,12 @@ class AddNewMovieSearchResult extends Component {
          {
            isSmallScreen ?
              null :
-              <div>
-                <div className={styles.posterContainer}>
-                  <MoviePoster
-                    className={styles.poster}
-                    images={images}
-                    size={250}
-                    overflow={true}
-                  />
-                </div>
-
-                {
-                  isExistingMovie &&
-                    <MovieIndexProgressBar
-                      monitored={monitored}
-                      hasFile={hasFile}
-                      status={status}
-                      posterWidth={167}
-                      detailedProgressBar={true}
-                      queueStatus={queueStatus}
-                      queueState={queueState}
-                      isAvailable={isAvailable}
-                    />
-                }
-              </div>
+              <MoviePoster
+                className={styles.poster}
+                images={images}
+                size={250}
+                overflow={true}
+              />
          }

          <div className={styles.content}>
@@ -164,22 +133,6 @@ class AddNewMovieSearchResult extends Component {
              </div>
            </div>

-            <div>
-              {
-                !!certification &&
-                  <span className={styles.certification}>
-                    {certification}
-                  </span>
-              }
-
-              {
-                !!runtime &&
-                  <span className={styles.runtime}>
-                    {formatRuntime(runtime, movieRuntimeFormat)}
-                  </span>
-              }
-            </div>
-
            <div>
              <Label size={sizes.LARGE}>
                <HeartRating
@@ -223,15 +176,13 @@ class AddNewMovieSearchResult extends Component {
              />

              {
-                isExistingMovie && isSmallScreen &&
-                  <MovieStatusLabel
-                    hasMovieFiles={hasFile}
-                    monitored={monitored}
-                    isAvailable={isAvailable}
-                    id={id}
-                    useLabel={true}
-                    colorImpairedMode={colorImpairedMode}
-                  />
+                status === 'ended' &&
+                  <Label
+                    kind={kinds.DANGER}
+                    size={sizes.LARGE}
+                  >
+                    Ended
+                  </Label>
              }
            </div>

@@ -271,18 +222,7 @@ AddNewMovieSearchResult.propTypes = {
  images: PropTypes.arrayOf(PropTypes.object).isRequired,
  isExistingMovie: PropTypes.bool.isRequired,
  isExclusionMovie: PropTypes.bool.isRequired,
-  isSmallScreen: PropTypes.bool.isRequired,
-  id: PropTypes.number,
-  queueItems: PropTypes.arrayOf(PropTypes.object),
-  monitored: PropTypes.bool.isRequired,
-  hasFile: PropTypes.bool.isRequired,
-  isAvailable: PropTypes.bool.isRequired,
-  colorImpairedMode: PropTypes.bool,
-  queueStatus: PropTypes.string,
-  queueState: PropTypes.string,
-  runtime: PropTypes.number.isRequired,
-  movieRuntimeFormat: PropTypes.string.isRequired,
-  certification: PropTypes.string
+  isSmallScreen: PropTypes.bool.isRequired
 };

 export default AddNewMovieSearchResult;
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js
@@ -10,17 +10,11 @@ function createMapStateToProps() {
    createExistingMovieSelector(),
    createExclusionMovieSelector(),
    createDimensionsSelector(),
-    (state) => state.queue.details.items,
-    (state, { internalId }) => internalId,
-    (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId) => {
-      const firstQueueItem = queueItems.find((q) => q.movieId === internalId && internalId > 0);
-
+    (isExistingMovie, isExclusionMovie, dimensions) => {
      return {
        isExistingMovie,
        isExclusionMovie,
-        isSmallScreen: dimensions.isSmallScreen,
-        queueStatus: firstQueueItem ? firstQueueItem.status : null,
-        queueState: firstQueueItem ? firstQueueItem.trackedDownloadState : null
+        isSmallScreen: dimensions.isSmallScreen
      };
    }
  );
--- a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.css
+++ b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.css
@@ -30,9 +30,3 @@
 .importButtonIcon {
  margin-right: 8px;
 }
-
-.addErrorAlert {
-  composes: alert from '~Components/Alert.css';
-
-  margin: 20px 0;
-}
--- a/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js
+++ b/frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import FieldSet from 'Components/FieldSet';
 import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
 import Icon from 'Components/Icon';
@@ -73,29 +72,23 @@ class ImportMovieSelectFolder extends Component {
      isWindows,
      isFetching,
      isPopulated,
-      isSaving,
      error,
-      saveError,
      items
    } = this.props;

-    const hasRootFolders = items.length > 0;
-
    return (
      <PageContent title={translate('ImportMovies')}>
        <PageContentBody>
          {
-            isFetching && !isPopulated ?
-              <LoadingIndicator /> :
-              null
+            isFetching && !isPopulated &&
+              <LoadingIndicator />
          }

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

          {
@@ -115,7 +108,7 @@ class ImportMovieSelectFolder extends Component {
                </div>

                {
-                  hasRootFolders ?
+                  items.length > 0 ?
                    <div className={styles.recentFolders}>
                      <FieldSet legend={translate('RecentFolders')}>
                        <Table
@@ -138,51 +131,35 @@ class ImportMovieSelectFolder extends Component {
                          </TableBody>
                        </Table>
                      </FieldSet>
+
+                      <Button
+                        kind={kinds.PRIMARY}
+                        size={sizes.LARGE}
+                        onPress={this.onAddNewRootFolderPress}
+                      >
+                        <Icon
+                          className={styles.importButtonIcon}
+                          name={icons.DRIVE}
+                        />
+                        {translate('ChooseAnotherFolder')}
+                      </Button>
                    </div> :
-                    null
+
+                    <div className={styles.startImport}>
+                      <Button
+                        kind={kinds.PRIMARY}
+                        size={sizes.LARGE}
+                        onPress={this.onAddNewRootFolderPress}
+                      >
+                        <Icon
+                          className={styles.importButtonIcon}
+                          name={icons.DRIVE}
+                        />
+                        {translate('StartImport')}
+                      </Button>
+                    </div>
                }

-                {
-                  !isSaving && saveError ?
-                    <Alert
-                      className={styles.addErrorAlert}
-                      kind={kinds.DANGER}
-                    >
-                      {translate('UnableToAddRootFolder')}
-
-                      <ul>
-                        {
-                          saveError.responseJSON.map((e, index) => {
-                            return (
-                              <li key={index}>
-                                {e.errorMessage}
-                              </li>
-                            );
-                          })
-                        }
-                      </ul>
-                    </Alert> :
-                    null
-                }
-
-                <div className={hasRootFolders ? undefined : styles.startImport}>
-                  <Button
-                    kind={kinds.PRIMARY}
-                    size={sizes.LARGE}
-                    onPress={this.onAddNewRootFolderPress}
-                  >
-                    <Icon
-                      className={styles.importButtonIcon}
-                      name={icons.DRIVE}
-                    />
-                    {
-                      hasRootFolders ?
-                        translate('ChooseAnotherFolder') :
-                        translate('StartImport')
-                    }
-                  </Button>
-                </div>
-
                <FileBrowserModal
                  isOpen={this.state.isAddNewRootFolderModalOpen}
                  name="rootFolderPath"
@@ -202,9 +179,7 @@ ImportMovieSelectFolder.propTypes = {
  isWindows: PropTypes.bool.isRequired,
  isFetching: PropTypes.bool.isRequired,
  isPopulated: PropTypes.bool.isRequired,
-  isSaving: PropTypes.bool.isRequired,
  error: PropTypes.object,
-  saveError: PropTypes.object,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  onNewRootFolderSelect: PropTypes.func.isRequired,
  onDeleteRootFolderPress: PropTypes.func.isRequired
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Redirect, Route } from 'react-router-dom';
-import BlocklistConnector from 'Activity/Blocklist/BlocklistConnector';
+import BlacklistConnector from 'Activity/Blacklist/BlacklistConnector';
 import HistoryConnector from 'Activity/History/HistoryConnector';
 import QueueConnector from 'Activity/Queue/QueueConnector';
 import AddNewMovieConnector from 'AddMovie/AddNewMovie/AddNewMovieConnector';
@@ -111,8 +111,8 @@ function AppRoutes(props) {
      />

      <Route
-        path="/activity/blocklist"
-        component={BlocklistConnector}
+        path="/activity/blacklist"
+        component={BlacklistConnector}
      />

      {/*
--- a/frontend/src/App/AppUpdatedModalContent.js
+++ b/frontend/src/App/AppUpdatedModalContent.js
@@ -11,47 +11,9 @@ import UpdateChanges from 'System/Updates/UpdateChanges';
 import translate from 'Utilities/String/translate';
 import styles from './AppUpdatedModalContent.css';

-function mergeUpdates(items, version, prevVersion) {
-  let installedIndex = items.findIndex((u) => u.version === version);
-  let installedPreviouslyIndex = items.findIndex((u) => u.version === prevVersion);
-
-  if (installedIndex === -1) {
-    installedIndex = 0;
-  }
-
-  if (installedPreviouslyIndex === -1) {
-    installedPreviouslyIndex = items.length;
-  } else if (installedPreviouslyIndex === installedIndex && items.length) {
-    installedPreviouslyIndex += 1;
-  }
-
-  const appliedUpdates = items.slice(installedIndex, installedPreviouslyIndex);
-
-  if (!appliedUpdates.length) {
-    return null;
-  }
-
-  const appliedChanges = { new: [], fixed: [] };
-  appliedUpdates.forEach((u) => {
-    if (u.changes) {
-      appliedChanges.new.push(... u.changes.new);
-      appliedChanges.fixed.push(... u.changes.fixed);
-    }
-  });
-
-  const mergedUpdate = Object.assign({}, appliedUpdates[0], { changes: appliedChanges });
-
-  if (!appliedChanges.new.length && !appliedChanges.fixed.length) {
-    mergedUpdate.changes = null;
-  }
-
-  return mergedUpdate;
-}
-
 function AppUpdatedModalContent(props) {
  const {
    version,
-    prevVersion,
    isPopulated,
    error,
    items,
@@ -59,7 +21,7 @@ function AppUpdatedModalContent(props) {
    onModalClose
  } = props;

-  const update = mergeUpdates(items, version, prevVersion);
+  const update = items[0];

  return (
    <ModalContent onModalClose={onModalClose}>
@@ -127,7 +89,6 @@ function AppUpdatedModalContent(props) {

 AppUpdatedModalContent.propTypes = {
  version: PropTypes.string.isRequired,
-  prevVersion: PropTypes.string,
  isPopulated: PropTypes.bool.isRequired,
  error: PropTypes.object,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
--- a/frontend/src/App/AppUpdatedModalContentConnector.js
+++ b/frontend/src/App/AppUpdatedModalContentConnector.js
@@ -8,9 +8,8 @@ import AppUpdatedModalContent from './AppUpdatedModalContent';
 function createMapStateToProps() {
  return createSelector(
    (state) => state.app.version,
-    (state) => state.app.prevVersion,
    (state) => state.system.updates,
-    (version, prevVersion, updates) => {
+    (version, updates) => {
      const {
        isPopulated,
        error,
@@ -19,7 +18,6 @@ function createMapStateToProps() {

      return {
        version,
-        prevVersion,
        isPopulated,
        error,
        items
--- a/frontend/src/App/ThemeSelector.js
+++ b/frontend/src/App/ThemeSelector.js
@@ -1,29 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-
-const theme = window.Radarr.theme;
-
-function ThemeSelector({ children }) {
-  return (
-    <>
-      {
-        theme !== 'default' &&
-          <>
-            <link rel="stylesheet" type="text/css"
-              href={'/Content/Theme.Park/radarr-base.css'}
-            />
-            <link rel="stylesheet" type="text/css"
-              href={`/Content/Theme.Park/Themes/${theme}.css`}
-            />
-          </>
-      }
-      {children}
-    </>
-  );
-}
-
-ThemeSelector.propTypes = {
-  children: PropTypes.object.isRequired
-};
-
-export default ThemeSelector;
--- a/frontend/src/Calendar/Agenda/AgendaEvent.css
+++ b/frontend/src/Calendar/Agenda/AgendaEvent.css
@@ -29,7 +29,7 @@
 }

 .time {
-  flex: 0 0 125px;
+  flex: 0 0 120px;
  margin-right: 10px;
  border: none !important;
 }
@@ -54,24 +54,20 @@
  composes: downloaded from '~Calendar/Events/CalendarEvent.css';
 }

-.queue {
-  composes: queue from '~Calendar/Events/CalendarEvent.css';
+.downloading {
+  composes: downloading from '~Calendar/Events/CalendarEvent.css';
 }

 .unmonitored {
  composes: unmonitored from '~Calendar/Events/CalendarEvent.css';
 }

-.missingUnmonitored {
-  composes: missingUnmonitored from '~Calendar/Events/CalendarEvent.css';
+.missing {
+  composes: missing from '~Calendar/Events/CalendarEvent.css';
 }

-.missingMonitored {
-  composes: missingMonitored from '~Calendar/Events/CalendarEvent.css';
-}
-
-.continuing {
-  composes: continuing from '~Calendar/Events/CalendarEvent.css';
+.unreleased {
+  composes: unreleased from '~Calendar/Events/CalendarEvent.css';
 }

@media only screen and (max-width: $breakpointSmall) {
--- a/frontend/src/Calendar/Agenda/AgendaEvent.js
+++ b/frontend/src/Calendar/Agenda/AgendaEvent.js
@@ -3,10 +3,10 @@ import moment from 'moment';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import CalendarEventQueueDetails from 'Calendar/Events/CalendarEventQueueDetails';
+import getStatusStyle from 'Calendar/getStatusStyle';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import { icons, kinds } from 'Helpers/Props';
-import getStatusStyle from 'Utilities/Movie/getStatusStyle';
 import translate from 'Utilities/String/translate';
 import styles from './AgendaEvent.css';

@@ -82,7 +82,7 @@ class AgendaEvent extends Component {
    startTime = moment(startTime);
    const downloading = !!(queueItem || grabbed);
    const isMonitored = monitored;
-    const statusStyle = getStatusStyle(null, isMonitored, hasFile, isAvailable, 'style', downloading);
+    const statusStyle = getStatusStyle(hasFile, downloading, isAvailable, isMonitored);
    const joinedGenres = genres.slice(0, 2).join(', ');
    const link = `/movie/${titleSlug}`;

--- a/frontend/src/Calendar/CalendarPageConnector.js
+++ b/frontend/src/Calendar/CalendarPageConnector.js
@@ -24,7 +24,7 @@ function createMissingMovieIdsSelector() {
        const inCinemas = movie.inCinemas;

        if (
-          !movie.hasFile &&
+          !movie.movieFileId &&
          moment(inCinemas).isAfter(start) &&
          moment(inCinemas).isBefore(end) &&
          isBefore(movie.inCinemas) &&
--- a/frontend/src/Calendar/Events/CalendarEvent.css
+++ b/frontend/src/Calendar/Events/CalendarEvent.css
@@ -60,30 +60,39 @@
  }
 }

-.queue {
+.downloading {
  border-left-color: $purple !important;
 }

 .unmonitored {
  border-left-color: $gray !important;
-}
-
-.missingUnmonitored {
-  border-left-color: $warningColor !important;

  &:global(.colorImpaired) {
    background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
  }
 }

-.missingMonitored {
-  border-left-color: $dangerColor !important;
+.onAir {
+  border-left-color: $warningColor !important;

  &:global(.colorImpaired) {
    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
  }
 }

-.continuing {
-  border-left-color: $primaryColor !important;
+.missing {
+  border-left-color: $dangerColor !important;
+
+  &:global(.colorImpaired) {
+    border-left-color: color($dangerColor saturation(+15%)) !important;
+    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+  }
+}
+
+.unreleased {
+  border-left-color: $primaryColor !important;
+
+  &:global(.colorImpaired) {
+    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+  }
 }
--- a/frontend/src/Calendar/Events/CalendarEvent.js
+++ b/frontend/src/Calendar/Events/CalendarEvent.js
@@ -2,10 +2,10 @@ import classNames from 'classnames';
 import moment from 'moment';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import getStatusStyle from 'Calendar/getStatusStyle';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import { icons, kinds } from 'Helpers/Props';
-import getStatusStyle from 'Utilities/Movie/getStatusStyle';
 import translate from 'Utilities/String/translate';
 import CalendarEventQueueDetails from './CalendarEventQueueDetails';
 import styles from './CalendarEvent.css';
@@ -38,7 +38,7 @@ class CalendarEvent extends Component {

    const isDownloading = !!(queueItem || grabbed);
    const isMonitored = monitored;
-    const statusStyle = getStatusStyle(null, isMonitored, hasFile, isAvailable, 'style', isDownloading);
+    const statusStyle = getStatusStyle(hasFile, isDownloading, isAvailable, isMonitored);
    const joinedGenres = genres.slice(0, 2).join(', ');
    const link = `/movie/${titleSlug}`;
    const eventType = [];
--- a/frontend/src/Calendar/getStatusStyle.js
+++ b/frontend/src/Calendar/getStatusStyle.js
@@ -0,0 +1,23 @@
+
+function getStatusStyle(hasFile, downloading, isAvailable, isMonitored) {
+
+  if (hasFile) {
+    return 'downloaded';
+  }
+
+  if (downloading) {
+    return 'downloading';
+  }
+
+  if (!isMonitored) {
+    return 'unmonitored';
+  }
+
+  if (isAvailable && !hasFile) {
+    return 'missing';
+  }
+
+  return 'unreleased';
+}
+
+export default getStatusStyle;
--- a/frontend/src/Calendar/iCal/CalendarLinkModalContent.js
+++ b/frontend/src/Calendar/iCal/CalendarLinkModalContent.js
@@ -22,7 +22,7 @@ function getUrls(state) {
    tags
  } = state;

-  let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/v3/calendar/Radarr.ics?`;
+  let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/calendar/Radarr.ics?`;

  if (unmonitored) {
    icalUrl += 'unmonitored=true&';
--- a/frontend/src/Commands/commandNames.js
+++ b/frontend/src/Commands/commandNames.js
@@ -1,7 +1,7 @@
 export const APPLICATION_UPDATE = 'ApplicationUpdate';
 export const BACKUP = 'Backup';
 export const REFRESH_MONITORED_DOWNLOADS = 'RefreshMonitoredDownloads';
-export const CLEAR_BLOCKLIST = 'ClearBlocklist';
+export const CLEAR_BLACKLIST = 'ClearBlacklist';
 export const CLEAR_LOGS = 'ClearLog';
 export const CUTOFF_UNMET_MOVIES_SEARCH = 'CutoffUnmetMoviesSearch';
 export const DELETE_LOG_FILES = 'DeleteLogFiles';
--- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
+++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
@@ -129,7 +129,7 @@ class FileBrowserModalContent extends Component {
                className={styles.mappedDrivesWarning}
                kind={kinds.WARNING}
              >
-                <Link to="https://wiki.servarr.com/radarr/faq#why-cant-radarr-see-my-files-on-a-remote-server">
+                <Link to="https://wiki.servarr.com/Radarr_FAQ#Why_cant_Radarr_see_my_files_on_a_remote_server">
                  {translate('MappedDrivesRunningAsService')}
                </Link> .
              </Alert>
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js
@@ -16,7 +16,7 @@ function createTagListSelector() {
        (selectedFilterBuilderProp.type === filterBuilderTypes.NUMBER ||
        selectedFilterBuilderProp.type === filterBuilderTypes.STRING) &&
        filterType !== filterTypes.EQUAL &&
-        filterType !== filterTypes.NOT_EQUAL ||
+        filterType !== filterBuilderTypes.NOT_EQUAL ||
        !selectedFilterBuilderProp.optionsSelector
      ) {
        return [];
--- a/frontend/src/Components/Form/EnhancedSelectInput.css
+++ b/frontend/src/Components/Form/EnhancedSelectInput.css
@@ -85,21 +85,3 @@
  display: inline-block;
  margin: 5px -5px 5px 0;
 }
-
-.mobileCloseButtonContainer {
-  display: flex;
-  justify-content: flex-end;
-  height: 40px;
-  border-bottom: 1px solid $borderColor;
-}
-
-.mobileCloseButton {
-  width: 40px;
-  height: 40px;
-  text-align: center;
-  line-height: 40px;
-
-  &:hover {
-    color: $modalCloseButtonHoverColor;
-  }
-}
--- a/frontend/src/Components/Form/EnhancedSelectInput.js
+++ b/frontend/src/Components/Form/EnhancedSelectInput.js
@@ -479,7 +479,6 @@ class EnhancedSelectInput extends Component {
                                <OptionComponent
                                  key={v.key}
                                  id={v.key}
-                                  dividerAfter={v.dividerAfter}
                                  depth={depth}
                                  isSelected={isSelectedItem(index, this.props)}
                                  isDisabled={parentSelected}
@@ -519,18 +518,6 @@ class EnhancedSelectInput extends Component {
                scrollDirection={scrollDirections.NONE}
              >
                <Scroller className={styles.optionsModalScroller}>
-                  <div className={styles.mobileCloseButtonContainer}>
-                    <Link
-                      className={styles.mobileCloseButton}
-                      onPress={this.onOptionsModalClose}
-                    >
-                      <Icon
-                        name={icons.CLOSE}
-                        size={18}
-                      />
-                    </Link>
-                  </div>
-
                  {
                    values.map((v, index) => {
                      const hasParent = v.parentKey !== undefined;
@@ -540,7 +527,6 @@ class EnhancedSelectInput extends Component {
                        <OptionComponent
                          key={v.key}
                          id={v.key}
-                          dividerAfter={v.dividerAfter}
                          depth={depth}
                          isSelected={isSelectedItem(index, this.props)}
                          isMultiSelect={isMultiSelect}
--- a/frontend/src/Components/Form/EnhancedSelectInputOption.css
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.css
@@ -54,8 +54,4 @@
  &:last-child {
    border: none;
  }
-
-  &:hover {
-    background-color: unset;
-  }
 }
--- a/frontend/src/Components/Form/EnhancedSelectInputOption.js
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.js
@@ -12,9 +12,7 @@ class EnhancedSelectInputOption extends Component {
  //
  // Listeners

-  onPress = (e) => {
-    e.preventDefault();
-
+  onPress = () => {
    const {
      id,
      onSelect
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -13,7 +13,6 @@ import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
 import IndexerFlagsSelectInputConnector from './IndexerFlagsSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
-import LanguageSelectInputConnector from './LanguageSelectInputConnector';
 import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
 import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
@@ -73,9 +72,6 @@ function getComponent(type) {
    case inputTypes.INDEXER_FLAGS_SELECT:
      return IndexerFlagsSelectInputConnector;

-    case inputTypes.LANGUAGE_SELECT:
-      return LanguageSelectInputConnector;
-
    case inputTypes.SELECT:
      return EnhancedSelectInput;

@@ -113,8 +109,6 @@ function FormInputGroup(props) {
    helpTexts,
    helpTextWarning,
    helpLink,
-    inlineLink,
-    tooltip,
    pending,
    errors,
    warnings,
@@ -184,9 +178,6 @@ function FormInputGroup(props) {
        !checkInput && helpText &&
          <FormInputHelpText
            text={helpText}
-            link={inlineLink}
-            tooltip={tooltip}
-            isWarning={!!inlineLink}
          />
      }

@@ -268,8 +259,6 @@ FormInputGroup.propTypes = {
  helpTexts: PropTypes.arrayOf(PropTypes.string),
  helpTextWarning: PropTypes.string,
  helpLink: PropTypes.string,
-  inlineLink: PropTypes.string,
-  tooltip: PropTypes.string,
  pending: PropTypes.bool,
  errors: PropTypes.arrayOf(PropTypes.object),
  warnings: PropTypes.arrayOf(PropTypes.object)
--- a/frontend/src/Components/Form/HintedSelectInputOption.css
+++ b/frontend/src/Components/Form/HintedSelectInputOption.css
@@ -21,8 +21,3 @@
  color: $darkGray;
  font-size: $smallFontSize;
 }
-
-.divider {
-  border: none;
-  border-bottom: 1px solid $lightGray;
-}
--- a/frontend/src/Components/Form/HintedSelectInputOption.js
+++ b/frontend/src/Components/Form/HintedSelectInputOption.js
@@ -12,46 +12,37 @@ function HintedSelectInputOption(props) {
    depth,
    isSelected,
    isDisabled,
-    dividerAfter,
    isMultiSelect,
    isMobile,
    ...otherProps
  } = props;

  return (
-    <div>
-      <EnhancedSelectInputOption
-        id={id}
-        depth={depth}
-        isSelected={isSelected}
-        isDisabled={isDisabled}
-        isHidden={isDisabled}
-        isMultiSelect={isMultiSelect}
-        isMobile={isMobile}
-        {...otherProps}
+    <EnhancedSelectInputOption
+      id={id}
+      depth={depth}
+      isSelected={isSelected}
+      isDisabled={isDisabled}
+      isHidden={isDisabled}
+      isMultiSelect={isMultiSelect}
+      isMobile={isMobile}
+      {...otherProps}
+    >
+      <div className={classNames(
+        styles.optionText,
+        isMobile && styles.isMobile
+      )}
      >
-        <div className={classNames(
-          styles.optionText,
-          isMobile && styles.isMobile
-        )}
-        >
-          <div>{value}</div>
+        <div>{value}</div>

-          {
-            hint != null &&
-              <div className={styles.hintText}>
-                {hint}
-              </div>
-          }
-        </div>
-      </EnhancedSelectInputOption>
-
-      {
-        dividerAfter ?
-          <div className={styles.divider} /> :
-          null
-      }
-    </div>
+        {
+          hint != null &&
+            <div className={styles.hintText}>
+              {hint}
+            </div>
+        }
+      </div>
+    </EnhancedSelectInputOption>
  );
 }

@@ -59,18 +50,15 @@ HintedSelectInputOption.propTypes = {
  id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
  value: PropTypes.string.isRequired,
  hint: PropTypes.node,
-  name: PropTypes.string,
  depth: PropTypes.number,
  isSelected: PropTypes.bool.isRequired,
  isDisabled: PropTypes.bool.isRequired,
-  dividerAfter: PropTypes.bool.isRequired,
  isMultiSelect: PropTypes.bool.isRequired,
  isMobile: PropTypes.bool.isRequired
 };

 HintedSelectInputOption.defaultProps = {
  isDisabled: false,
-  dividerAfter: false,
  isHidden: false,
  isMultiSelect: false
 };
--- a/frontend/src/Components/Form/LanguageSelectInputConnector.js
+++ b/frontend/src/Components/Form/LanguageSelectInputConnector.js
@@ -1,52 +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, { values }) => values,
-    ( languages ) => {
-
-      const minId = languages.reduce((min, v) => (v.key < 1 ? v.key : min), languages[0].key);
-
-      const values = languages.map(({ key, value }) => {
-        return {
-          key,
-          value,
-          dividerAfter: minId < 1 ? key === minId : false
-        };
-      });
-
-      return {
-        values
-      };
-    }
-  );
-}
-
-class LanguageSelectInputConnector extends Component {
-
-  //
-  // Render
-
-  render() {
-
-    return (
-      <EnhancedSelectInput
-        {...this.props}
-        onChange={this.props.onChange}
-      />
-    );
-  }
-}
-
-LanguageSelectInputConnector.propTypes = {
-  name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.number]).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onChange: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps)(LanguageSelectInputConnector);
--- a/frontend/src/Components/Form/ProviderFieldFormGroup.js
+++ b/frontend/src/Components/Form/ProviderFieldFormGroup.js
@@ -49,7 +49,6 @@ function getSelectValues(selectOptions) {
    result.push({
      key: option.value,
      value: option.name,
-      dividerAfter: option.dividerAfter,
      hint: option.hint
    });

--- a/frontend/src/Components/Form/RootFolderSelectInputConnector.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputConnector.js
@@ -10,16 +10,13 @@ const ADD_NEW_KEY = 'addNew';
 function createMapStateToProps() {
  return createSelector(
    (state) => state.rootFolders,
-    (state, { value }) => value,
-    (state, { includeMissingValue }) => includeMissingValue,
    (state, { includeNoChange }) => includeNoChange,
-    (rootFolders, value, includeMissingValue, includeNoChange) => {
+    (rootFolders, includeNoChange) => {
      const values = rootFolders.items.map((rootFolder) => {
        return {
          key: rootFolder.path,
          value: rootFolder.path,
-          freeSpace: rootFolder.freeSpace,
-          isMissing: false
+          freeSpace: rootFolder.freeSpace
        };
      });

@@ -27,8 +24,7 @@ function createMapStateToProps() {
        values.unshift({
          key: 'noChange',
          value: 'No Change',
-          isDisabled: true,
-          isMissing: false
+          isDisabled: true
        });
      }

@@ -41,15 +37,6 @@ function createMapStateToProps() {
        });
      }

-      if (includeMissingValue && !values.find((v) => v.key === value)) {
-        values.push({
-          key: value,
-          value,
-          isMissing: true,
-          isDisabled: true
-        });
-      }
-
      values.push({
        key: ADD_NEW_KEY,
        value: 'Add a new path'
@@ -164,8 +151,7 @@ RootFolderSelectInputConnector.propTypes = {
 };

 RootFolderSelectInputConnector.defaultProps = {
-  includeNoChange: false,
-  value: ''
+  includeNoChange: false
 };

 export default connect(createMapStateToProps, createMapDispatchToProps)(RootFolderSelectInputConnector);
--- a/frontend/src/Components/Form/RootFolderSelectInputOption.css
+++ b/frontend/src/Components/Form/RootFolderSelectInputOption.css
@@ -29,9 +29,3 @@
  color: $darkGray;
  font-size: $smallFontSize;
 }
-
-.isMissing {
-  margin-left: 15px;
-  color: $dangerColor;
-  font-size: $smallFontSize;
-}
--- a/frontend/src/Components/Form/RootFolderSelectInputOption.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputOption.js
@@ -10,7 +10,6 @@ function RootFolderSelectInputOption(props) {
    id,
    value,
    freeSpace,
-    isMissing,
    movieFolder,
    isMobile,
    isWindows,
@@ -44,20 +43,11 @@ function RootFolderSelectInputOption(props) {
        </div>

        {
-          freeSpace == null ?
-            null :
+          freeSpace != null &&
            <div className={styles.freeSpace}>
              {formatBytes(freeSpace)} Free
            </div>
        }
-
-        {
-          isMissing ?
-            <div className={styles.isMissing}>
-              Missing
-            </div> :
-            null
-        }
      </div>
    </EnhancedSelectInputOption>
  );
@@ -68,7 +58,6 @@ RootFolderSelectInputOption.propTypes = {
  value: PropTypes.string.isRequired,
  freeSpace: PropTypes.number,
  movieFolder: PropTypes.string,
-  isMissing: PropTypes.boolean,
  isMobile: PropTypes.bool.isRequired,
  isWindows: PropTypes.bool
 };
--- a/frontend/src/Components/Label.css
+++ b/frontend/src/Components/Label.css
@@ -19,10 +19,6 @@
  &.outline {
    color: $dangerColor;
  }
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
-  }
 }

 .default {
@@ -89,10 +85,6 @@
  &.outline {
    color: $warningColor;
  }
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
-  }
 }

 .queue {
--- a/frontend/src/Components/Label.js
+++ b/frontend/src/Components/Label.js
@@ -11,7 +11,6 @@ function Label(props) {
    size,
    outline,
    children,
-    colorImpairedMode,
    ...otherProps
  } = props;

@@ -21,8 +20,7 @@ function Label(props) {
        className,
        styles[kind],
        styles[size],
-        outline && styles.outline,
-        colorImpairedMode && 'colorImpaired'
+        outline && styles.outline
      )}
      {...otherProps}
    >
@@ -36,16 +34,14 @@ Label.propTypes = {
  kind: PropTypes.oneOf(kinds.all).isRequired,
  size: PropTypes.oneOf(sizes.all).isRequired,
  outline: PropTypes.bool.isRequired,
-  children: PropTypes.node.isRequired,
-  colorImpairedMode: PropTypes.bool
+  children: PropTypes.node.isRequired
 };

 Label.defaultProps = {
  className: styles.label,
  kind: kinds.DEFAULT,
  size: sizes.SMALL,
-  outline: false,
-  colorImpairedMode: false
+  outline: false
 };

 export default Label;
--- a/frontend/src/Components/Link/Link.js
+++ b/frontend/src/Components/Link/Link.js
@@ -38,12 +38,11 @@ class Link extends Component {
    const linkProps = { target };
    let el = component;

-    if (to && typeof to === 'string') {
+    if (to) {
      if ((/\w+?:\/\//).test(to)) {
        el = 'a';
        linkProps.href = to;
        linkProps.target = target || '_blank';
-        linkProps.rel = 'noreferrer';
      } else if (noRouter) {
        el = 'a';
        linkProps.href = to;
@@ -53,18 +52,6 @@ class Link extends Component {
        linkProps.to = `${window.Radarr.urlBase}/${to.replace(/^\//, '')}`;
        linkProps.target = target;
      }
-    } else if (to && typeof to === 'object') {
-      el = RouterLink;
-      linkProps.target = target;
-      if (to.pathname.startsWith(`${window.Radarr.urlBase}/`)) {
-        linkProps.to = to;
-      } else {
-        const pathname = `${window.Radarr.urlBase}/${to.pathname.replace(/^\//, '')}`;
-        linkProps.to = {
-          ...to,
-          pathname
-        };
-      }
    }

    if (el === 'button' || el === 'input') {
@@ -95,7 +82,7 @@ class Link extends Component {
 Link.propTypes = {
  className: PropTypes.string,
  component: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
-  to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+  to: PropTypes.string,
  target: PropTypes.string,
  isDisabled: PropTypes.bool,
  noRouter: PropTypes.bool,
--- a/frontend/src/Components/Loading/LoadingMessage.css
+++ b/frontend/src/Components/Loading/LoadingMessage.css
@@ -1,5 +1,5 @@
 .loadingMessage {
-  margin: 10px 10px 0;
+  margin: 50px 10px 0;
  text-align: center;
  font-weight: 300;
  font-size: 36px;
--- a/frontend/src/Components/Loading/LoadingMessage.js
+++ b/frontend/src/Components/Loading/LoadingMessage.js
@@ -12,7 +12,7 @@ const messages = [
  'Hum something loud while others stare',
  'Loading humorous message... Please Wait',
  'I could\'ve been faster in Python',
-  'Don\'t forget to rewind your movies',
+  '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...',
--- a/frontend/src/Components/Modal/ConfirmModal.js
+++ b/frontend/src/Components/Modal/ConfirmModal.js
@@ -30,10 +30,10 @@ function ConfirmModal(props) {
  useEffect(() => {
    if (isOpen) {
      bindShortcut('enter', onConfirm);
-
-      return () => unbindShortcut('enter', onConfirm);
+    } else {
+      unbindShortcut('enter', onConfirm);
    }
-  }, [isOpen, onConfirm]);
+  }, [onConfirm]);

  return (
    <Modal
--- a/frontend/src/Components/Page/Header/PageHeader.js
+++ b/frontend/src/Components/Page/Header/PageHeader.js
@@ -53,13 +53,7 @@ class PageHeader extends Component {
    return (
      <div className={styles.header}>
        <div className={styles.logoContainer}>
-          <Link
-            className={styles.logoLink}
-            to={{
-              pathname: '/',
-              state: { restoreScrollPosition: true }
-            }}
-          >
+          <Link to={'/'}>
            <img
              className={isSmallScreen ? styles.logo : styles.logoFull}
              src={isSmallScreen ? `${window.Radarr.urlBase}/Content/Images/logo.png` : `${window.Radarr.urlBase}/Content/Images/logo-full.png`}
--- a/frontend/src/Components/Page/LoadingPage.css
+++ b/frontend/src/Components/Page/LoadingPage.css
@@ -1,11 +1,3 @@
 .page {
  composes: page from '~./Page.css';
 }
-
-.logoFull {
-  margin-top: 50px;
-  margin-right: auto;
-  margin-left: auto;
-  width: 120px;
-  height: 40px;
-}
--- a/frontend/src/Components/Page/LoadingPage.js
+++ b/frontend/src/Components/Page/LoadingPage.js
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -61,8 +61,8 @@ const links = [
        to: '/activity/history'
      },
      {
-        title: translate('Blocklist'),
-        to: '/activity/blocklist'
+        title: translate('Blacklist'),
+        to: '/activity/blacklist'
      }
    ]
  },
--- a/frontend/src/Components/Page/Toolbar/PageToolbarSection.js
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarSection.js
@@ -10,7 +10,6 @@ import SpinnerIcon from 'Components/SpinnerIcon';
 import { forEach } from 'Helpers/elementChildren';
 import { align, icons } from 'Helpers/Props';
 import dimensions from 'Styles/Variables/dimensions';
-import translate from 'Utilities/String/translate';
 import styles from './PageToolbarSection.css';

 const BUTTON_WIDTH = parseInt(dimensions.toolbarButtonWidth);
@@ -162,7 +161,7 @@ class PageToolbarSection extends Component {
                      <ToolbarMenuButton
                        className={styles.overflowMenuButton}
                        iconName={icons.OVERFLOW}
-                        text={translate('More')}
+                        text="More"
                      />

                      <MenuContent>
--- a/frontend/src/Components/ProgressBar.css
+++ b/frontend/src/Components/ProgressBar.css
@@ -49,7 +49,7 @@
  background-color: $dangerColor;

  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, $dangerColor, $dangerColor 5px, $dangerColor 5px, $dimColor 10px);
+    background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
  }
 }

@@ -65,7 +65,7 @@
  background-color: $warningColor;

  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, $warningColor 5px, $dimColor 10px);
+    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
  }
 }

--- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { DndProvider } from 'react-dnd-multi-backend';
-import HTML5toTouch from 'react-dnd-multi-backend/dist/esm/HTML5toTouch';
+import { DndProvider } from 'react-dnd';
+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';
@@ -128,7 +128,7 @@ class TableOptionsModal extends Component {
    const isDraggingDown = isDragging && dropIndex > dragIndex;

    return (
-      <DndProvider options={HTML5toTouch}>
+      <DndProvider backend={HTML5Backend}>
        <Modal
          isOpen={isOpen}
          onModalClose={onModalClose}
--- a/frontend/src/Components/Table/VirtualTable.js
+++ b/frontend/src/Components/Table/VirtualTable.js
@@ -39,8 +39,7 @@ class VirtualTable extends Component {
    super(props, context);

    this.state = {
-      width: 0,
-      scrollRestored: false
+      width: 0
    };

    this._grid = null;
@@ -49,13 +48,11 @@ class VirtualTable extends Component {
  componentDidUpdate(prevProps, prevState) {
    const {
      items,
-      scrollIndex,
-      scrollTop
+      scrollIndex
    } = this.props;

    const {
-      width,
-      scrollRestored
+      width
    } = this.state;

    if (this._grid &&
@@ -71,11 +68,6 @@ class VirtualTable extends Component {
        columnIndex: 0
      });
    }
-
-    if (this._grid && scrollTop !== undefined && scrollTop !== 0 && !scrollRestored) {
-      this.setState({ scrollRestored: true });
-      this._grid.scrollToPosition({ scrollTop });
-    }
  }

  //
@@ -104,7 +96,6 @@ class VirtualTable extends Component {
      items,
      scroller,
      focusScroller,
-      scrollTop: ignored,
      header,
      headerHeight,
      rowRenderer,
@@ -189,7 +180,6 @@ VirtualTable.propTypes = {
  className: PropTypes.string.isRequired,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  scrollIndex: PropTypes.number,
-  scrollTop: PropTypes.number,
  scroller: PropTypes.instanceOf(Element).isRequired,
  focusScroller: PropTypes.bool.isRequired,
  header: PropTypes.node.isRequired,
--- a/frontend/src/Components/keyboardShortcuts.js
+++ b/frontend/src/Components/keyboardShortcuts.js
@@ -77,10 +77,8 @@ function keyboardShortcuts(WrappedComponent) {
    }

    unbindShortcut = (key) => {
-      if (this._mousetrap != null) {
-        delete this._mousetrapBindings[key];
-        this._mousetrap.unbind(key);
-      }
+      delete this._mousetrapBindings[key];
+      this._mousetrap.unbind(key);
    }

    unbindAllShortcuts = () => {
--- a/frontend/src/Components/withScrollPosition.js
+++ b/frontend/src/Components/withScrollPosition.js
@@ -8,7 +8,7 @@ function withScrollPosition(WrappedComponent, scrollPositionKey) {
      history
    } = props;

-    const scrollTop = history.action === 'POP' || (history.location.state && history.location.state.restoreScrollPosition) ?
+    const scrollTop = history.action === 'POP' ?
      scrollPositions[scrollPositionKey] :
      0;

--- a/frontend/src/Content/Images/Icons/logo-lidarr.png
+++ b/frontend/src/Content/Images/Icons/logo-lidarr.png
--- a/frontend/src/Content/Images/Icons/logo-prowlarr.png
+++ b/frontend/src/Content/Images/Icons/logo-prowlarr.png
--- a/frontend/src/Content/Images/Icons/logo-radarr.png
+++ b/frontend/src/Content/Images/Icons/logo-radarr.png
--- a/frontend/src/Content/Images/Icons/logo-readarr.png
+++ b/frontend/src/Content/Images/Icons/logo-readarr.png
--- a/frontend/src/Content/Images/Icons/logo-sonarr.png
+++ b/frontend/src/Content/Images/Icons/logo-sonarr.png
--- a/frontend/src/Content/Theme.Park/Resources/blur-noise.png
+++ b/frontend/src/Content/Theme.Park/Resources/blur-noise.png
--- a/frontend/src/Content/Theme.Park/Themes/aquamarine.css
+++ b/frontend/src/Content/Theme.Park/Themes/aquamarine.css
@@ -1,30 +0,0 @@
-:root {
-  --main-bg-color: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-  
-  --modal-bg-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-  --modal-header-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-  --modal-footer-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-
-  --drop-down-menu-bg: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-
-  --button-color: #009688;
-  --button-color-hover: #12afa0;
-  --button-text: #eee;
-  --button-text-hover: #FFF;
-
-  --accent-color:  18, 175, 160;
-  --accent-color-hover: rgb(var(--accent-color),.8);
-  --link-color: #0ed2bf;
-  --link-color-hover: #36e7d6;
-  --label-text-color: #fff;
-
-  --text:#ddd;
-  --text-hover: #fff;
-  --text-muted: #999;
-
-  /*Specials*/
-  --arr-queue-color: #009688; /* Servarr apps + Bazarr*/
-  --plex-poster-unwatched: rgb(21, 213, 194);
-  --petio-spinner: invert(39%) sepia(98%) saturate(527%) hue-rotate(129deg) brightness(94%) contrast(101%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
-  --gitea-color-primary-dark-4: 18, 175, 160;
-}
--- a/frontend/src/Content/Theme.Park/Themes/dark.css
+++ b/frontend/src/Content/Theme.Park/Themes/dark.css
@@ -1,30 +0,0 @@
-:root {
-  --main-bg-color: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-  
-  --modal-bg-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-  --modal-header-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-  --modal-footer-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-
-  --drop-down-menu-bg: #2d2d2d;
-
-  --button-color: #7a7a7a;
-  --button-color-hover: #9b9b9b;
-  --button-text: #eee;
-  --button-text-hover: #FFF;
-
-  --accent-color: 170, 170, 170;
-  --accent-color-hover: rgba(255, 255, 255, 0.45);
-  --link-color: #7a7a7a;
-  --link-color-hover: #fff;
-  --label-text-color: black;
-    
-  --text:#ddd;
-  --text-hover: #fff;
-  --text-muted: #999;
-
-  /*Specials*/
-  --arr-queue-color: #6b5; /* Servarr apps + Bazarr*/
-  --plex-poster-unwatched: #e5a00d;
-  --petio-spinner: invert(35%) sepia(12%) saturate(4%) hue-rotate(2deg) brightness(104%) contrast(86%);/* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
-  --gitea-color-primary-dark-4: 255, 255, 255;
-}
--- a/frontend/src/Content/Theme.Park/Themes/dracula.css
+++ b/frontend/src/Content/Theme.Park/Themes/dracula.css
@@ -1,30 +0,0 @@
-:root {
-  --main-bg-color: #282a36;
-  
-  --modal-bg-color: #1e2029;
-  --modal-header-color: #1e2029;
-  --modal-footer-color: #1e2029;
-
-  --drop-down-menu-bg: #1e2029;
-
-  --button-color: #bd93f9;
-  --button-color-hover: #ff79c6;
-  --button-text: #eee;
-  --button-text-hover: #FFF;
-
-  --accent-color:  80, 250, 123;
-  --accent-color-hover: rgb(var(--accent-color),.8);
-  --link-color: #ff79c6;
-  --link-color-hover: #8be9fd;
-  --label-text-color: #282a36;
-    
-  --text:#6272a4;
-  --text-hover: #95adfa;
-  --text-muted: #999;
-
-  /*Specials*/
-  --arr-queue-color: #50fa7b; /* Servarr apps + Bazarr*/
-  --plex-poster-unwatched: #bd93f9;
-  --petio-spinner: invert(79%) sepia(27%) saturate(1033%) hue-rotate(74deg) brightness(104%) contrast(96%);/* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
-  --gitea-color-primary-dark-4: 80, 250, 123;
-  }
--- a/Show More
+++ b/Show More