Fixed: (UI) Ensure root folders are populated in Author Editor

Fixed: Correctly calculate books count on Author page
Closes #1931
2026-04-18 21:34:28 -04:00 · 2023-07-30 05:10:21 +03:00 · 2023-07-30 05:10:07 +03:00 · 2023-07-30 05:09:25 +03:00 · 2023-07-30 03:44:14 +03:00 · 2023-07-30 03:44:14 +03:00
2840 changed files with 129755 additions and 42868 deletions
@@ -19,10 +19,10 @@ indent_size = 4
 dotnet_sort_system_directives_first = true

 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:refactoring
-dotnet_style_qualification_for_property = false:refactoring
-dotnet_style_qualification_for_method = false:refactoring
-dotnet_style_qualification_for_event = false:refactoring
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning

 # Indentation preferences
 csharp_indent_block_contents = true
@@ -32,17 +32,22 @@ csharp_indent_case_contents_when_block = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left

-dotnet_style_qualification_for_field = false:suggestion
-dotnet_style_qualification_for_property = false:suggestion
-dotnet_style_qualification_for_method = false:suggestion
-dotnet_style_qualification_for_event = false:suggestion
 dotnet_naming_style.instance_field_style.capitalization = camel_case
 dotnet_naming_style.instance_field_style.required_prefix = _

 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true
+csharp_style_var_when_type_is_apparent = true
+csharp_style_var_elsewhere = true
+# Prefer "out" variables to be declared inline
+csharp_style_inlined_variable_declaration = true
+
+# Using directive is unnecessary.
+dotnet_diagnostic.IDE0005.severity = error
+# Use var instead of explicit type
+dotnet_diagnostic.IDE0007.severity = error
+# Inline variable declaration
+dotnet_diagnostic.IDE0018.severity = error

 # Stylecop Rules
 dotnet_diagnostic.SA0001.severity = none
@@ -110,13 +115,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 +168,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 +186,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
@@ -210,6 +223,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
@@ -255,11 +269,13 @@ 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



