Speed up collections load by 50%

Fixes #7772

.editorconfig

@@ -42,7 +42,6 @@ csharp_style_var_elsewhere = true:suggestion
 
 # Stylecop Rules
 dotnet_diagnostic.SA0001.severity = none
-dotnet_diagnostic.SA1005.severity = none
 dotnet_diagnostic.SA1025.severity = none
 dotnet_diagnostic.SA1101.severity = none
 dotnet_diagnostic.SA1116.severity = none

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: radarr
 patreon: # Replace with a single Patreon username
 open_collective: radarr
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -45,11 +45,11 @@ body:
         - **Database**: Sqlite 3.36.0
     value: |
         - OS: 
-        - Radarr:
+        - Radarr: 
-        - Docker Install:
+        - Docker Install: 
-        - Using Reverse Proxy:
+        - Using Reverse Proxy: 
-        - Browser:
+        - Browser: 
-        - Database:
+        - Database: 
     render: markdown
   validations:
     required: true

.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 issue already exists for the feature you are requesting.
+    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
     options:
-    - label: I have searched the existing issues
+    - label: I have searched the existing open and closed issues
       required: true
 - type: textarea
   attributes:

.github/workflows/azuresync.yml

@@ -7,8 +7,12 @@ on:
 
 concurrency: azuresync-${{ github.event.issue.number }}
 
+permissions: {}
 jobs:
   alert:
+    permissions:
+      issues: write # to update issue body
+
     runs-on: ubuntu-latest
     steps:
       - uses: danhellem/github-actions-issue-to-work-item@master

.github/workflows/lock.yml

@@ -5,8 +5,13 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+permissions: {}
 jobs:
   lock:
+    permissions:
+      issues: write # to lock issues (dessant/lock-threads)
+      pull-requests: write # to lock PRs (dessant/lock-threads)
+
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/lock-threads@v2

.github/workflows/support.yml

@@ -4,8 +4,12 @@ on:
   issues:
     types: [labeled, unlabeled, reopened]
 
+permissions: {}
 jobs:
   support:
+    permissions:
+      issues: write # to modify issues
+
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/support-requests@v2

CODE_OF_CONDUCT.md

@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+<development@radarr.video>.
+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

SECURITY.md

@@ -0,0 +1,8 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities on Discord (preferred) to
+any of the Servarr Dev role holders (red names) or via email: development@servarr.com. You will receive a response from
+us within 72 hours. If the issue is confirmed, we will release a patch as soon
+as possible depending on complexity/severity.

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '4.2.4'
+  majorVersion: '4.3.1'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
@@ -761,7 +761,7 @@ stages:
         inputs:
           buildType: 'current'
           artifactName: Packages
-          itemPattern: '/$(pattern)'
+          itemPattern: '**/$(pattern)'
           targetPath: $(Build.ArtifactStagingDirectory)
       - bash: |
           mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
@@ -1143,4 +1143,5 @@ stages:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
             DISCORDCHANNELID: $(discordChannelId)
             DISCORDWEBHOOKKEY: $(discordWebhookKey)
+            DISCORDTHREADID: $(discordThreadId)
 

frontend/.eslintrc.js

