Fixed: Clarify delay profile bypass only applies to preferred protocol

Bump version 3.2.1
Added translation using Weblate (Chinese (Traditional) (zh_TW)) [skip ci]
2026-04-18 21:35:51 -04:00 · 2021-05-27 07:48:55 -04:00 · 2021-05-27 07:48:24 -04:00 · 2021-05-26 23:41:04 -04:00 · 2021-05-24 20:40:35 -04:00 · 2021-05-24 00:41:35 -04:00
634 changed files with 34363 additions and 10072 deletions
@@ -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,10 +163,16 @@ 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
@@ -175,12 +181,14 @@ 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
@@ -202,6 +210,7 @@ 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
@@ -247,6 +256,8 @@ 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
@@ -1,35 +1,37 @@
 ---
 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!
+about: Support Requests will be closed immediately, if you are not 100% certain this is a bug please go to our Reddit or Discord first. Exceptions do not mean you found a bug!
 title: ''
-labels: bug
+labels: 'Type: Bug'
 assignees: ''
 ---
-
+<!-- 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! -->
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 **To Reproduce**
-Steps to reproduce the behavior:
+<!-- Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
-4. See error
+4. See error -->
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen.-->
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+<!-- 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]
+ - OS: <!-- [e.g. Windows 10 2004 / Ubuntu 20.04] -->
- - Docker: [Yes/No]
+ - Docker: <!-- [Yes/No] -->
- - Mono or.NET Core Version: [e.g. Mono 5.8 or .Net Core 3.1.10] (found under System -> Status)
+ - Mono or .NET Version (System -> Status): <!--[e.g. Mono 5.8 or .Net Core 3.1.10 or .NET 5.0.1] -->
- - Browser and Version [e.g. chrome 86.0.4240.198] (Only needed for UI issues)
+ - Browser and Version (Only needed for UI issues): <!--[e.g. chrome 86.0.4240.198] -->
- - Radarr Version [e.g. 3.0.0.2956]
+ - Radarr Version: <!--[e.g. 3.0.1.4259, 3.0.2.4369]-->
- - Radarr Branch [e.g. master]
+ - Radarr Branch: <!--[e.g. master, develop]-->
 **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!**
+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!**
 <!-- Trace logs are named Radarr.trace.txt or Radarr.trace.#.txt and will contain "trace" in them-->
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Support via Discord
-    url: https://discord.gg/r5wJPt9
+    url: https://radarr.video/discord
    about: Chat with users and devs on support and setup related topics.
  - name: Support via Reddit
    url: https://reddit.com/r/radarr
@@ -8,13 +8,13 @@ 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 [...]
+<!-- 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.
+<!-- 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.
+<!-- 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.
+<!-- Add any other context or screenshots about the feature request here. -->
@@ -1,2 +0,0 @@
 todo:
  keyword: "TODO"
@@ -1,38 +0,0 @@
 # Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
 # Number of days of inactivity before a closed issue or pull request is locked
 daysUntilLock: 60
 # Skip issues and pull requests created before a given timestamp. Timestamp must
 # follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
 skipCreatedBefore: false
 # Issues and pull requests with these labels will be ignored. Set to `[]` to disable
 exemptLabels: []
 # Label to add before locking, such as `outdated`. Set to `false` to disable
 lockLabel: false
 # Comment to post before locking. Set to `false` to disable
 lockComment: >
  This thread has been automatically locked since there has not been
  any recent activity after it was closed. Please open a new issue for
  related bugs.
 # Assign `resolved` as the reason for locking. Set to `false` to disable
 setLockReason: true
 # Limit to only `issues` or `pulls`
 # only: issues
 # Optionally, specify configuration settings just for `issues` or `pulls`
 # issues:
 #   exemptLabels:
 #     - help-wanted
 #   lockLabel: outdated
 # pulls:
 #   daysUntilLock: 30
 # Repository to extend settings from
 # _extends: repo
@@ -1 +0,0 @@
@@ -5,12 +5,10 @@ daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
  - feature request
-  - parser
+  - 'Status: Confirmed'
  - 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
@@ -1,13 +0,0 @@
 # 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
@@ -0,0 +1,21 @@
 name: 'Lock threads'
 on:
  workflow_dispatch:
  schedule:
    - cron: '0 0 * * *'
 jobs:
  lock:
    runs-on: ubuntu-latest
    steps:
      - uses: dessant/lock-threads@v2
        with:
          github-token: ${{ github.token }}
          issue-lock-inactive-days: '90'
          issue-exclude-created-before: ''
          issue-exclude-labels: ''
          issue-lock-labels: ''
          issue-lock-comment: ''
          issue-lock-reason: 'resolved'
          process-only: ''
@@ -0,0 +1,21 @@
 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
@@ -11,19 +11,19 @@ Setup guides, FAQ, the more information we have on the [wiki](https://wiki.serva
 - 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)