-[*.{js,html,js,hbs,less,css}]
+[*.{js,html,hbs,less,css,ts,tsx}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
@@ -1,9 +0,0 @@
-{
-  "paths": [
-    "frontend/src/**/*.js"
-  ],
-  "ignored": [
-    "**/node_modules/**/*"
-  ],
-  "port": 5004
-}
@@ -1,35 +0,0 @@
---
-name: Bug Report
-about: Support Requests will be closed immediately, if you are unsure go to our Reddit or Discord first. Exceptions do not mean you found a bug!
-title: ''
-labels: bug
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Platform Information (please complete the following information):**
- - OS: [e.g. Windows 10 2004 / Ubuntu 20.10]
- - Docker: [Yes/No]
- - Mono or.NET Core Version: [e.g. Mono 5.8 or .Net Core 3.1.10] (found under System -> Status)
- - Browser and Version [e.g. chrome 86.0.4240.198] (Only needed for UI issues)
- - Readarr Version [e.g. 0.3.0.430]
- - Readarr Branch [e.g. master]
-
-**Trace Logs**
-Turn on Trace logs under Settings -> General and wait for the bug to occur again. **Upload the full log file here (or another site (e.g. pastebin) and link it). Issues will be closed, if they do not include this!**
@@ -0,0 +1,82 @@
+name: Bug Report
+description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Reddit or Discord first'
+labels: ['Type: Bug', 'Status: Needs Triage']
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch. 
+    options:
+    - label: I have searched the existing open and closed issues
+      required: true
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A concise description of what you're experiencing.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Steps To Reproduce
+    description: Steps to reproduce the behavior.
+    placeholder: |
+      1. In this environment...
+      2. With this config...
+      3. Run '...'
+      4. See error...
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Environment
+    description: |
+      examples:
+        - **OS**: Ubuntu 20.04
+        - **Readarr**: Readarr 0.1.0.432
+        - **Docker Install**: Yes
+        - **Using Reverse Proxy**: No
+        - **Browser**: Firefox 90 (If UI related)
+        - **Database**: Sqlite 3.36.0
+    value: |
+        - OS: 
+        - Readarr:
+        - Docker Install:
+        - Using Reverse Proxy:
+        - Browser:
+        - Database:
+    render: markdown
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: What branch are you running?
+    options:
+      - Master
+      - Develop
+      - Nightly
+      - Other (This issue will be closed)
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Trace Logs?
+    description: |
+      Trace Logs (https://wiki.servarr.com/readarr/troubleshooting#logging-and-log-files) 
+      ***Generally speaking, all bug reports must have trace logs provided.***
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      Additionally, any additional info? Screenshots? References? Anything that will give us more context about the issue you are encountering!
+  validations:
+    required: true
+- type: checkboxes
+  attributes:
+    label: Trace Logs have been provided as applicable. Reports may be closed if the required logs are not provided.
+    description: Trace logs are generally required for all bug reports and contain `trace`. Info logs are invalid for bug reports and do not contain `debug` nor `trace`
+    options:
+    - label: I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
+      required: true
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Support via Discord
-    url: https://discord.gg/rkEXY2Rbgn
+    url: https://readarr.com/discord
    about: Chat with users and devs on support and setup related topics.
  - name: Support via Reddit
    url: https://reddit.com/r/Readarr
@@ -1,17 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
@@ -0,0 +1,38 @@
+name: Feature Request
+description: 'Suggest an idea for Readarr'
+labels: ['Type: Feature Request', 'Status: Needs Triage']
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
+    options:
+    - label: I have searched the existing open and closed issues
+      required: true
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem? Please describe
+    description: A clear and concise description of what the problem is.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like
+    description: A clear and concise description of what you want to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe alternatives you've considered
+    description: A clear and concise description of any alternative solutions or features you've considered.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Anything else?
+    description: |
+      Links? References? Mockups? Anything that will give us more context about the feature you are encountering!
+      
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: true
@@ -1,14 +1,16 @@
 #### Database Migration
-YES | NO
+YES - XXXX | NO

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

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

 #### Issues Fixed or Closed by this PR

-* 
+* Fixes #XXXX
@@ -0,0 +1,28 @@
+'Area: API':
+  - src/Readarr.Api.V1/**/*
+
+'Area: Db-migration':
+  - src/NzbDrone.Core/Datastore/Migration/*
+
+'Area: Download Clients':
+  - src/NzbDrone.Core/Download/Clients/**/*
+
+'Area: Import Lists':
+  - src/NzbDrone.Core/ImportLists/**/*
+
+'Area: Indexer':
+  - src/NzbDrone.Core/Indexers/**/*
+
+'Area: Notifications':
+  - src/NzbDrone.Core/Notifications/**/*
+
+'Area: Organizer':
+  - src/NzbDrone.Core/Organizer/**/*
+
+'Area: Parser':
+  - src/NzbDrone.Core/Parser/**/*
+
+'Area: UI':
+  - frontend/**/*
+  - package.json
+  - yarn.lock
@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v4
@@ -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@v4
+        with:
+          github-token: ${{ github.token }}
+          issue-inactive-days: '90'
+          exclude-issue-created-before: ''
+          exclude-any-issue-labels: ''
+          add-issue-labels: ''
+          issue-comment: ''
+          issue-lock-reason: 'resolved'
+          process-only: ''
@@ -0,0 +1,32 @@
+name: 'Support requests'
+
+on:
+  issues:
+    types: [labeled, unlabeled, reopened]
+
+jobs:
+  support:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/support-requests@v3
+        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://readarr.com/discord) 
+            or [Subreddit](https://reddit.com/r/readarr)
+          close-issue: true
+          lock-issue: false
+      - uses: dessant/support-requests@v3
+        with:
+          github-token: ${{ github.token }}
+          support-label: 'Status: Logs Needed'
+          issue-comment: >
+            :wave: @{issue-author}, In order to help you further we'll need to see logs. 
+            You'll need to enable trace logging and replicate the problem that you encountered. 
+            Guidance on how to enable trace logging can be found in 
+            our [troubleshooting guide](https://wiki.servarr.com/readarr/troubleshooting#logging-and-log-files).
+          close-issue: false
+          lock-issue: false
@@ -148,3 +148,6 @@ _temp_*/**/*
 ## Merge any idea folder
 */**/.idea
 *.iml
+
+# API doc generation
+.config/
@@ -1,5 +0,0 @@
-{
-  "files.associations": {
-    "*.yaml": "home-assistant"
-  }
-}
@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+<development@readarr.com>.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
@@ -1,49 +1,13 @@
-# How to Contribute #
+# How to Contribute

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

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

-## Development ##
+## Documentation

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

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

-1. Fork Readarr
-2. Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
-3. Install the required Node Packages `yarn install`
-4. Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
-5. Build the project in Visual Studio, Setting startup project to `Readarr.Console` and framework to `netcoreapp31`
-6. Debug the project in Visual Studio
-7. Open http://localhost:8787
-
-### Contributing Code ###
- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Readarr/Readarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
- Rebase from Readarr's develop branch, don't merge
- Make meaningful commits, or squash them
- Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
- Reach out to us on the discord if you have any questions
- Add tests (unit/integration)
- Commit with *nix line endings for consistency (We checkout Windows and commit *nix)
- One feature/bug fix per pull request to keep things clean and easy to understand
- Use 4 spaces instead of tabs, this is the default for VS 2019 and WebStorm (to my knowledge)
-
-### Pull Requesting ###
- Only make pull requests to develop, never master, if you make a PR to master we'll comment on it and close it
- You're probably going to get some comments or questions from us, they will be to ensure consistency and maintainability
- We'll try to respond to pull requests as soon as possible, if its been a day or two, please reach out to us, we may have missed it
- Each PR should come from its own [feature branch](http://martinfowler.com/bliki/FeatureBranch.html) not develop in your fork, it should have a meaningful branch name (what is being added/fixed)
-  - new-feature (Good)
-  - fix-bug (Good)
-  - patch (Bad)
-  - develop (Bad)
-
-If you have any questions about any of this, please let us know.
+See the [Wiki Page](https://wiki.servarr.com/readarr/contributing)
@@ -1,52 +1,77 @@
 # Readarr

 [![Build Status](https://dev.azure.com/Readarr/Readarr/_apis/build/status/Readarr.Readarr?branchName=develop)](https://dev.azure.com/Readarr/Readarr/_build/latest?definitionId=1&branchName=develop)
-[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/readarr)](https://hub.docker.com/r/hotio/readarr)
-[![Backers on Open Collective](https://opencollective.com/readarr/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/readarr/sponsors/badge.svg)](#sponsors)
+[![Translated](https://translate.servarr.com/widgets/servarr/-/readarr/svg-badge.svg)](https://translate.servarr.com/engage/readarr/?utm_source=widget)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/readarr)](https://wiki.servarr.com/readarr/installation#docker)
+[![Donors on Open Collective](https://opencollective.com/Readarr/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/Readarr/sponsors/badge.svg)](#sponsors)
+[![Mega Sponsors on Open Collective](https://opencollective.com/Readarr/megasponsors/badge.svg)](#mega-sponsors)

-### Readarr is in early stages of development, alpha/beta binary builds are not yet available. Use of any test builds isn't recommend, and may have detrimental effects on your library.
+### Readarr is currently in beta testing and is generally still in a work in progress. Features may be broken, incomplete, or cause spontaneous combustion

-Readarr is a ebook (and maybe eventually magazine/audiobook) collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new books from your favorite authors and will grab, sort and rename them.
+Readarr is an ebook and audiobook collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new books from your favorite authors and will grab, sort, and rename them.
+Note that only one type of a given book is supported. If you want both an audiobook and ebook of a given book you will need multiple instances.

-## Major Features Include:
+## Major Features Include

+* Can watch for better quality of the ebooks and audiobooks you have and do an automatic upgrade. *e.g. from PDF to AZW3*
 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
-* Automatically detects new books.
-* Can scan your existing library and download any missing books.
+* Automatically detects new books
+* Can scan your existing library and download any missing books
 * Automatic failed download handling will try another release if one fails
 * Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Advanced customization for profiles, such that Readarr will always download the copy you want
 * Fully configurable book renaming
-* Full integration with SABnzbd and NZBGet
-* Full integration with Calibre (add to library, conversion)
+* SABnzbd, NZBGet, QBittorrent, Deluge, rTorrent, Transmission, uTorrent, and other download clients are supported and integrated
+* Full integration with Calibre (add to library, conversion) (Requires Calibre Content Server)
 * And a beautiful UI

 ## Support

-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://discord.gg/rkEXY2Rbgn)
-[![GitHub](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Readarr/Readarr/issues)
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/Readarr)
+[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/readarr)
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://readarr.com/discord)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/readarr)

-## Contributors
+Note: GitHub Issues are for Bugs and Feature Requests Only

-This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
-<a href="https://github.com/Readarr/Readarr/graphs/contributors"><img src="https://opencollective.com/Readarr/contributors.svg?width=890&button=false" /></a>
+[![GitHub - Bugs and Feature Requests Only](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Readarr/Readarr/issues)
+
+## Contributors & Developers
+
+[API Documentation](https://readarr.com/docs/api/)
+
+This project exists thanks to all the people who contribute.
+- [Contribute (GitHub)](CONTRIBUTING.md)
+- [Contribution (Wiki Article)](https://wiki.servarr.com/readarr/contributing)
+
+[![Contributors List](https://opencollective.com/Readarr/contributors.svg?width=890&button=false)](https://github.com/Readarr/Readarr/graphs/contributors)

 ## Backers

-Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/readarr#backer)
+Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/Readarr#backer)

-<img src="https://opencollective.com/readarr/backers.svg?width=890"></a>
+[![Backers List](https://opencollective.com/Readarr/backers.svg?width=890)](https://opencollective.com/Readarr#backer)

 ## Sponsors

 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor](https://opencollective.com/readarr#sponsor)

-<img src="https://opencollective.com/readarr/sponsors.svg?width=890"></a>
+[![Sponsors List](https://opencollective.com/Readarr/sponsors.svg?width=890)](https://opencollective.com/readarr#sponsor)

 ## Mega Sponsors
-<img src="https://opencollective.com/readarr/tiers/mega-sponsor.svg?width=890"></a>
+
+[![Mega Sponsors List](https://opencollective.com/Readarr/tiers/mega-sponsor.svg?width=890)](https://opencollective.com/readarr#mega-sponsor)
+
+## DigitalOcean
+
+This project is also supported by DigitalOcean
+<p>
+  <a href="https://www.digitalocean.com/">
+    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
+  </a>
+</p>

 ### License

 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-* Copyright 2010-2021
+* Copyright 2010-2022
@@ -0,0 +1,8 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities on Discord (preferred) to
+any of the Servarr Dev role holders (red names) or via email: development@servarr.com. You will receive a response from
+us within 72 hours. If the issue is confirmed, we will release a patch as soon
+as possible depending on complexity/severity.
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 set -e

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

+EnableExtraPlatformsInSDK()
+{
+    SDK_PATH=$(dotnet --list-sdks | grep -P '6\.\d\.\d+' | head -1 | sed 's/\(6\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
+    BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
+    if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
+        echo "Extra platforms already enabled"
+    else
+        echo "Enabling extra platform support"
+        sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
+    fi
+}
+
+EnableExtraPlatforms()
+{
+    if grep -qv freebsd-x64 src/Directory.Build.props; then
+        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64;linux-x86</RuntimeIdentifiers>^g" src/Directory.Build.props
+    fi
+}
+
 LintUI()
 {
    ProgressStart 'ESLint'
@@ -57,9 +76,6 @@ Build()
        platform=Posix
    fi

-    dotnet clean $slnFile -c Debug
-    dotnet clean $slnFile -c Release
-
    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
        dotnet msbuild -restore $slnFile -p:Configuration=Release -p:Platform=$platform -t:PublishAllRids
@@ -77,11 +93,11 @@ YarnInstall()
    ProgressEnd 'yarn install'
 }

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

 PackageFiles()
@@ -120,7 +136,7 @@ PackageLinux()

    echo "Adding Readarr.Mono to UpdatePackage"
    cp $folder/Readarr.Mono.* $folder/Readarr.Update
-    if [ "$framework" = "netcoreapp3.1" ]; then
+    if [ "$framework" = "net6.0" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Readarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Readarr.Update
    fi
@@ -131,17 +147,13 @@ PackageLinux()
 PackageMacOS()
 {
    local framework="$1"
+    local runtime="$2"
    
-    ProgressStart "Creating MacOS Package for $framework"
+    ProgressStart "Creating MacOS Package for $framework $runtime"

-    local folder=$artifactsFolder/macos/$framework/Readarr
+    local folder=$artifactsFolder/$runtime/$framework/Readarr

-    PackageFiles "$folder" "$framework" "osx-x64"
-
-    if [ "$framework" = "net462" ]; then
-        echo "Adding Startup script"
-        cp macOS/Readarr $folder
-    fi
+    PackageFiles "$folder" "$framework" "$runtime"

    echo "Removing Service helpers"
    rm -f $folder/ServiceUninstall.*
@@ -152,7 +164,7 @@ PackageMacOS()

    echo "Adding Readarr.Mono to UpdatePackage"
    cp $folder/Readarr.Mono.* $folder/Readarr.Update
-    if [ "$framework" = "netcoreapp3.1" ]; then
+    if [ "$framework" = "net6.0" ]; then
        cp $folder/Mono.Posix.NETStandard.* $folder/Readarr.Update
        cp $folder/libMonoPosixHelper.* $folder/Readarr.Update
    fi
@@ -163,10 +175,11 @@ PackageMacOS()
 PackageMacOSApp()
 {
    local framework="$1"
+    local runtime="$2"
    
-    ProgressStart "Creating macOS App Package for $framework"
+    ProgressStart "Creating macOS App Package for $framework $runtime"

-    local folder=$artifactsFolder/macos-app/$framework
+    local folder="$artifactsFolder/$runtime-app/$framework"

    rm -rf $folder
    mkdir -p $folder
@@ -174,7 +187,7 @@ PackageMacOSApp()
    mkdir -p $folder/Readarr.app/Contents/MacOS

    echo "Copying Binaries"
-    cp -r $artifactsFolder/macos/$framework/Readarr/* $folder/Readarr.app/Contents/MacOS
+    cp -r $artifactsFolder/$runtime/$framework/Readarr/* $folder/Readarr.app/Contents/MacOS

    echo "Removing Update Folder"
    rm -r $folder/Readarr.app/Contents/MacOS/Readarr.Update
@@ -186,12 +199,13 @@ PackageWindows()
 {
    local framework="$1"
    local runtime="$2"
-    
-    ProgressStart "Creating Windows Package for $framework"
+
+    ProgressStart "Creating $runtime Package for $framework"

    local folder=$artifactsFolder/$runtime/$framework/Readarr
    
    PackageFiles "$folder" "$framework" "$runtime"
+    cp -r $outputFolder/$framework-windows/$runtime/publish/* $folder

    echo "Removing Readarr.Mono"
    rm -f $folder/Readarr.Mono.*
@@ -201,7 +215,7 @@ PackageWindows()
    echo "Adding Readarr.Windows to UpdatePackage"
    cp $folder/Readarr.Windows.* $folder/Readarr.Update

-    ProgressEnd 'Creating Windows Package'
+    ProgressEnd "Creating $runtime Package for $framework"
 }

 Package()
@@ -213,19 +227,45 @@ Package()
    IFS='-' read -ra SPLIT <<< "$runtime"

    case "${SPLIT[0]}" in
-        linux)
+        linux|freebsd*)
            PackageLinux "$framework" "$runtime"
            ;;
        win)
            PackageWindows "$framework" "$runtime"
            ;;
        osx)
-            PackageMacOS "$framework"
-            PackageMacOSApp "$framework"
+            PackageMacOS "$framework" "$runtime"
+            PackageMacOSApp "$framework" "$runtime"
            ;;
    esac
 }

+BuildInstaller()
+{
+    local framework="$1"
+    local runtime="$2"
+    
+    ./_inno/ISCC.exe setup/readarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
+}
+
+InstallInno()
+{
+    ProgressStart "Installing portable Inno Setup"
+    
+    rm -rf _inno
+    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.0}.exe"
+    mkdir _inno
+    ./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno
+    rm innosetup.exe
+    
+    ProgressEnd "Installed portable Inno Setup"
+}
+
+RemoveInno()
+{
+    rm -rf _inno
+}
+
 PackageTests()
 {
    local framework="$1"
@@ -257,7 +297,10 @@ if [ $# -eq 0 ]; then
    BACKEND=YES
    FRONTEND=YES
    PACKAGES=YES
+    INSTALLER=NO
    LINT=YES
+    ENABLE_EXTRA_PLATFORMS=NO
+    ENABLE_EXTRA_PLATFORMS_IN_SDK=NO
 fi

 while [[ $# -gt 0 ]]
@@ -269,6 +312,14 @@ case $key in
        BACKEND=YES
        shift # past argument
        ;;
+    --enable-bsd|--enable-extra-platforms)
+        ENABLE_EXTRA_PLATFORMS=YES
+        shift # past argument
+        ;;
+    --enable-extra-platforms-in-sdk)
+        ENABLE_EXTRA_PLATFORMS_IN_SDK=YES
+        shift # past argument
+        ;;
    -r|--runtime)
        RID="$2"
        shift # past argument
@@ -287,6 +338,10 @@ case $key in
        PACKAGES=YES
        shift # past argument
        ;;
+    --installer)
+        INSTALLER=YES
+        shift # past argument
+        ;;
    --lint)
        LINT=YES
        shift # past argument
@@ -306,18 +361,31 @@ esac
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters

+if [ "$ENABLE_EXTRA_PLATFORMS_IN_SDK" = "YES" ];
+then
+    EnableExtraPlatformsInSDK
+fi
+
 if [ "$BACKEND" = "YES" ];
 then
    UpdateVersionNumber
+    if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+    then
+        EnableExtraPlatforms
+    fi
    Build
    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
-        PackageTests "netcoreapp3.1" "win-x64"
-        PackageTests "netcoreapp3.1" "win-x86"
-        PackageTests "netcoreapp3.1" "linux-x64"
-        PackageTests "netcoreapp3.1" "linux-musl-x64"
-        PackageTests "netcoreapp3.1" "osx-x64"
-        PackageTests "net462" "linux-x64"
+        PackageTests "net6.0" "win-x64"
+        PackageTests "net6.0" "win-x86"
+        PackageTests "net6.0" "linux-x64"
+        PackageTests "net6.0" "linux-musl-x64"
+        PackageTests "net6.0" "osx-x64"
+        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        then
+            PackageTests "net6.0" "freebsd-x64"
+            PackageTests "net6.0" "linux-x86"
+        fi
    else
        PackageTests "$FRAMEWORK" "$RID"
    fi
@@ -326,7 +394,7 @@ fi
 if [ "$FRONTEND" = "YES" ];
 then
    YarnInstall
-    RunGulp
+    RunWebpack
 fi

 if [ "$LINT" = "YES" ];
@@ -345,16 +413,30 @@ then

    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
    then
-        Package "netcoreapp3.1" "win-x64"
-        Package "netcoreapp3.1" "win-x86"
-        Package "netcoreapp3.1" "linux-x64"
-        Package "netcoreapp3.1" "linux-musl-x64"
-        Package "netcoreapp3.1" "linux-arm64"
-        Package "netcoreapp3.1" "linux-musl-arm64"
-        Package "netcoreapp3.1" "linux-arm"
-        Package "netcoreapp3.1" "osx-x64"
-        Package "net462" "linux-x64"
+        Package "net6.0" "win-x64"
+        Package "net6.0" "win-x86"
+        Package "net6.0" "linux-x64"
+        Package "net6.0" "linux-musl-x64"
+        Package "net6.0" "linux-arm64"
+        Package "net6.0" "linux-musl-arm64"
+        Package "net6.0" "linux-arm"
+        Package "net6.0" "linux-musl-arm"
+        Package "net6.0" "osx-x64"
+        Package "net6.0" "osx-arm64"
+        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        then
+            Package "net6.0" "freebsd-x64"
+            Package "net6.0" "linux-x86"
+        fi
    else
        Package "$FRAMEWORK" "$RID"
    fi
 fi
+
+if [ "$INSTALLER" = "YES" ];
+then
+    InstallInno
+    BuildInstaller "net6.0" "win-x64"
+    BuildInstaller "net6.0" "win-x86"
+    RemoveInno
+fi
@@ -1,5 +0,0 @@
-nzbdrone {version} {branch}; urgency=low
-
-  * Automatic Release.
-
- -- NzbDrone <contact@nzbdrone.com>  Mon, 26 Aug 2013 00:00:00 -0700
@@ -1 +0,0 @@
-8
@@ -1,12 +0,0 @@
-Section: web
-Priority: optional
-Maintainer: Sonarr <contact@nzbdrone.com>
-Source: nzbdrone
-Homepage: https://readarr.com
-Vcs-Git: git@github.com:readarr/Readarr.git
-Vcs-Browser: https://github.com/readarr/Readarr
-
-Package: nzbdrone
-Architecture: all
-Depends: libmono-cil-dev (>= 3.2), sqlite3 (>= 3.7), mediainfo (>= 0.7.52)
-Description: Readarr is a music collection manager
@@ -1,24 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: nzbdrone
-Source: https://github.com/readarr/Readarr
-
-Files: *
-Copyright: 2010-2016 Readarr <hello@readarr.com>
-
-License: GPL-3.0+
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
@@ -1 +0,0 @@
-nzbdrone_bin/* opt/NzbDrone
@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
@@ -0,0 +1,38 @@
+PLATFORM=$1
+
+if [ "$PLATFORM" = "Windows" ]; then
+  RUNTIME="win-x64"
+elif [ "$PLATFORM" = "Linux" ]; then
+  RUNTIME="linux-x64"
+elif [ "$PLATFORM" = "Mac" ]; then
+  RUNTIME="osx-x64"
+else
+  echo "Platform must be provided as first arguement: Windows, Linux or Mac"
+  exit 1
+fi
+
+outputFolder='_output'
+testPackageFolder='_tests'
+
+rm -rf $outputFolder
+rm -rf $testPackageFolder
+
+slnFile=src/Readarr.sln
+
+platform=Posix
+
+dotnet clean $slnFile -c Debug
+dotnet clean $slnFile -c Release
+
+dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p:RuntimeIdentifiers=$RUNTIME -t:PublishAllRids
+
+dotnet new tool-manifest
+dotnet tool install --version 6.5.0 Swashbuckle.AspNetCore.Cli
+
+dotnet tool run swagger tofile --output ./src/Readarr.Api.V1/openapi.json "$outputFolder/net6.0/$RUNTIME/Readarr.console.dll" v1 &
+
+sleep 45
+
+kill %1
+
+exit 0
@@ -1,25 +0,0 @@
-{
-  "remove-empty-rulesets": true,
-  "always-semicolon": true,
-  "color-case": "lower",
-  "block-indent": "  ",
-  "color-shorthand": false,
-  "element-case": "lower",
-  "eof-newline": true,
-  "leading-zero": true,
-  "quotes": "double",
-  "sort-order-fallback": "abc",
-  "space-before-colon": "",
-  "space-after-colon": " ",
-  "space-before-combinator": " ",
-  "space-after-combinator": " ",
-  "space-between-declarations": "\n",
-  "space-before-opening-brace": " ",
-  "space-after-opening-brace": "\n",
-  "space-after-selector-delimiter": " ",
-  "space-before-selector-delimiter": "",
-  "space-before-closing-brace": "\n",
-  "strip-spaces": true,
-  "tab-size": true,
-  "unitless-zero": false
-}
@@ -1,335 +0,0 @@
-{
-  "indent": {
-    "value": "  ",
-    "FunctionExpression": 1,
-    "ArrayExpression": 1,
-    "ObjectExpression": 1
-  },
-  "lineBreak": {
-    "value": "\n",
-
-    "before": {
-      "ArrayPatternClosing": 0,
-      "ArrayPatternComma": 0,
-      "ArrayPatternOpening": 0,
-      "ArrowFunctionExpressionArrow": 0,
-      "ArrowFunctionExpressionClosingBrace": ">=1",
-      "ArrowFunctionExpressionOpeningBrace": 0,
-      "AssignmentExpression": ">=1",
-      "AssignmentOperator": 0,
-      "BlockStatement": 0,
-      "BreakKeyword": ">=1",
-      "CallExpression": -1,
-      "CallExpressionClosingParentheses": -1,
-      "CallExpressionOpeningParentheses": 0,
-      "CatchClosingBrace": ">=1",
-      "CatchKeyword": 0,
-      "CatchOpeningBrace": 0,
-      "ClassDeclaration": ">=1",
-      "ClassDeclarationClosingBrace": ">=1",
-      "ClassDeclarationOpeningBrace": 0,
-      "ConditionalExpression": ">=1",
-      "DeleteOperator": ">=1",
-      "DoWhileStatement": ">=1",
-      "DoWhileStatementClosingBrace": ">=1",
-      "DoWhileStatementOpeningBrace": 0,
-      "ElseIfStatement": 0,
-      "ElseIfStatementClosingBrace": ">=1",
-      "ElseIfStatementOpeningBrace": 0,
-      "ElseStatement": 0,
-      "ElseStatementClosingBrace": ">=1",
-      "ElseStatementOpeningBrace": 0,
-      "EmptyStatement": -1,
-      "EndOfFile": -1,
-      "FinallyClosingBrace": ">=1",
-      "FinallyKeyword": -1,
-      "FinallyOpeningBrace": 0,
-      "ForInStatement": ">=1",
-      "ForInStatementClosingBrace": ">=1",
-      "ForInStatementExpressionClosing": 0,
-      "ForInStatementExpressionOpening": 0,
-      "ForInStatementOpeningBrace": 0,
-      "ForStatement": ">=1",
-      "ForStatementClosingBrace": ">=1",
-      "ForStatementExpressionClosing": "<2",
-      "ForStatementExpressionOpening": 0,
-      "ForStatementOpeningBrace": 0,
-      "FunctionDeclaration": ">=1",
-      "FunctionDeclarationClosingBrace": ">=1",
-      "FunctionDeclarationOpeningBrace": 0,
-      "FunctionExpression": 0,
-      "FunctionExpressionClosingBrace": 1,
-      "FunctionExpressionOpeningBrace":0,
-      "IIFEClosingParentheses": 0,
-      "IfStatement": ">=1",
-      "IfStatementClosingBrace": ">=1",
-      "IfStatementOpeningBrace": 0,
-      "LogicalExpression": -1,
-      "MemberExpressionClosing": 0,
-      "MemberExpressionOpening": 0,
-      "MemberExpressionPeriod": -1,
-      "MethodDefinition": ">=1",
-      "ObjectExpressionClosingBrace": "<=1",
-      "ObjectPatternClosingBrace": 0,
-      "ObjectPatternComma": 0,
-      "ObjectPatternOpeningBrace": 0,
-      "ParameterDefault": 0,
-      "Property": "<=2",
-      "PropertyValue": 0,
-      "ReturnStatement": -1,
-      "SwitchClosingBrace": ">=1",
-      "SwitchOpeningBrace": 0,
-      "ThisExpression": -1,
-      "ThrowStatement": ">=1",
-      "TryClosingBrace": ">=1",
-      "TryKeyword": -1,
-      "TryOpeningBrace": 0,
-      "VariableDeclaration": ">=1",
-      "VariableDeclarationSemiColon": 0,
-      "VariableDeclarationWithoutInit": ">=1",
-      "VariableName": ">=1",
-      "VariableValue": 0,
-      "WhileStatement": ">=1",
-      "WhileStatementClosingBrace": ">=1",
-      "WhileStatementOpeningBrace": 0
-    },
-
-    "after": {
-      "ArrayPatternClosing": 0,
-      "ArrayPatternComma": 0,
-      "ArrayPatternOpening": 0,
-      "ArrowFunctionExpressionArrow": 0,
-      "ArrowFunctionExpressionClosingBrace": -1,
-      "ArrowFunctionExpressionOpeningBrace": ">=1",
-      "AssignmentExpression": ">=1",
-      "AssignmentOperator": 0,
-      "BlockStatement": 0,
-      "BreakKeyword": -1,
-      "CallExpression": -1,
-      "CallExpressionClosingParentheses": -1,
-      "CallExpressionOpeningParentheses": -1,
-      "CatchClosingBrace": ">=0",
-      "CatchKeyword": 0,
-      "CatchOpeningBrace": ">=1",
-      "ClassDeclaration": ">=1",
-      "ClassDeclarationClosingBrace": ">=1",
-      "ClassDeclarationOpeningBrace": ">=1",
-      "ConditionalExpression": ">=1",
-      "DeleteOperator": ">=1",
-      "DoWhileStatement": ">=1",
-      "DoWhileStatementClosingBrace": 0,
-      "DoWhileStatementOpeningBrace": ">=1",
-      "ElseIfStatement": ">=1",
-      "ElseIfStatementClosingBrace": ">=1",
-      "ElseIfStatementOpeningBrace": ">=1",
-      "ElseStatement": ">=1",
-      "ElseStatementClosingBrace": ">=1",
-      "ElseStatementOpeningBrace": ">=1",
-      "EmptyStatement": -1,
-      "FinallyClosingBrace": ">=1",
-      "FinallyKeyword": -1,
-      "FinallyOpeningBrace": ">=1",
-      "ForInStatement": ">=1",
-      "ForInStatementClosingBrace": ">=1",
-      "ForInStatementExpressionClosing": -1,
-      "ForInStatementExpressionOpening": "<2",
-      "ForInStatementOpeningBrace": ">=1",
-      "ForStatement": ">=1",
-      "ForStatementClosingBrace": ">=1",
-      "ForStatementExpressionClosing": -1,
-      "ForStatementExpressionOpening": "<2",
-      "ForStatementOpeningBrace": ">=1",
-      "FunctionDeclaration": ">=1",
-      "FunctionDeclarationClosingBrace": ">=1",
-      "FunctionDeclarationOpeningBrace": ">=1",
-      "FunctionExpression": 0,
-      "FunctionExpressionClosingBrace": -1,
-      "FunctionExpressionOpeningBrace": 1,
-      "IIFEOpeningParentheses": 0,
-      "IfStatement": ">=1",
-      "IfStatementClosingBrace": ">=1",
-      "IfStatementOpeningBrace": ">=1",
-      "LogicalExpression": -1,
-      "MemberExpressionClosing": 0,
-      "MemberExpressionOpening": 0,
-      "MemberExpressionPeriod": 0,
-      "MethodDefinition": ">=1",
-      "ObjectExpressionOpeningBrace": "<=1",
-      "ObjectPatternClosingBrace": 0,
-      "ObjectPatternComma": 0,
-      "ObjectPatternOpeningBrace": 0,
-      "ParameterDefault": 0,
-      "Property": -1,
-      "PropertyName": 0,
-      "ReturnStatement": -1,
-      "SwitchCaseColon": ">=1",
-      "SwitchClosingBrace": ">=1",
-      "SwitchOpeningBrace": ">=1",
-      "ThisExpression": 0,
-      "ThrowStatement": ">=1",
-      "TryClosingBrace": 0,
-      "TryKeyword": -1,
-      "TryOpeningBrace": ">=1",
-      "VariableDeclaration": ">=1",
-      "VariableDeclarationSemiColon": ">=1",
-      "VariableValue": -1,
-      "WhileStatement": ">=1",
-      "WhileStatementClosingBrace": ">=1",
-      "WhileStatementOpeningBrace": ">=1"
-    }
-  },
-  "whiteSpace": {
-    "value": " ",
-    "removeTrailing": 1,
-    "before": {
-      "ArgumentComma": 0,
-      "ArgumentList": 0,
-      "ArgumentListArrayExpression": 0,
-      "ArgumentListFunctionExpression": 1,
-      "ArgumentListObjectExpression": 0,
-      "ArrayExpressionClosing": 0,
-      "ArrayExpressionComma": 0,
-      "ArrayExpressionOpening": 1,
-      "AssignmentOperator": 1,
-      "BinaryExpression": 0,
-      "BinaryExpressionOperator": 1,
-      "BlockComment": 1,
-      "CallExpression": 1,
-      "CatchClosingBrace": 1,
-      "CatchKeyword": 1,
-      "CatchOpeningBrace": 1,
-      "CatchParameterList": 0,
-      "CommaOperator": 0,
-      "ConditionalExpressionAlternate": 1,
-      "ConditionalExpressionConsequent": 1,
-      "DoWhileStatementClosingBrace": 1,
-      "DoWhileStatementConditional": 1,
-      "DoWhileStatementOpeningBrace": 1,
-      "ElseIfStatementClosingBrace": 1,
-      "ElseIfStatementOpeningBrace": 1,
-      "ElseStatementClosingBrace": 1,
-      "ElseStatementOpeningBrace": 1,
-      "EmptyStatement": 0,
-      "ExpressionClosingParentheses": 0,
-      "FinallyClosingBrace": 1,
-      "FinallyKeyword": -1,
-      "FinallyOpeningBrace": 1,
-      "ForInStatement": 1,
-      "ForInStatementClosingBrace": 1,
-      "ForInStatementExpressionClosing": 0,
-      "ForInStatementExpressionOpening": 1,
-      "ForInStatementOpeningBrace": 1,
-      "ForStatement": 1,
-      "ForStatementClosingBrace": 1,
-      "ForStatementExpressionClosing": 0,
-      "ForStatementExpressionOpening": 1,
-      "ForStatementOpeningBrace": 1,
-      "ForStatementSemicolon": 0,
-      "FunctionDeclarationClosingBrace": 1,
-      "FunctionDeclarationOpeningBrace": 1,
-      "FunctionExpressionClosingBrace": 1,
-      "FunctionExpressionOpeningBrace": 1,
-      "IfStatementClosingBrace": 1,
-      "IfStatementConditionalClosing": 0,
-      "IfStatementConditionalOpening": 1,
-      "IfStatementOpeningBrace": 1,
-      "LineComment": 1,
-      "LogicalExpressionOperator": 1,
-      "MemberExpressionClosing": 0,
-      "ObjectExpressionClosingBrace": 1,
-      "ParameterComma": 0,
-      "ParameterList": 0,
-      "Property": 1,
-      "PropertyName": 1,
-      "PropertyValue": 1,
-      "SwitchDiscriminantClosing": 0,
-      "SwitchDiscriminantOpening": 1,
-      "ThrowKeyword": 1,
-      "TryClosingBrace": 1,
-      "TryKeyword": -1,
-      "TryOpeningBrace": 1,
-      "UnaryExpressionOperator": 0,
-      "VariableName": 1,
-      "VariableValue": 1,
-      "WhileStatementClosingBrace": 1,
-      "WhileStatementConditionalClosing": 0,
-      "WhileStatementConditionalOpening": 1,
-      "WhileStatementOpeningBrace": 1
-    },
-    "after": {
-      "ArgumentComma": 1,
-      "ArgumentList": 0,
-      "ArgumentListArrayExpression": 1,
-      "ArgumentListFunctionExpression": 1,
-      "ArgumentListObjectExpression": 0,
-      "ArrayExpressionClosing": 0,
-      "ArrayExpressionComma": 1,
-      "ArrayExpressionOpening": 0,
-      "AssignmentOperator": 1,
-      "BinaryExpression": 0,
-      "BinaryExpressionOperator": 1,
-      "BlockComment": 1,
-      "CallExpression": 0,
-      "CatchClosingBrace": 1,
-      "CatchKeyword": 1,
-      "CatchOpeningBrace": 1,
-      "CatchParameterList": 0,
-      "CommaOperator": 1,
-      "ConditionalExpressionConsequent": 1,
-      "ConditionalExpressionTest": 1,
-      "DoWhileStatementBody": 1,
-      "DoWhileStatementClosingBrace": 1,
-      "DoWhileStatementOpeningBrace": 1,
-      "ElseIfStatementClosingBrace": 1,
-      "ElseIfStatementOpeningBrace": 1,
-      "ElseStatementClosingBrace": 1,
-      "ElseStatementOpeningBrace": 1,
-      "EmptyStatement": 0,
-      "ExpressionOpeningParentheses": 0,
-      "FinallyClosingBrace": 1,
-      "FinallyKeyword": -1,
-      "FinallyOpeningBrace": 1,
-      "ForInStatement": 1,
-      "ForInStatementClosingBrace": 1,
-      "ForInStatementExpressionClosing": 1,
-      "ForInStatementExpressionOpening": 0,
-      "ForInStatementOpeningBrace": 1,
-      "ForStatement": 1,
-      "ForStatementClosingBrace": 1,
-      "ForStatementExpressionClosing": 1,
-      "ForStatementExpressionOpening": 0,
-      "ForStatementOpeningBrace": 1,
-      "ForStatementSemicolon": 1,
-      "FunctionDeclarationClosingBrace": 0,
-      "FunctionDeclarationOpeningBrace": 0,
-      "FunctionExpressionClosingBrace": 0,
-      "FunctionExpressionOpeningBrace": 0,
-      "FunctionName": 0,
-      "FunctionReservedWord": 0,
-      "IfStatementClosingBrace": 1,
-      "IfStatementConditionalClosing": 0,
-      "IfStatementConditionalOpening": 0,
-      "IfStatementOpeningBrace": 1,
-      "LogicalExpressionOperator": 1,
-      "MemberExpressionOpening": 0,
-      "ObjectExpressionClosingBrace": 0,
-      "ObjectExpressionOpeningBrace": 1,
-      "ParameterComma": 1,
-      "ParameterList": 0,
-      "PropertyName": 0,
-      "PropertyValue": 0,
-      "SwitchDiscriminantClosing": 1,
-      "SwitchDiscriminantOpening": 0,
-      "ThrowKeyword": 1,
-      "TryClosingBrace": 1,
-      "TryKeyword": -1,
-      "TryOpeningBrace": 1,
-      "UnaryExpressionOperator": 0,
-      "VariableName": 1,
-      "WhileStatementClosingBrace": 1,
-      "WhileStatementConditionalClosing": 1,
-      "WhileStatementConditionalOpening": 0,
-      "WhileStatementOpeningBrace": 1
-    }
-  }
-}
@@ -1 +1,2 @@
 **/JsLibraries/**
+**/*.css.d.ts
@@ -1,13 +1,22 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const fs = require('fs');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const path = require('path');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const typescriptEslintRecommended = require('@typescript-eslint/eslint-plugin').configs.recommended;
+
+const frontendFolder = __dirname;

 const dirs = fs
-  .readdirSync('frontend/src', { withFileTypes: true })
+  .readdirSync(path.join(frontendFolder, 'src'), { withFileTypes: true })
  .filter((dirent) => dirent.isDirectory())
  .map((dirent) => dirent.name)
  .join('|');

 module.exports = {
-  parser: 'babel-eslint',
+  root: true,
+
+  parser: '@babel/eslint-parser',

  env: {
    browser: true,
@@ -25,6 +34,9 @@ module.exports = {
  parserOptions: {
    ecmaVersion: 6,
    sourceType: 'module',
+    babelOptions: {
+      configFile: `${frontendFolder}/babel.config.js`
+    },
    ecmaFeatures: {
      modules: true,
      impliedStrict: true
@@ -34,8 +46,11 @@ module.exports = {
  plugins: [
    'filenames',
    'react',
+    'react-hooks',
    'simple-import-sort',
-    'import'
+    'import',
+    '@typescript-eslint',
+    'prettier'
  ],

  settings: {
@@ -218,7 +233,7 @@ module.exports = {
    'consistent-this': ['error', 'self'],
    'eol-last': 'error',
    'func-names': 'off',
-    'func-style': ['error', 'declaration'],
+    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
    indent: ['error', 2, { SwitchCase: 1 }],
    'key-spacing': ['error', { beforeColon: false, afterColon: true }],
    'keyword-spacing': ['error', { before: true, after: true }],
@@ -271,7 +286,7 @@ module.exports = {

    // ImportSort

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

    // React
@@ -303,13 +318,17 @@ module.exports = {
    'react/react-in-jsx-scope': 2,
    'react/self-closing-comp': 2,
    'react/sort-comp': 2,
-    'react/jsx-wrap-multilines': 2
+    'react/jsx-wrap-multilines': 2,
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'error'
  },
  overrides: [
    {
-      files: ['*.js'],
+      files: [
+        '*.js'
+      ],
      rules: {
-        'simple-import-sort/sort': [
+        'simple-import-sort/imports': [
          'error',
          {
            groups: [
@@ -322,6 +341,52 @@ module.exports = {
          }
        ]
      }
+    },
+    {
+      files: [
+        '*.ts',
+        '*.tsx'
+      ],
+
+      parser: '@typescript-eslint/parser',
+      parserOptions: {
+        project: './tsconfig.json'
+      },
+
+      extends: [
+        'prettier'
+      ],
+
+      rules: Object.assign(typescriptEslintRecommended.rules, {
+        'no-shadow': 'off',
+        // These should be enabled after cleaning things up
+        '@typescript-eslint/no-unused-vars': 'warn',
+        '@typescript-eslint/explicit-function-return-type': 'off',
+        'react/prop-types': 'off',
+        'prettier/prettier': 'error',
+        'simple-import-sort/imports': [
+          'error',
+          {
+            groups: [
+              // Packages
+              // Absolute Paths
+              // Relative Paths
+              // Css
+              ['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$']
+            ]
+          }
+        ]
+      })
+    },
+    {
+      files: [
+        '*.css.d.ts'
+      ],
+      rules: {
+        'filenames/match-exported': 'off',
+        'init-declarations': 'off',
+        'prettier/prettier': 'off'
+      }
    }
  ]
 };
@@ -1,12 +0,0 @@
-{
-  "js": {
-    "indent_size": 2,
-    "indent_char": " ",
-    "indent_level": 2,
-    "indent_with_tabs": false,
-    "preserve_newlines": true,
-    "brace_style": "collapse",
-    "max_preserve_newlines": 2,
-    "jslint_happy": true
-  }
-}
@@ -0,0 +1,10 @@
+# Ignore everything recursively
+*
+
+# But not the .ts files
+!*.ts*
+
+*css.d.ts
+
+# Check subdirectories too
+!*/
@@ -0,0 +1,6 @@
+{
+  "arrowParens": "always",
+  "endOfLine": "auto",
+  "singleQuote": true,
+  "trailingComma": "es5"
+}
@@ -1,12 +1,12 @@
 {
-"plugins": [
-  "stylelint-order"
-],
-"ignoreFiles": [
-  "frontend/src/Styles/scaffolding.css",
-  "**/*.js"
-],
-"rules": {
+  "plugins": [
+    "stylelint-order"
+  ],
+  "ignoreFiles": [
+    "frontend/src/Styles/scaffolding.css",
+    "**/*.js"
+  ],
+  "rules": {
    "at-rule-empty-line-before": [
      "always",
      {
@@ -15,9 +15,6 @@
        ]
      }
    ],
-    "at-rule-name-case": "lower",
-    "at-rule-name-newline-after": "always-multi-line",
-    "at-rule-name-space-after": "always",
    "at-rule-no-unknown": [
      true,
      {
@@ -28,83 +25,36 @@
      }
    ],
    "at-rule-no-vendor-prefix": true,
-    "at-rule-semicolon-newline-after": "always",
-    "at-rule-semicolon-space-before": "never",
-    "block-closing-brace-empty-line-before": "never",
-    "block-closing-brace-newline-after": "always",
-    "block-closing-brace-newline-before": "always",
-    "block-closing-brace-space-after": "always-single-line",
-    "block-closing-brace-space-before": "always-single-line",
    "block-no-empty": true,
-    "block-opening-brace-newline-after": "always",
-    "block-opening-brace-newline-before": "never-single-line",
-    "block-opening-brace-space-after": "always-single-line",
-    "block-opening-brace-space-before": "always",
-    "color-hex-case": "lower",
    "color-hex-length": "short",
    "color-named": "never",
    "color-no-invalid-hex": true,
    "comment-whitespace-inside": "always",
-    "declaration-bang-space-after": "never",
-    "declaration-bang-space-before": "always",
    "declaration-block-no-duplicate-properties": [
      true,
      {
        "ignoreProperties": [
-            "composes"
+          "composes"
        ]
      }
    ],
    "declaration-block-no-redundant-longhand-properties": true,
    "declaration-block-no-shorthand-property-overrides": true,
-    "declaration-block-semicolon-newline-after": "always",
-    "declaration-block-semicolon-newline-before": "never-multi-line",
-    "declaration-block-semicolon-space-before": "never",
    "declaration-block-single-line-max-declarations": 1,
-    "declaration-block-trailing-semicolon": "always",
-    "declaration-colon-space-after": "always",
-    "declaration-colon-space-before": "never",
    "font-family-name-quotes": "always-unless-keyword",
    "function-calc-no-unspaced-operator": true,
-    "function-comma-newline-after": "never-multi-line",
-    "function-comma-newline-before": "never-multi-line",
-    "function-comma-space-after": "always",
-    "function-comma-space-before": "never",
    "function-linear-gradient-no-nonstandard-direction": true,
    "function-name-case": "lower",
-    "function-parentheses-newline-inside": "never-multi-line",
-    "function-parentheses-space-inside": "never",
    "function-url-quotes": "always",
    "function-url-scheme-disallowed-list": [
      "data"
    ],
-    "function-whitespace-after": "always",
-    "indentation": 2,
    "keyframe-declaration-no-important": true,
    "length-zero-no-unit": true,
-    "max-empty-lines": 1,
-    "max-line-length": [
-      100,
-      {
-        "ignore": [
-          "non-comments"
-        ]
-      }
-    ],
    "max-nesting-depth": 2,
-    "media-feature-colon-space-after": "always",
-    "media-feature-colon-space-before": "never",
-    "media-feature-name-case": "lower",
    "media-feature-name-no-vendor-prefix": true,
-    "media-feature-range-operator-space-after": "always",
-    "media-feature-range-operator-space-before": "always",
    "no-empty-source": true,
-    "no-eol-whitespace": true,
-    "no-extra-semicolons": true,
    "no-invalid-double-slash-comments": true,
-    "no-missing-end-of-source-newline": true,
-    "number-leading-zero": "always",
-    "number-no-trailing-zeros": true,
    "order/order": [
      "custom-properties",
      "dollar-variables",
@@ -132,6 +82,7 @@
          "right",
          "bottom",
          "left",
+          "inset",
          "z-index",
          "display",
          "visibility",
@@ -343,54 +294,33 @@
        ]
      }
    ],
-    "property-case": "lower",
    "property-no-vendor-prefix": true,
    "rule-empty-line-before": [
      "always",
      {
        "except": [
-            "first-nested"
+          "first-nested"
        ],
        "ignore": [
-            "after-comment"
+          "after-comment"
        ]
      }
    ],
-    "selector-attribute-brackets-space-inside": "never",
-    "selector-attribute-operator-space-after": "never",
-    "selector-attribute-operator-space-before": "never",
    "selector-attribute-quotes": "never",
    "selector-class-pattern": "^[A-Za-z0-9]+$",
-    "selector-combinator-space-after": "always",
-    "selector-combinator-space-before": "always",
-    "selector-descendant-combinator-no-non-space": true,
-    "selector-list-comma-newline-after": "always",
-    "selector-list-comma-newline-before": "never-multi-line",
-    "selector-list-comma-space-before": "never",
    "selector-max-attribute": 0,
    "selector-max-class": 3,
    "selector-max-compound-selectors": 3,
-    "selector-max-empty-lines": 0,
    "selector-max-id": 0,
    "selector-max-universal": 0,
-    "selector-pseudo-class-case": "lower",
-    "selector-pseudo-class-parentheses-space-inside": "never",
-    "selector-pseudo-element-case": "lower",
    "selector-pseudo-element-colon-notation": "double",
    "selector-pseudo-element-no-unknown": true,
    "selector-type-case": "lower",
    "selector-type-no-unknown": true,
    "shorthand-property-no-redundant-values": true,
    "string-no-newline": true,
-    "string-quotes": "single",
    "time-min-milliseconds": 100,
-    "unit-case": "lower",
    "unit-no-unknown": true,
-    "value-list-comma-newline-after": "never-multi-line",
-    "value-list-comma-newline-before": "never-multi-line",
-    "value-list-comma-space-after": "always",
-    "value-list-comma-space-before": "never",
-    "value-list-max-empty-lines": 0,
    "value-no-vendor-prefix": true
  }
-}
+}
@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "stylelint.vscode-stylelint",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode"
+    ]
+}
@@ -0,0 +1,23 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+  "files.insertFinalNewline": true,
+
+  "files.exclude": {
+    "**/node_modules": true,
+    "**/*.d.css": true
+  },
+
+  "editor.formatOnSave": false,
+  "editor.codeActionsOnSave": {
+    "source.fixAll": true
+  },
+
+  "typescript.preferences.quoteStyle": "single",
+
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+}
@@ -17,7 +17,8 @@ module.exports = {
  env: {
    development: {
      presets: [
-        ['@babel/preset-react', { development: true }]
+        ['@babel/preset-react', { development: true }],
+        '@babel/preset-typescript'
      ],
      plugins: [
        'babel-plugin-inline-classnames'
@@ -25,7 +26,8 @@ module.exports = {
    },
    production: {
      presets: [
-        '@babel/preset-react'
+        '@babel/preset-react',
+        '@babel/preset-typescript'
      ],
      plugins: [
        'babel-plugin-transform-react-remove-prop-types'
@@ -0,0 +1,283 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const path = require('path');
+const webpack = require('webpack');
+const FileManagerPlugin = require('filemanager-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const LiveReloadPlugin = require('webpack-livereload-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+
+module.exports = (env) => {
+  const uiFolder = 'UI';
+  const frontendFolder = path.join(__dirname, '..');
+  const srcFolder = path.join(frontendFolder, 'src');
+  const isProduction = !!env.production;
+  const isProfiling = isProduction && !!env.profile;
+  const inlineWebWorkers = 'no-fallback';
+
+  const distFolder = path.resolve(frontendFolder, '..', '_output', uiFolder);
+
+  console.log('Source Folder:', srcFolder);
+  console.log('Output Folder:', distFolder);
+  console.log('isProduction:', isProduction);
+  console.log('isProfiling:', isProfiling);
+
+  const config = {
+    mode: isProduction ? 'production' : 'development',
+    devtool: isProduction ? 'source-map' : 'eval-source-map',
+
+    stats: {
+      children: false
+    },
+
+    watchOptions: {
+      ignored: /node_modules/
+    },
+
+    entry: {
+      index: 'index.js'
+    },
+
+    resolve: {
+      extensions: [
+        '.ts',
+        '.tsx',
+        '.js'
+      ],
+      modules: [
+        srcFolder,
+        path.join(srcFolder, 'Shims'),
+        'node_modules'
+      ],
+      alias: {
+        jquery: 'jquery/dist/jquery.min',
+        'react-middle-truncate': 'react-middle-truncate/lib/react-middle-truncate'
+      },
+      fallback: {
+        buffer: false,
+        http: false,
+        https: false,
+        url: false,
+        util: false,
+        net: false
+      }
+    },
+
+    output: {
+      path: distFolder,
+      publicPath: '/',
+      filename: '[name]-[contenthash].js',
+      sourceMapFilename: '[file].map'
+    },
+
+    optimization: {
+      moduleIds: 'deterministic',
+      chunkIds: isProduction ? 'deterministic' : 'named'
+    },
+
+    performance: {
+      hints: false
+    },
+
+    experiments: {
+      topLevelAwait: true
+    },
+
+    plugins: [
+      new webpack.DefinePlugin({
+        __DEV__: !isProduction,
+        'process.env.NODE_ENV': isProduction ? JSON.stringify('production') : JSON.stringify('development')
+      }),
+
+      new MiniCssExtractPlugin({
+        filename: 'Content/styles.css',
+        chunkFilename: 'Content/[id]-[chunkhash].css'
+      }),
+
+      new HtmlWebpackPlugin({
+        template: 'frontend/src/index.ejs',
+        filename: 'index.html',
+        publicPath: '/'
+      }),
+
+      new FileManagerPlugin({
+        events: {
+          onEnd: {
+            copy: [
+              // HTML
+              {
+                source: 'frontend/src/*.html',
+                destination: distFolder
+              },
+
+              // Fonts
+              {
+                source: 'frontend/src/Content/Fonts/*.*',
+                destination: path.join(distFolder, 'Content/Fonts')
+              },
+
+              // Icon Images
+              {
+                source: 'frontend/src/Content/Images/Icons/*.*',
+                destination: path.join(distFolder, 'Content/Images/Icons')
+              },
+
+              // Images
+              {
+                source: 'frontend/src/Content/Images/*.*',
+                destination: path.join(distFolder, 'Content/Images')
+              },
+
+              // Robots
+              {
+                source: 'frontend/src/Content/robots.txt',
+                destination: path.join(distFolder, 'Content/robots.txt')
+              }
+            ]
+          }
+        }
+      }),
+
+      new ForkTsCheckerWebpackPlugin(),
+
+      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: [/\.jsx?$/, /\.tsx?$/],
+          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-modules-typescript-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 = {
+      minimize: true,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            sourceMap: true, // Must be set to true if using source-maps in production
+            mangle: false,
+            keep_classnames: true,
+            keep_fnames: true
+          }
+        })
+      ]
+    };
+  }
+
+  return config;
+};
@@ -1,3 +1,4 @@
+// eslint-disable-next-line filenames/match-exported
 const loaderUtils = require('loader-utils');

 module.exports = function cssVariablesLoader(source) {
@@ -1,18 +0,0 @@
-const gulp = require('gulp');
-
-require('./clean');
-require('./copy');
-require('./webpack');
-
-gulp.task('build',
-  gulp.series('clean',
-    gulp.parallel(
-      'webpack',
-      'copyHtml',
-      'copyFonts',
-      'copyImages',
-      'copyRobots'
-    )
-  )
-);
-
@@ -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,42 +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());
-});
-
-gulp.task('copyRobots', () => {
-  return gulp.src(paths.src.robots, { base: paths.src.root })
-    .pipe(cache('copyRobots'))
-    .pipe(print())
-    .pipe(gulp.dest(paths.dest.root))
-    .pipe(livereload());
-});
@@ -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,24 +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/`,
-    robots: `${root}/Content/robots.txt`,
-    exclude: {
-      libs: `!${root}/JsLibraries/**`
-    }
-  },
-  dest: {
-    root: './_output/UI/',
-    content: './_output/UI/Content/',
-    fonts: './_output/UI/Content/Fonts/',
-    images: './_output/UI/Content/Images/'
-  }
-};
-
-module.exports = paths;
@@ -1,19 +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'));
-  gulpWatch(paths.src.robots, gulp.series('copyRobots'));
-}
-
-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,31 @@
 const reload = require('require-nocache')(module);

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

-  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'
+  ]
 };
@@ -1,4 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-  "files.insertFinalNewline": true
-}
@@ -1,130 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
-import TablePager from 'Components/Table/TablePager';
-import { align, icons } from 'Helpers/Props';
-import BlacklistRowConnector from './BlacklistRowConnector';
-
-class Blacklist extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      isFetching,
-      isPopulated,
-      isAuthorFetching,
-      isAuthorPopulated,
-      error,
-      items,
-      columns,
-      totalRecords,
-      isClearingBlacklistExecuting,
-      onClearBlacklistPress,
-      ...otherProps
-    } = this.props;
-
-    const isAllPopulated = isPopulated && isAuthorPopulated;
-    const isAnyFetching = isFetching || isAuthorFetching;
-
-    return (
-      <PageContent title="Blacklist">
-        <PageToolbar>
-          <PageToolbarSection>
-            <PageToolbarButton
-              label="Clear"
-              iconName={icons.CLEAR}
-              isSpinning={isClearingBlacklistExecuting}
-              onPress={onClearBlacklistPress}
-            />
-          </PageToolbarSection>
-
-          <PageToolbarSection alignContent={align.RIGHT}>
-            <TableOptionsModalWrapper
-              {...otherProps}
-              columns={columns}
-            >
-              <PageToolbarButton
-                label="Options"
-                iconName={icons.TABLE}
-              />
-            </TableOptionsModalWrapper>
-          </PageToolbarSection>
-        </PageToolbar>
-
-        <PageContentBodyConnector>
-          {
-            isAnyFetching && !isAllPopulated &&
-              <LoadingIndicator />
-          }
-
-          {
-            !isAnyFetching && !!error &&
-              <div>Unable to load blacklist</div>
-          }
-
-          {
-            isAllPopulated && !error && !items.length &&
-              <div>
-                No history blacklist
-              </div>
-          }
-
-          {
-            isAllPopulated && !error && !!items.length &&
-              <div>
-                <Table
-                  columns={columns}
-                  {...otherProps}
-                >
-                  <TableBody>
-                    {
-                      items.map((item) => {
-                        return (
-                          <BlacklistRowConnector
-                            key={item.id}
-                            columns={columns}
-                            {...item}
-                          />
-                        );
-                      })
-                    }
-                  </TableBody>
-                </Table>
-
-                <TablePager
-                  totalRecords={totalRecords}
-                  isFetching={isFetching}
-                  {...otherProps}
-                />
-              </div>
-          }
-        </PageContentBodyConnector>
-      </PageContent>
-    );
-  }
-}
-
-Blacklist.propTypes = {
-  isAuthorFetching: PropTypes.bool.isRequired,
-  isAuthorPopulated: PropTypes.bool.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  totalRecords: PropTypes.number,
-  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
-  onClearBlacklistPress: PropTypes.func.isRequired
-};
-
-export default Blacklist;
@@ -0,0 +1,243 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Alert from 'Components/Alert';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import ConfirmModal from 'Components/Modal/ConfirmModal';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
+import TablePager from 'Components/Table/TablePager';
+import { align, icons, kinds } from 'Helpers/Props';
+import getRemovedItems from 'Utilities/Object/getRemovedItems';
+import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import translate from 'Utilities/String/translate';
+import getSelectedIds from 'Utilities/Table/getSelectedIds';
+import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
+import selectAll from 'Utilities/Table/selectAll';
+import toggleSelected from 'Utilities/Table/toggleSelected';
+import BlocklistRowConnector from './BlocklistRowConnector';
+
+class Blocklist extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      allSelected: false,
+      allUnselected: false,
+      lastToggled: null,
+      selectedState: {},
+      isConfirmRemoveModalOpen: false,
+      items: props.items
+    };
+  }
+
+  componentDidUpdate(prevProps) {
+    const {
+      items
+    } = this.props;
+
+    if (hasDifferentItems(prevProps.items, items)) {
+      this.setState((state) => {
+        return {
+          ...removeOldSelectedState(state, getRemovedItems(prevProps.items, items)),
+          items
+        };
+      });
+
+      return;
+    }
+  }
+
+  //
+  // Control
+
+  getSelectedIds = () => {
+    return getSelectedIds(this.state.selectedState);
+  };
+
+  //
+  // Listeners
+
+  onSelectAllChange = ({ value }) => {
+    this.setState(selectAll(this.state.selectedState, value));
+  };
+
+  onSelectedChange = ({ id, value, shiftKey = false }) => {
+    this.setState((state) => {
+      return toggleSelected(state, this.props.items, id, value, shiftKey);
+    });
+  };
+
+  onRemoveSelectedPress = () => {
+    this.setState({ isConfirmRemoveModalOpen: true });
+  };
+
+  onRemoveSelectedConfirmed = () => {
+    this.props.onRemoveSelected(this.getSelectedIds());
+    this.setState({ isConfirmRemoveModalOpen: false });
+  };
+
+  onConfirmRemoveModalClose = () => {
+    this.setState({ isConfirmRemoveModalOpen: false });
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isFetching,
+      isPopulated,
+      isAuthorFetching,
+      isAuthorPopulated,
+      error,
+      items,
+      columns,
+      totalRecords,
+      isRemoving,
+      isClearingBlocklistExecuting,
+      onClearBlocklistPress,
+      ...otherProps
+    } = this.props;
+
+    const isAllPopulated = isPopulated && isAuthorPopulated;
+    const isAnyFetching = isFetching || isAuthorFetching;
+
+    const {
+      allSelected,
+      allUnselected,
+      selectedState,
+      isConfirmRemoveModalOpen
+    } = this.state;
+
+    const selectedIds = this.getSelectedIds();
+
+    return (
+      <PageContent title={translate('Blocklist')}>
+        <PageToolbar>
+          <PageToolbarSection>
+            <PageToolbarButton
+              label={translate('RemoveSelected')}
+              iconName={icons.REMOVE}
+              isDisabled={!selectedIds.length}
+              isSpinning={isRemoving}
+              onPress={this.onRemoveSelectedPress}
+            />
+
+            <PageToolbarButton
+              label={translate('Clear')}
+              iconName={icons.CLEAR}
+              isSpinning={isClearingBlocklistExecuting}
+              onPress={onClearBlocklistPress}
+            />
+          </PageToolbarSection>
+
+          <PageToolbarSection alignContent={align.RIGHT}>
+            <TableOptionsModalWrapper
+              {...otherProps}
+              columns={columns}
+            >
+              <PageToolbarButton
+                label={translate('Options')}
+                iconName={icons.TABLE}
+              />
+            </TableOptionsModalWrapper>
+          </PageToolbarSection>
+        </PageToolbar>
+
+        <PageContentBody>
+          {
+            isAnyFetching && !isAllPopulated &&
+              <LoadingIndicator />
+          }
+
+          {
+            !isAnyFetching && !!error &&
+              <Alert kind={kinds.DANGER}>
+                {translate('UnableToLoadBlocklist')}
+              </Alert>
+          }
+
+          {
+            isAllPopulated && !error && !items.length &&
+              <Alert kind={kinds.INFO}>
+                {translate('NoHistoryBlocklist')}
+              </Alert>
+          }
+
+          {
+            isAllPopulated && !error && !!items.length &&
+              <div>
+                <Table
+                  selectAll={true}
+                  allSelected={allSelected}
+                  allUnselected={allUnselected}
+                  columns={columns}
+                  {...otherProps}
+                  onSelectAllChange={this.onSelectAllChange}
+                >
+                  <TableBody>
+                    {
+                      items.map((item) => {
+                        return (
+                          <BlocklistRowConnector
+                            key={item.id}
+                            isSelected={selectedState[item.id] || false}
+                            columns={columns}
+                            {...item}
+                            onSelectedChange={this.onSelectedChange}
+                          />
+                        );
+                      })
+                    }
+                  </TableBody>
+                </Table>
+
+                <TablePager
+                  totalRecords={totalRecords}
+                  isFetching={isFetching}
+                  {...otherProps}
+                />
+              </div>
+          }
+        </PageContentBody>
+
+        <ConfirmModal
+          isOpen={isConfirmRemoveModalOpen}
+          kind={kinds.DANGER}
+          title={translate('RemoveSelected')}
+          message={translate('RemoveSelectedItemBlocklistMessageText')}
+          confirmLabel={translate('RemoveSelected')}
+          onConfirm={this.onRemoveSelectedConfirmed}
+          onCancel={this.onConfirmRemoveModalClose}
+        />
+      </PageContent>
+    );
+  }
+}
+
+Blocklist.propTypes = {
+  isAuthorFetching: PropTypes.bool.isRequired,
+  isAuthorPopulated: PropTypes.bool.isRequired,
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  totalRecords: PropTypes.number,
+  isRemoving: PropTypes.bool.isRequired,
+  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
+  onRemoveSelected: PropTypes.func.isRequired,
+  onClearBlocklistPress: PropTypes.func.isRequired
+};
+
+export default Blocklist;
@@ -4,34 +4,34 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
-import * as blacklistActions from 'Store/Actions/blacklistActions';
+import * as blocklistActions from 'Store/Actions/blocklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
-import Blacklist from './Blacklist';
+import Blocklist from './Blocklist';

 function createMapStateToProps() {
  return createSelector(
-    (state) => state.blacklist,
+    (state) => state.blocklist,
    (state) => state.authors,
-    createCommandExecutingSelector(commandNames.CLEAR_BLACKLIST),
-    (blacklist, authors, isClearingBlacklistExecuting) => {
+    createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
+    (blocklist, authors, isClearingBlocklistExecuting) => {
      return {
        isAuthorFetching: authors.isFetching,
        isAuthorPopulated: authors.isPopulated,
-        isClearingBlacklistExecuting,
-        ...blacklist
+        isClearingBlocklistExecuting,
+        ...blocklist
      };
    }
  );
 }

 const mapDispatchToProps = {
-  ...blacklistActions,
+  ...blocklistActions,
  executeCommand
 };

-class BlacklistConnector extends Component {
+class BlocklistConnector extends Component {

  //
  // Lifecycle
@@ -39,27 +39,27 @@ class BlacklistConnector extends Component {
  componentDidMount() {
    const {
      useCurrentPage,
-      fetchBlacklist,
-      gotoBlacklistFirstPage
+      fetchBlocklist,
+      gotoBlocklistFirstPage
    } = this.props;

    registerPagePopulator(this.repopulate);

    if (useCurrentPage) {
-      fetchBlacklist();
+      fetchBlocklist();
    } else {
-      gotoBlacklistFirstPage();
+      gotoBlocklistFirstPage();
    }
  }

  componentDidUpdate(prevProps) {
-    if (prevProps.isClearingBlacklistExecuting && !this.props.isClearingBlacklistExecuting) {
-      this.props.gotoBlacklistFirstPage();
+    if (prevProps.isClearingBlocklistExecuting && !this.props.isClearingBlocklistExecuting) {
+      this.props.gotoBlocklistFirstPage();
    }
  }

  componentWillUnmount() {
-    this.props.clearBlacklist();
+    this.props.clearBlocklist();
    unregisterPagePopulator(this.repopulate);
  }

@@ -67,83 +67,89 @@ class BlacklistConnector extends Component {
  // Control

  repopulate = () => {
-    this.props.fetchBlacklist();
-  }
+    this.props.fetchBlocklist();
+  };
  //
  // Listeners

  onFirstPagePress = () => {
-    this.props.gotoBlacklistFirstPage();
-  }
+    this.props.gotoBlocklistFirstPage();
+  };

  onPreviousPagePress = () => {
-    this.props.gotoBlacklistPreviousPage();
-  }
+    this.props.gotoBlocklistPreviousPage();
+  };

  onNextPagePress = () => {
-    this.props.gotoBlacklistNextPage();
-  }
+    this.props.gotoBlocklistNextPage();
+  };

  onLastPagePress = () => {
-    this.props.gotoBlacklistLastPage();
-  }
+    this.props.gotoBlocklistLastPage();
+  };

  onPageSelect = (page) => {
-    this.props.gotoBlacklistPage({ page });
-  }
+    this.props.gotoBlocklistPage({ page });
+  };
+
+  onRemoveSelected = (ids) => {
+    this.props.removeBlocklistItems({ ids });
+  };

  onSortPress = (sortKey) => {
-    this.props.setBlacklistSort({ sortKey });
-  }
+    this.props.setBlocklistSort({ sortKey });
+  };

  onTableOptionChange = (payload) => {
-    this.props.setBlacklistTableOption(payload);
+    this.props.setBlocklistTableOption(payload);

    if (payload.pageSize) {
-      this.props.gotoBlacklistFirstPage();
+      this.props.gotoBlocklistFirstPage();
    }
-  }
+  };

-  onClearBlacklistPress = () => {
-    this.props.executeCommand({ name: commandNames.CLEAR_BLACKLIST });
-  }
+  onClearBlocklistPress = () => {
+    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
+  };

  //
  // Render

  render() {
    return (
-      <Blacklist
+      <Blocklist
        onFirstPagePress={this.onFirstPagePress}
        onPreviousPagePress={this.onPreviousPagePress}
        onNextPagePress={this.onNextPagePress}
        onLastPagePress={this.onLastPagePress}
        onPageSelect={this.onPageSelect}
+        onRemoveSelected={this.onRemoveSelected}
        onSortPress={this.onSortPress}
        onTableOptionChange={this.onTableOptionChange}
-        onClearBlacklistPress={this.onClearBlacklistPress}
+        onClearBlocklistPress={this.onClearBlocklistPress}
        {...this.props}
      />
    );
  }
 }

-BlacklistConnector.propTypes = {
+BlocklistConnector.propTypes = {
  useCurrentPage: PropTypes.bool.isRequired,
-  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
+  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  fetchBlacklist: PropTypes.func.isRequired,
-  gotoBlacklistFirstPage: PropTypes.func.isRequired,
-  gotoBlacklistPreviousPage: PropTypes.func.isRequired,
-  gotoBlacklistNextPage: PropTypes.func.isRequired,
-  gotoBlacklistLastPage: PropTypes.func.isRequired,
-  gotoBlacklistPage: PropTypes.func.isRequired,
-  setBlacklistSort: PropTypes.func.isRequired,
-  setBlacklistTableOption: PropTypes.func.isRequired,
-  clearBlacklist: PropTypes.func.isRequired,
+  fetchBlocklist: PropTypes.func.isRequired,
+  gotoBlocklistFirstPage: PropTypes.func.isRequired,
+  gotoBlocklistPreviousPage: PropTypes.func.isRequired,
+  gotoBlocklistNextPage: PropTypes.func.isRequired,
+  gotoBlocklistLastPage: PropTypes.func.isRequired,
+  gotoBlocklistPage: PropTypes.func.isRequired,
+  removeBlocklistItems: PropTypes.func.isRequired,
+  setBlocklistSort: PropTypes.func.isRequired,
+  setBlocklistTableOption: PropTypes.func.isRequired,
+  clearBlocklist: PropTypes.func.isRequired,
  executeCommand: PropTypes.func.isRequired
 };

 export default withCurrentPage(
-  connect(createMapStateToProps, mapDispatchToProps)(BlacklistConnector)
+  connect(createMapStateToProps, mapDispatchToProps)(BlocklistConnector)
 );
@@ -8,8 +8,9 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
+import translate from 'Utilities/String/translate';

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

  //
  // Render
@@ -39,19 +40,19 @@ class BlacklistDetailsModal extends Component {
          <ModalBody>
            <DescriptionList>
              <DescriptionListItem
-                title="Name"
+                title={translate('Name')}
                data={sourceTitle}
              />

              <DescriptionListItem
-                title="Protocol"
+                title={translate('Protocol')}
                data={protocol}
              />

              {
                !!message &&
                  <DescriptionListItem
-                    title="Indexer"
+                    title={translate('Indexer')}
                    data={indexer}
                  />
              }
@@ -59,7 +60,7 @@ class BlacklistDetailsModal extends Component {
              {
                !!message &&
                  <DescriptionListItem
-                    title="Message"
+                    title={translate('Message')}
                    data={message}
                  />
              }
@@ -77,7 +78,7 @@ class BlacklistDetailsModal extends Component {
  }
 }

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

-export default BlacklistDetailsModal;
+export default BlocklistDetailsModal;
@@ -0,0 +1,9 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'actions': string;
+  'indexer': string;
+  'quality': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -1,16 +1,19 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import AuthorNameLink from 'Author/AuthorNameLink';
+import BookFormats from 'Book/BookFormats';
 import BookQuality from 'Book/BookQuality';
 import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
-import BlacklistDetailsModal from './BlacklistDetailsModal';
-import styles from './BlacklistRow.css';
+import translate from 'Utilities/String/translate';
+import BlocklistDetailsModal from './BlocklistDetailsModal';
+import styles from './BlocklistRow.css';

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

  //
  // Lifecycle
@@ -28,25 +31,29 @@ class BlacklistRow extends Component {

  onDetailsPress = () => {
    this.setState({ isDetailsModalOpen: true });
-  }
+  };

  onDetailsModalClose = () => {
    this.setState({ isDetailsModalOpen: false });
-  }
+  };

  //
  // Render

  render() {
    const {
+      id,
      author,
      sourceTitle,
      quality,
+      customFormats,
      date,
      protocol,
      indexer,
      message,
+      isSelected,
      columns,
+      onSelectedChange,
      onRemovePress
    } = this.props;

@@ -56,6 +63,12 @@ class BlacklistRow extends Component {

    return (
      <TableRow>
+        <TableSelectCell
+          id={id}
+          isSelected={isSelected}
+          onSelectedChange={onSelectedChange}
+        />
+
        {
          columns.map((column) => {
            const {
@@ -67,7 +80,7 @@ class BlacklistRow extends Component {
              return null;
            }

-            if (name === 'authors.sortName') {
+            if (name === 'authorMetadata.sortName') {
              return (
                <TableRowCell key={name}>
                  <AuthorNameLink
@@ -99,6 +112,16 @@ class BlacklistRow extends Component {
              );
            }

+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <BookFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
            if (name === 'date') {
              return (
                <RelativeDateCellConnector
@@ -131,7 +154,7 @@ class BlacklistRow extends Component {
                  />

                  <IconButton
-                    title="Remove from blacklist"
+                    title={translate('RemoveFromBlocklist')}
                    name={icons.REMOVE}
                    kind={kinds.DANGER}
                    onPress={onRemovePress}
@@ -144,7 +167,7 @@ class BlacklistRow extends Component {
          })
        }

-        <BlacklistDetailsModal
+        <BlocklistDetailsModal
          isOpen={this.state.isDetailsModalOpen}
          sourceTitle={sourceTitle}
          protocol={protocol}
@@ -158,17 +181,20 @@ class BlacklistRow extends Component {

 }

-BlacklistRow.propTypes = {
+BlocklistRow.propTypes = {
  id: PropTypes.number.isRequired,
  author: PropTypes.object.isRequired,
  sourceTitle: PropTypes.string.isRequired,
  quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
  date: PropTypes.string.isRequired,
  protocol: PropTypes.string.isRequired,
  indexer: PropTypes.string,
  message: PropTypes.string,
+  isSelected: PropTypes.bool.isRequired,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onSelectedChange: PropTypes.func.isRequired,
  onRemovePress: PropTypes.func.isRequired
 };

-export default BlacklistRow;
+export default BlocklistRow;
@@ -1,8 +1,8 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { removeFromBlacklist } from 'Store/Actions/blacklistActions';
+import { removeBlocklistItem } from 'Store/Actions/blocklistActions';
 import createAuthorSelector from 'Store/Selectors/createAuthorSelector';
-import BlacklistRow from './BlacklistRow';
+import BlocklistRow from './BlocklistRow';

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

-export default connect(createMapStateToProps, createMapDispatchToProps)(BlacklistRow);
+export default connect(createMapStateToProps, createMapDispatchToProps)(BlocklistRow);
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'description': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -9,6 +9,8 @@ import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
+import translate from 'Utilities/String/translate';
 import styles from './HistoryDetails.css';

 function getDetailedList(statusMessages) {
@@ -64,8 +66,10 @@ function HistoryDetails(props) {
    const {
      indexer,
      releaseGroup,
+      customFormatScore,
      nzbInfoUrl,
      downloadClient,
+      downloadClientName,
      downloadId,
      age,
      ageHours,
@@ -73,18 +77,20 @@ function HistoryDetails(props) {
      publishedDate
    } = data;

+    const downloadClientNameInfo = downloadClientName ?? downloadClient;
+
    return (
      <DescriptionList>
        <DescriptionListItem
          descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
          data={sourceTitle}
        />

        {
          !!indexer &&
            <DescriptionListItem
-              title="Indexer"
+              title={translate('Indexer')}
              data={indexer}
            />
        }
@@ -93,13 +99,22 @@ function HistoryDetails(props) {
          !!releaseGroup &&
            <DescriptionListItem
              descriptionClassName={styles.description}
-              title="Release Group"
+              title={translate('ReleaseGroup')}
              data={releaseGroup}
            />
        }

        {
-          !!nzbInfoUrl &&
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
+            /> :
+            null
+        }
+
+        {
+          nzbInfoUrl ?
            <span>
              <DescriptionListItemTitle>
                Info URL
@@ -108,21 +123,23 @@ function HistoryDetails(props) {
              <DescriptionListItemDescription>
                <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
              </DescriptionListItemDescription>
-            </span>
+            </span> :
+            null
        }

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

        {
          !!downloadId &&
            <DescriptionListItem
-              title="Grab ID"
+              title={translate('GrabID')}
              data={downloadId}
            />
        }
@@ -130,7 +147,7 @@ function HistoryDetails(props) {
        {
          !!indexer &&
            <DescriptionListItem
-              title="Age (when grabbed)"
+              title={translate('AgeWhenGrabbed')}
              data={formatAge(age, ageHours, ageMinutes)}
            />
        }
@@ -138,7 +155,7 @@ function HistoryDetails(props) {
        {
          !!publishedDate &&
            <DescriptionListItem
-              title="Published Date"
+              title={translate('PublishedDate')}
              data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
            />
        }
@@ -155,14 +172,14 @@ function HistoryDetails(props) {
      <DescriptionList>
        <DescriptionListItem
          descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
          data={sourceTitle}
        />

        {
          !!message &&
            <DescriptionListItem
-              title="Message"
+              title={translate('Message')}
              data={message}
            />
        }
@@ -172,6 +189,7 @@ function HistoryDetails(props) {

  if (eventType === 'bookFileImported') {
    const {
+      customFormatScore,
      droppedPath,
      importedPath
    } = data;
@@ -180,7 +198,7 @@ function HistoryDetails(props) {
      <DescriptionList>
        <DescriptionListItem
          descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
          data={sourceTitle}
        />

@@ -188,18 +206,28 @@ function HistoryDetails(props) {
          !!droppedPath &&
            <DescriptionListItem
              descriptionClassName={styles.description}
-              title="Source"
+              title={translate('Source')}
              data={droppedPath}
            />
        }

        {
-          !!importedPath &&
+          importedPath ?
            <DescriptionListItem
              descriptionClassName={styles.description}
-              title="Imported To"
+              title={translate('ImportedTo')}
              data={importedPath}
-            />
+            /> :
+            null
+        }
+
+        {
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
+            /> :
+            null
        }
      </DescriptionList>
    );
@@ -207,20 +235,21 @@ function HistoryDetails(props) {

  if (eventType === 'bookFileDeleted') {
    const {
-      reason
+      reason,
+      customFormatScore
    } = data;

    let reasonMessage = '';

    switch (reason) {
      case 'Manual':
-        reasonMessage = 'File was deleted by via UI';
+        reasonMessage = translate('FileWasDeletedByViaUI');
        break;
      case 'MissingFromDisk':
-        reasonMessage = 'Readarr was unable to find the file on disk so it was removed';
+        reasonMessage = translate('MissingFromDisk');
        break;
      case 'Upgrade':
-        reasonMessage = 'File was deleted to import an upgrade';
+        reasonMessage = translate('FileWasDeletedByUpgrade');
        break;
      default:
        reasonMessage = '';
@@ -229,14 +258,23 @@ function HistoryDetails(props) {
    return (
      <DescriptionList>
        <DescriptionListItem
-          title="Name"
+          title={translate('Name')}
          data={sourceTitle}
        />

        <DescriptionListItem
-          title="Reason"
+          title={translate('Reason')}
          data={reasonMessage}
        />
+
+        {
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
+            /> :
+            null
+        }
      </DescriptionList>
    );
  }
@@ -250,12 +288,12 @@ function HistoryDetails(props) {
    return (
      <DescriptionList>
        <DescriptionListItem
-          title="Source Path"
+          title={translate('SourcePath')}
          data={sourcePath}
        />

        <DescriptionListItem
-          title="Destination Path"
+          title={translate('DestinationPath')}
          data={path}
        />
      </DescriptionList>
@@ -271,7 +309,7 @@ function HistoryDetails(props) {
    return (
      <DescriptionList>
        <DescriptionListItem
-          title="Path"
+          title={translate('Path')}
          data={sourceTitle}
        />
        {
@@ -286,7 +324,7 @@ function HistoryDetails(props) {
          })
        }
        <DescriptionListItem
-          title="Existing tags scrubbed"
+          title={translate('ExistingTagsScrubbed')}
          data={tagsScrubbed === 'True' ? <Icon name={icons.CHECK} /> : <Icon name={icons.REMOVE} />}
        />
      </DescriptionList>
@@ -301,14 +339,14 @@ function HistoryDetails(props) {
    return (
      <DescriptionList>
        <DescriptionListItem
-          title="Name"
+          title={translate('Name')}
          data={sourceTitle}
        />

        {
          !!statusMessages &&
            <DescriptionListItem
-              title="Import failures"
+              title={translate('ImportFailures')}
              data={getDetailedList(JSON.parse(statusMessages))}
            />
        }
@@ -332,14 +370,14 @@ function HistoryDetails(props) {
    return (
      <DescriptionList>
        <DescriptionListItem
-          title="Name"
+          title={translate('Name')}
          data={sourceTitle}
        />

        {
          !!indexer &&
            <DescriptionListItem
-              title="Indexer"
+              title={translate('Indexer')}
              data={indexer}
            />
        }
@@ -347,7 +385,7 @@ function HistoryDetails(props) {
        {
          !!releaseGroup &&
            <DescriptionListItem
-              title="Release Group"
+              title={translate('ReleaseGroup')}
              data={releaseGroup}
            />
        }
@@ -368,7 +406,7 @@ function HistoryDetails(props) {
        {
          !!downloadClient &&
            <DescriptionListItem
-              title="Download Client"
+              title={translate('DownloadClient')}
              data={downloadClient}
            />
        }
@@ -376,7 +414,7 @@ function HistoryDetails(props) {
        {
          !!downloadId &&
            <DescriptionListItem
-              title="Grab ID"
+              title={translate('GrabID')}
              data={downloadId}
            />
        }
@@ -384,7 +422,7 @@ function HistoryDetails(props) {
        {
          !!indexer &&
            <DescriptionListItem
-              title="Age (when grabbed)"
+              title={translate('AgeWhenGrabbed')}
              data={formatAge(age, ageHours, ageMinutes)}
            />
        }
@@ -392,7 +430,7 @@ function HistoryDetails(props) {
        {
          !!publishedDate &&
            <DescriptionListItem
-              title="Published Date"
+              title={translate('PublishedDate')}
              data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
            />
        }
@@ -409,14 +447,14 @@ function HistoryDetails(props) {
      <DescriptionList>
        <DescriptionListItem
          descriptionClassName={styles.description}
-          title="Name"
+          title={translate('Name')}
          data={sourceTitle}
        />

        {
          !!message &&
            <DescriptionListItem
-              title="Message"
+              title={translate('Message')}
              data={message}
            />
        }
@@ -428,7 +466,7 @@ function HistoryDetails(props) {
    <DescriptionList>
      <DescriptionListItem
        descriptionClassName={styles.description}
-        title="Name"
+        title={translate('Name')}
        data={sourceTitle}
      />
    </DescriptionList>
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'markAsFailedButton': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -1,9 +1,10 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@@ -11,33 +12,12 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons } from 'Helpers/Props';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import { align, icons, kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import HistoryRowConnector from './HistoryRowConnector';

 class History extends Component {

-  //
-  // Lifecycle
-
-  shouldComponentUpdate(nextProps) {
-    // Don't update when fetching has completed if items have changed,
-    // before books start fetching or when books start fetching.
-
-    if (
-      (
-        this.props.isFetching &&
-        nextProps.isPopulated &&
-        hasDifferentItems(this.props.items, nextProps.items)
-      ) ||
-      (!this.props.isBooksFetching && nextProps.isBooksFetching)
-    ) {
-      return false;
-    }
-
-    return true;
-  }
-
  //
  // Render

@@ -66,11 +46,11 @@ class History extends Component {
    const hasError = error || booksError;

    return (
-      <PageContent title="History">
+      <PageContent title={translate('History')}>
        <PageToolbar>
          <PageToolbarSection>
            <PageToolbarButton
-              label="Refresh"
+              label={translate('Refresh')}
              iconName={icons.REFRESH}
              isSpinning={isFetching}
              onPress={onFirstPagePress}
@@ -83,7 +63,7 @@ class History extends Component {
              columns={columns}
            >
              <PageToolbarButton
-                label="Options"
+                label={translate('Options')}
                iconName={icons.TABLE}
              />
            </TableOptionsModalWrapper>
@@ -98,7 +78,7 @@ class History extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isFetchingAny && !isAllPopulated &&
              <LoadingIndicator />
@@ -106,7 +86,9 @@ class History extends Component {

          {
            !isFetchingAny && hasError &&
-              <div>Unable to load history</div>
+              <Alert kind={kinds.DANGER}>
+                {translate('UnableToLoadHistory')}
+              </Alert>
          }

          {
@@ -114,9 +96,9 @@ class History extends Component {
            // wait for the books to populate because they are never coming.

            isPopulated && !hasError && !items.length &&
-              <div>
-                No history found
-              </div>
+              <Alert kind={kinds.INFO}>
+                {translate('NoHistory')}
+              </Alert>
          }

          {
@@ -149,7 +131,7 @@ class History extends Component {
                />
              </div>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
@@ -3,10 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import withCurrentPage from 'Components/withCurrentPage';
-import { clearBooks, fetchBooks } from 'Store/Actions/bookActions';
 import * as historyActions from 'Store/Actions/historyActions';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import History from './History';

@@ -29,9 +26,7 @@ function createMapStateToProps() {
 }

 const mapDispatchToProps = {
-  ...historyActions,
-  fetchBooks,
-  clearBooks
+  ...historyActions
 };

 class HistoryConnector extends Component {
@@ -55,21 +50,9 @@ class HistoryConnector extends Component {
    }
  }

-  componentDidUpdate(prevProps) {
-    if (hasDifferentItems(prevProps.items, this.props.items)) {
-      const bookIds = selectUniqueIds(this.props.items, 'bookId');
-      if (bookIds.length) {
-        this.props.fetchBooks({ bookIds });
-      } else {
-        this.props.clearBooks();
-      }
-    }
-  }
-
  componentWillUnmount() {
    unregisterPagePopulator(this.repopulate);
    this.props.clearHistory();
-    this.props.clearBooks();
  }

  //
@@ -77,38 +60,38 @@ class HistoryConnector extends Component {

  repopulate = () => {
    this.props.fetchHistory();
-  }
+  };

  //
  // Listeners

  onFirstPagePress = () => {
    this.props.gotoHistoryFirstPage();
-  }
+  };

  onPreviousPagePress = () => {
    this.props.gotoHistoryPreviousPage();
-  }
+  };

  onNextPagePress = () => {
    this.props.gotoHistoryNextPage();
-  }
+  };

  onLastPagePress = () => {
    this.props.gotoHistoryLastPage();
-  }
+  };

  onPageSelect = (page) => {
    this.props.gotoHistoryPage({ page });
-  }
+  };

  onSortPress = (sortKey) => {
    this.props.setHistorySort({ sortKey });
-  }
+  };

  onFilterSelect = (selectedFilterKey) => {
    this.props.setHistoryFilter({ selectedFilterKey });
-  }
+  };

  onTableOptionChange = (payload) => {
    this.props.setHistoryTableOption(payload);
@@ -116,7 +99,7 @@ class HistoryConnector extends Component {
    if (payload.pageSize) {
      this.props.gotoHistoryFirstPage();
    }
-  }
+  };

  //
  // Render
@@ -150,9 +133,7 @@ HistoryConnector.propTypes = {
  setHistorySort: PropTypes.func.isRequired,
  setHistoryFilter: PropTypes.func.isRequired,
  setHistoryTableOption: PropTypes.func.isRequired,
-  clearHistory: PropTypes.func.isRequired,
-  fetchBooks: PropTypes.func.isRequired,
-  clearBooks: PropTypes.func.isRequired
+  clearHistory: PropTypes.func.isRequired
 };

 export default withCurrentPage(
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'cell': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -23,8 +23,6 @@ function getIconName(eventType) {
      return icons.RETAG;
    case 'bookImportIncomplete':
      return icons.DOWNLOADED;
-    case 'downloadImported':
-      return icons.DOWNLOADED;
    case 'downloadIgnored':
      return icons.IGNORE;
    default:
@@ -61,8 +59,6 @@ function getTooltip(eventType, data) {
      return 'Book file tags updated';
    case 'bookImportIncomplete':
      return 'Files downloaded but not all could be imported';
-    case 'downloadImported':
-      return 'Download completed and successfully imported';
    case 'downloadIgnored':
      return 'Book Download Ignored';
    default:
@@ -10,6 +10,12 @@
  width: 80px;
 }

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

@@ -0,0 +1,11 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'customFormatScore': string;
+  'details': string;
+  'downloadClient': string;
+  'indexer': string;
+  'releaseGroup': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -1,13 +1,16 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import AuthorNameLink from 'Author/AuthorNameLink';
+import BookFormats from 'Book/BookFormats';
 import BookQuality from 'Book/BookQuality';
 import BookTitleLink from 'Book/BookTitleLink';
 import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
-import { icons } from 'Helpers/Props';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons, tooltipPositions } from 'Helpers/Props';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
@@ -40,11 +43,11 @@ class HistoryRow extends Component {

  onDetailsPress = () => {
    this.setState({ isDetailsModalOpen: true });
-  }
+  };

  onDetailsModalClose = () => {
    this.setState({ isDetailsModalOpen: false });
-  }
+  };

  //
  // Render
@@ -54,6 +57,8 @@ class HistoryRow extends Component {
      author,
      book,
      quality,
+      customFormats,
+      customFormatScore,
      qualityCutoffNotMet,
      eventType,
      sourceTitle,
@@ -93,7 +98,7 @@ class HistoryRow extends Component {
              );
            }

-            if (name === 'authors.sortName') {
+            if (name === 'authorMetadata.sortName') {
              return (
                <TableRowCell key={name}>
                  <AuthorNameLink
@@ -127,6 +132,16 @@ class HistoryRow extends Component {
              );
            }

+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <BookFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
            if (name === 'date') {
              return (
                <RelativeDateCellConnector
@@ -158,6 +173,24 @@ class HistoryRow extends Component {
              );
            }

+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  <Tooltip
+                    anchor={formatCustomFormatScore(
+                      customFormatScore,
+                      customFormats.length
+                    )}
+                    tooltip={<BookFormats formats={customFormats} />}
+                    position={tooltipPositions.BOTTOM}
+                  />
+                </TableRowCell>
+              );
+            }
+
            if (name === 'releaseGroup') {
              return (
                <TableRowCell
@@ -169,6 +202,16 @@ class HistoryRow extends Component {
              );
            }

+            if (name === 'sourceTitle') {
+              return (
+                <TableRowCell
+                  key={name}
+                >
+                  {sourceTitle}
+                </TableRowCell>
+              );
+            }
+
            if (name === 'details') {
              return (
                <TableRowCell
@@ -209,6 +252,8 @@ HistoryRow.propTypes = {
  author: PropTypes.object.isRequired,
  book: PropTypes.object,
  quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
  qualityCutoffNotMet: PropTypes.bool.isRequired,
  eventType: PropTypes.string.isRequired,
  sourceTitle: PropTypes.string.isRequired,
@@ -222,4 +267,8 @@ HistoryRow.propTypes = {
  onMarkAsFailedPress: PropTypes.func.isRequired
 };

+HistoryRow.defaultProps = {
+  customFormats: []
+};
+
 export default HistoryRow;
@@ -49,7 +49,7 @@ class HistoryRowConnector extends Component {

  onMarkAsFailedPress = () => {
    this.props.markAsFailed({ id: this.props.id });
-  }
+  };

  //
  // Render
@@ -1,13 +1,13 @@
 .torrent {
  composes: label from '~Components/Label.css';

-  border-color: $torrentColor;
-  background-color: $torrentColor;
+  border-color: var(--torrentColor);
+  background-color: var(--torrentColor);
 }

 .usenet {
  composes: label from '~Components/Label.css';

-  border-color: $usenetColor;
-  background-color: $usenetColor;
+  border-color: var(--usenetColor);
+  background-color: var(--usenetColor);
 }
@@ -0,0 +1,8 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'torrent': string;
+  'usenet': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -1,9 +1,10 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@@ -12,8 +13,10 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons } from 'Helpers/Props';
+import { align, icons, kinds } from 'Helpers/Props';
+import getRemovedItems from 'Utilities/Object/getRemovedItems';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import translate from 'Utilities/String/translate';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
@@ -30,30 +33,21 @@ class Queue extends Component {
  constructor(props, context) {
    super(props, context);

+    this._shouldBlockRefresh = false;
+
    this.state = {
      allSelected: false,
      allUnselected: false,
      lastToggled: null,
      selectedState: {},
      isPendingSelected: false,
-      isConfirmRemoveModalOpen: false
+      isConfirmRemoveModalOpen: false,
+      items: props.items
    };
  }

-  shouldComponentUpdate(nextProps) {
-    // Don't update when fetching has completed if items have changed,
-    // before books start fetching or when books start fetching.
-
-    if (
-      this.props.isFetching &&
-      nextProps.isPopulated &&
-      hasDifferentItems(this.props.items, nextProps.items) &&
-      nextProps.items.some((e) => e.bookId)
-    ) {
-      return false;
-    }
-
-    if (!this.props.isBooksFetching && nextProps.isBooksFetching) {
+  shouldComponentUpdate() {
+    if (this._shouldBlockRefresh) {
      return false;
    }

@@ -61,21 +55,44 @@ class Queue extends Component {
  }

  componentDidUpdate(prevProps) {
-    if (hasDifferentItems(prevProps.items, this.props.items)) {
+    const {
+      items,
+      isFetching,
+      isBooksFetching
+    } = this.props;
+
+    if (
+      (!isBooksFetching && prevProps.isBooksFetching) ||
+      (!isFetching && prevProps.isFetching) ||
+      (hasDifferentItems(prevProps.items, items) && !items.some((e) => e.bookId))
+    ) {
      this.setState((state) => {
-        return removeOldSelectedState(state, prevProps.items);
+        return {
+          ...removeOldSelectedState(state, getRemovedItems(prevProps.items, items)),
+          items
+        };
      });

      return;
    }

+    const nextState = {};
+
+    if (prevProps.items !== items) {
+      nextState.items = items;
+    }
+
    const selectedIds = this.getSelectedIds();
    const isPendingSelected = _.some(this.props.items, (item) => {
      return selectedIds.indexOf(item.id) > -1 && item.status === 'delay';
    });

    if (isPendingSelected !== this.state.isPendingSelected) {
-      this.setState({ isPendingSelected });
+      nextState.isPendingSelected = isPendingSelected;
+    }
+
+    if (!_.isEmpty(nextState)) {
+      this.setState(nextState);
    }
  }

@@ -84,37 +101,45 @@ class Queue extends Component {

  getSelectedIds = () => {
    return getSelectedIds(this.state.selectedState);
-  }
+  };

  //
  // Listeners

+  onQueueRowModalOpenOrClose = (isOpen) => {
+    this._shouldBlockRefresh = isOpen;
+  };
+
  onSelectAllChange = ({ value }) => {
    this.setState(selectAll(this.state.selectedState, value));
-  }
+  };

  onSelectedChange = ({ id, value, shiftKey = false }) => {
    this.setState((state) => {
      return toggleSelected(state, this.props.items, id, value, shiftKey);
    });
-  }
+  };

  onGrabSelectedPress = () => {
    this.props.onGrabSelectedPress(this.getSelectedIds());
-  }
+  };

  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 });
-  }
+  };

  //
  // Render
@@ -124,7 +149,6 @@ class Queue extends Component {
      isFetching,
      isPopulated,
      error,
-      items,
      isAuthorFetching,
      isAuthorPopulated,
      isBooksFetching,
@@ -144,7 +168,8 @@ class Queue extends Component {
      allUnselected,
      selectedState,
      isConfirmRemoveModalOpen,
-      isPendingSelected
+      isPendingSelected,
+      items
    } = this.state;

    const isRefreshing = isFetching || isAuthorFetching || isBooksFetching || isRefreshMonitoredDownloadsExecuting;
@@ -155,11 +180,11 @@ class Queue extends Component {
    const disableSelectedActions = selectedCount === 0;

    return (
-      <PageContent title="Queue">
+      <PageContent title={translate('Queue')}>
        <PageToolbar>
          <PageToolbarSection>
            <PageToolbarButton
-              label="Refresh"
+              label={translate('Refresh')}
              iconName={icons.REFRESH}
              isSpinning={isRefreshing}
              onPress={onRefreshPress}
@@ -168,7 +193,7 @@ class Queue extends Component {
            <PageToolbarSeparator />

            <PageToolbarButton
-              label="Grab Selected"
+              label={translate('GrabSelected')}
              iconName={icons.DOWNLOAD}
              isDisabled={disableSelectedActions || !isPendingSelected}
              isSpinning={isGrabbing}
@@ -176,7 +201,7 @@ class Queue extends Component {
            />

            <PageToolbarButton
-              label="Remove Selected"
+              label={translate('RemoveSelected')}
              iconName={icons.REMOVE}
              isDisabled={disableSelectedActions}
              isSpinning={isRemoving}
@@ -193,35 +218,38 @@ class Queue extends Component {
              optionsComponent={QueueOptionsConnector}
            >
              <PageToolbarButton
-                label="Options"
+                label={translate('Options')}
                iconName={icons.TABLE}
              />
            </TableOptionsModalWrapper>
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
-            isRefreshing && !isAllPopulated &&
-              <LoadingIndicator />
+            isRefreshing && !isAllPopulated ?
+              <LoadingIndicator /> :
+              null
          }

          {
-            !isRefreshing && hasError &&
-              <div>
-                Failed to load Queue
-              </div>
+            !isRefreshing && hasError ?
+              <Alert kind={kinds.DANGER}>
+                {translate('FailedToLoadQueue')}
+              </Alert> :
+              null
          }

          {
-            isPopulated && !hasError && !items.length &&
-              <div>
-                Queue is empty
-              </div>
+            isAllPopulated && !hasError && !items.length ?
+              <Alert kind={kinds.INFO}>
+                {translate('QueueIsEmpty')}
+              </Alert> :
+              null
          }

          {
-            isAllPopulated && !hasError && !!items.length &&
+            isAllPopulated && !hasError && !!items.length ?
              <div>
                <Table
                  columns={columns}
@@ -243,6 +271,7 @@ class Queue extends Component {
                            columns={columns}
                            {...item}
                            onSelectedChange={this.onSelectedChange}
+                            onQueueRowModalOpenOrClose={this.onQueueRowModalOpenOrClose}
                          />
                        );
                      })
@@ -255,9 +284,10 @@ class Queue extends Component {
                  isFetching={isRefreshing}
                  {...otherProps}
                />
-              </div>
+              </div> :
+              null
          }
-        </PageContentBodyConnector>
+        </PageContentBody>

        <RemoveQueueItemsModal
          isOpen={isConfirmRemoveModalOpen}
@@ -269,6 +299,17 @@ class Queue extends Component {
              return !!(item && item.authorId && item.bookId);
            })
          )}
+          allPending={isConfirmRemoveModalOpen && (
+            selectedIds.every((id) => {
+              const item = items.find((i) => i.id === id);
+
+              if (!item) {
+                return false;
+              }
+
+              return item.status === 'delay' || item.status === 'downloadClientUnavailable';
+            })
+          )}
          onRemovePress={this.onRemoveSelectedConfirmed}
          onModalClose={this.onConfirmRemoveModalClose}
        />
@@ -4,12 +4,9 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
-import { clearBooks, fetchBooks } from 'Store/Actions/bookActions';
 import { executeCommand } from 'Store/Actions/commandActions';
 import * as queueActions from 'Store/Actions/queueActions';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Queue from './Queue';

@@ -37,8 +34,6 @@ function createMapStateToProps() {

 const mapDispatchToProps = {
  ...queueActions,
-  fetchBooks,
-  clearBooks,
  executeCommand
 };

@@ -51,6 +46,7 @@ class QueueConnector extends Component {
    const {
      useCurrentPage,
      fetchQueue,
+      fetchQueueStatus,
      gotoQueueFirstPage
    } = this.props;

@@ -61,19 +57,11 @@ class QueueConnector extends Component {
    } else {
      gotoQueueFirstPage();
    }
+
+    fetchQueueStatus();
  }

  componentDidUpdate(prevProps) {
-    if (hasDifferentItems(prevProps.items, this.props.items)) {
-      const bookIds = selectUniqueIds(this.props.items, 'bookId');
-
-      if (bookIds.length) {
-        this.props.fetchBooks({ bookIds });
-      } else {
-        this.props.clearBooks();
-      }
-    }
-
    if (
      this.props.includeUnknownAuthorItems !==
      prevProps.includeUnknownAuthorItems
@@ -84,8 +72,6 @@ class QueueConnector extends Component {

  componentWillUnmount() {
    unregisterPagePopulator(this.repopulate);
-    this.props.clearQueue();
-    this.props.clearBooks();
  }

  //
@@ -93,34 +79,34 @@ class QueueConnector extends Component {

  repopulate = () => {
    this.props.fetchQueue();
-  }
+  };

  //
  // Listeners

  onFirstPagePress = () => {
    this.props.gotoQueueFirstPage();
-  }
+  };

  onPreviousPagePress = () => {
    this.props.gotoQueuePreviousPage();
-  }
+  };

  onNextPagePress = () => {
    this.props.gotoQueueNextPage();
-  }
+  };

  onLastPagePress = () => {
    this.props.gotoQueueLastPage();
-  }
+  };

  onPageSelect = (page) => {
    this.props.gotoQueuePage({ page });
-  }
+  };

  onSortPress = (sortKey) => {
    this.props.setQueueSort({ sortKey });
-  }
+  };

  onTableOptionChange = (payload) => {
    this.props.setQueueTableOption(payload);
@@ -128,21 +114,21 @@ class QueueConnector extends Component {
    if (payload.pageSize) {
      this.props.gotoQueueFirstPage();
    }
-  }
+  };

  onRefreshPress = () => {
    this.props.executeCommand({
      name: commandNames.REFRESH_MONITORED_DOWNLOADS
    });
-  }
+  };

  onGrabSelectedPress = (ids) => {
    this.props.grabQueueItems({ ids });
-  }
+  };

  onRemoveSelectedPress = (payload) => {
    this.props.removeQueueItems(payload);
-  }
+  };

  //
  // Render
@@ -171,6 +157,7 @@ QueueConnector.propTypes = {
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  includeUnknownAuthorItems: PropTypes.bool.isRequired,
  fetchQueue: PropTypes.func.isRequired,
+  fetchQueueStatus: PropTypes.func.isRequired,
  gotoQueueFirstPage: PropTypes.func.isRequired,
  gotoQueuePreviousPage: PropTypes.func.isRequired,
  gotoQueueNextPage: PropTypes.func.isRequired,
@@ -181,8 +168,6 @@ QueueConnector.propTypes = {
  clearQueue: PropTypes.func.isRequired,
  grabQueueItems: PropTypes.func.isRequired,
  removeQueueItems: PropTypes.func.isRequired,
-  fetchBooks: PropTypes.func.isRequired,
-  clearBooks: PropTypes.func.isRequired,
  executeCommand: PropTypes.func.isRequired
 };

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
 import { icons, kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';

 function QueueDetails(props) {
  const {
@@ -23,7 +24,7 @@ function QueueDetails(props) {
    return (
      <Icon
        name={icons.PENDING}
-        title={`Release will be processed ${moment(estimatedCompletionTime).fromNow()}`}
+        title={translate('ReleaseWillBeProcessedInterp', [moment(estimatedCompletionTime).fromNow()])}
      />
    );
  }
@@ -34,7 +35,7 @@ function QueueDetails(props) {
        <Icon
          name={icons.DOWNLOAD}
          kind={kinds.DANGER}
-          title={`Import failed: ${errorMessage}`}
+          title={translate('ImportFailedInterp', [errorMessage])}
        />
      );
    }
@@ -47,7 +48,7 @@ function QueueDetails(props) {
      <Icon
        name={icons.DOWNLOADING}
        kind={kinds.DANGER}
-        title={`Download failed: ${errorMessage}`}
+        title={translate('DownloadFailedInterp', [errorMessage])}
      />
    );
  }
@@ -57,7 +58,7 @@ function QueueDetails(props) {
      <Icon
        name={icons.DOWNLOADING}
        kind={kinds.DANGER}
-        title="Download failed: check download client for more details"
+        title={translate('DownloadFailedCheckDownloadClientForMoreDetails')}
      />
    );
  }
@@ -67,7 +68,7 @@ function QueueDetails(props) {
      <Icon
        name={icons.DOWNLOADING}
        kind={kinds.WARNING}
-        title="Download warning: check download client for more details"
+        title={translate('DownloadWarningCheckDownloadClientForMoreDetails')}
      />
    );
  }
@@ -76,7 +77,7 @@ function QueueDetails(props) {
    return (
      <Icon
        name={icons.DOWNLOADING}
-        title={`Book is downloading - ${progress.toFixed(1)}% ${title}`}
+        title={translate('BookIsDownloadingInterp', [progress.toFixed(1), title])}
      />
    );
  }
@@ -4,6 +4,7 @@ import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import { inputTypes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';

 class QueueOptions extends Component {

@@ -41,7 +42,7 @@ class QueueOptions extends Component {
        [name]: value
      });
    });
-  }
+  };

  //
  // Render
@@ -54,13 +55,15 @@ class QueueOptions extends Component {
    return (
      <Fragment>
        <FormGroup>
-          <FormLabel>Show Unknown Author Items</FormLabel>
+          <FormLabel>
+            {translate('ShowUnknownAuthorItems')}
+          </FormLabel>

          <FormInputGroup
            type={inputTypes.CHECK}
            name="includeUnknownAuthorItems"
            value={includeUnknownAuthorItems}
-            helpText="Show items without a author in the queue, this could include removed authors, movies or anything else in Readarr's category"
+            helpText={translate('IncludeUnknownAuthorItemsHelpText')}
            onChange={this.onOptionChange}
          />
        </FormGroup>
@@ -16,6 +16,12 @@
  width: 150px;
 }

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

@@ -0,0 +1,11 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'actions': string;
+  'customFormatScore': string;
+  'progress': string;
+  'protocol': string;
+  'quality': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
 import AuthorNameLink from 'Author/AuthorNameLink';
+import BookFormats from 'Book/BookFormats';
 import BookQuality from 'Book/BookQuality';
 import BookTitleLink from 'Book/BookTitleLink';
 import Icon from 'Components/Icon';
@@ -13,8 +14,12 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import Popover from 'Components/Tooltip/Popover';
+import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
+import formatBytes from 'Utilities/Number/formatBytes';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
+import translate from 'Utilities/String/translate';
 import QueueStatusCell from './QueueStatusCell';
 import RemoveQueueItemModal from './RemoveQueueItemModal';
 import TimeleftCell from './TimeleftCell';
@@ -39,24 +44,37 @@ class QueueRow extends Component {

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

-  onRemoveQueueItemModalConfirmed = (blacklist, skipredownload) => {
-    this.props.onRemoveQueueItemPress(blacklist, skipredownload);
    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 });
-  }
+  };

  //
  // Render
@@ -74,6 +92,8 @@ class QueueRow extends Component {
      author,
      book,
      quality,
+      customFormats,
+      customFormatScore,
      protocol,
      indexer,
      outputPath,
@@ -137,7 +157,7 @@ class QueueRow extends Component {
              );
            }

-            if (name === 'authors.sortName') {
+            if (name === 'authorMetadata.sortName') {
              return (
                <TableRowCell key={name}>
                  {
@@ -195,6 +215,34 @@ class QueueRow extends Component {
              );
            }

+            if (name === 'customFormats') {
+              return (
+                <TableRowCell key={name}>
+                  <BookFormats
+                    formats={customFormats}
+                  />
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  <Tooltip
+                    anchor={formatCustomFormatScore(
+                      customFormatScore,
+                      customFormats.length
+                    )}
+                    tooltip={<BookFormats formats={customFormats} />}
+                    position={tooltipPositions.BOTTOM}
+                  />
+                </TableRowCell>
+              );
+            }
+
            if (name === 'protocol') {
              return (
                <TableRowCell key={name}>
@@ -229,6 +277,12 @@ class QueueRow extends Component {
              );
            }

+            if (name === 'size') {
+              return (
+                <TableRowCell key={name}>{formatBytes(size)}</TableRowCell>
+              );
+            }
+
            if (name === 'outputPath') {
              return (
                <TableRowCell key={name}>
@@ -285,7 +339,7 @@ class QueueRow extends Component {
                            kind={kinds.DANGER}
                          />
                        }
-                        title="Manual Download"
+                        title={translate('ManualDownload')}
                        body="This release failed parsing checks and was manually downloaded from an interactive search.  Import is likely to fail."
                        position={tooltipPositions.LEFT}
                      />
@@ -310,7 +364,7 @@ class QueueRow extends Component {
                  }

                  <SpinnerIconButton
-                    title="Remove from queue"
+                    title={translate('RemoveFromQueue')}
                    name={icons.REMOVE}
                    isSpinning={isRemoving}
                    onPress={this.onRemoveQueueItemPress}
@@ -335,7 +389,8 @@ class QueueRow extends Component {
        <RemoveQueueItemModal
          isOpen={isRemoveQueueItemModalOpen}
          sourceTitle={title}
-          canIgnore={!!(author && book)}
+          canIgnore={!!author}
+          isPending={isPending}
          onRemovePress={this.onRemoveQueueItemModalConfirmed}
          onModalClose={this.onRemoveQueueItemModalClose}
        />
@@ -357,6 +412,8 @@ QueueRow.propTypes = {
  author: PropTypes.object,
  book: PropTypes.object,
  quality: PropTypes.object.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
  protocol: PropTypes.string.isRequired,
  indexer: PropTypes.string,
  outputPath: PropTypes.string,
@@ -376,10 +433,12 @@ 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 = {
+  customFormats: [],
  isGrabbing: false,
  isRemoving: false
 };
@@ -41,11 +41,11 @@ class QueueRowConnector extends Component {

  onGrabPress = () => {
    this.props.grabQueueItem({ id: this.props.id });
-  }
+  };

  onRemoveQueueItemPress = (payload) => {
    this.props.removeQueueItem({ id: this.props.id, ...payload });
-  }
+  };

  //
  // Render
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'status': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -4,6 +4,7 @@ import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import Popover from 'Components/Tooltip/Popover';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './QueueStatusCell.css';

 function getDetailedPopoverBody(statusMessages) {
@@ -49,11 +50,7 @@ function QueueStatusCell(props) {
  // status === 'downloading'
  let iconName = icons.DOWNLOADING;
  let iconKind = kinds.DEFAULT;
-  let title = 'Downloading';
-
-  if (hasWarning) {
-    iconKind = kinds.WARNING;
-  }
+  let title = translate('Title');

  if (status === 'paused') {
    iconName = icons.PAUSED;
@@ -71,17 +68,24 @@ function QueueStatusCell(props) {

    if (trackedDownloadState === 'importPending') {
      title += ' - Waiting to Import';
+      iconKind = kinds.PURPLE;
    }

    if (trackedDownloadState === 'importing') {
      title += ' - Importing';
+      iconKind = kinds.PURPLE;
    }

    if (trackedDownloadState === 'failedPending') {
      title += ' - Waiting to Process';
+      iconKind = kinds.DANGER;
    }
  }

+  if (hasWarning) {
+    iconKind = kinds.WARNING;
+  }
+
  if (status === 'delay') {
    iconName = icons.PENDING;
    title = 'Pending';
@@ -10,6 +10,7 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';

 class RemoveQueueItemModal extends Component {

@@ -21,8 +22,8 @@ class RemoveQueueItemModal extends Component {

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

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

  //
  // Listeners

  onRemoveChange = ({ value }) => {
    this.setState({ remove: value });
-  }
+  };

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

-  onSkipReDownloadChange = ({ value }) => {
-    this.setState({ skipredownload: value });
-  }
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };

  onRemoveConfirmed = () => {
    const state = this.state;

    this.resetState();
    this.props.onRemovePress(state);
-  }
+  };

  onModalClose = () => {
    this.resetState();
    this.props.onModalClose();
-  }
+  };

  //
  // Render
@@ -71,10 +72,11 @@ class RemoveQueueItemModal extends Component {
    const {
      isOpen,
      sourceTitle,
-      canIgnore
+      canIgnore,
+      isPending
    } = this.props;

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

    return (
      <Modal
@@ -94,41 +96,51 @@ class RemoveQueueItemModal extends Component {
              Are you sure you want to remove '{sourceTitle}' from the queue?
            </div>

+            {
+              isPending ?
+                null :
+                <FormGroup>
+                  <FormLabel>
+                    {translate('RemoveFromDownloadClient')}
+                  </FormLabel>
+
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="remove"
+                    value={remove}
+                    helpTextWarning={translate('RemoveHelpTextWarning')}
+                    isDisabled={!canIgnore}
+                    onChange={this.onRemoveChange}
+                  />
+                </FormGroup>
+            }
+
            <FormGroup>
-              <FormLabel>Remove From Download Client</FormLabel>
+              <FormLabel>
+                {translate('BlocklistRelease')}
+              </FormLabel>

              <FormInputGroup
                type={inputTypes.CHECK}
-                name="remove"
-                value={remove}
-                helpTextWarning="Removing will remove the download and the file(s) from the download client."
-                isDisabled={!canIgnore}
-                onChange={this.onRemoveChange}
-              />
-            </FormGroup>
-
-            <FormGroup>
-              <FormLabel>Blacklist Release</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="blacklist"
-                value={blacklist}
-                helpText="Prevents Readarr from automatically grabbing this release again"
-                onChange={this.onBlacklistChange}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistReleaseHelpText')}
+                onChange={this.onBlocklistChange}
              />
            </FormGroup>

            {
-              blacklist &&
+              blocklist &&
                <FormGroup>
-                  <FormLabel>Skip Redownload</FormLabel>
+                  <FormLabel>
+                    {translate('SkipRedownload')}
+                  </FormLabel>
                  <FormInputGroup
                    type={inputTypes.CHECK}
-                    name="skipredownload"
-                    value={skipredownload}
-                    helpText="Prevents Readarr from trying download an alternative release for this item"
-                    onChange={this.onSkipReDownloadChange}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
                  />
                </FormGroup>
            }
@@ -157,6 +169,7 @@ RemoveQueueItemModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  sourceTitle: PropTypes.string.isRequired,
  canIgnore: PropTypes.bool.isRequired,
+  isPending: PropTypes.bool.isRequired,
  onRemovePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'message': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -10,6 +10,7 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './RemoveQueueItemsModal.css';

 class RemoveQueueItemsModal extends Component {
@@ -22,48 +23,48 @@ class RemoveQueueItemsModal extends Component {

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

  //
  // Control

-   resetState = function() {
-     this.setState({
-       remove: true,
-       blacklist: false,
-       skipredownload: false
-     });
-   }
+  resetState = function() {
+    this.setState({
+      remove: true,
+      blocklist: false,
+      skipRedownload: false
+    });
+  };

-   //
-   // Listeners
+  //
+  // Listeners

-   onRemoveChange = ({ value }) => {
-     this.setState({ remove: value });
-   }
+  onRemoveChange = ({ value }) => {
+    this.setState({ remove: value });
+  };

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

-  onSkipReDownloadChange = ({ value }) => {
-    this.setState({ skipredownload: value });
-  }
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };

  onRemoveConfirmed = () => {
    const state = this.state;

    this.resetState();
    this.props.onRemovePress(state);
-  }
+  };

  onModalClose = () => {
    this.resetState();
    this.props.onModalClose();
-  }
+  };

  //
  // Render
@@ -72,10 +73,11 @@ class RemoveQueueItemsModal extends Component {
    const {
      isOpen,
      selectedCount,
-      canIgnore
+      canIgnore,
+      allPending
    } = this.props;

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

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

          <ModalBody>
            <div className={styles.message}>
-              Are you sure you want to remove {selectedCount} item{selectedCount > 1 ? 's' : ''} from the queue?
+              {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', selectedCount) : translate('RemoveSelectedItemQueueMessageText')}
            </div>

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

-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="remove"
-                value={remove}
-                helpTextWarning="Removing will remove the download and the file(s) from the download client."
-                isDisabled={!canIgnore}
-                onChange={this.onRemoveChange}
-              />
-            </FormGroup>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="remove"
+                    value={remove}
+                    helpTextWarning={translate('RemoveHelpTextWarning')}
+                    isDisabled={!canIgnore}
+                    onChange={this.onRemoveChange}
+                  />
+                </FormGroup>
+            }

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

              <FormInputGroup
                type={inputTypes.CHECK}
-                name="blacklist"
-                value={blacklist}
-                helpText="Prevents Readarr from automatically grabbing these files again"
-                onChange={this.onBlacklistChange}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistReleaseHelpText')}
+                onChange={this.onBlocklistChange}
              />
            </FormGroup>

            {
-              blacklist &&
+              blocklist &&
                <FormGroup>
-                  <FormLabel>Skip Redownload</FormLabel>
+                  <FormLabel>
+                    {translate('SkipRedownload')}
+                  </FormLabel>
                  <FormInputGroup
                    type={inputTypes.CHECK}
-                    name="skipredownload"
-                    value={skipredownload}
-                    helpText="Prevents Readarr from trying download alternative releases for the removed items"
-                    onChange={this.onSkipReDownloadChange}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
                  />
                </FormGroup>
            }
@@ -140,14 +150,14 @@ class RemoveQueueItemsModal extends Component {

          <ModalFooter>
            <Button onPress={this.onModalClose}>
-              Close
+              {translate('Close')}
            </Button>

            <Button
              kind={kinds.DANGER}
              onPress={this.onRemoveConfirmed}
            >
-              Remove
+              {translate('Remove')}
            </Button>
          </ModalFooter>
        </ModalContent>
@@ -160,6 +170,7 @@ RemoveQueueItemsModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  selectedCount: PropTypes.number.isRequired,
  canIgnore: PropTypes.bool.isRequired,
+  allPending: PropTypes.bool.isRequired,
  onRemovePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'timeleft': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -5,6 +5,7 @@ import formatTime from 'Utilities/Date/formatTime';
 import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
 import styles from './TimeleftCell.css';

 function TimeleftCell(props) {
@@ -19,35 +20,35 @@ function TimeleftCell(props) {
    timeFormat
  } = props;

-  if (status === 'Delay') {
+  if (status === 'delay') {
    const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates);
    const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });

    return (
      <TableRowCell
        className={styles.timeleft}
-        title={`Delaying download until ${date} at ${time}`}
+        title={translate('DelayingDownloadUntilInterp', [date, time])}
      >
        -
      </TableRowCell>
    );
  }

-  if (status === 'DownloadClientUnavailable') {
+  if (status === 'downloadClientUnavailable') {
    const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates);
    const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });

    return (
      <TableRowCell
        className={styles.timeleft}
-        title={`Retrying download ${date} at ${time}`}
+        title={translate('RetryingDownloadInterp', [date, time])}
      >
        -
      </TableRowCell>
    );
  }

-  if (!timeleft) {
+  if (!timeleft || status === 'completed' || status === 'failed') {
    return (
      <TableRowCell className={styles.timeleft}>
        -
@@ -0,0 +1,27 @@
+import React from 'react';
+import DescriptionList from 'Components/DescriptionList/DescriptionList';
+import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
+import translate from 'Utilities/String/translate';
+
+function AuthorMonitorNewItemsOptionsPopoverContent() {
+  return (
+    <DescriptionList>
+      <DescriptionListItem
+        title={translate('AllBooks')}
+        data={translate('DataNewAllBooks')}
+      />
+
+      <DescriptionListItem
+        title={translate('NewBooks')}
+        data={translate('DataNewBooks')}
+      />
+
+      <DescriptionListItem
+        title={translate('None')}
+        data={translate('DataNewNone')}
+      />
+    </DescriptionList>
+  );
+}
+
+export default AuthorMonitorNewItemsOptionsPopoverContent;
@@ -1,45 +1,52 @@
 import React from 'react';
+import Alert from 'Components/Alert';
 import DescriptionList from 'Components/DescriptionList/DescriptionList';
 import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
+import translate from 'Utilities/String/translate';

 function AuthorMonitoringOptionsPopoverContent() {
  return (
-    <DescriptionList>
-      <DescriptionListItem
-        title="All Books"
-        data="Monitor all books"
-      />
+    <>
+      <Alert>
+        {translate('MonitoringOptionsHelpText')}
+      </Alert>
+      <DescriptionList>
+        <DescriptionListItem
+          title={translate('AllBooks')}
+          data={translate('DataAllBooks')}
+        />

-      <DescriptionListItem
-        title="Future Books"
-        data="Monitor books that have not released yet"
-      />
+        <DescriptionListItem
+          title={translate('FutureBooks')}
+          data={translate('DataFutureBooks')}
+        />

-      <DescriptionListItem
-        title="Missing Books"
-        data="Monitor books that do not have files or have not released yet"
-      />
+        <DescriptionListItem
+          title={translate('MissingBooks')}
+          data={translate('DataMissingBooks')}
+        />

-      <DescriptionListItem
-        title="Existing Books"
-        data="Monitor books that have files or have not released yet"
-      />
+        <DescriptionListItem
+          title={translate('ExistingBooks')}
+          data={translate('DataExistingBooks')}
+        />

-      <DescriptionListItem
-        title="First Book"
-        data="Monitor the first book. All other books will be ignored"
-      />
+        <DescriptionListItem
+          title={translate('FirstBook')}
+          data={translate('DataFirstBook')}
+        />

-      <DescriptionListItem
-        title="Latest Book"
-        data="Monitor the latest book and future books"
-      />
+        <DescriptionListItem
+          title={translate('LatestBook')}
+          data={translate('DataLatestBook')}
+        />

-      <DescriptionListItem
-        title="None"
-        data="No books will be monitored"
-      />
-    </DescriptionList>
+        <DescriptionListItem
+          title={translate('None')}
+          data={translate('DataNone')}
+        />
+      </DescriptionList>
+    </>
  );
 }

@@ -4,16 +4,19 @@ import React from 'react';
 import DocumentTitle from 'react-document-title';
 import { Provider } from 'react-redux';
 import PageConnector from 'Components/Page/PageConnector';
+import ApplyTheme from './ApplyTheme';
 import AppRoutes from './AppRoutes';

-function App({ store, history }) {
+function App({ store, history, hasTranslationsError }) {
  return (
-    <DocumentTitle title="Readarr">
+    <DocumentTitle title={window.Readarr.instanceName}>
      <Provider store={store}>
        <ConnectedRouter history={history}>
-          <PageConnector>
-            <AppRoutes app={App} />
-          </PageConnector>
+          <ApplyTheme>
+            <PageConnector hasTranslationsError={hasTranslationsError}>
+              <AppRoutes app={App} />
+            </PageConnector>
+          </ApplyTheme>
        </ConnectedRouter>
      </Provider>
    </DocumentTitle>
@@ -22,7 +25,8 @@ function App({ store, history }) {

 App.propTypes = {
  store: PropTypes.object.isRequired,
-  history: PropTypes.object.isRequired
+  history: PropTypes.object.isRequired,
+  hasTranslationsError: PropTypes.bool.isRequired
 };

 export default App;
@@ -1,18 +1,20 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Redirect, Route } from 'react-router-dom';
-import BlacklistConnector from 'Activity/Blacklist/BlacklistConnector';
+import BlocklistConnector from 'Activity/Blocklist/BlocklistConnector';
 import HistoryConnector from 'Activity/History/HistoryConnector';
 import QueueConnector from 'Activity/Queue/QueueConnector';
 import AuthorDetailsPageConnector from 'Author/Details/AuthorDetailsPageConnector';
-import AuthorEditorConnector from 'Author/Editor/AuthorEditorConnector';
 import AuthorIndexConnector from 'Author/Index/AuthorIndexConnector';
 import BookDetailsPageConnector from 'Book/Details/BookDetailsPageConnector';
+import BookIndexConnector from 'Book/Index/BookIndexConnector';
 import BookshelfConnector from 'Bookshelf/BookshelfConnector';
 import CalendarPageConnector from 'Calendar/CalendarPageConnector';
 import NotFound from 'Components/NotFound';
 import Switch from 'Components/Router/Switch';
 import AddNewItemConnector from 'Search/AddNewItemConnector';
+import CustomFormatSettingsConnector from 'Settings/CustomFormats/CustomFormatSettingsConnector';
+import DevelopmentSettingsConnector from 'Settings/Development/DevelopmentSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
 import ImportListSettingsConnector from 'Settings/ImportLists/ImportListSettingsConnector';
@@ -21,7 +23,7 @@ import MediaManagementConnector from 'Settings/MediaManagement/MediaManagementCo
 import MetadataSettings from 'Settings/Metadata/MetadataSettings';
 import NotificationSettings from 'Settings/Notifications/NotificationSettings';
 import Profiles from 'Settings/Profiles/Profiles';
-import Quality from 'Settings/Quality/Quality';
+import QualityConnector from 'Settings/Quality/QualityConnector';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
 import UISettingsConnector from 'Settings/UI/UISettingsConnector';
@@ -70,19 +72,26 @@ function AppRoutes(props) {
          />
      }

+      <Route
+        path="/authors"
+        component={AuthorIndexConnector}
+      />
+
      <Route
        path="/add/search"
        component={AddNewItemConnector}
      />

      <Route
-        path="/authoreditor"
-        component={AuthorEditorConnector}
+        exact={true}
+        path="/shelf"
+        component={BookshelfConnector}
      />

      <Route
-        path="/bookshelf"
-        component={BookshelfConnector}
+        exact={true}
+        path="/books"
+        component={BookIndexConnector}
      />

      <Route
@@ -124,8 +133,8 @@ function AppRoutes(props) {
      />

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

      {/*
@@ -164,7 +173,12 @@ function AppRoutes(props) {

      <Route
        path="/settings/quality"
-        component={Quality}
+        component={QualityConnector}
+      />
+
+      <Route
+        path="/settings/customformats"
+        component={CustomFormatSettingsConnector}
      />

      <Route
@@ -207,6 +221,11 @@ function AppRoutes(props) {
        component={UISettingsConnector}
      />

+      <Route
+        path="/settings/development"
+        component={DevelopmentSettingsConnector}
+      />
+
      {/*
        System
      */}
@@ -0,0 +1,9 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'changes': string;
+  'maintenance': string;
+  'version': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -8,11 +8,50 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { kinds } from 'Helpers/Props';
 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,
@@ -20,7 +59,7 @@ function AppUpdatedModalContent(props) {
    onModalClose
  } = props;

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

  return (
    <ModalContent onModalClose={onModalClose}>
@@ -38,7 +77,9 @@ function AppUpdatedModalContent(props) {
            <div>
              {
                !update.changes &&
-                  <div className={styles.maintenance}>Maintenance release</div>
+                  <div className={styles.maintenance}>
+                    {translate('MaintenanceRelease')}
+                  </div>
              }

              {
@@ -49,12 +90,12 @@ function AppUpdatedModalContent(props) {
                    </div>

                    <UpdateChanges
-                      title="New"
+                      title={translate('New')}
                      changes={update.changes.new}
                    />

                    <UpdateChanges
-                      title="Fixed"
+                      title={translate('Fixed')}
                      changes={update.changes.fixed}
                    />
                  </div>
@@ -88,6 +129,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
@@ -0,0 +1,49 @@
+import PropTypes from 'prop-types';
+import React, { Fragment, useCallback, useEffect } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import themes from 'Styles/Themes';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.ui.item.theme || window.Readarr.theme,
+    (
+      theme
+    ) => {
+      return {
+        theme
+      };
+    }
+  );
+}
+
+function ApplyTheme({ theme, children }) {
+  // Update the CSS Variables
+  const updateCSSVariables = useCallback(() => {
+    const arrayOfVariableKeys = Object.keys(themes[theme]);
+    const arrayOfVariableValues = Object.values(themes[theme]);
+
+    // Loop through each array key and set the CSS Variables
+    arrayOfVariableKeys.forEach((cssVariableKey, index) => {
+      // Based on our snippet from MDN
+      document.documentElement.style.setProperty(
+        `--${cssVariableKey}`,
+        arrayOfVariableValues[index]
+      );
+    });
+  }, [theme]);
+
+  // On Component Mount and Component Update
+  useEffect(() => {
+    updateCSSVariables(theme);
+  }, [updateCSSVariables, theme]);
+
+  return <Fragment>{children}</Fragment>;
+}
+
+ApplyTheme.propTypes = {
+  theme: PropTypes.string.isRequired,
+  children: PropTypes.object.isRequired
+};
+
+export default connect(createMapStateToProps)(ApplyTheme);
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'automatic': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
@@ -0,0 +1,5 @@
+interface ModelBase {
+  id: number;
+}
+
+export default ModelBase;
@@ -0,0 +1,48 @@
+import SortDirection from 'Helpers/Props/SortDirection';
+
+export interface Error {
+  responseJSON: {
+    message: string;
+  };
+}
+
+export interface AppSectionDeleteState {
+  isDeleting: boolean;
+  deleteError: Error;
+}
+
+export interface AppSectionSaveState {
+  isSaving: boolean;
+  saveError: Error;
+}
+
+export interface PagedAppSectionState {
+  pageSize: number;
+}
+
+export interface AppSectionSchemaState<T> {
+  isSchemaFetching: boolean;
+  isSchemaPopulated: boolean;
+  schemaError: Error;
+  schema: {
+    items: T[];
+  };
+}
+
+export interface AppSectionItemState<T> {
+  isFetching: boolean;
+  isPopulated: boolean;
+  error: Error;
+  item: T;
+}
+
+interface AppSectionState<T> {
+  isFetching: boolean;
+  isPopulated: boolean;
+  error: Error;
+  items: T[];
+  sortKey: string;
+  sortDirection: SortDirection;
+}
+
+export default AppSectionState;
@@ -0,0 +1,41 @@
+import SettingsAppState from './SettingsAppState';
+import TagsAppState from './TagsAppState';
+
+interface FilterBuilderPropOption {
+  id: string;
+  name: string;
+}
+
+export interface FilterBuilderProp<T> {
+  name: string;
+  label: string;
+  type: string;
+  valueType?: string;
+  optionsSelector?: (items: T[]) => FilterBuilderPropOption[];
+}
+
+export interface PropertyFilter {
+  key: string;
+  value: boolean | string | number | string[] | number[];
+  type: string;
+}
+
+export interface Filter {
+  key: string;
+  label: string;
+  filers: PropertyFilter[];
+}
+
+export interface CustomFilter {
+  id: number;
+  type: string;
+  label: string;
+  filers: PropertyFilter[];
+}
+
+interface AppState {
+  settings: SettingsAppState;
+  tags: TagsAppState;
+}
+
+export default AppState;
@@ -0,0 +1,40 @@
+import AppSectionState, {
+  AppSectionDeleteState,
+  AppSectionSaveState,
+} from 'App/State/AppSectionState';
+import DownloadClient from 'typings/DownloadClient';
+import ImportList from 'typings/ImportList';
+import Indexer from 'typings/Indexer';
+import Notification from 'typings/Notification';
+import { UiSettings } from 'typings/UiSettings';
+
+export interface DownloadClientAppState
+  extends AppSectionState<DownloadClient>,
+    AppSectionDeleteState,
+    AppSectionSaveState {}
+
+export interface ImportListAppState
+  extends AppSectionState<ImportList>,
+    AppSectionDeleteState,
+    AppSectionSaveState {}
+
+export interface IndexerAppState
+  extends AppSectionState<Indexer>,
+    AppSectionDeleteState,
+    AppSectionSaveState {}
+
+export interface NotificationAppState
+  extends AppSectionState<Notification>,
+    AppSectionDeleteState {}
+
+export type UiSettingsAppState = AppSectionState<UiSettings>;
+
+interface SettingsAppState {
+  downloadClients: DownloadClientAppState;
+  importLists: ImportListAppState;
+  indexers: IndexerAppState;
+  notifications: NotificationAppState;
+  uiSettings: UiSettingsAppState;
+}
+
+export default SettingsAppState;
@@ -0,0 +1,12 @@
+import ModelBase from 'App/ModelBase';
+import AppSectionState, {
+  AppSectionDeleteState,
+} from 'App/State/AppSectionState';
+
+export interface Tag extends ModelBase {
+  label: string;
+}
+
+interface TagsAppState extends AppSectionState<Tag>, AppSectionDeleteState {}
+
+export default TagsAppState;
--- a/Show More
+++ b/Show More