Fixed: Instance Name validation

2026-03-06 13:49:59 -05:00 · 2022-05-16 21:29:00 +01:00
1583 changed files with 26988 additions and 117085 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -36,18 +36,9 @@ 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
-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
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion

 # Stylecop Rules
 dotnet_diagnostic.SA0001.severity = none
@@ -126,6 +117,7 @@ dotnet_diagnostic.CA1003.severity = suggestion
 dotnet_diagnostic.CA1008.severity = suggestion
 dotnet_diagnostic.CA1010.severity = suggestion
 dotnet_diagnostic.CA1012.severity = suggestion
+dotnet_diagnostic.CA1014.severity = suggestion
 dotnet_diagnostic.CA1016.severity = suggestion
 dotnet_diagnostic.CA1017.severity = suggestion
 dotnet_diagnostic.CA1018.severity = suggestion
@@ -171,7 +163,6 @@ dotnet_diagnostic.CA1309.severity = suggestion
 dotnet_diagnostic.CA1310.severity = suggestion
 dotnet_diagnostic.CA1401.severity = suggestion
 dotnet_diagnostic.CA1416.severity = suggestion
-dotnet_diagnostic.CA1419.severity = suggestion
 dotnet_diagnostic.CA1507.severity = suggestion
 dotnet_diagnostic.CA1508.severity = suggestion
 dotnet_diagnostic.CA1707.severity = suggestion
@@ -187,6 +178,9 @@ 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
@@ -198,14 +192,13 @@ dotnet_diagnostic.CA1819.severity = suggestion
 dotnet_diagnostic.CA1822.severity = suggestion
 dotnet_diagnostic.CA1823.severity = suggestion
 dotnet_diagnostic.CA1824.severity = suggestion
-dotnet_diagnostic.CA1835.severity = suggestion
-dotnet_diagnostic.CA1845.severity = suggestion
-dotnet_diagnostic.CA1848.severity = suggestion
-dotnet_diagnostic.CA1849.severity = suggestion
 dotnet_diagnostic.CA2000.severity = suggestion
 dotnet_diagnostic.CA2002.severity = suggestion
 dotnet_diagnostic.CA2007.severity = suggestion
 dotnet_diagnostic.CA2008.severity = suggestion
+dotnet_diagnostic.CA2009.severity = suggestion
+dotnet_diagnostic.CA2010.severity = suggestion
+dotnet_diagnostic.CA2011.severity = suggestion
 dotnet_diagnostic.CA2012.severity = suggestion
 dotnet_diagnostic.CA2013.severity = suggestion
 dotnet_diagnostic.CA2100.severity = suggestion
@@ -236,7 +229,6 @@ dotnet_diagnostic.CA2243.severity = suggestion
 dotnet_diagnostic.CA2244.severity = suggestion
 dotnet_diagnostic.CA2245.severity = suggestion
 dotnet_diagnostic.CA2246.severity = suggestion
-dotnet_diagnostic.CA2254.severity = suggestion
 dotnet_diagnostic.CA3061.severity = suggestion
 dotnet_diagnostic.CA3075.severity = suggestion
 dotnet_diagnostic.CA3076.severity = suggestion
@@ -263,11 +255,10 @@ dotnet_diagnostic.CA5385.severity = suggestion
 dotnet_diagnostic.CA5392.severity = suggestion
 dotnet_diagnostic.CA5394.severity = suggestion
 dotnet_diagnostic.CA5397.severity = suggestion
-dotnet_diagnostic.CA5401.severity = suggestion

 dotnet_diagnostic.SYSLIB0014.severity = none

-[*.{js,jsx,ts,tsx,html,hbs,less,css}]
+[*.{js,html,js,hbs,less,css}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
--- a/.esprintrc
+++ b/.esprintrc
@@ -0,0 +1,9 @@
+{
+  "paths": [
+    "frontend/src/**/*.js"
+  ],
+  "ignored": [
+    "**/node_modules/**/*"
+  ],
+  "port": 5004
+}
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,13 +1,13 @@
 name: Bug Report
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Discord first'
+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.
+    description: Please search to see if an issue already exists for the bug you encountered.
    options:
-    - label: I have searched the existing open and closed issues
+    - label: I have searched the existing issues
      required: true
 - type: textarea
  attributes:
@@ -71,10 +71,3 @@ body:
      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
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -6,3 +6,6 @@ contact_links:
  - name: Support via Discord
    url: https://prowlarr.com/discord
    about: Chat with users and devs on support and setup related topics.
+  - name: Support via Reddit
+    url: https://reddit.com/r/prowlarr
+    about: Discuss and search thru support topics.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -5,9 +5,9 @@ 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.
+    description: Please search to see if an issue already exists for the feature you are requesting.
    options:
-    - label: I have searched the existing open and closed issues
+    - label: I have searched the existing issues
      required: true
 - type: textarea
  attributes:
--- a/.github/label-actions.yml
+++ b/.github/label-actions.yml
@@ -4,21 +4,13 @@
  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://prowlarr.com/discord).
+    to be a support request. Please hop over onto our [Discord](https://prowlarr.com/discord) 
+    or [Subreddit](https://reddit.com/r/prowlarr)
  close: true
-  close-reason: 'not planned'

 'Type: Indexer Request':
  comment: >
    :wave: @{issue-author}, we use the issue tracker exclusively
    for bug reports and feature requests. However, this issue appears
    to be a indexer request. Please use our Indexer request [site](https://requests.prowlarr.com/)
-  close: true
-  close-reason: 'not planned'
-
-'Status: Logs Needed':
-  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/prowlarr/troubleshooting#logging-and-log-files).
+  close: true
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,19 +0,0 @@
-'Area: API':
-  - src/Prowlarr.Api.V1/**/*
-
-'Area: Db-migration':
-  - src/NzbDrone.Core/Datastore/Migration/*
-
-'Area: Download Clients':
-  - src/NzbDrone.Core/Download/Clients/**/*
-
-'Area: Indexer':
-  - src/NzbDrone.Core/Indexers/**/*
-
-'Area: Notifications':
-  - src/NzbDrone.Core/Notifications/**/*
-
-'Area: UI':
-  - frontend/**/*
-  - package.json
-  - yarn.lock
--- a/.github/workflows/azuresync.yml
+++ b/.github/workflows/azuresync.yml
@@ -0,0 +1,41 @@
+name: Sync issue to Azure DevOps work item
+
+on:
+  issues:
+    types:
+      [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned]
+
+concurrency: azuresync-${{ github.event.issue.number }}
+
+jobs:
+  alert:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: danhellem/github-actions-issue-to-work-item@master
+        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == true }}"
+        env:
+          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
+          github_token: "${{ github.token }}"
+          ado_organization: "Servarr"
+          ado_project: "Servarr"
+          ado_area_path: "Servarr\\Prowlarr"
+          ado_wit: "Bug"
+          ado_new_state: "New"
+          ado_active_state: "Active"
+          ado_close_state: "Closed"
+          ado_bypassrules: true
+          log_level: 100
+      - uses: danhellem/github-actions-issue-to-work-item@master
+        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == false }}"
+        env:
+          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
+          github_token: "${{ github.token }}"
+          ado_organization: "Servarr"
+          ado_project: "Servarr"
+          ado_area_path: "Servarr\\Prowlarr"
+          ado_wit: "User Story"
+          ado_new_state: "New"
+          ado_active_state: "Active"
+          ado_close_state: "Closed"
+          ado_bypassrules: true
+          log_level: 100
--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@@ -18,6 +18,6 @@ jobs:
  action:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/label-actions@v3
+      - uses: dessant/label-actions@v2
        with:
-          process-only: 'issues, prs'
+          process-only: 'issues, prs'
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,12 +0,0 @@
-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
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -9,13 +9,13 @@ jobs:
  lock:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v2
        with:
          github-token: ${{ github.token }}