+- [NodeJS](https://nodejs.org/en/download/) (Node 12.X.X or higher)
 - [Yarn](https://yarnpkg.com/)
- .NET Core 3.1. 
+- .NET Core 5.0. 
 ### Getting started ###
 1. Fork Radarr
-2. Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
+2. Clone the repository into your development machine. [*info*](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository-from-github)
 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`
+5. Build the project in Visual Studio, Setting startup project to `Radarr.Console` and framework to `net5.0`
 6. Debug the project in Visual Studio
-7. Open http://localhost:8686
+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)
@@ -28,18 +28,20 @@ Radarr is a movie collection manager for Usenet and BitTorrent users. It can mon
 * Adding metadata such as posters and information for Kodi and others to use
 * Advanced customization for profiles, such that Radarr will always download the copy you want
 ## Feature Requests
 [Feature Requests](https://github.com/lidarr/Radarr/issues/new?assignees=&labels=Type%3A+Enhancement&template=feature_request.md&title=)
 ## Support
 Note: GitHub Issues are for Bugs and Feature Requests Only
-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://discord.gg/r5wJPt9)
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://radarr.video/discord)
 [![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/github-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)
-## Contributors
+## 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/)
 This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
 <a href="https://github.com/Radarr/Radarr/graphs/contributors"><img src="https://opencollective.com/Radarr/contributors.svg?width=890&button=false" /></a>
@@ -72,4 +74,4 @@ Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrai
 ### License
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-* Copyright 2010-2020
+* Copyright 2010-2021
@@ -7,13 +7,13 @@ variables:
  outputFolder: './_output'
  artifactsFolder: './_artifacts'
  testsFolder: './_tests'
-  majorVersion: '3.0.0'
+  majorVersion: '3.2.1'
  minorVersion: $[counter('minorVersion', 2000)]
  radarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(radarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '3.1.404'
+  dotnetVersion: '5.0.202'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
 trigger:
@@ -23,7 +23,12 @@ trigger:
    - master
 pr:
- develop
+  branches:
    include:
    - develop
  paths:
    exclude:
    - src/NzbDrone.Core/Localization/Core
 stages:
  - stage: Setup
@@ -59,18 +64,21 @@ stages:
          Linux:
            osName: 'Linux'
            imageName: 'ubuntu-18.04'
            enableAnalysis: 'true'
          Mac:
            osName: 'Mac'
            imageName: 'macos-10.14'
            enableAnalysis: 'false'
          Windows:
            osName: 'Windows'
            imageName: 'windows-2019'
            enableAnalysis: 'false'
      pool:
        vmImage: $(imageName)
      variables:
        # Disable stylecop here - linting errors get caught by the analyze task
-        EnableAnalyzers: 'false'
+        EnableAnalyzers: $(enableAnalysis)
      steps:
      - checkout: self
        submodules: true
@@ -79,7 +87,18 @@ stages:
        displayName: 'Install .net core'
        inputs:
          version: $(dotnetVersion)
-      - bash: ./build.sh --backend
+      - 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
        displayName: Build Radarr Backend
      - bash: |
          find ${OUTPUTFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
@@ -92,23 +111,27 @@ stages:
        artifact: '$(osName)Backend'
        displayName: Publish Backend
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/netcoreapp3.1/win-x64/publish'
+      - publish: '$(testsFolder)/net5.0/win-x64/publish'
        artifact: WindowsCoreTests
        displayName: Publish Windows Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net462/linux-x64/publish'
+      - publish: '$(testsFolder)/net472/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'
+      - publish: '$(testsFolder)/net5.0/linux-x64/publish'
        artifact: LinuxCoreTests
        displayName: Publish Linux Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/netcoreapp3.1/linux-musl-x64/publish'
+      - publish: '$(testsFolder)/net5.0/linux-musl-x64/publish'
        artifact: LinuxMuslCoreTests
        displayName: Publish Linux Musl Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/netcoreapp3.1/osx-x64/publish'
+      - 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'
        artifact: MacCoreTests
        displayName: Publish MacOS Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
@@ -135,7 +158,7 @@ stages:
      - task: NodeTool@0
        displayName: Set Node.js version
        inputs:
-          versionSpec: '10.x'
+          versionSpec: '12.x'
      - checkout: self
        submodules: true
        fetchDepth: 1
@@ -184,12 +207,12 @@ stages:
      - bash: ./build.sh --packages
        displayName: Create Packages
      - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x86
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net5.0 //DRuntime=win-x86
-          cp setup/output/Radarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
+          cp setup/output/Radarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
        displayName: Create .NET Core Windows installer
      - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x64
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net5.0 //DRuntime=win-x64
-          cp setup/output/Radarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
+          cp setup/output/Radarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
        displayName: Create .NET Core Windows installer
      - publish: $(Build.ArtifactStagingDirectory)
        artifact: 'WindowsInstaller'
@@ -219,7 +242,7 @@ stages:
          artifactName: WindowsFrontend
          targetPath: _output
        displayName: Fetch Frontend
-      - bash: ./build.sh --packages
+      - bash: ./build.sh --packages --enable-bsd
        displayName: Create Packages
      - bash: |
          find . -name "Radarr" -exec chmod a+x {} \;
@@ -231,21 +254,21 @@ stages:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).windows-core-x64.zip'
          archiveType: 'zip'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x64/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/win-x64/net5.0
      - 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/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/win-x86/net5.0
      - 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/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/macos-app/net5.0
      - task: ArchiveFiles@2
        displayName: Create MacOS Core tar
        inputs:
@@ -253,7 +276,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/macos/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/macos/net5.0
      - task: ArchiveFiles@2
        displayName: Create Linux Mono tar
        inputs:
@@ -261,7 +284,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-x64/net462
+          rootFolderOrFile: $(artifactsFolder)/linux-x64/net472
      - task: ArchiveFiles@2
        displayName: Create Linux Core tar
        inputs:
@@ -269,7 +292,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-x64/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/linux-x64/net5.0
      - task: ArchiveFiles@2
        displayName: Create Linux Musl Core tar
        inputs:
@@ -277,7 +300,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net5.0
      - task: ArchiveFiles@2
        displayName: Create ARM32 Linux Core tar
        inputs:
@@ -285,7 +308,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/linux-arm/net5.0
      - task: ArchiveFiles@2
        displayName: Create ARM64 Linux Core tar
        inputs:
@@ -293,7 +316,7 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm64/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net5.0
      - task: ArchiveFiles@2
        displayName: Create ARM64 Linux Musl Core tar
        inputs:
@@ -301,7 +324,15 @@ stages:
          archiveType: 'tar'
          tarCompression: 'gz'
          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/netcoreapp3.1
+          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
      - publish: $(Build.ArtifactStagingDirectory)
        artifact: 'Packages'
        displayName: Publish Packages
@@ -355,24 +386,34 @@ 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.14'
          WindowsCore:
            osName: 'Windows'
            testName: 'WindowsCore'
            poolName: 'Azure Pipelines'
            imageName: 'windows-2019'
          LinuxCore:
            osName: 'Linux'
            testName: 'LinuxCore'
            poolName: 'Azure Pipelines'
            imageName: 'ubuntu-18.04'
-            pattern: 'Radarr.**.linux-core-x64.tar.gz'
+          FreebsdCore:
            osName: 'Linux'
            testName: 'FreebsdCore'
            poolName: 'FreeBSD'
            imageName:
      pool:
        name: $(poolName)
        vmImage: $(imageName)
      steps:
@@ -381,6 +422,7 @@ stages:
        displayName: 'Install .net core'
        inputs:
          version: $(dotnetVersion)
        condition: ne(variables['poolName'], 'FreeBSD')
      - task: DownloadPipelineArtifact@2
        displayName: Download Test Artifact
        inputs:
@@ -393,7 +435,7 @@ stages:
          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'))
+        condition: and(succeeded(), eq(variables['testName'], 'LinuxCore'))
      - powershell: Set-Service SCardSvr -StartupType Manual
        displayName: Enable Windows Test Service
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
@@ -431,19 +473,19 @@ stages:
          mono520:
            testName: 'Mono 5.20'
            artifactName: LinuxTests
-            containerImage: servarr/testimages:mono-5.20
+            containerImage: ghcr.io/servarr/testimages:mono-5.20
          mono610:
            testName: 'Mono 6.10'
            artifactName: LinuxTests
-            containerImage: servarr/testimages:mono-6.10
+            containerImage: ghcr.io/servarr/testimages:mono-6.10
          mono612:
            testName: 'Mono 6.12'
            artifactName: LinuxTests
-            containerImage: servarr/testimages:mono-6.12
+            containerImage: ghcr.io/servarr/testimages:mono-6.12
          alpine:
            testName: 'Musl Net Core'
            artifactName: LinuxMuslCoreTests
-            containerImage: servarr/testimages:alpine
+            containerImage: ghcr.io/servarr/testimages:alpine
      pool:
        vmImage: 'ubuntu-18.04'
@@ -508,17 +550,17 @@ stages:
            osName: 'Mac'
            testName: 'MacCore'
            imageName: 'macos-10.14'
-            pattern: 'Radarr.**.osx-core-x64.tar.gz'
+            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)
@@ -571,6 +613,52 @@ 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
@@ -580,23 +668,23 @@ stages:
          mono520:
            testName: 'Mono 5.20'
            artifactName: LinuxTests
-            containerImage: servarr/testimages:mono-5.20
+            containerImage: ghcr.io/servarr/testimages:mono-5.20
-            pattern: 'Radarr.**.linux.tar.gz'
+            pattern: 'Radarr.*.linux.tar.gz'
          mono610:
            testName: 'Mono 6.10'
            artifactName: LinuxTests
-            containerImage: servarr/testimages:mono-6.10
+            containerImage: ghcr.io/servarr/testimages:mono-6.10
-            pattern: 'Radarr.**.linux.tar.gz'
+            pattern: 'Radarr.*.linux.tar.gz'
          mono612:
            testName: 'Mono 6.12'
            artifactName: LinuxTests
-            containerImage: servarr/testimages:mono-6.12
+            containerImage: ghcr.io/servarr/testimages:mono-6.12
-            pattern: 'Radarr.**.linux.tar.gz'
+            pattern: 'Radarr.*.linux.tar.gz'
          alpine:
            testName: 'Musl Net Core'
            artifactName: LinuxMuslCoreTests
-            containerImage: servarr/testimages:alpine
+            containerImage: ghcr.io/servarr/testimages:alpine
-            pattern: 'Radarr.**.linux-musl-core-x64.tar.gz'
+            pattern: 'Radarr.*.linux-musl-core-x64.tar.gz'
      pool:
        vmImage: 'ubuntu-18.04'
@@ -655,17 +743,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.14'
-            pattern: 'Radarr.**.osx-core-x64.tar.gz'
+            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:
@@ -757,7 +845,7 @@ stages:
      - task: NodeTool@0
        displayName: Set Node.js version
        inputs:
-          versionSpec: '10.x'
+          versionSpec: '12.x'
      - checkout: self
        submodules: true
        fetchDepth: 1
@@ -803,6 +891,7 @@ stages:
      variables:
        disable.coverage.autogenerate: 'true'
        EnableAnalyzers: 'false'
      pool:
        vmImage: windows-2019
@@ -831,8 +920,8 @@ stages:
            sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
            sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
      - bash: |
-          ./build.sh --backend -f netcoreapp3.1 -r win-x64
+          ./build.sh --backend -f net5.0 -r win-x64
-          TEST_DIR=_tests/netcoreapp3.1/win-x64/publish/ ./test.sh Windows Unit Coverage
+          TEST_DIR=_tests/net5.0/win-x64/publish/ ./test.sh Windows Unit Coverage
        displayName: Coverage Unit Tests
      - task: SonarCloudAnalyze@1
        condition: eq(variables['System.PullRequest.IsFork'], 'False')
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 set -e
 outputFolder='_output'
@@ -25,6 +25,18 @@ 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
        sed -i'' -e "s^<ExcludedRuntimeFrameworkPairs>\(.*\)</ExcludedRuntimeFrameworkPairs>^<ExcludedRuntimeFrameworkPairs>\1;freebsd-x64:net472</ExcludedRuntimeFrameworkPairs>^g" src/Directory.Build.props
    fi
 }
 LintUI()
 {
    ProgressStart 'ESLint'
@@ -75,11 +87,11 @@ YarnInstall()
    ProgressEnd 'yarn install'
 }
-RunGulp()
+RunWebpack()
 {
-    ProgressStart 'Running gulp'
+    ProgressStart 'Running webpack'
-    yarn run build --production
+    yarn run build --env production
-    ProgressEnd 'Running gulp'
+    ProgressEnd 'Running webpack'
 }
 PackageFiles()
@@ -118,7 +130,7 @@ PackageLinux()
    echo "Adding Radarr.Mono to UpdatePackage"
    cp $folder/Radarr.Mono.* $folder/Radarr.Update
-    if [ "$framework" = "netcoreapp3.1" ]; then
+    if [ "$framework" = "net5.0" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Radarr.Update
    fi
@@ -136,7 +148,7 @@ PackageMacOS()
    PackageFiles "$folder" "$framework" "osx-x64"
-    if [ "$framework" = "net462" ]; then
+    if [ "$framework" = "net472" ]; then
        echo "Adding Startup script"
        cp macOS/Radarr $folder
    fi
@@ -150,7 +162,7 @@ PackageMacOS()
    echo "Adding Radarr.Mono to UpdatePackage"
    cp $folder/Radarr.Mono.* $folder/Radarr.Update
-    if [ "$framework" = "netcoreapp3.1" ]; then
+    if [ "$framework" = "net5.0" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Radarr.Update
    fi
@@ -190,6 +202,7 @@ 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.*
@@ -211,7 +224,7 @@ Package()
    IFS='-' read -ra SPLIT <<< "$runtime"
    case "${SPLIT[0]}" in
-        linux)
+        linux|freebsd*)
            PackageLinux "$framework" "$runtime"
            ;;
        win)
@@ -256,6 +269,7 @@ if [ $# -eq 0 ]; then
    FRONTEND=YES
    PACKAGES=YES
    LINT=YES
    ENABLE_BSD=NO
 fi
 while [[ $# -gt 0 ]]
@@ -267,6 +281,10 @@ case $key in
        BACKEND=YES
        shift # past argument
        ;;
    --enable-bsd)
        ENABLE_BSD=YES
        shift # past argument
        ;;
    -r|--runtime)
        RID="$2"
        shift # past argument
@@ -307,15 +325,23 @@ 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 "netcoreapp3.1" "win-x64"
+        PackageTests "net5.0" "win-x64"
-        PackageTests "netcoreapp3.1" "win-x86"
+        PackageTests "net5.0" "win-x86"
-        PackageTests "netcoreapp3.1" "linux-x64"
+        PackageTests "net5.0" "linux-x64"
-        PackageTests "netcoreapp3.1" "linux-musl-x64"
+        PackageTests "net5.0" "linux-musl-x64"
-        PackageTests "netcoreapp3.1" "osx-x64"
+        PackageTests "net5.0" "osx-x64"
-        PackageTests "net462" "linux-x64"
+        PackageTests "net472" "linux-x64"
        if [ "$ENABLE_BSD" = "YES" ];
        then
            PackageTests "net5.0" "freebsd-x64"
        fi
    else
        PackageTests "$FRAMEWORK" "$RID"
    fi
@@ -324,7 +350,7 @@ fi
 if [ "$FRONTEND" = "YES" ];
 then
    YarnInstall
-    RunGulp
+    RunWebpack
 fi
 if [ "$LINT" = "YES" ];
@@ -343,15 +369,19 @@ then
    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
-        Package "netcoreapp3.1" "win-x64"
+        Package "net5.0" "win-x64"
-        Package "netcoreapp3.1" "win-x86"
+        Package "net5.0" "win-x86"
-        Package "netcoreapp3.1" "linux-x64"
+        Package "net5.0" "linux-x64"
-        Package "netcoreapp3.1" "linux-musl-x64"
+        Package "net5.0" "linux-musl-x64"
-        Package "netcoreapp3.1" "linux-arm64"
+        Package "net5.0" "linux-arm64"
-        Package "netcoreapp3.1" "linux-musl-arm64"
+        Package "net5.0" "linux-musl-arm64"
-        Package "netcoreapp3.1" "linux-arm"
+        Package "net5.0" "linux-arm"
-        Package "netcoreapp3.1" "osx-x64"
+        Package "net5.0" "osx-x64"
-        Package "net462" "linux-x64"
+        Package "net472" "linux-x64"
        if [ "$ENABLE_BSD" = "YES" ];
        then
            Package "net5.0" "freebsd-x64"
        fi
    else
        Package "$FRAMEWORK" "$RID"
    fi
@@ -6,8 +6,10 @@ const dirs = fs
  .map((dirent) => dirent.name)
  .join('|');
 const frontendFolder = __dirname;
 module.exports = {
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
  env: {
    browser: true,
@@ -25,6 +27,9 @@ module.exports = {
  parserOptions: {
    ecmaVersion: 6,
    sourceType: 'module',
    babelOptions: {
      configFile: `${frontendFolder}/babel.config.js`
    },
    ecmaFeatures: {
      modules: true,
      impliedStrict: true
@@ -271,7 +276,7 @@ module.exports = {
    // ImportSort
-    'simple-import-sort/sort': 'error',
+    'simple-import-sort/imports': 'error',
    'import/newline-after-import': 'error',
    // React
@@ -309,7 +314,7 @@ module.exports = {
    {
      files: ['*.js'],
      rules: {
-        'simple-import-sort/sort': [
+        'simple-import-sort/imports': [
          'error',
          {
            groups: [
@@ -0,0 +1,269 @@
 const path = require('path');
 const webpack = require('webpack');
 const CopyPlugin = require('copy-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: '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.html',
        filename: 'index.html',
        publicPath: '/'
      }),
      new CopyPlugin({
        patterns: [
          // HTML
          {
            from: 'frontend/src/*.html',
            to: path.join(distFolder, '[name][ext]'),
            globOptions: {
              ignore: ['**/index.html']
            }
          },
          // Fonts
          {
            from: 'frontend/src/Content/Fonts/*.*',
            to: path.join(distFolder, 'Content/Fonts', '[name][ext]')
          },
          // Icon Images
          {
            from: 'frontend/src/Content/Images/Icons/*.*',
            to: path.join(distFolder, 'Content/Images/Icons', '[name][ext]')
          },
          // Images
          {
            from: 'frontend/src/Content/Images/*.*',
            to: path.join(distFolder, 'Content/Images', '[name][ext]')
          },
          // Robots
          {
            from: 'frontend/src/Content/robots.txt',
            to: path.join(distFolder, 'Content', '[name][ext]')
          }
        ]
      }),
      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]'
              }
            }
          ]
        }
      ]
    }
  };
  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;
 };
@@ -1,17 +0,0 @@
 const gulp = require('gulp');
 require('./clean');
 require('./copy');
 require('./webpack');
 gulp.task('build',
  gulp.series('clean',
    gulp.parallel(
      'webpack',
      'copyHtml',
      'copyFonts',
      'copyImages'
    )
  )
 );
@@ -1,8 +0,0 @@
 const gulp = require('gulp');
 const del = require('del');
 const paths = require('./helpers/paths');
 gulp.task('clean', () => {
  return del([paths.dest.root]);
 });
@@ -1,34 +0,0 @@
 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());
 });
@@ -1,5 +0,0 @@
 require('./build.js');
 require('./clean.js');
 require('./copy.js');
 require('./watch.js');
 require('./webpack.js');
@@ -1,6 +0,0 @@
 const colors = require('ansi-colors');
 module.exports = function errorHandler(error) {
  console.log(colors.red(`Error (${error.plugin}): ${error.message}`));
  this.emit('end');
 };
@@ -1,23 +0,0 @@
 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/`,
    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;
@@ -1,18 +0,0 @@
 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'));
 }
 gulp.task('watch', gulp.series('build', watch));
@@ -1,271 +0,0 @@
 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);
 });