@@ -39,6 +39,7 @@ module.exports = {
   plugins: [
     'filenames',
     'react',
+    'react-hooks',
     'simple-import-sort',
     'import'
   ],
@@ -308,7 +309,9 @@ module.exports = {
     'react/react-in-jsx-scope': 2,
     'react/self-closing-comp': 2,
     'react/sort-comp': 2,
-    'react/jsx-wrap-multilines': 2
+    'react/jsx-wrap-multilines': 2,
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'error'
   },
   overrides: [
     {

frontend/postcss.config.js

@@ -1,7 +1,6 @@
 const reload = require('require-nocache')(module);
 
 const cssVarsFiles = [
-  './src/Styles/Variables/colors',
   './src/Styles/Variables/dimensions',
   './src/Styles/Variables/fonts',
   './src/Styles/Variables/animations',
@@ -29,4 +28,4 @@ module.exports = {
     'postcss-color-function',
     'postcss-nested'
   ]
-};
+};

frontend/src/Activity/History/HistoryRow.css

@@ -10,6 +10,12 @@
   width: 80px;
 }
 
+.customFormatScore {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 55px;
+}
+
 .releaseGroup {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

frontend/src/Activity/History/HistoryRow.js

@@ -9,6 +9,7 @@ import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import MovieTitleLink from 'Movie/MovieTitleLink';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
@@ -168,6 +169,17 @@ class HistoryRow extends Component {
               );
             }
 
+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  {formatCustomFormatScore(data.customFormatScore)}
+                </TableRowCell>
+              );
+            }
+
             if (name === 'releaseGroup') {
               return (
                 <TableRowCell

frontend/src/Activity/Queue/ProtocolLabel.css

@@ -1,13 +1,13 @@
 .torrent {
   composes: label from '~Components/Label.css';
 
-  border-color: $torrentColor;
+  border-color: var(--torrentColor);
-  background-color: $torrentColor;
+  background-color: var(--torrentColor);
 }
 
 .usenet {
   composes: label from '~Components/Label.css';
 
-  border-color: $usenetColor;
+  border-color: var(--usenetColor);
-  background-color: $usenetColor;
+  background-color: var(--usenetColor);
 }

frontend/src/AddMovie/AddNewMovie/AddNewMovie.css

@@ -6,12 +6,12 @@
 .searchIconContainer {
   width: 58px;
   height: 46px;
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-right: none;
   border-radius: 4px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  background-color: #edf1f2;
+  background-color: var(--searchIconContainerBackgroundColor);
   text-align: center;
   line-height: 46px;
 }
@@ -25,7 +25,7 @@
 }
 
 .clearLookupButton {
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-left: none;
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;

frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.css

@@ -4,7 +4,7 @@
 
 .year {
   margin-left: 5px;
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .poster {

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css

@@ -9,13 +9,15 @@
 .underlay {
   @add-mixin cover;
 
-  background-color: $white;
+  background-color: var(--addMovieBackgroundColor);
   transition: background 500ms;
 
   &:hover {
-    background-color: #eaf2ff;
+    background-color: var(--pageBackground);
+    box-shadow: 0 0 12px var(--black);
     color: inherit;
     text-decoration: none;
+    transition: all 200ms ease-in;
   }
 }
 
@@ -31,7 +33,7 @@
   display: block;
   margin-right: 20px;
   height: 250px;
-  background-color: $defaultColor;
+  background-color: var(--defaultColor);
 }
 
 .content {
@@ -56,7 +58,7 @@
 
 .year {
   margin-left: 10px;
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .icons {
@@ -75,7 +77,7 @@
 
 .exclusionIcon {
   margin-left: 10px;
-  color: $dangerColor;
+  color: var(--dangerColor);
   pointer-events: all;
 }
 

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSearchResult.css

@@ -4,7 +4,7 @@
   width: 100%;
 
   &:hover {
-    background-color: $menuItemHoverBackgroundColor;
+    background-color: var(--menuItemHoverBackgroundColor);
   }
 }
 
@@ -17,7 +17,7 @@
   composes: link from '~Components/Link/Link.css';
 
   margin-left: auto;
-  color: $textColor;
+  color: var(--textColor);
 }
 
 .tmdbLinkIcon {

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.css

@@ -7,10 +7,10 @@
   padding: 6px 16px;
   width: 100%;
   height: 35px;
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-radius: 4px;
-  background-color: $white;
+  background-color: var(--inputBackgroundColor);
-  box-shadow: inset 0 1px 1px $inputBoxShadowColor;
+  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
 }
 
 .loading {
@@ -38,9 +38,9 @@
 
 .content {
   padding: 4px;
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-radius: 4px;
-  background-color: $white;
+  background-color: var(--inputBackgroundColor);
 }
 
 .searchContainer {
@@ -49,12 +49,12 @@
 
 .searchIconContainer {
   width: 58px;
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-right: none;
   border-radius: 4px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  background-color: #edf1f2;
+  background-color: var(--searchIconContainerBackgroundColor);
   text-align: center;
   line-height: 33px;
 }

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.css

@@ -9,7 +9,7 @@
 
 .year {
   margin-left: 5px;
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .existing {

frontend/src/App/App.js

@@ -4,6 +4,7 @@ import React from 'react';
 import DocumentTitle from 'react-document-title';
 import { Provider } from 'react-redux';
 import PageConnector from 'Components/Page/PageConnector';
+import ApplyTheme from './ApplyTheme';
 import AppRoutes from './AppRoutes';
 
 function App({ store, history }) {
@@ -11,9 +12,11 @@ function App({ store, history }) {
     <DocumentTitle title={window.Radarr.instanceName}>
       <Provider store={store}>
         <ConnectedRouter history={history}>
-          <PageConnector>
+          <ApplyTheme>
-            <AppRoutes app={App} />
+            <PageConnector>
-          </PageConnector>
+              <AppRoutes app={App} />
+            </PageConnector>
+          </ApplyTheme>
         </ConnectedRouter>
       </Provider>
     </DocumentTitle>

frontend/src/App/AppRoutes.js

@@ -22,7 +22,7 @@ import MediaManagementConnector from 'Settings/MediaManagement/MediaManagementCo
 import MetadataSettings from 'Settings/Metadata/MetadataSettings';
 import NotificationSettings from 'Settings/Notifications/NotificationSettings';
 import Profiles from 'Settings/Profiles/Profiles';
-import Quality from 'Settings/Quality/Quality';
+import QualityConnector from 'Settings/Quality/QualityConnector';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
 import UISettingsConnector from 'Settings/UI/UISettingsConnector';
@@ -143,7 +143,7 @@ function AppRoutes(props) {
 
       <Route
         path="/settings/quality"
-        component={Quality}
+        component={QualityConnector}
       />
 
       <Route

frontend/src/App/ApplyTheme.js

@@ -0,0 +1,49 @@
+import PropTypes from 'prop-types';
+import React, { Fragment, useCallback, useEffect } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import themes from 'Styles/Themes';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.ui.item.theme || window.Radarr.theme,
+    (
+      theme
+    ) => {
+      return {
+        theme
+      };
+    }
+  );
+}
+
+function ApplyTheme({ theme, children }) {
+  // Update the CSS Variables
+  const updateCSSVariables = useCallback(() => {
+    const arrayOfVariableKeys = Object.keys(themes[theme]);
+    const arrayOfVariableValues = Object.values(themes[theme]);
+
+    // Loop through each array key and set the CSS Variables
+    arrayOfVariableKeys.forEach((cssVariableKey, index) => {
+      // Based on our snippet from MDN
+      document.documentElement.style.setProperty(
+        `--${cssVariableKey}`,
+        arrayOfVariableValues[index]
+      );
+    });
+  }, [theme]);
+
+  // On Component Mount and Component Update
+  useEffect(() => {
+    updateCSSVariables(theme);
+  }, [updateCSSVariables, theme]);
+
+  return <Fragment>{children}</Fragment>;
+}
+
+ApplyTheme.propTypes = {
+  theme: PropTypes.string.isRequired,
+  children: PropTypes.object.isRequired
+};
+
+export default connect(createMapStateToProps)(ApplyTheme);

frontend/src/Calendar/Agenda/AgendaEvent.css

@@ -2,11 +2,11 @@
   display: flex;
   overflow-x: hidden;
   padding: 5px;
-  border-bottom: 1px solid $borderColor;
+  border-bottom: 1px solid var(--borderColor);
   font-size: $defaultFontSize;
 
   &:hover {
-    background-color: $tableRowHoverBackgroundColor;
+    background-color: var(--tableRowHoverBackgroundColor);
   }
 }
 

frontend/src/Calendar/Day/CalendarDay.css

@@ -2,8 +2,8 @@
   flex: 1 0 14.28%;
   overflow: hidden;
   min-height: 70px;
-  border-bottom: 1px solid $calendarBorderColor;
+  border-bottom: 1px solid var(--calendarBorderColor);
-  border-left: 1px solid $calendarBorderColor;
+  border-left: 1px solid var(--calendarBorderColor);
 }
 
 .isSingleDay {
@@ -12,14 +12,14 @@
 
 .dayOfMonth {
   padding-right: 5px;
-  border-bottom: 1px solid $calendarBorderColor;
+  border-bottom: 1px solid var(--calendarBorderColor);
   text-align: right;
 }
 
 .isToday {
-  background-color: $calendarTodayBackgroundColor;
+  background-color: var(--calendarTodayBackgroundColor);
 }
 
 .isDifferentMonth {
-  color: $disabledColor;
+  color: var(--disabledColor);
 }

frontend/src/Calendar/Day/CalendarDays.css

@@ -1,6 +1,6 @@
 .days {
   display: flex;
-  border-right: 1px solid $calendarBorderColor;
+  border-right: 1px solid var(--calendarBorderColor);
 }
 
 .day,

frontend/src/Calendar/Day/DayOfWeek.css

@@ -1,6 +1,6 @@
 .dayOfWeek {
   flex: 1 0 14.28%;
-  background-color: #e4eaec;
+  background-color: var(--calendarBackgroudColor);
   text-align: center;
 }
 
@@ -9,5 +9,5 @@
 }
 
 .isToday {
-  background-color: $calendarTodayBackgroundColor;
+  background-color: var(--calendarTodayBackgroundColor);
 }

frontend/src/Calendar/Events/CalendarEvent.css

@@ -2,8 +2,8 @@
   overflow-x: hidden;
   margin: 4px 2px;
   padding: 5px;
-  border-bottom: 1px solid $borderColor;
+  border-bottom: 1px solid var(--calendarBorderColor);
-  border-left: 4px solid $borderColor;
+  border-left: 4px solid var(--calendarBorderColor);
   font-size: 12px;
 
   &:global(.colorImpaired) {
@@ -15,10 +15,10 @@
   composes: link from '~Components/Link/Link.css';
 
   display: block;
-  color: $defaultColor;
+  color: var(--defaultColor);
 
   &:hover {
-    color: $defaultColor;
+    color: var(--defaultColor);
     text-decoration: none;
   }
 }
@@ -29,7 +29,7 @@
 }
 
 .movieInfo {
-  color: $calendarTextDim;
+  color: var(--calendarTextDim);
 }
 
 .movieTitle,
@@ -40,7 +40,7 @@
 }
 
 .movieTitle {
-  color: #3a3f51;
+  color: var(--calendarTextDimAlternate);
   font-size: $defaultFontSize;
 }
 
@@ -53,37 +53,37 @@
  */
 
 .downloaded {
-  border-left-color: $successColor !important;
+  border-left-color: var(--successColor) !important;
 
   &:global(.colorImpaired) {
-    border-left-color: color($successColor, saturation(+15%)) !important;
+    border-left-color: color(var(--successColor), saturation(+15%)) !important;
   }
 }
 
 .queue {
-  border-left-color: $purple !important;
+  border-left-color: var(--purple) !important;
 }
 
 .unmonitored {
-  border-left-color: $gray !important;
+  border-left-color: var(--gray) !important;
 }
 
 .missingUnmonitored {
-  border-left-color: $warningColor !important;
+  border-left-color: var(--warningColor) !important;
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+    background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
   }
 }
 
 .missingMonitored {
-  border-left-color: $dangerColor !important;
+  border-left-color: var(--dangerColor) !important;
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+    background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
   }
 }
 
 .continuing {
-  border-left-color: $primaryColor !important;
+  border-left-color: var(--primaryColor) !important;
 }

frontend/src/Calendar/Events/CalendarEventQueueDetails.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import QueueDetails from 'Activity/Queue/QueueDetails';
 import CircularProgressBar from 'Components/CircularProgressBar';
-import colors from 'Styles/Variables/colors';
 import translate from 'Utilities/String/translate';
 
 function CalendarEventQueueDetails(props) {
@@ -35,7 +34,7 @@ function CalendarEventQueueDetails(props) {
             progress={progress}
             size={20}
             strokeWidth={2}
-            strokeColor={colors.purple}
+            strokeColor={'#7a43b6'}
           />
         </div>
       }

frontend/src/Calendar/Legend/LegendItem.css

@@ -20,53 +20,53 @@
 .queue {
   composes: legendItemColor;
 
-  background-color: $queueColor;
+  background-color: var(--queueColor);
 }
 
 .continuing {
   composes: legendItemColor;
 
-  background-color: $primaryColor;
+  background-color: var(--primaryColor);
 }
 
 .availNotMonitored {
   composes: legendItemColor;
 
-  background-color: $darkGray;
+  background-color: var(--darkGray);
 }
 
 .ended {
   composes: legendItemColor;
 
-  background-color: $successColor;
+  background-color: var(--successColor);
 }
 
 .missingMonitored {
   composes: legendItemColor;
 
-  background-color: $dangerColor;
+  background-color: var(--dangerColor);
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
+    background: repeating-linear-gradient(90deg, color(var(--dangerColor) shade(5%)), color(var(--dangerColor) shade(5%)) 5px, color(var(--dangerColor) shade(15%)) 5px, color(var(--dangerColor) shade(15%)) 10px);
   }
 }
 
 .missingUnmonitored {
   composes: legendItemColor;
 
-  background-color: $warningColor;
+  background-color: var(--warningColor);
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
+    background: repeating-linear-gradient(45deg, var(--warningColor), var(--warningColor) 5px, color(var(--warningColor) tint(15%)) 5px, color(var(--warningColor) tint(15%)) 10px);
   }
 }
 
 .missingMonitoredColorImpaired {
-  background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+  background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
 }
 
 .missingUnmonitoredColorImpaired {
-  background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+  background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
 }
 
 .legendItemText {

frontend/src/Collection/AddNewCollectionMovieModalContent.css

@@ -4,7 +4,7 @@
 
 .year {
   margin-left: 5px;
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .poster {

frontend/src/Collection/Overview/CollectionMovie.css

@@ -6,7 +6,7 @@ $hoverScale: 1.05;
 
   &:hover {
     z-index: 2;
-    box-shadow: 0 0 10px $black;
+    box-shadow: 0 0 10px var(--black);
     transition: all 200ms ease-in;
 
     .poster {
@@ -28,7 +28,7 @@ $hoverScale: 1.05;
 .poster {
   position: relative;
   display: block;
-  background-color: $defaultColor;
+  background-color: var(--defaultColor);
 }
 
 .overlay {
@@ -44,7 +44,7 @@ $hoverScale: 1.05;
 
 .overlayTitle {
   padding: 5px;
-  color: $offWhite;
+  color: var(--offWhite);
   text-align: left;
   font-weight: bold;
   font-size: 15px;
@@ -67,7 +67,7 @@ $hoverScale: 1.05;
   z-index: 3;
   border-radius: 4px;
   background-color: #707070;
-  color: $white;
+  color: var(--white);
   font-size: $smallFontSize;
   opacity: 0;
   transition: opacity 0;
@@ -77,7 +77,7 @@ $hoverScale: 1.05;
   composes: button from '~Components/Link/IconButton.css';
 
   &:hover {
-    color: $radarrYellow;
+    color: var(--radarrYellow);
   }
 }
 
@@ -102,16 +102,16 @@ $hoverScale: 1.05;
 
   position: relative;
   display: block;
-  background-color: $defaultColor;
+  background-color: var(--defaultColor);
 }
 
 .monitorToggleButton {
   composes: toggleButton from '~Components/MonitorToggleButton.css';
 
   width: 25px;
-  color: $white;
+  color: var(--white);
 
   &:hover {
-    color: $iconButtonHoverLightColor;
+    color: var(--iconButtonHoverLightColor);
   }
 }

frontend/src/Collection/Overview/CollectionMovieLabel.css

@@ -3,7 +3,7 @@
   align-items: stretch;
   overflow: hidden;
   margin: 2px 4px;
-  border: 1px solid $borderColor;
+  border: 1px solid var(--borderColor);
   border-radius: 4px;
   background-color: #eee;
   cursor: default;
@@ -17,34 +17,34 @@
   padding: 0 4px;
   border-left: 4px;
   border-left-style: solid;
-  background-color: $white;
+  background-color: var(--white);
-  color: $defaultColor;
+  color: var(--defaultColor);
 }
 
 .primary {
-  border-color: $primaryColor;
+  border-color: var(--primaryColor);
 }
 
 .danger {
-  border-color: $dangerColor;
+  border-color: var(--dangerColor);
 }
 
 .success {
-  border-color: $successColor;
+  border-color: var(--successColor);
 }
 
 .purple {
-  border-color: $purple;
+  border-color: var(--purple);
 }
 
 .warning {
-  border-color: $warningColor;
+  border-color: var(--warningColor);
 }
 
 .info {
-  border-color: $infoColor;
+  border-color: var(--infoColor);
 }
 
 .queue {
-  border-color: $queueColor;
+  border-color: var(--queueColor);
 }

frontend/src/Collection/Overview/CollectionOverview.css

@@ -104,7 +104,7 @@ $hoverScale: 1.05;
   width: 25px;
 
   &:hover {
-    color: $iconButtonHoverLightColor;
+    color: var(--iconButtonHoverLightColor);
   }
 }
 
@@ -131,7 +131,7 @@ $hoverScale: 1.05;
     width: 20px;
 
     &:hover {
-      color: $iconButtonHoverLightColor;
+      color: var(--iconButtonHoverLightColor);
     }
   }
 }

frontend/src/Collection/Overview/CollectionOverviews.css

@@ -5,7 +5,7 @@
 .container {
   &:hover {
     .content {
-      background-color: $tableRowHoverBackgroundColor;
+      background-color: var(--tableRowHoverBackgroundColor);
     }
   }
 }

frontend/src/Commands/commandNames.js

@@ -15,6 +15,7 @@ export const REFRESH_MOVIE = 'RefreshMovie';
 export const RENAME_FILES = 'RenameFiles';
 export const RENAME_MOVIE = 'RenameMovie';
 export const RESET_API_KEY = 'ResetApiKey';
+export const RESET_QUALITY_DEFINITIONS = 'ResetQualityDefinitions';
 export const RSS_SYNC = 'RssSync';
 export const MOVIE_SEARCH = 'MoviesSearch';
 export const IMPORT_LIST_SYNC = 'ImportListSync';

frontend/src/Components/Alert.css

@@ -7,25 +7,25 @@
 }
 
 .danger {
-  border-color: $alertDangerBorderColor;
+  border-color: var(--alertDangerBorderColor);
-  background-color: $alertDangerBackgroundColor;
+  background-color: var(--alertDangerBackgroundColor);
-  color: $alertDangerColor;
+  color: var(--alertDangerColor);
 }
 
 .info {
-  border-color: $alertInfoBorderColor;
+  border-color: var(--alertInfoBorderColor);
-  background-color: $alertInfoBackgroundColor;
+  background-color: var(--alertInfoBackgroundColor);
-  color: $alertInfoColor;
+  color: var(--alertInfoColor);
 }
 
 .success {
-  border-color: $alertSuccessBorderColor;
+  border-color: var(--alertSuccessBorderColor);
-  background-color: $alertSuccessBackgroundColor;
+  background-color: var(--alertSuccessBackgroundColor);
-  color: $alertSuccessColor;
+  color: var(--alertSuccessColor);
 }
 
 .warning {
-  border-color: $alertWarningBorderColor;
+  border-color: var(--alertWarningBorderColor);
-  background-color: $alertWarningBackgroundColor;
+  background-color: var(--alertWarningBackgroundColor);
-  color: $alertWarningColor;
+  color: var(--alertWarningColor);
 }

frontend/src/Components/Card.css

@@ -3,9 +3,9 @@
   margin: 10px;
   padding: 10px;
   border-radius: 3px;
-  background-color: $white;
+  background-color: var(--cardBackgroundColor);
-  box-shadow: 0 0 10px 1px $cardShadowColor;
+  box-shadow: 0 0 10px 1px var(--cardShadowColor);
-  color: $defaultColor;
+  color: var(--defaultColor);
 }
 
 .underlay {

frontend/src/Components/CircularProgressBar.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import colors from 'Styles/Variables/colors';
 import styles from './CircularProgressBar.css';
 
 class CircularProgressBar extends Component {
@@ -132,7 +131,7 @@ CircularProgressBar.defaultProps = {
   containerClassName: styles.circularProgressBarContainer,
   size: 60,
   strokeWidth: 5,
-  strokeColor: colors.radarrYellow,
+  strokeColor: '#ffc230',
   showProgressText: false
 };
 

frontend/src/Components/FieldSet.css

@@ -13,7 +13,7 @@
   width: 100%;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
-  color: #3a3f51;
+  color: var(--textColor);
   font-size: 21px;
   line-height: inherit;
 

frontend/src/Components/FileBrowser/FileBrowserModalContent.css

@@ -13,7 +13,7 @@
 }
 
 .faqLink {
-  color: $alertWarningColor;
+  color: var(--alertWarningColor);
   font-weight: bold;
 }
 

frontend/src/Components/Filter/Builder/FilterBuilderRow.css

@@ -3,7 +3,7 @@
   margin-bottom: 5px;
 
   &:hover {
-    background-color: $tableRowHoverBackgroundColor;
+    background-color: var(--tableRowHoverBackgroundColor);
   }
 }
 

frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css

@@ -17,5 +17,5 @@
 
 .or {
   margin: 0 3px;
-  color: $themeDarkColor;
+  color: var(--themeDarkColor);
 }

frontend/src/Components/Filter/CustomFilters/CustomFilter.css

@@ -4,7 +4,7 @@
   padding: 5px;
 
   &:hover {
-    background-color: $tableRowHoverBackgroundColor;
+    background-color: var(--tableRowHoverBackgroundColor);
   }
 }
 