-          issue-inactive-days: '90'
-          exclude-issue-created-before: ''
-          exclude-any-issue-labels: ''
-          add-issue-labels: ''
-          issue-comment: ''
+          issue-lock-inactive-days: '90'
+          issue-exclude-created-before: ''
+          issue-exclude-labels: ''
+          issue-lock-labels: ''
+          issue-lock-comment: ''
          issue-lock-reason: 'resolved'
          process-only: ''
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,132 +0,0 @@
-# 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@prowlarr.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
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![Build Status](https://dev.azure.com/Prowlarr/Prowlarr/_apis/build/status/Prowlarr.Prowlarr?branchName=develop)](https://dev.azure.com/Prowlarr/Prowlarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/servarr/-/prowlarr/svg-badge.svg)](https://translate.servarr.com/engage/prowlarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/prowlarr/installation/docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/prowlarr/installation#docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Prowlarr/Prowlarr/total.svg)
 [![Backers on Open Collective](https://opencollective.com/Prowlarr/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/Prowlarr/sponsors/badge.svg)](#sponsors)
@@ -27,8 +27,12 @@ Prowlarr is an indexer manager/proxy built on the popular \*arr .net/reactjs bas

 ## Support

+Note: Prowlarr is currently early in life, thus bugs should be expected
+
 [![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/prowlarr)
+
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://prowlarr.com/discord)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Prowlarr)

 Note: GitHub Issues are for Bugs and Feature Requests Only

--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,15 +9,15 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.11.2'
+  majorVersion: '0.4.0'
  minorVersion: $[counter('minorVersion', 1)]
  prowlarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.417'
-  nodeVersion: '16.X'
+  dotnetVersion: '6.0.201'
  innoVersion: '6.2.0'
+  nodeVersion: '16.x'
  windowsImage: 'windows-2022'
  linuxImage: 'ubuntu-20.04'
  macImage: 'macOS-11'
@@ -27,10 +27,6 @@ trigger:
    include:
    - develop
    - master
-  paths:
-    exclude:
-      - .github
-      - src/Prowlarr.Api.*/openapi.json

 pr:
  branches:
@@ -38,9 +34,8 @@ pr:
    - develop
  paths:
    exclude:
-    - .github
    - src/NzbDrone.Core/Localization/Core
-    - src/Prowlarr.Api.*/openapi.json
+    - src/Prowlarr.API.*/openapi.json

 stages:
  - stage: Setup
@@ -102,14 +97,15 @@ stages:
      - bash: |
          BUNDLEDVERSIONS=${AGENT_TOOLSDIRECTORY}/dotnet/sdk/${DOTNETVERSION}/Microsoft.NETCoreSdk.BundledVersions.props
          echo $BUNDLEDVERSIONS
+          grep osx-x64 $BUNDLEDVERSIONS
          if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-            echo "Extra platforms already enabled"
+            echo "BSD already enabled"
          else
-            echo "Enabling extra platform support"
-            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
+            echo "Enabling BSD support"
+            sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64/' $BUNDLEDVERSIONS
          fi
-        displayName: Enable Extra Platform Support
-      - bash: ./build.sh --backend --enable-extra-platforms
+        displayName: Enable FreeBSD Support
+      - bash: ./build.sh --backend --enable-bsd
        displayName: Build Prowlarr Backend
      - bash: |
          find ${OUTPUTFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
@@ -123,28 +119,24 @@ stages:
        displayName: Publish Backend
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
      - publish: '$(testsFolder)/net6.0/win-x64/publish'
-        artifact: win-x64-tests
-        displayName: Publish win-x64 Test Package
+        artifact: WindowsCoreTests
+        displayName: Publish Windows Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
      - publish: '$(testsFolder)/net6.0/linux-x64/publish'
-        artifact: linux-x64-tests
-        displayName: Publish linux-x64 Test Package
-        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net6.0/linux-x86/publish'
-        artifact: linux-x86-tests
-        displayName: Publish linux-x86 Test Package
+        artifact: LinuxCoreTests
+        displayName: Publish Linux Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
      - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish'
-        artifact: linux-musl-x64-tests
-        displayName: Publish linux-musl-x64 Test Package
+        artifact: LinuxMuslCoreTests
+        displayName: Publish Linux Musl Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
      - publish: '$(testsFolder)/net6.0/freebsd-x64/publish'
-        artifact: freebsd-x64-tests
-        displayName: Publish freebsd-x64 Test Package
+        artifact: FreebsdCoreTests
+        displayName: Publish FreeBSD Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
      - publish: '$(testsFolder)/net6.0/osx-x64/publish'
-        artifact: osx-x64-tests
-        displayName: Publish osx-x64 Test Package
+        artifact: MacCoreTests
+        displayName: Publish MacOS Test Package
        condition: and(succeeded(), eq(variables['osName'], 'Windows'))

  - stage: Build_Frontend
@@ -247,35 +239,35 @@ stages:
          artifactName: WindowsFrontend
          targetPath: _output
        displayName: Fetch Frontend
-      - bash: ./build.sh --packages --enable-extra-platforms
+      - bash: ./build.sh --packages --enable-bsd
        displayName: Create Packages
      - bash: |
          find . -name "Prowlarr" -exec chmod a+x {} \;
          find . -name "Prowlarr.Update" -exec chmod a+x {} \;
        displayName: Set executable bits
      - task: ArchiveFiles@2
-        displayName: Create win-x64 zip
+        displayName: Create Windows Core zip
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).windows-core-x64.zip'
          archiveType: 'zip'
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/win-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create win-x86 zip
+        displayName: Create Windows x86 Core zip
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).windows-core-x86.zip'
          archiveType: 'zip'
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/win-x86/net6.0
      - task: ArchiveFiles@2
-        displayName: Create osx-x64 app
+        displayName: Create MacOS x64 Core app
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-app-core-x64.zip'
          archiveType: 'zip'
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/osx-x64-app/net6.0
      - task: ArchiveFiles@2
-        displayName: Create osx-x64 tar
+        displayName: Create MacOS x64 Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-core-x64.tar.gz'
          archiveType: 'tar'
@@ -283,14 +275,14 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/osx-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create osx-arm64 app
+        displayName: Create MacOS arm64 Core app
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-app-core-arm64.zip'
          archiveType: 'zip'
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/osx-arm64-app/net6.0
      - task: ArchiveFiles@2
-        displayName: Create osx-arm64 tar
+        displayName: Create MacOS arm64 Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-core-arm64.tar.gz'
          archiveType: 'tar'
@@ -298,7 +290,7 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/osx-arm64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create linux-x64 tar
+        displayName: Create Linux Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-core-x64.tar.gz'
          archiveType: 'tar'
@@ -306,7 +298,7 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/linux-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create linux-musl-x64 tar
+        displayName: Create Linux Musl Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-musl-core-x64.tar.gz'
          archiveType: 'tar'
@@ -314,15 +306,7 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create linux-x86 tar
-        inputs:
-          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-core-x86.tar.gz'
-          archiveType: 'tar'
-          tarCompression: 'gz'
-          includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-x86/net6.0
-      - task: ArchiveFiles@2
-        displayName: Create linux-arm tar
+        displayName: Create ARM32 Linux Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-core-arm.tar.gz'
          archiveType: 'tar'
@@ -330,7 +314,7 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0
      - task: ArchiveFiles@2
-        displayName: Create linux-musl-arm tar
+        displayName: Create ARM32 Linux Musl Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-musl-core-arm.tar.gz'
          archiveType: 'tar'
@@ -338,7 +322,7 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm/net6.0
      - task: ArchiveFiles@2
-        displayName: Create linux-arm64 tar
+        displayName: Create ARM64 Linux Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-core-arm64.tar.gz'
          archiveType: 'tar'
@@ -346,7 +330,7 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create linux-musl-arm64 tar
+        displayName: Create ARM64 Linux Musl Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-musl-core-arm64.tar.gz'
          archiveType: 'tar'
@@ -354,7 +338,7 @@ stages:
          includeRootFolder: false
          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0
      - task: ArchiveFiles@2
-        displayName: Create freebsd-x64 tar
+        displayName: Create FreeBSD Core Core tar
        inputs:
          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).freebsd-core-x64.tar.gz'
          archiveType: 'tar'
@@ -367,7 +351,7 @@ stages:
      - bash: |
          echo "Uploading source maps to sentry"
          curl -sL https://sentry.io/get-cli/ | bash
-          RELEASENAME="Prowlarr@${PROWLARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
+          RELEASENAME="${PROWLARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
          sentry-cli releases new --finalize -p prowlarr -p prowlarr-ui -p prowlarr-update "${RELEASENAME}"
          sentry-cli releases -p prowlarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite
          sentry-cli releases set-commits --auto "${RELEASENAME}"
@@ -421,22 +405,22 @@ stages:
        matrix:
          MacCore:
            osName: 'Mac'
-            testName: 'osx-x64'
+            testName: 'MacCore'
            poolName: 'Azure Pipelines'
            imageName: ${{ variables.macImage }}
          WindowsCore:
            osName: 'Windows'
-            testName: 'win-x64'
+            testName: 'WindowsCore'
            poolName: 'Azure Pipelines'
            imageName: ${{ variables.windowsImage }}
          LinuxCore:
            osName: 'Linux'
-            testName: 'linux-x64'
+            testName: 'LinuxCore'
            poolName: 'Azure Pipelines'
            imageName: ${{ variables.linuxImage }}
          FreebsdCore:
            osName: 'Linux'
-            testName: 'freebsd-x64'
+            testName: 'FreebsdCore'
            poolName: 'FreeBSD'
            imageName:

@@ -455,7 +439,7 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: '$(testName)-tests'
+          artifactName: '$(testName)Tests'
          targetPath: $(testsFolder)
      - powershell: Set-Service SCardSvr -StartupType Manual
        displayName: Enable Windows Test Service
@@ -485,12 +469,8 @@ stages:
        matrix:
          alpine:
            testName: 'Musl Net Core'
-            artifactName: linux-musl-x64-tests
+            artifactName: LinuxMuslCoreTests
            containerImage: ghcr.io/servarr/testimages:alpine
-          linux-x86:
-            testName: 'linux-x86'
-            artifactName: linux-x86-tests
-            containerImage: ghcr.io/servarr/testimages:linux-x86

      pool:
        vmImage: ${{ variables.linuxImage }}
@@ -501,15 +481,9 @@ stages:
        
      steps:
      - task: UseDotNet@2
-        displayName: 'Install .NET'
+        displayName: 'Install .net core'
        inputs:
          version: $(dotnetVersion)
-        condition: and(succeeded(), ne(variables['testName'], 'linux-x86'))
-      - bash: |
-          SDKURL=$(curl -s https://api.github.com/repos/Servarr/dotnet-linux-x86/releases | jq -rc '.[].assets[].browser_download_url' | grep sdk-${DOTNETVERSION}.*gz$)
-          curl -fsSL $SDKURL | tar xzf - -C /opt/dotnet
-        displayName: 'Install .NET'
-        condition: and(succeeded(), eq(variables['testName'], 'linux-x86'))
      - checkout: none
      - task: DownloadPipelineArtifact@2
        displayName: Download Test Artifact
@@ -532,112 +506,6 @@ stages:
          testResultsFiles: '**/TestResult.xml'
          testRunTitle: '$(testName) Unit Tests'
          failTaskOnFailedTests: true
-          
-    - job: Unit_LinuxCore_Postgres14
-      displayName: Unit Native LinuxCore with Postgres14 Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-        artifactName: linux-x64-tests
-        Prowlarr__Postgres__Host: 'localhost'
-        Prowlarr__Postgres__Port: '5432'
-        Prowlarr__Postgres__User: 'prowlarr'
-        Prowlarr__Postgres__Password: 'prowlarr'
-
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      timeoutInMinutes: 10
-        
-      steps:
-      - task: UseDotNet@2
-        displayName: 'Install .net core'
-        inputs:
-          version: $(dotnetVersion)
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Test Artifact
-        inputs:
-          buildType: 'current'
-          artifactName: $(artifactName)
-          targetPath: $(testsFolder)
-      - bash: find ${TESTSFOLDER} -name "Prowlarr.Test.Dummy" -exec chmod a+x {} \;
-        displayName: Make Test Dummy Executable
-        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
-      - bash: |
-          docker run -d --name=postgres14 \
-          -e POSTGRES_PASSWORD=prowlarr \
-          -e POSTGRES_USER=prowlarr \
-          -p 5432:5432/tcp \
-          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-          postgres:14
-        displayName: Start postgres
-      - bash: |
-          chmod a+x ${TESTSFOLDER}/test.sh
-          ls -lR ${TESTSFOLDER}
-          ${TESTSFOLDER}/test.sh Linux Unit Test
-        displayName: Run Tests
-      - task: PublishTestResults@2
-        displayName: Publish Test Results
-        inputs:
-          testResultsFormat: 'NUnit'
-          testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'LinuxCore Postgres14 Unit Tests'
-          failTaskOnFailedTests: true
-
-    - job: Unit_LinuxCore_Postgres15
-      displayName: Unit Native LinuxCore with Postgres15 Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-        artifactName: linux-x64-tests
-        Prowlarr__Postgres__Host: 'localhost'
-        Prowlarr__Postgres__Port: '5432'
-        Prowlarr__Postgres__User: 'prowlarr'
-        Prowlarr__Postgres__Password: 'prowlarr'
-  
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      timeoutInMinutes: 10
-        
-      steps:
-      - task: UseDotNet@2
-        displayName: 'Install .net core'
-        inputs:
-          version: $(dotnetVersion)
-      - checkout: none
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Test Artifact
-        inputs:
-          buildType: 'current'
-          artifactName: $(artifactName)
-          targetPath: $(testsFolder)
-      - bash: find ${TESTSFOLDER} -name "Prowlarr.Test.Dummy" -exec chmod a+x {} \;
-        displayName: Make Test Dummy Executable
-        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
-      - bash: |
-          docker run -d --name=postgres15 \
-          -e POSTGRES_PASSWORD=prowlarr \
-          -e POSTGRES_USER=prowlarr \
-          -p 5432:5432/tcp \
-          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-          postgres:15
-        displayName: Start postgres
-      - bash: |
-          chmod a+x ${TESTSFOLDER}/test.sh
-          ls -lR ${TESTSFOLDER}
-          ${TESTSFOLDER}/test.sh Linux Unit Test
-        displayName: Run Tests
-      - task: PublishTestResults@2
-        displayName: Publish Test Results
-        inputs:
-          testResultsFormat: 'NUnit'
-          testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'LinuxCore Postgres15 Unit Tests'
-          failTaskOnFailedTests: true

  - stage: Integration
    displayName: Integration
@@ -665,17 +533,17 @@ stages:
        matrix:
          MacCore:
            osName: 'Mac'
-            testName: 'osx-x64'
+            testName: 'MacCore'
            imageName: ${{ variables.macImage }}
            pattern: 'Prowlarr.*.osx-core-x64.tar.gz'
          WindowsCore:
            osName: 'Windows'
-            testName: 'win-x64'
+            testName: 'WindowsCore'
            imageName: ${{ variables.windowsImage }}
            pattern: 'Prowlarr.*.windows-core-x64.zip'
          LinuxCore:
            osName: 'Linux'
-            testName: 'linux-x64'
+            testName: 'LinuxCore'
            imageName: ${{ variables.linuxImage }}
            pattern: 'Prowlarr.*.linux-core-x64.tar.gz'

@@ -692,7 +560,7 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: '$(testName)-tests'
+          artifactName: '$(testName)Tests'
          targetPath: $(testsFolder)
      - task: DownloadPipelineArtifact@2
        displayName: Download Build Artifact
@@ -722,131 +590,6 @@ stages:
          failTaskOnFailedTests: true
        displayName: Publish Test Results

-    - job: Integration_LinuxCore_Postgres14
-      displayName: Integration Native LinuxCore with Postgres14 Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-        Prowlarr__Postgres__Host: 'localhost'
-        Prowlarr__Postgres__Port: '5432'
-        Prowlarr__Postgres__User: 'prowlarr'
-        Prowlarr__Postgres__Password: 'prowlarr'
-
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      steps:
-        - task: UseDotNet@2
-          displayName: 'Install .net core'
-          inputs:
-            version: $(dotnetVersion)
-        - checkout: none
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Test Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: 'linux-x64-tests'
-            targetPath: $(testsFolder)
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Build Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: Packages
-            itemPattern: '**/$(pattern)'
-            targetPath: $(Build.ArtifactStagingDirectory)
-        - task: ExtractFiles@1
-          inputs:
-            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
-            destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
-          displayName: Extract Package
-        - bash: |
-            mkdir -p ./bin/
-            cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Prowlarr/. ./bin/
-          displayName: Move Package Contents
-        - bash: |
-            docker run -d --name=postgres14 \
-            -e POSTGRES_PASSWORD=prowlarr \
-            -e POSTGRES_USER=prowlarr \
-            -p 5432:5432/tcp \
-            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-            postgres:14
-          displayName: Start postgres
-        - bash: |
-            chmod a+x ${TESTSFOLDER}/test.sh
-            ${TESTSFOLDER}/test.sh Linux Integration Test
-          displayName: Run Integration Tests
-        - task: PublishTestResults@2
-          inputs:
-            testResultsFormat: 'NUnit'
-            testResultsFiles: '**/TestResult.xml'
-            testRunTitle: 'Integration LinuxCore Postgres14 Database Integration Tests'
-            failTaskOnFailedTests: true
-          displayName: Publish Test Results
-
-
-    - job: Integration_LinuxCore_Postgres15
-      displayName: Integration Native LinuxCore with Postgres Database
-      dependsOn: Prepare
-      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
-      variables:
-        pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-        Prowlarr__Postgres__Host: 'localhost'
-        Prowlarr__Postgres__Port: '5432'
-        Prowlarr__Postgres__User: 'prowlarr'
-        Prowlarr__Postgres__Password: 'prowlarr'
-
-      pool:
-        vmImage: ${{ variables.linuxImage }}
-
-      steps:
-        - task: UseDotNet@2
-          displayName: 'Install .net core'
-          inputs:
-            version: $(dotnetVersion)
-        - checkout: none
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Test Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: 'linux-x64-tests'
-            targetPath: $(testsFolder)
-        - task: DownloadPipelineArtifact@2
-          displayName: Download Build Artifact
-          inputs:
-            buildType: 'current'
-            artifactName: Packages
-            itemPattern: '**/$(pattern)'
-            targetPath: $(Build.ArtifactStagingDirectory)
-        - task: ExtractFiles@1
-          inputs:
-            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
-            destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
-          displayName: Extract Package
-        - bash: |
-            mkdir -p ./bin/
-            cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Prowlarr/. ./bin/
-          displayName: Move Package Contents
-        - bash: |
-            docker run -d --name=postgres15 \
-            -e POSTGRES_PASSWORD=prowlarr \
-            -e POSTGRES_USER=prowlarr \
-            -p 5432:5432/tcp \
-            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
-            postgres:15
-          displayName: Start postgres
-        - bash: |
-            chmod a+x ${TESTSFOLDER}/test.sh
-            ${TESTSFOLDER}/test.sh Linux Integration Test
-          displayName: Run Integration Tests
-        - task: PublishTestResults@2
-          inputs:
-            testResultsFormat: 'NUnit'
-            testResultsFiles: '**/TestResult.xml'
-            testRunTitle: 'Integration LinuxCore Postgres15 Database Integration Tests'
-            failTaskOnFailedTests: true
-          displayName: Publish Test Results
-
    - job: Integration_FreeBSD
      displayName: Integration Native FreeBSD
      dependsOn: Prepare
@@ -864,14 +607,14 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: 'freebsd-x64-tests'
+          artifactName: 'FreebsdCoreTests'
          targetPath: $(testsFolder)
      - task: DownloadPipelineArtifact@2
        displayName: Download Build Artifact
        inputs:
          buildType: 'current'
          artifactName: Packages
-          itemPattern: '**/$(pattern)'
+          itemPattern: '/$(pattern)'
          targetPath: $(Build.ArtifactStagingDirectory)
      - bash: |
          mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
@@ -900,15 +643,11 @@ stages:
      strategy:
        matrix:
          alpine:
-            testName: 'linux-musl-x64'
-            artifactName: linux-musl-x64-tests
+            testName: 'Musl Net Core'
+            artifactName: LinuxMuslCoreTests
            containerImage: ghcr.io/servarr/testimages:alpine
            pattern: 'Prowlarr.*.linux-musl-core-x64.tar.gz'
-          linux-x86:
-            testName: 'linux-x86'
-            artifactName: linux-x86-tests
-            containerImage: ghcr.io/servarr/testimages:linux-x86
-            pattern: 'Prowlarr.*.linux-core-x86.tar.gz'
+
      pool:
        vmImage: ${{ variables.linuxImage }}

@@ -918,15 +657,9 @@ stages:
        
      steps:
      - task: UseDotNet@2
-        displayName: 'Install .NET'
+        displayName: 'Install .net core'
        inputs:
          version: $(dotnetVersion)
-        condition: and(succeeded(), ne(variables['testName'], 'linux-x86'))
-      - bash: |
-          SDKURL=$(curl -s https://api.github.com/repos/Servarr/dotnet-linux-x86/releases | jq -rc '.[].assets[].browser_download_url' | grep sdk-${DOTNETVERSION}.*gz$)
-          curl -fsSL $SDKURL | tar xzf - -C /opt/dotnet
-        displayName: 'Install .NET'
-        condition: and(succeeded(), eq(variables['testName'], 'linux-x86'))
      - checkout: none
      - task: DownloadPipelineArtifact@2
        displayName: Download Test Artifact
@@ -972,19 +705,16 @@ stages:
        matrix:
          Linux:
            osName: 'Linux'
-            artifactName: 'linux-x64'
            imageName: ${{ variables.linuxImage }}
            pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
            failBuild: true
          Mac:
            osName: 'Mac'
-            artifactName: 'osx-x64'
            imageName: ${{ variables.macImage }}
            pattern: 'Prowlarr.*.osx-core-x64.tar.gz'
            failBuild: true
          Windows:
            osName: 'Windows'
-            artifactName: 'win-x64'
            imageName: ${{ variables.windowsImage }}
            pattern: 'Prowlarr.*.windows-core-x64.zip'
            failBuild: true
@@ -1002,7 +732,7 @@ stages:
        displayName: Download Test Artifact
        inputs:
          buildType: 'current'
-          artifactName: '$(artifactName)-tests'
+          artifactName: '$(osName)CoreTests'
          targetPath: $(testsFolder)
      - task: DownloadPipelineArtifact@2
        displayName: Download Build Artifact
@@ -1231,5 +961,4 @@ stages:
            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
            DISCORDCHANNELID: $(discordChannelId)
            DISCORDWEBHOOKKEY: $(discordWebhookKey)
-            DISCORDTHREADID: $(discordThreadId)

--- a/build.sh
+++ b/build.sh
@@ -25,22 +25,15 @@ UpdateVersionNumber()
    fi
 }

-EnableExtraPlatformsInSDK()
+EnableBsdSupport()
 {
-    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
-}
+    #todo enable sdk with
+    #SDK_PATH=$(dotnet --list-sdks | grep -P '5\.\d\.\d+' | head -1 | sed 's/\(5\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
+    # BUNDLED_VERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"

-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
+        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64</RuntimeIdentifiers>^g" src/Directory.Build.props
+        sed -i'' -e "s^<ExcludedRuntimeFrameworkPairs>\(.*\)</ExcludedRuntimeFrameworkPairs>^<ExcludedRuntimeFrameworkPairs>\1;freebsd-x64:net472</ExcludedRuntimeFrameworkPairs>^g" src/Directory.Build.props
    fi
 }

@@ -300,8 +293,7 @@ if [ $# -eq 0 ]; then
    PACKAGES=YES
    INSTALLER=NO
    LINT=YES
-    ENABLE_EXTRA_PLATFORMS=NO
-    ENABLE_EXTRA_PLATFORMS_IN_SDK=NO
+    ENABLE_BSD=NO
 fi

 while [[ $# -gt 0 ]]
@@ -313,12 +305,8 @@ 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
+    --enable-bsd)
+        ENABLE_BSD=YES
        shift # past argument
        ;;
    -r|--runtime)
@@ -362,17 +350,12 @@ 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" ];
+    if [ "$ENABLE_BSD" = "YES" ];
    then
-        EnableExtraPlatforms
+        EnableBsdSupport
    fi
    Build
    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
@@ -382,31 +365,31 @@ then
        PackageTests "net6.0" "linux-x64"
        PackageTests "net6.0" "linux-musl-x64"
        PackageTests "net6.0" "osx-x64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        if [ "$ENABLE_BSD" = "YES" ];
        then
            PackageTests "net6.0" "freebsd-x64"
-            PackageTests "net6.0" "linux-x86"
        fi
    else
        PackageTests "$FRAMEWORK" "$RID"
    fi
 fi

-if [[ "$LINT" = "YES" || "$FRONTEND" = "YES" ]];
+if [ "$FRONTEND" = "YES" ];
 then
    YarnInstall
+    RunWebpack
 fi

 if [ "$LINT" = "YES" ];
 then
+    if [ -z "$FRONTEND" ];
+    then
+        YarnInstall
+    fi
+    
    LintUI
 fi

-if [ "$FRONTEND" = "YES" ];
-then
-    RunWebpack
-fi
-
 if [ "$PACKAGES" = "YES" ];
 then
    UpdateVersionNumber
@@ -423,10 +406,9 @@ then
        Package "net6.0" "linux-musl-arm"
        Package "net6.0" "osx-x64"
        Package "net6.0" "osx-arm64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        if [ "$ENABLE_BSD" = "YES" ];
        then
            Package "net6.0" "freebsd-x64"
-            Package "net6.0" "linux-x86"
        fi
    else
        Package "$FRAMEWORK" "$RID"
--- a/docs.sh
+++ b/docs.sh
@@ -3,9 +3,9 @@ PLATFORM=$1
 if [ "$PLATFORM" = "Windows" ]; then
  RUNTIME="win-x64"
 elif [ "$PLATFORM" = "Linux" ]; then
-  RUNTIME="linux-x64"
+  WHERE="linux-x64"
 elif [ "$PLATFORM" = "Mac" ]; then
-  RUNTIME="osx-x64"
+  WHERE="osx-x64"
 else
  echo "Platform must be provided as first arguement: Windows, Linux or Mac"
  exit 1
@@ -27,7 +27,7 @@ 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 install --version 6.3.0 Swashbuckle.AspNetCore.Cli

 dotnet tool run swagger tofile --output ./src/Prowlarr.Api.V1/openapi.json "$outputFolder/net6.0/$RUNTIME/prowlarr.console.dll" v1 &

@@ -35,4 +35,4 @@ sleep 30

 kill %1

-exit 0
+exit 0
--- a/frontend/.csscomb.json
+++ b/frontend/.csscomb.json
@@ -0,0 +1,25 @@
+{
+  "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
+}
--- a/frontend/.esformatter
+++ b/frontend/.esformatter
@@ -0,0 +1,335 @@
+{
+  "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
+    }
+  }
+}
--- a/frontend/.eslintignore
+++ b/frontend/.eslintignore
@@ -1,2 +1 @@
 **/JsLibraries/**
-**/*.css.d.ts
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -1,19 +1,14 @@
-// eslint-disable @typescript-eslint/no-var-requires
 const fs = require('fs');
-const path = require('path');
-const typescriptEslintRecommended = require('@typescript-eslint/eslint-plugin').configs.recommended;
-
-const frontendFolder = __dirname;

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

-module.exports = {
-  root: true,
+const frontendFolder = __dirname;

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

  env: {
@@ -26,8 +21,7 @@ module.exports = {
  globals: {
    expect: false,
    chai: false,
-    sinon: false,
-    JSX: true
+    sinon: false
  },

  parserOptions: {
@@ -45,11 +39,8 @@ module.exports = {
  plugins: [
    'filenames',
    'react',
-    'react-hooks',
    'simple-import-sort',
-    'import',
-    '@typescript-eslint',
-    'prettier'
+    'import'
  ],

  settings: {
@@ -232,7 +223,7 @@ module.exports = {
    'consistent-this': ['error', 'self'],
    'eol-last': 'error',
    'func-names': 'off',
-    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
+    'func-style': ['error', 'declaration'],
    indent: ['error', 2, { SwitchCase: 1 }],
    'key-spacing': ['error', { beforeColon: false, afterColon: true }],
    'keyword-spacing': ['error', { before: true, after: true }],
@@ -317,15 +308,11 @@ module.exports = {
    'react/react-in-jsx-scope': 2,
    'react/self-closing-comp': 2,
    'react/sort-comp': 2,
-    'react/jsx-wrap-multilines': 2,
-    'react-hooks/rules-of-hooks': 'error',
-    'react-hooks/exhaustive-deps': 'error'
+    'react/jsx-wrap-multilines': 2
  },
  overrides: [
    {
-      files: [
-        '*.js'
-      ],
+      files: ['*.js'],
      rules: {
        'simple-import-sort/imports': [
          'error',
@@ -340,52 +327,6 @@ 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'
-      }
    }
  ]
 };
--- a/frontend/.jsbeautifyrc
+++ b/frontend/.jsbeautifyrc
@@ -0,0 +1,12 @@
+{
+  "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
+  }
+}
--- a/frontend/.prettierignore
+++ b/frontend/.prettierignore
@@ -1,10 +0,0 @@
-# Ignore everything recursively
-*
-
-# But not the .ts files
-!*.ts*
-
-*css.d.ts
-
-# Check subdirectories too
-!*/
--- a/frontend/.prettierrc.json
+++ b/frontend/.prettierrc.json
@@ -1,6 +0,0 @@
-{
-  "arrowParens": "always",
-  "endOfLine": "auto",
-  "singleQuote": true,
-  "trailingComma": "es5"
-}
--- a/frontend/.stylelintrc
+++ b/frontend/.stylelintrc
@@ -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,6 +15,9 @@
        ]
      }
    ],
+    "at-rule-name-case": "lower",
+    "at-rule-name-newline-after": "always-multi-line",
+    "at-rule-name-space-after": "always",
    "at-rule-no-unknown": [
      true,
      {
@@ -25,36 +28,83 @@
      }
    ],
    "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",
@@ -82,7 +132,6 @@
          "right",
          "bottom",
          "left",
-          "inset",
          "z-index",
          "display",
          "visibility",
@@ -294,33 +343,54 @@
        ]
      }
    ],
+    "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
  }