@@ -1,23 +1,32 @@
 const reload = require('require-nocache')(module);
-module.exports = (ctx, configPath, options) => {
+const cssVarsFiles = [
-  const config = {
+  './src/Styles/Variables/colors',
-    plugins: {
+  './src/Styles/Variables/dimensions',
-      'postcss-mixins': {
+  './src/Styles/Variables/fonts',
-        mixinsDir: [
+  './src/Styles/Variables/animations',
-          'frontend/src/Styles/Mixins'
+  './src/Styles/Variables/zIndexes'
-        ]
+].map(require.resolve);
      },
      'postcss-simple-vars': {
        variables: () =>
          ctx.options.cssVarsFiles.reduce((acc, vars) => {
            return Object.assign(acc, reload(vars));
          }, {})
      },
      'postcss-color-function': {},
      'postcss-nested': {}
    }
  };
-  return config;
+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'
  ]
 };
@@ -32,6 +32,8 @@ class Queue extends Component {
  constructor(props, context) {
    super(props, context);
    this._shouldBlockRefresh = false;
    this.state = {
      allSelected: false,
      allUnselected: false,
@@ -43,6 +45,14 @@ class Queue extends Component {
    };
  }
  shouldComponentUpdate() {
    if (this._shouldBlockRefresh) {
      return false;
    }
    return true;
  }
  componentDidUpdate(prevProps) {
    const {
      items,
@@ -85,6 +95,10 @@ class Queue extends Component {
  //
  // Listeners
  onQueueRowModalOpenOrClose = (isOpen) => {
    this._shouldBlockRefresh = isOpen;
  }
  onSelectAllChange = ({ value }) => {
    this.setState(selectAll(this.state.selectedState, value));
  }
@@ -100,15 +114,19 @@ class Queue extends Component {
  }
  onRemoveSelectedPress = () => {
-    this.setState({ isConfirmRemoveModalOpen: true });
+    this.setState({ isConfirmRemoveModalOpen: true }, () => {
      this._shouldBlockRefresh = 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 });
  }
@@ -208,7 +226,7 @@ class Queue extends Component {
          }
          {
-            isPopulated && !hasError && !items.length &&
+            isAllPopulated && !hasError && !items.length &&
              <div>
                {translate('QueueIsEmpty')}
              </div>
@@ -237,6 +255,7 @@ class Queue extends Component {
                            columns={columns}
                            {...item}
                            onSelectedChange={this.onSelectedChange}
                            onQueueRowModalOpenOrClose={this.onQueueRowModalOpenOrClose}
                          />
                        );
                      })
@@ -43,6 +43,7 @@ class QueueConnector extends Component {
    const {
      useCurrentPage,
      fetchQueue,
      fetchQueueStatus,
      gotoQueueFirstPage
    } = this.props;
@@ -53,6 +54,8 @@ class QueueConnector extends Component {
    } else {
      gotoQueueFirstPage();
    }
    fetchQueueStatus();
  }
  componentDidUpdate(prevProps) {
@@ -152,6 +155,7 @@ 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,
@@ -43,19 +43,32 @@ class QueueRow extends Component {
  }
  onRemoveQueueItemModalConfirmed = (blacklist) => {
-    this.props.onRemoveQueueItemPress(blacklist);
+    const {
      onRemoveQueueItemPress,
      onQueueRowModalOpenOrClose
    } = this.props;
    onQueueRowModalOpenOrClose(false);
    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 });
  }
@@ -359,7 +372,8 @@ QueueRow.propTypes = {
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  onSelectedChange: PropTypes.func.isRequired,
  onGrabPress: PropTypes.func.isRequired,
-  onRemoveQueueItemPress: PropTypes.func.isRequired
+  onRemoveQueueItemPress: PropTypes.func.isRequired,
  onQueueRowModalOpenOrClose: PropTypes.func.isRequired
 };
 QueueRow.defaultProps = {
@@ -81,7 +81,8 @@ class AddNewMovie extends Component {
    const {
      error,
      items,
-      hasExistingMovies
+      hasExistingMovies,
      colorImpairedMode
    } = this.props;
    const term = this.state.term;
@@ -141,6 +142,7 @@ class AddNewMovie extends Component {
                    return (
                      <AddNewMovieSearchResultConnector
                        key={item.tmdbId}
                        colorImpairedMode={colorImpairedMode}
                        {...item}
                      />
                    );
@@ -213,7 +215,8 @@ AddNewMovie.propTypes = {
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  hasExistingMovies: PropTypes.bool.isRequired,
  onMovieLookupChange: PropTypes.func.isRequired,
-  onClearMovieLookup: PropTypes.func.isRequired
+  onClearMovieLookup: PropTypes.func.isRequired,
  colorImpairedMode: PropTypes.bool.isRequired
 };
 export default AddNewMovie;
@@ -3,8 +3,10 @@ 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';
@@ -13,13 +15,15 @@ function createMapStateToProps() {
    (state) => state.addMovie,
    (state) => state.movies.items.length,
    (state) => state.router.location,
-    (addMovie, existingMoviesCount, location) => {
+    createUISettingsSelector(),
    (addMovie, existingMoviesCount, location, uiSettings) => {
      const { params } = parseUrl(location.search);
      return {
        ...addMovie,
        term: params.term,
-        hasExistingMovies: existingMoviesCount > 0
+        hasExistingMovies: existingMoviesCount > 0,
        colorImpairedMode: uiSettings.enableColorImpairedMode
      };
    }
  );
@@ -29,7 +33,9 @@ const mapDispatchToProps = {
  lookupMovie,
  clearAddMovie,
  fetchRootFolders,
-  fetchImportExclusions
+  fetchImportExclusions,
  fetchQueueDetails,
  clearQueueDetails
 };
 class AddNewMovieConnector extends Component {
@@ -46,6 +52,7 @@ class AddNewMovieConnector extends Component {
  componentDidMount() {
    this.props.fetchRootFolders();
    this.props.fetchImportExclusions();
    this.props.fetchQueueDetails();
  }
  componentWillUnmount() {
@@ -54,6 +61,7 @@ class AddNewMovieConnector extends Component {
    }
    this.props.clearAddMovie();
    this.props.clearQueueDetails();
  }
  //
@@ -102,7 +110,9 @@ AddNewMovieConnector.propTypes = {
  lookupMovie: PropTypes.func.isRequired,
  clearAddMovie: PropTypes.func.isRequired,
  fetchRootFolders: PropTypes.func.isRequired,
-  fetchImportExclusions: PropTypes.func.isRequired
+  fetchImportExclusions: PropTypes.func.isRequired,
  fetchQueueDetails: PropTypes.func.isRequired,
  clearQueueDetails: PropTypes.func.isRequired
 };
 export default connect(createMapStateToProps, mapDispatchToProps)(AddNewMovieConnector);
@@ -17,30 +17,15 @@ import styles from './AddNewMovieModalContent.css';
 class AddNewMovieModalContent extends Component {
  //
  // Lifecycle
  constructor(props, context) {
    super(props, context);
    this.state = {
      searchForMovie: false
    };
  }
  //
  // Listeners
  onSearchForMissingMovieChange = ({ value }) => {
    this.setState({ searchForMovie: value });
  }
  onQualityProfileIdChange = ({ value }) => {
    this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
  }
  onAddMoviePress = () => {
-    this.props.onAddMoviePress(this.state.searchForMovie);
+    this.props.onAddMoviePress();
  }
  //
@@ -57,6 +42,7 @@ class AddNewMovieModalContent extends Component {
      monitor,
      qualityProfileId,
      minimumAvailability,
      searchForMovie,
      folder,
      tags,
      isSmallScreen,
@@ -175,8 +161,8 @@ class AddNewMovieModalContent extends Component {
              containerClassName={styles.searchForMissingMovieContainer}
              className={styles.searchForMissingMovieInput}
              name="searchForMovie"
-              value={this.state.searchForMovie}
+              onChange={onInputChange}
-              onChange={this.onSearchForMissingMovieChange}
+              {...searchForMovie}
            />
          </label>
@@ -205,6 +191,7 @@ AddNewMovieModalContent.propTypes = {
  monitor: PropTypes.object.isRequired,
  qualityProfileId: PropTypes.object,
  minimumAvailability: PropTypes.object.isRequired,
  searchForMovie: PropTypes.object.isRequired,
  folder: PropTypes.string.isRequired,
  tags: PropTypes.object.isRequired,
  isSmallScreen: PropTypes.bool.isRequired,
@@ -53,13 +53,14 @@ class AddNewMovieModalContentConnector extends Component {
    this.props.setAddMovieDefault({ [name]: value });
  }
-  onAddMoviePress = (searchForMovie) => {
+  onAddMoviePress = () => {
    const {
      tmdbId,
      rootFolderPath,
      monitor,
      qualityProfileId,
      minimumAvailability,
      searchForMovie,
      tags
    } = this.props;
@@ -69,8 +70,8 @@ class AddNewMovieModalContentConnector extends Component {
      monitor: monitor.value,
      qualityProfileId: qualityProfileId.value,
      minimumAvailability: minimumAvailability.value,
-      tags: tags.value,
+      searchForMovie: searchForMovie.value,
-      searchForMovie
+      tags: tags.value
    });
  }
@@ -94,6 +95,7 @@ AddNewMovieModalContentConnector.propTypes = {
  monitor: PropTypes.object.isRequired,
  qualityProfileId: PropTypes.object,
  minimumAvailability: PropTypes.object.isRequired,
  searchForMovie: PropTypes.object.isRequired,
  tags: PropTypes.object.isRequired,
  onModalClose: PropTypes.func.isRequired,
  setAddMovieDefault: PropTypes.func.isRequired,
@@ -27,9 +27,11 @@
 }
 .poster {
-  flex: 0 0 170px;
+  position: relative;
  display: block;
  margin-right: 20px;
  height: 250px;
  background-color: $defaultColor;
 }
 .content {
@@ -86,6 +88,28 @@
  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;
@@ -7,7 +7,10 @@ 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';
@@ -65,7 +68,17 @@ class AddNewMovieSearchResult extends Component {
      images,
      isExistingMovie,
      isExclusionMovie,
-      isSmallScreen
+      isSmallScreen,
      colorImpairedMode,
      id,
      monitored,
      hasFile,
      isAvailable,
      queueStatus,
      queueState,
      runtime,
      movieRuntimeFormat,
      certification
    } = this.props;
    const {
@@ -85,12 +98,30 @@ class AddNewMovieSearchResult extends Component {
          {
            isSmallScreen ?
              null :
-              <MoviePoster
+              <div>
-                className={styles.poster}
+                <div className={styles.posterContainer}>
-                images={images}
+                  <MoviePoster
-                size={250}
+                    className={styles.poster}
-                overflow={true}
+                    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>
          }
          <div className={styles.content}>
@@ -133,6 +164,22 @@ 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
@@ -176,13 +223,15 @@ class AddNewMovieSearchResult extends Component {
              />
              {
-                status === 'ended' &&
+                isExistingMovie && isSmallScreen &&
-                  <Label
+                  <MovieStatusLabel
-                    kind={kinds.DANGER}
+                    hasMovieFiles={hasFile}
-                    size={sizes.LARGE}
+                    monitored={monitored}
-                  >
+                    isAvailable={isAvailable}
-                    Ended
+                    id={id}
-                  </Label>
+                    useLabel={true}
                    colorImpairedMode={colorImpairedMode}
                  />
              }
            </div>
@@ -222,7 +271,18 @@ AddNewMovieSearchResult.propTypes = {
  images: PropTypes.arrayOf(PropTypes.object).isRequired,
  isExistingMovie: PropTypes.bool.isRequired,
  isExclusionMovie: PropTypes.bool.isRequired,
-  isSmallScreen: 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
 };
 export default AddNewMovieSearchResult;
@@ -10,11 +10,17 @@ function createMapStateToProps() {
    createExistingMovieSelector(),
    createExclusionMovieSelector(),
    createDimensionsSelector(),
-    (isExistingMovie, isExclusionMovie, dimensions) => {
+    (state) => state.queue.details.items,
    (state, { internalId }) => internalId,
    (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId) => {
      const firstQueueItem = queueItems.find((q) => q.movieId === internalId && internalId > 0);
      return {
        isExistingMovie,
        isExclusionMovie,
-        isSmallScreen: dimensions.isSmallScreen
+        isSmallScreen: dimensions.isSmallScreen,
        queueStatus: firstQueueItem ? firstQueueItem.status : null,
        queueState: firstQueueItem ? firstQueueItem.trackedDownloadState : null
      };
    }
  );
@@ -28,6 +28,13 @@ function ImportMovieHeader(props) {
        {translate('Folder')}
      </VirtualTableHeaderCell>
      <VirtualTableHeaderCell
        className={styles.movie}
        name="movie"
      >
        {translate('Movie')}
      </VirtualTableHeaderCell>
      <VirtualTableHeaderCell
        className={styles.monitor}
        name="monitor"
@@ -48,13 +55,6 @@ function ImportMovieHeader(props) {
      >
        {translate('QualityProfile')}
      </VirtualTableHeaderCell>
      <VirtualTableHeaderCell
        className={styles.movie}
        name="movie"
      >
        {translate('Movie')}
      </VirtualTableHeaderCell>
    </VirtualTableHeader>
  );
 }
@@ -34,6 +34,13 @@ function ImportMovieRow(props) {
        {id}
      </VirtualTableRowCell>
      <VirtualTableRowCell className={styles.movie}>
        <ImportMovieSelectMovieConnector
          id={id}
          isExistingMovie={isExistingMovie}
        />
      </VirtualTableRowCell>
      <VirtualTableRowCell className={styles.monitor}>
        <FormInputGroup
          type={inputTypes.MOVIE_MONITORED_SELECT}
@@ -60,13 +67,6 @@ function ImportMovieRow(props) {
          onChange={onInputChange}
        />
      </VirtualTableRowCell>
      <VirtualTableRowCell className={styles.movie}>
        <ImportMovieSelectMovieConnector
          id={id}
          isExistingMovie={isExistingMovie}
        />
      </VirtualTableRowCell>
    </>
  );
 }
@@ -103,6 +103,7 @@ class ImportMovieSelectFolder extends Component {
                  <ul>
                    <li className={styles.tip} dangerouslySetInnerHTML={{ __html: translate('ImportIncludeQuality', ['<code>movie.2008.bluray.mkv</code>']) }} />
                    <li className={styles.tip} dangerouslySetInnerHTML={{ __html: translate('ImportRootPath', [`<code>${isWindows ? 'C:\\movies' : '/movies'}</code>`, `<code>${isWindows ? 'C:\\movies\\the matrix' : '/movies/the matrix'}</code>`]) }} />
                    <li className={styles.tip}>{translate('ImportNotForDownloads')}</li>
                  </ul>
                </div>
@@ -11,9 +11,47 @@ 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,
@@ -21,7 +59,7 @@ function AppUpdatedModalContent(props) {
    onModalClose
  } = props;
-  const update = items[0];
+  const update = mergeUpdates(items, version, prevVersion);
  return (
    <ModalContent onModalClose={onModalClose}>
@@ -89,6 +127,7 @@ 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,
@@ -8,8 +8,9 @@ import AppUpdatedModalContent from './AppUpdatedModalContent';
 function createMapStateToProps() {
  return createSelector(
    (state) => state.app.version,
    (state) => state.app.prevVersion,
    (state) => state.system.updates,
-    (version, updates) => {
+    (version, prevVersion, updates) => {
      const {
        isPopulated,
        error,
@@ -18,6 +19,7 @@ function createMapStateToProps() {
      return {
        version,
        prevVersion,
        isPopulated,
        error,
        items
@@ -29,7 +29,7 @@
 }
 .time {
-  flex: 0 0 120px;
+  flex: 0 0 125px;
  margin-right: 10px;
  border: none !important;
 }
@@ -24,7 +24,7 @@ function createMissingMovieIdsSelector() {
        const inCinemas = movie.inCinemas;
        if (
-          !movie.movieFileId &&
+          !movie.hasFile &&
          moment(inCinemas).isAfter(start) &&
          moment(inCinemas).isBefore(end) &&
          isBefore(movie.inCinemas) &&
@@ -22,7 +22,7 @@ function getUrls(state) {
    tags
  } = state;
-  let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/calendar/Radarr.ics?`;
+  let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/v3/calendar/Radarr.ics?`;
  if (unmonitored) {
    icalUrl += 'unmonitored=true&';
@@ -16,7 +16,7 @@ function createTagListSelector() {
        (selectedFilterBuilderProp.type === filterBuilderTypes.NUMBER ||
        selectedFilterBuilderProp.type === filterBuilderTypes.STRING) &&
        filterType !== filterTypes.EQUAL &&
-        filterType !== filterBuilderTypes.NOT_EQUAL ||
+        filterType !== filterTypes.NOT_EQUAL ||
        !selectedFilterBuilderProp.optionsSelector
      ) {
        return [];
@@ -85,3 +85,21 @@
  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;
  }
 }
@@ -479,6 +479,7 @@ class EnhancedSelectInput extends Component {
                                <OptionComponent
                                  key={v.key}
                                  id={v.key}
                                  dividerAfter={v.dividerAfter}
                                  depth={depth}
                                  isSelected={isSelectedItem(index, this.props)}
                                  isDisabled={parentSelected}
@@ -518,6 +519,18 @@ 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;
@@ -527,6 +540,7 @@ class EnhancedSelectInput extends Component {
                        <OptionComponent
                          key={v.key}
                          id={v.key}
                          dividerAfter={v.dividerAfter}
                          depth={depth}
                          isSelected={isSelectedItem(index, this.props)}
                          isMultiSelect={isMultiSelect}
@@ -54,4 +54,8 @@
  &:last-child {
    border: none;
  }
  &:hover {
    background-color: unset;
  }
 }
@@ -12,7 +12,9 @@ class EnhancedSelectInputOption extends Component {
  //
  // Listeners
-  onPress = () => {
+  onPress = (e) => {
    e.preventDefault();
    const {
      id,
      onSelect
@@ -13,6 +13,7 @@ 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';
@@ -72,6 +73,9 @@ function getComponent(type) {
    case inputTypes.INDEXER_FLAGS_SELECT:
      return IndexerFlagsSelectInputConnector;
    case inputTypes.LANGUAGE_SELECT:
      return LanguageSelectInputConnector;
    case inputTypes.SELECT:
      return EnhancedSelectInput;
@@ -21,3 +21,8 @@
  color: $darkGray;
  font-size: $smallFontSize;
 }
 .divider {
  border: none;
  border-bottom: 1px solid $lightGray;
 }
@@ -12,37 +12,46 @@ function HintedSelectInputOption(props) {
    depth,
    isSelected,
    isDisabled,
    dividerAfter,
    isMultiSelect,
    isMobile,
    ...otherProps
  } = props;
  return (
-    <EnhancedSelectInputOption
+    <div>
-      id={id}
+      <EnhancedSelectInputOption
-      depth={depth}
+        id={id}
-      isSelected={isSelected}
+        depth={depth}
-      isDisabled={isDisabled}
+        isSelected={isSelected}
-      isHidden={isDisabled}
+        isDisabled={isDisabled}
-      isMultiSelect={isMultiSelect}
+        isHidden={isDisabled}
-      isMobile={isMobile}
+        isMultiSelect={isMultiSelect}
-      {...otherProps}
+        isMobile={isMobile}
-    >
+        {...otherProps}
      <div className={classNames(
        styles.optionText,
        isMobile && styles.isMobile
      )}
      >
-        <div>{value}</div>
+        <div className={classNames(
          styles.optionText,
          isMobile && styles.isMobile
        )}
        >
          <div>{value}</div>
-        {
+          {
-          hint != null &&
+            hint != null &&
-            <div className={styles.hintText}>
+              <div className={styles.hintText}>
-              {hint}
+                {hint}
-            </div>
+              </div>
-        }
+          }
-      </div>
+        </div>
-    </EnhancedSelectInputOption>
+      </EnhancedSelectInputOption>
      {
        dividerAfter ?
          <div className={styles.divider} /> :
          null
      }
    </div>
  );
 }
@@ -50,15 +59,18 @@ 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
 };
@@ -0,0 +1,52 @@
 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);
@@ -49,6 +49,7 @@ function getSelectValues(selectOptions) {
    result.push({
      key: option.value,
      value: option.name,
      dividerAfter: option.dividerAfter,
      hint: option.hint
    });
@@ -10,13 +10,16 @@ const ADD_NEW_KEY = 'addNew';
 function createMapStateToProps() {
  return createSelector(
    (state) => state.rootFolders,
    (state, { value }) => value,
    (state, { includeMissingValue }) => includeMissingValue,
    (state, { includeNoChange }) => includeNoChange,
-    (rootFolders, includeNoChange) => {
+    (rootFolders, value, includeMissingValue, includeNoChange) => {
      const values = rootFolders.items.map((rootFolder) => {
        return {
          key: rootFolder.path,
          value: rootFolder.path,
-          freeSpace: rootFolder.freeSpace
+          freeSpace: rootFolder.freeSpace,
          isMissing: false
        };
      });
@@ -24,7 +27,8 @@ function createMapStateToProps() {
        values.unshift({
          key: 'noChange',
          value: 'No Change',
-          isDisabled: true
+          isDisabled: true,
          isMissing: false
        });
      }
@@ -37,6 +41,15 @@ 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'
@@ -151,7 +164,8 @@ RootFolderSelectInputConnector.propTypes = {
 };
 RootFolderSelectInputConnector.defaultProps = {
-  includeNoChange: false
+  includeNoChange: false,
  value: ''
 };
 export default connect(createMapStateToProps, createMapDispatchToProps)(RootFolderSelectInputConnector);
@@ -29,3 +29,9 @@
  color: $darkGray;
  font-size: $smallFontSize;
 }
 .isMissing {
  margin-left: 15px;
  color: $dangerColor;
  font-size: $smallFontSize;
 }
@@ -10,6 +10,7 @@ function RootFolderSelectInputOption(props) {
    id,
    value,
    freeSpace,
    isMissing,
    movieFolder,
    isMobile,
    isWindows,
@@ -43,11 +44,20 @@ function RootFolderSelectInputOption(props) {
        </div>
        {
-          freeSpace != null &&
+          freeSpace == null ?
            null :
            <div className={styles.freeSpace}>
              {formatBytes(freeSpace)} Free
            </div>
        }
        {
          isMissing ?
            <div className={styles.isMissing}>
              Missing
            </div> :
            null
        }
      </div>
    </EnhancedSelectInputOption>
  );
@@ -58,6 +68,7 @@ RootFolderSelectInputOption.propTypes = {
  value: PropTypes.string.isRequired,
  freeSpace: PropTypes.number,
  movieFolder: PropTypes.string,
  isMissing: PropTypes.boolean,
  isMobile: PropTypes.bool.isRequired,
  isWindows: PropTypes.bool
 };
@@ -19,6 +19,10 @@
  &.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 {
@@ -85,6 +89,10 @@
  &.outline {
    color: $warningColor;
  }
  &:global(.colorImpaired) {
    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
  }
 }
 .queue {
@@ -11,6 +11,7 @@ function Label(props) {
    size,
    outline,
    children,
    colorImpairedMode,
    ...otherProps
  } = props;
@@ -20,7 +21,8 @@ function Label(props) {
        className,
        styles[kind],
        styles[size],
-        outline && styles.outline
+        outline && styles.outline,
        colorImpairedMode && 'colorImpaired'
      )}
      {...otherProps}
    >
@@ -34,14 +36,16 @@ Label.propTypes = {
  kind: PropTypes.oneOf(kinds.all).isRequired,
  size: PropTypes.oneOf(sizes.all).isRequired,
  outline: PropTypes.bool.isRequired,
-  children: PropTypes.node.isRequired
+  children: PropTypes.node.isRequired,
  colorImpairedMode: PropTypes.bool
 };
 Label.defaultProps = {
  className: styles.label,
  kind: kinds.DEFAULT,
  size: sizes.SMALL,
-  outline: false
+  outline: false,
  colorImpairedMode: false
 };
 export default Label;
@@ -38,24 +38,33 @@ class Link extends Component {
    const linkProps = { target };
    let el = component;
-    if (to) {
+    if (to && typeof to === 'string') {
      if ((/\w+?:\/\//).test(to)) {
        el = 'a';
        linkProps.href = to;
        linkProps.target = target || '_blank';
        linkProps.rel = 'noreferrer';
      } else if (noRouter) {
        el = 'a';
        linkProps.href = to;
        linkProps.target = target || '_self';
      } else if (to.startsWith(`${window.Radarr.urlBase}/`)) {
        el = RouterLink;
        linkProps.to = to;
        linkProps.target = target;
      } else {
        el = RouterLink;
        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') {
@@ -86,7 +95,7 @@ class Link extends Component {
 Link.propTypes = {
  className: PropTypes.string,
  component: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
-  to: PropTypes.string,
+  to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
  target: PropTypes.string,
  isDisabled: PropTypes.bool,
  noRouter: PropTypes.bool,
@@ -1,5 +1,5 @@
 .loadingMessage {
-  margin: 50px 10px 0;
+  margin: 10px 10px 0;
  text-align: center;
  font-weight: 300;
  font-size: 36px;
@@ -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 tracks',
+  'Don\'t forget to rewind your movies',
  'Congratulations! you are the 1000th visitor.',
  'HELP! I\'m being held hostage and forced to write these stupid lines!',
  'RE-calibrating the internet...',
@@ -30,10 +30,10 @@ function ConfirmModal(props) {
  useEffect(() => {
    if (isOpen) {
      bindShortcut('enter', onConfirm);
-    } else {
+
-      unbindShortcut('enter', onConfirm);
+      return () => unbindShortcut('enter', onConfirm);
    }
-  }, [onConfirm]);
+  }, [isOpen, onConfirm]);
  return (
    <Modal
@@ -53,7 +53,13 @@ class PageHeader extends Component {
    return (
      <div className={styles.header}>
        <div className={styles.logoContainer}>
-          <Link to={`${window.Radarr.urlBase}/`}>
+          <Link
            className={styles.logoLink}
            to={{
              pathname: '/',
              state: { restoreScrollPosition: true }
            }}
          >
            <img
              className={isSmallScreen ? styles.logo : styles.logoFull}
              src={isSmallScreen ? `${window.Radarr.urlBase}/Content/Images/logo.png` : `${window.Radarr.urlBase}/Content/Images/logo-full.png`}
@@ -1,3 +1,11 @@
 .page {
  composes: page from '~./Page.css';
 }
 .logoFull {
  margin-top: 50px;
  margin-right: auto;
  margin-left: auto;
  width: 120px;
  height: 40px;
 }
@@ -30,7 +30,7 @@ const links = [
        to: '/add/new'
      },
      {
-        title: translate('Import'),
+        title: translate('ImportLibrary'),
        to: '/add/import'
      },
      {
@@ -10,6 +10,7 @@ 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);
@@ -161,7 +162,7 @@ class PageToolbarSection extends Component {
                      <ToolbarMenuButton
                        className={styles.overflowMenuButton}
                        iconName={icons.OVERFLOW}
-                        text="More"
+                        text={translate('More')}
                      />
                      <MenuContent>
@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { DndProvider } from 'react-dnd';
+import { DndProvider } from 'react-dnd-multi-backend';
-import { HTML5Backend } from 'react-dnd-html5-backend';
+import HTML5toTouch from 'react-dnd-multi-backend/dist/esm/HTML5toTouch';
 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 backend={HTML5Backend}>
+      <DndProvider options={HTML5toTouch}>
        <Modal
          isOpen={isOpen}
          onModalClose={onModalClose}
@@ -39,7 +39,8 @@ class VirtualTable extends Component {
    super(props, context);
    this.state = {
-      width: 0
+      width: 0,
      scrollRestored: false
    };
    this._grid = null;
@@ -48,11 +49,13 @@ class VirtualTable extends Component {
  componentDidUpdate(prevProps, prevState) {
    const {
      items,
-      scrollIndex
+      scrollIndex,
      scrollTop
    } = this.props;
    const {
-      width
+      width,
      scrollRestored
    } = this.state;
    if (this._grid &&
@@ -68,6 +71,11 @@ class VirtualTable extends Component {
        columnIndex: 0
      });
    }
    if (this._grid && scrollTop !== undefined && scrollTop !== 0 && !scrollRestored) {
      this.setState({ scrollRestored: true });
      this._grid.scrollToPosition({ scrollTop });
    }
  }
  //
@@ -96,6 +104,7 @@ class VirtualTable extends Component {
      items,
      scroller,
      focusScroller,
      scrollTop: ignored,
      header,
      headerHeight,
      rowRenderer,
@@ -180,6 +189,7 @@ 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,
@@ -77,8 +77,10 @@ function keyboardShortcuts(WrappedComponent) {
    }
    unbindShortcut = (key) => {
-      delete this._mousetrapBindings[key];
+      if (this._mousetrap != null) {
-      this._mousetrap.unbind(key);
+        delete this._mousetrapBindings[key];
        this._mousetrap.unbind(key);
      }
    }
    unbindAllShortcuts = () => {
@@ -8,7 +8,7 @@ function withScrollPosition(WrappedComponent, scrollPositionKey) {
      history
    } = props;
-    const scrollTop = history.action === 'POP' ?
+    const scrollTop = history.action === 'POP' || (history.location.state && history.location.state.restoreScrollPosition) ?
      scrollPositions[scrollPositionKey] :
      0;
@@ -0,0 +1,2 @@
 User-agent: *
 Disallow: /
@@ -53,13 +53,14 @@ class AddNewDiscoverMovieModalContentConnector extends Component {
    this.props.setAddMovieDefault({ [name]: value });
  }
-  onAddMoviePress = (searchForMovie) => {
+  onAddMoviePress = () => {
    const {
      tmdbId,
      rootFolderPath,
      monitor,
      qualityProfileId,
      minimumAvailability,
      searchForMovie,
      tags
    } = this.props;
@@ -69,8 +70,8 @@ class AddNewDiscoverMovieModalContentConnector extends Component {
      monitor: monitor.value,
      qualityProfileId: qualityProfileId.value,
      minimumAvailability: minimumAvailability.value,
-      tags: tags.value,
+      searchForMovie: searchForMovie.value,
-      searchForMovie
+      tags: tags.value
    });
    this.props.onModalClose(true);
@@ -96,6 +97,7 @@ AddNewDiscoverMovieModalContentConnector.propTypes = {
  monitor: PropTypes.object.isRequired,
  qualityProfileId: PropTypes.object,
  minimumAvailability: PropTypes.object.isRequired,
  searchForMovie: PropTypes.object.isRequired,
  tags: PropTypes.object.isRequired,
  onModalClose: PropTypes.func.isRequired,
  setAddMovieDefault: PropTypes.func.isRequired,
@@ -184,6 +184,7 @@ export const PAGE_LAST = fasFastForward;
 export const PARENT = fasLevelUpAlt;
 export const PAUSED = fasPause;
 export const PENDING = farClock;
 export const PLAY = fasPlay;
 export const PROFILE = fasUser;
 export const POSTER = fasTh;
 export const QUEUED = fasCloud;
@@ -3,6 +3,7 @@ export const AVAILABILITY_SELECT = 'availabilitySelect';
 export const CAPTCHA = 'captcha';
 export const CHECK = 'check';
 export const DEVICE = 'device';
 export const KEY_VALUE_LIST = 'keyValueList';
 export const MOVIE_MONITORED_SELECT = 'movieMonitoredSelect';
 export const NUMBER = 'number';
 export const OAUTH = 'oauth';
@@ -11,6 +12,7 @@ export const PATH = 'path';
 export const QUALITY_PROFILE_SELECT = 'qualityProfileSelect';
 export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
 export const INDEXER_FLAGS_SELECT = 'indexerFlagsSelect';
 export const LANGUAGE_SELECT = 'languageSelect';
 export const SELECT = 'select';
 export const DYNAMIC_SELECT = 'dynamicSelect';
 export const TAG = 'tag';
@@ -26,6 +28,7 @@ export const all = [
  CAPTCHA,
  CHECK,
  DEVICE,
  KEY_VALUE_LIST,
  MOVIE_MONITORED_SELECT,
  NUMBER,
  OAUTH,
@@ -34,6 +37,7 @@ export const all = [
  QUALITY_PROFILE_SELECT,
  ROOT_FOLDER_SELECT,
  INDEXER_FLAGS_SELECT,
  LANGUAGE_SELECT,
  SELECT,
  DYNAMIC_SELECT,
  TAG,
@@ -1,5 +1,6 @@
 export const DANGER = 'danger';
 export const DEFAULT = 'default';
 export const DELETE = 'delete';
 export const DISABLED = 'disabled';
 export const INFO = 'info';
 export const INVERSE = 'inverse';
@@ -13,6 +14,7 @@ export const QUEUE = 'queue';
 export const all = [
  DANGER,
  DEFAULT,
  DELETE,
  DISABLED,
  INFO,
  INVERSE,
@@ -272,7 +272,7 @@ class InteractiveImportModalContent extends Component {
            isPopulated && !!items.length && !isFetching && !isFetching &&
              <Table
                columns={columns}
-                horizontalScroll={false}
+                horizontalScroll={true}
                selectAll={true}
                allSelected={allSelected}
                allUnselected={allUnselected}
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
+import { reprocessInteractiveImportItems, updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
 import { fetchLanguages } from 'Store/Actions/settingsActions';
 import SelectLanguageModalContent from './SelectLanguageModalContent';
@@ -33,6 +33,7 @@ function createMapStateToProps() {
 const mapDispatchToProps = {
  dispatchFetchLanguages: fetchLanguages,
  dispatchReprocessInteractiveImportItems: reprocessInteractiveImportItems,
  dispatchUpdateInteractiveImportItems: updateInteractiveImportItems
 };
@@ -51,6 +52,12 @@ class SelectLanguageModalContentConnector extends Component {
  // Listeners
  onLanguageSelect = ({ languageIds }) => {
    const {
      ids,
      dispatchUpdateInteractiveImportItems,
      dispatchReprocessInteractiveImportItems
    } = this.props;
    const languages = [];
    languageIds.forEach((languageId) => {
@@ -62,11 +69,13 @@ class SelectLanguageModalContentConnector extends Component {
      }
    });
-    this.props.dispatchUpdateInteractiveImportItems({
+    dispatchUpdateInteractiveImportItems({
-      ids: this.props.ids,
+      ids,
      languages
    });
    dispatchReprocessInteractiveImportItems({ ids });
    this.props.onModalClose(true);
  }
@@ -91,6 +100,7 @@ SelectLanguageModalContentConnector.propTypes = {
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  dispatchFetchLanguages: PropTypes.func.isRequired,
  dispatchUpdateInteractiveImportItems: PropTypes.func.isRequired,
  dispatchReprocessInteractiveImportItems: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
+import { reprocessInteractiveImportItems, updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
 import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
 import getQualities from 'Utilities/Quality/getQualities';
 import SelectQualityModalContent from './SelectQualityModalContent';
@@ -31,6 +31,7 @@ function createMapStateToProps() {
 const mapDispatchToProps = {
  dispatchFetchQualityProfileSchema: fetchQualityProfileSchema,
  dispatchReprocessInteractiveImportItems: reprocessInteractiveImportItems,
  dispatchUpdateInteractiveImportItems: updateInteractiveImportItems
 };
@@ -49,6 +50,12 @@ class SelectQualityModalContentConnector extends Component {
  // Listeners
  onQualitySelect = ({ qualityId, proper, real }) => {
    const {
      ids,
      dispatchUpdateInteractiveImportItems,
      dispatchReprocessInteractiveImportItems
    } = this.props;
    const quality = _.find(this.props.items,
      (item) => item.id === qualityId);
@@ -57,14 +64,16 @@ class SelectQualityModalContentConnector extends Component {
      real: real ? 1 : 0
    };
-    this.props.dispatchUpdateInteractiveImportItems({
+    dispatchUpdateInteractiveImportItems({
-      ids: this.props.ids,
+      ids,
      quality: {
        quality,
        revision
      }
    });
    dispatchReprocessInteractiveImportItems({ ids });
    this.props.onModalClose(true);
  }
@@ -88,6 +97,7 @@ SelectQualityModalContentConnector.propTypes = {
  error: PropTypes.object,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
  dispatchReprocessInteractiveImportItems: PropTypes.func.isRequired,
  dispatchUpdateInteractiveImportItems: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
@@ -22,6 +22,20 @@ const columns = [
    isSortable: true,
    isVisible: true
  },
  {
    name: 'releaseWeight',
    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
    isSortable: true,
    fixedSortDirection: sortDirections.ASCENDING,
    isVisible: true
  },
  {
    name: 'rejections',
    label: React.createElement(Icon, { name: icons.DANGER }),
    isSortable: true,
    fixedSortDirection: sortDirections.ASCENDING,
    isVisible: true
  },
  {
    name: 'title',
    label: translate('Title'),
@@ -85,20 +99,6 @@ const columns = [
    label: React.createElement(Icon, { name: icons.FLAG }),
    isSortable: true,
    isVisible: true
  },
  {
    name: 'rejections',
    label: React.createElement(Icon, { name: icons.DANGER }),
    isSortable: true,
    fixedSortDirection: sortDirections.ASCENDING,
    isVisible: true
  },
  {
    name: 'releaseWeight',
    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
    isSortable: true,
    fixedSortDirection: sortDirections.ASCENDING,
    isVisible: true
  }
 ];
@@ -55,12 +55,10 @@
 .title {
  composes: cell;
  max-width: 30vw;
 }
 .title div {
-  @add-mixin truncate;
+  overflow-wrap: break-word;
 }
 .history {
@@ -145,6 +145,46 @@ class InteractiveSearchRow extends Component {
          {formatAge(age, ageHours, ageMinutes)}
        </TableRowCell>
        <TableRowCell className={styles.download}>
          <SpinnerIconButton
            name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
            kind={grabError ? kinds.DANGER : kinds.DEFAULT}
            title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
            isDisabled={isGrabbed}
            isSpinning={isGrabbing}
            onPress={downloadAllowed ? this.onGrabPress : this.onConfirmGrabPress}
          />
        </TableRowCell>
        <TableRowCell className={styles.rejected}>
          {
            !!rejections.length &&
              <Popover
                anchor={
                  <Icon
                    name={icons.DANGER}
                    kind={kinds.DANGER}
                  />
                }
                title={translate('ReleaseRejected')}
                body={
                  <ul>
                    {
                      rejections.map((rejection, index) => {
                        return (
                          <li key={index}>
                            {rejection}
                          </li>
                        );
                      })
                    }
                  </ul>
                }
                position={tooltipPositions.BOTTOM}
              />
          }
        </TableRowCell>
        <TableRowCell className={styles.title}>
          <Link
            to={infoUrl}
@@ -252,51 +292,11 @@ class InteractiveSearchRow extends Component {
                    }
                  </ul>
                }
-                position={tooltipPositions.LEFT}
+                position={tooltipPositions.BOTTOM}
              />
          }
        </TableRowCell>
        <TableRowCell className={styles.rejected}>
          {
            !!rejections.length &&
              <Popover
                anchor={
                  <Icon
                    name={icons.DANGER}
                    kind={kinds.DANGER}
                  />
                }
                title={translate('ReleaseRejected')}
                body={
                  <ul>
                    {
                      rejections.map((rejection, index) => {
                        return (
                          <li key={index}>
                            {rejection}
                          </li>
                        );
                      })
                    }
                  </ul>
                }
                position={tooltipPositions.LEFT}
              />
          }
        </TableRowCell>
        <TableRowCell className={styles.download}>
          <SpinnerIconButton
            name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
            kind={grabError ? kinds.DANGER : kinds.DEFAULT}
            title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
            isDisabled={isGrabbed}
            isSpinning={isGrabbing}
            onPress={downloadAllowed ? this.onGrabPress : this.onConfirmGrabPress}
          />
        </TableRowCell>
        <ConfirmModal
          isOpen={this.state.isConfirmGrabModalOpen}
          kind={kinds.WARNING}
@@ -54,22 +54,18 @@ class DeleteMovieModalContent extends Component {
    const {
      title,
      path,
-      statistics,
+      hasFile,
      sizeOnDisk,
      onModalClose
    } = this.props;
    const {
      movieFileCount,
      sizeOnDisk
    } = statistics;
    const deleteFiles = this.state.deleteFiles;
    const addImportExclusion = this.state.addImportExclusion;
-    let deleteFilesLabel = translate('DeleteFilesLabel', [movieFileCount]);
+    let deleteFilesLabel = hasFile ? translate('DeleteFileLabel', [1]) : translate('DeleteFilesLabel', [0]);
    let deleteFilesHelpText = translate('DeleteFilesHelpText');
-    if (movieFileCount === 0) {
+    if (!hasFile) {
      deleteFilesLabel = translate('DeleteMovieFolderLabel');
      deleteFilesHelpText = translate('DeleteMovieFolderHelpText');
    }
@@ -92,6 +88,21 @@ class DeleteMovieModalContent extends Component {
            {path}
          </div>
          <FormGroup>
            <FormLabel>
              {translate('AddListExclusion')}
            </FormLabel>
            <FormInputGroup
              type={inputTypes.CHECK}
              name="addImportExclusion"
              value={addImportExclusion}
              helpText={translate('AddImportExclusionHelpText')}
              kind={kinds.DANGER}
              onChange={this.onAddImportExclusionChange}
            />
          </FormGroup>
          <FormGroup>
            <FormLabel>{deleteFilesLabel}</FormLabel>
@@ -113,29 +124,14 @@ class DeleteMovieModalContent extends Component {
                </div>
                {
-                  !!movieFileCount &&
+                  !!hasFile &&
                    <div>
-                      {movieFileCount} {translate('MovieFilesTotaling')} {formatBytes(sizeOnDisk)}
+                      {hasFile} {translate('MovieFilesTotaling')} {formatBytes(sizeOnDisk)}
                    </div>
                }
              </div>
          }
          <FormGroup>
            <FormLabel>
              {translate('AddListExclusion')}
            </FormLabel>
            <FormInputGroup
              type={inputTypes.CHECK}
              name="addImportExclusion"
              value={addImportExclusion}
              helpText={translate('AddImportExclusionHelpText')}
              kind={kinds.DANGER}
              onChange={this.onAddImportExclusionChange}
            />
          </FormGroup>
        </ModalBody>
        <ModalFooter>
@@ -158,15 +154,10 @@ class DeleteMovieModalContent extends Component {
 DeleteMovieModalContent.propTypes = {
  title: PropTypes.string.isRequired,
  path: PropTypes.string.isRequired,
-  statistics: PropTypes.object.isRequired,
+  hasFile: PropTypes.bool.isRequired,
  sizeOnDisk: PropTypes.string.isRequired,
  onDeletePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
 DeleteMovieModalContent.defaultProps = {
  statistics: {
    movieFileCount: 0
  }
 };
 export default DeleteMovieModalContent;
@@ -1,9 +1,7 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import MovieCreditPosters from '../MovieCreditPosters';
 import MovieCastPoster from './MovieCastPoster';
@@ -26,19 +24,8 @@ function createMapStateToProps() {
  );
 }
 const mapDispatchToProps = {
  fetchRootFolders
 };
 class MovieCastPostersConnector extends Component {
  //
  // Lifecycle
  componentDidMount() {
    this.props.fetchRootFolders();
  }
  //
  // Render
@@ -53,8 +40,4 @@ class MovieCastPostersConnector extends Component {
  }
 }
-MovieCastPostersConnector.propTypes = {
+export default connect(createMapStateToProps)(MovieCastPostersConnector);
  fetchRootFolders: PropTypes.func.isRequired
 };
 export default connect(createMapStateToProps, mapDispatchToProps)(MovieCastPostersConnector);
@@ -1,9 +1,7 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import MovieCreditPosters from '../MovieCreditPosters';
 import MovieCrewPoster from './MovieCrewPoster';
@@ -26,19 +24,8 @@ function createMapStateToProps() {
  );
 }
 const mapDispatchToProps = {
  fetchRootFolders
 };
 class MovieCrewPostersConnector extends Component {
  //
  // Lifecycle
  componentDidMount() {
    this.props.fetchRootFolders();
  }
  //
  // Render
@@ -53,8 +40,4 @@ class MovieCrewPostersConnector extends Component {
  }
 }
-MovieCrewPostersConnector.propTypes = {
+export default connect(createMapStateToProps)(MovieCrewPostersConnector);
  fetchRootFolders: PropTypes.func.isRequired
 };
 export default connect(createMapStateToProps, mapDispatchToProps)(MovieCrewPostersConnector);
@@ -286,7 +286,7 @@ class MovieDetails extends Component {
      onMonitorTogglePress,
      onRefreshPress,
      onSearchPress,
-      queueDetails,
+      queueItems,
      movieRuntimeFormat
    } = this.props;
@@ -318,7 +318,6 @@ class MovieDetails extends Component {
            <PageToolbarButton
              label={translate('SearchMovie')}
              iconName={icons.SEARCH}
              isDisabled={!monitored}
              isSpinning={isSearching}
              title={undefined}
              onPress={onSearchPress}
@@ -523,7 +522,7 @@ class MovieDetails extends Component {
                        hasMovieFiles={hasMovieFiles}
                        monitored={monitored}
                        isAvailable={isAvailable}
-                        queueDetails={queueDetails}
+                        queueItem={(queueItems.length > 0) ? queueItems[0] : null}
                      />
                    </span>
                  </InfoLabel>
@@ -794,7 +793,7 @@ MovieDetails.propTypes = {
  onRefreshPress: PropTypes.func.isRequired,
  onSearchPress: PropTypes.func.isRequired,
  onGoToMovie: PropTypes.func.isRequired,
-  queueDetails: PropTypes.object,
+  queueItems: PropTypes.arrayOf(PropTypes.object),
  movieRuntimeFormat: PropTypes.string.isRequired
 };
@@ -89,10 +89,10 @@ function createMapStateToProps() {
    createAllMoviesSelector(),
    createCommandsSelector(),
    createDimensionsSelector(),
-    (state) => state.queue.details,
+    (state) => state.queue.details.items,
    (state) => state.app.isSidebarVisible,
    (state) => state.settings.ui.item.movieRuntimeFormat,
-    (titleSlug, movieFiles, movieCredits, extraFiles, allMovies, commands, dimensions, queueDetails, isSidebarVisible, movieRuntimeFormat) => {
+    (titleSlug, movieFiles, movieCredits, extraFiles, allMovies, commands, dimensions, queueItems, isSidebarVisible, movieRuntimeFormat) => {
      const sortedMovies = _.orderBy(allMovies, 'sortTitle');
      const movieIndex = _.findIndex(sortedMovies, { titleSlug });
      const movie = sortedMovies[movieIndex];
@@ -165,7 +165,7 @@ function createMapStateToProps() {
        nextMovie,
        isSmallScreen: dimensions.isSmallScreen,
        isSidebarVisible,
-        queueDetails,
+        queueItems,
        movieRuntimeFormat
      };
    }
@@ -41,6 +41,19 @@ function MovieDetailsLinks(props) {
        </Label>
      </Link>
      <Link
        className={styles.link}
        to={`https://letterboxd.com/tmdb/${tmdbId}`}
      >
        <Label
          className={styles.linkLabel}
          kind={kinds.INFO}
          size={sizes.LARGE}
        >
          {translate('Letterboxd')}
        </Label>
      </Link>
      {
        !!imdbId &&
          <Link
@@ -61,7 +74,7 @@ function MovieDetailsLinks(props) {
        !!imdbId &&
          <Link
            className={styles.link}
-            to={` https://moviechat.org/${imdbId}/`}
+            to={`https://moviechat.org/${imdbId}/`}
          >
            <Label
              className={styles.linkLabel}
@@ -77,7 +90,7 @@ function MovieDetailsLinks(props) {
        !!youTubeTrailerId &&
          <Link
            className={styles.link}
-            to={` https://www.youtube.com/watch?v=${youTubeTrailerId}/`}
+            to={`https://www.youtube.com/watch?v=${youTubeTrailerId}/`}
          >
            <Label
              className={styles.linkLabel}
@@ -8,6 +8,7 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import NotFound from 'Components/NotFound';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
 import MovieDetailsConnector from './MovieDetailsConnector';
@@ -46,7 +47,8 @@ function createMapStateToProps() {
 }
 const mapDispatchToProps = {
-  push
+  push,
  fetchRootFolders
 };
 class MovieDetailsPageConnector extends Component {
@@ -54,6 +56,10 @@ class MovieDetailsPageConnector extends Component {
  //
  // Lifecycle
  componentDidMount() {
    this.props.fetchRootFolders();
  }
  componentDidUpdate(prevProps) {
    if (!this.props.titleSlug) {
      this.props.push(`${window.Radarr.urlBase}/`);
@@ -112,7 +118,8 @@ MovieDetailsPageConnector.propTypes = {
  isPopulated: PropTypes.bool.isRequired,
  error: PropTypes.object,
  match: PropTypes.shape({ params: PropTypes.shape({ titleSlug: PropTypes.string.isRequired }).isRequired }).isRequired,
-  push: PropTypes.func.isRequired
+  push: PropTypes.func.isRequired,
  fetchRootFolders: PropTypes.func.isRequired
 };
 export default connect(createMapStateToProps, mapDispatchToProps)(MovieDetailsPageConnector);
@@ -1,24 +1,29 @@
 .missing {
  padding-left: 2px;
  border-left: 4px solid $dangerColor;
 }
 .downloaded {
  padding-left: 2px;
  border-left: 4px solid $successColor;
 }
 .notAvailable {
  padding-left: 2px;
  border-left: 4px solid $primaryColor;
 }
 .unmonitored {
  padding-left: 2px;
  border-left: 4px solid $warningColor;
 }
 .queue {
  padding-left: 2px;
  border-left: 4px solid $queueColor;
 }
 .continuing {
  padding-left: 2px;
  border-left: 4px solid $primaryColor;
 }
 .availNotMonitored {
  padding-left: 2px;
  border-left: 4px solid $darkGray;
 }
 .ended {
  padding-left: 2px;
  border-left: 4px solid $successColor;
 }
 .missingMonitored {
  padding-left: 2px;
  border-left: 4px solid $dangerColor;
 }
 .missingUnmonitored {
  padding-left: 2px;
  border-left: 4px solid $warningColor;
 }
@@ -1,15 +1,17 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Label from 'Components/Label';
 import { kinds, sizes } from 'Helpers/Props';
 import getQueueStatusText from 'Utilities/Movie/getQueueStatusText';
 import firstCharToUpper from 'Utilities/String/firstCharToUpper';
 import translate from 'Utilities/String/translate';
 import styles from './MovieStatusLabel.css';
-function getMovieStatus(hasFile, isMonitored, isAvailable, queueDetails = false) {
+function getMovieStatus(hasFile, isMonitored, isAvailable, queueItem = false) {
-  if (queueDetails.items[0]) {
+  if (queueItem) {
-    const queueStatus = queueDetails.items[0].status;
+    const queueStatus = queueItem.status;
-    const queueState = queueDetails.items[0].trackedDownloadStatus;
+    const queueState = queueItem.trackedDownloadStatus;
    const queueStatusText = getQueueStatusText(queueStatus, queueState);
    if (queueStatusText) {
@@ -17,19 +19,23 @@ function getMovieStatus(hasFile, isMonitored, isAvailable, queueDetails = false)
    }
  }
-  if (hasFile) {
+  if (hasFile && !isMonitored) {
-    return 'downloaded';
+    return 'availNotMonitored';
  }
-  if (!isMonitored) {
+  if (hasFile) {
-    return 'unmonitored';
+    return 'ended';
  }
  if (isAvailable && !isMonitored && !hasFile) {
    return 'missingUnmonitored';
  }
  if (isAvailable && !hasFile) {
-    return 'missing';
+    return 'missingMonitored';
  }
-  return 'notAvailable';
+  return 'continuing';
 }
 function MovieStatusLabel(props) {
@@ -37,16 +43,61 @@ function MovieStatusLabel(props) {
    hasMovieFiles,
    monitored,
    isAvailable,
-    queueDetails
+    queueItem,
    useLabel,
    colorImpairedMode
  } = props;
-  const status = getMovieStatus(hasMovieFiles, monitored, isAvailable, queueDetails);
+  let status = getMovieStatus(hasMovieFiles, monitored, isAvailable, queueItem);
  let statusClass = status;
-  if (queueDetails.items.length) {
+  if (status === 'availNotMonitored' || status === 'ended') {
    status = 'downloaded';
  }
  if (status === 'missingMonitored' || status === 'missingUnmonitored') {
    status = 'missing';
  }
  if (status === 'continuing') {
    status = 'notAvailable';
  }
  if (queueItem) {
    statusClass = 'queue';
  }
  if (useLabel) {
    let kind = kinds.SUCCESS;
    switch (statusClass) {
      case 'queue':
        kind = kinds.QUEUE;
        break;
      case 'missingMonitored':
        kind = kinds.DANGER;
        break;
      case 'continuing':
        kind = kinds.INFO;
        break;
      case 'availNotMonitored':
        kind = kinds.DEFAULT;
        break;
      case 'missingUnmonitored':
        kind = kinds.WARNING;
        break;
      default:
    }
    return (
      <Label
        kind={kind}
        size={sizes.LARGE}
        colorImpairedMode={colorImpairedMode}
      >
        {translate(firstCharToUpper(status))}
      </Label>
    );
  }
  return (
    <span
      className={styles[statusClass]}
@@ -60,7 +111,9 @@ MovieStatusLabel.propTypes = {
  hasMovieFiles: PropTypes.bool.isRequired,
  monitored: PropTypes.bool.isRequired,
  isAvailable: PropTypes.bool.isRequired,
-  queueDetails: PropTypes.object
+  queueItem: PropTypes.object,
  useLabel: PropTypes.bool,
  colorImpairedMode: PropTypes.bool
 };
 MovieStatusLabel.defaultProps = {
@@ -60,7 +60,8 @@ class MovieIndexOverviews extends Component {
      columnCount: 1,
      posterWidth: 162,
      posterHeight: 238,
-      rowHeight: calculateRowHeight(238, null, props.isSmallScreen, {})
+      rowHeight: calculateRowHeight(238, null, props.isSmallScreen, {}),
      scrollRestored: false
    };
    this._grid = null;
@@ -72,13 +73,15 @@ class MovieIndexOverviews extends Component {
      sortKey,
      overviewOptions,
      jumpToCharacter,
      scrollTop,
      isMovieEditorActive,
      isSmallScreen
    } = this.props;
    const {
      width,
-      rowHeight
+      rowHeight,
      scrollRestored
    } = this.state;
    if (prevProps.sortKey !== sortKey ||
@@ -97,6 +100,11 @@ class MovieIndexOverviews extends Component {
      this._grid.recomputeGridSize();
    }
    if (this._grid && scrollTop !== 0 && !scrollRestored) {
      this.setState({ scrollRestored: true });
      this._grid.scrollToPosition({ scrollTop });
    }
    if (jumpToCharacter != null && jumpToCharacter !== prevProps.jumpToCharacter) {
      const index = getIndexOfFirstCharacter(items, jumpToCharacter);
@@ -262,6 +270,7 @@ MovieIndexOverviews.propTypes = {
  sortKey: PropTypes.string,
  overviewOptions: PropTypes.object.isRequired,
  jumpToCharacter: PropTypes.string,
  scrollTop: PropTypes.number.isRequired,
  scroller: PropTypes.instanceOf(Element).isRequired,
  showRelativeDates: PropTypes.bool.isRequired,
  shortDateFormat: PropTypes.string.isRequired,
@@ -13,6 +13,7 @@ import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
 import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
 import MoviePoster from 'Movie/MoviePoster';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import translate from 'Utilities/String/translate';
 import MovieIndexPosterInfo from './MovieIndexPosterInfo';
 import styles from './MovieIndexPoster.css';
@@ -101,6 +102,11 @@ class MovieIndexPoster extends Component {
      showSearchAction,
      showRelativeDates,
      shortDateFormat,
      showReleaseDate,
      showCinemaRelease,
      inCinemas,
      physicalRelease,
      digitalRelease,
      timeFormat,
      isRefreshingMovie,
      isSearchingMovie,
@@ -127,6 +133,19 @@ class MovieIndexPoster extends Component {
      height: `${posterHeight}px`
    };
    let releaseDate = '';
    let releaseDateType = '';
    if (physicalRelease && digitalRelease) {
      releaseDate = (physicalRelease < digitalRelease) ? physicalRelease : digitalRelease;
      releaseDateType = (physicalRelease < digitalRelease) ? 'Released' : 'Digital';
    } else if (physicalRelease && !digitalRelease) {
      releaseDate = physicalRelease;
      releaseDateType = 'Released';
    } else if (digitalRelease && !physicalRelease) {
      releaseDate = digitalRelease;
      releaseDateType = 'Digital';
    }
    return (
      <div className={styles.content}>
        <div className={styles.posterContainer}>
@@ -253,12 +272,67 @@ class MovieIndexPoster extends Component {
            </div>
        }
        {
          showCinemaRelease && inCinemas &&
            <div className={styles.title}>
              <Icon
                name={icons.IN_CINEMAS}
              /> {getRelativeDate(
                inCinemas,
                shortDateFormat,
                showRelativeDates,
                {
                  timeFormat,
                  timeForToday: false
                }
              )}
            </div>
        }
        {
          showReleaseDate && releaseDateType === 'Released' &&
            <div className={styles.title}>
              <Icon
                name={icons.DISC}
              /> {getRelativeDate(
                releaseDate,
                shortDateFormat,
                showRelativeDates,
                {
                  timeFormat,
                  timeForToday: false
                }
              )}
            </div>
        }
        {
          showReleaseDate && releaseDateType === 'Digital' &&
            <div className={styles.title}>
              <Icon
                name={icons.MOVIE_FILE}
              /> {getRelativeDate(
                releaseDate,
                shortDateFormat,
                showRelativeDates,
                {
                  timeFormat,
                  timeForToday: false
                }
              )}
            </div>
        }
        <MovieIndexPosterInfo
          qualityProfile={qualityProfile}
          showQualityProfile={showQualityProfile}
          showReleaseDate={showReleaseDate}
          showRelativeDates={showRelativeDates}
          shortDateFormat={shortDateFormat}
          timeFormat={timeFormat}
          inCinemas={inCinemas}
          physicalRelease={physicalRelease}
          digitalRelease={digitalRelease}
          {...otherProps}
        />
@@ -298,6 +372,11 @@ MovieIndexPoster.propTypes = {
  showSearchAction: PropTypes.bool.isRequired,
  showRelativeDates: PropTypes.bool.isRequired,
  shortDateFormat: PropTypes.string.isRequired,
  showCinemaRelease: PropTypes.bool.isRequired,
  showReleaseDate: PropTypes.bool.isRequired,
  inCinemas: PropTypes.string,
  physicalRelease: PropTypes.string,
  digitalRelease: PropTypes.string,
  timeFormat: PropTypes.string.isRequired,
  isRefreshingMovie: PropTypes.bool.isRequired,
  isSearchingMovie: PropTypes.bool.isRequired,
@@ -1,5 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
 import { icons } from 'Helpers/Props';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
@@ -10,6 +12,7 @@ function MovieIndexPosterInfo(props) {
    studio,
    qualityProfile,
    showQualityProfile,
    showReleaseDate,
    added,
    inCinemas,
    digitalRelease,
@@ -57,7 +60,7 @@ function MovieIndexPosterInfo(props) {
    );
  }
-  if (sortKey === 'inCinemas' && inCinemas) {
+  if (sortKey === 'inCinemas' && inCinemas && !showReleaseDate) {
    const inCinemasDate = getRelativeDate(
      inCinemas,
      shortDateFormat,
@@ -70,12 +73,14 @@ function MovieIndexPosterInfo(props) {
    return (
      <div className={styles.info}>
-        {translate('InCinemas')}: {inCinemasDate}
+        <Icon
          name={icons.IN_CINEMAS}
        /> {inCinemasDate}
      </div>
    );
  }
-  if (sortKey === 'digitalRelease' && digitalRelease) {
+  if (sortKey === 'digitalRelease' && digitalRelease && !showReleaseDate) {
    const digitalReleaseDate = getRelativeDate(
      digitalRelease,
      shortDateFormat,
@@ -88,12 +93,14 @@ function MovieIndexPosterInfo(props) {
    return (
      <div className={styles.info}>
-        {translate('Digital')}: {digitalReleaseDate}
+        <Icon
          name={icons.MOVIE_FILE}
        /> {digitalReleaseDate}
      </div>
    );
  }
-  if (sortKey === 'physicalRelease' && physicalRelease) {
+  if (sortKey === 'physicalRelease' && physicalRelease && !showReleaseDate) {
    const physicalReleaseDate = getRelativeDate(
      physicalRelease,
      shortDateFormat,
@@ -106,7 +113,9 @@ function MovieIndexPosterInfo(props) {
    return (
      <div className={styles.info}>
-        {translate('Released')}: {physicalReleaseDate}
+        <Icon
          name={icons.DISC}
        /> {physicalReleaseDate}
      </div>
    );
  }
@@ -150,6 +159,7 @@ MovieIndexPosterInfo.propTypes = {
  path: PropTypes.string.isRequired,
  sizeOnDisk: PropTypes.number,
  sortKey: PropTypes.string.isRequired,
  showReleaseDate: PropTypes.bool.isRequired,
  showRelativeDates: PropTypes.bool.isRequired,
  shortDateFormat: PropTypes.string.isRequired,
  timeFormat: PropTypes.string.isRequired
--- a/Show More
+++ b/Show More