frontend/src/Components/Form/AutoSuggestInput.css

@@ -27,10 +27,10 @@
     overflow-y: auto;
     max-height: 200px;
     width: 100%;
-    border: 1px solid $inputBorderColor;
+    border: 1px solid var(--inputBorderColor);
     border-radius: 4px;
-    background-color: $white;
+    background-color: var(--inputBackgroundColor);
-    box-shadow: inset 0 1px 1px $inputBoxShadowColor;
+    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
   }
 }
 
@@ -46,5 +46,5 @@
 }
 
 .suggestionHighlighted {
-  background-color: $menuItemHoverBackgroundColor;
+  background-color: var(--menuItemHoverBackgroundColor);
 }

frontend/src/Components/Form/CheckInput.css

@@ -32,21 +32,21 @@
   height: 20px;
   border: 1px solid #ccc;
   border-radius: 2px;
-  background-color: $white;
+  background-color: var(--white);
-  color: $white;
+  color: var(--white);
   text-align: center;
   line-height: 20px;
 }
 
 .checkbox:focus + .input {
   outline: 0;
-  border-color: $inputFocusBorderColor;
+  border-color: var(--inputFocusBorderColor);
-  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
+  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
 }
 
 .dangerIsChecked {
-  border-color: $dangerColor;
+  border-color: var(--dangerColor);
-  background-color: $dangerColor;
+  background-color: var(--dangerColor);
 
   &.isDisabled {
     opacity: 0.7;
@@ -54,8 +54,8 @@
 }
 
 .primaryIsChecked {
-  border-color: $primaryColor;
+  border-color: var(--primaryColor);
-  background-color: $primaryColor;
+  background-color: var(--primaryColor);
 
   &.isDisabled {
     opacity: 0.7;
@@ -63,8 +63,8 @@
 }
 
 .successIsChecked {
-  border-color: $successColor;
+  border-color: var(--successColor);
-  background-color: $successColor;
+  background-color: var(--successColor);
 
   &.isDisabled {
     opacity: 0.7;
@@ -72,8 +72,8 @@
 }
 
 .warningIsChecked {
-  border-color: $warningColor;
+  border-color: var(--warningColor);
-  background-color: $warningColor;
+  background-color: var(--warningColor);
 
   &.isDisabled {
     opacity: 0.7;
@@ -82,15 +82,15 @@
 
 .isNotChecked {
   &.isDisabled {
-    border-color: $disabledCheckInputColor;
+    border-color: var(--disabledCheckInputColor);
-    background-color: $disabledCheckInputColor;
+    background-color: var(--disabledCheckInputColor);
     opacity: 0.7;
   }
 }
 
 .isIndeterminate {
-  border-color: $gray;
+  border-color: var(--gray);
-  background-color: $gray;
+  background-color: var(--gray);
 }
 
 .helpText {

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -39,7 +39,7 @@
 .dropdownArrowContainerDisabled {
   composes: dropdownArrowContainer;
 
-  color: $disabledInputColor;
+  color: var(--disabledInputColor);
 }
 
 .optionsContainer {
@@ -50,9 +50,9 @@
 .options {
   composes: scroller from '~Components/Scroller/Scroller.css';
 
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-radius: 4px;
-  background-color: $white;
+  background-color: var(--inputBackgroundColor);
 }
 
 .optionsModal {
@@ -76,9 +76,9 @@
 .optionsModalScroller {
   composes: scroller from '~Components/Scroller/Scroller.css';
 
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-radius: 4px;
-  background-color: $white;
+  background-color: var(--inputBackgroundColor);
 }
 
 .loading {
@@ -90,7 +90,7 @@
   display: flex;
   justify-content: flex-end;
   height: 40px;
-  border-bottom: 1px solid $borderColor;
+  border-bottom: 1px solid var(--borderColor);
 }
 
 .mobileCloseButton {
@@ -100,6 +100,6 @@
   line-height: 40px;
 
   &:hover {
-    color: $modalCloseButtonHoverColor;
+    color: var(--modalCloseButtonHoverColor);
   }
 }

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -7,7 +7,7 @@
   cursor: default;
 
   &:hover {
-    background-color: #f8f8f8;
+    background-color: var(--inputHoverBackgroundColor);
   }
 }
 
@@ -24,17 +24,17 @@
 }
 
 .isSelected {
-  background-color: #e2e2e2;
+  background-color: var(--inputSelectedBackgroundColor);
 
   &:hover {
-    background-color: #e2e2e2;
+    background-color: var(--inputSelectedBackgroundColor);
   }
 
   &.isMobile {
     background-color: inherit;
 
     .iconContainer {
-      color: $primaryColor;
+      color: var(--primaryColor);
     }
   }
 }
@@ -49,7 +49,7 @@
 
 .isMobile {
   height: 50px;
-  border-bottom: 1px solid $borderColor;
+  border-bottom: 1px solid var(--borderColor);
 
   &:last-child {
     border: none;

frontend/src/Components/Form/EnhancedSelectInputSelectedValue.css

@@ -3,5 +3,5 @@
 }
 
 .isDisabled {
-  color: $disabledInputColor;
+  color: var(--disabledInputColor);
 }

frontend/src/Components/Form/FormInputGroup.css

@@ -40,7 +40,7 @@
 }
 
 .pendingChangesIcon {
-  color: $warningColor;
+  color: var(--warningColor);
   font-size: 20px;
   line-height: 35px;
 }

frontend/src/Components/Form/FormInputHelpText.css

@@ -1,14 +1,14 @@
 .helpText {
   margin-top: 5px;
-  color: $helpTextColor;
+  color: var(--helpTextColor);
   line-height: 20px;
 }
 
 .isError {
-  color: $dangerColor;
+  color: var(--dangerColor);
 
   .link {
-    color: $dangerColor;
+    color: var(--dangerColor);
 
     &:hover {
       color: #e01313;
@@ -17,10 +17,10 @@
 }
 
 .isWarning {
-  color: $warningColor;
+  color: var(--warningColor);
 
   .link {
-    color: $warningColor;
+    color: var(--warningColor);
 
     &:hover {
       color: #e36c00;

frontend/src/Components/Form/FormLabel.css

@@ -7,11 +7,11 @@
 }
 
 .hasError {
-  color: $dangerColor;
+  color: var(--dangerColor);
 }
 
 .isAdvanced {
-  color: $advancedFormLabelColor;
+  color: var(--advancedFormLabelColor);
 }
 
 @media only screen and (max-width: $breakpointLarge) {

frontend/src/Components/Form/HintedSelectInputOption.css

@@ -18,11 +18,11 @@
   @add-mixin truncate;
 
   margin-left: 15px;
-  color: $darkGray;
+  color: var(--darkGray);
   font-size: $smallFontSize;
 }
 
 .divider {
   border: none;
-  border-bottom: 1px solid $lightGray;
+  border-bottom: 1px solid var(--lightGray);
 }

frontend/src/Components/Form/HintedSelectInputSelectedValue.css

@@ -18,7 +18,7 @@
 
   flex: 1 10 0;
   margin-left: 15px;
-  color: $gray;
+  color: var(--gray);
   text-align: right;
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/Input.css

@@ -2,26 +2,27 @@
   padding: 6px 16px;
   width: 100%;
   height: 35px;
-  border: 1px solid $inputBorderColor;
+  border: 1px solid var(--inputBorderColor);
   border-radius: 4px;
-  background-color: $white;
+  background-color: var(--inputBackgroundColor);
-  box-shadow: inset 0 1px 1px $inputBoxShadowColor;
+  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
+  color: var(--textColor);
 
   &:focus {
     outline: 0;
-    border-color: $inputFocusBorderColor;
+    border-color: var(--inputFocusBorderColor);
-    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
+    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
   }
 }
 
 .hasError {
-  border-color: $inputErrorBorderColor;
+  border-color: var(--inputErrorBorderColor);
-  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputErrorBoxShadowColor;
+  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputErrorBoxShadowColor);
 }
 
 .hasWarning {
-  border-color: $inputWarningBorderColor;
+  border-color: var(--inputWarningBorderColor);
-  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputWarningBoxShadowColor;
+  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputWarningBoxShadowColor);
 }
 
 .hasButton {

frontend/src/Components/Form/KeyValueListInput.css

@@ -7,8 +7,8 @@
 
   &.isFocused {
     outline: 0;
-    border-color: $inputFocusBorderColor;
+    border-color: var(--inputFocusBorderColor);
-    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
+    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
   }
 }
 

frontend/src/Components/Form/KeyValueListInputItem.css

@@ -1,7 +1,7 @@
 .itemContainer {
   display: flex;
   margin-bottom: 3px;
-  border-bottom: 1px solid $inputBorderColor;
+  border-bottom: 1px solid var(--inputBorderColor);
 
   &:last-child {
     margin-bottom: 0;

frontend/src/Components/Form/RootFolderSelectInputOption.css

@@ -21,17 +21,17 @@
 .movieFolder {
   @add-mixin truncate;
 
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .freeSpace {
   margin-left: 15px;
-  color: $darkGray;
+  color: var(--darkGray);
   font-size: $smallFontSize;
 }
 
 .isMissing {
   margin-left: 15px;
-  color: $dangerColor;
+  color: var(--dangerColor);
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/RootFolderSelectInputSelectedValue.css

@@ -20,13 +20,13 @@
 .movieFolder {
   @add-mixin truncate;
   flex: 0 1 auto;
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .freeSpace {
   flex: 0 0 auto;
   margin-left: 15px;
-  color: $gray;
+  color: var(--gray);
   text-align: right;
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/TagInput.css

@@ -7,8 +7,8 @@
 
   &.isFocused {
     outline: 0;
-    border-color: $inputFocusBorderColor;
+    border-color: var(--inputFocusBorderColor);
-    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
+    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
   }
 }
 
@@ -20,4 +20,6 @@
   width: 0%;
   height: 31px;
   border: none;
+  background-color: var(--inputBackground);
+  color: var(--textColor);
 }

frontend/src/Components/Form/TextInput.css

@@ -3,7 +3,7 @@
 }
 
 .readOnly {
-  background-color: #eee;
+  background-color: var(--inputReadOnlyBackgroundColor);
 }
 
 .hasError {

frontend/src/Components/Form/UMaskInput.css

@@ -49,5 +49,5 @@
 }
 
 .readOnly {
-  background-color: #eee;
+  background-color: var(--inputReadOnlyBackgroundColor);
 }

frontend/src/Components/Icon.css

@@ -1,5 +1,5 @@
 .danger {
-  color: $dangerColor;
+  color: var(--dangerColor);
 }
 
 .default {
@@ -7,25 +7,25 @@
 }
 
 .disabled {
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .info {
-  color: $infoColor;
+  color: var(--infoColor);
 }
 
 .pink {
-  color: $pink;
+  color: var(--pink);
 }
 
 .success {
-  color: $successColor;
+  color: var(--successColor);
 }
 
 .warning {
-  color: $warningColor;
+  color: var(--warningColor);
 }
 
 .purple {
-  color: $purple;
+  color: var(--purple);
 }

frontend/src/Components/InfoLabel.css

@@ -1,7 +1,7 @@
 .label {
   display: inline-block;
   margin: 2px;
-  color: $white;
+  color: var(--white);
   /** text-align: center; **/
   white-space: nowrap;
   line-height: 1;
@@ -10,7 +10,7 @@
 
 .title {
   margin-bottom: 2px;
-  color: $helpTextColor;
+  color: var(--helpTextColor);
   font-size: 10px;
 }
 
@@ -36,5 +36,5 @@
 /** Outline **/
 
 .outline {
-  background-color: $white;
+  background-color: var(--white);
 }

frontend/src/Components/Label.css

@@ -3,7 +3,7 @@
   margin: 2px;
   border: 1px solid;
   border-radius: 2px;
-  color: $white;
+  color: var(--white);
   text-align: center;
   white-space: nowrap;
   line-height: 1;
@@ -13,94 +13,95 @@
 /** Kinds **/
 
 .danger {
-  border-color: $dangerColor;
+  border-color: var(--dangerColor);
-  background-color: $dangerColor;
+  background-color: var(--dangerColor);
 
   &.outline {
-    color: $dangerColor;
+    color: var(--dangerColor);
   }
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
+    background: repeating-linear-gradient(90deg, color(var(--dangerColor) shade(5%)), color(var(--dangerColor) shade(5%)) 5px, color(var(--dangerColor) shade(15%)) 5px, color(var(--dangerColor) shade(15%)) 10px);
   }
 }
 
 .default {
-  border-color: $themeLightColor;
+  border-color: var(--themeLightColor);
-  background-color: $themeLightColor;
+  background-color: var(--themeLightColor);
 
   &.outline {
-    color: $themeLightColor;
+    color: var(--themeLightColor);
   }
 }
 
 .disabled {
-  border-color: $disabledColor;
+  border-color: var(--disabledColor);
-  background-color: $disabledColor;
+  background-color: var(--disabledColor);
 
   &.outline {
-    color: $disabledColor;
+    color: var(--offWhite);
   }
 }
 
 .info {
-  border-color: $infoColor;
+  border-color: var(--infoColor);
-  background-color: $infoColor;
+  background-color: var(--infoColor);
+  color: var(--infoTextColor);
 
   &.outline {
-    color: $infoColor;
+    color: var(--infoColor);
   }
 }
 
 .inverse {
-  border-color: $lightGray;
+  border-color: var(--inverseLabelColor);
-  background-color: $lightGray;
+  background-color: var(--inverseLabelColor);
-  color: $defaultColor;
+  color: var(--inverseLabelTextColor);
 
   &.outline {
-    background-color: $defaultColor !important;
+    background-color: var(--inverseLabelTextColor) !important;
-    color: $lightGray;
+    color: var(--inverseLabelColor);
   }
 }
 
 .primary {
-  border-color: $primaryColor;
+  border-color: var(--primaryColor);
-  background-color: $primaryColor;
+  background-color: var(--primaryColor);
 
   &.outline {
-    color: $primaryColor;
+    color: var(--primaryColor);
   }
 }
 
 .success {
-  border-color: $successColor;
+  border-color: var(--successColor);
-  background-color: $successColor;
+  background-color: var(--successColor);
   color: #eee;
 
   &.outline {
-    color: $successColor;
+    color: var(--successColor);
   }
 }
 
 .warning {
-  border-color: $warningColor;
+  border-color: var(--warningColor);
-  background-color: $warningColor;
+  background-color: var(--warningColor);
 
   &.outline {
-    color: $warningColor;
+    color: var(--warningColor);
   }
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
+    background: repeating-linear-gradient(45deg, var(--warningColor), var(--warningColor) 5px, color(var(--warningColor) tint(15%)) 5px, color(var(--warningColor) tint(15%)) 10px);
   }
 }
 
 .queue {
-  border-color: $queueColor;
+  border-color: var(--queueColor);
-  background-color: $queueColor;
+  background-color: var(--queueColor);
 
   &.outline {
-    color: $queueColor;
+    color: var(--queueColor);
   }
 }
 
@@ -125,5 +126,5 @@
 /** Outline **/
 
 .outline {
-  background-color: $white;
+  background-color: var(--disabledLabelColor);
 }

frontend/src/Components/Link/Button.css

@@ -19,62 +19,62 @@
 }
 
 .danger {
-  border-color: $dangerBorderColor;
+  border-color: var(--dangerBorderColor);
-  background-color: $dangerBackgroundColor;
+  background-color: var(--dangerBackgroundColor);
-  color: $white;
+  color: var(--white);
 
   &:hover {
-    border-color: $dangerHoverBorderColor;
+    border-color: var(--dangerHoverBorderColor);
-    background-color: $dangerHoverBackgroundColor;
+    background-color: var(--dangerHoverBackgroundColor);
-    color: $white;
+    color: var(--white);
   }
 }
 
 .default {
-  border-color: $defaultBorderColor;
+  border-color: var(--defaultBorderColor);
-  background-color: $defaultBackgroundColor;
+  background-color: var(--defaultBackgroundColor);
-  color: $defaultColor;
+  color: var(--defaultColor);
 
   &:hover {
-    border-color: $defaultHoverBorderColor;
+    border-color: var(--defaultHoverBorderColor);
-    background-color: $defaultHoverBackgroundColor;
+    background-color: var(--defaultHoverBackgroundColor);
-    color: $defaultColor;
+    color: var(--defaultColor);
   }
 }
 
 .primary {
-  border-color: $primaryBorderColor;
+  border-color: var(--primaryBorderColor);
-  background-color: $primaryBackgroundColor;
+  background-color: var(--primaryBackgroundColor);
-  color: $white;
+  color: var(--white);
 
   &:hover {
-    border-color: $primaryHoverBorderColor;
+    border-color: var(--primaryHoverBorderColor);
-    background-color: $primaryHoverBackgroundColor;
+    background-color: var(--primaryHoverBackgroundColor);
-    color: $white;
+    color: var(--white);
   }
 }
 
 .success {
-  border-color: $successBorderColor;
+  border-color: var(--successBorderColor);
-  background-color: $successBackgroundColor;
+  background-color: var(--successBackgroundColor);
-  color: $white;
+  color: var(--white);
 
   &:hover {
-    border-color: $successHoverBorderColor;
+    border-color: var(--successHoverBorderColor);
-    background-color: $successHoverBackgroundColor;
+    background-color: var(--successHoverBackgroundColor);
-    color: $white;
+    color: var(--white);
   }
 }
 
 .warning {
-  border-color: $warningBorderColor;
+  border-color: var(--warningBorderColor);
-  background-color: $warningBackgroundColor;
+  background-color: var(--warningBackgroundColor);
-  color: $white;
+  color: var(--white);
 
   &:hover {
-    border-color: $warningHoverBorderColor;
+    border-color: var(--warningHoverBorderColor);
-    background-color: $warningHoverBackgroundColor;
+    background-color: var(--warningHoverBackgroundColor);
-    color: $white;
+    color: var(--white);
   }
 }
 

frontend/src/Components/Link/IconButton.css

@@ -12,10 +12,10 @@
   &:hover {
     border: none;
     background-color: inherit;
-    color: $iconButtonHoverColor;
+    color: var(--iconButtonHoverColor);
   }
 
   &.isDisabled {
-    color: $iconButtonDisabledColor;
+    color: var(--iconButtonDisabledColor);
   }
 }

frontend/src/Components/Link/Link.css

@@ -15,10 +15,10 @@
 }
 
 .to {
-  color: $linkColor;
+  color: var(--linkColor);
 
   &:hover {
-    color: $linkHoverColor;
+    color: var(--linkHoverColor);
     text-decoration: underline;
   }
 }

frontend/src/Components/Loading/LoadingIndicator.css

@@ -26,7 +26,7 @@
 
 .ripple {
   position: absolute;
-  border: 2px solid #3a3f51;
+  border: 2px solid var(--themeDarkColor);
   border-radius: 100%;
   animation: rippleContainer 1.25s 0s infinite cubic-bezier(0.21, 0.53, 0.56, 0.8);
   animation-fill-mode: both;

frontend/src/Components/Menu/MenuButton.css

@@ -10,12 +10,12 @@
   }
 
   &:hover {
-    color: $toobarButtonHoverColor;
+    color: var(--toobarButtonHoverColor);
   }
 }
 
 .isDisabled {
-  color: $disabledColor;
+  color: var(--disabledColor);
 
   pointer-events: none;
 }

frontend/src/Components/Menu/MenuContent.css

@@ -2,7 +2,7 @@
   z-index: $popperZIndex;
   display: flex;
   flex-direction: column;
-  background-color: $toolbarMenuItemBackgroundColor;
+  background-color: var(--toolbarMenuItemBackgroundColor);
   line-height: 20px;
 }
 

frontend/src/Components/Menu/MenuItem.css

@@ -5,19 +5,19 @@
   padding: 10px 20px;
   min-width: 150px;
   max-width: 250px;
-  background-color: $toolbarMenuItemBackgroundColor;
+  background-color: var(--toolbarMenuItemBackgroundColor);
-  color: $menuItemColor;
+  color: var(--menuItemColor);
   line-height: 20px;
 
   &:hover,
   &:focus {
-    background-color: $toolbarMenuItemHoverBackgroundColor;
+    background-color: var(--toolbarMenuItemHoverBackgroundColor);
-    color: $menuItemHoverColor;
+    color: var(--menuItemHoverColor);
     text-decoration: none;
   }
 }
 
 .isDisabled {
-  color: $disabledColor;
+  color: var(--disabledColor);
   pointer-events: none;
 }

frontend/src/Components/Menu/MenuItemSeparator.css

@@ -2,5 +2,5 @@
   overflow: hidden;
   min-height: 1px;
   height: 1px;
-  background-color: $themeDarkColor;
+  background-color: var(--themeDarkColor);
 }

frontend/src/Components/Modal/ConfirmModal.js

@@ -33,7 +33,7 @@ function ConfirmModal(props) {
 
       return () => unbindShortcut('enter', onConfirm);
     }
-  }, [isOpen, onConfirm]);
+  }, [bindShortcut, unbindShortcut, isOpen, onConfirm]);
 
   return (
     <Modal

frontend/src/Components/Modal/Modal.css

@@ -12,7 +12,7 @@
   justify-content: center;
   width: 100%;
   height: 100%;
-  background-color: $modalBackdropBackgroundColor;
+  background-color: var(--modalBackdropBackgroundColor);
   opacity: 1;
 }
 