-}
+}
--- a/frontend/.vscode/extensions.json
+++ b/frontend/.vscode/extensions.json
@@ -1,7 +0,0 @@
-{
-    "recommendations": [
-        "stylelint.vscode-stylelint",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
-    ]
-}
--- a/frontend/.vscode/settings.json
+++ b/frontend/.vscode/settings.json
@@ -1,23 +0,0 @@
-// 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"
-  ],
-}
--- a/frontend/babel.config.js
+++ b/frontend/babel.config.js
@@ -4,21 +4,20 @@ module.exports = {
  plugins: [
    // Stage 1
    '@babel/plugin-proposal-export-default-from',
-    ['@babel/plugin-transform-optional-chaining', { loose }],
-    ['@babel/plugin-transform-nullish-coalescing-operator', { loose }],
+    ['@babel/plugin-proposal-optional-chaining', { loose }],
+    ['@babel/plugin-proposal-nullish-coalescing-operator', { loose }],

    // Stage 2
-    '@babel/plugin-transform-export-namespace-from',
+    '@babel/plugin-proposal-export-namespace-from',

    // Stage 3
-    ['@babel/plugin-transform-class-properties', { loose }],
+    ['@babel/plugin-proposal-class-properties', { loose }],
    '@babel/plugin-syntax-dynamic-import'
  ],
  env: {
    development: {
      presets: [
-        ['@babel/preset-react', { development: true }],
-        '@babel/preset-typescript'
+        ['@babel/preset-react', { development: true }]
      ],
      plugins: [
        'babel-plugin-inline-classnames'
@@ -26,8 +25,7 @@ module.exports = {
    },
    production: {
      presets: [
-        '@babel/preset-react',
-        '@babel/preset-typescript'
+        '@babel/preset-react'
      ],
      plugins: [
        'babel-plugin-transform-react-remove-prop-types'
--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 const webpack = require('webpack');
 const FileManagerPlugin = require('filemanager-webpack-plugin');
@@ -6,7 +5,6 @@ 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';
@@ -35,22 +33,17 @@ module.exports = (env) => {
    },

    entry: {
-      index: 'index.ts'
+      index: 'index.js'
    },

    resolve: {
-      extensions: [
-        '.ts',
-        '.tsx',
-        '.js'
-      ],
      modules: [
        srcFolder,
        path.join(srcFolder, 'Shims'),
        'node_modules'
      ],
      alias: {
-        jquery: 'jquery/dist/jquery.min'
+        jquery: 'jquery/src/jquery'
      },
      fallback: {
        buffer: false,
@@ -65,23 +58,23 @@ module.exports = (env) => {
    output: {
      path: distFolder,
      publicPath: '/',
-      filename: '[name]-[contenthash].js',
+      filename: '[name].js',
      sourceMapFilename: '[file].map'
    },

    optimization: {
      moduleIds: 'deterministic',
-      chunkIds: isProduction ? 'deterministic' : 'named'
+      chunkIds: 'named',
+      splitChunks: {
+        chunks: 'initial',
+        name: 'vendors'
+      }
    },

    performance: {
      hints: false
    },

-    experiments: {
-      topLevelAwait: true
-    },
-
    plugins: [
      new webpack.DefinePlugin({
        __DEV__: !isProduction,
@@ -89,15 +82,13 @@ module.exports = (env) => {
      }),

      new MiniCssExtractPlugin({
-        filename: 'Content/styles.css',
-        chunkFilename: 'Content/[id]-[chunkhash].css'
+        filename: 'Content/styles.css'
      }),

      new HtmlWebpackPlugin({
        template: 'frontend/src/index.ejs',
        filename: 'index.html',
-        publicPath: '/',
-        inject: false
+        publicPath: '/'
      }),

      new FileManagerPlugin({
@@ -138,8 +129,6 @@ module.exports = (env) => {
        }
      }),

-      new ForkTsCheckerWebpackPlugin(),
-
      new LiveReloadPlugin()
    ],

@@ -153,8 +142,8 @@ module.exports = (env) => {
    module: {
      rules: [
        {
-          test: [/\.jsx?$/, /\.tsx?$/],
-          exclude: /[\\/]node_modules[\\/](?!(@sentry|chart\.js|filesize)[\\/])/,
+          test: /\.js?$/,
+          exclude: /(node_modules|JsLibraries)/,
          use: [
            {
              loader: 'babel-loader',
@@ -184,7 +173,6 @@ module.exports = (env) => {
          exclude: /(node_modules|globals.css)/,
          use: [
            { loader: MiniCssExtractPlugin.loader },
-            { loader: 'css-modules-typescript-loader' },
            {
              loader: 'css-loader',
              options: {
@@ -253,19 +241,18 @@ module.exports = (env) => {
    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
-          }
-        })
-      ]
-    };
+    config.optimization.minimizer = [
+      new TerserPlugin({
+        cache: true,
+        parallel: true,
+        sourceMap: true, // Must be set to true if using source-maps in production
+        terserOptions: {
+          mangle: false,
+          keep_classnames: true,
+          keep_fnames: true
+        }
+      })
+    ];
  }

  return config;
--- a/frontend/build/webpack/css-variables-loader.js
+++ b/frontend/build/webpack/css-variables-loader.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line filenames/match-exported
 const loaderUtils = require('loader-utils');

 module.exports = function cssVariablesLoader(source) {
--- a/frontend/src/.vscode/settings.json
+++ b/frontend/src/.vscode/settings.json
@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+  "files.insertFinalNewline": true
+}
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -4,10 +4,10 @@ import { Redirect, Route } from 'react-router-dom';
 import NotFound from 'Components/NotFound';
 import Switch from 'Components/Router/Switch';
 import HistoryConnector from 'History/HistoryConnector';
-import IndexerIndex from 'Indexer/Index/IndexerIndex';
-import IndexerStats from 'Indexer/Stats/IndexerStats';
+import IndexerIndexConnector from 'Indexer/Index/IndexerIndexConnector';
+import StatsConnector from 'Indexer/Stats/StatsConnector';
 import SearchIndexConnector from 'Search/SearchIndexConnector';
-import ApplicationSettings from 'Settings/Applications/ApplicationSettings';
+import ApplicationSettingsConnector from 'Settings/Applications/ApplicationSettingsConnector';
 import DevelopmentSettingsConnector from 'Settings/Development/DevelopmentSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
@@ -38,7 +38,7 @@ function AppRoutes(props) {
      <Route
        exact={true}
        path="/"
-        component={IndexerIndex}
+        component={IndexerIndexConnector}
      />

      {
@@ -60,7 +60,7 @@ function AppRoutes(props) {

      <Route
        path="/indexers/stats"
-        component={IndexerStats}
+        component={StatsConnector}
      />

      {/*
@@ -98,7 +98,7 @@ function AppRoutes(props) {

      <Route
        path="/settings/applications"
-        component={ApplicationSettings}
+        component={ApplicationSettingsConnector}
      />

      <Route
--- a/frontend/src/App/AppUpdatedModalContent.css
+++ b/frontend/src/App/AppUpdatedModalContent.css
@@ -1,7 +1,6 @@
 .version {
  margin: 0 3px;
  font-weight: bold;
-  font-family: var(--defaultFontFamily);
 }

 .maintenance {
--- a/frontend/src/App/AppUpdatedModalContent.css.d.ts
+++ b/frontend/src/App/AppUpdatedModalContent.css.d.ts
@@ -1,9 +0,0 @@
-// 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;
--- a/frontend/src/App/AppUpdatedModalContent.js
+++ b/frontend/src/App/AppUpdatedModalContent.js
@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -65,12 +64,12 @@ function AppUpdatedModalContent(props) {
  return (
    <ModalContent onModalClose={onModalClose}>
      <ModalHeader>
-        {translate('AppUpdated')}
+        Prowlarr Updated
      </ModalHeader>

      <ModalBody>
        <div>
-          <InlineMarkdown data={translate('AppUpdatedVersion', { version })} blockClassName={styles.version} />
+          Version <span className={styles.version}>{version}</span> of Prowlarr has been installed, in order to get the latest changes you'll need to reload Prowlarr.
        </div>

        {
@@ -78,14 +77,16 @@ function AppUpdatedModalContent(props) {
            <div>
              {
                !update.changes &&
-                  <div className={styles.maintenance}>{translate('MaintenanceRelease')}</div>
+                  <div className={styles.maintenance}>
+                    {translate('MaintenanceRelease')}
+                  </div>
              }

              {
                !!update.changes &&
                  <div>
                    <div className={styles.changes}>
-                      {translate('WhatsNew')}
+                      What's new?
                    </div>

                    <UpdateChanges
@@ -112,14 +113,14 @@ function AppUpdatedModalContent(props) {
        <Button
          onPress={onSeeChangesPress}
        >
-          {translate('RecentChanges')}
+          Recent Changes
        </Button>

        <Button
          kind={kinds.PRIMARY}
          onPress={onModalClose}
        >
-          {translate('Reload')}
+          Reload
        </Button>
      </ModalFooter>
    </ModalContent>
--- a/frontend/src/App/ApplyTheme.js
+++ b/frontend/src/App/ApplyTheme.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, { Fragment, useCallback, useEffect } from 'react';
+import React, { Fragment, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import themes from 'Styles/Themes';
@@ -19,8 +19,7 @@ function createMapStateToProps() {

 function ApplyTheme({ theme, children }) {
  // Update the CSS Variables
-
-  const updateCSSVariables = useCallback(() => {
+  function updateCSSVariables() {
    const arrayOfVariableKeys = Object.keys(themes[theme]);
    const arrayOfVariableValues = Object.values(themes[theme]);

@@ -32,12 +31,12 @@ function ApplyTheme({ theme, children }) {
        arrayOfVariableValues[index]
      );
    });
-  }, [theme]);
+  }

  // On Component Mount and Component Update
  useEffect(() => {
    updateCSSVariables(theme);
-  }, [updateCSSVariables, theme]);
+  }, [theme]);

  return <Fragment>{children}</Fragment>;
 }
--- a/frontend/src/App/ConnectionLostModal.css.d.ts
+++ b/frontend/src/App/ConnectionLostModal.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'automatic': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/App/ConnectionLostModal.js
+++ b/frontend/src/App/ConnectionLostModal.js
@@ -28,11 +28,11 @@ function ConnectionLostModal(props) {

        <ModalBody>
          <div>
-            {translate('ConnectionLostToBackend')}
+            {translate('ConnectionLostMessage')}
          </div>

          <div className={styles.automatic}>
-            {translate('ConnectionLostReconnect')}
+            {translate('ConnectionLostAutomaticMessage')}
          </div>
        </ModalBody>
        <ModalFooter>
--- a/frontend/src/App/ModelBase.ts
+++ b/frontend/src/App/ModelBase.ts
@@ -1,5 +0,0 @@
-interface ModelBase {
-  id: number;
-}
-
-export default ModelBase;
--- a/frontend/src/App/SelectContext.tsx
+++ b/frontend/src/App/SelectContext.tsx
@@ -1,83 +0,0 @@
-import { cloneDeep } from 'lodash';
-import React, { useCallback, useEffect } from 'react';
-import useSelectState, { SelectState } from 'Helpers/Hooks/useSelectState';
-import ModelBase from './ModelBase';
-
-export type SelectContextAction =
-  | { type: 'reset' }
-  | { type: 'selectAll' }
-  | { type: 'unselectAll' }
-  | {
-      type: 'toggleSelected';
-      id: number;
-      isSelected: boolean;
-      shiftKey: boolean;
-    }
-  | {
-      type: 'removeItem';
-      id: number;
-    }
-  | {
-      type: 'updateItems';
-      items: ModelBase[];
-    };
-
-export type SelectDispatch = (action: SelectContextAction) => void;
-
-interface SelectProviderOptions<T extends ModelBase> {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  children: any;
-  items: Array<T>;
-}
-
-const SelectContext = React.createContext<
-  [SelectState, SelectDispatch] | undefined
->(cloneDeep(undefined));
-
-export function SelectProvider<T extends ModelBase>(
-  props: SelectProviderOptions<T>
-) {
-  const { items } = props;
-  const [state, dispatch] = useSelectState();
-
-  const dispatchWrapper = useCallback(
-    (action: SelectContextAction) => {
-      switch (action.type) {
-        case 'reset':
-        case 'removeItem':
-          dispatch(action);
-          break;
-
-        default:
-          dispatch({
-            ...action,
-            items,
-          });
-          break;
-      }
-    },
-    [items, dispatch]
-  );
-
-  const value: [SelectState, SelectDispatch] = [state, dispatchWrapper];
-
-  useEffect(() => {
-    dispatch({ type: 'updateItems', items });
-  }, [items, dispatch]);
-
-  return (
-    <SelectContext.Provider value={value}>
-      {props.children}
-    </SelectContext.Provider>
-  );
-}
-
-export function useSelect() {
-  const context = React.useContext(SelectContext);
-
-  if (context === undefined) {
-    throw new Error('useSelect must be used within a SelectProvider');
-  }
-
-  return context;
-}
--- a/frontend/src/App/State/AppSectionState.ts
+++ b/frontend/src/App/State/AppSectionState.ts
@@ -1,48 +0,0 @@
-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;
--- a/frontend/src/App/State/AppState.ts
+++ b/frontend/src/App/State/AppState.ts
@@ -1,58 +0,0 @@
-import CommandAppState from './CommandAppState';
-import HistoryAppState from './HistoryAppState';
-import IndexerAppState, {
-  IndexerHistoryAppState,
-  IndexerIndexAppState,
-  IndexerStatusAppState,
-} from './IndexerAppState';
-import IndexerStatsAppState from './IndexerStatsAppState';
-import SettingsAppState from './SettingsAppState';
-import SystemAppState from './SystemAppState';
-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 {
-  commands: CommandAppState;
-  history: HistoryAppState;
-  indexerHistory: IndexerHistoryAppState;
-  indexerIndex: IndexerIndexAppState;
-  indexerStats: IndexerStatsAppState;
-  indexerStatus: IndexerStatusAppState;
-  indexers: IndexerAppState;
-  settings: SettingsAppState;
-  system: SystemAppState;
-  tags: TagsAppState;
-}
-
-export default AppState;
--- a/frontend/src/App/State/ClientSideCollectionAppState.ts
+++ b/frontend/src/App/State/ClientSideCollectionAppState.ts
@@ -1,8 +0,0 @@
-import { CustomFilter } from './AppState';
-
-interface ClientSideCollectionAppState {
-  totalItems: number;
-  customFilters: CustomFilter[];
-}
-
-export default ClientSideCollectionAppState;
--- a/frontend/src/App/State/CommandAppState.ts
+++ b/frontend/src/App/State/CommandAppState.ts
@@ -1,6 +0,0 @@
-import AppSectionState from 'App/State/AppSectionState';
-import Command from 'Commands/Command';
-
-export type CommandAppState = AppSectionState<Command>;
-
-export default CommandAppState;
--- a/frontend/src/App/State/HistoryAppState.ts
+++ b/frontend/src/App/State/HistoryAppState.ts
@@ -1,10 +0,0 @@
-import AppSectionState from 'App/State/AppSectionState';
-import Column from 'Components/Table/Column';
-import History from 'typings/History';
-
-interface HistoryAppState extends AppSectionState<History> {
-  pageSize: number;
-  columns: Column[];
-}
-
-export default HistoryAppState;
--- a/frontend/src/App/State/IndexerAppState.ts
+++ b/frontend/src/App/State/IndexerAppState.ts
@@ -1,40 +0,0 @@
-import Column from 'Components/Table/Column';
-import SortDirection from 'Helpers/Props/SortDirection';
-import Indexer, { IndexerStatus } from 'Indexer/Indexer';
-import History from 'typings/History';
-import AppSectionState, {
-  AppSectionDeleteState,
-  AppSectionSaveState,
-} from './AppSectionState';
-import { Filter, FilterBuilderProp } from './AppState';
-
-export interface IndexerIndexAppState {
-  isTestingAll: boolean;
-  sortKey: string;
-  sortDirection: SortDirection;
-  secondarySortKey: string;
-  secondarySortDirection: SortDirection;
-  view: string;
-
-  tableOptions: {
-    showSearchAction: boolean;
-  };
-
-  selectedFilterKey: string;
-  filterBuilderProps: FilterBuilderProp<Indexer>[];
-  filters: Filter[];
-  columns: Column[];
-}
-
-interface IndexerAppState
-  extends AppSectionState<Indexer>,
-    AppSectionDeleteState,
-    AppSectionSaveState {
-  itemMap: Record<number, number>;
-}
-
-export type IndexerStatusAppState = AppSectionState<IndexerStatus>;
-
-export type IndexerHistoryAppState = AppSectionState<History>;
-
-export default IndexerAppState;
--- a/frontend/src/App/State/IndexerStatsAppState.ts
+++ b/frontend/src/App/State/IndexerStatsAppState.ts
@@ -1,13 +0,0 @@
-import { AppSectionItemState } from 'App/State/AppSectionState';
-import { Filter, FilterBuilderProp } from 'App/State/AppState';
-import Indexer from 'Indexer/Indexer';
-import { IndexerStats } from 'typings/IndexerStats';
-
-export interface IndexerStatsAppState
-  extends AppSectionItemState<IndexerStats> {
-  filterBuilderProps: FilterBuilderProp<Indexer>[];
-  selectedFilterKey: string;
-  filters: Filter[];
-}
-
-export default IndexerStatsAppState;
--- a/frontend/src/App/State/ReleaseAppState.ts
+++ b/frontend/src/App/State/ReleaseAppState.ts
@@ -1,10 +0,0 @@
-import AppSectionState, {
-  AppSectionDeleteState,
-} from 'App/State/AppSectionState';
-import Release from 'typings/Release';
-
-interface ReleaseAppState
-  extends AppSectionState<Release>,
-    AppSectionDeleteState {}
-
-export default ReleaseAppState;
--- a/frontend/src/App/State/SettingsAppState.ts
+++ b/frontend/src/App/State/SettingsAppState.ts
@@ -1,42 +0,0 @@
-import AppSectionState, {
-  AppSectionDeleteState,
-  AppSectionItemState,
-  AppSectionSaveState,
-} from 'App/State/AppSectionState';
-import Application from 'typings/Application';
-import DownloadClient from 'typings/DownloadClient';
-import Notification from 'typings/Notification';
-import { UiSettings } from 'typings/UiSettings';
-
-export interface AppProfileAppState
-  extends AppSectionState<Application>,
-    AppSectionDeleteState,
-    AppSectionSaveState {}
-
-export interface ApplicationAppState
-  extends AppSectionState<Application>,
-    AppSectionDeleteState,
-    AppSectionSaveState {
-  isTestingAll: boolean;
-}
-
-export interface DownloadClientAppState
-  extends AppSectionState<DownloadClient>,
-    AppSectionDeleteState,
-    AppSectionSaveState {}
-
-export interface NotificationAppState
-  extends AppSectionState<Notification>,
-    AppSectionDeleteState {}
-
-export type UiSettingsAppState = AppSectionItemState<UiSettings>;
-
-interface SettingsAppState {
-  appProfiles: AppProfileAppState;
-  applications: ApplicationAppState;
-  downloadClients: DownloadClientAppState;
-  notifications: NotificationAppState;
-  ui: UiSettingsAppState;
-}
-
-export default SettingsAppState;
--- a/frontend/src/App/State/SystemAppState.ts
+++ b/frontend/src/App/State/SystemAppState.ts
@@ -1,10 +0,0 @@
-import SystemStatus from 'typings/SystemStatus';
-import { AppSectionItemState } from './AppSectionState';
-
-export type SystemStatusAppState = AppSectionItemState<SystemStatus>;
-
-interface SystemAppState {
-  status: SystemStatusAppState;
-}
-
-export default SystemAppState;
--- a/frontend/src/App/State/TagsAppState.ts
+++ b/frontend/src/App/State/TagsAppState.ts
@@ -1,28 +0,0 @@
-import ModelBase from 'App/ModelBase';
-import AppSectionState, {
-  AppSectionDeleteState,
-  AppSectionSaveState,
-} from 'App/State/AppSectionState';
-
-export interface Tag extends ModelBase {
-  label: string;
-}
-
-export interface TagDetail extends ModelBase {
-  label: string;
-  applicationIds: number[];
-  indexerIds: number[];
-  indexerProxyIds: number[];
-  notificationIds: number[];
-}
-
-export interface TagDetailAppState
-  extends AppSectionState<TagDetail>,
-    AppSectionDeleteState,
-    AppSectionSaveState {}
-
-interface TagsAppState extends AppSectionState<Tag>, AppSectionDeleteState {
-  details: TagDetailAppState;
-}
-
-export default TagsAppState;
--- a/frontend/src/Commands/Command.ts
+++ b/frontend/src/Commands/Command.ts
@@ -1,37 +0,0 @@
-import ModelBase from 'App/ModelBase';
-
-export interface CommandBody {
-  sendUpdatesToClient: boolean;
-  updateScheduledTask: boolean;
-  completionMessage: string;
-  requiresDiskAccess: boolean;
-  isExclusive: boolean;
-  isLongRunning: boolean;
-  name: string;
-  lastExecutionTime: string;
-  lastStartTime: string;
-  trigger: string;
-  suppressMessages: boolean;
-  seriesId?: number;
-}
-
-interface Command extends ModelBase {
-  name: string;
-  commandName: string;
-  message: string;
-  body: CommandBody;
-  priority: string;
-  status: string;
-  result: string;
-  queued: string;
-  started: string;
-  ended: string;
-  duration: string;
-  trigger: string;
-  stateChangeTime: string;
-  sendUpdatesToClient: boolean;
-  updateScheduledTask: boolean;
-  lastExecutionTime: string;
-}
-
-export default Command;
--- a/frontend/src/Components/Alert.css.d.ts
+++ b/frontend/src/Components/Alert.css.d.ts
@@ -1,11 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'alert': string;
-  'danger': string;
-  'info': string;
-  'success': string;
-  'warning': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Alert.js
+++ b/frontend/src/Components/Alert.js
@@ -4,9 +4,7 @@ import React from 'react';
 import { kinds } from 'Helpers/Props';
 import styles from './Alert.css';

-function Alert(props) {
-  const { className, kind, children, ...otherProps } = props;
-
+function Alert({ className, kind, children, ...otherProps }) {
  return (
    <div
      className={classNames(
@@ -21,8 +19,8 @@ function Alert(props) {
 }

 Alert.propTypes = {
-  className: PropTypes.string,
-  kind: PropTypes.oneOf(kinds.all),
+  className: PropTypes.string.isRequired,
+  kind: PropTypes.oneOf(kinds.all).isRequired,
  children: PropTypes.node.isRequired
 };

--- a/frontend/src/Components/Card.css.d.ts
+++ b/frontend/src/Components/Card.css.d.ts
@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'card': string;
-  'overlay': string;
-  'underlay': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Chart/BarChart.js
+++ b/frontend/src/Components/Chart/BarChart.js
@@ -2,7 +2,6 @@ import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { kinds } from 'Helpers/Props';
-import { defaultFontFamily } from 'Styles/Variables/fonts';

 function getColors(kind) {

@@ -40,15 +39,7 @@ class BarChart extends Component {
        plugins: {
          title: {
            display: true,
-            align: 'start',
-            text: this.props.title,
-            padding: {
-              bottom: 30
-            },
-            font: {
-              size: 14,
-              family: defaultFontFamily
-            }
+            text: this.props.title
          },
          legend: {
            display: this.props.legend
--- a/frontend/src/Components/Chart/DoughnutChart.js
+++ b/frontend/src/Components/Chart/DoughnutChart.js
@@ -1,7 +1,6 @@
 import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { defaultFontFamily } from 'Styles/Variables/fonts';

 function getColors(kind) {

@@ -23,15 +22,7 @@ class DoughnutChart extends Component {
        plugins: {
          title: {
            display: true,
-            align: 'start',
-            text: this.props.title,
-            padding: {
-              bottom: 30
-            },
-            font: {
-              size: 14,
-              family: defaultFontFamily
-            }
+            text: this.props.title
          },
          legend: {
            position: 'bottom'
--- a/frontend/src/Components/Chart/StackedBarChart.js
+++ b/frontend/src/Components/Chart/StackedBarChart.js
@@ -1,7 +1,6 @@
 import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { defaultFontFamily } from 'Styles/Variables/fonts';

 function getColors(index) {

@@ -37,15 +36,7 @@ class StackedBarChart extends Component {
        plugins: {
          title: {
            display: true,
-            align: 'start',
-            text: this.props.title,
-            padding: {
-              bottom: 30
-            },
-            font: {
-              size: 14,
-              family: defaultFontFamily
-            }
+            text: this.props.title
          }
        }
      },
--- a/frontend/src/Components/DescriptionList/DescriptionList.css.d.ts
+++ b/frontend/src/Components/DescriptionList/DescriptionList.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'descriptionList': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/DescriptionList/DescriptionListItem.js
+++ b/frontend/src/Components/DescriptionList/DescriptionListItem.js
@@ -17,7 +17,7 @@ class DescriptionListItem extends Component {
    } = this.props;

    return (
-      <div>
+      <span>
        <DescriptionListItemTitle
          className={titleClassName}
        >
@@ -29,7 +29,7 @@ class DescriptionListItem extends Component {
        >
          {data}
        </DescriptionListItemDescription>
-      </div>
+      </span>
    );
  }
 }
--- a/frontend/src/Components/DescriptionList/DescriptionListItemDescription.css.d.ts
+++ b/frontend/src/Components/DescriptionList/DescriptionListItemDescription.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'description': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/DescriptionList/DescriptionListItemTitle.css.d.ts
+++ b/frontend/src/Components/DescriptionList/DescriptionListItemTitle.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'title': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/DragPreviewLayer.css.d.ts
+++ b/frontend/src/Components/DragPreviewLayer.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'dragLayer': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Error/ErrorBoundaryError.css
+++ b/frontend/src/Components/Error/ErrorBoundaryError.css
@@ -25,10 +25,6 @@
  white-space: pre-wrap;
 }

-.version {
-  margin-top: 20px;
-}
-
@media only screen and (max-width: $breakpointMedium) {
  .image {
    height: 250px;
--- a/frontend/src/Components/Error/ErrorBoundaryError.css.d.ts
+++ b/frontend/src/Components/Error/ErrorBoundaryError.css.d.ts
@@ -1,12 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'container': string;
-  'details': string;
-  'image': string;
-  'imageContainer': string;
-  'message': string;
-  'version': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Error/ErrorBoundaryError.js
+++ b/frontend/src/Components/Error/ErrorBoundaryError.js
@@ -0,0 +1,60 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import styles from './ErrorBoundaryError.css';
+
+function ErrorBoundaryError(props) {
+  const {
+    className,
+    messageClassName,
+    detailsClassName,
+    message,
+    error,
+    info
+  } = props;
+
+  return (
+    <div className={className}>
+      <div className={messageClassName}>
+        {message}
+      </div>
+
+      <div className={styles.imageContainer}>
+        <img
+          className={styles.image}
+          src={`${window.Prowlarr.urlBase}/Content/Images/error.png`}
+        />
+      </div>
+
+      <details className={detailsClassName}>
+        {
+          error &&
+            <div>
+              {error.toString()}
+            </div>
+        }
+
+        <div className={styles.info}>
+          {info.componentStack}
+        </div>
+      </details>
+    </div>
+  );
+}
+
+ErrorBoundaryError.propTypes = {
+  className: PropTypes.string.isRequired,
+  messageClassName: PropTypes.string.isRequired,
+  detailsClassName: PropTypes.string.isRequired,
+  message: PropTypes.string.isRequired,
+  error: PropTypes.object.isRequired,
+  info: PropTypes.object.isRequired
+};
+
+ErrorBoundaryError.defaultProps = {
+  className: styles.container,
+  messageClassName: styles.message,
+  detailsClassName: styles.details,
+  message: 'There was an error loading this content'
+};
+
+export default ErrorBoundaryError;
--- a/frontend/src/Components/Error/ErrorBoundaryError.tsx
+++ b/frontend/src/Components/Error/ErrorBoundaryError.tsx
@@ -1,76 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import StackTrace from 'stacktrace-js';
-import styles from './ErrorBoundaryError.css';
-
-interface ErrorBoundaryErrorProps {
-  className: string;
-  messageClassName: string;
-  detailsClassName: string;
-  message: string;
-  error: Error;
-  info: {
-    componentStack: string;
-  };
-}
-
-function ErrorBoundaryError(props: ErrorBoundaryErrorProps) {
-  const {
-    className = styles.container,
-    messageClassName = styles.message,
-    detailsClassName = styles.details,
-    message = 'There was an error loading this content',
-    error,
-    info,
-  } = props;
-
-  const [detailedError, setDetailedError] = useState<
-    StackTrace.StackFrame[] | null
-  >(null);
-
-  useEffect(() => {
-    if (error) {
-      StackTrace.fromError(error).then((de) => {
-        setDetailedError(de);
-      });
-    } else {
-      setDetailedError(null);
-    }
-  }, [error, setDetailedError]);
-
-  return (
-    <div className={className}>
-      <div className={messageClassName}>{message}</div>
-
-      <div className={styles.imageContainer}>
-        <img
-          className={styles.image}
-          src={`${window.Prowlarr.urlBase}/Content/Images/error.png`}
-        />
-      </div>
-
-      <details className={detailsClassName}>
-        {error ? <div>{error.message}</div> : null}
-
-        {detailedError ? (
-          detailedError.map((d, index) => {
-            return (
-              <div key={index}>
-                {`  at ${d.functionName} (${d.fileName}:${d.lineNumber}:${d.columnNumber})`}
-              </div>
-            );
-          })
-        ) : (
-          <div>{info.componentStack}</div>
-        )}
-
-        {
-          <div className={styles.version}>
-            Version: {window.Prowlarr.version}
-          </div>
-        }
-      </details>
-    </div>
-  );
-}
-
-export default ErrorBoundaryError;
--- a/frontend/src/Components/FieldSet.css.d.ts
+++ b/frontend/src/Components/FieldSet.css.d.ts
@@ -1,8 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'fieldSet': string;
-  'legend': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/FileBrowser/FileBrowserModal.css.d.ts
+++ b/frontend/src/Components/FileBrowser/FileBrowserModal.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'modal': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.css.d.ts
+++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.css.d.ts
@@ -1,12 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'faqLink': string;
-  'loading': string;
-  'mappedDrivesWarning': string;
-  'modalBody': string;
-  'pathInput': string;
-  'scroller': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
+++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
 import Alert from 'Components/Alert';
 import PathInput from 'Components/Form/PathInput';
 import Button from 'Components/Link/Button';
@@ -20,12 +21,12 @@ import styles from './FileBrowserModalContent.css';
 const columns = [
  {
    name: 'type',
-    label: () => translate('Type'),
+    label: translate('Type'),
    isVisible: true
  },
  {
    name: 'name',
-    label: () => translate('Name'),
+    label: translate('Name'),
    isVisible: true
  }
 ];
@@ -38,7 +39,7 @@ class FileBrowserModalContent extends Component {
  constructor(props, context) {
    super(props, context);

-    this._scrollerRef = React.createRef();
+    this._scrollerNode = null;

    this.state = {
      isFileBrowserModalOpen: false,
@@ -56,10 +57,21 @@ class FileBrowserModalContent extends Component {
      currentPath !== prevState.currentPath
    ) {
      this.setState({ currentPath });
-      this._scrollerRef.current.scrollTop = 0;
+      this._scrollerNode.scrollTop = 0;
    }
  }

+  //
+  // Control
+
+  setScrollerRef = (ref) => {
+    if (ref) {
+      this._scrollerNode = ReactDOM.findDOMNode(ref);
+    } else {
+      this._scrollerNode = null;
+    }
+  };
+
  //
  // Listeners

@@ -133,7 +145,7 @@ class FileBrowserModalContent extends Component {
          />

          <Scroller
-            ref={this._scrollerRef}
+            ref={this.setScrollerRef}
            className={styles.scroller}
            scrollDirection={scrollDirections.BOTH}
          >
--- a/frontend/src/Components/FileBrowser/FileBrowserRow.css.d.ts
+++ b/frontend/src/Components/FileBrowser/FileBrowserRow.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'type': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css.d.ts
+++ b/frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.css.d.ts
@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'container': string;
-  'numberInput': string;
-  'selectInput': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.css.d.ts
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.css.d.ts
@@ -1,10 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'label': string;
-  'labelContainer': string;
-  'labelInputContainer': string;
-  'rows': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.css.d.ts
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.css.d.ts
@@ -1,10 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'actionsContainer': string;
-  'filterRow': string;
-  'inputContainer': string;
-  'valueInputContainer': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
@@ -198,13 +198,11 @@ class FilterBuilderRow extends Component {
    const selectedFilterBuilderProp = this.selectedFilterBuilderProp;

    const keyOptions = filterBuilderProps.map((availablePropFilter) => {
-      const { name, label } = availablePropFilter;
-
      return {
-        key: name,
-        value: typeof label === 'function' ? label() : label
+        key: availablePropFilter.name,
+        value: availablePropFilter.label
      };
-    }).sort((a, b) => a.value.localeCompare(b.value));
+    });

    const ValueComponent = getRowValueConnector(selectedFilterBuilderProp);

--- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css.d.ts
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css.d.ts
@@ -1,10 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'isLastTag': string;
-  'label': string;
-  'or': string;
-  'tag': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Filter/Builder/IndexerFilterBuilderRowValueConnector.js
+++ b/frontend/src/Components/Filter/Builder/IndexerFilterBuilderRowValueConnector.js
@@ -9,13 +9,13 @@ import FilterBuilderRowValue from './FilterBuilderRowValue';
 function createMapStateToProps() {
  return createSelector(
    (state) => state.indexers,
-    (indexers) => {
+    (qualityProfiles) => {
      const {
        isFetching,
        isPopulated,
        error,
        items
-      } = indexers;
+      } = qualityProfiles;

      const tagList = items.map((item) => {
        return {
--- a/frontend/src/Components/Filter/Builder/PrivacyFilterBuilderRowValue.js
+++ b/frontend/src/Components/Filter/Builder/PrivacyFilterBuilderRowValue.js
@@ -3,24 +3,9 @@ import translate from 'Utilities/String/translate';
 import FilterBuilderRowValue from './FilterBuilderRowValue';

 const privacyTypes = [
-  {
-    id: 'public',
-    get name() {
-      return translate('Public');
-    }
-  },
-  {
-    id: 'private',
-    get name() {
-      return translate('Private');
-    }
-  },
-  {
-    id: 'semiPrivate',
-    get name() {
-      return translate('SemiPrivate');
-    }
-  }
+  { id: 'public', name: translate('Public') },
+  { id: 'private', name: translate('Private') },
+  { id: 'semiPrivate', name: translate('SemiPrivate') }
 ];

 function PrivacyFilterBuilderRowValue(props) {
--- a/frontend/src/Components/Filter/CustomFilters/CustomFilter.css.d.ts
+++ b/frontend/src/Components/Filter/CustomFilters/CustomFilter.css.d.ts
@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'actions': string;
-  'customFilter': string;
-  'label': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.css.d.ts
+++ b/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'addButtonContainer': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js
+++ b/frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js
@@ -50,7 +50,7 @@ function CustomFiltersModalContent(props) {

        <div className={styles.addButtonContainer}>
          <Button onPress={onAddCustomFilter}>
-            {translate('AddCustomFilter')}
+            Add Custom Filter
          </Button>
        </div>
      </ModalBody>
--- a/frontend/src/Components/Form/AppProfileSelectInputConnector.js
+++ b/frontend/src/Components/Form/AppProfileSelectInputConnector.js
@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
 import sortByName from 'Utilities/Array/sortByName';
-import translate from 'Utilities/String/translate';
 import SelectInput from './SelectInput';

 function createMapStateToProps() {
@@ -24,7 +23,7 @@ function createMapStateToProps() {
      if (includeNoChange) {
        values.unshift({
          key: 'noChange',
-          value: translate('NoChange'),
+          value: 'No Change',
          disabled: true
        });
      }
--- a/frontend/src/Components/Form/AutoSuggestInput.css.d.ts
+++ b/frontend/src/Components/Form/AutoSuggestInput.css.d.ts
@@ -1,15 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'hasError': string;
-  'hasWarning': string;
-  'input': string;
-  'inputContainer': string;
-  'suggestion': string;
-  'suggestionHighlighted': string;
-  'suggestionsContainer': string;
-  'suggestionsContainerOpen': string;
-  'suggestionsList': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/CaptchaInput.css.d.ts
+++ b/frontend/src/Components/Form/CaptchaInput.css.d.ts
@@ -1,12 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'captchaInputWrapper': string;
-  'hasButton': string;
-  'hasError': string;
-  'hasWarning': string;
-  'input': string;
-  'recaptchaWrapper': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/CheckInput.css.d.ts
+++ b/frontend/src/Components/Form/CheckInput.css.d.ts
@@ -1,18 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'checkbox': string;
-  'container': string;
-  'dangerIsChecked': string;
-  'helpText': string;
-  'input': string;
-  'isDisabled': string;
-  'isIndeterminate': string;
-  'isNotChecked': string;
-  'label': string;
-  'primaryIsChecked': string;
-  'successIsChecked': string;
-  'warningIsChecked': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/DeviceInput.css.d.ts
+++ b/frontend/src/Components/Form/DeviceInput.css.d.ts
@@ -1,8 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'deviceInputWrapper': string;
-  'input': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/DownloadClientSelectInputConnector.js
+++ b/frontend/src/Components/Form/DownloadClientSelectInputConnector.js
@@ -1,98 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchDownloadClients } from 'Store/Actions/settingsActions';
-import sortByName from 'Utilities/Array/sortByName';
-import EnhancedSelectInput from './EnhancedSelectInput';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.downloadClients,
-    (state, { includeAny }) => includeAny,
-    (state, { protocol }) => protocol,
-    (downloadClients, includeAny, protocolFilter) => {
-      const {
-        isFetching,
-        isPopulated,
-        error,
-        items
-      } = downloadClients;
-
-      const values = items
-        .filter((downloadClient) => downloadClient.protocol === protocolFilter)
-        .sort(sortByName)
-        .map((downloadClient) => ({
-          key: downloadClient.id,
-          value: downloadClient.name
-        }));
-
-      if (includeAny) {
-        values.unshift({
-          key: 0,
-          value: '(Any)'
-        });
-      }
-
-      return {
-        isFetching,
-        isPopulated,
-        error,
-        values
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchFetchDownloadClients: fetchDownloadClients
-};
-
-class DownloadClientSelectInputConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    if (!this.props.isPopulated) {
-      this.props.dispatchFetchDownloadClients();
-    }
-  }
-
-  //
-  // Listeners
-
-  onChange = ({ name, value }) => {
-    this.props.onChange({ name, value: parseInt(value) });
-  };
-
-  //
-  // Render
-
-  render() {
-    return (
-      <EnhancedSelectInput
-        {...this.props}
-        onChange={this.onChange}
-      />
-    );
-  }
-}
-
-DownloadClientSelectInputConnector.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  includeAny: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired,
-  dispatchFetchDownloadClients: PropTypes.func.isRequired
-};
-
-DownloadClientSelectInputConnector.defaultProps = {
-  includeAny: false,
-  protocol: 'torrent'
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(DownloadClientSelectInputConnector);
--- a/frontend/src/Components/Form/EnhancedSelectInput.css
+++ b/frontend/src/Components/Form/EnhancedSelectInput.css
@@ -78,7 +78,7 @@

  border: 1px solid var(--inputBorderColor);
  border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: var(--white);
 }

 .loading {
--- a/frontend/src/Components/Form/EnhancedSelectInput.css.d.ts
+++ b/frontend/src/Components/Form/EnhancedSelectInput.css.d.ts
@@ -1,22 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'dropdownArrowContainer': string;
-  'dropdownArrowContainerDisabled': string;
-  'dropdownArrowContainerEditable': string;
-  'editableContainer': string;
-  'enhancedSelect': string;
-  'hasError': string;
-  'hasWarning': string;
-  'isDisabled': string;
-  'loading': string;
-  'mobileCloseButton': string;
-  'mobileCloseButtonContainer': string;
-  'options': string;
-  'optionsContainer': string;
-  'optionsModal': string;
-  'optionsModalBody': string;
-  'optionsModalScroller': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/EnhancedSelectInput.js
+++ b/frontend/src/Components/Form/EnhancedSelectInput.js
@@ -12,9 +12,9 @@ import ModalBody from 'Components/Modal/ModalBody';
 import Portal from 'Components/Portal';
 import Scroller from 'Components/Scroller/Scroller';
 import { icons, scrollDirections, sizes } from 'Helpers/Props';
-import { isMobile as isMobileUtil } from 'Utilities/browser';
 import * as keyCodes from 'Utilities/Constants/keyCodes';
 import getUniqueElememtId from 'Utilities/getUniqueElementId';
+import { isMobile as isMobileUtil } from 'Utilities/mobile';
 import HintedSelectInputOption from './HintedSelectInputOption';
 import HintedSelectInputSelectedValue from './HintedSelectInputSelectedValue';
 import TextInput from './TextInput';
@@ -113,12 +113,10 @@ class EnhancedSelectInput extends Component {
      this._scheduleUpdate();
    }

-    if (!Array.isArray(this.props.value)) {
-      if (prevProps.value !== this.props.value || prevProps.values !== this.props.values) {
-        this.setState({
-          selectedIndex: getSelectedIndex(this.props)
-        });
-      }
+    if (!Array.isArray(this.props.value) && prevProps.value !== this.props.value) {
+      this.setState({
+        selectedIndex: getSelectedIndex(this.props)
+      });
    }
  }

@@ -334,11 +332,6 @@ class EnhancedSelectInput extends Component {

    const isMultiSelect = Array.isArray(value);
    const selectedOption = getSelectedOption(selectedIndex, values);
-    let selectedValue = value;
-
-    if (!values.length) {
-      selectedValue = isMultiSelect ? [] : '';
-    }

    return (
      <div>
@@ -379,17 +372,15 @@ class EnhancedSelectInput extends Component {
                          onPress={this.onPress}
                        >
                          {
-                            isFetching ?
+                            isFetching &&
                              <LoadingIndicator
                                className={styles.loading}
                                size={20}
-                              /> :
-                              null
+                              />
                          }

                          {
-                            isFetching ?
-                              null :
+                            !isFetching &&
                              <Icon
                                name={icons.CARET_DOWN}
                              />
@@ -409,7 +400,7 @@ class EnhancedSelectInput extends Component {
                        onPress={this.onPress}
                      >
                        <SelectedValueComponent
-                          value={selectedValue}
+                          value={value}
                          values={values}
                          {...selectedValueOptions}
                          {...selectedOption}
@@ -427,17 +418,15 @@ class EnhancedSelectInput extends Component {
                        >

                          {
-                            isFetching ?
+                            isFetching &&
                              <LoadingIndicator
                                className={styles.loading}
                                size={20}
-                              /> :
-                              null
+                              />
                          }

                          {
-                            isFetching ?
-                              null :
+                            !isFetching &&
                              <Icon
                                name={icons.CARET_DOWN}
                              />
@@ -516,7 +505,7 @@ class EnhancedSelectInput extends Component {
        </Manager>

        {
-          isMobile ?
+          isMobile &&
            <Modal
              className={styles.optionsModal}
              size={sizes.EXTRA_SMALL}
@@ -566,8 +555,7 @@ class EnhancedSelectInput extends Component {
                  }
                </Scroller>
              </ModalBody>
-            </Modal> :
-            null
+            </Modal>
        }
      </div>
    );
@@ -578,7 +566,7 @@ EnhancedSelectInput.propTypes = {
  className: PropTypes.string,
  disabledClassName: PropTypes.string,
  name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.string), PropTypes.arrayOf(PropTypes.number)]).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.number)]).isRequired,
  values: PropTypes.arrayOf(PropTypes.object).isRequired,
  isDisabled: PropTypes.bool.isRequired,
  isFetching: PropTypes.bool.isRequired,
--- a/frontend/src/Components/Form/EnhancedSelectInputOption.css
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.css
@@ -9,10 +9,6 @@
  &:hover {
    background-color: var(--inputHoverBackgroundColor);
  }
-
-  &.isDisabled {
-    cursor: not-allowed;
-  }
 }

 .optionCheck {
--- a/frontend/src/Components/Form/EnhancedSelectInputOption.css.d.ts
+++ b/frontend/src/Components/Form/EnhancedSelectInputOption.css.d.ts
@@ -1,14 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'iconContainer': string;
-  'isDisabled': string;
-  'isHidden': string;
-  'isMobile': string;
-  'isSelected': string;
-  'option': string;
-  'optionCheck': string;
-  'optionCheckInput': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/EnhancedSelectInputSelectedValue.css.d.ts
+++ b/frontend/src/Components/Form/EnhancedSelectInputSelectedValue.css.d.ts
@@ -1,8 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'isDisabled': string;
-  'selectedValue': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/Form.css.d.ts
+++ b/frontend/src/Components/Form/Form.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'validationFailures': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/Form.js
+++ b/frontend/src/Components/Form/Form.js
@@ -4,15 +4,7 @@ import Alert from 'Components/Alert';
 import { kinds } from 'Helpers/Props';
 import styles from './Form.css';

-function Form(props) {
-  const {
-    children,
-    validationErrors,
-    validationWarnings,
-    // eslint-disable-next-line no-unused-vars
-    ...otherProps
-  } = props;
-
+function Form({ children, validationErrors, validationWarnings, ...otherProps }) {
  return (
    <div>
      {
--- a/frontend/src/Components/Form/FormGroup.css.d.ts
+++ b/frontend/src/Components/Form/FormGroup.css.d.ts
@@ -1,11 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'extraSmall': string;
-  'group': string;
-  'large': string;
-  'medium': string;
-  'small': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/FormInputButton.css.d.ts
+++ b/frontend/src/Components/Form/FormInputButton.css.d.ts
@@ -1,8 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'button': string;
-  'middleButton': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/FormInputGroup.css.d.ts
+++ b/frontend/src/Components/Form/FormInputGroup.css.d.ts
@@ -1,14 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'helpLink': string;
-  'inputContainer': string;
-  'inputGroup': string;
-  'inputGroupContainer': string;
-  'inputUnit': string;
-  'inputUnitNumber': string;
-  'pendingChangesContainer': string;
-  'pendingChangesIcon': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Link from 'Components/Link/Link';
-import { inputTypes, kinds } from 'Helpers/Props';
+import { inputTypes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import AppProfileSelectInputConnector from './AppProfileSelectInputConnector';
 import AutoCompleteInput from './AutoCompleteInput';
@@ -10,14 +10,12 @@ import CaptchaInputConnector from './CaptchaInputConnector';
 import CardigannCaptchaInputConnector from './CardigannCaptchaInputConnector';
 import CheckInput from './CheckInput';
 import DeviceInputConnector from './DeviceInputConnector';
-import DownloadClientSelectInputConnector from './DownloadClientSelectInputConnector';
 import EnhancedSelectInput from './EnhancedSelectInput';
 import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
 import IndexerFlagsSelectInputConnector from './IndexerFlagsSelectInputConnector';
 import InfoInput from './InfoInput';
 import KeyValueListInput from './KeyValueListInput';
-import NewznabCategorySelectInputConnector from './NewznabCategorySelectInputConnector';
 import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
@@ -70,12 +68,6 @@ function getComponent(type) {
    case inputTypes.PATH:
      return PathInputConnector;

-    case inputTypes.CATEGORY_SELECT:
-      return NewznabCategorySelectInputConnector;
-
-    case inputTypes.DOWNLOAD_CLIENT_SELECT:
-      return DownloadClientSelectInputConnector;
-
    case inputTypes.INDEXER_FLAGS_SELECT:
      return IndexerFlagsSelectInputConnector;

@@ -257,27 +249,16 @@ FormInputGroup.propTypes = {
  className: PropTypes.string.isRequired,
  containerClassName: PropTypes.string.isRequired,
  inputClassName: PropTypes.string,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.any,
-  values: PropTypes.arrayOf(PropTypes.any),
  type: PropTypes.string.isRequired,
-  kind: PropTypes.oneOf(kinds.all),
-  min: PropTypes.number,
-  max: PropTypes.number,
  unit: PropTypes.string,
  buttons: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
  helpText: PropTypes.string,
  helpTexts: PropTypes.arrayOf(PropTypes.string),
  helpTextWarning: PropTypes.string,
  helpLink: PropTypes.string,
-  autoFocus: PropTypes.bool,
-  includeNoChange: PropTypes.bool,
-  includeNoChangeDisabled: PropTypes.bool,
-  selectedValueOptions: PropTypes.object,
  pending: PropTypes.bool,
  errors: PropTypes.arrayOf(PropTypes.object),
-  warnings: PropTypes.arrayOf(PropTypes.object),
-  onChange: PropTypes.func.isRequired
+  warnings: PropTypes.arrayOf(PropTypes.object)
 };

 FormInputGroup.defaultProps = {
--- a/frontend/src/Components/Form/FormInputHelpText.css.d.ts
+++ b/frontend/src/Components/Form/FormInputHelpText.css.d.ts
@@ -1,12 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'details': string;
-  'helpText': string;
-  'isCheckInput': string;
-  'isError': string;
-  'isWarning': string;
-  'link': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/Show More
+++ b/Show More