frontend/src/Components/Modal/ModalContent.css

@@ -4,7 +4,7 @@
   flex-direction: column;
   flex-grow: 1;
   width: 100%;
-  background-color: $modalBackgroundColor;
+  background-color: var(--modalBackgroundColor);
 }
 
 .closeButton {
@@ -18,6 +18,6 @@
   line-height: 60px;
 
   &:hover {
-    color: $modalCloseButtonHoverColor;
+    color: var(--modalCloseButtonHoverColor);
   }
 }

frontend/src/Components/Modal/ModalFooter.css

@@ -4,7 +4,7 @@
   justify-content: flex-end;
   flex-shrink: 0;
   padding: 15px 30px;
-  border-top: 1px solid $borderColor;
+  border-top: 1px solid var(--borderColor);
 
   a,
   button {

frontend/src/Components/Modal/ModalHeader.css

@@ -3,6 +3,6 @@
 
   flex-shrink: 0;
   padding: 15px 50px 15px 30px;
-  border-bottom: 1px solid $borderColor;
+  border-bottom: 1px solid var(--borderColor);
   font-size: 18px;
 }

frontend/src/Components/MonitorToggleButton.css

@@ -6,6 +6,6 @@
 }
 
 .isDisabled {
-  color: $disabledColor;
+  color: var(--disabledColor);
   cursor: not-allowed;
 }

frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.css

@@ -8,8 +8,8 @@
 .key {
   padding: 2px 4px;
   border-radius: 3px;
-  background-color: $defaultColor;
+  background-color: var(--defaultColor);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
-  color: $white;
+  color: var(--white);
   font-size: 16px;
 }

frontend/src/Components/Page/Header/MovieSearchInput.css

@@ -12,22 +12,22 @@
 .ripple {
   composes: ripple from '~Components/Loading/LoadingIndicator.css';
 
-  border: 1px solid $toolbarColor;
+  border: 1px solid var(--toolbarColor);
 }
 
 .input {
   margin-left: 8px;
   width: 200px;
   border: none;
-  border-bottom: solid 1px $white;
+  border-bottom: solid 1px var(--white);
   border-radius: 0;
   background-color: transparent;
   box-shadow: none;
-  color: $white;
+  color: var(--white);
   transition: border 0.3s ease-out;
 
   &::placeholder {
-    color: $white;
+    color: var(--white);
     transition: color 0.3s ease-out;
   }
 
@@ -60,13 +60,13 @@
     overflow-y: auto;
     min-width: 100%;
     max-height: 230px;
-    border: 1px solid $themeDarkColor;
+    border: 1px solid var(--themeDarkColor);
     border-radius: 4px;
     border-top-left-radius: 0;
     border-top-right-radius: 0;
-    background-color: $themeDarkColor;
+    background-color: var(--themeDarkColor);
-    box-shadow: inset 0 1px 1px $inputBoxShadowColor;
+    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
-    color: $menuItemColor;
+    color: var(--menuItemColor);
   }
 }
 
@@ -82,12 +82,12 @@
 }
 
 .highlighted {
-  background-color: $themeLightColor;
+  background-color: var(--themeLightColor);
 }
 
 .sectionTitle {
   padding: 5px 8px;
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .addNewMovieSuggestion {

frontend/src/Components/Page/Header/MovieSearchResult.css

@@ -21,7 +21,7 @@
 .alternateTitle {
   composes: title;
 
-  color: $disabledColor;
+  color: var(--disabledColor);
   font-size: $smallFontSize;
 }
 

frontend/src/Components/Page/Header/PageHeader.css

@@ -4,8 +4,8 @@
   align-items: center;
   flex: 0 0 auto;
   height: $headerHeight;
-  background-color: #464b51;
+  background-color: var(--pageHeaderBackgroundColor);
-  color: $white;
+  color: var(--white);
 }
 
 .logoContainer {
@@ -56,7 +56,7 @@
   line-height: 60px;
 
   &:hover {
-    color: $toobarButtonHoverColor;
+    color: var(--toobarButtonHoverColor);
   }
 }
 
@@ -67,7 +67,7 @@
   align-items: center;
   justify-content: center;
   width: 30px;
-  color: $themeRed;
+  color: var(--themeRed);
   text-align: center;
   line-height: 60px;
 

frontend/src/Components/Page/Header/PageHeaderActionsMenu.css

@@ -5,7 +5,7 @@
   text-align: center;
 
   &:hover {
-    color: $toobarButtonHoverColor;
+    color: var(--toobarButtonHoverColor);
   }
 }
 

frontend/src/Components/Page/LoadingPage.css

@@ -1,5 +1,7 @@
 .page {
   composes: page from '~./Page.css';
+
+  background-color: var(--pageBackground);
 }
 
 .logoFull {

frontend/src/Components/Page/PageContentBody.js

@@ -1,24 +1,12 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import OverlayScroller from 'Components/Scroller/OverlayScroller';
 import Scroller from 'Components/Scroller/Scroller';
 import { scrollDirections } from 'Helpers/Props';
-import { isFirefox, isMobile } from 'Utilities/browser';
 import { isLocked } from 'Utilities/scrollLock';
 import styles from './PageContentBody.css';
 
 class PageContentBody extends Component {
 
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this._isMobile = isMobile();
-    this._isSmallScreenFirefox = isFirefox && window.innerWidth < 768;
-  }
-
   //
   // Listeners
 
@@ -42,12 +30,8 @@ class PageContentBody extends Component {
       ...otherProps
     } = this.props;
 
-    const ScrollerComponent = this._isMobile || this._isSmallScreenFirefox ?
-      Scroller :
-      OverlayScroller;
-
     return (
-      <ScrollerComponent
+      <Scroller
         className={className}
         scrollDirection={scrollDirections.VERTICAL}
         {...otherProps}
@@ -56,7 +40,7 @@ class PageContentBody extends Component {
         <div className={innerClassName}>
           {children}
         </div>
-      </ScrollerComponent>
+      </Scroller>
     );
   }
 }

frontend/src/Components/Page/PageContentFooter.css

@@ -2,7 +2,7 @@
   display: flex;
   flex: 0 0 auto;
   padding: 20px;
-  background-color: #f1f1f1;
+  background-color: var(--pageFooterBackground);
 }
 
 @media only screen and (max-width: $breakpointSmall) {

frontend/src/Components/Page/PageJumpBarItem.css

@@ -1,6 +1,6 @@
 .jumpBarItem {
   flex: 1 1 $jumpBarItemHeight;
-  border-bottom: 1px solid $borderColor;
+  border-bottom: 1px solid var(--borderColor);
   text-align: center;
   font-weight: bold;
 

frontend/src/Components/Page/Sidebar/Messages/Message.css

@@ -1,6 +1,6 @@
 .message {
   display: flex;
-  border-left: 3px solid $infoColor;
+  border-left: 3px solid var(--infoColor);
 }
 
 .iconContainer,
@@ -9,7 +9,7 @@
   justify-content: center;
   flex-direction: column;
   padding: 2px 0;
-  color: $sidebarColor;
+  color: var(--sidebarColor);
 }
 
 .iconContainer {
@@ -26,17 +26,17 @@
 /* Types */
 
 .error {
-  border-left-color: $dangerColor;
+  border-left-color: var(--dangerColor);
 }
 
 .info {
-  border-left-color: $infoColor;
+  border-left-color: var(--infoColor);
 }
 
 .success {
-  border-left-color: $successColor;
+  border-left-color: var(--successColor);
 }
 
 .warning {
-  border-left-color: $warningColor;
+  border-left-color: var(--warningColor);
 }

frontend/src/Components/Page/Sidebar/PageSidebar.css

@@ -2,7 +2,7 @@
   flex: 0 0 $sidebarWidth;
   overflow: hidden;
   width: $sidebarWidth;
-  background-color: $sidebarBackgroundColor;
+  background-color: var(--sidebarBackgroundColor);
   transition: transform 300ms ease-in-out;
   transform: translateX(0);
 }
@@ -11,8 +11,8 @@
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  background-color: $sidebarBackgroundColor;
+  background-color: var(--sidebarBackgroundColor);
-  color: $white;
+  color: var(--white);
 }
 
 @media only screen and (max-width: $breakpointSmall) {

frontend/src/Components/Page/Sidebar/PageSidebarItem.css

@@ -1,21 +1,21 @@
 .item {
   border-left: 3px solid transparent;
-  color: $sidebarColor;
+  color: var(--sidebarColor);
   transition: border-left 0.3s ease-in-out;
 }
 
 .isActiveItem {
-  border-left: 3px solid $themeBlue;
+  border-left: 3px solid var(--themeBlue);
 }
 
 .link {
   display: block;
   padding: 12px 24px;
-  color: $sidebarColor;
+  color: var(--sidebarColor);
 
   &:hover,
   &:focus {
-    color: $themeBlue;
+    color: var(--themeBlue);
     text-decoration: none;
   }
 }
@@ -27,11 +27,11 @@
 }
 
 .isActiveLink {
-  color: $themeBlue;
+  color: var(--themeBlue);
 }
 
 .isActiveParentLink {
-  background-color: $sidebarActiveBackgroundColor;
+  background-color: var(--sidebarActiveBackgroundColor);
 }
 
 .iconContainer {

frontend/src/Components/Page/Toolbar/PageToolbar.css

@@ -4,8 +4,8 @@
   flex: 0 0 auto;
   padding: 0 20px;
   height: $toolbarHeight;
-  background-color: $toolbarBackgroundColor;
+  background-color: var(--toolbarBackgroundColor);
-  color: $toolbarColor;
+  color: var(--toolbarColor);
   line-height: 60px;
 }
 

frontend/src/Components/Page/Toolbar/PageToolbarButton.css

@@ -7,16 +7,16 @@
   text-align: center;
 
   &:hover {
-    color: $toobarButtonHoverColor;
+    color: var(--toobarButtonHoverColor);
   }
 
   &.isDisabled {
-    color: $disabledColor;
+    color: var(--disabledColor);
   }
 }
 
 .isDisabled {
-  color: $disabledColor;
+  color: var(--disabledColor);
 }
 
 .labelContainer {
@@ -28,7 +28,7 @@
 
 .label {
   padding: 0 3px;
-  color: $toolbarLabelColor;
+  color: var(--toolbarLabelColor);
   font-size: $extraSmallFontSize;
   line-height: calc($extraSmallFontSize + 1px);
 }

frontend/src/Components/ProgressBar.css

@@ -3,7 +3,7 @@
   overflow: hidden;
   width: 100%;
   border-radius: 4px;
-  background-color: #f5f5f5;
+  background-color: var(--progressBarBackgroundColor);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 
@@ -14,13 +14,13 @@
   width: 0;
   height: 100%;
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  color: $white;
+  color: var(--white);
   transition: width 0.6s ease;
 }
 
 .frontTextContainer {
   z-index: 1;
-  color: $white;
+  color: var(--white);
 }
 
 .backTextContainer,
@@ -42,39 +42,39 @@
 }
 
 .primary {
-  background-color: $primaryColor;
+  background-color: var(--primaryColor);
 }
 
 .danger {
-  background-color: $dangerColor;
+  background-color: var(--dangerColor);
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, $dangerColor, $dangerColor 5px, $dangerColor 5px, $dimColor 10px);
+    background: repeating-linear-gradient(90deg, var(--dangerColor), var(--dangerColor) 5px, var(--dangerColor) 5px, var(--dimColor) 10px);
   }
 }
 
 .success {
-  background-color: $successColor;
+  background-color: var(--successColor);
 }
 
 .purple {
-  background-color: $purple;
+  background-color: var(--purple);
 }
 
 .warning {
-  background-color: $warningColor;
+  background-color: var(--warningColor);
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, $warningColor 5px, $dimColor 10px);
+    background: repeating-linear-gradient(45deg, var(--warningColor), var(--warningColor) 5px, var(--warningColor) 5px, var(--dimColor) 10px);
   }
 }
 
 .info {
-  background-color: $infoColor;
+  background-color: var(--infoColor);
 }
 
 .queue {
-  background-color: $queueColor;
+  background-color: var(--queueColor);
 }
 
 .small {

frontend/src/Components/Scroller/OverlayScroller.css

@@ -10,10 +10,10 @@
   min-height: 100px;
   border: 1px solid transparent;
   border-radius: 5px;
-  background-color: $scrollbarBackgroundColor;
+  background-color: var(--scrollbarBackgroundColor);
   background-clip: padding-box;
 
   &:hover {
-    background-color: $scrollbarHoverBackgroundColor;
+    background-color: var(--scrollbarHoverBackgroundColor);
   }
 }

frontend/src/Components/SignalRConnector.js

@@ -9,6 +9,7 @@ import { fetchCommands, finishCommand, updateCommand } from 'Store/Actions/comma
 import { fetchMovies } from 'Store/Actions/movieActions';
 import { fetchQueue, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
+import { fetchQualityDefinitions } from 'Store/Actions/settingsActions';
 import { fetchHealth } from 'Store/Actions/systemActions';
 import { fetchTagDetails, fetchTags } from 'Store/Actions/tagActions';
 import { repopulatePage } from 'Utilities/pagePopulator';
@@ -46,6 +47,7 @@ const mapDispatchToProps = {
   dispatchUpdateItem: updateItem,
   dispatchRemoveItem: removeItem,
   dispatchFetchHealth: fetchHealth,
+  dispatchFetchQualityDefinitions: fetchQualityDefinitions,
   dispatchFetchQueue: fetchQueue,
   dispatchFetchQueueDetails: fetchQueueDetails,
   dispatchFetchRootFolders: fetchRootFolders,
@@ -216,6 +218,10 @@ class SignalRConnector extends Component {
     }
   };
 
+  handleQualitydefinition = () => {
+    this.props.dispatchFetchQualityDefinitions();
+  };
+
   handleQueue = () => {
     if (this.props.isQueuePopulated) {
       this.props.dispatchFetchQueue();
@@ -335,6 +341,7 @@ SignalRConnector.propTypes = {
   dispatchUpdateItem: PropTypes.func.isRequired,
   dispatchRemoveItem: PropTypes.func.isRequired,
   dispatchFetchHealth: PropTypes.func.isRequired,
+  dispatchFetchQualityDefinitions: PropTypes.func.isRequired,
   dispatchFetchQueue: PropTypes.func.isRequired,
   dispatchFetchQueueDetails: PropTypes.func.isRequired,
   dispatchFetchRootFolders: PropTypes.func.isRequired,

frontend/src/Components/Table/Cells/TableRowCell.css

@@ -1,6 +1,6 @@
 .cell {
   padding: 8px;
-  border-top: 1px solid #eee;
+  border-top: 1px solid var(--borderColor);
   line-height: 1.52857143;
 }
 

frontend/src/Components/Table/TableOptions/TableOptionsColumn.css

@@ -4,7 +4,7 @@
   width: 100%;
   border: 1px solid #aaa;
   border-radius: 4px;
-  background: #fafafa;
+  background: var(--inputBackgroundColor);
 }
 
 .checkContainer {

frontend/src/Components/Table/TableOptions/TableOptionsModal.js

@@ -192,7 +192,7 @@ class TableOptionsModal extends Component {
                                       <TableOptionsColumnDragSource
                                         key={name}
                                         name={name}
-                                        label={label || columnLabel}
+                                        label={columnLabel || label}
                                         isVisible={isVisible}
                                         isModifiable={true}
                                         index={index}
@@ -210,7 +210,7 @@ class TableOptionsModal extends Component {
                                     <TableOptionsColumn
                                       key={name}
                                       name={name}
-                                      label={label || columnLabel}
+                                      label={columnLabel || label}
                                       isVisible={isVisible}
                                       index={index}
                                       isModifiable={false}